Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-14 19:36:40 +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
Jeffrey Ventrella
4d95d0a426 more cleanup on lookat 2013-05-22 13:24:19 -07:00
ZappoMan
06f2528d6a fix crashing on deleting voxels in server and client 2013-05-22 13:23:01 -07:00
Jeffrey Ventrella
9de6060d0f Merge remote-tracking branch 'upstream/master' 2013-05-22 13:14:09 -07:00
Jeffrey Ventrella
3c3a3fc82e cleaning up look at code - Stephen helped find a transmission bug - fixed. 2013-05-22 13:12:11 -07:00
Philip Rosedale
e411b41be7 oops moving stdint to header file 2013-05-22 13:02:07 -07:00
Philip Rosedale
a03d6f8d80 moved pair to own menu 2013-05-22 12:55:46 -07:00
Andrzej Kapolka
88bc6caf51 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 12:49:35 -07:00
Andrzej Kapolka
30958e3ce6 Working on reorientation. 2013-05-22 12:49:25 -07:00
Philip Rosedale
bcf13b9754 hopefully fix linux broken build by including stdint in transmitter 2013-05-22 12:48:36 -07:00
Philip Rosedale
b95560587a pitch force 4x bigger in transmitter 2013-05-22 12:42:28 -07:00
Philip Rosedale
4ad2f9a943 Merge pull request #381 from Geenz/19319 
Code Review for Job #19319
 2013-05-22 12:32:47 -07:00
ZappoMan
6733d83f2d Merge pull request #379 from PhilipRosedale/master 
Sensor fusion to better stabilize transmitter roll, pitch
 2013-05-22 12:00:08 -07:00
Philip Rosedale
53dc81e309 Fixes per code review. 2013-05-22 11:57:11 -07:00
Jeffrey Ventrella
f7b101b4aa Merge remote-tracking branch 'upstream/master' 2013-05-22 11:43:12 -07:00
Jeffrey Ventrella
493aff3133 more prototyping of head feature geometry 2013-05-22 11:42:35 -07:00
Andrzej Kapolka
0e7c0e08eb Since we're not using deltaTime (yet), don't pass it as a parameter (yet). 2013-05-22 11:29:46 -07:00
Andrzej Kapolka
ada32f1a8b Added back "floor," "bounce." 2013-05-22 11:08:04 -07:00
Andrzej Kapolka
7e5418f8db Fix for default environment, better capsule placement. 2013-05-22 10:53:58 -07:00
Geenz
fb553fce80 Refactor startup timing a little by getting the current time the moment the application enters its main function, then passing that to Application's constructor. Also fix the titlebar bug by setting the title bar at the end of initializeGL() instead of at the end of the first frame (which would actually further the inaccuracy of the startup time). 2013-05-22 10:53:35 -04:00
Philip Rosedale
0d231b5550 Added lift to transmitter with finger, for true god-like flight! 2013-05-21 23:24:58 -07:00
ZappoMan
a311e40f25 hopefully fix unix build buster 2013-05-21 23:10:57 -07:00
Philip Rosedale
2edd085941 Added sensor fusion with gravity to transmitter to stabilize drift offset in pitch and roll. 2013-05-21 22:40:13 -07:00
Andrzej Kapolka
8d255f7685 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 22:38:23 -07:00
Andrzej Kapolka
c7e840e0d4 The end parameter to glDrawRangeElements is inclusive. 2013-05-21 22:36:27 -07:00
Andrzej Kapolka
8b1362636e Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 22:29:46 -07:00
Philip Rosedale
8b65fcae75 Merge pull request #352 from tschw/master 
refactors logging, adds comments, and revises names & formatting in all submitted code
 2013-05-21 22:10:10 -07:00
Andrzej Kapolka
a864a6f8c6 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 21:34:09 -07:00
Andrzej Kapolka
fd98982fa6 Support for multiple environments, collisions with notional planet surfaces. 2013-05-21 21:33:08 -07:00
Philip Rosedale
47d9035def Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 20:34:55 -07:00
Jeffrey Ventrella
9f82b9fb43 test 2013-05-21 17:51:41 -07:00
Jeffrey Ventrella
e219cd8223 Merge remote-tracking branch 'upstream/master' 2013-05-21 17:44:45 -07:00
Jeffrey Ventrella
006fc3268e thingy 2013-05-21 17:44:24 -07:00
birarda
63fcb2eeef Merge pull request #367 from ZappoMan/voxel_animation 
Fixes "Delete" voxel behavior
 2013-05-21 17:43:36 -07:00
Jeffrey Ventrella
6e5f036eeb test 2013-05-21 17:41:50 -07:00
Jeffrey Ventrella
25dfc7bc4b Merge remote-tracking branch 'upstream/master' 2013-05-21 17:38:36 -07:00
Jeffrey Ventrella
c32d621d5f improving lookat behavior 2013-05-21 17:38:17 -07:00
Stephen Birarda
3ac20849d6 remove old menu code and glew implemenation file 2013-05-21 16:21:33 -07:00
Jeffrey Ventrella
0b7e0ef43d test 2013-05-21 16:13:41 -07:00
Philip Rosedale
f7e75ee57c Fixed conflict 2013-05-21 15:47:15 -07:00
Philip Rosedale
6ff4b88ea4 starting tweaks to head gyro motion 2013-05-21 15:46:11 -07:00
Jeffrey Ventrella
b881507f51 fixed mouth and added a test for transmitting look at 2013-05-21 15:43:40 -07:00
Jeffrey Ventrella
16a1dd103d Merge remote-tracking branch 'upstream/master' 2013-05-21 15:27:37 -07:00
Jeffrey Ventrella
2781a354a8 reversed gyro for head (didn't know the headset was on backwards :) 2013-05-21 15:27:03 -07:00
ZappoMan
4f0aca4b0c Merge pull request #372 from birarda/master 
refactor FindGLM to not check twice, revert the previous audio change
 2013-05-21 15:12:43 -07:00
Jeffrey Ventrella
e09e01b81e Merge remote-tracking branch 'upstream/master' 2013-05-21 15:09:23 -07:00
Jeffrey Ventrella
6840ce0bbe thingy 2013-05-21 15:09:05 -07:00
Philip Rosedale
dc8dea727a Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 15:04:24 -07:00
Philip Rosedale
330c59b36b Fixed conflicts 2013-05-21 15:04:12 -07:00
Jeffrey Ventrella
1f82d339d0 Merge remote-tracking branch 'upstream/master' 2013-05-21 15:03:06 -07:00
Jeffrey Ventrella
c11851b75d cleaned up formatting stuff 2013-05-21 15:02:44 -07:00
Stephen Birarda
95cef67e33 Revert "remove unused variable in Audio" 
This reverts commit bbdd601855.
 2013-05-21 15:01:08 -07:00
Philip Rosedale
f47b5a196a Added missing transmitter files 2013-05-21 15:00:22 -07:00
birarda
ca9738a101 Merge pull request #370 from birarda/master 
remove unused varible in Audio
 2013-05-21 14:52:45 -07:00
Stephen Birarda
bbdd601855 remove unused variable in Audio 2013-05-21 14:52:05 -07:00
Jeffrey Ventrella
ef95b13723 Merge remote-tracking branch 'upstream/master' 2013-05-21 14:21:14 -07:00
Jeffrey Ventrella
d21b48ad6e cleaned up a lot of pitch/yaw/roll confusion in Head and made new versions of eyes, eyebrows and mouth (Head still needs work) 2013-05-21 14:20:44 -07:00
tosh
0ab2d4c741 Merge branch 'master' of git://github.com/worklist/hifi 2013-05-21 23:13:21 +02:00
ZappoMan
fdba349d9b temporary hack fix to busted build 2013-05-21 13:57:54 -07:00
tosh
ba4f4b9809 Merge branch 'master' of git://github.com/worklist/hifi 2013-05-21 22:49:39 +02:00
ZappoMan
0bcd629c8a Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-21 13:46:04 -07:00
ZappoMan
6f0035b297 Merge pull request #365 from PhilipRosedale/master 
Made Transmitter it's own class, removed V1 Transmitter code (Glass and Android)
 2013-05-21 13:45:15 -07:00
Andrzej Kapolka
1118c06f5d Only do collision checking for own avatar. 2013-05-21 13:01:01 -07:00
Andrzej Kapolka
597769a861 Added basic capsule/sphere collisions between avatar and voxels. 2013-05-21 12:58:02 -07:00
ZappoMan
9f23f846a9 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-21 12:47:46 -07:00
Philip Rosedale
71a875042a Updated transmitter class to handle correct orientation of gyros 2013-05-21 11:57:14 -07:00
ZappoMan
7c9be4b9f5 cleanup code 2013-05-21 11:42:13 -07:00
ZappoMan
a7f0a66aee code cleanup 2013-05-21 11:31:47 -07:00
ZappoMan
0dde5b6411 remove dead code, comment cleanup 2013-05-21 11:28:12 -07:00
ZappoMan
4f9c7fed59 removed UI for want exists bits, defaults to true 2013-05-21 11:25:50 -07:00
ZappoMan
ef2d27aba6 getting closer to working delete 2013-05-21 10:43:31 -07:00
Philip Rosedale
340882a330 Changed 1P view to turn off head rendering when close/inside head rather than showing disembodied neck 2013-05-21 10:22:05 -07:00
Andrzej Kapolka
b15162abfd Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 09:49:12 -07:00
tosh
bfaeb4a4d9 Merge branch 'master' of git://github.com/worklist/hifi 
Conflicts:
	libraries/avatars/src/AvatarData.cpp
 2013-05-21 18:46:20 +02:00
Philip Rosedale
3539ec858e Added hand movement and body motion to transmitter. Feel much better - like dancing. 2013-05-20 23:22:28 -07:00
Philip Rosedale
7728a54d26 Converted Transmitter to separate class, removed V1 (Google Glass, Android) support for V2 (iOS) transmitter 2013-05-20 19:00:49 -07:00
Jeffrey Ventrella
9d3e76efe2 operating on head. patient under anesthesia 2013-05-20 17:53:55 -07:00
Jeffrey Ventrella
6e994ed425 Merge remote-tracking branch 'upstream/master' 2013-05-20 17:33:27 -07:00
Jeffrey Ventrella
72f8f447a1 starting a rework of Head renderer 2013-05-20 17:30:13 -07:00
Philip Rosedale
6392bb0045 Merge pull request #363 from birarda/head-changes 
move lean sideways and lean forwards to the head data class
 2013-05-20 17:25:05 -07:00
Andrzej Kapolka
1be859ede9 Use glDrawRangeElements, which indicates the range of used indices. It may or 
may not make a difference in performance, but it won't hurt.
 2013-05-20 17:14:41 -07:00
Stephen Birarda
564244ddd3 move _leanSideways and _leanForwards to HeadData 2013-05-20 17:13:40 -07:00
ZappoMan
d1554e0150 Merge pull request #361 from birarda/head-changes 
add a HeadData class to reduce redundancy for head member variables
 2013-05-20 17:08:09 -07:00
Andrzej Kapolka
5b0640bbbf Whoops--fixed a matrix stack issue that was breaking Oculus rendering. 2013-05-20 16:52:40 -07:00
Stephen Birarda
570dfba934 code review comments, cleanup Avatar constructor 2013-05-20 16:12:38 -07:00
tosh
a86b8a1d93 refactors logging 2013-05-21 01:00:10 +02:00
tosh
4385fc31e8 adds missing include "InterfaceConfig.h" for OpenGL types 2013-05-21 00:59:29 +02:00
ZappoMan
e1c89aac87 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-20 15:52:04 -07:00
ZappoMan
a53f84fcb9 latest hacking 2013-05-20 15:51:47 -07:00
Stephen Birarda
de84b7803f move _lookAtPosition to HeadData class 2013-05-20 15:51:40 -07:00
Andrzej Kapolka
06c78c2f12 Tweak: let the reader know when it needs to load the full VBO. 2013-05-20 15:41:19 -07:00
Stephen Birarda
257a1d1f2e move head rotations to new HeadData class to be used for transmission 2013-05-20 15:21:02 -07:00
Andrzej Kapolka
8d522cd3ed I believe the problem with voxel rendering is caused by the update thread's 
writing the data while the render thread is attempting to read it.  This
should fix the issue.
 2013-05-20 15:15:44 -07:00
Andrzej Kapolka
8c71741843 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-20 15:13:36 -07:00
tosh
e70efe7481 fixes improper merge / changes 2013-05-20 23:37:06 +02:00
Jeffrey Ventrella
b42d093b4a Merge remote-tracking branch 'upstream/master' 2013-05-20 14:36:13 -07:00
Jeffrey Ventrella
d144fb7f84 fix 2013-05-20 14:34:39 -07:00
tosh
06288e8366 Merge branch 'master' of git://github.com/worklist/hifi 
Conflicts:
	interface/src/Oscilloscope.cpp
 2013-05-20 23:15:06 +02:00
ZappoMan
4298b922a2 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 
Conflicts:
	libraries/avatars/src/AvatarData.cpp
 2013-05-20 13:55:01 -07:00
ZappoMan
321d1952d6 first cut at exists bits 2013-05-20 12:56:59 -07:00
Stephen Birarda
6aafcc752d re-arrange member variable constructors for compiler warning 2013-05-20 12:51:21 -07:00
Jeffrey Ventrella
1e9b04d28f cleanup 2013-05-20 12:16:18 -07:00
Stephen Birarda
7b21b8520e Merge branch 'master' of github.com:worklist/hifi 2013-05-20 12:16:10 -07:00
Andrzej Kapolka
616285f4c7 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-20 12:13:53 -07:00
Andrzej Kapolka
3f0fd2f976 Added toggle for voxel textures; they may be slowing some machines down. 2013-05-20 12:13:23 -07:00
Jeffrey Ventrella
677f0b5d2e Merge remote-tracking branch 'upstream/master' 2013-05-20 12:13:21 -07:00
Jeffrey Ventrella
f09cbca00b cleanup 2013-05-20 12:12:46 -07:00
Jeffrey Ventrella
a192a21ef0 added _lookatPosition to avatar Data 2013-05-20 12:08:58 -07:00
Andrzej Kapolka
85dc14bb94 Drag support for adding/removing (as well as coloring) voxels. I had to 
ensure that the "last" voxel edited was the one under the cursor after the
operation, not the one operated on.
 2013-05-20 12:01:33 -07:00
Jeffrey Ventrella
d384e36af1 test 2013-05-20 11:59:19 -07:00
Philip Rosedale
956ffe223f Merge branch 'master' of https://github.com/worklist/hifi 2013-05-20 11:56:47 -07:00
Philip Rosedale
28581e33cc turn off audio echo rendering (it's for debug) 2013-05-20 11:56:40 -07:00
Philip Rosedale
50ee9b9ee4 Added options menu choice for 'MouseLook', defaults off 2013-05-20 11:50:04 -07:00
Stephen Birarda
dae7bf8674 use AgentList defaults when AIM has no socket or address set 2013-05-20 11:48:50 -07:00
Jeffrey Ventrella
aa9783a88d Merge remote-tracking branch 'upstream/master' 2013-05-20 11:41:45 -07:00
Jeffrey Ventrella
ffbc70814a preparing to add transmitted lookat position data 2013-05-20 11:41:21 -07:00
Andrzej Kapolka
0f2f4ee8f9 Add the discussed four lines to disable blending and enable backface culling. 2013-05-20 11:32:32 -07:00
Andrzej Kapolka
85bca558f5 Tabs -> spaces, spacing fix. 2013-05-20 09:38:01 -07:00
Jeffrey Ventrella
7f0d2e572e some preliminary work on avatarRenderer 2013-05-20 07:38:00 -07:00
Andrzej Kapolka
ae02004ef6 Use M rather than L, since L is taken by the level display. 2013-05-19 22:40:53 -07:00
Andrzej Kapolka
0539739720 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-19 18:38:09 -07:00
Andrzej Kapolka
dd3e8d524a Support for eye offset position/orientation in camera/frustum. 2013-05-19 18:37:21 -07:00
tosh
e99a41f41b revises oscilloscope 2013-05-19 16:28:49 +02:00
tosh
fbdda8bce4 adds comments 2013-05-19 15:07:48 +02:00
tosh
cfd4100c6e revises log display 2013-05-19 14:52:01 +02:00
tosh
2120ab9b1e puts member variables last but first 2013-05-19 13:23:04 +02:00
tosh
de665c2d48 adjusts names 2013-05-19 13:01:57 +02:00
Jeffrey Ventrella
bbeac7701a small fix 2013-05-18 14:43:23 -07:00
Jeffrey Ventrella
64392d0a78 Merge remote-tracking branch 'upstream/master' 2013-05-18 14:32:28 -07:00
Jeffrey Ventrella
5a4813d5c9 improved algorithm for rotating eyes to look at target 2013-05-18 14:31:27 -07:00
Philip Rosedale
5475b19a9e Merge branch 'master' of https://github.com/worklist/hifi 2013-05-18 12:33:31 -07:00
Philip Rosedale
d9cc07cf17 Working on audio echo cancellation 2013-05-18 12:33:21 -07:00
ZappoMan
0ff65b44b5 Merge pull request #337 from tschw/19165 
19165
 2013-05-18 10:45:15 -07:00
tosh
4f3f5e1abe clarifies some names 2013-05-18 13:35:06 +02:00
tosh
989256aad0 clarifies some names 2013-05-18 13:33:01 +02:00
tosh
2cc5f732ce Merge branch '19165' of git://github.com/tschw/hifi 2013-05-18 11:03:09 +02:00
tosh
864d4e6734 Merge branch '19188' of git://github.com/tschw/hifi 2013-05-18 11:02:52 +02:00
Stephen Birarda
c504e8aa1a fix incorrect ordering of member variables in Head 2013-05-17 18:30:41 -07:00
Stephen Birarda
391d6dca8e remove the voxel server erase all that's unused 2013-05-17 17:54:04 -07:00
Jeffrey Ventrella
f099702d2a Merge remote-tracking branch 'upstream/master' 2013-05-17 14:56:51 -07:00
Jeffrey Ventrella
f2af37801e tidied up the head class and fixed a negated pitch value in orientation 2013-05-17 14:56:14 -07:00
Stephen Birarda
fc0448a148 disallow copying of VoxelSystem objects 2013-05-17 12:32:42 -07:00
Stephen Birarda
3e65d5a548 inline getters and setters in Avatar 2013-05-17 12:25:00 -07:00
Stephen Birarda
1ba1b56b2c disallow copying of Avatar objects 2013-05-17 12:15:19 -07:00
Stephen Birarda
ce7918108c remove a lingering comment 2013-05-17 11:09:23 -07:00
Stephen Birarda
194035e464 repair indentation in Head constructor 2013-05-17 11:08:44 -07:00
Stephen Birarda
a11ddee974 fix the width and height for the new iris texture 2013-05-17 10:55:11 -07:00
Stephen Birarda
b2518e0595 change the iris texture 2013-05-17 10:51:29 -07:00
Stephen Birarda
c214e9b179 use the default Avatar destructor, comment out unused consts in Head 2013-05-17 10:46:59 -07:00
Stephen Birarda
a1ea7b58dd remove unused GLUQuadric sphere from Avatar class 2013-05-17 10:45:26 -07:00
Stephen Birarda
0e7c0776f2 refactor the Head class to remove _sphere and use default copy constructor 2013-05-17 10:43:26 -07:00
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