Commit graph

304 commits

Author SHA1 Message Date
Stephen Birarda
f38df5579b remove the VBO transfer frequency tests 2013-04-01 15:12:39 -07:00
Stephen Birarda
3135d50ca9 drop redraw frequency to 0.5s 2013-04-01 15:08:20 -07:00
Stephen Birarda
793ac841f2 only allow VBO re-transfer every 5 seconds for test 2013-04-01 14:08:42 -07:00
Stephen Birarda
a0c5dcb3ca correct number of leading bytes for addition of attenuation byte 2013-04-01 13:03:46 -07:00
Stephen Birarda
124fecf8c9 Revert "don't send or parse attenuation for now"
This reverts commit 1767f2b052.
2013-04-01 12:28:51 -07:00
ZappoMan
ad0b2f024b Fixed a couple of complier warnings, and added a new PerfStat class for monitoring runtime performance 2013-03-31 20:43:23 -07:00
Stephen Birarda
2de86bfa92 Revert "allow the bad triangles to render"
This reverts commit b5d1ae1a36.
2013-03-29 16:22:10 -07:00
Stephen Birarda
b5d1ae1a36 allow the bad triangles to render 2013-03-29 15:18:34 -07:00
Stephen Birarda
f0e457081b temporarily disable walking noises for demo 2013-03-29 11:34:58 -07:00
Stephen Birarda
3be5d60fc4 comment out threshold frames to hopefully reduce clicks 2013-03-29 09:17:33 -07:00
Stephen Birarda
1767f2b052 don't send or parse attenuation for now 2013-03-29 08:36:33 -07:00
Stephen Birarda
3186254a93 initial LOD drop off when moving back 2013-03-29 03:42:54 -07:00
Stephen Birarda
80170bd4c4 don't do gross things if data is being written while GPU is copying it 2013-03-29 03:12:11 -07:00
ZappoMan
270f77799d added random color options, cleaned up compiler warnings, add reAverageParentColors when modifying voxel tree 2013-03-28 17:21:47 -07:00
Stephen Birarda
a7f74a9f40 Merge branch 'master' of github.com:worklist/hifi 2013-03-28 15:30:40 -07:00
Stephen Birarda
f109916125 move the voxel tree back to origin 2013-03-28 15:30:14 -07:00
ZappoMan
ebceaf06dc added --domain command line option to interface 2013-03-28 15:22:10 -07:00
Stephen Birarda
1b3c15a701 Merge remote-tracking branch 'origin/master' 2013-03-28 14:39:59 -07:00
Stephen Birarda
9cd314d3c4 move the voxel system to 40,0,40, only re-render on new voxels 2013-03-28 14:35:02 -07:00
ZappoMan
6ec9949098 Add --local support to interface command line 2013-03-28 14:03:16 -07:00
ZappoMan
ed6195f3a0 Merge branch 'master' of https://github.com/worklist/hifi 2013-03-28 14:00:58 -07:00
ZappoMan
fe8b6f7d63 * Moved load file and create sphere from VoxelSystem to VoxelTree
* Added --local command line support to domain and voxel servers so that
  you can run them locally without recompiling.
* made command line option parsing more cross platform
* added --NoColorRandomizer to interface when loading local models
* added -i file load support to voxel server to load in a preexisting model at launch
* added --NoRandomVoxelSheet to voxel server to NOT create the built in voxel sheet
* added first cut at 'I' command from clients to voxel server to insert voxels into voxel tree
* changed ambient light settings in interface to not be so aggressive
* added randInIntRange() helper to SharedUtils
* tweat to pruneTree() to also repair child mask
* some coding standard refactoring
2013-03-28 13:54:28 -07:00
Stephen Birarda
a41b003582 perform proper verification for creation of new sphere 2013-03-28 11:47:23 -07:00
Stephen Birarda
084b77be50 NULL sphere pointer on Head copy 2013-03-28 11:37:49 -07:00
Stephen Birarda
d2a8da890f don't make the eye sphere a global object 2013-03-28 11:36:41 -07:00
Philip Rosedale
0b044d01d5 always be making random left/right/mouth eye contact 2013-03-27 16:00:40 -07:00
Philip Rosedale
c3bc43f48e Merge remote-tracking branch 'origin' 2013-03-27 15:55:13 -07:00
Philip Rosedale
c0cb88e21b Added keyboard controls for smooth rotation, more junk removed from main.cpp 2013-03-27 15:54:54 -07:00
Stephen Birarda
17904ee069 remove .mm include for interface now that menu is gone 2013-03-27 11:29:13 -07:00
Philip Rosedale
ef9c704bb1 Merge remote-tracking branch 'origin' 2013-03-26 17:33:21 -07:00
Philip Rosedale
642b64dfd6 First commit to improve avatar movement 2013-03-26 17:32:54 -07:00
Stephen Birarda
7c1470c07e remove debug send to 10.0.0.10 2013-03-26 16:22:42 -07:00
Philip Rosedale
e0ee6c269a Added thrust and velocity to avatar head, first part of movement improvements 2013-03-26 11:53:57 -07:00
Stephen Birarda
bb14a90f86 remove constants re-added on merge 2013-03-25 23:00:36 -07:00
ZappoMan
23c6a9017c Merge branch 'master' of https://github.com/worklist/hifi
Conflicts:
	interface/src/main.cpp
	shared/src/SharedUtil.cpp
	shared/src/SharedUtil.h
2013-03-25 22:51:59 -07:00
ZappoMan
2f6b2466ea Fixed getCommandOption and cmOptionExists to be more porable
added support for --NoConnect command line option to test running without connecting
added pruneTree to VoxelTree
2013-03-25 22:39:24 -07:00
Stephen Birarda
d76fafda67 remove call that included getCmdOption 2013-03-25 16:45:49 -07:00
Stephen Birarda
507b6e0064 use abstracted DS check in method from AgentList 2013-03-25 16:24:14 -07:00
Stephen Birarda
c8190b95aa remove un-needed AgentList include from VoxelSystem 2013-03-25 16:23:42 -07:00
Stephen Birarda
896047d2aa have the mixer additionally attenuate sources based on extra byte 2013-03-25 12:05:32 -07:00
ZappoMan
0711539fc6 Changed colors of spheres to be a gradient along phi between to random colors
this gives the spheres a little bit more natural look.
Also increased the level of detail (smaller voxels)
2013-03-24 13:00:23 -07:00
ZappoMan
ef8694dd60 1) Added createSphere() to VoxelSystem to create a sphere
2) Added pointToVoxel() to SharedUtils, this will give you a voxel code
   given x,y,z,s,r,g,b
3) Added '.' keyboard interface to create a random sphere in the local
   voxel system
2013-03-24 10:06:43 -07:00
ZappoMan
8ecc0d53ad Added a utility to VoxelSystem for loading voxels from a local file
Also added a couple shared utility functions for reading command
line options (since that's how you can load a local file at this
point).
2013-03-23 21:59:27 -07:00
Stephen Birarda
61f23a2d0f add a new walk sound 2013-03-22 14:06:20 -07:00
Stephen Birarda
6346a14cb5 remove voxelServerAddCallback 2013-03-22 10:48:41 -07:00
Stephen Birarda
3fa0439f29 add method to SharedUtil to chdir to OS X bundle resources 2013-03-22 10:35:55 -07:00
Stephen Birarda
6712d23cd1 push and pop the matrix for voxel system draw 2013-03-21 17:12:50 -07:00
Stephen Birarda
5f052d7c9e scale back heads after voxel system draw 2013-03-21 17:03:52 -07:00
Stephen Birarda
95926cb7fc conditional chdir for OS X resources, revert windows Head changes 2013-03-21 17:02:41 -07:00
Stephen Birarda
e2a28b48db revert Head.cpp to earlier commit to confirm source of direction changes 2013-03-21 16:51:45 -07:00