Derive Collection3D from Msp::DataFile and get GL::Objects through it

diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp
index 8641013fe3559256a052644267aaf77d7e0869b7..99148f8fb3c234bfd17a0b2a3452ba9594d6967e 100644 (file)
--- a/source/3d/catalogue.cpp
+++ b/source/3d/catalogue.cpp
@@ -5,7 +5,11 @@ Copyright © 2010 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
+#include <msp/fs/stat.h>
 #include <msp/gl/meshbuilder.h>
+#include <msp/gl/object.h>
+#include <msp/gl/program.h>
+#include <msp/gl/technique.h>
 #include "catalogue.h"
 #include "tracktype.h"
 #include "vehicletype.h"
@@ -19,6 +23,12 @@ Catalogue3D::Catalogue3D(Catalogue &c):
        catalogue(c),
        endpoint_mesh((GL::NORMAL3, GL::VERTEX3))
 {
+       add_creator<GL::Material>(&Catalogue3D::create<GL::Material>);
+       add_creator<GL::Mesh>(&Catalogue3D::create<GL::Mesh>);
+       add_creator<GL::Object>(&Catalogue3D::create2<GL::Object>);
+       add_creator<GL::Program>(&Catalogue3D::create<GL::Program>);
+       add_creator<GL::Technique>(&Catalogue3D::create2<GL::Technique>);
+
        catalogue.signal_track_added.connect(sigc::mem_fun(this, &Catalogue3D::track_added));
        catalogue.signal_vehicle_added.connect(sigc::mem_fun(this, &Catalogue3D::vehicle_added));
 
@@ -93,4 +103,32 @@ void Catalogue3D::build_endpoint_mesh()
        bld.end();
 }
 
+FS::Path Catalogue3D::locate_file(const string &name)
+{
+       if(FS::exists(name))
+               return name;
+
+       FS::Path path = FS::Path("data")/name;
+       if(FS::exists(path))
+               return path;
+
+       throw Exception("Can't locate "+name);
+}
+
+template<typename T>
+T *Catalogue3D::create(const string &name)
+{
+       RefPtr<T> obj = new T;
+       DataFile::load(*obj, locate_file(name).str());
+       return obj.release();
+}
+
+template<typename T>
+T *Catalogue3D::create2(const string &name)
+{
+       RefPtr<T> obj = new T;
+       DataFile::load(*obj, locate_file(name).str(), *this);
+       return obj.release();
+}
+
 } // namespace R2C2

diff --git a/source/3d/catalogue.h b/source/3d/catalogue.h
index bda1314ce6528a8f4721ca1ed2e9933c1bdbe0b4..caf104e5ef146bcb9ec844dd963037bf41294ab7 100644 (file)
--- a/source/3d/catalogue.h
+++ b/source/3d/catalogue.h
@@ -8,6 +8,8 @@ Distributed under the GPL
 #ifndef R2C2_3D_CATALOGUE_H_
 #define R2C2_3D_CATALOGUE_H_
 
+#include <msp/datafile/collection.h>
+#include <msp/fs/path.h>
 #include <msp/gl/material.h>
 #include <msp/gl/mesh.h>
 #include "libr2c2/catalogue.h"
@@ -17,7 +19,7 @@ namespace R2C2 {
 class TrackType3D;
 class VehicleType3D;
 
-class Catalogue3D
+class Catalogue3D: public Msp::DataFile::Collection
 {
 private:
        Catalogue &catalogue;
@@ -41,6 +43,14 @@ private:
        void track_added(const TrackType &);
        void vehicle_added(const VehicleType &);
        void build_endpoint_mesh();
+
+       Msp::FS::Path locate_file(const std::string &);
+
+       template<typename T>
+       T *create(const std::string &);
+
+       template<typename T>
+       T *create2(const std::string &);
 };
 
 }

diff --git a/source/3d/vehicletype.cpp b/source/3d/vehicletype.cpp
index 2ddd34db08cc4515753f1eeb3171acee973e57d2..27fb883a985241ef12b66ea8a4e56d5cff9f91b3 100644 (file)
--- a/source/3d/vehicletype.cpp
+++ b/source/3d/vehicletype.cpp
@@ -31,7 +31,7 @@ T get(const map<string, string> &params, const string &key, T def = T())
 
 namespace R2C2 {
 
-VehicleType3D::VehicleType3D(const Catalogue3D &c, const VehicleType &t):
+VehicleType3D::VehicleType3D(Catalogue3D &c, const VehicleType &t):
        catalogue(c),
        type(t),
        body_object(0),
@@ -144,10 +144,7 @@ GL::Object *VehicleType3D::get_object(const string &name)
                        }
                }
                else
-               {
-                       ptr = new GL::Object;
-                       DataFile::load(*ptr, name);
-               }
+                       return catalogue.get<GL::Object>(name);
        }
        return ptr;
 }

diff --git a/source/3d/vehicletype.h b/source/3d/vehicletype.h
index bef461c695befa7a3781983bd9a3918be9295ba8..8be9f3aa5bad5e79a6640982aea8b289d121852e 100644 (file)
--- a/source/3d/vehicletype.h
+++ b/source/3d/vehicletype.h
@@ -19,7 +19,7 @@ class Catalogue3D;
 class VehicleType3D
 {
 private:
-       const Catalogue3D &catalogue;
+       Catalogue3D &catalogue;
        const VehicleType &type;
        std::map<std::string, Msp::GL::Object *> objects;
        Msp::GL::Object *body_object;
@@ -28,7 +28,7 @@ private:
        std::vector<Msp::GL::Object *> rod_objects;
 
 public:
-       VehicleType3D(const Catalogue3D &, const VehicleType &);
+       VehicleType3D(Catalogue3D &, const VehicleType &);
        ~VehicleType3D();
 
        const Msp::GL::Object *get_body_object() const { return body_object; }