Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-12 03:38:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
4499 commits 74 branches 59 tags 1.2 GiB
Commit graph

2296 commits

Author SHA1 Message Date
Stephen Birarda
1c0b256f92 remove echo cancellation from audio code 2013-06-26 16:22:54 -07:00
Stephen Birarda
fd30725222 add a missing set of parenthesis 2013-06-26 15:53:35 -07:00
Stephen Birarda
6c4dd03867 add a missing semicolon 2013-06-26 15:52:26 -07:00
Stephen Birarda
2c7d720e88 add a boolean helper for _owningAvatar NULL comparison 2013-06-26 15:52:01 -07:00
Andrzej Kapolka
5ef400b193 Got the depth information displaying. 2013-06-26 15:35:44 -07:00
Andrzej Kapolka
c0b5bc5922 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-06-26 12:59:50 -07:00
Andrzej Kapolka
5e989b6ee5 More work on obtaining Kinect data. 2013-06-26 12:19:10 -07:00
Stephen Birarda
383b6ecec2 use correct future appcast URL 2013-06-26 11:27:55 -07:00
Stephen Birarda
949395348f switch to silent update checking 2013-06-26 10:42:07 -07:00
Stephen Birarda
0b243ec881 add fervor updater and run during launch if OS X release 2013-06-26 10:36:32 -07:00
Stephen Birarda
800bfd097b alphabetize some includes in Application header 2013-06-26 10:35:17 -07:00
Philip Rosedale
0b37ce5375 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-25 21:08:37 -07:00
Andrzej Kapolka
f2f29d2e60 Well, I guess OS X doesn't like || and && without parentheses. 2013-06-25 16:58:31 -07:00
Andrzej Kapolka
6eb421d564 Blink less when talking (and never when brows are raised); force a blink after 
we stop talking.
 2013-06-25 16:51:22 -07:00
Stephen Birarda
5cf89e90d7 fix redundancy in reference to Rect for OpenCV 2013-06-25 16:45:14 -07:00
Andrzej Kapolka
3d214c2655 More work on Kinect integration. 2013-06-25 15:26:07 -07:00
Andrzej Kapolka
1d578d5b0e Lots of Kinect bits. 2013-06-25 14:27:13 -07:00
Andrzej Kapolka
7ab1055d47 Derp, need to bind the element array buffer. 2013-06-24 17:25:09 -07:00
Andrzej Kapolka
9356d1a27d Turns out sincos is a GNU thing. 2013-06-24 17:16:06 -07:00
atlante45
ee15739e7e few fixes on the job 19368 2013-06-25 01:28:31 +02:00
atlante45
52d62185ee Merge branch 'master' of https://github.com/worklist/hifi into 19368 2013-06-25 00:24:54 +02:00
atlante45
d6c70ea6ca #19368 - Improve editing/building workflow in Interface 2013-06-25 00:24:21 +02:00
Andrzej Kapolka
a0ecd167fc Replace 0/1 with FULLY_OPEN/CLOSED. 2013-06-24 10:31:11 -07:00
Andrzej Kapolka
1e258aae99 Define blink speed as a constant. 2013-06-24 10:20:01 -07:00
ZappoMan
c627010d3a Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-06-24 10:12:59 -07:00
tosh
7690ace2c3 Merge branch 'master' of git://github.com/worklist/hifi into 19377 
Conflicts:
	interface/src/Audio.cpp
 2013-06-22 05:35:31 +02:00
tosh
09962737dd tightens bounding issues for bandwidth meter's scale indicators 2013-06-22 05:21:15 +02:00
tosh
4f692aeb56 improves bandwidth meter layout / simplifies & fixes rendering 2013-06-22 05:07:01 +02:00
tosh
290c20bfc7 introduces bandwidth meter / dialog 2013-06-22 04:22:10 +02:00
Andrzej Kapolka
ef7c6ebdc6 Basic blinking. 2013-06-21 18:11:31 -07:00
ZappoMan
4590bdc69d added support for clipping polygons to screen bounds, not yet enabled since it doesn't help performance, will use in future 2013-06-21 16:42:55 -07:00
Andrzej Kapolka
5bbff6f63f Merge branch 'master' of https://github.com/worklist/hifi into opencv 
Conflicts:
	interface/src/Balls.cpp
 2013-06-21 14:40:47 -07:00
Philip Rosedale
7e12a0c1d7 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-21 14:33:52 -07:00
Philip Rosedale
74f6ee6fca Fixed spacing at parenthesis 2013-06-21 14:33:37 -07:00
Andrzej Kapolka
650e659ee8 Fixed includes, pointer warning. 2013-06-21 14:33:01 -07:00
Stephen Birarda
258eed5890 fix casing of SharedUtil include in balls 2013-06-21 14:32:55 -07:00
Andrzej Kapolka
0c184b9912 Merge pull request #571 from ey6es/opencv 
Quick fix for something I broke in mouse/touch took.
 2013-06-21 14:30:59 -07:00
Andrzej Kapolka
94cbb50dfa Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-21 14:30:03 -07:00
birarda
bd0d820fc7 Merge pull request #556 from PhilipRosedale/master 
Dynamic jitter buffer for less stuttering, fixes to stereo
 2013-06-21 14:29:45 -07:00
Andrzej Kapolka
686fc3607e Fix for mouse/touch look: don't apply rotations if the gyros/webcam aren't 
connected.
 2013-06-21 14:25:25 -07:00
Philip Rosedale
12ef87e073 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-21 14:23:49 -07:00
Andrzej Kapolka
483407a3f2 Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-21 14:09:38 -07:00
Andrzej Kapolka
0000eac95f Implementation parameter name should match interface parameter name. 2013-06-21 14:02:35 -07:00
Andrzej Kapolka
5194fb2ee6 Don't bother with testing the ignore orientations stuff. 2013-06-21 13:58:49 -07:00
Eric Johnston
6825274b65 Re-issue of change which adds two-finger touch look to avatar. 
The option is un-checked by default because of an unsolved problem: We're getting the events into Qt very slowly, so input from several seconds ago is still active when the user has stopped the touch action. This needs to be fixed before this can be turned on full-time.
Corrections were made per feedback, and the change has been merged with the latest.
 2013-06-21 13:43:23 -07:00
Philip Rosedale
6eafd6582e Merge branch 'master' of https://github.com/worklist/hifi 2013-06-21 11:42:29 -07:00
Philip Rosedale
1f6fd31b52 Merge pull request #568 from ey6es/opencv 
Head roll, lean from webcam data.
 2013-06-21 11:41:21 -07:00
Andrzej Kapolka
0e223b90d9 Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-21 11:35:23 -07:00
Andrzej Kapolka
00eba63e4e Added various options to test for voxel avatars, manual third person mode 
(also, cleaned up the camera switching a little).
 2013-06-21 11:33:38 -07:00
Philip Rosedale
13b729d9b4 Fixed problems with ring buffer not handling stereo right, reset audio buffers on spacebar. 2013-06-20 18:49:05 -07:00
Andrzej Kapolka
3de76c9e15 Approach the webcam position rapidly. 2013-06-20 16:28:48 -07:00
Andrzej Kapolka
281aee1f12 Increased smoothing substantially to reduce effect of jittering face rect. 2013-06-20 16:22:46 -07:00
Andrzej Kapolka
8cffaf7cc0 Fixed includes. 2013-06-20 16:09:24 -07:00
Andrzej Kapolka
7e34bef01e Attempt to fuse gyro readings with webcam data. 2013-06-20 16:07:33 -07:00
Stephen Birarda
8b7b0d542a send the interface startup time to log stash 2013-06-20 15:34:17 -07:00
Andrzej Kapolka
02b881aa33 Increased the camera distance in mirror mode to avoid clipping. 2013-06-20 15:08:46 -07:00
Andrzej Kapolka
b0dd5223e1 Avatar head roll/lean based on webcam data. 2013-06-20 14:20:03 -07:00
Andrzej Kapolka
b14a0c1554 Reset webcam along with other sensors on spacebar, added settings config for 
non-Apple.
 2013-06-20 11:44:47 -07:00
Philip Rosedale
56b8a5880d cleaned up stdout audio reporting 2013-06-20 10:59:50 -07:00
Philip Rosedale
c740400224 Merge fixes plus auto jitter buffer 2013-06-20 10:54:58 -07:00
Andrzej Kapolka
6493f3aa44 Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-20 10:08:58 -07:00
Philip Rosedale
2c8c34f9bd set jitter buffer on application start to 1/2 of a packet 2013-06-20 09:08:37 -07:00
ZappoMan
517ff0f3cf Merge pull request #565 from tschw/19371 
Code Review for Job #19371
 2013-06-19 21:08:55 -07:00
Philip Rosedale
5dae92d610 Merge pull request #560 from ZappoMan/occlusion_culling 
Occlusion culling optimizations
 2013-06-19 19:26:56 -07:00
tosh
72a29979d0 Merge branch 'master' of git://github.com/worklist/hifi into 19371 
Conflicts:
	interface/CMakeLists.txt
 2013-06-20 03:46:25 +02:00
tosh
9c54ef18d3 adds 'Oscilloscope::setColor' and uses it when visualizing echo cancellation 2013-06-20 03:15:01 +02:00
Andrzej Kapolka
0dc0552f50 Basic Haar cascade/CamShift tracking. 2013-06-19 18:02:26 -07:00
ZappoMan
cadd596508 implement partitioned CoverageRegions in CoverageMap to further optimize polygon compares 2013-06-19 17:52:01 -07:00
tosh
7588b7f6bb - separates audio system round trip time determination from echo cancellation 
- changes speex parameters to more humble values
- resolves build issues by removing the speex dylibs - static ones are fine
- tightens build script
 2013-06-20 02:00:12 +02:00
Philip Rosedale
3304f0eb2e Merge branch 'master' of https://github.com/worklist/hifi 2013-06-19 16:03:20 -07:00
Philip Rosedale
bc374d0183 More audio tweaks 2013-06-19 16:02:56 -07:00
tosh
651dc19427 separates echo cancellation from loopback test (intermediate commit) 2013-06-19 23:55:15 +02:00
Andrzej Kapolka
d4d662b3f5 Convert frame to grayscale and equalize. 2013-06-19 14:13:42 -07:00
ZappoMan
1284f9d09a naming cleanup and some optimizations 2013-06-19 13:45:13 -07:00
Andrzej Kapolka
2e52925496 Bump this up to 60 again. 2013-06-19 11:22:41 -07:00
Andrzej Kapolka
46b3d829d5 Round FPS display. 2013-06-19 11:06:51 -07:00
Andrzej Kapolka
68371f8c3f Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-19 11:04:12 -07:00
Andrzej Kapolka
1651044234 Disable auto exposure, set exposure rather high (which causes a lower exposure 
time).
 2013-06-19 11:02:48 -07:00
Andrzej Kapolka
963b033e41 Fixed warning on OS X, playing with settings. 2013-06-19 10:50:58 -07:00
Andrzej Kapolka
352f7ca3cf Provide option to enable/disable webcam (disabled by default). 2013-06-19 10:46:54 -07:00
Andrzej Kapolka
dbde66cbd5 Use trigger to change the state of the menu actions; that way, we get the 
callbacks.
 2013-06-19 10:32:55 -07:00
tosh
755208aaf7 comments unused variable to avoid a compiler warning 2013-06-19 16:19:50 +02:00
tosh
7342b7a774 Merge branch 'master' of git://github.com/worklist/hifi into 19371 2013-06-19 16:15:38 +02:00
tosh
97fc38313b implements audio echo cancellation based on speex 2013-06-19 16:12:25 +02:00
Andrzej Kapolka
cc9f8bc717 Adjustments to UVCCameraControl invocation. 2013-06-18 18:15:52 -07:00
Andrzej Kapolka
2e033631eb Make our call to configureCamera on OS X. 2013-06-18 16:50:15 -07:00
Andrzej Kapolka
4519b43072 Initialization order fix. 2013-06-18 14:48:58 -07:00
Andrzej Kapolka
9cb671aa56 Slightly better fps computation. 2013-06-18 14:43:19 -07:00
Andrzej Kapolka
e1f76b2bdf Limit the rate at which we acquire images, since OS X doesn't block like Linux 
does.
 2013-06-18 14:37:24 -07:00
Andrzej Kapolka
e98d1f9a92 Let's try getting the cam's fps. 2013-06-18 14:18:33 -07:00
Andrzej Kapolka
2ad8585f26 Show the acquisition fps. 2013-06-18 14:11:13 -07:00
Andrzej Kapolka
2a60414968 Set the desired webcam resolution and fps, report what we actually get. 2013-06-18 13:56:58 -07:00
Andrzej Kapolka
0fa710e518 Let's try using glPixelStore to specify the widthStep. 2013-06-18 13:39:54 -07:00
Andrzej Kapolka
2c2297b2bd Let's try using widthStep rather than nChannels and computing the alpha 
values.
 2013-06-18 13:30:31 -07:00
tosh
682a7c9cdf libspeexdsp-based echo cancellation (untested) 2013-06-18 22:18:27 +02:00
Andrzej Kapolka
a4324d71d5 If we don't get the image frame, try again later. 2013-06-18 13:08:16 -07:00
Philip Rosedale
216c5d054d working on audio system, added metrics on in/out latency. 2013-06-18 12:16:39 -07:00
Andrzej Kapolka
9e92ea03da Rather than copying to a QImage, just send the pointer. Also, put the render 
code in Webcam itself.
 2013-06-18 12:13:40 -07:00
ZappoMan
1fc3ad8011 CR feedback 2013-06-18 12:03:58 -07:00
ZappoMan
8b18ee6844 renamed VoxelProjectedShadow class 2013-06-18 12:01:01 -07:00
ZappoMan
46d7ada753 code cleanup 2013-06-18 10:21:47 -07:00
ZappoMan
8331fc1acb removed some old debug code 2013-06-18 10:19:49 -07:00
ZappoMan
7fe6c0e3b3 added occlusion culling menu option 2013-06-18 09:34:12 -07:00
Philip Rosedale
002f8c736f Added adjustable audio jitter buffer (in preferences), and simple lowPassFilter (for pert testing compared to LPF) 2013-06-17 18:30:02 -07:00
Andrzej Kapolka
341cde61f5 Allow four channel images, create a copy. 2013-06-17 18:21:35 -07:00
Andrzej Kapolka
a771f53df3 Read the webcam frames in a separate thread, since the call blocks. 2013-06-17 18:07:53 -07:00
Andrzej Kapolka
3c58f0c0a7 Must init webcam after OpenGL. 2013-06-17 16:24:47 -07:00
Andrzej Kapolka
c7ddc89803 Basic frame grab from camera; not currently working yet, but let's try on 
OS X!
 2013-06-17 15:06:40 -07:00
Andrzej Kapolka
ec495e14d3 Missed these guys. 2013-06-17 13:29:24 -07:00
Andrzej Kapolka
4421b21124 Working on reintegrating OpenCV (also, removed lodepng). 2013-06-17 13:24:01 -07:00
tosh
e3da925e46 Merge branch 'master' of git://github.com/worklist/hifi into 19371 2013-06-17 07:18:19 +02:00
tosh
66f350d846 echo cancellation: ui, calibration, visualization 2013-06-17 07:16:29 +02:00
ZappoMan
c9e1c898c2 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-06-14 19:50:38 -07:00
Andrzej Kapolka
c11ab45474 It seems gl_ModelViewMatrixInverse is problematic on OS X; let's try passing 
in the camera's position as transformed into model space.
 2013-06-14 17:21:35 -07:00
Andrzej Kapolka
790cdfb0bd Added refraction to irises. 2013-06-14 16:46:34 -07:00
Andrzej Kapolka
ec0b1a99fb Fix iris orientations: start with the head orientation, then rotate onto the 
lookat vector.  This way, the irises don't rotate around as we yaw.
 2013-06-14 11:23:08 -07:00
ZappoMan
620a4a8ad6 latest occlusion culling with support for checking map without adding to coverage map for checking parent nodes 2013-06-13 16:37:14 -07:00
Philip Rosedale
dd1df47c71 fixes per review 2013-06-13 16:20:28 -07:00
Philip Rosedale
e6e147d86a Merge branch 'master' of https://github.com/worklist/hifi 2013-06-13 16:09:28 -07:00
Andrzej Kapolka
e401663459 Added per-pixel specular highlight to irises. 2013-06-13 15:58:49 -07:00
Philip Rosedale
04736fefb5 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-13 15:04:41 -07:00
Philip Rosedale
f6e6ceddfe Head camera scaling always one if gyros off so that mouse look works. 2013-06-13 14:53:10 -07:00
Andrzej Kapolka
466c062bc1 Use a bound texture for the iris, load it with Qt rather than lodepng (we can 
probably just remove the lodepng dependency).
 2013-06-13 14:41:06 -07:00
Philip Rosedale
1556886a64 fixing reversed lookat, rendering for all avatars 2013-06-13 14:33:09 -07:00
Philip Rosedale
8af0da754f we are always looking at something 2013-06-13 14:21:14 -07:00
Philip Rosedale
687966c486 Other people's avatar's look where they are mousing 2013-06-13 14:04:51 -07:00
Philip Rosedale
e32f9f387a Basic random eye movements added, and fixation on camera in mirror mode. 2013-06-13 13:50:56 -07:00
ZappoMan
40c2cf2d44 removed some dead code 2013-06-13 13:31:26 -07:00
ZappoMan
8320925add Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-06-13 13:30:18 -07:00
Andrzej Kapolka
78072fbde0 Merge pull request #523 from PhilipRosedale/master 
Better physics, first person to third person transition
 2013-06-13 12:07:06 -07:00
Philip Rosedale
b85f91a7d4 fixes per code review 2013-06-13 12:05:06 -07:00
Philip Rosedale
d517487d1b OK I wanted us to jump just a bit higher. 2013-06-13 11:35:36 -07:00
Philip Rosedale
61b1a2f995 First person to third person transition driven by velocity, changes to make moving and flying physics more fun. 2013-06-13 11:31:41 -07:00
Andrzej Kapolka
db729a04aa Converted double timestamps to long long (64 bit integers), fixed bug with 
updating agent timestamps.
 2013-06-13 11:11:59 -07:00
ZappoMan
72b2845178 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-06-13 09:40:45 -07:00
Philip Rosedale
c0ba2aeebe Added jumping, tuned friction model, tuned thrust 2013-06-12 23:45:59 -07:00
ZappoMan
b8e51943ab make sure position is in voxel units NOT TREE_SCALE 2013-06-12 21:45:45 -07:00
ZappoMan
0f234d739e remove Camera menu from frustum debugging, because its obsolete and only causes problems 2013-06-12 21:44:49 -07:00
Philip Rosedale
a5a0df09cb removed grab voxel rendering 2013-06-12 16:36:55 -07:00
Philip Rosedale
3d1ddf047e Merge branch 'master' of https://github.com/worklist/hifi 2013-06-12 16:27:53 -07:00
Andrzej Kapolka
ccd61ee5a2 Found the problem we were having: the domain server was reporting back all 
kinds of things as our ID.
 2013-06-12 16:13:44 -07:00
Andrzej Kapolka
19180ad900 Put the debugging back in. 2013-06-12 15:56:28 -07:00
Andrzej Kapolka
e4ed9162b9 This should help, as well as fix another annoyance: bind to an ephemeral port, 
rather than a fixed one.
 2013-06-12 15:52:29 -07:00
Philip Rosedale
311b09eee0 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-12 14:30:48 -07:00
Andrzej Kapolka
f197b4cd62 Some debugging to use on the other machine. 2013-06-12 14:20:28 -07:00
Andrzej Kapolka
b28df17207 Slight tweak: we need to call trigger in order to get the full toggle 
behavior.
 2013-06-12 13:51:16 -07:00
Andrzej Kapolka
178996bb8b Make sure first person mode and mirror mode are mutually exclusive. 2013-06-12 13:30:41 -07:00
Philip Rosedale
6cffb16279 merge fixes 2013-06-12 13:29:17 -07:00
Andrzej Kapolka
52c616b688 Added configurable lean scale, fixed loadSetting. 2013-06-12 13:06:28 -07:00
Philip Rosedale
26ca1a9a1d Remove shortcut on ground plane 'G', was conflicting with turning gravity on/off 2013-06-12 12:58:45 -07:00
ZappoMan
627f61badb some debug changes for testing occlusion culling 2013-06-12 12:36:28 -07:00
Philip Rosedale
6164e6cd7e Merge branch 'master' of https://github.com/worklist/hifi 2013-06-12 11:37:24 -07:00
Philip Rosedale
3546bcc101 Avatar can set velocity, velocity set to zero on reset 2013-06-12 11:36:28 -07:00
Andrzej Kapolka
59c8d9d26a Function cleanup, fixed misspelling, tweaked transparency distances to 
accomodate lean.
 2013-06-12 10:25:28 -07:00
ZappoMan
636030b0bb Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-06-12 01:17:03 -07:00
ZappoMan
e2d22a8e21 latest cut at occlusion culling 2013-06-12 01:16:46 -07:00
Philip Rosedale
750d210f0a Merge branch 'master' of https://github.com/worklist/hifi 2013-06-11 21:20:39 -07:00
Philip Rosedale
ad58d0aa23 Adding voxel thrust on grabbing/dragging to move avatar 2013-06-11 21:19:58 -07:00
Andrzej Kapolka
c58eb0d584 Bump the maximum voxels up to 10000. 2013-06-11 18:11:42 -07:00
Andrzej Kapolka
7ef2a2c5d9 Set/get lean to/from network data. 2013-06-11 18:06:05 -07:00
Andrzej Kapolka
82f03ffd8e Don't render the voxels when we're too close (i.e., in first person mode). 2013-06-11 17:53:49 -07:00
Andrzej Kapolka
648aacb53d Let's use a fixed vector for the camera position so that the target doesn't 
move with lean.
 2013-06-11 17:26:41 -07:00
Andrzej Kapolka
70c5a941d7 Now let's try using the estimated position to calculate lean. 2013-06-11 17:01:06 -07:00
Andrzej Kapolka
c1c2439d2c Let's try changing the torso rotation based on the gyros! 2013-06-11 16:44:21 -07:00
Andrzej Kapolka
35e18abcbd Let's try using estimated velocity to control "lean." 2013-06-11 16:27:39 -07:00
Andrzej Kapolka
627fd49003 Merge branch 'master' of https://github.com/worklist/hifi into gyroquat 2013-06-11 16:01:52 -07:00
Andrzej Kapolka
090df81afe Fixes to align better with previous code. 2013-06-11 15:58:50 -07:00
Andrzej Kapolka
e77aee3967 Show the average rotation rates, too. 2013-06-11 15:47:05 -07:00
Andrzej Kapolka
d913f8dec0 Actually, we want it sans gravity. 2013-06-11 14:25:05 -07:00
Andrzej Kapolka
4b890e2ccc Let's see what the long-term average acceleration is. 2013-06-11 14:23:47 -07:00
Andrzej Kapolka
47bd3bcdd7 Don't estimate acceleration before we know the gravity and don't update our 
matrices without acceleration.
 2013-06-11 14:03:49 -07:00
Andrzej Kapolka
b88380db6f New values, slower learning. 2013-06-11 13:43:29 -07:00
ZappoMan
ac7fbc6320 added occlusion tests to debug menu 2013-06-11 13:29:01 -07:00
Andrzej Kapolka
5ba1d3a28c It ain't perfect, but I'm going with what I've got for now. 2013-06-11 13:18:13 -07:00
Andrzej Kapolka
517bbe80a7 Initial values, report error. 2013-06-11 13:02:20 -07:00
ZappoMan
ab365202c8 added some debugging routines to visualize occlusion 2013-06-11 12:36:15 -07:00
Andrzej Kapolka
ff9e6f831c Revert to previous coordinates. 2013-06-11 11:31:01 -07:00
Andrzej Kapolka
bf389de774 Testing a different coordinate conversion. 2013-06-11 11:22:43 -07:00
Philip Rosedale
57fcaceec2 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-11 11:10:41 -07:00
Philip Rosedale
b1e3a0984b Improved mouse look behavior to be smoother, removed transmitter debug. 2013-06-11 11:10:09 -07:00
Andrzej Kapolka
73ceea7795 Working on "learning" the acceleration matrices. 2013-06-11 10:55:28 -07:00
ZappoMan
74d63cdd1d Merge pull request #522 from birarda/conditional-ds 
allow agents to specify which agent types they want to hear about
 2013-06-11 00:47:36 -07:00
Andrzej Kapolka
988c4f97b0 This should be the normalized offset. 2013-06-10 18:43:11 -07:00
Andrzej Kapolka
a34f9a0ef3 Need to include SharedUtil. 2013-06-10 18:41:49 -07:00
Andrzej Kapolka
90ef6a7cc0 Attempting to perform the transform between angular and linear acceleration. 2013-06-10 18:40:07 -07:00
Andrzej Kapolka
1b8683cbc5 Let's see if we can get an estimate of the distance to the sensor based on 
the ratios between linear and angular velocity.
 2013-06-10 15:22:53 -07:00
ZappoMan
27f8f5dcb8 fix CR feedback 2013-06-10 14:50:04 -07:00
Andrzej Kapolka
5820c3c7c3 Remove average measurements, compute estimated acceleration (without rotated 
gravity).
 2013-06-10 14:49:39 -07:00
Stephen Birarda
a8075e44ca Merge remote-tracking branch 'upstream/master' into conditional-ds 2013-06-10 14:01:54 -07:00
Stephen Birarda
7fb42dcb8a fix bug with sent and received agent interest packets 2013-06-10 13:48:34 -07:00
ZappoMan
fc3fb7d3f0 fixed bug with loading of corrupt settings file where NaN returned for avatar position details 2013-06-10 11:46:06 -07:00
Philip Rosedale
fb97d3e04b Merge pull request #520 from tschw/19367 
Code Review for Job #19367
 2013-06-10 08:04:16 -07:00
atlante45
c96e01ef51 Fixed merge conflict 2013-06-09 23:15:49 +02:00
atlante45
b1aabc2c1f Added shortcup for gravity use 2013-06-09 23:02:45 +02:00
Geenz
8dea00052d Merge branch 'master' of https://github.com/worklist/hifi into 19361 2013-06-09 02:08:29 -04:00
ZappoMan
b60df9ce89 Merge pull request #512 from ey6es/gyroquat 
Fixes for preferences: store avatar voxel URL along with other avatar settings, use QAction rather than separate boolean for autosave.
 2013-06-08 21:36:07 -07:00
ZappoMan
6fa8c23cca Merge branch 'master' of https://github.com/worklist/hifi into keyhole_frustum 2013-06-08 17:28:27 -07:00
ZappoMan
b69cfd4e06 fixed CR spacing issue 2013-06-08 17:27:48 -07:00
Philip Rosedale
55a5531eb7 Merge pull request #514 from ZappoMan/keyhole_frustum 
Keyhole frustum
 2013-06-08 14:22:06 -07:00
tosh
4736e95761 Merge branch 'master' of git://github.com/worklist/hifi into 19367 2013-06-08 02:37:16 +02:00
tosh
9ca0b5e7a7 removes blank lines that slipped in 2013-06-08 02:35:55 +02:00
tosh
d39b25a17b adds menu option to set whether ground plane gets rendered 2013-06-08 02:31:23 +02:00
ZappoMan
46c66c39e5 implement keyhole frustum 2013-06-07 17:23:23 -07:00
atlante45
5c07638ce2 19369 - Added "Use Gravity" option 2013-06-08 02:05:54 +02:00
Andrzej Kapolka
ac2b7d7f48 Fix for initial camera transition. 2013-06-07 15:20:26 -07:00
Stephen Birarda
1e05936aea unthread DS check in, allow agents to tell DS who they want to hear about 2013-06-07 15:19:12 -07:00
Andrzej Kapolka
096dcd089a Merge branch 'master' of https://github.com/worklist/hifi into gyroquat 2013-06-07 14:28:22 -07:00
Stephen Birarda
fc27c2c7bb more renaming for AGENT_TYPE_VOXEL_SERVER 2013-06-07 14:14:13 -07:00
Philip Rosedale
202c293a77 Merge pull request #513 from Atlante45/19366 
19366 - Smaller log display
 2013-06-07 14:13:49 -07:00
atlante45
b0d02ab7d8 19366 - Smaller log display 2013-06-07 23:02:00 +02:00
Andrzej Kapolka
5515fc02e4 Merge branch 'master' of https://github.com/worklist/hifi into gyroquat 2013-06-07 13:46:27 -07:00
Andrzej Kapolka
75c89f2c22 OK, I found the problem: duplication of state for the "autosave" option. 
Let's just use the QAction, as does everything else.
 2013-06-07 13:42:49 -07:00
Geenz
89ef026ce8 Remove seemingly unnecessary coordinate space conversion. 2013-06-07 16:42:22 -04:00
Geenz
65ec02044e Add a distance check for selected voxels. 2013-06-07 16:34:10 -04:00
Geenz
1c8d4f7717 Get the average velocity of the avatar. 2013-06-07 16:20:51 -04:00
Andrzej Kapolka
9da10df9f2 We need to set these before initMenu, as that's where we create the QSettings. 2013-06-07 13:12:59 -07:00
Geenz
82db388552 Real max velocity stuff. 2013-06-07 16:08:27 -04:00
Geenz
c79bd71fe7 Merge branch 'master' of https://github.com/worklist/hifi into 19361 2013-06-07 16:00:33 -04:00
Geenz
86316bc674 Don't render the voxel selection when we're moving over a maximum velocity. 2013-06-07 16:00:13 -04:00
Andrzej Kapolka
953aec35e6 Use the default QSettings constructor and let it get the application info 
from the QCoreApplication properties.
 2013-06-07 11:48:29 -07:00
Andrzej Kapolka
a5c24b5333 OK, we don't need this sync. Clearly the problem I was seeing on OS X lies 
elsewhere.
 2013-06-07 11:32:26 -07:00
Andrzej Kapolka
dc8a6c2725 Store the avatar voxel URL along with the rest of the avatar settings. 2013-06-07 11:30:41 -07:00
Stephen Birarda
222a596754 remove unnecessary OctalCode include in main 2013-06-07 10:59:40 -07:00
ZappoMan
ba7863605c fix several delete/delete[] mismatches 2013-06-07 10:49:43 -07:00
ZappoMan
479e8c7811 add shortcut key for Kill Local Voxels to help debugging of LOD 2013-06-07 10:29:05 -07:00
ZappoMan
887e3428c2 cleaned up menus slightly 2013-06-07 09:39:24 -07:00
Philip Rosedale
dd0fa021a0 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-07 09:19:54 -07:00
Philip Rosedale
f0c9bd45bb Fixed merge 2013-06-07 09:19:49 -07:00
ZappoMan
ece117e0b0 Merge pull request #502 from ey6es/gyroquat 
Increase YAW_DECAY, remove roll from head camera, provide option for pitch/yaw scale (zero by default).
 2013-06-07 09:17:11 -07:00
ZappoMan
27c3627e02 Merge pull request #500 from birarda/master 
indentation and NULL comparison repairs in Avatar
 2013-06-07 09:15:09 -07:00
atlante45
2a1730af72 #19365 - Frustum menu moved inside the Debug menu 2013-06-07 16:35:43 +02:00
Andrzej Kapolka
26de3028fa We need to sync in order to ensure that the settings are saved. 2013-06-06 18:25:16 -07:00
Andrzej Kapolka
acc8efa026 One more "one more try." 2013-06-06 18:10:21 -07:00
Andrzej Kapolka
1b698b24e2 OK, one more try. 2013-06-06 18:05:39 -07:00
Andrzej Kapolka
ce68c1a6a4 Think this needs to be a double. 2013-06-06 18:03:38 -07:00
Andrzej Kapolka
e0e94481c9 Add pitch/yaw scale preference to control degree of view rotation. 2013-06-06 17:53:00 -07:00
Philip Rosedale
b5e63fb446 Added debug->run timing tests option to speed test some common functions (please add some more, bottom of util.cpp 2013-06-06 17:52:19 -07:00
Andrzej Kapolka
ffc1c33455 Removed double negation for coordinates, world aligned orientation -> camera 
orientation, removed roll.
 2013-06-06 17:25:52 -07:00
Geenz
7cefa3fe7b Check if our main window is our application window within Application's event handling functions. 2013-06-06 19:58:33 -04:00
Geenz
51340452df Use _mouseX and _mouseY for mouse look instead of the global mouse position when idle (prevents mouse look from accidentally triggering when the window is inactive). 2013-06-06 19:47:01 -04:00
Geenz
151a6edfb4 Check if our canvas has focus. If not, then ignore events passed to it. 2013-06-06 19:31:55 -04:00
Stephen Birarda
bd553ef061 repair indentation and NULL comparisons in Avatar class 2013-06-06 16:01:36 -07:00
Andrzej Kapolka
a5abfbe1cd Merge branch 'master' of https://github.com/worklist/hifi into gyroquat 2013-06-06 15:52:54 -07:00
Andrzej Kapolka
0dbb5375db Approach the "down" direction more rapidly. 2013-06-06 15:50:14 -07:00
Andrzej Kapolka
a7c265d017 More compiley. 2013-06-06 15:44:38 -07:00
Andrzej Kapolka
ba6f2307ba Coordinate fix. 2013-06-06 15:43:26 -07:00
Andrzej Kapolka
081f193db8 Add back yaw decay the quaternion way. 2013-06-06 14:34:28 -07:00
Andrzej Kapolka
d87e165b06 Acceleration is presumably relative to the current orientation. 2013-06-06 14:08:53 -07:00
Andrzej Kapolka
650981abfa Remove the bounce term; it causes fluctuations in velocity. 2013-06-06 13:41:22 -07:00
Andrzej Kapolka
6ef7da5200 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-06 13:09:23 -07:00
Andrzej Kapolka
9afb1b3338 Enhanced workiness. 2013-06-06 13:09:00 -07:00
Andrzej Kapolka
f04e45b7c1 Use quaternions for rotation estimates. 2013-06-06 12:07:34 -07:00
Andrzej Kapolka
7f8b6fe0a6 Merge branch 'master' of https://github.com/worklist/hifi into gyroquat 2013-06-06 12:06:29 -07:00
Andrzej Kapolka
14f331b07d Scratch that; need to do this in a branch. 2013-06-06 12:05:52 -07:00
Andrzej Kapolka
a851499684 Rework rotation estimation bits to use quaternions. 2013-06-06 12:03:50 -07:00
Stephen Birarda
ecd03d7b4b replace magic number 1 with sizeof 2013-06-06 11:54:44 -07:00
Andrzej Kapolka
b13f22be26 Forgot to update the default pose position. 2013-06-06 11:14:57 -07:00
Andrzej Kapolka
56b4c04a18 Adjusted head base/top transforms. 2013-06-06 11:09:09 -07:00
Andrzej Kapolka
d9d6891cc8 Use the head rotation to adjust the position, too. 2013-06-06 10:54:28 -07:00
Andrzej Kapolka
27717bfcd4 Removed unused variables. 2013-06-06 10:48:35 -07:00
Andrzej Kapolka
2cc640b6f6 Set head bone rotation from head orientation. 2013-06-06 10:26:26 -07:00
Andrzej Kapolka
c1bccb04d1 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-06 10:21:10 -07:00
Philip Rosedale
0f4e6a447e Merge pull request #493 from birarda/echo 
add back audio echo option
 2013-06-06 10:20:12 -07:00
Andrzej Kapolka
e0189c9834 Build fix, render body as balls if we don't have an avatar. 2013-06-06 10:17:57 -07:00
Andrzej Kapolka
80847b3884 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-06 10:10:07 -07:00
Andrzej Kapolka
7af42a1896 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Avatar.cpp
 2013-06-06 10:09:48 -07:00
Andrzej Kapolka
4cac35293a Refer to body balls parents, not joint parents. 2013-06-06 10:08:15 -07:00
Philip Rosedale
b08fe8f915 merge fixes 2013-06-06 10:07:50 -07:00
Philip Rosedale
61d4ac2675 Fixes per code review. 2013-06-06 09:52:39 -07:00
Stephen Birarda
719af3b9e6 Merge branch 'master' of github.com:worklist/hifi into echo 2013-06-06 09:52:33 -07:00
Stephen Birarda
dd7c1fab2e more spacing fixes in Avatar.cpp 2013-06-06 09:51:32 -07:00
Stephen Birarda
6a7434651a spacing fix in Avatar.cpp 2013-06-06 09:42:25 -07:00
Philip Rosedale
24dcd14371 Added sensor fusion for more stable gyro roll, pitch. 2013-06-05 23:53:01 -07:00
Philip Rosedale
1b20b016dd Fixed acceleration checking bug that was limiting angular rotation, changed mouselook to work correctly/stable. 2013-06-05 20:04:30 -07:00
Stephen Birarda
2cb9b609f4 resolve conflicts on merge with upstream master 2013-06-05 18:28:02 -07:00
Stephen Birarda
30d6c7f68a Merge remote-tracking branch 'upstream/master' into synthesis 2013-06-05 18:26:12 -07:00
Philip Rosedale
1f0e321980 removed Oculus Manager from camera object, using _tightness = 0.0 to shutoff camera movement smoothing 2013-06-05 17:54:14 -07:00
Stephen Birarda
5bbf96d946 allow avatar agents to ask for audio loopback 2013-06-05 17:31:52 -07:00
Philip Rosedale
97be04716e Added render menu choice to switch between voxel and ball avatar rendering. 2013-06-05 17:24:53 -07:00
Stephen Birarda
e5a1fa4dec Merge branch 'master' of github.com:worklist/hifi into synthesis 2013-06-05 17:03:53 -07:00
Philip Rosedale
07405ef280 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-05 16:55:12 -07:00
Andrzej Kapolka
6c3425a642 Fix for URL decoding. 2013-06-05 15:39:37 -07:00
Andrzej Kapolka
b9e2e26ab1 Don't restart the download when we're given the same URL. 2013-06-05 14:59:08 -07:00
Andrzej Kapolka
a4aa8e7bde Basic sharing of the avatar voxel URLs. 2013-06-05 14:55:49 -07:00
Stephen Birarda
2db7b5de4e fix the number of bytes for microphone audio 2013-06-05 14:41:10 -07:00
Andrzej Kapolka
69dd4ff59b Improved rotation computation. 2013-06-05 13:08:17 -07:00
Stephen Birarda
beb415a851 correct buffer byte constants in AudioRingBuffer 2013-06-05 12:45:07 -07:00
Stephen Birarda
d64b46a6b2 add specialized parsing of audio data to ARB subclasses 2013-06-05 12:11:56 -07:00
Stephen Birarda
4cb00ad54b clean up AudioRingBuffer by subclassing 2013-06-05 11:51:21 -07:00
Philip Rosedale
b38c68ab20 remove unused setHeadFromGyros() routine - confusing. 2013-06-05 10:46:55 -07:00
Andrzej Kapolka
391b62ed32 Make sure we don't hear back from replies after we've cleared them. 2013-06-05 10:34:41 -07:00
Philip Rosedale
5fbf9f8714 gyro look off by default 2013-06-05 10:23:52 -07:00
Philip Rosedale
29c4374dc0 Merge fixes for brad, reversed pitch direction to correct mouse look 2013-06-05 09:59:39 -07:00
Stephen Birarda
6353940bf7 some extra cleanup after merge with upstream master 2013-06-05 09:59:33 -07:00
Stephen Birarda
eee7d6f92f resolve some conflicts on merge with upstream master 2013-06-05 09:56:26 -07:00
Stephen Birarda
6c2dcb86c8 Merge remote-tracking branch 'upstream/master' into synthesis 2013-06-05 09:55:16 -07:00
Philip Rosedale
626dcd0875 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-05 09:40:42 -07:00
ZappoMan
9310876531 Merge pull request #485 from birarda/cube-injector 
spherical audio injector and quaternion rotations for audio
 2013-06-05 09:37:38 -07:00
ZappoMan
3bce3f7a62 support file:// urls for avitar voxles 2013-06-05 00:53:27 -07:00
Philip Rosedale
8719b9f9d4 merge fix 2013-06-04 21:26:53 -07:00