X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fvehicle.h;h=ce56666f473f93f0222d3b209c292e6cf712fafb;hb=34f8bf04e4bdffefeceea59b186386b51c542b9d;hp=2e91962842f2d319153ea4e8a2592f9f7af2275b;hpb=37af7970d9cefcf40ae58ca06ca8469f56b0cc13;p=r2c2.git

diff --git a/source/libr2c2/vehicle.h b/source/libr2c2/vehicle.h
index 2e91962..ce56666 100644
--- a/source/libr2c2/vehicle.h
+++ b/source/libr2c2/vehicle.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of R²C²
-Copyright © 2010  Mikkosoft Productions, Mikko Rasa
+Copyright © 2010-2011  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -9,12 +9,12 @@ Distributed under the GPL
 #define LIBR2C2_VEHICLE_H_
 
 #include "geometry.h"
+#include "vehicletype.h"
 
 namespace R2C2 {
 
 class Layout;
 class Track;
-class VehicleType;
 
 class Vehicle
 {
@@ -28,6 +28,32 @@ public:
 		BACK_BUFFER
 	};
 
+	struct Axle
+	{
+		const VehicleType::Axle *type;
+		float angle;
+
+		Axle(const VehicleType::Axle &);
+	};
+
+	struct Bogie
+	{
+		const VehicleType::Bogie *type;
+		float direction;
+		std::vector<Axle> axles;
+
+		Bogie(const VehicleType::Bogie &);
+	};
+
+	struct Rod
+	{
+		const VehicleType::Rod *type;
+		Vector position;
+		float angle;
+
+		Rod(const VehicleType::Rod &);
+	};
+
 private:
 	struct TrackPosition
 	{
@@ -41,23 +67,15 @@ private:
 		TrackPoint get_point() const;
 	};
 
-	struct Rod
-	{
-		Point position;
-		float angle;
-
-		Rod();
-	};
-
 	Layout &layout;
 	const VehicleType &type;
 	Vehicle *next;
 	Vehicle *prev;
 	TrackPosition track_pos;
-	Point position;
+	Vector position;
 	float direction;
-	std::vector<float> bogie_dirs;
-	std::vector<std::vector<float> > axle_angles;
+	std::vector<Axle> axles;
+	std::vector<Bogie> bogies;
 	std::vector<Rod> rods;
 	unsigned front_sensor;
 	unsigned back_sensor;
@@ -81,13 +99,12 @@ public:
 	Track *get_track() const { return track_pos.track; }
 	unsigned get_entry() const { return track_pos.ep; }
 	float get_offset() const { return track_pos.offs; }
-	const Point &get_position() const { return position; }
+	const Vector &get_position() const { return position; }
 	float get_direction() const { return direction; }
-	float get_axle_angle(unsigned) const;
-	float get_bogie_direction(unsigned) const;
-	float get_bogie_axle_angle(unsigned, unsigned) const;
-	const Point &get_rod_position(unsigned) const;
-	float get_rod_angle(unsigned) const;
+	const Axle &get_fixed_axle(unsigned) const;
+	const Bogie &get_bogie(unsigned) const;
+	const Axle &get_bogie_axle(unsigned, unsigned) const;
+	const Rod &get_rod(unsigned) const;
 private:
 	void update_position();
 	void update_position_from(const Vehicle &);
@@ -99,7 +116,7 @@ private:
 	void update_rods();
 
 	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 Vector &, const Vector &, float = 0.5) const;
 	TrackPoint get_point(const TrackPosition &, float, float = 0.5) const;
 };