[ Patch #1793 ] Turn physic into POD

[supertux.git] / src / physic.cpp

diff --git a/src/physic.cpp b/src/physic.cpp
index 0f6fdde..84eb892 100644 (file)
--- a/src/physic.cpp
+++ b/src/physic.cpp
@@ -1,86 +1,43 @@
+//  $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>
-#include "defines.h"
-#include "physic.h"
-
-float gravity;
-
-void physic_init(physic_type* pphysic)
-{
-  pphysic->state = -1;
-  pphysic->start_time = 0;
-  pphysic->start_vy = 0;
-}
-
-int physic_get_state(physic_type* pphysic)
-{
-  return pphysic->state;
-}
-
-void physic_set_state(physic_type* pphysic, int nstate)
-{
-  pphysic->state = nstate;
-  pphysic->start_time = st_get_ticks();
-}
-
-void physic_set_start_vy(physic_type* pphysic, float start_vy)
-{
-  pphysic->start_vy = start_vy;
-}
-
-void physic_set_start_vx(physic_type* pphysic, float start_vx)
-{
-  pphysic->start_vx = start_vx;
-}
-
-void physic_set_acceleration(physic_type* pphysic, float acceleration)
-{
-  pphysic->acceleration = acceleration;
-}
-
+//  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>
 
-int physic_is_set(physic_type* pphysic)
-{
-  if(pphysic->state != -1)
-    return YES;
-  else
-    return NO;
-}
+#include "physic.hpp"
 
-float physic_get_velocity(physic_type* pphysic)
+Physic::Physic()
+    : ax(0), ay(0), vx(0), vy(0), gravity_enabled(true), gravity(1000)
 {
-  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;
 }
 
-float physic_get_max_distance(physic_type* pphysic)
+Vector
+Physic::get_movement(float elapsed_time)
 {
-  return (pphysic->start_vy * pphysic->start_vy / 2.*gravity);
-}
+  float grav = gravity_enabled ? gravity : 0;
 
-unsigned int physic_get_max_time(physic_type* pphysic)
-{
-  return (unsigned int)((pphysic->start_vy / gravity) * 1000);
-}
+  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;
 
-unsigned int physic_get_time_gone(physic_type* pphysic)
-{
-  return st_get_ticks() - pphysic->start_time;
+  return result;
 }
-
-