X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fvehicle.h;h=303c6686a339d6fc938823f6e80ac2d0426b373b;hb=a4566a4a23ff676f11a90615e8e468ef50107946;hp=149adda5d55e931ab6f92a6a83be383e510c8caf;hpb=9ddcd066e37e4c72685817c042c30897786ece05;p=r2c2.git

diff --git a/source/libmarklin/vehicle.h b/source/libmarklin/vehicle.h
index 149adda..303c668 100644
--- a/source/libmarklin/vehicle.h
+++ b/source/libmarklin/vehicle.h
@@ -48,6 +48,7 @@ private:
 	TrackPosition track_pos;
 	Point position;
 	float direction;
+	std::vector<float> bogie_dirs;
 
 public:
 	Vehicle(Layout &, const VehicleType &);
@@ -55,6 +56,13 @@ public:
 
 	const VehicleType &get_type() const { return type; }
 
+	void attach_back(Vehicle &);
+	void attach_front(Vehicle &);
+	void detach_back();
+	void detach_front();
+	Vehicle *get_next() const { return next; }
+	Vehicle *get_previous() const { return prev; }
+
 	void place(Track *, unsigned, float, PlaceMode = CENTER);
 	void advance(float);
 	Track *get_track() const { return track_pos.track; }
@@ -62,9 +70,17 @@ public:
 	float get_offset() const { return track_pos.offs; }
 	const Point &get_position() const { return position; }
 	float get_direction() const { return direction; }
+	float get_bogie_direction(unsigned) const;
 private:
 	void update_position();
-	TrackPoint get_position(float, float, const TrackPosition &);
+	void update_position_from(const Vehicle &);
+	void propagate_position();
+	void propagate_forward();
+	void propagate_backward();
+
+	void adjust_for_distance(TrackPosition &, TrackPosition &, float, float = 0.5) const;
+	TrackPoint get_point(const Point &, const Point &, float = 0.5) const;
+	TrackPoint get_point(const TrackPosition &, float, float = 0.5) const;
 };
 
 } // namespace Marklin