Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 04:41:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
946 commits 76 branches 59 tags 1.2 GiB
Commit graph

46 commits

Author SHA1 Message Date
tosh
2341af271b Merge branch 'master' of git://github.com/worklist/hifi into 19188 
Conflicts:
	interface/CMakeLists.txt
	interface/src/main.cpp
	shared/src/SharedUtil.cpp
	shared/src/SharedUtil.h
	shared/src/VoxelTree.cpp
 2013-04-03 22:44:22 +02:00
ZappoMan
9220ba3ee5 Added agentTypes to AgentList::broadcastToAgents() 
Make voxel server rebroadcast "remove voxel" messages to all it's connected heads
Cleaned up processing of Remove voxel messages to live in VoxelTree
 2013-04-03 12:42:24 -07:00
ZappoMan
407fa95195 more delete voxel debugging, call reaverage colors on root node 2013-04-03 11:14:00 -07:00
ZappoMan
8988796285 more voxel delete debugging, use memcmp() instead of == 2013-04-03 09:38:11 -07:00
ZappoMan
f9dc41011a added call to reaverageVoxelColors() after deleting a voxel 2013-04-03 09:23:22 -07:00
ZappoMan
8c9eff82b2 More delete voxel debugging 2013-04-03 09:09:51 -07:00
ZappoMan
eda4657ba9 adding debugging to delete node from tree 2013-04-02 14:55:03 -07:00
ZappoMan
804943e2fb Added deleteVoxelCodeFromTree() and 'R' command to voxel server 
Also added extra optional parameter to nodeForOctalCode() to return the parent node on node lookup
 2013-04-02 14:26:54 -07:00
ZappoMan
fa60bdeb48 tweaks to default voxel server model for demo 2013-03-29 11:21:03 -07:00
Stephen Birarda
c6b38f0f39 fix the childrenCollapsed assignment 2013-03-29 11:11:05 -07:00
Stephen Birarda
271c41ce16 collapse the identical leaves again 2013-03-29 10:59:10 -07:00
Stephen Birarda
2df808fba5 explicitly set hasChildren to false 2013-03-29 10:58:29 -07:00
Stephen Birarda
c01cf4db53 Merge branch 'master' of github.com:worklist/hifi 2013-03-29 10:42:49 -07:00
Stephen Birarda
2729d0dfb6 verbose debugging to track down node creation problem 2013-03-29 10:42:04 -07:00
ZappoMan
8524c6c4b6 debug 2013-03-29 09:27:23 -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
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
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
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
tosh
2c40673e04 fixes #includes 2013-03-24 14:04:08 +01: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
Stephen Birarda
c51b4e3311 add leavesWrittenToBitstream member variable to VoxelTree for debug 2013-03-22 16:21:45 -07:00
Stephen Birarda
c40800db8b send back a 10 level voxel tree from server 2013-03-22 15:32:36 -07: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
d2da9000f4 return correct nodeForOctalCode 2013-03-20 16:21:22 -07:00
Stephen Birarda
6ce4ed2d40 add cstring for use of memcpy 2013-03-20 13:45:48 -07:00
Stephen Birarda
1abce28310 use int instead of forced 8-bit types where appropriate 2013-03-20 13:44:09 -07:00
Stephen Birarda
65e9626e72 remove superfluous debugging 2013-03-20 13:24:43 -07:00
Stephen Birarda
76f7f68526 fix voxel system to send new bistream format, add helpers to VoxelNode class 2013-03-19 15:52:51 -07:00
Stephen Birarda
807377ef97 change bitstream load function to return stateless MTU sized packets 2013-03-18 13:16:14 -07:00
Stephen Birarda
2c0565e358 prepend bitstream packets with a V 2013-03-15 14:33:45 -07:00
Stephen Birarda
3e36ba9265 use char when unsigned char is not explicitly required 2013-03-15 12:26:34 -07:00
Stephen Birarda
763c09f562 add VoxelNode and VoxelTree classes for shared tree representation 2013-03-14 16:16:01 -07:00