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

[SofaHaptics] Modularize sofa haptics #945

merged 7 commits into from Mar 14, 2019


4 participants
Copy link

commented Feb 25, 2019

There is several dependencies from SofaHaptics to "hard" to compile code.

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.

damienmarchal added some commits Feb 24, 2019

[SofaHaptics] MOVE file to SofaHaptics/src/SofaHaptics
Because this is how we can avoid leacking too easily the include path.

Signed-off-by: Damien Marchal <>

@damienmarchal damienmarchal requested a review from ChristianDuriez Feb 25, 2019

@epernod epernod self-requested a review Mar 1, 2019


epernod approved these changes Mar 7, 2019

Copy link

left a comment

Tested on windows with Geomagic Touch. No problem.


This comment has been minimized.

Copy link
Contributor Author

commented Mar 8, 2019

Deep sadness...why so much conflict.

Merge remote-tracking branch 'sofa-framework/master' into modularizeS…

# Conflicts:
#	modules/SofaHaptics/NullForceFeedbackT.cpp
#	modules/SofaHaptics/src/SofaHaptics/ForceFeedback.h
#	modules/SofaHaptics/src/SofaHaptics/LCPForceFeedback.h
#	modules/SofaHaptics/src/SofaHaptics/MechanicalStateForceFeedback.h
#	modules/SofaHaptics/src/SofaHaptics/NullForceFeedback.h
#	modules/SofaHaptics/src/SofaHaptics/NullForceFeedbackT.h

@epernod epernod merged commit 58bf432 into sofa-framework:master Mar 14, 2019

5 of 7 checks passed

[with-regression-tests] Missing.
[with-scene-tests] Missing.
Dashboard Builds triggered.
centos_clang-5_options Build OK. FIXME: 1 unit tests
mac_clang-3.5_options Build OK. FIXME: 2 unit tests
ubuntu_gcc-5.4_options Build OK. FIXME: 1 unit tests
windows7_VS-2015_options_amd64 Build OK. FIXME: 3 unit tests

@damienmarchal damienmarchal deleted the SofaDefrost:modularizeSofaHaptics branch Apr 24, 2019

@guparan guparan added this to the v19.06 milestone Jun 20, 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.