Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 00:47:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
3431 commits 25 branches 0 tags 1.1 GiB
Commit graph

1718 commits

Author SHA1 Message Date
Andrzej Kapolka
58a9a05ef7 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-17 10:17:37 -07:00
Andrzej Kapolka
3ed99f40a6 Working on support for off-axis projection. 2013-05-17 10:17:21 -07:00
Jeffrey Ventrella
ade5b7bec3 formatting changes 2013-05-17 09:52:19 -07:00
Jeffrey Ventrella
0edf72a2be trying to fix merge conflicts 2013-05-17 09:20:42 -07:00
Jeffrey Ventrella
7e0877e753 cleanup 2013-05-17 08:48:54 -07:00
tosh
7115975c41 Merge branch 'master' of git://github.com/worklist/hifi into 19165 
Conflicts:
	interface/src/Oscilloscope.cpp
 2013-05-17 12:28:34 +02:00
Philip Rosedale
c43847946c Tweaked mouse camera movement a bit 2013-05-16 20:31:17 -06:00
Philip Rosedale
e55efb81a8 Added acceleration decay of pitch (you look up/straight if you start moving) 2013-05-16 19:12:48 -06:00
Jeffrey Ventrella
1c126e2525 resolved conflicts 2013-05-16 17:32:54 -07:00
Jeffrey Ventrella
750a48bb73 cleaned up head class - made most members private. Added copy constructor 2013-05-16 17:20:00 -07:00
Andrzej Kapolka
a23ed58a53 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 16:25:05 -07:00
ZappoMan
068e863fb4 Merge pull request #334 from PhilipRosedale/master 
Mouse moves pitch, yaw when near screen edge, gravity bouncing fixed!
 2013-05-16 16:24:42 -07:00
Andrzej Kapolka
00171eccbb Slight fix for shadows; we were drawing an unnecessary layer of text. 2013-05-16 16:23:11 -07:00
Philip Rosedale
aad5f3bfff Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 17:21:24 -06:00
Andrzej Kapolka
26badc56e0 Added shadow and outline effects to TextRenderer, use the shadow effect in 
our text to separate it from the background.
 2013-05-16 16:10:38 -07:00
Philip Rosedale
9f57787ece Fixed jerking on gravity, added mouse pitch, yaw behavior. 2013-05-16 17:05:45 -06:00
Andrzej Kapolka
191c533ad2 Provide a gray background for the chat entry, so that we can see what we're 
typing.
 2013-05-16 14:24:18 -07:00
Philip Rosedale
7866c803fb Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 14:44:15 -06:00
Philip Rosedale
b2709652b4 Tweaks to improve mouse Yaw behavior. 2013-05-16 14:43:46 -06:00
Andrzej Kapolka
d241dba573 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 13:09:31 -07:00
Andrzej Kapolka
86ddcea87f Better names for the shaders. 2013-05-16 13:08:21 -07:00
Philip Rosedale
31967e8afb Merge pull request #331 from ZappoMan/master 
get rid of the "kill the solar system" feature... protecting us from ourselves!
 2013-05-16 12:59:55 -07:00
ZappoMan
f8dc01a890 removed the - key killing all the planets 2013-05-16 12:56:13 -07:00
Philip Rosedale
a36d32e101 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 13:34:54 -06:00
Philip Rosedale
78bd5ab40f Fixes per review 2013-05-16 13:34:48 -06:00
Jeffrey Ventrella
cd248188d9 thingy 2013-05-16 12:19:20 -07:00
Jeffrey Ventrella
aafb557b02 turned off look at behavior - until it is finished and working correctly 2013-05-16 12:14:36 -07:00
Jeffrey Ventrella
04828c8224 cleaned up copyright header notifications in several files 2013-05-16 12:06:36 -07:00
Jeffrey Ventrella
be7be4ad99 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 11:18:32 -07:00
tosh
489a0cb844 adds comments and blank lines to clarify the code 2013-05-16 18:56:32 +02:00
tosh
539e69cef0 puts private members to the bottom of the class definition 2013-05-16 18:56:20 +02:00
Philip Rosedale
c8c4b8fda5 Merge pull request #328 from kordero/master 
fixing sscanf issue with floats for certain locales
 2013-05-15 23:36:04 -07:00
Philip Rosedale
1b039c3755 Transmitter V2 drives the hand, and rendering levels with 'l' shows the hand transmitter data. Physics will need to be tuned. 2013-05-16 00:10:10 -06:00
=
0016038fe3 fixing locale issue with decimal delimiter for floats 2013-05-16 02:39:10 -03:00
Andrzej Kapolka
0a6b4702c6 Experimenting with simple Perlin noise shader for voxels. 2013-05-15 22:18:56 -07:00
Philip Rosedale
29889725ef Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 21:17:34 -06:00
Philip Rosedale
1a283c3ac0 Improvements to scope display, added framework for echo analysis over multiple frames 2013-05-15 21:15:55 -06:00
Andrzej Kapolka
2885c14480 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 17:31:11 -07:00
Stephen Birarda
d78daf53e9 fix copy of Avatar object for use in Audio class 2013-05-15 17:28:27 -07:00
Andrzej Kapolka
cb2acb58e7 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 16:22:47 -07:00
Andrzej Kapolka
f0055bd419 Fixes for OS X: GLSL version must be first line in source, don't init glut 
(Qt apparently uses it?)
 2013-05-15 16:19:42 -07:00
Stephen Birarda
fc5e42cf8b add threaded injection of audio via audio injector class 2013-05-15 16:10:59 -07:00
Andrzej Kapolka
f15c670c4e Let's try initializing glut before Qt, since we're getting a warning on OS X. 2013-05-15 16:07:09 -07:00
Philip Rosedale
2820323567 Fixes from merge 2013-05-15 13:48:55 -07:00
Andrzej Kapolka
7211fd7027 Now that we have a Qt context, we can use their shader classes. However, we 
extend the program object class with glm-enabled functions.
 2013-05-15 13:27:37 -07:00
Philip Rosedale
f6389cac38 First commit, audio echo detection, also changed scope to show last buffer played rather than next buffer to play. 2013-05-15 13:03:22 -07:00
Andrzej Kapolka
3e57aa08c9 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 12:48:51 -07:00
Stephen Birarda
e0ee50fa9c spacing changes in Audio render 2013-05-15 12:38:11 -07:00
Stephen Birarda
351412f6e8 constantize SOUND_PITCH in addProceduralSounds 2013-05-15 12:36:53 -07:00
Stephen Birarda
63a2b203d9 constantize VOLUME_BASELINE in addProceduralSounds 2013-05-15 12:36:19 -07:00
Stephen Birarda
274c810dec constantize the number of packets to discard for stats 2013-05-15 12:35:41 -07:00
Stephen Birarda
b186dd0f65 comment cleanup for audioCallback 2013-05-15 12:24:58 -07:00
Stephen Birarda
c5fdfd64e7 remove extra space 2013-05-15 12:22:11 -07:00
Stephen Birarda
44b12cb593 spacing changes 2013-05-15 12:21:43 -07:00
Stephen Birarda
fb42e8df04 correct some global references in Audio.cpp 2013-05-15 12:19:40 -07:00
Andrzej Kapolka
4292cd9ab3 Moved voxel options into their own menu, switched destructive flag to check 
Qt action.
 2013-05-15 12:05:32 -07:00
Stephen Birarda
e83710e45e prepend audio packets from the mixer with a packet header 2013-05-15 12:00:04 -07:00
Andrzej Kapolka
0ce9e42085 Support dragging when in coloring mode. I tried it in add/delete mode, too, 
but it felt messy.
 2013-05-15 11:48:23 -07:00
Stephen Birarda
ce34a8f3e0 add packet headers and agent types for audio clarity 2013-05-15 11:43:49 -07:00
Stephen Birarda
26c34bb86c sensible initialization for Audio member variables 2013-05-15 11:29:52 -07:00
Andrzej Kapolka
6317404249 When in add mode and there's no voxel under the cursor, place the mouse voxel 
a fixed distance away.
 2013-05-15 11:21:34 -07:00
Stephen Birarda
4693082db0 refactor Audio to remove requirement of AudioData 2013-05-15 10:54:36 -07:00
Andrzej Kapolka
b05140ee51 Turned the voxel edit commands into menu options for better visibility. 2013-05-15 10:40:41 -07:00
Philip Rosedale
72d657b51d Preventing render bug with mis-scaled mouth (part of screen all black) 2013-05-15 10:00:30 -07:00
Andrzej Kapolka
1f7b77eb95 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 09:55:56 -07:00
Philip Rosedale
124f04820e Removed renderPitch(), and renderYaw() from code/classes - we will use bodyPitch(), headPitch() only. 2013-05-15 09:52:12 -07:00
Philip Rosedale
73c793c0a1 Added optional millisecond onscreen frame timer for easier latency timing with high-speed camera 2013-05-15 09:37:36 -07:00
Philip Rosedale
daaf86a634 restrict avatar body yaw to be between 0-360 2013-05-15 08:06:53 -07:00
tosh
9765ce7b9c removes obsolete OGlProgram.h, moves utility macro for logging gl errors to Log.h 2013-05-15 14:25:40 +02:00
tosh
31e518ebfd moves dependency to new gl-program class to starfield/Config.h (where all 
the other dependencies to components outside the 'starfield' folder live)
and removes dependency to obsolete OGlProgram.h
 2013-05-15 14:21:32 +02:00
Jeffrey Ventrella
a0e8c0da74 more work on avatar lookat 2013-05-14 18:15:54 -07:00
Jeffrey Ventrella
a5e696b696 Merge remote-tracking branch 'upstream/master' 2013-05-14 17:31:03 -07:00
Jeffrey Ventrella
f53b49c496 working on lookat (eye contact) 2013-05-14 17:30:41 -07:00
Philip Rosedale
5fec8bc8fe Merge branch 'master' of https://github.com/worklist/hifi 2013-05-14 17:11:27 -07:00
Philip Rosedale
6cfdf96dea Added mouse panning in the Yaw direction - at edges of screen. 2013-05-14 17:11:16 -07:00
birarda
6f7d2a6922 Merge pull request #314 from birarda/transmitter 
add new packet header for V2 transmitter data
 2013-05-14 16:30:55 -07:00
Stephen Birarda
aca2ce47b6 add a V2 transmitter data packet for new iOS transmitter 2013-05-14 16:29:39 -07:00
Andrzej Kapolka
45e1d341fa When we add voxels, add them with the selected color. 2013-05-14 16:02:50 -07:00
Philip Rosedale
62a97f23bf Merge branch 'master' of https://github.com/worklist/hifi 2013-05-14 15:11:04 -07:00
Philip Rosedale
b30f7b02bd Removed mouse shift prototype. 2013-05-14 15:10:44 -07:00
Andrzej Kapolka
775fd5bd2e Use the sun location in the environment to set the light position. 2013-05-14 14:53:29 -07:00
Andrzej Kapolka
8e04c17cc2 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Application.cpp
 2013-05-14 14:44:22 -07:00
Andrzej Kapolka
e1016ad902 What matters is the active state, not the focus. 2013-05-14 14:40:18 -07:00
Andrzej Kapolka
b4ca7ca5e3 Just manually request focus. 2013-05-14 14:36:43 -07:00
Andrzej Kapolka
053c0d1ca5 Focus tweak; focus isn't returning to the GL widget after closing the color 
dialog on OS X.
 2013-05-14 14:34:36 -07:00
Andrzej Kapolka
ebc612f87a Start out with gray, fix coloring smaller portions by (similar to deleting) 
breaking up leaf nodes into their components.
 2013-05-14 14:23:08 -07:00
ZappoMan
8dc61d89fc Added support for "destructive" vs "non-destructive" voxel create 
- changed VoxelTree to support destructive and non-destructive mode
- added protocol packet headers to differentiate
- added new UI to switch modes
- default mode now, non-destructive.
 2013-05-14 14:19:31 -07:00
Andrzej Kapolka
4eced82cf4 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2013-05-14 13:51:27 -07:00
Andrzej Kapolka
9033152401 Color selection for painting. 2013-05-14 13:49:24 -07:00
ZappoMan
43e190fe3c switched Want Delta menu to use new Qt menus 2013-05-14 12:19:23 -07:00
Jeffrey Ventrella
7117e4a76c Merge remote-tracking branch 'upstream/master' 2013-05-14 11:44:34 -07:00
Jeffrey Ventrella
acda87502e more work on camera shifting between modes 2013-05-14 11:43:51 -07:00
Andrzej Kapolka
174fdb8109 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/main.cpp
 2013-05-14 11:32:43 -07:00
Andrzej Kapolka
60e8971eb9 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/main.cpp
 2013-05-14 11:29:08 -07:00
ZappoMan
63510aa30b Merge pull request #301 from PhilipRosedale/master 
Improved stability of invensense for drift
 2013-05-14 11:27:01 -07:00
Andrzej Kapolka
537686d541 Allow changing the edit voxel size using the mouse wheel. 2013-05-14 11:06:03 -07:00
Philip Rosedale
d386221620 Merge pull request #297 from Ventrella/master 
added code to allow mouse hover over avatar to be used for touch effects
 2013-05-14 11:04:59 -07:00
Andrzej Kapolka
a5e7fdeacd Accidentally left a debug line in. 2013-05-14 10:47:21 -07:00
Andrzej Kapolka
096421347e Missed some comments in transferring from main.cpp to Application.h; trying to 
preserve original formatting.
 2013-05-14 10:45:54 -07:00
Andrzej Kapolka
31b94203ff Disable the menu shortcuts for "regular" keys when the chat entry is showing. 2013-05-14 00:24:53 -07:00
Andrzej Kapolka
1e99389a4b Various fixes, removed the bulk of main.cpp. 2013-05-13 23:15:45 -07:00
Andrzej Kapolka
75eee4bcbd Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2013-05-13 21:23:00 -07:00
Andrzej Kapolka
e0388515a4 Massive migration from GLUT/globals to Qt/class members. Mostly there. 2013-05-13 21:11:54 -07:00
Philip Rosedale
6b85d93aee Simplified serial port init to not use baud. 2013-05-13 18:52:43 -07:00
Stephen Birarda
a3a91984d2 include stdio for sprintf 2013-05-13 18:22:55 -07:00
Stephen Birarda
2c66ec8520 include string for methods in PairingHandler 2013-05-13 18:19:19 -07:00
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
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
ZappoMan
5f55d511c5 Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-08 15:01:50 -07:00
Philip Rosedale
5e450827d8 Merge pull request #237 from ey6es/master 
Added basic environment data and atmosphere rendering.
 2013-05-08 15:01:12 -07:00
ZappoMan
9a04f2c00c Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-08 14:57:20 -07:00
Philip Rosedale
ad25150d62 Merge remote-tracking branch 'upstream/master' 2013-05-08 14:51:52 -07:00
Philip Rosedale
fd5789abb8 Merge remote-tracking branch 'upstream/master' 2013-05-08 14:40:53 -07:00
Philip Rosedale
a9882d054f Invensense gyros now correctly controlling head motion, code cleanups. 2013-05-08 14:39:41 -07:00
ZappoMan
cb5ccee1e4 CR cleanup 2013-05-08 14:32:55 -07:00
ZappoMan
ed30a03b2e CR cleanup 2013-05-08 14:30:18 -07:00
ZappoMan
ad67c363ec Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-08 14:27:37 -07:00
ZappoMan
70557cd51c Optimized removeOutOfView() 
- don't recurse down trees that are fully INSIDE of the view frustum, because those nodes
  are guaranteed to also be INSIDE
- changes to extraData of the recurse operation to make this possible
- adding debug stats to track how many nodes are inside, outside, intersect
- change call to removeOutOfView() to not call if last elapsed time has not
  yet passed since last call (similar to treeToArrays() logic)
 2013-05-08 14:24:08 -07:00
Andrzej Kapolka
1c8b835bb8 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-08 13:15:21 -07:00
Andrzej Kapolka
caeccf59ec When the stars and the atmosphere are both on, adjust the stars' alpha value 
based on the distance from the atmosphere.
 2013-05-08 13:13:56 -07:00
ZappoMan
0b873dddc8 Merge pull request #244 from Ventrella/master 
moved Orientation class to shared folder
 2013-05-08 12:51:26 -07:00
Andrzej Kapolka
8a21823469 Render the stars, when enabled, before the atmosphere. 2013-05-08 12:11:48 -07:00
ZappoMan
7a5ce57b4e added alwaysDisplay mode to PerformanceWarnings class 2013-05-08 12:01:55 -07:00
Andrzej Kapolka
c34b6df2f4 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	voxel-server/src/main.cpp
 2013-05-08 11:56:03 -07:00
Andrzej Kapolka
5138f62aef Use the "proper" alpha value (i.e., the one from the original shader). This 
makes the sky somewhat darker, but that probably just means we need more
scattering or a brighter sun.
 2013-05-08 11:50:59 -07:00
Andrzej Kapolka
82f16e7f34 Include the "sky from space" shaders, too, and use them when the camera is 
outside the atmosphere's outer radius.
 2013-05-08 11:42:31 -07:00
Philip Rosedale
131377aaf9 Converted gyro values to floats and converted to exact degrees/second per docs. 2013-05-08 11:22:49 -07:00
Philip Rosedale
de6627f922 Merge remote-tracking branch 'upstream/master' 2013-05-08 10:40:05 -07:00
Andrzej Kapolka
8d4a74cf03 Render environment -> render atmosphere. 2013-05-08 10:00:31 -07:00
Philip Rosedale
355cff21c5 Merge remote-tracking branch 'upstream/master' 2013-05-08 09:06:13 -07:00
Philip Rosedale
baf64c07dc Added Procedural audio noise when moving, scaled to velocity 2013-05-08 09:04:38 -07:00
Jeffrey Ventrella
9e60c8a36e increased GRAVITY_SCALE to 10.0; tidied-up avatar code; moved Orientation class to shared folder 2013-05-08 08:59:29 -07:00
ZappoMan
de969891d8 Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-08 01:19:35 -07:00
ZappoMan
ddf49ffdec removed addRandomSphere() which was dead code 2013-05-08 00:46:02 -07:00
ZappoMan
f1425216ba removed VoxelSystem::createSphere() which was dead code 2013-05-08 00:45:27 -07:00
Andrzej Kapolka
80cdd597f4 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-07 17:53:27 -07:00
ZappoMan
085bfa384a Merge pull request #225 from PhilipRosedale/master 
Added perlin noise example function noiseTest()
 2013-05-07 17:53:07 -07:00
ZappoMan
005b2fce35 Merge pull request #223 from Ventrella/master 
cleaned up a bunch of spacings inside of parentheses
 2013-05-07 17:51:43 -07:00
Andrzej Kapolka
9e6e5acf19 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-07 17:42:47 -07:00
Andrzej Kapolka
7c8a06ed4d Added wrapper classes for shaders/shader programs to ease the process of 
compiling, linking, assigning uniforms, etc.  They're modeled after the ones
included in QtOpenGL, which we can't use at the moment because they require
a Qt OpenGL context.
 2013-05-07 17:40:55 -07:00
Stephen Birarda
75ba88923f remove the serial interface close in destructor, incorrect solution 2013-05-07 17:09:49 -07:00
Andrzej Kapolka
c7e31ec414 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	libraries/shared/src/PacketHeaders.h
 2013-05-07 14:44:17 -07:00
Andrzej Kapolka
47f3566929 Wavelengths, switch for environment rendering, far plane adjustment. 2013-05-07 14:40:30 -07:00
Stephen Birarda
92daa8e6e0 revert the type squish 2013-05-07 13:43:07 -07:00
Stephen Birarda
9be92cebdd revert type squish, spacing, code review comment 2013-05-07 13:41:48 -07:00
Stephen Birarda
d5d9479b65 make eve send her ID to identify with the avatar mixer 2013-05-07 13:38:56 -07:00
Philip Rosedale
0ae700d746 Merge remote-tracking branch 'upstream/master' 2013-05-07 12:53:19 -07:00
Philip Rosedale
e1645b1158 Testing audio noise generation at client 2013-05-07 12:48:35 -07:00
Stephen Birarda
0566330a8a some magic number removals 2013-05-07 12:44:45 -07:00
Andrzej Kapolka
7faa9e4318 More work on atmosphere rendering; rendering now working. 2013-05-07 12:40:15 -07:00
Stephen Birarda
85dfb23fbd add constant for UNKNOWN_AGENT_ID 2013-05-07 12:39:35 -07:00
Stephen Birarda
83e59b1aa8 more deletions 2013-05-07 12:05:32 -07:00
Stephen Birarda
5c90b4575e trivial deletions for cleanup 2013-05-07 12:05:25 -07:00
Stephen Birarda
4eeb1ed5b1 have interface clients tell the avatar-mixer and voxel-server what their ID is 2013-05-07 12:05:19 -07:00
Philip Rosedale
331d4116d9 Finished noiseTest example (in util.h) that uses Perlin noise to draw a bitmap in 2D. 2013-05-07 11:14:12 -07:00
Philip Rosedale
be1b803656 Noise Test function, adjust chat position 2013-05-07 10:41:39 -07:00
Philip Rosedale
27540f1286 Fixes per code review 2013-05-07 09:59:37 -07:00
Jeffrey Ventrella
fe11d929e3 cleaned up code spacing 2013-05-07 08:43:14 -07:00
Philip Rosedale
c7635604a9 Fixes in merge. 2013-05-07 08:40:11 -07:00
Jeffrey Ventrella
65181cb4e0 changed some spacing formatting things 2013-05-06 22:23:16 -07:00
Philip Rosedale
31593dccd4 improved comment of function 2013-05-06 18:46:19 -07:00
Philip Rosedale
00c8673ceb Added Utility function angleBetween() which returns the positive angle between any two 3D vectors. 2013-05-06 18:45:06 -07:00
Jeffrey Ventrella
ef76c6ba0a Merge remote-tracking branch 'upstream/master' 2013-05-06 18:29:42 -07:00
Jeffrey Ventrella
22a0e39d6c more work on avatar touch, reachable radius, and hand states 2013-05-06 18:29:20 -07:00
Philip Rosedale
631ee8f478 Merge remote-tracking branch 'upstream/master' 2013-05-06 18:23:06 -07:00
Stephen Birarda
55a1e26585 remove the Texture class no longer in use 2013-05-06 18:10:21 -07:00
Stephen Birarda
f424b75e7b some spacing repairs after merging Philip's levels pull 2013-05-06 17:50:44 -07:00
birarda
133e95f116 Merge pull request #210 from PhilipRosedale/master 
Added invensense gyro level indicators
 2013-05-06 17:47:38 -07:00
Jeffrey Ventrella
9c1f163175 Merge remote-tracking branch 'upstream/master' 2013-05-06 17:00:04 -07:00
Philip Rosedale
9c56e5a2f7 Merge remote-tracking branch 'upstream/master' 2013-05-06 16:59:46 -07:00
Jeffrey Ventrella
9fc56a6230 working out avatar touch stuff 2013-05-06 16:59:43 -07:00
ZappoMan
84da976383 removed _voxelCleanupLock 2013-05-06 16:38:24 -07:00
ZappoMan
f5808f43b5 some cleanup pre CR 2013-05-06 16:24:09 -07:00
Philip Rosedale
ff88d1fc06 Created a drawVector() call that will draw a vector in 3-space with axes for testing 2013-05-06 16:18:27 -07:00
Jeffrey Ventrella
fd4a0c9acd working on detection of avatars entering into each other's peripersonal space 2013-05-06 16:17:16 -07:00
ZappoMan
94529d54e8 some cleanup pre CR 2013-05-06 16:16:21 -07:00
ZappoMan
b69c1a3474 some cleanup pre CR 2013-05-06 16:14:10 -07:00
ZappoMan
68d58650a5 removed some debug code 2013-05-06 16:09:21 -07:00
ZappoMan
09923d1c97 second cut at view culling voxels 2013-05-06 15:51:56 -07:00
Jeffrey Ventrella
c1ac3eb320 improving the code for detecting collisions, hand movement and handholding 2013-05-06 15:14:13 -07:00
Jeffrey Ventrella
114dfeacf6 thingy 2013-05-06 14:22:01 -07:00
Jeffrey Ventrella
40771e4c47 thingy 2013-05-06 14:18:14 -07:00
Jeffrey Ventrella
bc15bc2292 Merge remote-tracking branch 'upstream/master' 2013-05-06 13:53:16 -07:00
ZappoMan
4f7adf7a05 Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-06 13:47:13 -07:00
Philip Rosedale
3b3e6ae075 Merge remote-tracking branch 'upstream/master' 2013-05-06 13:42:23 -07:00
Andrzej Kapolka
a44cb3fcb6 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-06 13:41:30 -07:00
Stephen Birarda
784fa5882a closing of serial interface should be conditional on __APPLE__ 2013-05-06 13:36:58 -07:00
ZappoMan
043a284d4d Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-06 13:36:31 -07:00
Andrzej Kapolka
5b873c1e8f Merge branch 'master' of https://github.com/worklist/hifi 2013-05-06 13:33:07 -07:00
ZappoMan
7ba9d4aa86 First cut are removing out of view voxels and switch to using PerformanceWarnings 2013-05-06 13:32:09 -07:00
Stephen Birarda
250df35bc1 resolve conflicts on merge with upstream master 2013-05-06 13:31:50 -07:00
Andrzej Kapolka
2226d722cf Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	libraries/shared/src/PacketHeaders.h
 2013-05-06 13:31:46 -07:00
Andrzej Kapolka
b4dd6b57aa Starting on environment bits. 2013-05-06 13:30:07 -07:00
Philip Rosedale
eedbb98c32 Merge remote-tracking branch 'upstream/master' 2013-05-06 13:29:34 -07:00
Philip Rosedale
f39fa3549b invensense horizontal lines for RT indicator 2013-05-06 13:29:02 -07:00
Stephen Birarda
6666229d83 close the serial file descriptor in destructor 2013-05-06 13:25:49 -07:00
Stephen Birarda
49042046de remove duplicated constructor after merge 2013-05-06 13:20:13 -07:00
Stephen Birarda
6d91e4721e Merge remote-tracking branch 'upstream/master' into domain-rfd 2013-05-06 13:18:34 -07:00
Stephen Birarda
ee4c55afe7 move SerialInterface constructor to header file 2013-05-06 13:18:06 -07:00
Stephen Birarda
0b810fa4c2 if we fail to open SerialInterface twice then don't keep trying 2013-05-06 13:09:15 -07:00
Stephen Birarda
f3a9dcf777 if we fail to open SerialInterface twice then don't keep trying 2013-05-06 13:08:45 -07:00
Philip Rosedale
e85e44456b Tweaking level indicators for new Invensense 2013-05-06 13:05:45 -07:00
Jeffrey Ventrella
6273594f51 made a call to initializeBodySprings at the end of initializeSkeleton 2013-05-06 12:56:31 -07:00
Jeffrey Ventrella
2a1bbcc168 improved avatar gravity code and moved source of gravity vector to main.cpp 2013-05-06 12:35:52 -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
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
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
24dee12d67 Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-04 08:25:35 -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
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
Stephen Birarda
66e2771135 some cleanup in interface main 2013-05-03 15:58:55 -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
Stephen Birarda
24c1ea5e7f resolve conflicts on merge with upstream master 2013-05-03 15:37:22 -07:00
Jeffrey Ventrella
85ad5601d7 added avatar shadow 2013-05-03 15:22:01 -07:00
Stephen Birarda
bd3c902b68 remove logging of audio stats 2013-05-03 15:13:38 -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
Stephen Birarda
90a08b4dd8 cleanup in Audio and Util 2013-05-03 14:45:47 -07:00
Andrzej Kapolka
8923057d0e Compile fix, need to use integer GL uniform. 2013-05-03 13:00:48 -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
Jeffrey Ventrella
8457b91fe0 cleaned up a bunch of leftover tabs and converted each to 4 spaces 2013-05-03 11:15:49 -07:00
Stephen Birarda
5f26d44fd8 Merge remote-tracking branch 'upstream/master' into pairing 2013-05-03 10:59:34 -07:00
Stephen Birarda
bd6f0d9885 couple of line deletions 2013-05-03 10:58:57 -07:00
Andrzej Kapolka
9dfc6c6590 Fix for fullscreen mode switching: when we reshape, we need to resize the 
render texture (if it exists).
 2013-05-03 10:57:51 -07:00
Jeffrey Ventrella
026ee4345c Merge remote-tracking branch 'upstream/master' 2013-05-03 10:54:07 -07:00
Jeffrey Ventrella
e0b33e56da couple of small code cleanups 2013-05-03 10:52:44 -07:00
Andrzej Kapolka
346f213e3b Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Avatar.cpp
	interface/src/Avatar.h
	interface/src/main.cpp
 2013-05-03 10:31:40 -07:00
Philip Rosedale
f05451b4f1 Merge pull request #186 from ZappoMan/render_voxels_optimization 
Some more tweaks to test pipeline
 2013-05-03 10:27:56 -07:00
Andrzej Kapolka
08350a5d3a Rather than a command line parameter, provide a menu option for switching 
to/from fullscreen mode.
 2013-05-03 10:22:10 -07:00
Philip Rosedale
1fbc13941d Fixes per merge (Ventrella) 2013-05-03 10:16:58 -07:00
Andrzej Kapolka
43b5e9430f Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/main.cpp
 2013-05-03 10:04:50 -07:00
ZappoMan
5710dd750d Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-03 10:01:37 -07:00
ZappoMan
a4f2dc283d various changes to help debug render pipeline 
- fixing some cases where TREE_SCALE was not using constant in prep for making TREE_SCALE larger
- added createLine() to VoxelTree
- added axis lines made of voxels to scene
- added corner points made of voxels to scene
 2013-05-03 09:58:52 -07:00
Philip Rosedale
b703d0982e Changed avatar.h to store _distanceToNearestAvatar 2013-05-03 09:55:25 -07:00
ZappoMan
2b11cad1ab Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-02 22:33:41 -07:00
Philip Rosedale
9716ea9550 Ground plane moved to 0->10 and lines are exactly 1 meter 2013-05-02 22:28:41 -07:00
ZappoMan
34a059db9a more optimizations of render pipeline 2013-05-02 22:26:56 -07:00
Philip Rosedale
581365f1f1 Fixes per code review. 2013-05-02 20:51:17 -07:00
Philip Rosedale
2195a140fd Merge remote-tracking branch 'upstream/master' 2013-05-02 20:36:43 -07:00
ZappoMan
771c604121 more render pipeline optimizations 2013-05-02 18:12:55 -07:00
Jeffrey Ventrella
7a52d51251 adding avatar renderer 2013-05-02 17:47:28 -07:00
Jeffrey Ventrella
c46fc5a861 (1) added avatar tilting while walking; (2) added avatar renderer; (3) tweaked body proportions; (4) 2013-05-02 17:46:10 -07:00
ZappoMan
fcce4753c9 more optimizations on render pipeline 2013-05-02 16:37:31 -07:00
ZappoMan
5a14c71225 added dirty bit support to VoxelTree, use it to determine when to call treeToArrays 2013-05-02 15:57:31 -07:00
Andrzej Kapolka
8e2c43e983 Need to disable blending when we render the distorted screen quad. 2013-05-02 15:54:58 -07:00
Andrzej Kapolka
ccded56ecf Use the right type here; Xcode complains about it. 2013-05-02 15:20:29 -07:00
Andrzej Kapolka
762c635744 Restored constant value added another reference to the SDK docs. 2013-05-02 14:44:03 -07:00
Andrzej Kapolka
5de15dd5a4 Final bits for Oculus support. Works! 2013-05-02 14:39:00 -07:00
Jeffrey Ventrella
673936e141 adjusted proportions of avatar skeleton to make it closer to average human 2013-05-02 14:05:51 -07:00
ZappoMan
8f0dd1ffa1 added render pipeline warnings menu item 2013-05-02 13:17:06 -07:00
Jeffrey Ventrella
cd334c2ade renamed avatar skeleton from "bones" to "joints" to be more consistent with standard language. Also improved skeleton some 2013-05-02 13:13:56 -07:00
Andrzej Kapolka
b0bbca281d Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/main.cpp
 2013-05-02 13:10:39 -07:00
Andrzej Kapolka
94f1e03eb1 More work on Oculus integration; added some notes to explain the source of the 
magic numbers.
 2013-05-02 13:02:11 -07:00
ZappoMan
e2481f514c lower warning threshold to 1 millisecond for voxel render pipeline steps 2013-05-02 12:53:56 -07:00
Stephen Birarda
d2ca0d4dc4 Merge remote-tracking branch 'upstream/master' into invensense 2013-05-02 12:29:37 -07:00
ZappoMan
275772bb3d debugging voxel sending behavior 2013-05-02 12:26:51 -07:00
Stephen Birarda
9e3b862c67 hook up the invensense via existing SerialInterface class 2013-05-02 12:26:12 -07:00
Jeffrey Ventrella
4eda930f4a Merge remote-tracking branch 'upstream/master' 2013-05-02 11:06:18 -07:00
Jeffrey Ventrella
35a8066bd6 fixed merge problem 2013-05-02 11:05:51 -07:00
Jeffrey Ventrella
42ce96c82e Merge pull request #177 from Ventrella/master 
I made a few minor fixes in Avatar
 2013-05-02 11:01:24 -07:00
ZappoMan
a6d2bb73ad added warnings if bitstream processing takes too long 2013-05-01 23:24:46 -07:00
ZappoMan
6a7ebb3a55 fixed LOD issue in client 2013-05-01 22:57:19 -07:00
Philip Rosedale
900caa6278 Changed idle simulate call to 16msecs (which will set avatar mixer rate at 60FPS), further small stats improvements 2013-05-01 22:40:38 -07:00
Philip Rosedale
ee1e5d16fc Avatars are now slowed down when they get near other avatars, for easy fine positioning. 2013-05-01 22:03:57 -07:00
ZappoMan
0f71627923 fixed local mode 2013-05-01 21:22:41 -07:00
Philip Rosedale
e2ce927492 Merge remote-tracking branch 'upstream/master' 2013-05-01 20:57:40 -07:00
Philip Rosedale
09a6a476d5 Slow down when near other avatars - incremental commit 2013-05-01 20:55:40 -07:00
Philip Rosedale
f78f983e2d Merge pull request #176 from ZappoMan/render_voxels_optimization 
Render voxels optimization
 2013-05-01 20:52:48 -07:00
Jeffrey Ventrella
1e6ba9cc34 (1) raised Eve's hand; (2) renamed some member variables; (3) added more functionality to hand-holding 2013-05-01 20:35:21 -07:00
ZappoMan
015fd05e62 code cleanup 2013-05-01 18:37:14 -07:00
ZappoMan
62e7c0383b cleaned up some code for distanceToCamera() 2013-05-01 18:31:05 -07:00
Andrzej Kapolka
5b6b28664f Most of the way towards basic Oculus support. 2013-05-01 18:22:45 -07:00
ZappoMan
4f86b5570f first cut at improved render pipeline 2013-05-01 18:21:13 -07:00
Jeffrey Ventrella
4b18a25b7f cleaned up some tabbing issues in main.cpp 2013-05-01 17:11:35 -07:00
Jeffrey Ventrella
f86a92fef0 fixed some small formatting glitches in code and added a way to make head lean affect the position of the head 2013-05-01 16:51:15 -07:00
Jeffrey Ventrella
aeb545656e (1) added a few methods to orientation; (2) fixed Eve's height; (3) added pitch and roll members to Avatar (not used yet); added avatar pull from handshake; 2013-05-01 15:38:55 -07:00
Jeffrey Ventrella
c88a7f8f55 fixed merge 2013-05-01 13:51:59 -07:00