Add a function to retrieve track attachments in order

[r2c2.git] / source / 3d / path.cpp

diff --git a/source/3d/path.cpp b/source/3d/path.cpp
index 98ead14774c3ac7904f128945d292fb18291f815..816631b8307a8f289f436e41c0f7e71d17b1f577 100644 (file)
--- a/source/3d/path.cpp
+++ b/source/3d/path.cpp
@@ -6,6 +6,7 @@
 #include "track.h"
 #include "tracktype.h"
 
+using namespace std;
 using namespace Msp;
 
 namespace R2C2 {
@@ -32,7 +33,7 @@ void Path3D::set_automatic()
 void Path3D::set_path(unsigned p)
 {
        if(!(track.get_track().get_type().get_paths()&(1<<p)))
-               throw InvalidParameterValue("Invalid path");
+               throw invalid_argument("Path3D::set_path");
        automatic = false;
        paths = 1<<p;
 }
@@ -40,7 +41,7 @@ void Path3D::set_path(unsigned p)
 void Path3D::set_mask(unsigned p)
 {
        if(p&~track.get_track().get_type().get_paths())
-               throw InvalidParameterValue("Invalid path mask");
+               throw invalid_argument("Path3D::set_mask");
        automatic = false;
        paths = p;
 }
@@ -70,9 +71,8 @@ void Path3D::render(GL::Renderer &renderer, const GL::Tag &tag) const
                        return;
 
                GL::MatrixStack::Push push_mtx(renderer.matrix_stack());
-               GL::Matrix matrix = track.get_matrix();
-               matrix.translate(0, 0, z_offs);
-               renderer.matrix_stack() *= matrix;
+               renderer.matrix_stack() *= track.Object3D::get_matrix();
+               renderer.matrix_stack() *= GL::Matrix::translation(0, 0, z_offs);
 
                glColor4f(color.r, color.g, color.b, color.a);
                for(unsigned i=0; mask; ++i, mask>>=1)