Andrzej Kapolka
1c8b835bb8
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-08 13:15:21 -07:00
ZappoMan
ed9a7ae900
Merge pull request #247 from ZappoMan/render_voxels_optimization
...
Use different voxel persist files for local or server mode
2013-05-08 12:22:03 -07:00
ZappoMan
2f3a7f8ea8
use different voxel persist files for local or server mode
2013-05-08 12:19:27 -07:00
Andrzej Kapolka
4defeb9feb
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-08 11:56:27 -07:00
Andrzej Kapolka
c34b6df2f4
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
voxel-server/src/main.cpp
2013-05-08 11:56:03 -07:00
ZappoMan
66bf71f8d9
debug file loading
2013-05-08 11:55:00 -07:00
ZappoMan
e55661bb0f
temporarily disable add scene in voxel server
2013-05-08 11:05:43 -07:00
ZappoMan
2bae64ad87
moved voxels file to resources directory
2013-05-08 10:11:56 -07:00
ZappoMan
91438b029d
moved voxels file to resources directory
2013-05-08 10:11:42 -07:00
ZappoMan
de969891d8
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-08 01:19:35 -07:00
ZappoMan
93a5f662f7
dead code cleanup
2013-05-08 01:06:43 -07:00
Andrzej Kapolka
7c9b0d8f58
Have the voxel server push out an environment packet with its regular updates.
2013-05-07 15:10:02 -07:00
Stephen Birarda
5ccc6d6d20
prefer sizeOf to hardcoded byte
2013-05-07 12:42:10 -07:00
Stephen Birarda
4eeb1ed5b1
have interface clients tell the avatar-mixer and voxel-server what their ID is
2013-05-07 12:05:19 -07:00
ZappoMan
4b0cde0b0d
bump up voxel send rate, since client can now handle it
2013-05-06 16:09:04 -07:00
ZappoMan
2c8c6a2600
Coding standard cleanup and VoxelNode optimization
...
- make octalCode and children members private
- add public getters for accessing these private members
- change constructor to require an OctalCode for all non-roots
- default constructor constructs a rootNode
- make primary access for deleting, adding, and accessing children through public methods that do bookkeeping
- calculate AABox on voxel creation so that we don't need to do all the math when we deal with voxels
- added methods on VoxelNode for common items like getCorner(), getCenter(), getLevel(), etc
2013-05-05 10:17:02 -07:00
ZappoMan
0a488e3585
whitespace fixes
2013-05-04 09:48:11 -07:00
ZappoMan
17fbc2347b
removed signal handlers, since we weren't using them and they were segfaulting
2013-05-04 09:46:03 -07:00
ZappoMan
eb56810ef2
make default server behavior be voxel persistance
2013-05-04 09:41:45 -07:00
ZappoMan
89eefe461d
persist voxels in main loop
2013-05-04 09:20:22 -07:00
ZappoMan
286c6e0e39
fixed local domain
2013-05-03 19:36:30 -07:00
ZappoMan
48a597a9b9
added --wantVoxelPersist command line to server
2013-05-03 19:29:25 -07:00
ZappoMan
2c128fd813
added voxel-edit tool, as well as made voxel file read/write work, disabled voxel persist on server shutdown
2013-05-03 19:19:48 -07:00
ZappoMan
2fde890dc2
added save/load persistant file on server startup
2013-05-03 18:27:40 -07:00
ZappoMan
0656b5b14f
fixed acidental local mode
2013-05-03 17:12:37 -07:00
ZappoMan
e3164b3976
added read/write voxel files
2013-05-03 17:09:43 -07:00
ZappoMan
1366794bdc
added some tree methods for primitive voxel editing
2013-05-03 15:00:03 -07:00
ZappoMan
a4f2dc283d
various changes to help debug render pipeline
...
- fixing some cases where TREE_SCALE was not using constant in prep for making TREE_SCALE larger
- added createLine() to VoxelTree
- added axis lines made of voxels to scene
- added corner points made of voxels to scene
2013-05-03 09:58:52 -07:00
ZappoMan
d7e34d25bf
small tweak to corner boxes
2013-05-02 22:38:58 -07:00
ZappoMan
ac879f5809
added corner voxels to scene
2013-05-02 22:27:33 -07:00
ZappoMan
c353c1d2bf
added command line options for packets per second and debug packet sending
2013-05-02 13:18:12 -07:00
ZappoMan
7625c9a621
add command line option to debug voxel sending time
2013-05-02 12:54:26 -07:00
ZappoMan
0f48ac67b8
added timing details to voxel sending behavior
2013-05-02 12:27:16 -07:00
ZappoMan
4f86b5570f
first cut at improved render pipeline
2013-05-01 18:21:13 -07:00
ZappoMan
08c7c486d9
cr cleanup
2013-04-30 11:40:12 -07:00
ZappoMan
7fddd63a61
cr cleanup
2013-04-30 11:29:13 -07:00
ZappoMan
747cfc04be
cr cleanup
2013-04-30 11:21:50 -07:00
ZappoMan
dae3881821
removed MarkerNode
2013-04-30 11:13:41 -07:00
ZappoMan
447de68fb5
cr cleanup, remove loadBitstreamBuffer()
2013-04-30 11:06:30 -07:00
ZappoMan
33f86513ab
make new voxel distribution default behavior
2013-04-29 17:45:36 -07:00
ZappoMan
accda966d5
Add LOD culling to the server protocol.
...
- Add LOD/distance culling to VoxelTree:encodeTreeBitstreamRecursion()
and VoxelTree::searchForColoredNodesRecursion()
- added new levels to boundaryDistanceForRenderLevel()
- added more spheres to the scene to get a better sense of LOD behavior
2013-04-29 17:38:52 -07:00
ZappoMan
a638542aa0
added support for LOD scanned sendding order of voxel scene
2013-04-29 14:34:17 -07:00
ZappoMan
e7296e1851
made tempOutputBuffer static, added some comments
2013-04-29 08:00:31 -07:00
ZappoMan
781721b79c
clean up constants for voxels
2013-04-29 06:49:57 -07:00
ZappoMan
78e8751a79
use constant for 'V' header
2013-04-29 06:31:06 -07:00
ZappoMan
0ebf339562
removed some dead code
2013-04-27 15:25:44 -07:00
ZappoMan
2fb172f3db
added support for command line option to use OLD or NEW voxel distribution schemes
...
- moved new voxel distribution strategy to helper function
- added back old technique
- added "--newVoxelDistributor" command line option
- fixed crashing bug for derefrencing NULL pointer in case where server is started
which interface agents already in the domain. Basically agentData may not yet
be setup properly
- added proper cleanup support to node bag in case where voxel tree is erased
- first cut at new version of sphere scene, we will make it richer in case of
new distribution
- bumped packets per interval to 5
2013-04-27 12:12:43 -07:00
ZappoMan
d49607b4cd
fix typo
2013-04-27 12:05:38 -07:00
ZappoMan
3cb41a6fa6
re-apply agentlist changes to voxel server that somehow got smashed
2013-04-26 12:36:25 -07:00
ZappoMan
bcdc4d6654
new version of voxel encoding and sending
2013-04-26 12:16:41 -07:00
