Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/interactables - fixes #2038 #2040

Merged
merged 2 commits into from Jun 24, 2019

Conversation

Projects
None yet
2 participants
@thestonefox
Copy link
Member

commented Jun 22, 2019

No description provided.

chore(Dependencies): update Zinnia submodule to latest head
Brings in some new features for CameraColorOverlay events and a new
Vector2ToFloat converter. Also fixes a failing test.

@thestonefox thestonefox requested a review from bddckr Jun 22, 2019

@thestonefox thestonefox changed the title Fix/interactables Fix/interactables - fixes #2038 Jun 22, 2019

fix(Interactions): apply correct kinematic state on follow action
The GrabInteractableFollowAction has been changed so it requires the
specific kinematic state of the containing Rigidbody to be specified as
a parameter for when the follow is active and when the follow is
inactive.

Previously, it would always force the Rigidbody kinematic state to
`true` when a TransformFollow occured but never change the kinematic
state under any other circumstance. It would also always set the
kinematic state back to `false` when the follow finished during
TransformFollow but never did anything with the state under any
other circumstance.

This created an issue as if the object was initially kinematic then
on stop following it would always force it back to being non kinematic
or if the object was kinematic and it was a RigidybodyFollow then as
that follow mechanism requires the Rigidbody to be non kinematic then
it would simply not work.

This new solution means each individual object can be specified what
it expects the Rigidbody kinematic state to be in when a follow starts
and when it ends. It's also possible to change the expected states
during a follow.

So an object may start as being non-kinematic when the follow ends
but during a follow it can be updated so it will stay being kinematic
when the follow ends.

This change will cause some breaking issues for any unpacked prefabs
as the default states may not be correct for the specified follow type.

@thestonefox thestonefox force-pushed the fix/interactables branch from e215332 to 2b77ae5 Jun 23, 2019

@thestonefox thestonefox requested a review from bddckr Jun 23, 2019

@bddckr

bddckr approved these changes Jun 24, 2019

@thestonefox thestonefox merged commit 61c746b into master Jun 24, 2019

1 check passed

WIP Ready for review
Details

@thestonefox thestonefox deleted the fix/interactables branch Jun 24, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.