X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fphysic.cpp;h=cdc37879f755c219b8482f3e01f07e731993c03b;hb=472d0ad804844d28811c86f03da74b6d6be53f1b;hp=0f6fddeb3c0a1b75235ad19c887166943bf9ec74;hpb=ef208e1b7d93b6e434c17df26c8edcaa51088539;p=supertux.git

diff --git a/src/physic.cpp b/src/physic.cpp
index 0f6fddeb3..cdc37879f 100644
--- a/src/physic.cpp
+++ b/src/physic.cpp
@@ -1,86 +1,166 @@
+//  $Id$
 //
-// C Implementation: physic
+//  SuperTux
+//  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
-// 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 <config.h>
 
-#include <stdio.h>
-#include "defines.h"
-#include "physic.h"
+#include "physic.hpp"
 
-float gravity;
+Physic::Physic()
+    : ax(0), ay(0), vx(0), vy(0), gravity_enabled_flag(true), gravity(10 * 100)
+{
+}
 
-void physic_init(physic_type* pphysic)
+Physic::~Physic()
 {
-  pphysic->state = -1;
-  pphysic->start_time = 0;
-  pphysic->start_vy = 0;
 }
 
-int physic_get_state(physic_type* pphysic)
+void
+Physic::reset()
 {
-  return pphysic->state;
+    ax = ay = vx = vy = 0;
+    gravity_enabled_flag = true;
 }
 
-void physic_set_state(physic_type* pphysic, int nstate)
+void
+Physic::set_velocity_x(float nvx)
 {
-  pphysic->state = nstate;
-  pphysic->start_time = st_get_ticks();
+  vx = nvx;
 }
 
-void physic_set_start_vy(physic_type* pphysic, float start_vy)
+void
+Physic::set_velocity_y(float nvy)
 {
-  pphysic->start_vy = start_vy;
+  vy = nvy;
 }
 
-void physic_set_start_vx(physic_type* pphysic, float start_vx)
+void
+Physic::set_velocity(float nvx, float nvy)
 {
-  pphysic->start_vx = start_vx;
+  vx = nvx;
+  vy = nvy;
 }
 
-void physic_set_acceleration(physic_type* pphysic, float acceleration)
+void
+Physic::set_velocity(const Vector& vector)
 {
-  pphysic->acceleration = acceleration;
+  vx = vector.x;
+  vy = vector.y;
 }
 
+void Physic::inverse_velocity_x()
+{
+  vx = -vx;
+}
 
-int physic_is_set(physic_type* pphysic)
+void Physic::inverse_velocity_y()
 {
-  if(pphysic->state != -1)
-    return YES;
-  else
-    return NO;
+  vy = -vy;
 }
 
-float physic_get_velocity(physic_type* pphysic)
+float
+Physic::get_velocity_x() const
 {
-  if(pphysic->state == PH_VT)
-    return - (pphysic->start_vy - gravity* ((float)(st_get_ticks() - pphysic->start_time))/1000.);
-  else if(pphysic->state == PH_HA)
-    return - (pphysic->start_vx - pphysic->acceleration * ((float)(st_get_ticks() - pphysic->start_time))/1000.);
-  else
-    return 0;
+    return vx;
 }
 
-float physic_get_max_distance(physic_type* pphysic)
+float
+Physic::get_velocity_y() const
 {
-  return (pphysic->start_vy * pphysic->start_vy / 2.*gravity);
+    return vy;
 }
 
-unsigned int physic_get_max_time(physic_type* pphysic)
+Vector
+Physic::get_velocity() const
 {
-  return (unsigned int)((pphysic->start_vy / gravity) * 1000);
+  return Vector(vx, vy);
 }
 
-unsigned int physic_get_time_gone(physic_type* pphysic)
+void
+Physic::set_acceleration_x(float nax)
 {
-  return st_get_ticks() - pphysic->start_time;
+  ax = nax;
 }
 
+void
+Physic::set_acceleration_y(float nay)
+{
+  ay = nay;
+}
 
+void
+Physic::set_acceleration(float nax, float nay)
+{
+  ax = nax;
+  ay = nay;
+}
+
+float
+Physic::get_acceleration_x() const
+{
+  return ax;
+}
+
+float
+Physic::get_acceleration_y() const
+{
+  return ay;
+}
+
+Vector
+Physic::get_acceleration() const
+{
+  return Vector(ax, ay);
+}
+
+void
+Physic::enable_gravity(bool enable_gravity)
+{
+  gravity_enabled_flag = enable_gravity;
+}
+
+bool
+Physic::gravity_enabled() const
+{
+  return gravity_enabled_flag;
+}
+
+void
+Physic::set_gravity(float gravity)
+{
+  this->gravity = gravity * 100;
+}
+
+float
+Physic::get_gravity() const
+{
+  return gravity / 100;
+}
+
+Vector
+Physic::get_movement(float elapsed_time)
+{
+  float grav = gravity_enabled_flag ? gravity : 0;
+
+  vx += ax * elapsed_time;
+  vy += (ay + grav) * elapsed_time;
+  Vector result(vx * elapsed_time, vy * elapsed_time);
+
+  return result;
+}