mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-04-19 11:25:27 +00:00
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:
commit
3a73344abb
36 changed files with 357 additions and 46 deletions
|
|
@ -117,6 +117,10 @@ public:
|
|||
virtual void findContact(SceneObject **contactObject,
|
||||
VectorF *contactNormal,
|
||||
Vector<SceneObject*> *outOverlapObjects) const = 0;
|
||||
|
||||
///
|
||||
virtual void moveKinematicTo(const MatrixF &xfm) = 0;
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue