Strip Id tags and copyright notices from files

[r2c2.git] / source / engineer / trainview.cpp

diff --git a/source/engineer/trainview.cpp b/source/engineer/trainview.cpp
index df336d577197763080a68fca2360f97fc52c6d52..c3d96fdc2fd78af194ffca98a99396cac287595e 100644 (file)
--- a/source/engineer/trainview.cpp
+++ b/source/engineer/trainview.cpp
@@ -1,20 +1,13 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <msp/gl/tests.h>
 #include <msp/gltk/button.h>
 #include <msp/gltk/image.h>
-#include "libmarklin/vehicle.h"
-#include "libmarklin/vehicletype.h"
+#include "libr2c2/vehicle.h"
+#include "libr2c2/vehicletype.h"
 #include "engineer.h"
 #include "trainview.h"
 
 using namespace Msp;
-using namespace Marklin;
+using namespace R2C2;
 
 TrainView::TrainView(Engineer &e, const Train &t):
        engineer(e),
@@ -27,7 +20,7 @@ TrainView::TrainView(Engineer &e, const Train &t):
        set_size(300, 330);
 
        tex.set_min_filter(GL::LINEAR);
-       tex.storage(GL::RGB, 280, 280, 0);
+       tex.storage(GL::RGB, 280, 280);
        tex.image(0, GL::RGB, GL::UNSIGNED_BYTE, 0);
        fbo.attach(GL::COLOR_ATTACHMENT0, tex, 0);
        depth.storage(GL::DEPTH_COMPONENT, 280, 280);
@@ -92,7 +85,7 @@ void TrainView::set_forward(bool f)
 void TrainView::prepare()
 {
        const Vehicle &veh = train.get_vehicle(0);
-       const Point &pos = veh.get_position();
+       const Vector &pos = veh.get_position();
        float angle = veh.get_direction();
        if(!forward)
                angle += M_PI;