X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fcatalogue.cpp;h=9daa7c809c7421dc71b9a68e2e044107358d7750;hb=7c98e23312cf01ce1fa6c1ffd8e36c22d2fa6110;hp=57bf0533918d67f7ac95d101d1896aa6f3d727f6;hpb=6968273080fa2a1cbcfc506610d5f249299611e9;p=r2c2.git

diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp
index 57bf053..9daa7c8 100644
--- a/source/3d/catalogue.cpp
+++ b/source/3d/catalogue.cpp
@@ -1,80 +1,67 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-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 "signaltype.h"
 #include "tracktype.h"
 #include "vehicletype.h"
 
 using namespace std;
 using namespace Msp;
 
-namespace Marklin {
+namespace R2C2 {
 
 Catalogue3D::Catalogue3D(Catalogue &c):
 	catalogue(c),
 	endpoint_mesh((GL::NORMAL3, GL::VERTEX3))
 {
-	catalogue.signal_track_added.connect(sigc::mem_fun(this, &Catalogue3D::track_added));
-	catalogue.signal_vehicle_added.connect(sigc::mem_fun(this, &Catalogue3D::vehicle_added));
+	add_type<GL::Material>().creator(&Catalogue3D::create<GL::Material>);
+	add_type<GL::Mesh>().creator(&Catalogue3D::create<GL::Mesh>);
+	add_type<GL::Object>().creator(&Catalogue3D::create<GL::Object>);
+	add_type<GL::Program>().creator(&Catalogue3D::create<GL::Program>);
+	add_type<GL::Technique>().creator(&Catalogue3D::create<GL::Technique>);
 
-	const map<unsigned, TrackType *> &trks = catalogue.get_tracks();
-	for(map<unsigned, TrackType *>::const_iterator i=trks.begin(); i!=trks.end(); ++i)
-		track_added(*i->second);
+	catalogue.signal_object_added.connect(sigc::mem_fun(this, &Catalogue3D::object_added));
 
-	ballast_material.set_diffuse(GL::Color(0.25, 0.25, 0.25));
-	rail_material.set_diffuse(GL::Color(0.85, 0.85, 0.85));
+	const Catalogue::ObjectMap &objs = catalogue.get_all();
+	for(Catalogue::ObjectMap::const_iterator i=objs.begin(); i!=objs.end(); ++i)
+		object_added(*i->second);
 
 	build_endpoint_mesh();
 }
 
 Catalogue3D::~Catalogue3D()
 {
-	for(map<const TrackType *, TrackType3D *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	for(map<const ObjectType *, ObjectType3D *>::iterator i=objects.begin(); i!=objects.end(); ++i)
 		delete i->second;
 }
 
-const TrackType3D &Catalogue3D::get_track(const TrackType &tt) const
+void Catalogue3D::object_added(const ObjectType &ot)
 {
-	map<const TrackType *, TrackType3D *>::const_iterator i = tracks.find(&tt);
-	if(i==tracks.end())
-		throw KeyError("Unknown track type");
-
-	return *i->second;
+	if(const TrackType *tt = dynamic_cast<const TrackType *>(&ot))
+		objects[&ot] = new TrackType3D(*this, *tt);
+	else if(const SignalType *st = dynamic_cast<const SignalType *>(&ot))
+		objects[&ot] = new SignalType3D(*this, *st);
+	else if(const VehicleType *vt = dynamic_cast<const VehicleType *>(&ot))
+		objects[&ot] = new VehicleType3D(*this, *vt);
 }
 
-const VehicleType3D &Catalogue3D::get_vehicle(const VehicleType &vt) const
+const ObjectType3D &Catalogue3D::get_3d(const ObjectType &ot) const
 {
-	map<const VehicleType *, VehicleType3D *>::const_iterator i = vehicles.find(&vt);
-	if(i==vehicles.end())
-		throw KeyError("Unknown vehicle type");
-
-	return *i->second;
-}
-
-void Catalogue3D::track_added(const TrackType &track)
-{
-	tracks[&track] = new TrackType3D(*this, track);
-}
-
-void Catalogue3D::vehicle_added(const VehicleType &veh)
-{
-	vehicles[&veh] = new VehicleType3D(*this, veh);
+	return *get_item(objects, &ot);
 }
 
 void Catalogue3D::build_endpoint_mesh()
 {
 	const Profile &ballast_profile = catalogue.get_ballast_profile();
-	const Point &ballast_min = ballast_profile.get_min_coords();
-	const Point &ballast_max = ballast_profile.get_max_coords();
+	const Vector &ballast_min = ballast_profile.get_min_coords();
+	const Vector &ballast_max = ballast_profile.get_max_coords();
 
 	const Profile &rail_profile = catalogue.get_rail_profile();
-	const Point &rail_min = rail_profile.get_min_coords();
-	const Point &rail_max = rail_profile.get_max_coords();
+	const Vector &rail_min = rail_profile.get_min_coords();
+	const Vector &rail_max = rail_profile.get_max_coords();
 
 	float gauge = catalogue.get_gauge();
 
@@ -91,4 +78,32 @@ void Catalogue3D::build_endpoint_mesh()
 	bld.end();
 }
 
-} // namespace Marklin
+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 runtime_error("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