X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fphysic.cpp;h=518ce8349b7556cb1bcca0b222198feb5d5b2f68;hb=7a051411ba56f285197e047229586865931b748c;hp=232475d692ee8c8c0f63edc666abd9c7da41d332;hpb=2398b134147461d9b4e096f1c15dbf889c0f2d41;p=supertux.git

diff --git a/src/physic.cpp b/src/physic.cpp
index 232475d69..518ce8349 100644
--- a/src/physic.cpp
+++ b/src/physic.cpp
@@ -1,25 +1,29 @@
+//  $Id$
 //
-// C Implementation: physic
+//  SuperTux
+//  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
-// Description:
+//  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.
 //
-// Author: Tobias Glaesser <tobi.web@gmx.de>, (C) 2004
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
-#include <stdio.h>
+//  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 <config.h>
 
-#include "scene.h"
-#include "defines.h"
-#include "physic.h"
-#include "timer.h"
-#include "world.h"
-#include "level.h"
+#include "physic.hpp"
 
 Physic::Physic()
-    : ax(0), ay(0), vx(0), vy(0), gravity_enabled(true)
+    : ax(0), ay(0), vx(0), vy(0), gravity_enabled_flag(true)
 {
 }
 
@@ -31,65 +35,124 @@ void
 Physic::reset()
 {
     ax = ay = vx = vy = 0;
-    gravity_enabled = true;
+    gravity_enabled_flag = true;
+}
+
+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::set_velocity(const Vector& vector)
+{
+  vx = vector.x;
+  vy = vector.y;
+}
+
+void Physic::inverse_velocity_x()
+{
+  vx = -vx;
+}
+
+void Physic::inverse_velocity_y()
+{
+  vy = -vy;
 }
 
 float
-Physic::get_velocity_x()
+Physic::get_velocity_x() const
 {
     return vx;
 }
 
 float
-Physic::get_velocity_y()
+Physic::get_velocity_y() const
+{
+    return vy;
+}
+
+Vector
+Physic::get_velocity() const
+{
+  return Vector(vx, vy);
+}
+
+void
+Physic::set_acceleration_x(float nax)
+{
+  ax = nax;
+}
+
+void
+Physic::set_acceleration_y(float nay)
 {
-    return -vy;
+  ay = nay;
 }
 
 void
 Physic::set_acceleration(float nax, float nay)
 {
-    ax = nax;
-    ay = -nay;
+  ax = nax;
+  ay = nay;
 }
 
 float
-Physic::get_acceleration_x()
+Physic::get_acceleration_x() const
 {
-    return ax;
+  return ax;
 }
 
 float
-Physic::get_acceleration_y()
+Physic::get_acceleration_y() const
+{
+  return ay;
+}
+
+Vector
+Physic::get_acceleration() const
 {
-    return -ay;
+  return Vector(ax, ay);
 }
 
 void
 Physic::enable_gravity(bool enable_gravity)
 {
-  gravity_enabled = enable_gravity;
+  gravity_enabled_flag = enable_gravity;
 }
 
-void
-Physic::apply(float frame_ratio, float &x, float &y)
+bool
+Physic::gravity_enabled() const
 {
-  float gravity = World::current()->get_level()->gravity;
-  float grav;
-  if(gravity_enabled)
-    grav = gravity / 100.0;
-  else
-    grav = 0;
+  return gravity_enabled_flag;
+}
 
-  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;
+Vector
+Physic::get_movement(float elapsed_time)
+{
+  float grav = gravity_enabled_flag ? 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;
 }
+