Add reset to rrtext 2

diff --git a/incl/rrtext.hh b/incl/rrtext.hh
index 60eace15e6e4c33e30422a7fc080e5a189eab7b9..0c8cd06660ae2d4ecc9f058e1f0f3dd49182f996 100644 (file)
--- a/incl/rrtext.hh
+++ b/incl/rrtext.hh
@@ -414,6 +414,7 @@ public:
        RRTExt2();
        Json::Value json() const;
        void json(Json::Value jvi);
+       void reset();
 };
 
 /* \brief Different costs extension.

diff --git a/incl/rrtsp.hh b/incl/rrtsp.hh
index 728ebf9770fb2b3c487737e6e85f828699505452..24f329f1c72223319fa496e16a3bf28dd4d2b255 100644 (file)
--- a/incl/rrtsp.hh
+++ b/incl/rrtsp.hh
@@ -47,6 +47,7 @@ public:
                RRTExt8::reset();
                RRTExt14::reset();
                RRTExt13::reset();
+               RRTExt2::reset();
        }
 };
 
@@ -74,6 +75,7 @@ public:
                RRTExt8::reset();
                RRTExt14::reset();
                RRTExt13::reset();
+               RRTExt2::reset();
        }
 };
 
@@ -97,6 +99,7 @@ public:
                RRTExt8::reset();
                RRTExt14::reset();
                RRTExt13::reset();
+               RRTExt2::reset();
        }
 };
 
@@ -115,6 +118,7 @@ public:
        {
                RRTExt8::reset();
                RRTExt14::reset();
+               RRTExt2::reset();
        }
 };
 
@@ -133,6 +137,7 @@ public:
        {
                RRTExt8::reset();
                RRTExt14::reset();
+               RRTExt2::reset();
        }
 };
 

diff --git a/src/rrtext2.cc b/src/rrtext2.cc
index 06caf9fe2f028e6d4b43c0725696633bed5a8be4..8af74221dbe9f2a1386e9009a666cad4c753a58b 100644 (file)
--- a/src/rrtext2.cc
+++ b/src/rrtext2.cc
@@ -53,6 +53,21 @@ RRTExt2::RRTExt2() : RRTS()
        this->c2_bc_.verts[3].y = this->bc_.rfy();
 }
 
+void
+RRTExt2::reset()
+{
+       RRTS::reset();
+       this->c2_bc_.count = 4;
+       this->c2_bc_.verts[0].x = this->bc_.lfx();
+       this->c2_bc_.verts[0].y = this->bc_.lfy();
+       this->c2_bc_.verts[1].x = this->bc_.lrx();
+       this->c2_bc_.verts[1].y = this->bc_.lry();
+       this->c2_bc_.verts[2].x = this->bc_.rrx();
+       this->c2_bc_.verts[2].y = this->bc_.rry();
+       this->c2_bc_.verts[3].x = this->bc_.rfx();
+       this->c2_bc_.verts[3].y = this->bc_.rfy();
+}
+
 Json::Value
 RRTExt2::json() const
 {