Verified Commit 47be80b9 authored by Justin Carpentier's avatar Justin Carpentier
Browse files

core: add virtualisation for inheritance

parent 448bd881
Pipeline #13852 passed with stage
in 46 minutes and 38 seconds
......@@ -136,6 +136,8 @@ public:
return res;
}
virtual ~ComputeCollision() {};
protected:
CollisionGeometry const *o1, *o2;
GJKSolver solver;
......@@ -143,7 +145,7 @@ protected:
CollisionFunctionMatrix::CollisionFunc func;
bool swap_geoms;
std::size_t run(const Transform3f& tf1, const Transform3f& tf2,
virtual std::size_t run(const Transform3f& tf1, const Transform3f& tf2,
const CollisionRequest& request, CollisionResult& result) const;
};
......
......@@ -128,6 +128,8 @@ public:
return res;
}
virtual ~ComputeDistance() {};
protected:
CollisionGeometry const *o1, *o2;
GJKSolver solver;
......@@ -135,7 +137,7 @@ protected:
DistanceFunctionMatrix::DistanceFunc func;
bool swap_geoms;
FCL_REAL run(const Transform3f& tf1, const Transform3f& tf2,
virtual FCL_REAL run(const Transform3f& tf1, const Transform3f& tf2,
const DistanceRequest& request, DistanceResult& result) const;
};
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment