ZappoMan
17e26b2d42
add matches()
2013-05-06 10:59:09 -07:00
ZappoMan
07f64ac639
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-06 08:39:14 -07:00
Philip Rosedale
d92b648bf4
Merge pull request #197 from ZappoMan/render_voxels_optimization
...
Voxel Persistence in server, voxel-edit tool for creating voxel files, new VoxelTree features
2013-05-05 21:33:17 -07:00
ZappoMan
af6f51527a
short circuit shouldRender logic in treeToArrays()
2013-05-05 10:34:09 -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
34982227e4
removed color reaveraging from readNodeData() because server will already send averages
2013-05-04 21:58:16 -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
6a32424fb2
make readFromFileV2() return bool for file exists
2013-05-04 09:41:10 -07:00
ZappoMan
89eefe461d
persist voxels in main loop
2013-05-04 09:20:22 -07:00
ZappoMan
c1847a7511
set dirty bit on tree in a couple new places
2013-05-04 09:19:46 -07:00
ZappoMan
3ed19ccb91
fixed comment
2013-05-04 08:28:00 -07:00
ZappoMan
24dee12d67
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-04 08:25:35 -07:00
ZappoMan
2dbf6f85cf
Merge pull request #199 from ZappoMan/master
...
fixed bug in case of bogus avatar position file
2013-05-04 08:24:04 -07:00
ZappoMan
7d1e271c39
fix bug in bogus avatar data file
2013-05-04 08:23:06 -07:00
ZappoMan
5253485261
added TREE_SCALE to default camera farClip
2013-05-04 07:46:42 -07:00
ZappoMan
1967526675
adding command options
2013-05-03 19:36:40 -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
f93bc98ec7
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-03 17:11:41 -07:00
ZappoMan
e3164b3976
added read/write voxel files
2013-05-03 17:09:43 -07:00
birarda
33b4159a95
Merge pull request #194 from ey6es/master
...
Fix for starfield rendering on OS X.
2013-05-03 16:06:24 -07:00
Andrzej Kapolka
6389f0bc13
OK, I give up.
2013-05-03 15:49:31 -07:00
Andrzej Kapolka
34a5293b13
Added newline at end of file; just trying to get this file out of the diff.
2013-05-03 15:48:34 -07:00
Andrzej Kapolka
861e78f161
Removed my temporary fix for pairing server bits.
2013-05-03 15:47:03 -07:00
Andrzej Kapolka
bc0c1cf5f9
Fixed bug with rendering stars on OS X: was using some weird extension on
...
Apple rather than standard VBOs.
2013-05-03 15:44:51 -07:00
Andrzej Kapolka
c1a3478954
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-03 15:44:14 -07:00
Philip Rosedale
a31098ac3c
Merge pull request #193 from birarda/avatar-file
...
store avatar position and yaw in a local file
2013-05-03 15:13:45 -07:00
Stephen Birarda
bd3c902b68
remove logging of audio stats
2013-05-03 15:13:38 -07:00
ZappoMan
f4099349e8
change to encodeTreeBitstreamRecursion() to allow calling without viewFrustum
2013-05-03 15:13:00 -07:00
Stephen Birarda
31e9c18346
couple of extra line deletions in main.cpp
2013-05-03 15:09:44 -07:00
Stephen Birarda
da93b596de
some deletion cleanup in main.cpp
2013-05-03 15:08:48 -07:00
Stephen Birarda
1a8564f9d9
store avatar position and yaw in file to restore on relaunch
2013-05-03 15:05:28 -07:00
ZappoMan
1366794bdc
added some tree methods for primitive voxel editing
2013-05-03 15:00:03 -07:00
Andrzej Kapolka
d28356e776
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-03 14:55:13 -07:00
Stephen Birarda
90a08b4dd8
cleanup in Audio and Util
2013-05-03 14:45:47 -07:00
birarda
4f74e5a6e2
Merge pull request #192 from birarda/pairing
...
include cstring for use of strlen
2013-05-03 14:42:33 -07:00
Stephen Birarda
82db78cc67
include cstring for use of strlen
2013-05-03 14:41:56 -07:00
ZappoMan
e9d556419f
got rid of some dead code
2013-05-03 14:39:00 -07:00
birarda
f5bbc981c1
Merge pull request #191 from birarda/pairing
...
add missing header for sscanf and printf
2013-05-03 13:01:41 -07:00
Stephen Birarda
2ab7bc0d8a
add cstdio for sscanf and printf
2013-05-03 13:01:02 -07:00
Andrzej Kapolka
8923057d0e
Compile fix, need to use integer GL uniform.
2013-05-03 13:00:48 -07:00
birarda
af44e42d74
Merge pull request #190 from birarda/pairing
...
fix port on pairing server
2013-05-03 12:35:14 -07:00
Stephen Birarda
597c8336bd
change the pairing server listen port to 7247
2013-05-03 12:34:29 -07:00
ZappoMan
8e7dd4ba8f
Merge pull request #187 from ey6es/master
...
Fix for Oculus rendering: we need to resize the render texture when the display is resized.
2013-05-03 12:24:54 -07:00
ZappoMan
f78c59f828
Merge pull request #189 from birarda/pairing
...
basic version of the pairing server
2013-05-03 12:24:29 -07:00
