ZappoMan
33fc9f5389
fixed partial VBO updates
2013-05-09 17:01:20 -07:00
ZappoMan
7b22300164
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-09 14:39:41 -07:00
Jeffrey Ventrella
3ba93397bd
fixed a bug in menu clicking
2013-05-09 14:37:13 -07:00
ZappoMan
3aa862fa34
removed some debug messages
2013-05-09 14:19:42 -07:00
ZappoMan
c73d4ddfa4
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-09 14:06:42 -07:00
ZappoMan
f490f3ed53
More work on partial VBO updates still not working 100% correctly
2013-05-09 14:04:08 -07:00
Jeffrey Ventrella
8ecfbce15e
fixed some small formatting things
2013-05-09 14:00:40 -07:00
Jeffrey Ventrella
14d47d87d8
thingy
2013-05-09 13:52:03 -07:00
Jeffrey Ventrella
14b943f1f7
added lean code for Philip...
2013-05-09 13:48:05 -07:00
Jeffrey Ventrella
b61a9687f8
thingy
2013-05-09 13:14:08 -07:00
Jeffrey Ventrella
17c61c88c7
cleaned up avatar slow-down upon nearness; fixed mouse pressed bug;
2013-05-09 13:04:22 -07:00
Jeffrey Ventrella
7cfc9844a3
Merge remote-tracking branch 'upstream/master'
2013-05-09 11:22:55 -07:00
Jeffrey Ventrella
e923f5446d
clean up
2013-05-09 11:22:24 -07:00
ZappoMan
a476c8362c
Merge pull request #254 from PhilipRosedale/master
...
Fixed bug with bodies springing into view on startup
2013-05-09 11:01:33 -07:00
Andrzej Kapolka
dcd42096a5
Tabs -> spaces.
2013-05-09 10:56:08 -07:00
Andrzej Kapolka
7ff8b84f4c
Return the box face, as well as the distance, from the ray intersection test.
...
Use it to determine which voxel neighbor we create when adding.
2013-05-09 10:46:52 -07:00
Andrzej Kapolka
2b9c2ca9a2
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-09 10:42:59 -07:00
Stephen Birarda
1c073c1c71
correct the accelerometer sensitivity
2013-05-09 10:38:02 -07:00
Stephen Birarda
f95ba24f21
also read accelerometer data from invensense boards
2013-05-09 10:34:40 -07:00
Andrzej Kapolka
4a0657fead
Set up the lights after applying the camera transform so that they will be in
...
world, not view, space.
2013-05-09 10:29:15 -07:00
ZappoMan
a08d89a074
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-09 10:28:05 -07:00
ZappoMan
655f14121d
Voxel Render Optimization - using blended VBO update strategy
...
- Fixed a bug in updateNodeInArraysAsFullVBO() that caused blended strategy
to not work properly.
- Implement strategy to usually update only the portion of the VBOs that
have changed, unless nodes have been removed, and then update the full
VBO. This siginificantly improves treeToArrays() performance
- Still to do implement partial strategy for copy buffers and update GPU
2013-05-09 10:25:12 -07:00
Andrzej Kapolka
0cff127082
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-09 09:56:58 -07:00
Andrzej Kapolka
785e55e06f
Working on voxel editing.
2013-05-09 09:56:35 -07:00
Jeffrey Ventrella
a75f655e40
Merge remote-tracking branch 'upstream/master'
2013-05-08 22:46:57 -07:00
Jeffrey Ventrella
0ac2765b09
cleaned up a few small code thingies; added a check for where avatar velocity updates avatar position;
2013-05-08 22:45:28 -07:00
Philip Rosedale
39c35ea5c4
spacing
2013-05-08 21:19:33 -07:00
Philip Rosedale
5db7b74c1e
spacing
2013-05-08 21:19:15 -07:00
Philip Rosedale
2bf9b3e6fd
Fixed problem with springy body repositioning on startup
2013-05-08 21:18:10 -07:00
ZappoMan
bb65137b7e
Optimized performance of newTreeToArrays() by implementing blended VBO strategy
...
- Introduced concept of sometimes only updating the new/changed part of the VBO
while other times updating the full VBO. This allows us to get the speed
advantage of only partial VBO updates when nodes haven't been removed
- Some debugging output related to _alwaysRenderFullVBO
- added cleanupRemovedVoxels() which actually deletes the nodes that were
previously removed (fixes a memory leak!!)
2013-05-08 20:33:41 -07:00
Philip Rosedale
408a21b515
Fixed Eve's missing mouth and the bad triangles!
2013-05-08 20:26:38 -07:00
Philip Rosedale
14f0ecdc51
Lowered avatar drag to allow faster flight, increased drag when near others
2013-05-08 20:07:27 -07:00
Philip Rosedale
4bb8f49132
Added new cooler movement sound that is velocity sensitive.
2013-05-08 20:02:29 -07:00
Philip Rosedale
ddc97a6ac9
Merge remote-tracking branch 'upstream/master'
2013-05-08 19:36:45 -07:00
Philip Rosedale
76c5a74876
Added gyro pitch to view, moved onscreen displays around to look nicer.
2013-05-08 19:35:48 -07:00
Jeffrey Ventrella
fc549b73bd
fixed merge conflict
2013-05-08 19:25:23 -07:00
Jeffrey Ventrella
bbd85664d6
Merge remote-tracking branch 'upstream/master'
2013-05-08 19:24:07 -07:00
Jeffrey Ventrella
7a24c50063
put orientation back in avatar folder (this should be put in a more logical place at some point) - also did some work on avatar renderer
2013-05-08 19:22:21 -07:00
ZappoMan
5cfbcc5caa
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-08 18:06:30 -07:00
ZappoMan
244b4a17f7
lowered voxel count so Ryan can run, and handle too many voxels case slightly more gracefully than crashing
2013-05-08 18:06:13 -07:00
ZappoMan
bf81587e1b
Merge pull request #243 from PhilipRosedale/master
...
Procedural noise support added on client, adds a bit of noise when moving
2013-05-08 17:44:15 -07:00
Philip Rosedale
08c48bf6a7
Merge remote-tracking branch 'upstream/master'
2013-05-08 17:27:31 -07:00
Philip Rosedale
5052f4af5e
Added render option for avatars, code cleanup.
2013-05-08 17:26:44 -07:00
Philip Rosedale
ebf06187b7
Merge remote-tracking branch 'upstream/master'
2013-05-08 16:16:27 -07:00
ZappoMan
9bde92fe78
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-08 15:35:09 -07:00
ZappoMan
4e789dcfbf
Merge pull request #250 from ey6es/master
...
Directory fix for shaders on OS X.
2013-05-08 15:34:55 -07:00
Andrzej Kapolka
da822e5299
We need to adjust the directory on OS X before we attempt to load the shaders.
2013-05-08 15:33:39 -07:00
ZappoMan
b35c88029e
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-08 15:07:24 -07:00
ZappoMan
4301506f0c
Merge pull request #249 from ey6es/master
...
Fix for build error on OS X.
2013-05-08 15:07:08 -07:00
Andrzej Kapolka
1f58e28b36
Need the ARB suffix on this. I'm surprised it compiled for me!
2013-05-08 15:05:35 -07:00
