Reverted bigger parts of tuxdev patch:

[supertux.git] / src / physic.cpp

diff --git a/src/physic.cpp b/src/physic.cpp
index 753d3cb..d7993cd 100644 (file)
--- a/src/physic.cpp
+++ b/src/physic.cpp
@@ -23,7 +23,7 @@
 #include "physic.hpp"
 
 Physic::Physic()
-    : ax(0), ay(0), vx(0), vy(0), gravity_enabled_flag(true)
+    : ax(0), ay(0), vx(0), vy(0), gravity_enabled_flag(true), gravity(1000)
 {
 }
 
@@ -47,14 +47,14 @@ Physic::set_velocity_x(float nvx)
 void
 Physic::set_velocity_y(float nvy)
 {
-  vy = -nvy;
+  vy = nvy;
 }
 
 void
 Physic::set_velocity(float nvx, float nvy)
 {
   vx = nvx;
-  vy = -nvy;
+  vy = nvy;
 }
 
 void
@@ -83,13 +83,13 @@ Physic::get_velocity_x() const
 float
 Physic::get_velocity_y() const
 {
-    return -vy;
+    return vy;
 }
 
 Vector
 Physic::get_velocity() const
 {
-  return Vector(vx, -vy);
+  return Vector(vx, vy);
 }
 
 void
@@ -101,14 +101,14 @@ Physic::set_acceleration_x(float nax)
 void
 Physic::set_acceleration_y(float nay)
 {
-  ay = -nay;
+  ay = nay;
 }
 
 void
 Physic::set_acceleration(float nax, float nay)
 {
   ax = nax;
-  ay = -nay;
+  ay = nay;
 }
 
 float
@@ -120,13 +120,13 @@ Physic::get_acceleration_x() const
 float
 Physic::get_acceleration_y() const
 {
-  return -ay;
+  return ay;
 }
 
 Vector
 Physic::get_acceleration() const
 {
-  return Vector(ax, -ay);
+  return Vector(ax, ay);
 }
 
 void
@@ -141,18 +141,29 @@ Physic::gravity_enabled() const
   return gravity_enabled_flag;
 }
 
+void
+Physic::set_gravity(float gravity)
+{
+  this->gravity = gravity;
+}
+
+float
+Physic::get_gravity() const
+{
+  return gravity;
+}
+
 Vector
 Physic::get_movement(float elapsed_time)
 {
-  float grav = gravity_enabled_flag ? 1000 : 0;
-  
+  float grav = gravity_enabled_flag ? gravity : 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;  
+  vy += (ay + grav) * elapsed_time;
 
   return result;
 }
-