Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 11:45:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

actions work again

Browse source
This commit is contained in:
Seth Alves 2017-04-11 21:11:03 -07:00
parent 74c0a70cb0
commit 2b0315645c
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/physics/src/ObjectAction.h
View file

@ -21,10 +21,12 @@ class ObjectAction : public btActionInterface, public ObjectDynamic {
public:
ObjectAction(EntityDynamicType type, const QUuid& id, EntityItemPointer ownerEntity);
virtual bool isAction() const override { return true; }
// this is called from updateAction and should be overridden by subclasses
virtual void updateActionWorker(float deltaTimeStep) = 0;
// these are from btDynamicInterface
// these are from btActionInterface
virtual void updateAction(btCollisionWorld* collisionWorld, btScalar deltaTimeStep) override;
virtual void debugDraw(btIDebugDraw* debugDrawer) override;
};

3
libraries/physics/src/ObjectConstraint.h
View file

@ -22,6 +22,9 @@ class ObjectConstraint : public ObjectDynamic
public:
ObjectConstraint(EntityDynamicType type, const QUuid& id, EntityItemPointer ownerEntity);
virtual btTypedConstraint* getConstraint() = 0;
virtual bool isConstraint() const override { return true; }
protected:
btTypedConstraint* _constraint { nullptr };
};