Resolves merging-order conflicts for the vehicle physics PR, as well as correcting cmake not blacklisting the componentGroup files if TORQUE_EXPERIMENTAL_EC was flipped off.

This commit is contained in:
Areloch 2016-06-05 19:17:34 -05:00
commit 3a73344abb
36 changed files with 357 additions and 46 deletions

View file

@ -117,6 +117,10 @@ public:
virtual void findContact(SceneObject **contactObject,
VectorF *contactNormal,
Vector<SceneObject*> *outOverlapObjects) const = 0;
///
virtual void moveKinematicTo(const MatrixF &xfm) = 0;
};