Commit graph

34698 commits

Author SHA1 Message Date
Anthony J. Thibault
995958a8f0 Rig: normalized index bounds checking. 2015-11-20 18:45:53 -08:00
Anthony J. Thibault
54408a9c87 AnimVars are now in avatar/rig space
This makes it much simpler for code out side of the rig to manipulate AnimVars

* Removed mat4 type from AnimVars
* AnimVariantMap now has a _rigToGeometryTransform matrix
  used to transform positions and rotations into the correct coordinate frame.
* Moved AnimPose code to extract a quat from a scaled matrix into GLMHelpers
2015-11-20 18:29:17 -08:00
Anthony J. Thibault
4f8cd6930d Rig: Fixes for initializing _absolutePoses during initJointStates 2015-11-20 15:13:16 -08:00
Anthony J. Thibault
2f37335d77 Warning fixes 2015-11-20 14:50:42 -08:00
Anthony J. Thibault
30087ef0bd Removed dead code 2015-11-20 14:37:53 -08:00
Anthony J. Thibault
cb89f09635 Removed EntityRig and AvatarRig. One Rig to rule them all. 2015-11-20 14:27:01 -08:00
Anthony J. Thibault
a77ea8da43 Removed JointStates! You won't be missed. 2015-11-20 14:15:37 -08:00
Anthony J. Thibault
a4116e633a Removed last consumer of JointState class
Removed option to render IK constraints used by old animation system
2015-11-20 11:26:54 -08:00
Anthony J. Thibault
df7ca3bc38 Rig: getJointRotation and getJointTranslation use _relativePoses 2015-11-20 10:36:40 -08:00
Anthony J. Thibault
923d60e452 Rig: Bug fix for copyJointsIntoJointData 2015-11-20 10:30:12 -08:00
Anthony J. Thibault
ad4b8e0001 Avatar transmission fixes, moved JointData into shared
* Moved JointData into shared library
* added methods to the rig to copy into and out of JointData
* JointData translations must be in meters this is so the
  fixed point compression wont overflow, also, it's a
  consistent wire format.
2015-11-20 10:24:24 -08:00
Anthony J. Thibault
27685e0425 Bug fixes for other Avatar root translation 2015-11-20 09:33:57 -08:00
Anthony J. Thibault
c2ae6f0c8e Fix for remote Avatar
Make sure to copy the correct data to and from AvatarData::JointData
2015-11-20 09:20:41 -08:00
Anthony J. Thibault
302b6f7e26 Mac and Debug build fixes 2015-11-19 18:28:15 -08:00
Anthony J. Thibault
9e36a79155 Rig: hooked up script overridePoses 2015-11-19 18:14:04 -08:00
Anthony J. Thibault
46d23a9f38 head IK and controller IK work again! 2015-11-19 17:30:56 -08:00
Anthony J. Thibault
982e2c06a9 Rig: Switched over to use AnimPoses instead of JointStates
* fixed debug rendering
* improved jointState/animPose diff detection code.
2015-11-19 12:14:04 -08:00
Anthony J. Thibault
721da29432 WIP checkpoint
* No longer normalizing scale in AnimSkeleton and AnimClip
  This means graph is animating in 'geometry' coordinates
  before unit scale is even applied.  This is necessary to
  properly work with both Avatar based models and ModelEntity
  based models

Many things are broken.
  * debug rendering (translations are x100)
  * IK hand targets
  * follow cam
  * I did not even dare to try HMD mode
2015-11-18 18:47:33 -08:00
Anthony J. Thibault
b054ef1488 Rig: fixes for rigs used for ModelEntities. 2015-11-18 16:04:34 -08:00
Anthony J. Thibault
3a74d188b0 AnimSkeleton: Added default poses 2015-11-18 16:03:28 -08:00
Anthony J. Thibault
5ffef7f41a AnimPose: bug fix for extracting rotations from matrices with large scale 2015-11-18 16:02:30 -08:00
Anthony J. Thibault
b481d7c73d Merge branch 'master' into tony/remove-joint-states 2015-11-18 09:38:21 -08:00
Philip Rosedale
9c29ba2ca3 Merge pull request #6408 from imgntn/newbubble
Change out bubble model
2015-11-17 20:30:59 -08:00
Philip Rosedale
5b853ddf57 Merge pull request #6402 from sethalves/grab-equip
grab script bumper is an equip toggle
2015-11-17 20:15:26 -08:00
Brad Hefta-Gaub
a1e10a9f04 Merge pull request #6309 from thoys/20724
CR for Job #20724 - Camera entity mode
2015-11-17 20:05:22 -08:00
Philip Rosedale
450608bf5b Merge pull request #6390 from sethalves/average-near-holds
Average near holds
2015-11-17 20:01:46 -08:00
Brad Hefta-Gaub
963510a3f2 Merge pull request #6414 from jherico/dargo
Fix OpenSSL 64 bit search logic
2015-11-17 19:33:19 -08:00
Brad Davis
ec918a1cf5 Fix OpenSSL 64 bit search logic 2015-11-17 19:10:16 -08:00
Brad Hefta-Gaub
6247aa207f Merge pull request #6412 from birarda/master
fix for messages-mixer bail early on empty settings
2015-11-17 19:09:43 -08:00
Stephen Birarda
2355ba70ca just remove messages-mixer settings grabbing all together 2015-11-17 18:55:09 -08:00
Anthony J. Thibault
9a39da9050 new absolutePoses work for avatars, but not for model entities. 2015-11-17 18:53:38 -08:00
Stephen Birarda
c21fbc9a46 fix for messages-mixer bail early on empty settings 2015-11-17 18:53:23 -08:00
Brad Hefta-Gaub
96b877df97 Merge pull request #6410 from AlessandroSigna/groupRecording
Group recording - better structure
2015-11-17 18:46:14 -08:00
Brad Hefta-Gaub
ba922290a4 Merge pull request #6407 from jherico/dargo
Exclude avatar scales out of the permissable range
2015-11-17 18:41:15 -08:00
Brad Hefta-Gaub
dbd74dc9e2 Merge pull request #6411 from jherico/chiana
A couple fixes for windows 64 bit builds
2015-11-17 18:36:57 -08:00
Brad Davis
68c6718d1c Fixes for windows 64 bit builds 2015-11-17 18:22:00 -08:00
AlessandroSigna
5400381583 improved the structure 2015-11-17 18:03:26 -08:00
AlessandroSigna
8566d84709 fixed cleanup - unload 2015-11-17 18:03:25 -08:00
Brad Hefta-Gaub
733d93039f Merge pull request #6403 from jherico/rec3
Recording fixes
2015-11-17 17:52:15 -08:00
Seth Alves
94f18672d4 equip from a distance uses a spring to pull the object to the hand before equipping it 2015-11-17 17:18:16 -08:00
Brad Davis
4e57c9114c Avatar has no dependency on audio or recording anymore 2015-11-17 17:13:53 -08:00
James B. Pollack
b340a99d69 Merge pull request #6290 from zzmp/examples/growth
Add growth script to examples
2015-11-17 17:01:28 -08:00
James B. Pollack
e0a9048287 new bubble model 2015-11-17 16:59:14 -08:00
Brad Davis
0ad1d08041 Exclude avatar scales out of the permissable range 2015-11-17 16:46:25 -08:00
Brad Davis
d87b8a749f Merge pull request #6405 from ZappoMan/messaging
Messaging Improvements
2015-11-17 16:41:35 -08:00
Brad Hefta-Gaub
293914b84f added NodeActivated signal to make it easier for users to know when a recently added node has an active socket 2015-11-17 16:31:34 -08:00
Brad Hefta-Gaub
073215d067 handle socketActivated 2015-11-17 15:55:41 -08:00
Brad Hefta-Gaub
9c4286b6ca Merge branch 'master' of https://github.com/highfidelity/hifi into messaging 2015-11-17 15:50:54 -08:00
Brad Hefta-Gaub
4ef04f4080 Merge pull request #6406 from birarda/peer-active-signal
add socketActivated signal to NetworkPeer for punch success
2015-11-17 15:50:47 -08:00
Stephen Birarda
f5ec458a5e make activeSocket checks more consistent 2015-11-17 15:38:03 -08:00