Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
34462 commits 29 branches 0 tags 1.1 GiB
Commit graph

1061 commits

Author SHA1 Message Date
Howard Stearns
ae3e052e72 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-08-21 08:13:44 -07:00
Howard Stearns
642e569033 Uncomment code that was commented out to simplify debugging. 2015-08-20 17:38:49 -07:00
Howard Stearns
ea02583875 Cleanup. 2015-08-20 17:33:10 -07:00
Howard Stearns
05f4145acb Checkpoint. Working? 2015-08-20 16:28:40 -07:00
Howard Stearns
f26849c7e1 Proper HMD scaling. 2015-08-20 12:34:50 -07:00
Howard Stearns
dc75b238a8 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 
And update with current code.
 2015-08-18 15:35:37 -07:00
Howard Stearns
0f6c0a3117 Merge branch 'master' of https://github.com/highfidelity/hifi into recapitate 2015-08-13 15:56:13 -07:00
Howard Stearns
2756a00638 Get default avatar url from resources. 2015-08-13 14:23:34 -07:00
Howard Stearns
4dae01a69c Provide a consistent avatar default for the empty string. 2015-08-13 12:54:16 -07:00
Howard Stearns
62941c0914 Remove dead code. 2015-08-13 12:39:30 -07:00
David Rowe
6a0a08eafb Consolidate identical code paths 2015-08-12 15:25:34 -07:00
David Rowe
8f376247f0 Fix calculation of corrected look-at position in HMD view 2015-08-11 20:25:02 -07:00
David Rowe
0f56285283 Fix HMD look-at positions and lines 2015-08-11 18:54:55 -07:00
David Rowe
3e8d0ad712 Fix to use new HMD methods 2015-08-11 13:40:08 -07:00
David Rowe
e6473fc8b9 Merge branch 'master' into 20639 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Menu.h
	tests/ui/src/main.cpp
 2015-08-11 12:34:28 -07:00
David Rowe
b54c2526c1 Fix rendering own look-at vectors in HMD mode 
Vectors now originate at user's physical eyeballs rather than at user
avatar's eye separation.
 2015-08-07 16:13:25 -07:00
David Rowe
b70c1a4960 Merge branch 'master' into 20639 2015-08-07 12:33:13 -07:00
David Rowe
e37fd956ed Fix look-at target position getting stuck when avatar moves out of range 2015-08-06 22:51:25 -07:00
David Rowe
551c00dc23 Fix look-at position calculation when in HMD display 
Calculate look-at target from camera position and orientation.
Render own look-at vectors from camera eye positions.
Draw other avatar's look-at vectors from their eyeballs.
With and without eye trackers.
 2015-08-06 16:41:06 -07:00
Sam Gondelman
54f64b62eb Merge remote-tracking branch 'upstream/plugins' into sam/input-plugins 2015-08-06 14:45:26 -07:00
Bradley Austin Davis
7e60aee1bf Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/avatar/Head.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/avatar/SkeletonModel.h
	interface/src/devices/3DConnexionClient.cpp
	interface/src/ui/overlays/Overlays.cpp
 2015-08-06 11:03:37 -07:00
Anthony J. Thibault
c3fc37df18 Added true boneSets to AnimOverlay. 2015-08-05 18:07:56 -07:00
David Rowe
d7b42e264e Merge branch 'master' into 20639 
Conflicts:
	interface/CMakeLists.txt
 2015-08-05 16:49:06 -07:00
Atlante45
3dc8bd47ae Fix warning and remove unused headers 2015-08-05 16:46:44 -07:00
David Rowe
e8eac7db34 Render look-at vectors and target in first person view 2015-08-05 13:40:57 -07:00
Sam Gondelman
113c4ea28b exposing palm velocity and angular velocity to js 2015-08-05 12:17:15 -07:00
Anthony J. Thibault
2154f76202 Added some comments to AnimNode, AnimClip & AnimBlendLinear. 2015-08-05 12:03:20 -07:00
Anthony J. Thibault
5d83976e2a Added AnimBlendLinear + tests. 
MyAvatar now does a sine wave blend between a walk
and a walk animation.
 2015-08-04 18:14:50 -07:00
Anthony J. Thibault
559367db4a Got to the bottom of the bind pose question. 
When TRUST_BIND_TRANSFORM is defined in AnimSkeleton, the bind pose is taken
from the FBXJoint::bindTransform field, which is correct for all joints
bound to actual geometry.  Basically it's not trust worthy for bones NOT bound to anything.

When TRUST_BIND_TRANSFORM is not defined, the bind pose is taken from the other
FBXJoint fields.  Unfortunatly these poses are NOT the bind pose, but instead
are taken from the FBX files 'resting' pose. i.e. frame 0.
 2015-08-04 18:14:49 -07:00
Anthony J. Thibault
69cc270802 removed scale for fight club model 2015-08-04 18:14:48 -07:00
Anthony J. Thibault
55da34f713 Better debug rendering of animations. 
* added mat4 cast and mat4 ctors to AnimPose.
 2015-08-04 18:14:48 -07:00
Anthony J. Thibault
df79463750 WIP, animNode rendering 2015-08-04 18:14:48 -07:00
Anthony J. Thibault
b8bae7cc3f Debug rendering of MyAvatar’s skeletonModel skeleton 2015-08-04 18:14:47 -07:00
Howard Stearns
731bcba956 Merge branch 'master' of https://github.com/highfidelity/hifi into smooth-faded-animations 2015-08-04 17:27:23 -07:00
Howard Stearns
61198a658c Smooth fading of animations in and out. 
Also, turn on the secret rig animations from Javascript with MyAvatar.setEnableRigAnimations(true). (persists)
 2015-08-04 17:04:15 -07:00
Andrew Meadows
661a916ebd merge rig into cleanup (removal of legacy shapes) 
Conflicts:
	interface/src/avatar/Avatar.h
	tests/physics/src/ShapeColliderTests.cpp
	tests/physics/src/ShapeColliderTests.h
 2015-07-31 13:40:51 -07:00
Brad Davis
f7a2513f26 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/MyAvatar.h
	tests/ui/src/main.cpp
 2015-07-30 12:55:22 -07:00
Howard Stearns
4e7d191fb1 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-29 18:53:38 -07:00
Howard Stearns
838711e526 Remove avatar->shift hips for idle animations. 
See https://app.asana.com/0/32622044445063/43127903156601
 2015-07-29 15:27:50 -07:00
Howard Stearns
a9f76324b5 Merge branch 'rig' of https://github.com/sethalves/hifi into sethalves-rig2 2015-07-29 10:49:27 -07:00
Howard Stearns
68aec1fd36 Merge branch 'rig' of https://github.com/howard-stearns/hifi into rig 2015-07-29 09:12:44 -07:00
Howard Stearns
327ecfe62c Be less noisy. 2015-07-29 09:11:58 -07:00
Andrew Meadows
2c66af67e9 Merge howard/rig into andrew/caesium 2015-07-29 09:04:32 -07:00
Anthony J. Thibault
ce7e385900 Updated comment 2015-07-28 18:03:03 -07:00
Anthony J. Thibault
b06485c266 Remove cauterize code from Rig and move it back into Model. 
* cauterize code is used as at render time and is not dependent on
  the jointStates.
* MyAvatar now initialize the bone set used for cauterization and
  makes the decision to perform cauterization or not in preRender.
 2015-07-28 17:45:33 -07:00
Seth Alves
6e5aca6da4 merge from upstream 2015-07-27 16:52:36 -07:00
Seth Alves
5ae15d46b4 add some javascript callable stuff back to MyAvatar 2015-07-27 16:42:54 -07:00
Andrew Meadows
e527f49d65 removing interface dependency on ShapeCollider 2015-07-27 15:30:10 -07:00
Howard Stearns
ef52c0703f Merge pull request #8 from AndrewMeadows/cadmium 
remove unused legacy Shapes from Model and friends
 2015-07-27 13:20:41 -07:00
Howard Stearns
8196770ed3 Wiring, including avatar position/velocity/orientation data, and an enableRig setting so that we don't break stuff unless turned on. 2015-07-27 12:58:43 -07:00
Andrew Meadows
81831975b5 remove legacy CapsuleShape from SkeletonModel 2015-07-27 12:27:17 -07:00
Andrew Meadows
73ac941230 remove unused legacy Shapes from Model and friends 2015-07-27 11:15:33 -07:00
Howard Stearns
1ec0518d05 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-27 09:20:30 -07:00
Seth Alves
81375e47e0 remove methods from MyAvatar: setJointRotations setJointData clearJointData clearJointsData 2015-07-27 09:07:26 -07:00
Seth Alves
ac53b6b22c Merge branch 'master' of github.com:highfidelity/hifi into rig 2015-07-26 20:00:56 -07:00
Seth Alves
24fff719c5 quiet compiler 2015-07-25 21:11:23 -07:00
Howard Stearns
8b5f24e4df Keep list of animations in Rig, not MyAvatar. 2015-07-24 22:02:39 -07:00
Howard Stearns
1663d095a1 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-24 14:08:51 -07:00
Bradley Austin Davis
975c95eded Merge remote-tracking branch 'tony/ajt/overlay-fade' into plugins 2015-07-24 13:59:11 -04:00
Bradley Austin Davis
a60e669d3d Merge branch 'master' into plugins 2015-07-24 13:38:18 -04:00
Sam Gateau
a424ff98ca Fixing issues with the review process 2015-07-23 16:55:18 -07:00
Sam Gateau
a002560003 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-23 16:32:00 -07:00
Howard Stearns
16525dc737 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-23 15:41:00 -07:00
Seth Alves
33c97a1833 get rid of _firstPersonSkeletonModel in MyAvatar. add flag in Rig for joints being dirty so Model knows when to recompute meshes 2015-07-23 15:14:10 -07:00
Sam Gateau
dc10f30d3d Merged 2015-07-23 15:10:42 -07:00
Sam Gateau
a561874ce3 Render the rear view mirror in a separate target and then display it during overlay pass 2015-07-23 14:56:14 -07:00
Andrew Meadows
b26f4b0c8d fix for underdamped avatar rotation momentum 2015-07-23 14:49:15 -07:00
Seth Alves
4566d16402 move Model's AnimationHandles to Rig. Move a bunch of Model methods from public to protected 2015-07-23 13:03:38 -07:00
Bradley Austin Davis
1db4162371 Merge branch 'master' into plugins 2015-07-23 13:42:03 -04:00
Seth Alves
57eb798d63 Merge branch 'master' of github.com:highfidelity/hifi into rig 2015-07-23 09:46:41 -07:00
David Rowe
3362358dcd Remove unused postLighting variable from Avatar and MyAvatar 
Fixes Leap and Hydra laser pointers not displaying.

Enables:
- Avatar billboard display
- Avatar collision bounding shape display
- Hand information display
 2015-07-22 17:50:55 -07:00
David Rowe
b515b163fb Remove dead code from Head 2015-07-22 17:50:54 -07:00
Seth Alves
47965bc39c merge from upstream 2015-07-22 13:48:19 -07:00
Seth Alves
7c8d52cbd1 back out some changes to Model.cpp, change how rig pointer is delivered to model initilizer 2015-07-22 13:41:31 -07:00
Howard Stearns
a6395a2351 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-22 12:29:27 -07:00
Howard Stearns
dbb4a8b767 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-22 11:40:25 -07:00
Sam Gateau
f70553ec95 Fixing merge 2015-07-22 11:31:46 -07:00
Sam Gateau
7ac2030862 Preparing for first pr 2015-07-22 10:43:50 -07:00
Bradley Austin Davis
114ab9e47f Merge branch 'master' into plugins 2015-07-22 11:47:56 -04:00
Brad Hefta-Gaub
6dbe6bc375 Merge pull request #5332 from ctrlaltdavid/20612 
Fix full-screen mirror not mirroring correctly with Faceshift or DDE
 2015-07-21 13:32:56 -07:00
Seth Alves
fecdc08720 merge from upstream 2015-07-21 09:53:51 -07:00
Seth Alves
cdc26526b4 merge from upstream 2015-07-21 09:51:16 -07:00
Brad Davis
5744200f64 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/avatar/MyAvatar.h
 2015-07-20 19:21:02 -07:00
Anthony J. Thibault
80dea6831c Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers 
Conflicts:
	interface/src/Application.cpp
	libraries/input-plugins/src/input-plugins/SixenseManager.cpp
 2015-07-20 15:18:23 -07:00
Atlante45
8d6ff2d9f9 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 14:50:44 -07:00
Atlante45
59acfc9f47 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 13:51:51 -07:00
Brad Davis
359abd6474 Merge branch 'master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/GLCanvas.cpp
	interface/src/GLCanvas.h
	interface/src/devices/OculusManager.cpp
	interface/src/devices/OculusManager.h
	interface/src/devices/TV3DManager.cpp
	interface/src/ui/overlays/LocalModelsOverlay.cpp
	libraries/render-utils/src/OffscreenGlCanvas.cpp
	libraries/render-utils/src/OffscreenGlCanvas.h
	libraries/render-utils/src/text/EffectType.h
 2015-07-20 13:33:24 -07:00
Stephen Birarda
0177513285 resolve conflicts on merge with upstream/master 2015-07-20 12:29:38 -07:00
Seth Alves
2814ad78fe Merge branch 'rig' of github.com:howard-stearns/hifi into rig 2015-07-20 11:16:11 -07:00
Howard Stearns
9623ccf792 Change instantiation of Rig. 2015-07-20 11:07:25 -07:00
Seth Alves
9af104f745 Merge branch 'master' of github.com:highfidelity/hifi into rig 2015-07-20 09:47:23 -07:00
Brad Davis
d68618e206 Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
Atlante45
256c786e28 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-17 17:59:19 -07:00
Stephen Birarda
f8c832e50b resolve conflicts on merge with upstream master 2015-07-17 16:48:46 -07:00
Seth Alves
d287817829 give SkeletonModel created by MyAvatar a Rig pointer 2015-07-17 14:52:37 -07:00
Seth Alves
bcd6b30ec3 move AnimationHandle from render-utils to animation. give Rig some jointstates and animation lists 2015-07-17 13:31:48 -07:00
Anthony J. Thibault
65b76869fa Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllers 2015-07-16 18:47:55 -07:00
Anthony J. Thibault
e8da4b9586 merge with plugins, needs testing 2015-07-16 18:47:39 -07:00
Brad Davis
ae882c8347 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
	interface/src/ui/ApplicationCompositor.cpp
	interface/src/ui/overlays/LocalModelsOverlay.cpp
 2015-07-16 16:37:55 -07:00
Anthony J. Thibault
157c20e57b goToLocation should work properly in standing HMD mode 2015-07-16 16:04:08 -07:00
Anthony J. Thibault
ef0a157111 Fixes for oculus rift support 
* should work in standing and 'seated' mode
* OculusBaseDisplayPlugin getModelView now only applies eye offset to match behavior from the OpenVRPlugin
 2015-07-16 16:04:08 -07:00
Brad Davis
89faf85ad9 Working on text rendering overlays 2015-07-16 15:56:01 -07:00
Anthony J. Thibault
7a3f53910f fix compile error, oops 2015-07-15 17:50:47 -07:00
Anthony J. Thibault
442b701c9a refactor of myAvatar sensor matrix updating 
Much simpler and maintanable.

* updateFromHMDSensorMatrix is called at start of Application::update()
  It moves the avatar forward taking into account head motion in the room.
* all other avatar manipulation call setPosition and setOrientation
  normally
* Then at the end of Application::update() updateSensorToWorldMatrix is
  called.  This ensures that rendering will use the correct camera
  position w.r.t. the body.
 2015-07-15 17:38:12 -07:00
Stephen Birarda
05dde9d8f5 resolve conflicts on merge with upstream/master 2015-07-15 16:18:47 -07:00
David Rowe
fc0ae17a87 Mirror head when using face tracker in fullscreen mirror 
Mirror translation, yaw, and roll in the same manner as done for HMD
case, to mimic what you would expect to see in a mirror.
 2015-07-15 07:27:55 -07:00
David Rowe
0af62ca946 Convert tabs to spaces 2015-07-15 07:27:54 -07:00
ZappoMan
8bb6616a25 remove nakedGL from skeleton IK constraint rendering 2015-07-14 18:47:35 -07:00
ZappoMan
5a927c4c90 remove dead code 2015-07-14 18:25:50 -07:00
Atlante45
fbb6a94579 Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol 2015-07-14 16:36:28 -07:00
Atlante45
bbb00b9d3a Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-07-14 14:11:41 -07:00
Anthony J. Thibault
aa66691a73 Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllers 2015-07-14 12:37:09 -07:00
Anthony J. Thibault
dbc18ce51f merge with plugins 2015-07-14 12:30:47 -07:00
Anthony J. Thibault
9209e0745e Added "Standing HMD Sensor Mode" checkbox to menu 
removed static bool isRoomTracking and instead moved into the View menu.
 2015-07-14 12:12:38 -07:00
Stephen Birarda
821c16cbc4 resolve conflicts on merge with uptream/master 2015-07-14 09:52:20 -07:00
Anthony J. Thibault
158c1c6aa8 Removed some debugging prints and drawing 2015-07-13 20:41:19 -07:00
Brad Davis
fee5f7cd0f Merge fixes 2015-07-13 19:07:44 -07:00
Atlante45
c80df94b06 Update includes for moved files 2015-07-13 15:28:55 -07:00
Anthony J. Thibault
454aa9b983 Optimization for computation of sensorMat 
During setPosition/setOrientation we used the cached inverse of the body
matrix, instead of the somewhat convoluted previous code path.
 2015-07-13 14:01:12 -07:00
Anthony J. Thibault
57731e7bd8 More refactoring of MyAvatar HMD Sensor math. 
Moved compuation of avatar postion using head/body joints int a helper
method.  Also we compute this once per frame in setHMDSensorMatrix instead
of inside of every setPostion/setOrientation call.
 2015-07-13 13:36:55 -07:00
Stephen Birarda
ca1ff9b0f5 fix a couple of compile errors for avatar changes 2015-07-13 13:34:36 -07:00
Stephen Birarda
859122db5d update signature of callbacks for avatar packets 2015-07-13 13:32:46 -07:00
Anthony J. Thibault
d07a02cef3 Refactor of MyAvatar and Application HMD sensor 
MyAvatar now uses a cached copy of the HMDSensor location,
instead of calling into Application for every access.
This allows us to simplify application to always return the
most recent pose, instead of a different one pre and post physics.

Added accessors to HMD Sensor in MyAvatar, besides being helpful,
it also an optimization to avoid extracting quaternions from the
HMD matrix on every access.
 2015-07-13 12:56:33 -07:00
Stephen Birarda
264f39fa59 resolve conflicts on merge with upstream/master 2015-07-13 11:25:24 -07:00
Atlante45
80fe090a94 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-10 20:20:03 -07:00
Anthony J. Thibault
94918be949 another fix for viewing vive user in third person 2015-07-10 18:27:12 -07:00
Anthony J. Thibault
51e24ea466 head model follows HMD for observers 2015-07-10 09:20:38 -07:00
Anthony J. Thibault
b6c0ae4bea Fix for flying in HMDMode with avatar collisons disabled 2015-07-09 16:29:43 -07:00
Seth Alves
d197bf2a85 use palm rotation data in hold action 2015-07-09 12:18:32 -07:00
Seth Alves
08d63b7fd8 first attempt at palm rotation 2015-07-09 11:03:02 -07:00
Anthony J. Thibault
2ac6b6cd32 misc. changes 2015-07-09 09:57:12 -07:00
Stephen Birarda
da3502eb6c resolve conflicts on merge with upstream/master 2015-07-08 18:41:48 -07:00
Stephen Birarda
cf15cbc62f fix a cast, move a packet 2015-07-08 18:37:25 -07:00
Stephen Birarda
dfa5be1a0c fix for killPacket in MyAvatar and DatagramProcessor header check 2015-07-08 18:35:04 -07:00
Anthony J. Thibault
07141fd1e3 rotation and thrust work in both 2d and hmd mode 
known issue, hmd does thrust doesnt work when avatar collisons are disabled.
 2015-07-08 12:25:57 -07:00
Stephen Birarda
74940a2132 replace lingering PacketTypes in old format 2015-07-08 10:18:13 -07:00
Anthony J. Thibault
754e55553a modified rotation in MyAvatar::updatePosition, reenabled trackpad input 2015-07-07 17:29:46 -07:00
Anthony J. Thibault
15cf008f13 hand controllers and arrow keys now work 2015-07-07 17:29:45 -07:00
Anthony J. Thibault
5293effc2e more work in progress vive room tracking 
Found and disabled torso twist
use an old copy of the hmd pose before physics, and the most up to date
one after physics.
 2015-07-07 00:12:48 -07:00
Anthony J. Thibault
834b75f4c4 work in progress room scale tracking work. 
sensor to world matrix stored in MyAvatar
override setPosition and setOrientation to move sensor to world matrix.
 2015-07-06 18:25:42 -07:00
Sam Gondelman
f69b755166 merge with hifi/plugins 2015-07-06 17:41:45 -07:00
David Rowe
87ca7626d7 Merge branch 'master' into 20601 2015-07-02 15:45:32 -07:00
David Rowe
9efeda9716 Adjust gaze target for someone looking at me 2015-07-02 15:43:23 -07:00
David Rowe
3a92878544 Reinstate making someone looking at me look at my camera instead of face 2015-07-02 13:47:52 -07:00
Clément Brisset
b616fff222 Merge pull request #5220 from howard-stearns/avatar-collision-sounds 
Avatar collision sounds
 2015-07-02 10:27:24 -07:00
David Rowe
c20cd40275 Merge branch 'master' into 20601 
Conflicts:
	interface/src/avatar/Head.cpp
 2015-07-02 09:51:47 -07:00
Anthony J. Thibault
f0d8916d8a First crack at room scale tracking from vive HMD. 
* modifed openvr plugin to return different eye pose matrices.
* avatar position and physics body now follow the head.
* orientation also follows head direction
 2015-07-02 09:47:08 -07:00
Howard Stearns
d0675c7f22 Side-effect new value before emit. 2015-07-02 09:56:02 -05: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
Atlante45
7b5a5a339a Use make_shared/create to make shared pointers 2015-07-01 19:46:06 -07:00
Atlante45
ee13407066 Fix smart pointer casts 2015-07-01 19:22:40 -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
Howard Stearns
98f165f2ae Avatar collision sounds. 
collisionsSoundURL can be set in preferences:
  Currently defaults to https://s3.amazonaws.com/hifi-public/sounds/Collisions-hitsandslaps/airhockey_hit1.wav.
  Can be empty, which means no sound, rather than restoring default.
MyAvatar.collisionSoundURL can read/written in scripts.
Preloads when set, so that it won't have to fetch on first collision.
Plays at start of collision only, with volume proportional to "velocity change"^2.
 2015-06-26 16:23:16 -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.

Conflicts:
	interface/src/Camera.h
 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