Jeffrey Ventrella
470349d662
made avatars taller an fixed proportions a bit
2013-05-09 23:31:45 -07:00
ZappoMan
6b5eceeae1
Merge pull request #269 from Ventrella/master
...
improved camera first person mode and cleaned up some camera code
2013-05-09 22:26:59 -07:00
ZappoMan
f0b4dde388
Merge pull request #267 from PhilipRosedale/master
...
Stars meridians removed and count reduced, some log cleanup
2013-05-09 22:25:56 -07:00
Philip Rosedale
8521a9e146
added one more log line
2013-05-09 22:23:15 -07:00
ZappoMan
4fe93af5cd
create and delete voxels locally
2013-05-09 22:22:32 -07:00
Jeffrey Ventrella
751254ab56
set default camera mode back to third person
2013-05-09 22:22:21 -07:00
ZappoMan
bd3ea6ef65
create and delete voxels locally
2013-05-09 22:20:13 -07:00
Jeffrey Ventrella
6254a6886f
cleaned up camera code and improved first person mode
2013-05-09 22:11:33 -07:00
Philip Rosedale
eefd0c36f1
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-09 22:06:57 -07:00
Philip Rosedale
527b65f6a4
Log cleanup. removed star field meridians.
2013-05-09 22:06:32 -07:00
Jeffrey Ventrella
697e0d0cbe
fixed spacing issue
2013-05-09 17:51:05 -07:00
Jeffrey Ventrella
bca5436fab
indentation
2013-05-09 17:36:39 -07:00
Jeffrey Ventrella
6dfa20976d
Merge remote-tracking branch 'upstream/master'
2013-05-09 17:24:50 -07:00
Jeffrey Ventrella
eed56db9e5
more fixes to hand holding
2013-05-09 17:24:16 -07:00
Philip Rosedale
cdab62c10c
Merge pull request #265 from ZappoMan/render_voxels_optimization
...
Optimized Voxel Rendering Performance by implementing blended VBO strategy
2013-05-09 17:21:05 -07:00
Jeffrey Ventrella
ede3cc2f3d
tweak tweak
2013-05-09 17:18:26 -07:00
Jeffrey Ventrella
ab3ee1688d
more work on hand holding
2013-05-09 17:14:54 -07:00
ZappoMan
2128cb8bff
get rid of dead code
2013-05-09 17:10:25 -07:00
Jeffrey Ventrella
6c58dbeab2
thingy
2013-05-09 17:02:40 -07:00
ZappoMan
33fc9f5389
fixed partial VBO updates
2013-05-09 17:01:20 -07:00
Jeffrey Ventrella
9d548c43ad
twiddle tweak iterate whittle
2013-05-09 16:54:01 -07:00
Jeffrey Ventrella
513701391e
working on hand touching
2013-05-09 16:07:43 -07:00
Jeffrey Ventrella
c2deba6e39
improved avatar touch code
2013-05-09 15:15:28 -07:00
Philip Rosedale
52337a1fae
Merge remote-tracking branch 'upstream/master'
2013-05-09 15:03:45 -07:00
Philip Rosedale
c0a54eca14
Added head lean to broadcast data packets, lean now being set from invensense accelerometers.
2013-05-09 15:03:19 -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
Philip Rosedale
ef1848a68c
Merge remote-tracking branch 'upstream/master'
2013-05-09 14:03:03 -07:00
Philip Rosedale
dd33cedf8d
Removed old serial code for Maple ADC
2013-05-09 14:01:22 -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
Philip Rosedale
dbdd4160cc
Added acceleration reading, gravity baseline, and line displays to invensense
2013-05-09 13:29:09 -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
Philip Rosedale
d2cccce80a
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-09 10:42:36 -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