X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fphysic.cpp;h=39ad54e733ce46a2cdb28935bd6bd50dd0c38e26;hb=8d1566374788e2c612b35d6b95463398a555b54a;hp=edd976cd38e9c1bad6c3b176bd2f374bcef67ee3;hpb=74ab009aba10e7bed5ad9aa7e1217b7fb1518bf3;p=supertux.git

diff --git a/src/physic.cpp b/src/physic.cpp
index edd976cd3..39ad54e73 100644
--- a/src/physic.cpp
+++ b/src/physic.cpp
@@ -17,15 +17,9 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
+#include <config.h>
 
-#include <stdio.h>
-
-#include "scene.h"
-#include "defines.h"
 #include "physic.h"
-#include "timer.h"
-#include "world.h"
-#include "level.h"
 
 Physic::Physic()
     : ax(0), ay(0), vx(0), vy(0), gravity_enabled(true)
@@ -46,7 +40,7 @@ Physic::reset()
 void
 Physic::set_velocity_x(float nvx)
 {
-  vx = -nvx;
+  vx = nvx;
 }
 
 void
@@ -58,8 +52,8 @@ Physic::set_velocity_y(float nvy)
 void
 Physic::set_velocity(float nvx, float nvy)
 {
-    vx = nvx;
-    vy = -nvy;
+  vx = nvx;
+  vy = -nvy;
 }
 
 void Physic::inverse_velocity_x()
@@ -85,6 +79,18 @@ Physic::get_velocity_y()
 }
 
 void
+Physic::set_acceleration_x(float nax)
+{
+  ax = nax;
+}
+
+void
+Physic::set_acceleration_y(float nay)
+{
+  ay = -nay;
+}
+
+void
 Physic::set_acceleration(float nax, float nay)
 {
     ax = nax;
@@ -109,18 +115,18 @@ Physic::enable_gravity(bool enable_gravity)
   gravity_enabled = enable_gravity;
 }
 
-void
-Physic::apply(float frame_ratio, float &x, float &y)
+Vector
+Physic::get_movement(float elapsed_time)
 {
-  float gravity = World::current()->get_level()->gravity;
-  float grav;
-  if(gravity_enabled)
-    grav = gravity / 100.0;
-  else
-    grav = 0;
-
-  x += vx * frame_ratio + ax * frame_ratio * frame_ratio;
-  y += vy * frame_ratio + (ay + grav) * frame_ratio * frame_ratio;
-  vx += ax * frame_ratio;
-  vy += (ay + grav) * frame_ratio;
+  float grav = gravity_enabled ? 1000 : 0;
+  
+  Vector result(
+      vx * elapsed_time + ax * elapsed_time * elapsed_time,
+      vy * elapsed_time + (ay + grav) * elapsed_time * elapsed_time
+  );
+  vx += ax * elapsed_time;
+  vy += (ay + grav) * elapsed_time;  
+
+  return result;
 }
+