Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-12 05:18:57 +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
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
Andrzej Kapolka
c953fc743d Merge branch 'master' of https://github.com/worklist/hifi 2013-06-04 18:00:01 -07:00
ZappoMan
b75bd80de7 fix build busters 2013-06-04 17:54:48 -07:00
Andrzej Kapolka
f708649546 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-04 17:44:53 -07:00
Andrzej Kapolka
b30b64c5b5 Use downloadProgress rather than isFinished (which worked on files, but didn't 
on HTTP URLs).
 2013-06-04 17:44:19 -07:00
ZappoMan
f66641f1b4 Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization 2013-06-04 17:41:41 -07:00
ZappoMan
26542d44c9 Merge pull request #478 from Atlante45/master 
Settings handling with QSettings
 2013-06-04 17:41:02 -07:00
ZappoMan
4f2af717f2 Fixed merge issue with new orientation vectors, migrated to common identity names 2013-06-04 17:27:40 -07:00
Andrzej Kapolka
ad377e6256 We can't initialize avatars from the network thread; they need access to the 
OpenGL context.
 2013-06-04 17:25:04 -07:00
Philip Rosedale
4db6e9074e merge conflict fix 2013-06-04 17:11:33 -07:00
atlante45
d539ea283e Merge 19358 with upstream Master 2013-06-05 01:43:47 +02:00
ZappoMan
6e70f3b187 Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization 2013-06-04 16:21:20 -07:00
Andrzej Kapolka
93b50f44f5 Add a reasonable minimum size for the URL field. 2013-06-04 15:59:07 -07:00
Andrzej Kapolka
b856af505a Adjusted default bind radius, spring vector threshold. 2013-06-04 15:52:39 -07:00
Stephen Birarda
7d3d8f8b43 rewrite the AudioInjector to send an orientation quaternion instead of bearing 2013-06-04 15:31:11 -07:00
Stephen Birarda
0f70c9c06b send full quaternion orientation instead of just bearing to audio-mixer 2013-06-04 12:52:09 -07:00
Andrzej Kapolka
d09700adde Merge branch 'master' of https://github.com/worklist/hifi into voxeltars 
Conflicts:
	interface/src/Avatar.cpp
	interface/src/Avatar.h
	interface/src/Skeleton.h
	interface/src/VoxelSystem.h
 2013-06-04 11:00:59 -07:00
Andrzej Kapolka
90a53bc518 Only bind vertices within an adjustable radius. 2013-06-04 10:40:08 -07:00
Andrzej Kapolka
bc8eadd526 More work on voxeltars; separated default pose from bind pose. 2013-06-04 10:22:58 -07:00
atlante45
c199190666 Fixes asked by ZappoMan on QSettings' commit. 2013-06-04 19:00:38 +02:00
ZappoMan
edf6e767f0 removed unused variable 2013-06-04 09:35:38 -07:00
ZappoMan
026fb5b344 Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization 2013-06-04 09:34:37 -07:00
Philip Rosedale
60100fd473 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-04 09:09:39 -07:00
ZappoMan
ce499f925a add cut voxels 2013-06-04 09:02:34 -07:00
ZappoMan
626874f9ec add delete key support while in select mode 2013-06-04 08:47:57 -07:00
ZappoMan
743e1a433c make import/export default to desktop 2013-06-04 01:24:35 -07:00
ZappoMan
4f3872c18f CR feedback 2013-06-04 01:13:58 -07:00
ZappoMan
0a9b3bf5ce changed file name and exention to Sparse Voxel Octree and svo 2013-06-04 01:07:18 -07:00
ZappoMan
435791f28c CR feedback 2013-06-04 01:02:10 -07:00
ZappoMan
eef0636655 some cleanup 2013-06-03 21:53:06 -07:00
ZappoMan
510dfc7353 Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization 2013-06-03 21:43:38 -07:00
ZappoMan
05e8c8806c Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels 2013-06-03 21:28:23 -07:00
ZappoMan
cf3ff53e2c copy and paste working 2013-06-03 18:08:11 -07:00
Jeffrey Ventrella
cee2244364 fixed formatting things 2013-06-03 17:55:48 -07:00
Philip Rosedale
179e30fdfc Merge branch 'master' of https://github.com/worklist/hifi 2013-06-03 17:37:25 -07:00
Philip Rosedale
5e0a70c524 gyro look controls head offset on/off 2013-06-03 17:36:32 -07:00
Philip Rosedale
da343215ce Rename serialPort to serialHeadSensor, added passing of lean to eyeOffset 2013-06-03 17:25:20 -07:00
Andrzej Kapolka
6552a64bb4 Merge branch 'master' of https://github.com/worklist/hifi into voxeltars 2013-06-03 17:17:24 -07:00
Jeffrey Ventrella
da09dd3259 test 2013-06-03 17:16:52 -07:00
ZappoMan
0b7f4b21f4 Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels 2013-06-03 16:42:27 -07:00
Jeffrey Ventrella
3ff11d0eb8 test 2013-06-03 16:42:27 -07:00
Jeffrey Ventrella
b73eb66492 temp test 2013-06-03 16:31:39 -07:00
Jeffrey Ventrella
26bbb9917b more work on avatar touch 2013-06-03 16:23:55 -07:00
ZappoMan
0f2b736130 cleanup 2013-06-03 13:50:42 -07:00
ZappoMan
ea965f2290 fixed issue with sendVoxelsOperataion, some other cleanup 2013-06-03 13:46:21 -07:00
ZappoMan
c4b3b568e7 make import and export properly rebase 2013-06-03 13:13:52 -07:00
Andrzej Kapolka
73f8fca2af More work on voxeltars; added rotations. 2013-06-03 13:00:54 -07:00
Jeffrey Ventrella
e96503de0d Merge remote-tracking branch 'upstream/master' 2013-06-03 12:26:51 -07:00
Jeffrey Ventrella
6479a41206 more ball prep 2013-06-03 12:26:20 -07:00
ZappoMan
78fe89172a eyedropper mode, and import work 2013-06-03 12:23:16 -07:00
Stephen Birarda
0fedf354e0 don't attempt to send microphone audio if AgentList is NULL 2013-06-03 12:10:18 -07:00
Jeffrey Ventrella
00dce6b59e fix 2013-06-03 12:01:01 -07:00
Stephen Birarda
5a5b22db61 fix use of PI constant after merge with upstream master 2013-06-03 12:00:57 -07:00
Stephen Birarda
4348702dd2 Merge remote-tracking branch 'upstream/master' into synthesis 2013-06-03 11:53:13 -07:00
Jeffrey Ventrella
8d031b5c2d preparation for extending the avatar ball array to accommodate more touch capabilities 2013-06-03 11:53:00 -07:00
ZappoMan
7dd217b318 more work on copy and paste 2013-06-03 10:57:18 -07:00
Andrzej Kapolka
a6daa296ff Slight fix to capsule/box penetration test: we should use the smaller distance 
to the diagonal, not the first one we find.
 2013-06-03 10:08:42 -07:00
Jeffrey Ventrella
9e046b74e6 working on avatar touch 2013-06-03 08:09:27 -07:00
Andrzej Kapolka
8d757e148f More work on voxeltars; basic skinning works. 2013-06-02 19:55:51 -07:00
atlante45
dccc44a6f5 Added settings management using QSettings 2013-06-02 14:58:51 +02:00
Andrzej Kapolka
35ae08def0 Merge branch 'master' of https://github.com/worklist/hifi into voxeltars 2013-06-01 15:07:00 -07:00
Andrzej Kapolka
6c975f9c6f More work on avatar voxels. 2013-06-01 15:06:29 -07:00
Andrzej Kapolka
7425b39237 Working on avatar voxel system. 2013-05-31 17:55:30 -07:00
Jeffrey Ventrella
de49d7fc6c more fixes 2013-05-31 17:32:30 -07:00
Jeffrey Ventrella
d92471860d cleanup 2013-05-31 16:58:58 -07:00
Jeffrey Ventrella
4f49f1769e separated springy balls from skeleton 2013-05-31 16:54:56 -07:00
Stephen Birarda
2d7c397138 create a FreeVerb object for each other agent per agent 2013-05-31 15:47:57 -07:00
Philip Rosedale
69ec109585 Refactor/Cleanup serial interface to use vectors, correct rotation axes. Added translation estimation for the head. 2013-05-31 15:28:15 -07:00
Jeffrey Ventrella
1061b3eb4d cleanup 2013-05-31 15:05:05 -07:00
Jeffrey Ventrella
303643e921 cleanup 2013-05-31 15:01:08 -07:00
Jeffrey Ventrella
e33c11bb48 Merge remote-tracking branch 'upstream/master' 2013-05-31 14:52:46 -07:00
Andrzej Kapolka
929797516d Merge branch 'master' of https://github.com/worklist/hifi into voxeltars 2013-05-31 14:52:39 -07:00
Andrzej Kapolka
e4bc7af6b4 Working on avatar voxels. 2013-05-31 14:52:29 -07:00
Jeffrey Ventrella
f1fc3fe704 merge 2013-05-31 14:52:24 -07:00
Andrzej Kapolka
8f377349ef Merge pull request #474 from PhilipRosedale/master 
Smooth gravity fields when flying
 2013-05-31 14:52:00 -07:00
Philip Rosedale
088e9d0aef Merge branch 'master' of https://github.com/worklist/hifi 2013-05-31 14:21:38 -07:00
Jeffrey Ventrella
3ce051bff7 merge 2013-05-31 14:11:46 -07:00
Philip Rosedale
2a9a3139b2 Added smooth gravity field so we can fly to planets and land on them, static friction to stop drifting, thrust tweaks. 2013-05-31 14:02:20 -07:00
Jeffrey Ventrella
fdfc639c23 merge 2013-05-31 13:52:22 -07:00
ZappoMan
e5e200345b more work on copy and paste 2013-05-31 11:52:18 -07:00
Jeffrey Ventrella
108ce62d1a committing latest skeleton-separation changes (more to come as Andrzej and I work on it more) 2013-05-31 11:51:03 -07:00
ZappoMan
b0397e8eb9 Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels 2013-05-30 21:41:55 -07:00
Andrzej Kapolka
224e5d666d Fix for segmentation fault when the settings file doesn't exist. 2013-05-30 17:12:18 -07:00
ZappoMan
bc5af6e399 Merge pull request #438 from Geenz/19308 
#19308 - Store menu settings in the avatar data file
 2013-05-30 16:51:02 -07:00
Geenz
ed904b58eb Fixed spacing issues per the coding standard. 2013-05-30 19:50:01 -04:00
Geenz
fefa74135c Moved to function overloads instead of unique function names. 2013-05-30 19:47:25 -04:00
Philip Rosedale
38e611eb7f Merge branch 'master' of https://github.com/worklist/hifi 2013-05-30 16:19:11 -07:00
Philip Rosedale
f009177aa7 Added check for lost transmitter 2013-05-30 16:19:07 -07:00
Andrzej Kapolka
9213cfd0c2 Revert to simply adding the Eulers. 2013-05-30 15:48:00 -07:00
Andrzej Kapolka
47bf5a2b77 Have the Head control how orientations are added. 2013-05-30 15:43:07 -07:00
Andrzej Kapolka
780b049f4b I got these backwards. 2013-05-30 15:21:54 -07:00
Andrzej Kapolka
826ef33d4b Reverse angles for mirror mode. 2013-05-30 15:20:20 -07:00
Andrzej Kapolka
3f6cf08b97 Removed remaining Orientation bits (and class itself), enforce limits on 
head yaw/pitch/roll.
 2013-05-30 15:15:12 -07:00
Andrzej Kapolka
e2ec8245b0 Rather than adding Euler angles, compose quaternions for gyros. 2013-05-30 14:56:12 -07:00
Andrzej Kapolka
f447230d26 Use body orientation, not head orientation, for mirror mode. 2013-05-30 14:14:01 -07:00
Geenz
0a3dbcd675 Removed unused readYaw variable. 2013-05-30 17:00:32 -04:00
Geenz
0dda2b88b5 Merge branch 'master' of https://github.com/worklist/hifi into 19308 
Conflicts:
	interface/src/Avatar.cpp - resolved; added avatarRotation setting that's interpreted as a vec3
 2013-05-30 16:58:48 -04:00
Andrzej Kapolka
bcd3833898 Align chat with full camera rotation (not just yaw). 2013-05-30 13:46:53 -07:00
Andrzej Kapolka
28531fcae0 Added --local option to avatar-mixer for testing. Only update velocity, 
acceleration, angular velocity, etc., for local avatar.
 2013-05-30 12:33:05 -07:00
Andrzej Kapolka
342e19aa41 Save/restore the pitch and roll as well as the yaw. 2013-05-30 12:12:30 -07:00
Geenz
78c3891c92 Merge commit '6d57324d0b9fce9d6a030123689bb499ed54c8ad' into 19308 2013-05-30 14:48:40 -04:00
Andrzej Kapolka
100d10dc9e Offset camera fix, cleaner frustum transformation. 2013-05-30 11:08:33 -07:00
Andrzej Kapolka
3330b20232 More reformatting. 2013-05-30 10:33:45 -07:00
Andrzej Kapolka
fff9d1c372 Formatting. 2013-05-30 10:23:19 -07:00
Andrzej Kapolka
b502321b57 Moved gravity influence multiplier into constant, reduced. 2013-05-30 10:00:52 -07:00
Andrzej Kapolka
021dce72be Moved direction vectors to AvatarData, made them align with OpenGL view space 
(to avoid the 180 degree rotations).
 2013-05-30 09:55:34 -07:00
Andrzej Kapolka
9b301eb235 Merge branch 'master' of https://github.com/worklist/hifi into reorient 
Conflicts:
	interface/src/Avatar.cpp
 2013-05-29 19:13:18 -07:00
Andrzej Kapolka
d6855b6430 Massive changes to orientations: use quaternions rather than Orientation 
class.
 2013-05-29 19:05:33 -07:00
Jeffrey Ventrella
d839312cd6 testing avatar touch 2013-05-29 17:28:44 -07:00
Jeffrey Ventrella
88ff0ea7aa merge 2013-05-29 16:54:15 -07:00
Jeffrey Ventrella
4c7d75b39e testing avatar touch 2013-05-29 16:52:48 -07:00
Geenz
f0d7b47c37 Merge branch 'master' of https://github.com/worklist/hifi into 19308 2013-05-29 19:47:54 -04:00
birarda
73168af4d1 Merge pull request #458 from birarda/master 
move the mouth out farther in front of the face
 2013-05-29 16:38:35 -07:00
Stephen Birarda
089dc3669d push the mouth out in front of the face 2013-05-29 16:37:40 -07:00
Jeffrey Ventrella
f7a0e8018a Merge remote-tracking branch 'upstream/master' 2013-05-29 16:15:16 -07:00
Jeffrey Ventrella
63434da23c testing avatar touch 2013-05-29 16:14:55 -07:00
birarda
64d02f5f5f Merge pull request #457 from birarda/master 
make it harder to quit accidentally
 2013-05-29 16:06:40 -07:00
Stephen Birarda
b0a8de818d make quit CMD-Q instead of just Q 2013-05-29 16:05:03 -07:00
Jeffrey Ventrella
5750adf6fd test 2013-05-29 15:53:47 -07:00
Stephen Birarda
02333644dc one line fix in AvatarTouch 2013-05-29 15:31:18 -07:00
Jeffrey Ventrella
72688d86ca Merge remote-tracking branch 'upstream/master' 2013-05-29 15:25:05 -07:00
Jeffrey Ventrella
66c7da6552 simplify avatar proximity check for 1p transition 2013-05-29 15:24:37 -07:00
ZappoMan
46c6f2f9b5 latest copy paste 2013-05-29 15:02:28 -07:00
Geenz
c33d2ee25e Coding standard cleanup based upon ZappoMan's suggestions. 2013-05-29 16:46:47 -04:00
ZappoMan
c70ade0cc1 temporary hack fix to not discarding voxels 2013-05-29 12:14:45 -07:00
ZappoMan
377fb1e936 latest copy and paste 2013-05-29 12:06:58 -07:00
Jeffrey Ventrella
ab1c00dac6 Merge remote-tracking branch 'upstream/master' 2013-05-29 11:51:34 -07:00
Jeffrey Ventrella
e34193f1d7 increased hand motion sensitivity 2013-05-29 11:51:16 -07:00
ZappoMan
408fef0de8 Merge pull request #450 from birarda/master 
make audio echo a menu option instead of forcing it with the mirror mode
 2013-05-29 11:47:38 -07:00
Stephen Birarda
b6a0662c98 inline the shouldEchoAudio 2013-05-29 11:47:02 -07:00
Jeffrey Ventrella
ab3b0c8aa3 alpha 2013-05-29 11:43:42 -07:00
Stephen Birarda
a5a30efec9 CR fixes 2013-05-29 11:42:10 -07:00
Jeffrey Ventrella
350bd878fc fix 2013-05-29 11:39:53 -07:00
Stephen Birarda
5d74a865e8 make audio echo a menu option instead of forcing with mirror 2013-05-29 11:35:32 -07:00
Jeffrey Ventrella
39805db040 Merge remote-tracking branch 'upstream/master' 2013-05-29 11:27:36 -07:00
Jeffrey Ventrella
39499e4a92 fix to head transparency 2013-05-29 11:26:06 -07:00
Philip Rosedale
c31c14c56e Merge remote-tracking branch 'upstream/master' into one-liner 2013-05-29 10:46:55 -07:00
Philip Rosedale
ca8c78162d one line fix for translucent head 2013-05-29 10:46:10 -07:00
Jeffrey Ventrella
31ff768363 fixed some glitches in avatar render alpha transition between 3p and 1p 2013-05-29 08:30:14 -07:00
ZappoMan
6b1d37599c Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels 2013-05-29 08:12:07 -07:00
ZappoMan
d1d2e75143 first cut at export and import of voxels 2013-05-28 19:00:02 -07:00
Jeffrey Ventrella
0e329af03e made inline 2013-05-28 18:55:21 -07:00
Jeffrey Ventrella
b98d03337d fixed bug causing camera to not get updated position of other av 2013-05-28 18:49:16 -07:00
Jeffrey Ventrella
e4c0aeb9a0 added AVATAR_FACING_THRESHOLD to avatarTouch 2013-05-28 18:15:29 -07:00
Jeffrey Ventrella
5d9b8c08b3 Merge remote-tracking branch 'upstream/master' 2013-05-28 17:57:42 -07:00
Jeffrey Ventrella
923c39cdc0 fixed third person shift bug 2013-05-28 17:57:11 -07:00
Stephen Birarda
65f10cb99a fix the enum in AABox, fix a warning in Head 2013-05-28 16:26:18 -07:00
Stephen Birarda
8118e3bf69 type squish in Audio.cpp 2013-05-28 16:23:54 -07:00
Stephen Birarda
55954899e6 fix silent audio on client 2013-05-28 16:20:23 -07:00
Stephen Birarda
badab39ef1 resolve conflict on merge with upstream master 2013-05-28 15:58:57 -07:00
Stephen Birarda
e040c927f5 Merge remote-tracking branch 'upstream/master' into mouth-render 2013-05-28 15:58:11 -07:00
birarda
17e3902d17 Merge pull request #435 from Ventrella/master 
Integrated mohawk code, and did some cleanup and improvements on avatar
 2013-05-28 15:50:48 -07:00
Stephen Birarda
9f2c0adec7 move audioLoudness to HeadData 2013-05-28 12:22:51 -07:00
Jeffrey Ventrella
5715860f6b added Skeleton class (to be completed soon) 2013-05-27 18:55:23 -07:00
Jeffrey Ventrella
75b57d17a7 fixed some things based on recent code review 2013-05-27 18:54:44 -07:00
Geenz
8ac8335776 Check how many matches were found for the given data type we're checking for. 1 for bool and float, 3 for vec3. Return false and assign default values if this isn't true. 2013-05-27 19:18:36 -04:00
Geenz
5efda079c9 Store settings in an ordered map to allow for runtime getting and setting of settings. Read the setting file on startup, then write on shut down. 2013-05-27 18:48:05 -04:00
Andrzej Kapolka
278ff00926 Fixed Linux build error and a warning on call to Avatar.simulate, moved grid 
size constant to world.h and made gravity bounds match.
 2013-05-27 14:46:16 -07:00
Andrzej Kapolka
1df7806464 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-27 14:40:30 -07:00
Andrzej Kapolka
949befee09 Fix for NaN. 2013-05-27 14:37:07 -07:00
ZappoMan
04f4e499e1 Optimize wire-format for AvatarData 
- moved HandState into semi-nibble in bitItems
- moved KeyState into semi-nibble in bitItems
- moved AudioLoudness into scaled float stored as byte
- overall savings - 5 bytes
 2013-05-27 14:18:10 -07:00
ZappoMan
5d1ba857c5 Optimize View Frustum wire format. 
- Changed View frstum orientaton to be a quaternion
- Implemented packing formats for Orientation Quats, Ratios, and Clipping values
- Changed wire format for View Frustum details to be more efficient 28 bytes vs 64 bytes
 2013-05-27 14:17:34 -07:00
Andrzej Kapolka
cfb66bee95 Capsule/box collisions. 2013-05-27 14:05:44 -07:00
Geenz
94a07b92a7 Documentation for #19308. 2013-05-27 15:54:32 -04:00
Jeffrey Ventrella
096e465d36 cleaned up some formatting and in-line functions in Avatar.cpp 2013-05-27 10:31:31 -07:00
Geenz
93eac0c0dc Setup various debug options. 2013-05-27 12:56:41 -04:00
Geenz
17a5e6a700 First round of settings serialization. Setup an API to load and save different settings to the avatar data file. 
Initial serialized settings:
Gyro look
Mouse look
Transmitter drives
Voxel rendering
Voxel textures
Star rendering
Atmosphere rendering
Avatar rendering
Oculus rift mode
Render stats
Frame stats
Look at vectors
Logging
Frustum debugging
View frustum offset
Camera frustum
 2013-05-27 12:37:42 -04:00
Jeffrey Ventrella
d43c5ca52c normalized body spring tightness 2013-05-26 21:56:21 -07:00
Jeffrey Ventrella
ad5d097ed4 improved neck rendering 2013-05-26 17:44:52 -07:00
Jeffrey Ventrella
4e4a672f32 fixed visual glitch where mouth penetrates head sphere 2013-05-26 17:17:15 -07:00
Jeffrey Ventrella
2b31e79a0b cleanup 2013-05-26 15:23:44 -07:00
Jeffrey Ventrella
883d21a5e4 added facing other av requirement for camera shift to 1p; improved ease-in/out for camera mode shift; did some clean up on the camera code 2013-05-26 15:17:58 -07:00
Jeffrey Ventrella
622863dbf1 Merge remote-tracking branch 'upstream/master' 2013-05-26 10:19:02 -07:00
Jeffrey Ventrella
9f7e05d407 integrated Philip's mohawk colors into my hair code and added a switch to test each version 2013-05-26 10:18:35 -07:00
Philip Rosedale
7aebbe3047 Merge pull request #434 from ZappoMan/voxel_animation 
Improve "Delta Sending" mode..
 2013-05-26 09:45:54 -07:00
Andrzej Kapolka
70b25fd6c4 Sphere/box collisions for voxels, various utility functions. 2013-05-25 19:59:07 -07:00
ZappoMan
77e5fbb590 Merge pull request #427 from birarda/oculus 
go into oculus mode when connected, fix the yaw pull
 2013-05-25 15:38:20 -07:00
ZappoMan
1a2921e3e8 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-25 15:32:12 -07:00
ZappoMan
60f2b9a438 removed debug 2013-05-25 15:31:28 -07:00
ZappoMan
f6863081f9 Fix Delta Sending mode by not culling out of view voxels until we STOP moving 
- added isViewChanging() which determines if the view is currently changing
- made hasViewChanged() report false UNTIL we've stopped moving
- changed setupNewVoxelsForDrawing() to only call removeOutOfView() if we're not moving
 2013-05-25 15:29:23 -07:00
Jeffrey Ventrella
1e4771fe27 fix 2013-05-24 18:05:14 -07:00
Jeffrey Ventrella
8c24477a24 Merge remote-tracking branch 'upstream/master' 2013-05-24 18:01:47 -07:00
Jeffrey Ventrella
0c2c90b84d cleanup 2013-05-24 18:01:25 -07:00
Freddy
6a4bcf32fa Code review fixes 2013-05-24 17:58:31 -07:00
Freddy
30e951578e procedural voxel create/delete noises 2013-05-24 17:27:56 -07:00
Jeffrey Ventrella
28f3af4ea5 Merge remote-tracking branch 'upstream/master' 2013-05-24 17:13:10 -07:00
Jeffrey Ventrella
56438435c1 made mouth conform to the head sphere 2013-05-24 17:12:14 -07:00
birarda
82f5e0a3b1 Merge pull request #426 from PhilipRosedale/master 
big ground plane
 2013-05-24 16:37:53 -07:00
Jeffrey Ventrella
6634ad2ed2 thingy 2013-05-24 16:31:17 -07:00
Stephen Birarda
a8b08647d0 require that crotch grabbing be explicit, not implicit 2013-05-24 16:18:36 -07:00
Stephen Birarda
65168e6aec add a yaw offset to the oculus so it can pull body 2013-05-24 15:23:25 -07:00
Philip Rosedale
608a4f71bf ground surface is 20 meters across. play on! 2013-05-24 14:51:06 -07:00
Philip Rosedale
995fbcf4f9 mohawk also follows body pitch when accelerating 2013-05-24 14:46:26 -07:00
Philip Rosedale
d796956a96 fix per review 2013-05-24 14:32:56 -07:00
Philip Rosedale
9baf087c9a Avatar renders right arm in 1P mode 2013-05-24 14:29:26 -07:00
Philip Rosedale
31e41260c1 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-24 14:17:44 -07:00
Philip Rosedale
f5c0f84d27 Mohawk is different/stable for each person, and rotates correctly with head 2013-05-24 14:15:53 -07:00
Stephen Birarda
d12bc85376 go directly into oculus mode when the oculus is connected 2013-05-24 14:05:22 -07:00
Philip Rosedale
cb7381fcd1 incremental fix rotation 2013-05-24 12:33:05 -07:00
Philip Rosedale
360c9c8ab1 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-24 12:30:12 -07:00
Philip Rosedale
dc9b2e33b5 Fixing mohawk orientation 2013-05-24 12:30:05 -07:00