X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fphysic.cpp;h=7300b9e3cc35461912f2f41b5ed91a71df004936;hb=828b5e1ef1cb89d830735f24dd79bbd9b09d5b32;hp=f31566158e0e8d781f6ef6e942b02068654132b6;hpb=a2715d2de23913e3bd458cbea162924e2f379495;p=supertux.git

diff --git a/src/physic.cpp b/src/physic.cpp
index f31566158..7300b9e3c 100644
--- a/src/physic.cpp
+++ b/src/physic.cpp
@@ -1,22 +1,31 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
 //
-// C Implementation: physic
-//
-// Description:
-//
-//
-// Author: Tobias Glaesser <tobi.web@gmx.de>, (C) 2004
-//
-// Copyright: See COPYING file that comes with this distribution
-//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
 //
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+//  02111-1307, USA.
+
 #include <stdio.h>
 
 #include "scene.h"
 #include "defines.h"
 #include "physic.h"
 #include "timer.h"
-
-float gravity;
+#include "sector.h"
+#include "level.h"
 
 Physic::Physic()
     : ax(0), ay(0), vx(0), vy(0), gravity_enabled(true)
@@ -35,10 +44,32 @@ Physic::reset()
 }
 
 void
+Physic::set_velocity_x(float nvx)
+{
+  vx = nvx;
+}
+
+void
+Physic::set_velocity_y(float nvy)
+{
+  vy = -nvy;
+}
+
+void
 Physic::set_velocity(float nvx, float nvy)
 {
-    vx = nvx;
-    vy = -nvy;
+  vx = nvx;
+  vy = -nvy;
+}
+
+void Physic::inverse_velocity_x()
+{
+vx = -vx;
+}
+
+void Physic::inverse_velocity_y()
+{
+vy = -vy;
 }
 
 float
@@ -54,6 +85,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;
@@ -75,20 +118,28 @@ Physic::get_acceleration_y()
 void
 Physic::enable_gravity(bool enable_gravity)
 {
-    gravity_enabled = enable_gravity;
+  gravity_enabled = enable_gravity;
 }
 
 void
-Physic::apply(float &x, float &y)
+Physic::apply(float elapsed_time, float &x, float &y)
 {
-    float grav;
-    if(gravity_enabled)
-        grav = gravity / 100.0;
-    else
-        grav = 0;
+  float gravity = Sector::current()->gravity;
+  float grav;
+  if(gravity_enabled)
+    grav = gravity / 100.0;
+  else
+    grav = 0;
+
+  x += vx * elapsed_time + ax * elapsed_time * elapsed_time;
+  y += vy * elapsed_time + (ay + grav) * elapsed_time * elapsed_time;
+  vx += ax * elapsed_time;
+  vy += (ay + grav) * elapsed_time;
+}
 
-    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;
+void
+Physic::apply(Vector& vector, float elapsed_time)
+{
+  apply(elapsed_time, vector.x, vector.y);
 }
+