ZappoMan
94754963ad
Merge branch 'master' of https://github.com/worklist/hifi
2013-03-29 09:27:37 -07:00
ZappoMan
8524c6c4b6
debug
2013-03-29 09:27:23 -07:00
Stephen Birarda
0388218a5d
Merge branch 'master' of github.com:worklist/hifi
2013-03-29 09:17:46 -07:00
Stephen Birarda
3be5d60fc4
comment out threshold frames to hopefully reduce clicks
2013-03-29 09:17:33 -07:00
ZappoMan
f7df625439
tweak
2013-03-29 09:12:52 -07:00
ZappoMan
9e308f4821
added debugging
2013-03-29 08:59:50 -07:00
ZappoMan
e920a6e873
tweak
2013-03-29 08:53:28 -07:00
Stephen Birarda
1767f2b052
don't send or parse attenuation for now
2013-03-29 08:36:33 -07:00
Stephen Birarda
01d5bdd68c
Merge branch 'master' of github.com:worklist/hifi
2013-03-29 08:30:48 -07:00
Stephen Birarda
431cbec734
remove some of the explicit floats to hunt down digital noise
2013-03-29 08:29:43 -07:00
ZappoMan
565b6f877c
Merge branch 'master' of https://github.com/worklist/hifi
2013-03-29 08:24:30 -07:00
ZappoMan
e580369a93
tweak to shpere
2013-03-29 08:24:08 -07:00
Stephen Birarda
f0f0df2cf3
Merge branch 'master' of github.com:worklist/hifi
2013-03-29 08:20:52 -07:00
Stephen Birarda
ffd2f61420
don't use distance attenuation in audio mixer for now
2013-03-29 08:20:37 -07:00
tosh
cf00802e64
consistently adjusts comment on include guard
2013-03-29 16:03:31 +01:00
ZappoMan
c6a667af61
added Scene mode to voxel server
2013-03-29 07:27:46 -07:00
tosh
8f458b0bea
changes case/naming to agreed conventions
2013-03-29 13:41:33 +01:00
tosh
bdf358b0fb
removes some leftover debug code
2013-03-29 13:39:46 +01:00
tosh
1eb904ca59
also changes case/naming to agreed conventions in the utility components
2013-03-29 11:54:09 +01:00
tosh
2d997a9a8d
inserts synchronization primitives
2013-03-29 11:43:04 +01: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
tosh
2b3263e019
splits up Stars.cpp into a module of multiple files
2013-03-29 10:53:30 +01:00
Stephen Birarda
b50f10fde4
Merge branch 'master' of github.com:worklist/hifi
2013-03-29 02:46:33 -07:00
Stephen Birarda
0a9183e05b
small change to render levels
2013-03-29 02:46:22 -07:00
tosh
8300646b33
allows new C++ standard features
2013-03-29 10:42:36 +01:00
tosh
b4f2b04241
allows qualified inclusion in subdirectories
2013-03-29 10:24:14 +01:00
ZappoMan
00787a31d6
Added VoxelNode::collapseIdenticalLeaves()
...
Fixed small bug in setColorFromAverageOfChildren()
Changed sphere color randomization to be more dramatic
2013-03-28 23:38:34 -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
tosh
df7f3942e1
straightens data pipeline and several bugs after exhaustive testing
2013-03-29 01:08:24 +01:00
tosh
0b183cf7a0
adds function to convert between angle units
2013-03-29 00:30:57 +01:00
Stephen Birarda
f85abe53ef
add a method to VoxelTree to reaverage the voxel colors
2013-03-28 16:22:37 -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
Stephen Birarda
eec16a8eb5
recreate the MarkerNode tree on agent copy
2013-03-28 15:28:55 -07:00
ZappoMan
ebceaf06dc
added --domain command line option to interface
2013-03-28 15:22:10 -07:00
Stephen Birarda
3ead1a5827
merge with brad's sphere/load file changes
2013-03-28 14:46:44 -07:00
Stephen Birarda
1b3c15a701
Merge remote-tracking branch 'origin/master'
2013-03-28 14:39:59 -07:00
Stephen Birarda
6d8ff8cc05
use a thread to distribute voxels to clients on a clock
2013-03-28 14:36:21 -07:00
Stephen Birarda
287775e0f9
change the loadBitstreamBuffer method to accommodate absence of childMask variable
2013-03-28 14:35:45 -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
Stephen Birarda
1f98929503
remove the childMask member variable VoxelNode
2013-03-28 14:34:10 -07:00
Stephen Birarda
f469ec8e2e
remove the notion of last sent level from VoxelAgentData
2013-03-28 14:33:26 -07:00
Stephen Birarda
0fb244c2bd
don't delete an agent if the data is concurrently being used
2013-03-28 14:33:04 -07:00
ZappoMan
055c46c60f
add spheres from command line
2013-03-28 14:32:53 -07:00
Stephen Birarda
de3f5edd69
add a mutex to the agent so we don't delete it when using it
2013-03-28 14:32:20 -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