X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fpath.hpp;h=5ac0fe032b6fef8f23385eca83c4e908b9e131dc;hb=1c148c20eede15d02659203c417d01a9877103de;hp=97f21abe333274db412533c2f5215a47de2e769d;hpb=a15b670f9fb343da5a2398880cfacf2655aefdec;p=supertux.git

diff --git a/src/object/path.hpp b/src/object/path.hpp
index 97f21abe3..5ac0fe032 100644
--- a/src/object/path.hpp
+++ b/src/object/path.hpp
@@ -1,7 +1,9 @@
 //  $Id$
 // 
-//  SuperTux
+//  SuperTux Path
 //  Copyright (C) 2005 Philipp <balinor@pnxs.de>
+//  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
+//  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
@@ -20,54 +22,48 @@
 #ifndef __PATH_HPP__
 #define __PATH_HPP__
 
-#include <string>
-#include <list>
-#include <map>
-
+#include <vector>
 #include "math/vector.hpp"
-#include "game_object.hpp"
 #include "lisp/lisp.hpp"
+#include "serializable.hpp"
 
-
-class   Path;
-typedef std::map<std::string,Path*>       PathRegistry;
-
-
-typedef std::list<Vector>                 PathPoints;
-typedef std::list<Vector>::const_iterator PathPointIter;
-
-
-class Path : public GameObject
+class Path : public Serializable
 {
 public:
-  Path(const lisp::Lisp& reader);
+  Path();
   ~Path();
 
-  virtual void update(float elapsed_time);
-  virtual void draw(DrawingContext& context);
+  void read(const lisp::Lisp& reader);
+  void write(lisp::Writer& writer);
 
-  const Vector& GetPosition();
-  const Vector& GetStart();
-  const Vector& GetLastMovement();
+  Vector get_base() const;
 
-  // WARNING: returns NULL if not found !
-  static Path* GetByName(const std::string& name);
+  /**
+   * Helper class that stores an individual node of a Path
+   */
+  class Node
+  {
+  public:
+    Vector position; /**< the position of this node */
+    float time; /**< time (in seconds) to get from this node to next node */
+  };
 
-private:
-  std::string       name;
-  float             pixels_per_second;
-  PathPoints        points;	
-  PathPointIter     next_target;
-  Vector            pos;
-  Vector            velocity;
-  Vector            last_movement;
-
-  bool              circular;
-  bool              forward;
-
-  void calc_next_velocity();
+  std::vector<Node> nodes;
 
-  static PathRegistry registry;
+private:
+  friend class PathWalker;
+
+  enum WalkMode {
+    // moves from first to last path node and stops
+    ONE_SHOT,
+    // moves from first to last node then in reverse order back to first
+    PING_PONG,
+    // moves from last node back to the first node
+    CIRCULAR
+  };
+
+  WalkMode mode;
 };
 
 #endif
+