Andrew Meadows
335141049c
Cleaning up collision check API's and re-enabling collisions with particles.
2014-02-14 16:33:19 -08:00
Andrew Meadows
d9b50359a6
Hand-face collisions now work (sorta).
2014-02-13 12:21:28 -08:00
Andrew Meadows
6b2c7c556d
Fixing mouselook.
...
Faceshift head rotations are stored separately and then integrated into
the final (rendered) head rotation at the right times but do not affect
the camera.
2014-02-07 17:46:14 -08:00
Andrew Meadows
1ad2171952
Fix #1862 camera should not follow head orientation when using faceshift
2014-02-04 15:23:10 -08:00
ZappoMan
b36cc0bcf9
removed old cruft around mousePitch in Head and unified pitch
2014-01-29 02:09:49 -08:00
Andrzej Kapolka
2e3c597d40
Scooping out more head bits.
2014-01-16 15:01:24 -08:00
Andrzej Kapolka
50d224661c
Pruning more avatar bits.
2014-01-16 14:47:39 -08:00
Andrzej Kapolka
865b495e6c
Merge branch 'master' of https://github.com/worklist/hifi into debone
...
Conflicts:
interface/src/Audio.cpp
interface/src/Menu.cpp
interface/src/avatar/Avatar.h
interface/src/avatar/MyAvatar.cpp
interface/src/devices/Webcam.cpp
interface/src/devices/Webcam.h
interface/src/renderer/FBXReader.cpp
2014-01-16 13:35:03 -08:00
Brad Hefta-Gaub
55babbf7b6
windows type mismatch warning fixes
2014-01-13 00:30:23 -08:00
Andrzej Kapolka
8b2212b6cf
Fix for "red ball" issue with no skeleton: use avatar position for head
...
position.
2014-01-06 12:08:42 -08:00
Philip Rosedale
3fe972791c
remove unused mohawk and hair physics
2014-01-02 17:12:34 -08:00
ZappoMan
d9f412406f
better implementation of particle palm collisions
2013-12-16 18:12:47 -08:00
Philip Rosedale
4707733563
Removed avatar balls
2013-12-06 16:26:02 -08:00
Andrzej Kapolka
b294b328dd
Only render ball avatars when "avatars as balls" is checked.
2013-11-27 12:56:31 -08:00
Andrzej Kapolka
eeeed84664
When Faceshift isn't connected, apply the audio-based blinking and brow/mouth
...
movement to the new face models.
2013-11-22 13:36:14 -08:00
Andrzej Kapolka
91b38313be
Treat pitchFromTouch more like yawFromTouch, persist mouse pitch.
2013-11-22 11:28:33 -08:00
Andrzej Kapolka
490194c747
Rescale eye positions to compensate for growing heads.
2013-11-04 13:53:39 -08:00
Andrzej Kapolka
55de8ceb85
Use blue default texture when we fail to load a normal map.
2013-10-31 14:46:51 -07:00
Andrzej Kapolka
145e9337a2
Let's try actually using the average eye position as the camera location for
...
first person and mirror mode.
2013-10-24 15:20:46 -07:00
Andrzej Kapolka
7e174093e4
Factoring the FBX model code out to a shared base class.
2013-10-18 17:26:03 -07:00
Stephen Birarda
fa146e302d
remove 16-bit node IDs and replace with UUIDs
2013-10-17 11:49:41 -07:00
stojce
355a1f3da3
Merge branch 'master' of https://github.com/worklist/hifi into 19435
...
Conflicts:
interface/src/avatar/Head.cpp
interface/src/avatar/Head.h
2013-10-11 22:54:59 +02:00
Philip Rosedale
27a892fa55
Removed old head rotation code, menu items, added ability to turn off faceshift head rotation
2013-10-09 22:46:34 -07:00
Andrzej Kapolka
083c5e34b2
Fix for non-Faceshift eye and mouth movement.
2013-10-09 15:11:14 -07:00
Andrzej Kapolka
87bdd2fb1a
When in mirror mode and using a blend face, try to position the camera so as
...
to look directly into the face's eyes.
2013-10-08 15:09:56 -07:00
Andrzej Kapolka
3cca3dc894
Reset fix.
2013-10-08 14:06:04 -07:00
stojce
a795a5b88f
#19435 - Remove 'Perlin Face' option from menus and code
2013-10-08 18:23:51 +02:00
Andrzej Kapolka
3448ceccd2
Progress towards a spring-mass model.
2013-10-07 17:25:46 -07:00
Andrzej Kapolka
5f26177560
Fix for URLs' not being sent: setting the scale calls createMohawk, which
...
reseeds the random number generator, breaking "shouldDo."
2013-10-04 13:42:03 -07:00
Andrzej Kapolka
c98dec8a65
Dilate our network-downloaded textures.
2013-10-02 11:59:14 -07:00
Freddy
6b0f9314ba
Faceshift drives body rotation, remove gyro-driven rotation
2013-09-26 23:52:44 -07:00
Andrzej Kapolka
91999dfe1f
Pupil dilation.
2013-09-26 15:48:11 -07:00
Andrzej Kapolka
402f65fc00
Use the blend face eye locations for the eye vectors, when possible.
2013-09-25 14:12:50 -07:00
Andrzej Kapolka
9a16d44a47
Render the eye textures.
2013-09-25 13:47:03 -07:00
Andrzej Kapolka
71ec6f75e5
Move the eyeball meshes according to the lookat direction (not really visible
...
yet since the eyeballs have no textures).
2013-09-24 18:57:37 -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
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
atlante45
d6981bfa20
Andrejz Faceshift modif merge
2013-09-13 18:18:41 -07:00
atlante45
7a2a79f6f5
Temp code for Brad to look at
2013-09-13 15:17:17 -07:00
atlante45
7cd2f2b06b
send faceshift data to avatar mixer
2013-09-12 17:41:26 -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
61f9088d3e
eyelib handling for faceshift
2013-09-10 16:35:14 -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
Andrzej Kapolka
6614a13c64
Align the eyelids to the top of the iris.
2013-09-10 11:58:45 -07:00
Andrzej Kapolka
8fec78d82a
Disable random saccades for own eyes.
2013-09-09 13:48:46 -07:00
Andrzej Kapolka
03ead34642
Code review cleanup.
2013-09-05 10:34:43 -07:00