projects
/
physics.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gravity well now follows the mouse
[physics.git]
/
src
/
effectManager.cpp
diff --git
a/src/effectManager.cpp
b/src/effectManager.cpp
index
6ebffdd
..
2e50c65
100644
(file)
--- a/
src/effectManager.cpp
+++ b/
src/effectManager.cpp
@@
-23,12
+23,15
@@
#include "Effects/Screen.h"
#include "Vector2.h"
#include "Effects/Screen.h"
#include "Vector2.h"
+#include "input/inputManager.h"
/// ***** Private Variables *****
Effect** effects;
int numEffects;
/// ***** Private Variables *****
Effect** effects;
int numEffects;
+GravityWell* mouseWell;
+
/// ***** Initializers/Cleaners *****
void effect::init()
/// ***** Initializers/Cleaners *****
void effect::init()
@@
-36,8
+39,10
@@
void effect::init()
numEffects = 3;
effects = new Effect*[numEffects]();
numEffects = 3;
effects = new Effect*[numEffects]();
- effects[0] = new Gravity();
- effects[1] = new GravityWell(Vector2(400,400));
+ mouseWell = new GravityWell(input::mousePosition());
+
+ effects[0] = mouseWell;
+ effects[1] = new Gravity();
effects[2] = new Screen();
}
void effect::clean()
effects[2] = new Screen();
}
void effect::clean()
@@
-52,6
+57,15
@@
void effect::clean()
/// ***** Public Methods *****
/// ***** Public Methods *****
+void effect::update(float)
+{
+
+}
+void effect::handleInput()
+{
+ mouseWell->setPosition(input::mousePosition());
+}
+
Vector2 effect::positionDelta(const PhysicsEntity* e, float time_step)
{
Vector2 acc(0,0);
Vector2 effect::positionDelta(const PhysicsEntity* e, float time_step)
{
Vector2 acc(0,0);