ZappoMan
f859d8ed9c
Added PaintMode, toggle for stars, etc.
2013-04-03 22:42:02 -07:00
Stephen Birarda
320fa9e5c8
link curl to shared library, not interface
2013-04-03 15:14:35 -07:00
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
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
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
Stephen Birarda
1767f2b052
don't send or parse attenuation for now
2013-03-29 08:36:33 -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
1eb904ca59
also changes case/naming to agreed conventions in the utility components
2013-03-29 11:54:09 +01: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
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
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
tosh
dde8b7dee5
fixes horizontal angle normalization
2013-03-27 17:00:21 +01:00
tosh
f98cd10485
straightens potential range issues for wide integers
2013-03-27 15:47:39 +01:00
tosh
5bb55f7fc4
improves naming consistency (mostly member variable prefixes)
2013-03-27 11:53:01 +01:00
tosh
ecd64d3244
improves naming consistency (mostly member variable prefixes)
2013-03-27 11:49:43 +01:00
tosh
0a2cd9537b
fixes broken error handling
2013-03-27 06:39:27 +01:00
tosh
a0ef60efe7
removes duplicate local declarations
2013-03-27 04:49:40 +01:00
tosh
bec1529cac
removes duplicate default argument
2013-03-27 04:43:12 +01:00
tosh
ed8a14ee09
adds flood fill algorithm
2013-03-27 03:33:51 +01:00
tosh
403c9d9ce5
naming and such...
2013-03-27 03:32:53 +01:00
Stephen Birarda
bbb0e9cea3
move MarkerNode to shared to hook with VoxelTree
2013-03-26 14:10:06 -07:00
