Anthony Thibault
3a034fdf66
HMD mode bug fix for avatars with no eyes
...
Previously getCenterEyeCalibrationMat() would return the average eye position for an avatar, if the eyes are missing.
Now we fall back to using the HeadCalibrationMat() and adding an offset from the head to the center of the eyes.
This is more accurate for characters that don't quite have human proportions.
2018-09-04 10:13:57 -07:00
Sam Gondelman
7cdc7dcc66
Merge pull request #13873 from sabrina-shanman/stt_parenting
...
Collision Pick Parenting
2018-08-31 14:43:55 -07:00
sabrina-shanman
62344c106d
Make render states a map when returned from PointerScriptingInterface::getPointerProperties
2018-08-31 11:19:53 -07:00
sabrina-shanman
2e290ea798
Only create a NestableTransformNode if the spatially nestable exists
2018-08-31 10:52:00 -07:00
sabrina-shanman
f71fc83309
Remove PickResult::needsToCompareResults
2018-08-31 10:48:48 -07:00
sabrina-shanman
4d85cb17f3
Include full transform in CollisionPick::getResultTransform
2018-08-31 10:46:17 -07:00
sabrina-shanman
9bf088d32b
Just assign mathPick.loaded in CollisionPick::getMathematicalPick
2018-08-31 10:28:45 -07:00
sabrina-shanman
e94d7de99a
Add JS API hook for getting overlay IDs from a pointer via
...
Pointer.getPointerProperties
2018-08-31 09:18:07 -07:00
Sam Gateau
a7fd35747d
Merge pull request #13896 from AndrewMeadows/workload-feedback
...
Filter timings used in feedback logic for workload region sizes
2018-08-30 19:11:49 -07:00
Anthony Thibault
78d7c321b8
Merge pull request #13796 from amantley/noNeckFix
...
Avatar without Neck Joint bug 14620
2018-08-30 14:52:44 -07:00
John Conklin II
8fa4a2855e
Merge pull request #13641 from amantley/rotateFilterChange
...
Hand Azimuth Controls Shoulder Rotation
2018-08-30 13:59:00 -07:00
David Back
cee270780b
Merge pull request #13908 from dback2/androidCrashStateVariables
...
Fix Android StateController assert
2018-08-30 13:37:13 -07:00
John Conklin II
f5ebdfa233
Merge pull request #13905 from zfox23/fixPr13870
...
Fixup PR13870: Make the feature work in Master
2018-08-30 11:08:23 -07:00
John Conklin II
bf0ab865bb
Merge pull request #13903 from birarda/bug/av-entity-delete-master
...
send MyAvatar avatar entity updates through entity tree
2018-08-30 10:25:31 -07:00
David Back
8b1fcfcce9
fix double windows platform
2018-08-30 10:16:27 -07:00
Sam Gateau
12ec56875e
Merge pull request #13867 from SamGondelman/recurse
...
findRayIntersection/findParabolaIntersection performance improvements
2018-08-30 09:49:16 -07:00
Zach Fox
b8cd5dd8b9
Fixup PR13870: Make the feature work in Master
2018-08-29 16:58:19 -07:00
Sam Gondelman
cfffa65819
Merge pull request #13899 from SamGondelman/pointerPerf
...
Improve Pointer performance
2018-08-29 16:57:43 -07:00
sabrina-shanman
1fe909f9ad
Make CollisionPick::getResultTransform() always return a valid transform
2018-08-29 16:33:51 -07:00
Stephen Birarda
aaf5f593c5
send MyAvatar avatar entity updates through entity tree
2018-08-29 16:30:24 -07:00
sabrina-shanman
686f9fb18a
Move load state flag from CollisionPickResult to CollisionRegion and make it a boolean
2018-08-29 16:29:59 -07:00
Angus Antley
9fb0f8b7c0
added condition to prevent overwriting tracker input with estimated orientation for spine2 joint
2018-08-30 00:25:53 +01:00
John Conklin II
7298cb4654
Merge pull request #13888 from dback2/editControllerMapping
...
Edit mode controller mapping using new platform state variables
2018-08-29 16:06:47 -07:00
sabrina-shanman
2d73b7845e
Code style fixes
2018-08-29 15:00:01 -07:00
sabrina-shanman
0981f08b22
Do not propagate avatar scale in AvatarHeadTransformNode
2018-08-29 14:48:27 -07:00
Zach Fox
67e57a9487
Merge pull request #13849 from zfox23/MS16003_backCloses
...
Fix MS16003: In PAL/GoTo WebView, 'BACK' closes app when you can't go back
2018-08-29 14:29:12 -07:00
SamGondelman
cda8b82ead
improve pointer performance
2018-08-29 13:32:53 -07:00
Angus Antley
f7d0cdda02
added a check for whether the head to shoulder azimuth is greater than 100 degrees. If so unflip the chest azimuth
2018-08-29 20:44:21 +01:00
David Back
96d2ba660c
Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping
2018-08-29 12:05:51 -07:00
Andrew Meadows
f9d14e1351
filter time-cost drivers for region regulation
2018-08-29 11:17:59 -07:00
John Conklin II
4ab45e70a4
Merge pull request #13887 from sethalves/fix-pick-reg-point-1
...
fix far-grab laser-lock on entities with non-default registration point
2018-08-29 10:42:03 -07:00
Angus Antley
ee33f5dc97
normalize the hip hand vector in getSpine2RotationRigSpace, made computeHandAzimuth a const function that returns a vec2
2018-08-29 01:57:49 +01:00
SamGondelman
0c8a4cc81e
merge with master
2018-08-28 17:31:51 -07:00
Sam Gondelman
89bd24dd54
Merge pull request #13880 from SamGondelman/matCrash
...
Fix crash on shutdown in domain with material
2018-08-28 11:48:35 -07:00
amantley
3c792a04c1
fixed roll rotation added to azimuth in MySkeletonModel.cpp
2018-08-28 11:25:42 -07:00
Sam Gateau
d9d23e7fcf
Merge pull request #13877 from luiscuenca/multiplyOtherAvatars
...
Create N replicas of each other-avatar on the client side
2018-08-28 09:02:13 -07:00
amantley
89b508251e
added some comment to explain rig to avatar transform
2018-08-27 17:57:50 -07:00
sabrina-shanman
c6e6da2e3f
Make MouseTransformNode actually parent the pick to a mouse rather than a MouseRayPick, and properly include rotation information
2018-08-27 16:53:55 -07:00
Seth Alves
52bbb4d2ab
fix ray-pick results on entities with non-default registration point. clean up grab scripts to correctly use this fix.
2018-08-27 16:21:01 -07:00
SamGondelman
aae06e8f49
faster aabox ray intersection and pre-computed inverse direction
2018-08-27 15:40:33 -07:00
David Back
b6edb2c9d6
platform states, edit controller mapping, separate mac/win delete
2018-08-27 14:53:13 -07:00
amantley
055f03878e
made changes to add roll to the spine2 rotation. also only the shoulders control the rotation recenter now
2018-08-27 14:44:27 -07:00
sabrina-shanman
397b03d5d5
Add threshold parameter to collision pick with minimum of 0
2018-08-27 14:12:24 -07:00
amantley
dd8a00983c
Merge remote-tracking branch 'upstream/master' into rotateFilterChange
2018-08-24 16:29:20 -07:00
amantley
2bec867863
added the sanity check to see if the shoulders have flipped
2018-08-24 16:29:08 -07:00
sabrina-shanman
cce62f4d92
Do not assume picks with doesIntersect()==false have no results to compare. Fixes CollisionPickResult 'loaded' value always evaluating to false when not colliding
2018-08-24 15:47:52 -07:00
sabrina-shanman
6e160ad22f
Add TransformNode-based parenting and implement for CollisionPicks
2018-08-24 15:47:52 -07:00
sabrina-shanman
3167d3c0c7
Create TransformNodes for SpatiallyNestables, the mouse, and MyAvatar head
2018-08-24 15:47:52 -07:00
SamGondelman
98d145dc24
fix crash on shutdown in domain with material
2018-08-24 15:19:48 -07:00
SamGondelman
70f4d0c634
Merge remote-tracking branch 'upstream/master' into perf
2018-08-24 14:04:37 -07:00