Stephen Birarda
7a17449e1d
organize folder to match Xcode structure
2013-01-22 13:45:37 -08:00
Philip Rosedale
7e9deeadce
Work to add lattice, finger, other stuff
2013-01-21 18:07:07 -08:00
Philip Rosedale
58f0ea0a65
Commented out broadcast calls, added fullscreen flag
2012-12-13 17:23:39 -08:00
Kenneth Keiter
9d05e5dcad
Improves performance with image capture ever so slightly.
2012-12-13 14:19:16 -08:00
Kenneth Keiter
dc036551ac
Fix small typo.
2012-12-13 13:15:40 -08:00
Kenneth Keiter
ac35009cac
Merge branch 'opencv'
...
Conflicts:
head.h
2012-12-13 13:13:53 -08:00
Kenneth Keiter
19b2bb1728
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
1c03d5822a
Adding networking to send agent head rotations
2012-12-12 09:54:13 -08:00
Philip Rosedale
b022550eac
Merge pull request #8 from yozlet/18784
...
Go fullscreen on startup
2012-12-03 16:08:06 -08:00
Philip Rosedale
8099cfec4a
Made particles colored simply by their velocity
2012-12-03 16:06:18 -08:00
Philip Rosedale
044b813dd3
More stuff for head roll, improved head, stable dt in all field calcs
2012-11-29 23:28:14 -08:00
Philip Rosedale
ec91637f1a
Updated maple PDE to have Roll gyro and led latency tester
2012-11-29 15:52:47 -08:00
Yoz Grahame
50b020ed96
Go fullscreen on startup
2012-11-28 16:28:14 -08:00
Philip Rosedale
a4daf22e37
Moving I/O code into head class, playing with blocks
2012-11-28 14:50:14 -08:00
Philip Rosedale
2309d248a9
Moving I/O code into head class, playing with blocks
2012-11-28 14:47:09 -08:00
Yoz Grahame
690a7075ce
Move constants to macros; increase particle count
2012-11-28 14:01:35 -08:00
Yoz Grahame
8d47a75758
Commented out cubes, added particle count, misc cleanup
2012-11-26 14:47:30 -08:00
Yoz Grahame
20ae9e0f11
Merge branch 'master' of git://github.com/worklist/interface
...
Conflicts:
main.cpp
2012-11-26 14:17:32 -08:00
Philip Rosedale
6172b38f49
Added test routine makecubes() and key handlers
2012-11-25 15:32:55 -08:00
Philip Rosedale
2b62adce6c
Added vector renderer util, broadcast packets now reaching agents
2012-11-21 12:08:30 -08:00
Philip Rosedale
5daf15ac2d
Spaceserver agent list, broadcast routines for discovered agents
2012-11-21 11:12:40 -08:00
Philip Rosedale
3ddea45e2c
Added spaceserver messaging.
2012-11-20 21:51:09 -08:00
Philip Rosedale
86b1f0909b
More little housekeeping cleanups to main.cpp
2012-11-19 15:20:24 -08:00
Philip Rosedale
17cccf7617
Removed cloud rendering from main.cpp to Cloud class
2012-11-19 15:07:21 -08:00
Yoz Grahame
5536f539b0
use glDrawElements() to draw the particles - no major speedup so far, but less code
2012-11-19 13:18:37 -08:00
Yoz Grahame
2bc588f4d0
Merge branch 'master' of git://github.com/worklist/interface
...
Conflicts:
main.cpp
2012-11-19 12:56:38 -08:00
Philip Rosedale
cb52fb7f04
Removing some of the triangle code in main.cpp
2012-11-18 11:00:21 -08:00
Philip Rosedale
4174364adc
Further work on Cloud class
2012-11-18 10:45:41 -08:00
Philip Rosedale
86d9230181
Partial commit to switch sprite rendering to new Cloud class
2012-11-17 17:00:56 -08:00
Philip Rosedale
672f48c08f
Head tweaks, audio toggle
2012-11-16 16:45:44 -08:00
Yoz Grahame
b774d833e4
Texture loading only happens at init()
2012-11-12 17:48:28 -08:00
Philip Rosedale
ee0c614482
Merge branch 'master' of github.com:/worklist/interface
2012-11-12 17:32:42 -08:00
Philip Rosedale
15dd6cafbd
Work in progress on field/ball interaction
2012-11-12 17:31:07 -08:00
Yoz Grahame
adb373180f
Oops - texture load command went missing in a merge
2012-11-12 17:27:39 -08:00
Philip Rosedale
d168cb1610
Trivial change to test
2012-11-09 18:02:39 -08:00
Yoz Grahame
4d94e9e322
Merge branch '18637'
...
Conflicts:
main.cpp
2012-11-09 15:53:42 -08:00
Philip Rosedale
250400dac1
field modifies itself by particles
2012-11-09 15:44:45 -08:00
Yoz Grahame
6e62e9ee32
Fixed 2D pointer particle display
2012-11-09 15:41:19 -08:00
Philip Rosedale
acd7689cab
Added textures
2012-11-07 15:12:59 -08:00
Philip Rosedale
eb69451c9b
Default with less stuff showing, code cleanup.
2012-11-07 14:49:28 -08:00
Philip Rosedale
fd09a94db0
Testing Grayson texture
2012-11-07 12:53:29 -08:00
Yoz Grahame
255f9e73d3
Removed width & height args from load_png_as_texture()
2012-11-07 12:48:51 -08:00
Yoz Grahame
2d6a2922a7
Twiddle the twiddles
2012-11-07 12:34:58 -08:00
Philip Rosedale
73c4e55da4
Fixing merge conflicts
2012-11-07 10:48:24 -08:00
Philip Rosedale
39c4c729e4
tweak audio compression to 22050
2012-11-07 09:51:05 -08:00
Yoz Grahame
ee1113a017
Bug fix
2012-11-06 18:47:19 -08:00
Yoz Grahame
e6ef767152
Uses point sprites, Grayson's texture, and 100,000 particles
2012-11-06 17:59:20 -08:00
Yoz Grahame
2a9d1701cb
Added sphere.png
2012-11-06 15:35:17 -08:00
Yoz Grahame
6cdba406e1
Now loads PNGs as textures (test texture load in the corner)
2012-11-05 16:52:45 -08:00
Philip Rosedale
cabcbbc0d2
Latest work
2012-11-02 16:49:08 -07:00