X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftracktype.h;h=64efe8c1907f27541d08af89a2898aa4c02040ac;hb=b79fbe6985cb9bcd8df1f5b0ec95b25314d8798d;hp=afc85215bfe0366e0e107d21371a218ea8ab282a;hpb=2910db1364914c0ab98a0f80250cc39137821577;p=r2c2.git
diff --git a/source/libr2c2/tracktype.h b/source/libr2c2/tracktype.h
index afc8521..64efe8c 100644
--- a/source/libr2c2/tracktype.h
+++ b/source/libr2c2/tracktype.h
@@ -9,16 +9,18 @@
namespace R2C2 {
+class TrackAppearance;
+
class TrackType: public ObjectType
{
public:
struct Endpoint
{
Vector pos;
- float dir; // Direction outwards from the endpoint
+ Angle dir; // Direction outwards from the endpoint
unsigned paths;
- Endpoint(float, float, float, unsigned);
+ Endpoint(float, float, const Angle &, unsigned);
bool has_path(unsigned p) const { return paths&(1<
parts;
std::vector endpoints;
unsigned state_bits;
@@ -46,8 +49,9 @@ private:
std::string object;
public:
- TrackType(const ArticleNumber &);
+ TrackType(const ArticleNumber &, const TrackAppearance &);
+ const TrackAppearance &get_appearance() const { return appearance; }
float get_total_length() const;
float get_path_length(int) const;
unsigned get_paths() const;
@@ -60,9 +64,8 @@ public:
const std::vector &get_parts() const { return parts; }
const std::vector &get_endpoints() const { return endpoints; }
const Endpoint &get_endpoint(unsigned) const;
- TrackPoint get_point(unsigned, unsigned, float) const;
- TrackPoint get_nearest_point(const Vector &) const;
- bool collide_ray(const Vector &, const Vector &, float) const;
+ OrientedPoint get_point(unsigned, unsigned, float) const;
+ OrientedPoint get_nearest_point(const Vector &) const;
private:
void collect_endpoints();