projects
/
physics.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed phony make targets for projects to be suffixies of 'all'
[physics.git]
/
src
/
Entities
/
PhysicsEntity.h
diff --git
a/src/Entities/PhysicsEntity.h
b/src/Entities/PhysicsEntity.h
index
47971a5
..
6c1d455
100644
(file)
--- a/
src/Entities/PhysicsEntity.h
+++ b/
src/Entities/PhysicsEntity.h
@@
-18,8
+18,10
@@
#ifndef PHYSICS_H
#define PHYSICS_H
#ifndef PHYSICS_H
#define PHYSICS_H
+#include <bear/Vector2.h>
+using namespace bear;
+
#include "Entity.h"
#include "Entity.h"
-#include "../Vector2.h"
/// ***** Header Class *****
/// ***** Header Class *****
@@
-37,10
+39,15
@@
class PhysicsEntity: public Entity
virtual Vector2 positionAt(float) const;
virtual Vector2 velocityAt(float) const;
virtual Vector2 positionAt(float) const;
virtual Vector2 velocityAt(float) const;
- virtual void applyForce(const Vector2&);
- virtual void apply
Impulse(const Vector2&
);
+ virtual void applyForce(const Vector2&
force
);
+ virtual void apply
Force(const Vector2& force, const Vector2& at
);
- protected:
+ virtual void applyImpulse(const Vector2& impulse);
+ virtual void applyImpulse(const Vector2& impulse, const Vector2& at);
+
+ virtual void applyNudge(const Vector2& vecPush);
+
+ //protected:
Vector2 force;
float mass;
Vector2 force;
float mass;