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

[Geomagic plugin] Fix scenes #858

Merged
merged 2 commits into from
Dec 13, 2018

Conversation

epernod
Copy link
Contributor

@epernod epernod commented Dec 10, 2018

Following work with @ChristianDuriez at STC6, here is a way to fix the geomagic plugin scenes and recover behavior from before the PR on freeAnimationLoop and lambda function.

Also add:

  • a second RigidSkull.scn example to show another way to map the haptic tool.
  • A small bool to know if the haptic tool is in contact with an object.

This PR:

  • builds with SUCCESS for all platforms on the CI.
  • does not generate new warnings.
  • does not generate new unit test failures.
  • does not generate new scene test failures.
  • does not break API compatibility.
  • is more than 1 week old (or has fast-merge label).

Reviewers will merge only if all these checks are true.

…hanges on freeAnimationLoop. Add second RigidSkull example to show another way to map the haptic tool.
@epernod epernod added location: plugins pr: fix Fix a bug pr: status to review To notify reviewers to review this pull-request labels Dec 10, 2018
@hugtalbot hugtalbot added pr: status ready Approved a pull-request, ready to be squashed and removed pr: status to review To notify reviewers to review this pull-request labels Dec 13, 2018
@damienmarchal damienmarchal merged commit eced9cb into sofa-framework:master Dec 13, 2018
@damienmarchal
Copy link
Contributor

Ready, so merge.

@guparan guparan added this to the v18.12 milestone Dec 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr: fix Fix a bug pr: status ready Approved a pull-request, ready to be squashed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants