David Rowe
c20cd40275
Merge branch 'master' into 20601
...
Conflicts:
interface/src/avatar/Head.cpp
2015-07-02 09:51:47 -07:00
David Rowe
026f6d3690
Add mouth as third gaze target in addition to left and right eyes
2015-07-01 21:22:30 -07:00
David Rowe
bc4c635106
Fix gazing at avatar (when no head tracking or HMD)
...
Randomly look at avatar's left and right eyes if the face is visible.
Otherwise just look at their head.
2015-07-01 18:31:16 -07:00
Brad Hefta-Gaub
af932fde29
Merge pull request #5247 from ericrius1/handRender
...
Fixed broken rendering of hydra visualization paraphernalia
2015-07-01 16:21:32 -07:00
ericrius1
f49f368ec3
removed dead commented out code
2015-07-01 15:16:34 -07:00
ericrius1
8b00864175
hydra hand spheres and lasers are rendering again
2015-07-01 15:04:19 -07:00
Philip Rosedale
8ed4000560
Merge pull request #5239 from SamGondelman/zooming
...
DO NOT MERGE - quadratic zooming response
2015-07-01 12:22:23 -07:00
Sam Gondelman
c9d205de3e
quadratic zooming response
2015-06-30 14:04:43 -07:00
Anthony J. Thibault
c480c85f85
Fixes for switching between fullAvatar and head & body avatars while in first person.
...
Need to always add _skeletonModel to the main scene when switching to head/body avatar.
Need to always remove _firstPersonSkeletonModel from main scene when switching to head/body avatar.
2015-06-24 17:35:23 -07:00
Anthony J. Thibault
71639a7466
Fix for switching avatars while mirror is not enabled.
...
When the avatar is changed via set*URL, we need to set the associated model visibility appropriately.
This way when it gets added to the scene later in preRender, initWhenReady, it will render with the correct visibility settings.
2015-06-24 16:10:47 -07:00
Anthony J. Thibault
3853395298
Bug fixes for switching between head/body and full body avatars
...
The head model visibility is now updated in preRender()
Moved the near clip plane in a bit more
Invalidate head bone vector on LOD switching.
Removed _currentSkeletonModel pointer, instead use _prevShouldDrawHead to detect when we should flip the visibility bit.
2015-06-24 16:10:47 -07:00
Anthony J. Thibault
8f03ead74e
Bug fix for two piece avatars.
...
The head was not rendering
2015-06-24 16:10:47 -07:00
Anthony J. Thibault
99a03bac21
Render a different model when in first person view.
...
Currently this model is identical to the third person model, except
that the head bones have been 'cauterized' by applying a zero scale transform.
This allows us to set the near clip back to a reasonable value.
2015-06-24 16:10:47 -07:00
Ryan Huffman
4df1bea4ec
Merge pull request #5167 from SamGondelman/hmdControls
...
hmdControls.js for movement when wearing an HMD
2015-06-24 14:40:31 -07:00
Sam Gondelman
a0d4b7ec7c
without script, doesn't limit you to constant degree turns
2015-06-19 16:11:43 -07:00
Brad Davis
9bef5f011b
Reverting mirror functionality
2015-06-19 00:03:46 -07:00
Brad Davis
48b27acc79
Merge remote-tracking branch 'upstream/master' into overlay
...
Conflicts:
interface/src/Application.cpp
interface/src/ui/ApplicationOverlay.cpp
2015-06-18 18:17:59 -07:00
Seth Alves
b258aeaa3d
merge from master
2015-06-18 10:04:14 -07:00
Brad Davis
ae1c9603b9
Merge remote-tracking branch 'upstream/master' into overlay
2015-06-17 15:13:04 -07:00
Seth Alves
508ae276c6
enable -Wdouble-promotion
2015-06-16 18:23:10 -07:00
Sam Gondelman
156adb1a98
one more coding standard fix
2015-06-16 11:34:59 -07:00
Brad Davis
ba13b7820c
Working on overlay refactor
2015-06-16 09:58:03 -07:00
Brad Davis
00d8fe75ab
Breaking up overlay into rendering and compositing classes
2015-06-13 17:36:08 -07:00
Sam Gondelman
72cc070f0a
enabled remappable zooming (with keyboard: shift + w, shift + s, and others), switches to first person if you zoom in a lot
2015-06-11 18:24:32 -07:00
ZappoMan
139855f487
handle remove attachment case
2015-06-10 16:13:17 -07:00
ZappoMan
e06422825a
mostly getting attachments working again
2015-06-10 15:46:54 -07:00
ZappoMan
e0adb8e38a
render avatar attachments as model payload items
2015-06-09 12:57:04 -07:00
ZappoMan
7fde574a2a
make model overlays acutally use sub mesh payload items
2015-06-03 16:33:58 -07:00
ZappoMan
a7feca0727
more work on making avatar models (face included) use render payloads
2015-06-02 22:10:00 -07:00
ZappoMan
c9c434bc8c
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-06-02 21:04:33 -07:00
ZappoMan
4ce27f1483
first cut at rendering avatars as individual model items
2015-06-02 16:54:47 -07:00
Sam Gateau
453fa87654
making sure the proj and view matrix are correctly assigned
2015-06-02 14:31:40 -07:00
Ryan Huffman
389d5556f5
Update Avatar*Pointers to use std::*_ptr instead of Q*Pointer
2015-05-27 12:36:55 -07:00
Ryan Huffman
3f22b5f8b3
Add RenderArgs to more render methods
2015-05-22 15:25:53 -07:00
Brad Davis
41d587bd2e
Revert "Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff""
...
This reverts commit 6e8c067bcb
2015-05-12 14:47:44 -07:00
samcake
6e8c067bcb
Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff"
2015-05-12 14:34:43 -07:00
Brad Davis
666caf0d59
Working on fixing DK1 and santizing the transform stuff
2015-05-12 00:44:30 -07:00
Stephen Birarda
305835ea79
Merge branch 'master' of https://github.com/highfidelity/hifi into sequence-numbers
2015-05-07 15:38:35 -07:00
Sam Gateau
bba7dcfe5f
Try to fix the transform stack issue in 1st person
2015-05-06 23:32:02 -07:00
Bradley Austin Davis
fc73676b4d
Merge branch 'master' into plugins_pt1
2015-05-06 11:43:25 -07:00
Clément Brisset
9f8e52652b
Merge pull request #4771 from ctrlaltdavid/20526
...
CR for #20526 - Fix Mixamo avatar clipping in HMD view
2015-05-06 20:17:07 +02:00
Stephen Birarda
5b1514a390
Merge branch 'master' of https://github.com/highfidelity/hifi into sequence-numbers
2015-05-06 10:12:17 -07:00
David Rowe
eb438e9ccb
Can use same clipping calc for non-Oculus
2015-05-06 09:58:14 -07:00
Stephen Birarda
6b3cf1ba4a
remove dependency of PacketHeaders on NodeList
2015-05-05 12:19:42 -07:00
David Rowe
7afd990e2e
Fix Mixamo avatar clipping in HMD view
2015-05-04 22:27:41 -07:00
Brad Davis
302aa9db47
Removing access to the gl widget and display managers
2015-05-02 00:49:52 -07:00
David Rowe
d053379831
Add "Mute Face Tracking" menu item
2015-04-30 23:14:21 -07:00
ZappoMan
664d126465
remove scale from Camera class since it was only used by avatar and was causing problems with no obvious benefit
2015-04-28 16:34:33 -07:00
ZappoMan
aec0bd1693
dont change camera scale with avatar scale
2015-04-28 16:26:17 -07:00
ZappoMan
bfbad539e0
hack test
2015-04-28 14:54:58 -07:00
