X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FCharacter.cc;h=c6ad2a049874d821befa4e90da831703ce2ec653;hp=ac5f8bcb6693349b44679613279465f36fdd7546;hb=33842c860fe18ca8cf087905992885687434320c;hpb=25aefe01ef7dbdb603c51411e04b0d6a6107684f

diff --git a/src/Character.cc b/src/Character.cc
index ac5f8bc..c6ad2a0 100644
--- a/src/Character.cc
+++ b/src/Character.cc
@@ -61,10 +61,12 @@ void Character::update(Mf::Scalar t, Mf::Scalar dt)
 	Mf::Scalar mag = x.length();
 	Mf::Scalar d = 50.0;
 
-	current.force = -5 * (current.position - Mf::Vector2(500.0, 200.0))
-		- 2.0 * current.velocity;
+	current.force = Mf::Vector2(0.0, -2000.0);
+	//current.force += -15.0 * x - 1.5 * current.velocity;
+	current.force += -20.0 * (mag - d) * (x / mag) - 2.0 * current.velocity;
+	current.force += userForce;
 	current.recalculate();
-	std::cout << "force: " << current.momentum << std::endl;
+	//std::cout << "force: " << current.momentum << std::endl;
 
 	Mf::integrate<State,Derivative>(current, t, dt);
 
@@ -85,7 +87,7 @@ void Character::handleEvent(const Mf::Event& event)
 {
 	// really just for heroine...
 	
-	Mf::Scalar force = 500.0;
+	Mf::Scalar force = 4000.0;
 	
 	Mf::Vector2 left = Mf::Vector2(-force, 0.0);
 	Mf::Vector2 right = Mf::Vector2(force, 0.0);