birarda
2076dcc67f
Merge pull request #196 from Ventrella/master
...
fixed physics bug and added avatar shadow
2013-05-06 11:39:12 -07:00
Jeffrey Ventrella
fcf37352d4
thingy
2013-05-06 11:32:04 -07:00
Jeffrey Ventrella
40213dfedd
Merge remote-tracking branch 'upstream/master'
2013-05-06 11:31:33 -07:00
Jeffrey Ventrella
5c7fd0fe7d
a few small formatting and glitch fixes
2013-05-06 11:29:18 -07:00
ZappoMan
e0d040a73b
added removeChildAtIndex() which removes a node, but doesn't delete it
2013-05-06 11:02:28 -07:00
ZappoMan
17b137cc53
changed VoxelNodeBag to just compare pointers, since we don't really care about ordering the bag
2013-05-06 11:01:29 -07:00
ZappoMan
16b93f8c92
added PerformanceWarning class
2013-05-06 11:00:01 -07:00
ZappoMan
17e26b2d42
add matches()
2013-05-06 10:59:09 -07:00
ZappoMan
83c8ac6111
Merge pull request #198 from ey6es/master
...
Support for generating pick rays and finding intersections between rays and voxel nodes.
2013-05-06 10:55:15 -07:00
ZappoMan
ab7b2f4188
Merge pull request #195 from birarda/invensense
...
a basic setup to connect to invensense gyros
2013-05-06 10:41:20 -07:00
Stephen Birarda
37f1360542
fix spacing for gravity vector
2013-05-06 10:39:36 -07:00
Stephen Birarda
928beac8e0
Merge branch 'master' of github.com:worklist/hifi into invensense
2013-05-06 10:38:53 -07:00
Andrzej Kapolka
4d33c462fe
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
libraries/voxels/src/VoxelTree.h
2013-05-06 09:45:57 -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
Andrzej Kapolka
aff465b17b
Missed a spot with the conversion from pointers to references.
2013-05-04 07:59:45 -07:00
Andrzej Kapolka
34565a4956
Pointers to references for in/out parameters, renamed line parameter to more
...
descriptive "distance."
2013-05-04 07:56:30 -07:00
ZappoMan
5253485261
added TREE_SCALE to default camera farClip
2013-05-04 07:46:42 -07:00
Andrzej Kapolka
ff4e21e504
Remaining pick bits.
2013-05-03 20:12:46 -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
Andrzej Kapolka
f8cbe34e07
Added basic ray intersection testing to VoxelTree.
2013-05-03 17:27:57 -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
Jeffrey Ventrella
f8762c5e37
added avatar data file stuff that got lost during a merge or something
2013-05-03 16:58:52 -07:00
Jeffrey Ventrella
707d513dac
Merge remote-tracking branch 'upstream/master'
2013-05-03 16:12:01 -07:00
Jeffrey Ventrella
cb8e68f300
fixed a physics bug in avatar body spring (forgot to use deltaTime) - and adjusted various physics constants accordingly.
2013-05-03 16:11:35 -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
Stephen Birarda
66e2771135
some cleanup in interface main
2013-05-03 15:58:55 -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
