Improve the interface and algorithms of BlockAllocator

[r2c2.git] / source / libr2c2 / tracktype.h

diff --git a/source/libr2c2/tracktype.h b/source/libr2c2/tracktype.h
index afc85215bfe0366e0e107d21371a218ea8ab282a..da0df71428f3514129f953f404133da3b6526dc8 100644 (file)
--- a/source/libr2c2/tracktype.h
+++ b/source/libr2c2/tracktype.h
@@ -15,10 +15,10 @@ 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<<p); }
                bool has_common_paths(const Endpoint &e) const { return paths&e.paths; }
@@ -62,7 +62,6 @@ public:
        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;
 
 private:
        void collect_endpoints();