Commit graph

82 commits

Author SHA1 Message Date
Stephen Birarda
7b2c8a4db9 remove unused variable length 2013-01-24 11:18:46 -08:00
Stephen Birarda
bf336d8e40 remove extra space in audioCallback 2013-01-24 11:18:29 -08:00
Stephen Birarda
186f1217c3 swap echo for forevermore sample, phase delay with gyro 2013-01-24 11:15:58 -08:00
Stephen Birarda
4d914128ea simplify audio code, allow passing of Head object 2013-01-22 17:56:12 -08:00
Stephen Birarda
8a7db1f63c remove duplicate sources directory 2013-01-22 14:45:06 -08:00
Stephen Birarda
03db6f0a9b remove .DS_Store from repo 2013-01-22 14:43:05 -08:00
Stephen Birarda
3e4da1582f shift indented comment in audio.cpp 2013-01-22 14:23:37 -08:00
Stephen Birarda
078ee65438 organize folder to match Xcode structure 2013-01-22 13:45:37 -08:00
Philip Rosedale
ab50a4dd7c Work to add lattice, finger, other stuff 2013-01-21 18:07:07 -08:00
Philip Rosedale
d27bf404a6 Commented out broadcast calls, added fullscreen flag 2012-12-13 17:23:39 -08:00
Kenneth Keiter
795e7cdc55 Merge branch 'perf-optimization' 2012-12-13 14:19:48 -08:00
Kenneth Keiter
cd26933268 Improves performance with image capture ever so slightly. 2012-12-13 14:19:16 -08:00
Kenneth Keiter
283b8b298d Fix small typo. 2012-12-13 13:15:40 -08:00
Kenneth Keiter
1c071e5e26 Merge branch 'opencv'
Conflicts:
	head.h
2012-12-13 13:13:53 -08:00
Kenneth Keiter
b6919755c2 Roll-up commit of marker-tracking.
* Added OpenCV and CVBlob framework.
* Added marker acquisition and tracking.

Note: OpenCV libs are compiled for Apple x64 arch. This is for convenience.
2012-12-13 13:08:04 -08:00
Philip Rosedale
09f3c00b5a Adding networking to send agent head rotations 2012-12-12 09:54:13 -08:00
Philip Rosedale
8d74d5b4e9 Merge pull request #8 from yozlet/18784
Go fullscreen on startup
2012-12-03 16:08:06 -08:00
Philip Rosedale
4f65339daf Made particles colored simply by their velocity 2012-12-03 16:06:18 -08:00
Yoz Grahame
0fdcf1a566 Increase colour value gamut 2012-11-30 09:59:33 -08:00
Philip Rosedale
a495c291e5 More stuff for head roll, improved head, stable dt in all field calcs 2012-11-29 23:28:14 -08:00
Philip Rosedale
ff0cf7e13c Updated maple PDE to have Roll gyro and led latency tester 2012-11-29 15:52:47 -08:00
Yoz Grahame
b78cc04bf5 Go fullscreen on startup 2012-11-28 16:28:14 -08:00
Philip Rosedale
255e628a92 Moving I/O code into head class, playing with blocks 2012-11-28 14:50:14 -08:00
Philip Rosedale
fad5e28347 Moving I/O code into head class, playing with blocks 2012-11-28 14:47:09 -08:00
Yoz Grahame
a70c6225c2 Merge pull request #7 from yozlet/18673
18673
2012-11-28 14:10:39 -08:00
Yoz Grahame
8b720d53df Move constants to macros; increase particle count 2012-11-28 14:01:35 -08:00
Yoz Grahame
4ebcc0cff3 Look at all the pretty colours!
We now have color values for the field elements, which are gradually added to the particles as they move.
2012-11-26 18:17:00 -08:00
Yoz Grahame
410e7b2d7e Commented out cubes, added particle count, misc cleanup 2012-11-26 14:47:30 -08:00
Yoz Grahame
268bc88ed3 Merge branch 'master' of git://github.com/worklist/interface
Conflicts:
	main.cpp
2012-11-26 14:17:32 -08:00
Philip Rosedale
e5c94d6c69 Added test routine makecubes() and key handlers 2012-11-25 15:32:55 -08:00
Philip Rosedale
4226886042 Added vector renderer util, broadcast packets now reaching agents 2012-11-21 12:08:30 -08:00
Philip Rosedale
2cf25c23c5 Spaceserver agent list, broadcast routines for discovered agents 2012-11-21 11:12:40 -08:00
Philip Rosedale
e64f46d556 Added spaceserver messaging. 2012-11-20 21:51:09 -08:00
Philip Rosedale
c91dd5c4c2 More little housekeeping cleanups to main.cpp 2012-11-19 15:20:24 -08:00
Philip Rosedale
6a7128243a Removed cloud rendering from main.cpp to Cloud class 2012-11-19 15:07:21 -08:00
Yoz Grahame
ea66f0c2a8 use glDrawElements() to draw the particles - no major speedup so far, but less code 2012-11-19 13:18:37 -08:00
Yoz Grahame
5a522feb32 Merge branch 'master' of git://github.com/worklist/interface
Conflicts:
	main.cpp
2012-11-19 12:56:38 -08:00
Philip Rosedale
95b106b867 Removing some of the triangle code in main.cpp 2012-11-18 11:00:21 -08:00
Philip Rosedale
125eed350a Further work on Cloud class 2012-11-18 10:45:41 -08:00
Philip Rosedale
eb648d3d1f Partial commit to switch sprite rendering to new Cloud class 2012-11-17 17:00:56 -08:00
Philip Rosedale
13344f1774 Head tweaks, audio toggle 2012-11-16 16:45:44 -08:00
Yoz Grahame
1f6134b14b Lock build SDK to 10.7 2012-11-12 17:48:45 -08:00
Yoz Grahame
c604a88a07 Texture loading only happens at init() 2012-11-12 17:48:28 -08:00
Philip Rosedale
ee1db09d06 Merge branch 'master' of github.com:/worklist/interface 2012-11-12 17:32:42 -08:00
Philip Rosedale
7dbac3fbc9 Work in progress on field/ball interaction 2012-11-12 17:31:07 -08:00
Yoz Grahame
8509cd421e Merge pull request #5 from yozlet/master
Fix missing textures
2012-11-12 17:29:09 -08:00
Yoz Grahame
0206086ade Oops - texture load command went missing in a merge 2012-11-12 17:27:39 -08:00
Philip Rosedale
642c81beae Trivial change to test 2012-11-09 18:02:39 -08:00
Yoz Grahame
190bc258b4 Merge pull request #4 from yozlet/master
Merging 2d pointer fix
2012-11-09 15:55:00 -08:00
Yoz Grahame
4d94e9e322 Merge branch '18637'
Conflicts:
	main.cpp
2012-11-09 15:53:42 -08:00