Make designer work on generic objects

[r2c2.git] / source / libr2c2 / signal.cpp

diff --git a/source/libr2c2/signal.cpp b/source/libr2c2/signal.cpp
index 6efc250256477a7115cae0cff3962da7667be158..72cf235193e6a9c537e67a003ede7a221b8c7673 100644 (file)
--- a/source/libr2c2/signal.cpp
+++ b/source/libr2c2/signal.cpp
@@ -13,14 +13,13 @@ using namespace Msp;
 namespace R2C2 {
 
 Signal::Signal(Layout &l, const SignalType &t):
-       layout(l),
+       Object(l),
        type(t),
        address(0),
        track(0),
        block(0),
        entry(0),
        train(0),
-       check_train_direction(false),
        check_allocated_blocks(false),
        passing(false)
 {
@@ -34,6 +33,14 @@ Signal::~Signal()
        layout.remove_signal(*this);
 }
 
+Signal *Signal::clone(Layout *to_layout) const
+{
+       Signal *sig = new Signal((to_layout ? *to_layout : layout), type);
+       sig->set_position(position);
+       sig->set_rotation(rotation);
+       return sig;
+}
+
 void Signal::set_address(unsigned a)
 {
        address = a;
@@ -54,7 +61,7 @@ void Signal::set_position(const Vector &p)
                        if(d<dist || dist<0)
                        {
                                position = n.pos;
-                               direction = n.dir;
+                               rotation = n.dir;
                                track = *i;
                                dist = d;
                        }
@@ -70,7 +77,7 @@ void Signal::normalize_location()
        unsigned n_endpoints = track->get_type().get_endpoints().size();
        for(unsigned j=0; j<n_endpoints; ++j)
        {
-               float a = track->get_endpoint_direction(j)-direction;
+               float a = track->get_endpoint_direction(j)-rotation;
                while(a<-M_PI/2)
                        a += M_PI*2;
                while(a>M_PI*3/2)
@@ -83,38 +90,39 @@ void Signal::normalize_location()
        }
 }
 
-void Signal::set_direction(float d)
+void Signal::set_rotation(float r)
 {
-       float a = direction-d;
+       float a = rotation-r;
        while(a>M_PI*3/2)
                a -= M_PI*2;
        while(a<-M_PI/2)
                a += M_PI*2;
        if(a>=M_PI/2)
        {
-               direction += M_PI;
-               if(direction>M_PI*2)
-                       direction -= M_PI*2;
+               rotation += M_PI;
+               if(rotation>M_PI*2)
+                       rotation -= M_PI*2;
        }
 
        normalize_location();
 }
 
-void Signal::tick(const Time::TimeDelta &)
+bool Signal::collide_ray(const Vector &start, const Vector &ray) const
 {
-       if(check_train_direction)
-       {
-               int train_entry = train->get_entry_to_block(*block);
-               if(train_entry>=0 && static_cast<unsigned>(train_entry)==entry)
-               {
-                       if(train_conn)
-                               train_conn.disconnect();
-                       train_conn = train->signal_advanced.connect(sigc::mem_fun(this, &Signal::train_advanced));
-               }
-               check_train_direction = false;
-               check_allocated_blocks = true;
-       }
+       // XXX Totally hardcoded stuff, should be replaced with a geometry system
+       Vector center = position;
+       center.x += sin(rotation)*0.035;
+       center.y -= cos(rotation)*0.035;
+       Vector d(center.x-start.x, center.y-start.y);
+       float x = (d.x*ray.x+d.y*ray.y)/(ray.x*ray.x+ray.y*ray.y);
+       Vector nearest(start.x+ray.x*x-center.x, start.y+ray.y*x-center.y, start.z+ray.z*x-center.z);
+       if(nearest.z<0|| nearest.z>0.12)
+               return false;
+       return nearest.x*nearest.x+nearest.y*nearest.y<0.0001;
+}
 
+void Signal::tick(const Time::TimeDelta &)
+{
        if(check_allocated_blocks)
        {
                unsigned n_blocks = 0;
@@ -147,9 +155,16 @@ void Signal::block_reserved(const Block &b, Train *t)
        {
                if(t)
                {
-                       train = t;
-                       passing = false;
-                       check_train_direction = true;
+                       int train_entry = t->get_entry_to_block(*block);
+                       if(train_entry>=0 && static_cast<unsigned>(train_entry)==entry)
+                       {
+                               if(train_conn)
+                                       train_conn.disconnect();
+                               train = t;
+                               passing = false;
+                               train_conn = train->signal_advanced.connect(sigc::mem_fun(this, &Signal::train_advanced));
+                               check_allocated_blocks = true;
+                       }
                }
                else
                {
@@ -177,14 +192,13 @@ void Signal::reset()
        train = 0;
        if(train_conn)
                train_conn.disconnect();
-       check_train_direction = false;
        check_allocated_blocks = false;
 }
 
 void Signal::save(list<DataFile::Statement> &st) const
 {
        st.push_back((DataFile::Statement("position"), position.x, position.y, position.z));
-       st.push_back((DataFile::Statement("direction"), direction));
+       st.push_back((DataFile::Statement("rotation"), rotation));
        if(address)
                st.push_back((DataFile::Statement("address"), address));
 }
@@ -193,9 +207,9 @@ void Signal::save(list<DataFile::Statement> &st) const
 Signal::Loader::Loader(Signal &s):
        DataFile::ObjectLoader<Signal>(s)
 {
-       add("address",   &Loader::address);
-       add("direction", &Loader::direction);
-       add("position",  &Loader::position);
+       add("address",  &Loader::address);
+       add("position", &Loader::position);
+       add("rotation", &Loader::rotation);
 }
 
 void Signal::Loader::address(unsigned a)
@@ -203,14 +217,14 @@ void Signal::Loader::address(unsigned a)
        obj.set_address(a);
 }
 
-void Signal::Loader::direction(float d)
+void Signal::Loader::position(float x, float y, float z)
 {
-       obj.set_direction(d);
+       obj.set_position(Vector(x, y, z));
 }
 
-void Signal::Loader::position(float x, float y, float z)
+void Signal::Loader::rotation(float d)
 {
-       obj.set_position(Vector(x, y, z));
+       obj.set_rotation(d);
 }
 
 } // namespace R2C2