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

3433 commits

Author SHA1 Message Date
Andrzej Kapolka
8c963ed6a7 Blend the normals, too. 2013-09-23 10:30:03 -07:00
Andrzej Kapolka
24bf1e2036 Don't render neck/neck base when blend face is active. 2013-09-20 17:55:31 -07:00
Andrzej Kapolka
133ba3a00a Set normals based on indices, cache face models. 2013-09-20 17:40:15 -07:00
Andrzej Kapolka
ddb0d916ae Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-20 16:50:38 -07:00
Andrzej Kapolka
9c2d851650 Fixed bug in decoding: newer versions of Qt streaming use whatever precision 
the stream is set at for both floats and doubles.
 2013-09-20 16:38:44 -07:00
Andrzej Kapolka
120f8f729c Find the mesh that corresponds to the blendshapes. 2013-09-20 15:28:08 -07:00
Stephen Birarda
f8f0e3db1b remove the sphere from the ground plane 2013-09-20 14:04:18 -07:00
Andrzej Kapolka
fe0d93102e Another slight face fix: clear the face when set, before loading the new one. 2013-09-20 13:46:29 -07:00
Andrzej Kapolka
df0b2f4eec Fix for face model sending. 2013-09-20 13:28:50 -07:00
Andrzej Kapolka
77d9e21162 Meant to include this in the last commit. 2013-09-20 10:06:34 -07:00
Andrzej Kapolka
2f5a5a4b27 Remove unnecessary, unlucky "13," add note explaining arbitrary translation. 2013-09-20 09:52:15 -07:00
Andrzej Kapolka
9d28aaefae Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-19 18:00:46 -07:00
Andrzej Kapolka
94d6f00f65 Parenting the info view to the menu is preventing the menu from showing up on 
Linux.  Let's try not doing that.
 2013-09-19 17:47:50 -07:00
Andrzej Kapolka
c049665090 Removed temporary comment. 2013-09-19 16:42:25 -07:00
Andrzej Kapolka
5c841616dc Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-19 16:37:26 -07:00
Andrzej Kapolka
a04ced633e Include the face model URL in the same packet as the avatar voxel URL. 2013-09-19 16:35:25 -07:00
Andrzej Kapolka
fff10375a9 Map the blendshapes by name. 2013-09-19 15:48:33 -07:00
Andrzej Kapolka
116a4e0bad Subtract the deltas. 2013-09-19 15:18:45 -07:00
Andrzej Kapolka
09fa782c61 More work on FBX reading. 2013-09-19 15:05:17 -07:00
Andrzej Kapolka
1bd8ea947a Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-18 17:14:58 -07:00
Stephen Birarda
bbbdc4f88c fixes for InfoView ownership and display 2013-09-18 16:42:51 -07:00
Andrzej Kapolka
dfea69ab8f Basic FBX parser. 2013-09-18 16:26:35 -07:00
Stephen Birarda
5393d75281 remove call to re-set default setting in InfoView 2013-09-18 14:39:35 -07:00
Stephen Birarda
8a901382a3 get rid of local and domain options in interface 2013-09-18 14:01:32 -07:00
Stephen Birarda
9fa695b71c allow setting of custom port via domainHostname setting 2013-09-18 13:50:14 -07:00
Stephen Birarda
ab85c4109d use QHostInfo and QHostAddress for DS changes in NodeList 2013-09-18 13:29:53 -07:00
Andrzej Kapolka
6be03ac3df Working on downloading the faces. 2013-09-18 10:10:24 -07:00
Andrzej Kapolka
596d0ac471 Subtract the neutral position from the blendshapes. 2013-09-17 17:01:17 -07:00
Andrzej Kapolka
617b3d67cf I think we need to treat the blend shapes as offsets from neutral. 2013-09-17 16:11:07 -07:00
Andrzej Kapolka
558d3d41a6 First attempt at blending. 2013-09-17 15:22:06 -07:00
Andrzej Kapolka
1afece81c5 Use quads as well as triangles, apply scale. 2013-09-17 11:49:50 -07:00
Andrzej Kapolka
b4ca66eb68 Merge branch 'master' of https://github.com/worklist/hifi into blendface 
Conflicts:
	interface/src/devices/Faceshift.cpp
 2013-09-17 11:05:11 -07:00
Andrzej Kapolka
262365f15f Only render the Perlin face for the local user. 2013-09-17 10:51:33 -07:00
Andrzej Kapolka
a4f79390f4 Fixed initialization order. 2013-09-17 10:25:27 -07:00
Andrzej Kapolka
1fce6c717b Working on shipping around the complete set of blendshape coefficients. 2013-09-16 17:28:04 -07:00
Andrzej Kapolka
f9426cbecc Working on reading and rendering the rig from Faceshift. 2013-09-16 15:49:40 -07:00
atlante45
ac0ee6c7d6 another merge commit 2013-09-14 14:41:03 -07:00
ZappoMan
facd60799e Merge pull request #931 from Atlante45/add_fs_data_in_head_data 
Add fs data in head data
 2013-09-14 14:04:37 -07:00
ZappoMan
2d545c8adb Merge pull request #924 from stojce/19418 
Code Review for Job #19418
 2013-09-14 14:00:09 -07:00
stojce
316f8a0345 Brace placement fix 2013-09-14 08:39:21 +02:00
atlante45
d6981bfa20 Andrejz Faceshift modif merge 2013-09-13 18:18:41 -07:00
LionTurtle
6613ad0591 Arrow keys now also control nudge guide. Avatar position is now fixed 
during nudge.
 2013-09-13 18:10:52 -07:00
LionTurtle
394e660ac3 Use WASD to move nudge guide instead of mouse. 
Nudge can be completed with return/enter key now.
Nudge is now accessible in any voxelEditMode.
 2013-09-13 17:51:10 -07:00
atlante45
7a2a79f6f5 Temp code for Brad to look at 2013-09-13 15:17:17 -07:00
atlante45
9ae7fab95f Merge branch 'master' of https://github.com/worklist/hifi into add_fs_data_in_head_data 2013-09-13 14:59:17 -07:00
LionTurtle
67bbcc4d9b Put upper bound on increasing nudge precision (i.e. making the nudge 
less precise).
 2013-09-13 14:08:21 -07:00
LionTurtle
86d1666d6a Add ifdef for OS X to show delete hotkey in edit menu 2013-09-13 13:49:19 -07:00
LionTurtle
0251349221 Change nudge UI to be more consistent with classic editing UI. 
Add menu option for Delete and fix delete for VoxelSelectMode.
 2013-09-13 13:41:26 -07:00
atlante45
683cfd6c8b Fixed Eye Open 2013-09-13 11:21:13 -07:00
stojce
4b993ec931 CR fixes 2013-09-13 20:10:27 +02:00
atlante45
87b4528e2c removed unmeant committed files 2013-09-12 17:54:57 -07:00
atlante45
7cd2f2b06b send faceshift data to avatar mixer 2013-09-12 17:41:26 -07:00
stojce
921e88ea5d Merge branch 'master' of https://github.com/worklist/hifi into 19418 
Merge branch 'master'
 2013-09-12 21:11:30 +02:00
stojce
eefe08e733 non OS X menu 
added help + about menu for non OS X
 2013-09-12 19:39:34 +02:00
LionTurtle
bb1feab661 Merge remote-tracking branch 'upstream/master' 2013-09-11 16:45:29 -07:00
LionTurtle
cef4837654 Fix voxel erase bug in nudge code. Fix rendering of nudge guide. 2013-09-11 16:43:50 -07:00
atlante45
64b462a4f0 Improved smile 2013-09-11 15:19:01 -07:00
stojce
330b1cdaf1 About menu 
added About menu - OS X version only
 2013-09-11 22:08:07 +02:00
atlante45
88e8ef7c7c eye opening and some better memory handling 2013-09-11 12:57:58 -07:00
atlante45
5618a784c7 Fixed perlin's face eyes 2013-09-11 10:51:31 -07:00
Andrzej Kapolka
80cc278bfa Increase the eye open scale. 2013-09-11 10:49:12 -07:00
Andrzej Kapolka
feecb4fa25 Fix for eyelids, change Faceshift menu option to indicate that it applies 
specifically to TCP connection.
 2013-09-11 10:44:38 -07:00
atlante45
ae5173a730 Added Jaw 2013-09-10 18:32:39 -07:00
atlante45
117565934c added smooth normals for lighting 2013-09-10 17:54:59 -07:00
Andrzej Kapolka
4b19e3d0fe Incorporate the "eye open" coefficients for eye widening. 2013-09-10 17:43:06 -07:00
RyanDowne
13c228e796 Added Smile 2013-09-10 17:33:22 -07:00
Andrzej Kapolka
b9878bbbd6 Adjustment to UDP code. 2013-09-10 16:55:59 -07:00
atlante45
61f9088d3e eyelib handling for faceshift 2013-09-10 16:35:14 -07:00
Andrzej Kapolka
5c7913068e Support for UDP input from Faceshift. 2013-09-10 16:21:08 -07:00
atlante45
85c3d54718 mouth handling on perlin faces 2013-09-10 15:33:09 -07:00
atlante45
4e3484021e PerlinFace implementation 2013-09-10 15:31:58 -07:00
Andrzej Kapolka
cea645dfc7 Tweak to blink angles. 2013-09-10 12:34:41 -07:00
stojce
114cc065bd Merge branch 'master' of https://github.com/worklist/hifi into 19418 2013-09-10 21:05:44 +02:00
Andrzej Kapolka
6614a13c64 Align the eyelids to the top of the iris. 2013-09-10 11:58:45 -07:00
Andrzej Kapolka
7e98e3f4e3 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-10 11:26:07 -07:00
Andrzej Kapolka
db8575b59a Reduced the restore rate. 2013-09-10 11:25:30 -07:00
ZappoMan
befbc1b93a Merge pull request #916 from LionTurtle/master 
Nudge
 2013-09-10 11:16:12 -07:00
Andrzej Kapolka
c56778c3bf When devices become inactive (including when Faceshift reports loss of 
tracking), smoothly restore neutral head rotation/lean.
 2013-09-10 11:14:36 -07:00
LionTurtle
30c8af222d Merge remote-tracking branch 'upstream/master' 2013-09-10 11:10:50 -07:00
LionTurtle
3b464094d9 Remove magic numbers, fix spacing, and other code clean up in nudge code. 2013-09-10 11:09:50 -07:00
Philip Rosedale
4245f33c3c Merge pull request #915 from ey6es/master 
Subtract the long term average from the eye gaze directions.  Best solution I've found so far for aligning the gaze.
 2013-09-10 09:36:04 -07:00
LionTurtle
f41533fee6 Add nudgeVoxel shading in grid. Fix erase bug. 2013-09-09 18:23:37 -07:00
LionTurtle
b0803c1267 Merge remote-tracking branch 'upstream/master' 2013-09-09 16:54:34 -07:00
LionTurtle
ac878c9c63 UI for nudge completed! 2013-09-09 16:53:31 -07:00
Andrzej Kapolka
6e447415df Merge branch 'master' of https://github.com/worklist/hifi 2013-09-09 15:49:55 -07:00
stojce
54e7de8e96 remove empty line 2013-09-10 00:44:16 +02:00
stojce
19c8084b64 dynamic height 2013-09-10 00:38:43 +02:00
Stephen Birarda
613334074f leverage qDebug and custom message handler for verbose logging 2013-09-09 15:11:11 -07:00
stojce
7bd565f1f2 removed unused variable 2013-09-10 00:01:09 +02:00
stojce
1a32bf7428 centering fix 2013-09-09 23:59:44 +02:00
stojce
6b81620098 removed redundant this keyword 2013-09-09 23:54:25 +02:00
stojce
7c7cf667ae WindowModal 2013-09-09 23:38:51 +02:00
Andrzej Kapolka
f8aee88a5b Let's try subtracting the long-term average from the eye directions. 2013-09-09 14:30:26 -07:00
stojce
a081f081f8 popup layot 
- center position
- resizable
 2013-09-09 23:27:03 +02:00
Andrzej Kapolka
8fec78d82a Disable random saccades for own eyes. 2013-09-09 13:48:46 -07:00
stojce
29c62d366f QtWebKitWidgets fix #2 2013-09-09 22:41:03 +02:00
stojce
52f413b59c QtWebKitWidgets reference fix 2013-09-09 22:11:44 +02:00
Andrzej Kapolka
597c57a117 Revert "Try using the eye coefficients rather than the eye directions reported by" 
This reverts commit 37aa909322.
 2013-09-09 12:17:12 -07:00
Andrzej Kapolka
37aa909322 Try using the eye coefficients rather than the eye directions reported by 
Faceshift.
 2013-09-09 11:22:46 -07:00
Andrzej Kapolka
ddf92b39c7 Fix for off-axis ambient occlusion. 2013-09-08 17:52:35 -07:00