Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-15 10:57:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
849 commits 25 branches 28 tags 1.2 GiB
Commit graph

148 commits

Author SHA1 Message Date
Stephen Birarda
1767f2b052 don't send or parse attenuation for now 2013-03-29 08:36:33 -07:00
ZappoMan
c6a667af61 added Scene mode to voxel server 2013-03-29 07:27:46 -07:00
Stephen Birarda
3186254a93 initial LOD drop off when moving back 2013-03-29 03:42:54 -07: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
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
Stephen Birarda
f85abe53ef add a method to VoxelTree to reaverage the voxel colors 2013-03-28 16:22:37 -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
287775e0f9 change the loadBitstreamBuffer method to accommodate absence of childMask variable 2013-03-28 14:35:45 -07:00
Stephen Birarda
1f98929503 remove the childMask member variable VoxelNode 2013-03-28 14:34:10 -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
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
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
0820900365 fix incorrect name for member variable in MarkerNode 2013-03-27 18:51:11 -07:00
Stephen Birarda
bbb0e9cea3 move MarkerNode to shared to hook with VoxelTree 2013-03-26 14:10:06 -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
ZappoMan
08413cfc3d fixed build issue 2013-03-25 22:57:15 -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
a2b05d5f14 include stdlib for use of atoi 2013-03-25 16:43:31 -07:00
Stephen Birarda
3df93804d1 include cstring for memcpy in AgentList 2013-03-25 16:41:42 -07:00
Stephen Birarda
1e2876ce75 include stdint for use of uint16_t 2013-03-25 16:40:19 -07:00
Stephen Birarda
eb185f2ce8 remove command options methods from SharedUtil that crash Jenkins 2013-03-25 16:37:24 -07:00
Stephen Birarda
9eac649268 merge Leo's ID additions to DS 2013-03-25 16:27:25 -07:00
Stephen Birarda
3ca5263582 abstract check in with DS to AgentList 2013-03-25 16:23:13 -07:00
Leonardo Murillo
63589985f4 Removing unneeded memcpy 2013-03-25 16:12:51 -06:00
Leonardo Murillo
cb84b7573b Getting rid of unused declaration 2013-03-25 15:56:22 -06:00
Leonardo Murillo
54a946ee80 Splitting line, adding agentId to copy constructor and swap 2013-03-25 15:54:08 -06:00
Leonardo Murillo
fc382997bd Merge branch 'master' of github.com:/worklist/hifi into 19179 2013-03-25 15:13:39 -06:00
Stephen Birarda
896047d2aa have the mixer additionally attenuate sources based on extra byte 2013-03-25 12:05:32 -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
c9e16994f4 fix printTreeForDebugging instead of addition of repairChildMasks 2013-03-22 18:26:05 -07:00
Stephen Birarda
f435a09673 add method to repair child masks after adding randomly placed voxels 2013-03-22 18:19:37 -07:00
Stephen Birarda
c641f12693 some refactoring in for readCodeColorBufferToTree 2013-03-22 17:59:54 -07:00
Leonardo Murillo
bd18aeefe4 Couple of quick changes 2013-03-22 17:39:07 -06:00
Stephen Birarda
c51b4e3311 add leavesWrittenToBitstream member variable to VoxelTree for debug 2013-03-22 16:21:45 -07:00
Leonardo Murillo
be96f1cdd0 No longer need exists 2013-03-22 16:58:52 -06:00
Leonardo Murillo
61c866a34c Handling increase of id smarter 2013-03-22 16:57:30 -06:00
Stephen Birarda
c40800db8b send back a 10 level voxel tree from server 2013-03-22 15:32:36 -07:00
Leonardo Murillo
e5b0843212 Resolving conflicts 2013-03-22 13:40:16 -06:00
Leonardo Murillo
dc92f0be42 More agent IDing around the code 2013-03-22 13:34:35 -06:00
Stephen Birarda
3518ee15a8 add readCodeColorBufferToTree method to VoxelTree for point cloud render 2013-03-22 12:32:57 -07:00
Stephen Birarda
8ec5298c4a add groundwork for LOD specific transmissions from VS 2013-03-22 12:01:30 -07:00
Stephen Birarda
bb47967126 send head data to VS for level differentiation, remove the VS add callback 2013-03-22 10:46:37 -07:00
Leonardo Murillo
f604b574c5 Merge branch 'master' of github.com:/worklist/hifi into 19179 2013-03-22 11:46:36 -06:00
Leonardo Murillo
a4f6d85676 Fixing definitions 2013-03-22 11:45:19 -06:00
Leonardo Murillo
e3d842dff7 Packing agent ID on domain broadcast packet 2013-03-22 11:43:16 -06:00