Stephen Birarda
a01b35f041
remove extra debugging
2013-05-13 18:16:59 -07:00
Philip Rosedale
87dfbf9f4f
Improved Invensense stability by adding average of first few samples to better eliminate DC bias/drift
2013-05-13 18:04:21 -07:00
Stephen Birarda
b6925edbe8
add a PairingHandler to send pair requests to the pairing server
2013-05-13 17:34:34 -07:00
Jeffrey Ventrella
6e3ab12411
Merge remote-tracking branch 'upstream/master'
2013-05-13 16:54:41 -07:00
Jeffrey Ventrella
54010d36c4
created transitions between camera modes
2013-05-13 16:53:45 -07:00
ZappoMan
b196227385
Added wantResIn and wantColor feature between client and server
...
- Updated Voxel Server to support non-res-in version of voxel distribution
- Updated agent data to allow client to send desired res-in and color state
- added menu items to client debug menu to toggle wantResIn and wantColor
2013-05-13 15:02:46 -07:00
Jeffrey Ventrella
6c3de00bcd
cleaned up some code spacing
2013-05-13 14:53:05 -07:00
Jeffrey Ventrella
6f1000447b
Merge remote-tracking branch 'upstream/master'
2013-05-13 14:01:32 -07:00
Jeffrey Ventrella
3ab0fa4e8c
added code to detect mouse hovering over avatar joints for various touch effects
2013-05-13 14:00:25 -07:00
Andrzej Kapolka
7a653741de
Don't set the renderFullVBOs flag; that's not the problem.
2013-05-13 12:30:56 -07:00
Andrzej Kapolka
57af5b11dd
Start out with voxel editing disabled; let the add/delete/color buttons toggle
...
the mode.
2013-05-13 11:27:55 -07:00
Andrzej Kapolka
4bbd3e2e07
Better way of coming up with a contrasting color.
2013-05-13 09:41:50 -07:00
Andrzej Kapolka
eb77f5ff83
Removed debug code, more tests for staged-for-deletion.
2013-05-12 20:36:10 -07:00
Andrzej Kapolka
be88fec7d3
Fixed the major bug, which is that non-leaves were being collapsed. Update
...
full VBO on deletion, since otherwise we don't see the update.
2013-05-12 20:08:01 -07:00
Andrzej Kapolka
4289921b7e
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-11 15:39:18 -07:00
Andrzej Kapolka
9802403749
Let's do some locking to prevent simultaneous access from different threads.
2013-05-11 15:38:49 -07:00
Jeffrey Ventrella
442632f467
fixed merge conflict
2013-05-11 11:50:19 -07:00
Jeffrey Ventrella
5c10ca5677
Merge remote-tracking branch 'upstream/master'
2013-05-11 11:48:34 -07:00
Jeffrey Ventrella
08aba4decb
fixed problem of camera shifting when application starts (made camera jump to ideal position/rotation when initialized)
2013-05-11 11:48:00 -07:00
Philip Rosedale
f115f2a991
fixes to repair merge
2013-05-11 10:55:20 -07:00
Philip Rosedale
dec7e5921c
Merge remote-tracking branch 'upstream/master'
2013-05-11 10:49:23 -07:00
Philip Rosedale
a89b011ddf
Spacing fixes
2013-05-11 10:47:02 -07:00
Philip Rosedale
a1e9235db5
fixed per review
2013-05-11 10:41:34 -07:00
Philip Rosedale
59a681ee44
Fixes per review.
2013-05-11 10:19:57 -07:00
Jeffrey Ventrella
ab9fa0a556
cleaned up some code
2013-05-10 22:31:51 -07:00
Jeffrey Ventrella
f1346604f4
indentation
2013-05-10 22:10:06 -07:00
Jeffrey Ventrella
1e4305d277
Merge remote-tracking branch 'upstream/master'
2013-05-10 21:58:52 -07:00
Jeffrey Ventrella
e4c84e7b74
added mouse view shift behaviors
2013-05-10 21:58:11 -07:00
Andrzej Kapolka
750843e867
More editing progress. Now there are threading issues. Joy!
2013-05-10 21:02:08 -07:00
Stephen Birarda
2a47d8955a
remove some leftover walking sound stuff
2013-05-10 17:44:50 -07:00
Philip Rosedale
4a4184b327
Head in first person follows head mouse at edges of screen
2013-05-10 17:41:16 -07:00
Jeffrey Ventrella
847bfbdadd
mode cleanup after head operation
2013-05-10 17:29:04 -07:00
Stephen Birarda
82ed4a4ae8
remove old style walking sounds
2013-05-10 17:21:58 -07:00
Stephen Birarda
7abe5024d9
some space removals in Interface main.cpp
2013-05-10 17:20:07 -07:00
Jeffrey Ventrella
b2d5bfab2b
clean up from headotomy
2013-05-10 17:12:16 -07:00
Jeffrey Ventrella
2d12b9b800
Merge remote-tracking branch 'upstream/master'
2013-05-10 17:06:25 -07:00
Jeffrey Ventrella
7fc2756257
I just did a headotomy (removed all head-related stuff from Avatar and made it its own class)
2013-05-10 17:05:52 -07:00
Philip Rosedale
6b75fe6e21
Merge remote-tracking branch 'upstream/master'
2013-05-10 16:49:28 -07:00
Philip Rosedale
5e21cb48ba
First person added to render mode and 'p' key
2013-05-10 16:48:21 -07:00
Stephen Birarda
44814a275c
have OculusManager::isConnected always return false if not APPLE
2013-05-10 15:33:36 -07:00
Stephen Birarda
9db694f683
condtional calls to constructors in OculusManager on APPLE only
2013-05-10 15:30:31 -07:00
Stephen Birarda
4c2b729047
assume that oculus will only be from APPLE machines
2013-05-10 15:27:02 -07:00
ZappoMan
ddd55104c1
CR feedback
2013-05-10 14:45:18 -07:00
ZappoMan
6c84e9015e
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-10 14:33:08 -07:00
ZappoMan
ef20b3e4b3
optimized performance of VoxelNode::isLeaf()
2013-05-10 14:32:44 -07:00
Stephen Birarda
9ee3f889ab
Merge remote-tracking branch 'upstream/master' into oculus
2013-05-10 14:00:10 -07:00
Stephen Birarda
e5fce7d83e
remove a useless comment
2013-05-10 13:55:26 -07:00
Stephen Birarda
f447abe03b
zero the yaw on oculus connect, set head yaw instead of body
2013-05-10 13:52:54 -07:00
Philip Rosedale
97f91403a3
Merge pull request #278 from ZappoMan/render_voxels_optimization
...
Implement Partial VBO strategy in copyWrittenDataToReadArrays()
2013-05-10 13:50:49 -07:00
Jeffrey Ventrella
2032264e7e
pull avatar from handshake
2013-05-10 13:42:51 -07:00
Jeffrey Ventrella
ca5adb791c
pull avatars from handholding
2013-05-10 13:25:40 -07:00
ZappoMan
b9a023af37
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-10 13:19:06 -07:00
ZappoMan
322cb2ff23
implemented partial VBOs support in copyWrittenDataToReadArrays()
2013-05-10 13:18:51 -07:00
Jeffrey Ventrella
939665419d
made some improvements to handshake
2013-05-10 13:04:41 -07:00
Jeffrey Ventrella
eb49a9e4f2
hand holding
2013-05-10 12:52:39 -07:00
Jeffrey Ventrella
9db5d7e202
hand holding
2013-05-10 12:45:37 -07:00
Jeffrey Ventrella
87f8df7e7b
...
2013-05-10 12:28:46 -07:00
Jeffrey Ventrella
a5496ee99e
Merge remote-tracking branch 'upstream/master'
2013-05-10 12:24:24 -07:00
Jeffrey Ventrella
685df2c65c
thingy
2013-05-10 12:23:58 -07:00
Jeffrey Ventrella
9598976894
Merge remote-tracking branch 'upstream/master'
2013-05-10 12:20:01 -07:00
Jeffrey Ventrella
619c1a843f
working on hand holding algo
2013-05-10 12:18:49 -07:00
Andrzej Kapolka
012c2c9c9f
Changed "Quit" menu item to "Test" (Quit should apparently be added
...
automatically).
2013-05-10 12:11:32 -07:00
Andrzej Kapolka
66a8e40712
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-10 12:09:25 -07:00
Andrzej Kapolka
8d0fdcac06
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-10 12:08:50 -07:00
ZappoMan
0888a6605f
CR fixes
2013-05-10 12:08:43 -07:00
ZappoMan
bfa7c91a7a
fixed menu behavior
2013-05-10 12:08:03 -07:00
Andrzej Kapolka
5a113fd546
Added a stub for a Qt application class that creates a menu (which, since it's
...
unparented, will only appear on OS X) with a test item connected to a slot.
2013-05-10 12:07:47 -07:00
ZappoMan
e84d2696f9
fixed menu behavior
2013-05-10 12:04:52 -07:00
Jeffrey Ventrella
474423e33f
Merge remote-tracking branch 'upstream/master'
2013-05-10 11:27:41 -07:00
Jeffrey Ventrella
40e7603e49
removed print statements
2013-05-10 11:27:07 -07:00
Philip Rosedale
7d69eb09c2
Merge remote-tracking branch 'upstream/master'
2013-05-10 10:55:39 -07:00
Stephen Birarda
2f9c16f495
have the oculus drive the body yaw, head pitch, and head roll
2013-05-10 10:55:26 -07:00
Philip Rosedale
f8701e6c0c
Re-added Head Mouse working correctly with invensense
2013-05-10 10:55:05 -07:00
Andrzej Kapolka
e6e5b20dee
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-10 10:20:04 -07:00
Stephen Birarda
cc38e4c5c4
Merge remote-tracking branch 'upstream/master' into oculus
2013-05-10 10:18:36 -07:00
Stephen Birarda
04447dfcbd
drive body yaw and render pitch with oculus when connected
2013-05-10 10:17:21 -07:00
Stephen Birarda
adbca70eba
expand the OculusManager to return euler angles
2013-05-10 10:16:23 -07:00
ZappoMan
3af8a1b8f4
code review fixes
2013-05-10 10:03:28 -07:00
Andrzej Kapolka
beadb6a93d
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/main.cpp
2013-05-10 10:03:05 -07:00
Andrzej Kapolka
f6fcdd78b2
Adding/removing voxels at different sizes.
2013-05-10 09:53:53 -07:00
ZappoMan
9dc09de75e
make VoxelSystem::deleteVoxelAt() work properly
2013-05-10 09:32:56 -07:00
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
Andrzej Kapolka
78b37fe920
Starting on coloring support.
2013-05-09 16:26:51 -07:00
Stephen Birarda
f656800fa7
add getters for yaw, pitch and roll to the OculusManager class
2013-05-09 16:10:49 -07:00
Andrzej Kapolka
ecd12e0ac4
Show the voxels to be added/deleted as wireframe cubes.
2013-05-09 16:09:07 -07:00
Jeffrey Ventrella
513701391e
working on hand touching
2013-05-09 16:07:43 -07:00
Stephen Birarda
999ab5cb20
initial setup to connect to oculus and grab sensors
2013-05-09 15:45:09 -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
Stephen Birarda
613066f786
add linking of LibOVR to interface CMakeLists.txt
2013-05-09 15:03:14 -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
Andrzej Kapolka
c411083057
Working on adding an "add voxel in front of avatar" command.
2013-05-09 14:30:50 -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
Andrzej Kapolka
145c6484f4
Fixed issue with mouse pressed state, use mouse buttons to add/delete voxels
...
(numbers now switch between modes).
2013-05-09 13:33:23 -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
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