X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fplatform.cpp;h=e890b92b5a12a2008b24ee7f20eea9844112b700;hb=8a627e73d824b5a14249cfe066dc2fdc643ce28d;hp=f418596ba221b3ec1ace7b60c092af9fd7b337ea;hpb=ef57479f613b900b73eba8e8f4d026aae0de25cc;p=supertux.git

diff --git a/src/object/platform.cpp b/src/object/platform.cpp
index f418596ba..e890b92b5 100644
--- a/src/object/platform.cpp
+++ b/src/object/platform.cpp
@@ -1,76 +1,108 @@
+//  $Id$
+//
+//  SuperTux
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
+//
+//  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 "platform.h"
-#include "video/drawing_context.h"
-#include "resources.h"
-#include "player.h"
-#include "special/sprite_manager.h"
-#include "lisp/lisp.h"
-#include "lisp/writer.h"
+#include "platform.hpp"
+
+#include <stdexcept>
+#include "log.hpp"
+#include "video/drawing_context.hpp"
+#include "resources.hpp"
+#include "player.hpp"
+#include "path.hpp"
+#include "path_walker.hpp"
+#include "sprite/sprite.hpp"
+#include "lisp/lisp.hpp"
+#include "object_factory.hpp"
+#include "scripting/platform.hpp"
+#include "scripting/squirrel_util.hpp"
 
 Platform::Platform(const lisp::Lisp& reader)
+	: MovingSprite(reader, Vector(0,0), LAYER_OBJECTS, COLGROUP_STATIC), speed(Vector(0,0))
 {
-  sprite = sprite_manager->create("flying_platform");
-  movement = Vector(0, 1);
-  reader.get("x", bbox.p1.x);
-  reader.get("y", bbox.p1.y);
-  bbox.set_size(sprite->get_width(), sprite->get_height());
-
-  flags |= FLAG_SOLID;
+  bool running = true;
+  reader.get("running", running);
+  const lisp::Lisp* pathLisp = reader.get_lisp("path");
+  if(pathLisp == NULL)
+    throw std::runtime_error("No path specified for platform");
+  path.reset(new Path());
+  path->read(*pathLisp);
+  walker.reset(new PathWalker(path.get(), running));
+  bbox.set_pos(path->get_base());
 
-  state = 0;
+  set_solid(true);
 }
 
-Platform::~Platform()
+Platform::Platform(const Platform& other)
+	: MovingSprite(other), ScriptInterface(other), speed(other.speed)
 {
-  delete sprite;
+  name = other.name;
+  path.reset(new Path(*other.path));
+  walker.reset(new PathWalker(*other.walker));
+  walker->path = &*path;
 }
 
 HitResponse
 Platform::collision(GameObject& , const CollisionHit& )
 {
-#if 0
-  if(typeid(object) == typeid(Player)) {
-    Player* player = (Player*) &object;
-    //player->movement += movement;
-  }
-#endif
   return FORCE_MOVE;
 }
 
 void
-Platform::action(float )
+Platform::update(float elapsed_time)
+{
+  movement = walker->advance(elapsed_time) - get_pos();
+  speed = movement / elapsed_time;
+}
+
+void
+Platform::goto_node(int node_no)
+{
+  walker->goto_node(node_no);
+}
+
+void
+Platform::start_moving()
+{
+  walker->start_moving();
+}
+
+void
+Platform::stop_moving()
 {
-  // just some test code...
-  if(state == 0) {
-    movement = Vector(0, 1);
-    if(bbox.p1.y > 250)
-      state = 1;
-  }
-  if(state == 1) {
-    movement = Vector(0, -1);
-    if(bbox.p1.y < 50)
-      state = 2;
-  }
-  if(state == 2) {
-    movement = Vector(1, 0);
-    if(bbox.p1.x > 800)
-      state = 3;
-  }
-  if(state == 3) {
-    movement = Vector(-1, 0);
-    if(bbox.p1.x < 400)
-      state = 4;
-  }
-  if(state == 4) {
-    movement = Vector(-1, 1);
-    if(bbox.p1.x < 0)
-      state = 0;
-  }
+  walker->stop_moving();
 }
 
 void
-Platform::draw(DrawingContext& context)
+Platform::expose(HSQUIRRELVM vm, SQInteger table_idx)
 {
-  sprite->draw(context, get_pos(), LAYER_OBJECTS);
+  if (name.empty()) return;
+  Scripting::Platform* interface = new Scripting::Platform(this);
+  expose_object(vm, table_idx, interface, name, true);
 }
+
+void
+Platform::unexpose(HSQUIRRELVM vm, SQInteger table_idx)
+{
+  if (name.empty()) return;
+  Scripting::unexpose_object(vm, table_idx, name);
+}
+
+IMPLEMENT_FACTORY(Platform, "platform");