Clément Brisset
5ff482071e
Merge pull request #6465 from ericrius1/polyLineFix
...
moved logic to build vertex buffer to renderable polyline class, recalculati…
2015-11-25 11:02:02 -08:00
Anthony J. Thibault
868cf83b48
Fix for attachments and MyAvatar::getDefaultEyePosition()
2015-11-25 10:07:29 -08:00
Andrew Meadows
bc20b72645
Merge pull request #6453 from howard-stearns/avatar-render-controller2
...
Survive Flash Mobs Without Making Everyone Sick
2015-11-25 09:52:28 -08:00
Anthony Thibault
527199bc69
Merge pull request #1 from AndrewMeadows/fix-avatar-capsule
...
compute bounding capsule of avatars
2015-11-25 09:39:18 -08:00
Andrew Meadows
2cc1dfe819
getRootAbsoluteBindPoseByChildName() is deprecated
2015-11-24 20:39:26 -08:00
Andrew Meadows
3ae082f09c
compute bounding capsule of avatars
2015-11-24 20:28:39 -08:00
Anthony J. Thibault
386dad7aff
Fixes hand IK for some avatars
...
Specifically:
https://hifi-content.s3.amazonaws.com/ozan/dev/avatars/hifi_team/ryan/_test/ryan.fst
https://hifi-content.s3.amazonaws.com/ozan/dev/avatars/hifi_team/brad/brad.fst
https://s3.amazonaws.com/hifi-public/tony/blackmery/blackmery.fst
These avatars have "Hips" joints that are NOT the root of the skeleton.
This would cause the getRootAbsoluteBindPoseByChildName() to return (0,0,0).
Causing the IK targets to be lower then they should have.
2015-11-24 18:57:35 -08:00
Anthony J. Thibault
76034d62d5
Eye tracking fixes
2015-11-24 16:57:26 -08:00
Anthony J. Thibault
f120e10ff4
Merge branch 'master' into tony/remove-joint-states
2015-11-24 15:00:05 -08:00
Howard Stearns
b12bc96fb7
Merge pull request #6482 from hyperlogic/tony/avatar-eye-tracking-fix
...
Fix for avatar eye tracking
2015-11-24 14:38:28 -08:00
Anthony J. Thibault
e07e1c5c92
Fix for avatar eye tracking
...
When computing a full eye to world matrix, the translations need to be the geometry coordinate frame, not scaled into meters.
2015-11-24 14:01:01 -08:00
David Rowe
e25d4c17e8
Fix InputController (Leap Motion) not able to be created
2015-11-25 09:29:40 +13:00
Philip Rosedale
dde01b2071
Merge pull request #6476 from AndrewMeadows/arrow
...
fix for objects suffering from very small updates to physics properties
2015-11-24 11:22:25 -08:00
Brad Hefta-Gaub
fd7a704753
Merge pull request #6471 from birarda/url-cmp
...
fix unnecessary model URL updating thanks to URL encoding
2015-11-24 10:56:21 -08:00
Andrew Meadows
e26081e981
always update physics properties when they change
...
and move activation check logic to MotionState
2015-11-24 10:20:19 -08:00
Andrew Meadows
5135c9dded
whitespace cleanup
2015-11-24 10:20:19 -08:00
Brad Hefta-Gaub
d32e500464
Merge pull request #6462 from jherico/rec5
...
Blendshapes and attachments in recordings, plus other minor fixes.
2015-11-24 10:01:17 -08:00
Stephen Birarda
5a7b0dd1ad
put the parsed model URL in ModelEntityItem
2015-11-24 11:46:51 -06:00
Stephen Birarda
0d6b919448
cleanup printing of updated model URL
2015-11-24 11:22:30 -06:00
Stephen Birarda
0e19e50047
cleaner handling for QString/QUrl conversion/comparison
2015-11-24 11:17:46 -06:00
Stephen Birarda
ab7cbc0b76
Merge branch 'master' of https://github.com/highfidelity/hifi into injector-hybrid
2015-11-24 10:45:00 -06:00
Stephen Birarda
762709748d
Merge pull request #6473 from ZappoMan/waitForScriptThreads
...
change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to complete
2015-11-24 10:39:22 -06:00
Brad Davis
5c2b980a45
Fixing avatar facial blendshapes and attachments in recordings
2015-11-23 22:36:07 -08:00
Brad Davis
bc84265e99
Additional checking when serializing transforms to json
2015-11-23 22:35:12 -08:00
Brad Davis
3738f21936
Fix occasional deadlock in loading recordings
2015-11-23 22:34:17 -08:00
samcake
a1668cdc73
Let the AssertClient JS interface use global vars
2015-11-23 22:28:59 -08:00
Anthony J. Thibault
14189ac909
Move Y_180 flip rotation out of Rig
...
This Y_180 flip is defined in skeletonModel not in the rig.
This is important if we wish to use the Rig for both Avatars (180 flip) and Entity models (no 180 flip).
We can hide this 180 flip from script, if we wish, by including it in all the accessors to and from
MyAvatar -> skeletalModel -> Rig.
Added Quaternions::Y_180 to GLMHelpers.
2015-11-23 19:31:27 -08:00
Brad Hefta-Gaub
5f88d958ab
CR feedback
2015-11-23 18:26:15 -08:00
Brad Hefta-Gaub
ce46c30647
change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to complete
2015-11-23 16:27:06 -08:00
Anthony J. Thibault
8f46b8a765
Added USE_PRE_ROT_FROM_ANIM option to AnimClip
...
This will allow us in the future to pull preRotations from
animations instead of the model skeleton. It is disabled
by default because our current animations preRotations are
not correct for the left hand.
2015-11-23 15:58:18 -08:00
Stephen Birarda
6339c2c48f
fix for unnecessary model URL updating
2015-11-23 17:25:31 -06:00
Stephen Birarda
0997d3dcae
resolve conflicts on merge with upstream/master
2015-11-23 16:15:15 -06:00
Seth Alves
ba30e01664
include global position in avatar-mixer protocol so server knows where avatars are in world-space
2015-11-23 14:12:49 -08:00
Anthony J. Thibault
8252bbed9b
AnimSkeleton: added pre rotation accessor methods
2015-11-23 13:50:14 -08:00
Seth Alves
a08bad8cbd
for models, relay getJointRotation and getJointTranslation to the model
2015-11-23 13:46:32 -08:00
ericrius1
1409ed2d18
moved logic to build vertices buffer to renderable class, recalculating vertices anytime any of the normals, point, or strokeWidths data changes
2015-11-23 12:28:44 -08:00
Seth Alves
d4937071e1
rather than activating rigid body and forcing non-static on deserialize, just force non-static
2015-11-23 12:17:15 -08:00
Anthony J. Thibault
dd3f43705c
Fix for Model Entity animations.
...
Because rig->setJoint* methods take parameters in geometry space
the animations preRotation has to be applied manually.
2015-11-23 11:06:11 -08:00
Howard Stearns
c94a5389a0
comments
2015-11-23 10:31:37 -08:00
Seth Alves
6f19093cb9
if an entity with an action has a motion-type of static, flag it so it gets updated in bullet
2015-11-23 10:03:35 -08:00
Brad Davis
64ba5b4f14
Cleaning up old recording files
2015-11-23 09:42:34 -08:00
Anthony J. Thibault
db21db3cbc
Rig.h: more coordinate space comments
2015-11-22 16:34:06 -08:00
Anthony J. Thibault
dc169dc0aa
Rig.h: updated comments with coordinate spaces
2015-11-22 16:21:22 -08:00
Anthony J. Thibault
821264a031
Merge branch 'master' of github.com:highfidelity/hifi into tony/remove-joint-states
2015-11-22 16:15:03 -08:00
Seth Alves
a0c1f9a1f9
progress toward having things be children of specific joints rather than just of other objects
2015-11-22 13:11:37 -08:00
Seth Alves
abfc3e994a
AvatarData::toFrame expects a scaled transform
2015-11-22 07:18:12 -08:00
Anthony J. Thibault
e2f031e77f
AnimDebugDraw Removed unused drawing code.
2015-11-21 10:57:39 -08:00
Anthony J. Thibault
fe683edb66
Avatar Debug Draw Default Pose now works
2015-11-21 10:53:24 -08:00
Seth Alves
4646c0c103
unmangle merge
2015-11-21 10:49:31 -08:00
Anthony J. Thibault
6cfd831a5a
Menu: Added Developer > Avatar > Debug Draw Position
...
Also renamed "Debug Draw Bind Pose" to "Debug Draw Default Pose"
2015-11-21 09:50:56 -08:00
Seth Alves
f013f95e9b
merge from upstream
2015-11-21 08:43:00 -08:00
Seth Alves
0b1fa4f60f
add interface for getters for specific joints
2015-11-21 08:21:10 -08:00
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
EdgarPironti
ebbed7c525
Save clip to asset - removing last fix
2015-11-20 18:23:36 -08:00
samcake
de56f698aa
Merge pull request #6444 from EdgarPironti/asset_branch
...
Save clip to asset
2015-11-20 16:28:55 -08:00
Brad Davis
336562b894
Merge pull request #6452 from ctrlaltdavid/20732
...
Make multiline strings from JavaScript's print() readably in log file
2015-11-20 16:25:17 -08:00
EdgarPironti
df2153186d
Fixes
2015-11-20 16:07:31 -08:00
EdgarPironti
e70f6855aa
Fixes
2015-11-20 16:07:30 -08:00
EdgarPironti
35365f9157
Fixes
2015-11-20 16:07:30 -08:00
EdgarPironti
1db6d0e3c1
Upload QByteArray
2015-11-20 16:07:29 -08:00
EdgarPironti
1b18d3656f
Save clip to asset
2015-11-20 16:07:29 -08:00
Stephen Birarda
c8b5f6f737
fix for top on deque when empty
2015-11-20 16:03:18 -08:00
Brad Davis
f45eff3df9
Merge pull request #6455 from samcake/controllers
...
Recording playback the skeleton animation correctly for agents
2015-11-20 15:35:53 -08:00
Stephen Birarda
9ddebc8d13
resolve conflicts on merge with upstream/master
2015-11-20 15:29:44 -08:00
samcake
0dc551409d
Fixing a comment
2015-11-20 15:22:01 -08:00
Anthony J. Thibault
4f8cd6930d
Rig: Fixes for initializing _absolutePoses during initJointStates
2015-11-20 15:13:16 -08:00
samcake
e97e864de7
Getting the animation playback to work
2015-11-20 15:05:17 -08:00
Clément Brisset
5d75fcbfce
Merge pull request #6430 from birarda/unique_linked_data
...
use a unique_ptr for linkedData in Node
2015-11-20 15:01:41 -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
howard-stearns
1ddcc62db9
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-render-controller2
2015-11-20 14:05:40 -08:00
howard-stearns
6c784256cb
final(?) cleanup
2015-11-20 13:51:12 -08:00
David Rowe
c72c6a0a47
Make multiline strings from JavaScript's print() readably in log file
...
Addresses quoting of newline characters as "\n" which was introduced in
Qt 5.5.
2015-11-21 10:44:21 +13:00
Brad Hefta-Gaub
c7673aad4a
Merge pull request #6447 from huffman/polyline-texture
...
Add texture property to polyline entity type
2015-11-20 13:31:34 -08:00
Brad Hefta-Gaub
879c42c269
Merge pull request #6451 from jherico/rec5
...
Force synchronous loading of clips in JS
2015-11-20 13:13:34 -08:00
Brad Davis
eef01f8a13
Merge pull request #6443 from ZappoMan/assetJS
...
fix crash with no asset server
2015-11-20 12:58:16 -08:00
Stephen Birarda
b34934b849
resolve conflicts on merge with upstream/master
2015-11-20 11:52:53 -08:00
Brad Davis
cc2a7cbda8
Force synchronous loading of clips in JS
2015-11-20 11:51:08 -08:00
Brad Hefta-Gaub
c22d632c3a
Merge pull request #6446 from jherico/rec4
...
Support writing a clip to a qbytearray
2015-11-20 11:45:39 -08:00
Brad Hefta-Gaub
f1badc017b
CR feedback
2015-11-20 11:43:50 -08:00
Brad Davis
a356f96a7b
Merge pull request #6448 from ZappoMan/messaging
...
fix senderID in messages, dry up code
2015-11-20 11:42:30 -08:00
Clément Brisset
f4b0492b33
Merge pull request #6436 from birarda/ghost-avatar
...
fix for ghosted avatars thanks to check/add race
2015-11-20 11:41:20 -08:00
Brad Hefta-Gaub
7e9190d0e1
Merge branch 'master' of https://github.com/highfidelity/hifi into assetJS
2015-11-20 11:39:50 -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
Brad Hefta-Gaub
caa8b0b5b6
fix unix build
2015-11-20 11:07:01 -08:00
Stephen Birarda
19d3d80ff9
fixes for some incorrect assumptions
2015-11-20 11:03:52 -08:00
Anthony J. Thibault
df7ca3bc38
Rig: getJointRotation and getJointTranslation use _relativePoses
2015-11-20 10:36:40 -08:00
Brad Hefta-Gaub
4bbfcb6092
Merge branch 'master' of https://github.com/highfidelity/hifi into messaging
2015-11-20 10:30:38 -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
Brad Hefta-Gaub
0e5e33446e
handle old protocol case
2015-11-20 09:57:30 -08:00
Howard Stearns
0f6a37f0f7
remainder->fmod!
2015-11-20 09:49:14 -08:00
Anthony J. Thibault
27685e0425
Bug fixes for other Avatar root translation
2015-11-20 09:33:57 -08:00
Brad Hefta-Gaub
8ba6dfe721
add deprication warning about binary SVOs
2015-11-20 09:29:36 -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
Brad Hefta-Gaub
abf169ebd9
fix senderID in messages, dry up code
2015-11-20 09:03:21 -08:00
Brad Davis
5adcbcaf5f
Support writing a clip to a qbytearray
2015-11-19 20:23:50 -08:00
