Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-03 09:51:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
3990 commits 73 branches 59 tags 1.2 GiB
Commit graph

2142 commits

Author SHA1 Message Date
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
8ec8e0b9d8 Avoid name mangling on the symbol. 2013-06-18 17:04:02 -07:00
Andrzej Kapolka
2e033631eb Make our call to configureCamera on OS X. 2013-06-18 16:50:15 -07:00
Andrzej Kapolka
556a64eab9 Adding UVCCameraControl. 2013-06-18 16:47:11 -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
0d4efad490 Missed QuartzCore. 2013-06-17 13:58:19 -07:00
Andrzej Kapolka
6b065ab856 Find Zlib the right way. 2013-06-17 13:57:01 -07:00
Andrzej Kapolka
2c0bea3f33 More required libraries for OS X. 2013-06-17 13:53:48 -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
7d1679dab7 Ryan's new iris texture. 2013-06-14 14:35:56 -07:00
Andrzej Kapolka
5241c41ddd Shed some light on what these shaders are doing, so to speak. 2013-06-14 11:29:32 -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
Andrzej Kapolka
4f9f2fa4ca Better iris texture. 2013-06-14 10:28:45 -07:00
Andrzej Kapolka
ce9236e659 Merge pull request #537 from ey6es/master 
Ryan's new iris texture.
 2013-06-13 16:59:53 -07:00
Andrzej Kapolka
0f897340ee New iris texture from Ryan. 2013-06-13 16:42:31 -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