[SofaBase] Package SofaBaseCollision #1653
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fredroy
added
pr: status wip
|
[ci-build][with-all-tests] |
fredroy
added
pr: status to review
fredroy
force-pushed
the
modularize_base_collision
branch
from
387e4e5 to
7cac067
Compare
fredroy
force-pushed
the
modularize_base_collision
branch
from
7cac067 to
3be530a
Compare
epernod
reviewed
Dec 17, 2020
| @@ -184,12 +176,7 @@ void CubeCollisionModel::draw(const core::visual::VisualParams* vparams) | |||
| ++level; | |||
| color *= 0.8f; | |||
| } | |||
| Vec<4,float> c; | |||
| if (isSimulated()) | |||
| c=Vec<4,float>(1.0f, 1.0f, 1.0f, color); | |||
There was a problem hiding this comment.
if it is like TriangleModel, I think simulated is "gold" and not is white
There was a problem hiding this comment.
I was not sure but I went for the lazy way :p
| @@ -42,13 +36,7 @@ int RigidCylinderCollisionModelClass = core::RegisterObject("Collision model whi | |||
| .addAlias("CylinderModel") | |||
There was a problem hiding this comment.
didn't even know we had that in SOFA ....
| @@ -52,20 +45,12 @@ class SOFA_BASE_COLLISION_API NewProximityIntersection : public BaseProximityInt | |||
|
|
|||
| }; | |||
|
|
|||
| } // namespace collision | |||
| } // namespace sofa::core::collision | |||
There was a problem hiding this comment.
sofa::component::collision no sofa::core
yes... I'm really reading!
There was a problem hiding this comment.
right.
(And i dont doubt about it, with your remarks on end of line or spaces 😙)
|
|
||
| #include <SofaBase/config.h> | ||
| #include <sofa/config.h> | ||
| #include <sofa/config/sharedlibrary_defines.h> |
There was a problem hiding this comment.
This one ?
#include <sofa/config/sharedlibrary_defines.h>
It defines the macros SOFA_EXPORT_DYNAMIC_LIBRARY and SOFA_IMPORT_DYNAMIC_LIBRARY
fredroy
added
pr: status ready
fredroy
added a commit
that referenced
this pull request
Dec 21, 2020
* cmake setup * cleaning * Fix compilation (coming from the removal of the inclusion of MechanicalObject) * clean headers * remove warnings * use rgbacolor * add component change * Update NewProximityIntersection.h * replace color for CubeModel
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#1633
By submitting this pull request, I acknowledge that
I have read, understand, and agree SOFA Developer Certificate of Origin (DCO).
Reviewers will merge this pull-request only if