Inherit Loaders from the ObjectLoader classes

[libs/gl.git] / source / technique.cpp

diff --git a/source/technique.cpp b/source/technique.cpp
index 4d2377a350549e50641c0e045cc6e88f7e8c6374..26837b61533167e0ddc268715f2722aee008272e 100644 (file)
--- a/source/technique.cpp
+++ b/source/technique.cpp
@@ -5,6 +5,8 @@ Copyright © 2007  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include <msp/core/refptr.h>
+#include <msp/datafile/collection.h>
 #include <msp/strings/formatter.h>
 #include "material.h"
 #include "program.h"
@@ -26,18 +28,18 @@ Technique::Technique():
 
 Technique::~Technique()
 {
-       for(map<unsigned, ObjectPass>::iterator i=passes.begin(); i!=passes.end(); ++i)
+       for(PassMap::iterator i=passes.begin(); i!=passes.end(); ++i)
                delete i->second.shdata;
 }
 
 bool Technique::has_pass(const GL::Tag &tag) const
 {
-       return passes.count(tag.id);
+       return passes.count(tag);
 }
 
 const ObjectPass &Technique::get_pass(const GL::Tag &tag) const
 {
-       map<unsigned, ObjectPass>::const_iterator i=passes.find(tag.id);
+       PassMap::const_iterator i=passes.find(tag);
        if(i==passes.end())
                throw KeyError("Unknown pass");
        return i->second;
@@ -45,8 +47,8 @@ const ObjectPass &Technique::get_pass(const GL::Tag &tag) const
 
 unsigned Technique::get_texture_index(const std::string &n) const
 {
-       for(unsigned i=0; i<tex_names.size(); ++i)
-               if(tex_names[i]==n)
+       for(unsigned i=0; i<textures.size(); ++i)
+               if(textures[i].name==n)
                        return i;
 
        throw KeyError("Unknown texture slot", n);
@@ -57,13 +59,12 @@ const Texture *Technique::get_texture(unsigned i) const
        if(i>=textures.size())
                throw KeyError("Texture index out of range");
 
-       return textures[i];
+       return textures[i].texture;
 }
 
 
 Technique::Loader::Loader(Technique &t, Collection &c):
-       tech(t),
-       coll(c)
+       DataFile::CollectionObjectLoader<Technique>(t, &c)
 {
        add("material",        &Technique::material);
        add("material_inline", &Loader::material_inline);
@@ -76,11 +77,14 @@ Technique::Loader::Loader(Technique &t, Collection &c):
 
 void Technique::Loader::finish()
 {
-       for(map<unsigned, ObjectPass>::iterator i=tech.passes.begin(); i!=tech.passes.end(); ++i)
+       for(PassMap::iterator i=obj.passes.begin(); i!=obj.passes.end(); ++i)
                if(i->second.shdata)
                {
-                       for(unsigned j=0; j<tech.textures.size(); ++j)
-                               i->second.shdata->uniform(i->second.shprog->get_uniform_location(tech.tex_names[j]), static_cast<int>(j));
+                       for(unsigned j=0; j<obj.textures.size(); ++j)
+                       {
+                               unsigned loc=i->second.shprog->get_uniform_location(obj.textures[j].name);
+                               i->second.shdata->uniform(loc, static_cast<int>(j));
+                       }
                }
 }
 
@@ -88,64 +92,73 @@ void Technique::Loader::material_inline()
 {
        RefPtr<Material> mat=new Material;
        load_sub(*mat);
-       coll.add(format("_%p", mat.get()), mat.get());
-       tech.material=mat.release();
+       coll->add(format("_%p", mat.get()), mat.get());
+       obj.material=mat.release();
 }
 
 void Technique::Loader::pass(const string &n)
 {
-       unsigned id=Tag(n).id;
-       if(tech.passes.count(id))
+       Tag tag(n);
+       if(obj.passes.count(tag))
                throw KeyError("Duplicate pass name", n);
        ObjectPass p;
-       load_sub(p, coll);
-       tech.passes[id]=p;
+       load_sub(p, *coll);
+       obj.passes[tag]=p;
 }
 
 void Technique::Loader::shader(const string &n)
 {
-       Program *shprog=coll.get<Program>(n);
+       Program *shprog=coll->get<Program>(n);
        if(shprog)  // Allow for unsupported shaders
        {
                RefPtr<ProgramData> shdata=new ProgramData;
                load_sub(*shdata, *shprog);
 
-               tech.normal_pass->shprog=shprog;
-               if(tech.normal_pass->shdata)
-                       delete tech.normal_pass->shdata;
-               tech.normal_pass->shdata=shdata.release();
+               obj.normal_pass->shprog=shprog;
+               if(obj.normal_pass->shdata)
+                       delete obj.normal_pass->shdata;
+               obj.normal_pass->shdata=shdata.release();
        }
 }
 
 void Technique::Loader::shader_texture(const string &n)
 {
-       unsigned eqsign=n.find('=');
+       string::size_type eqsign=n.find('=');
+       TextureSlot tex;
        if(eqsign!=string::npos)
        {
-               tech.textures.push_back(coll.get<Texture>(n.substr(eqsign+1)));
-               tech.tex_names.push_back(n.substr(0, eqsign));
+               tex.name=n.substr(0, eqsign);
+               tex.texture=coll->get<Texture>(n.substr(eqsign+1));
        }
        else
        {
-               tech.textures.push_back(coll.get<Texture>(n));
-               tech.tex_names.push_back(n);
+               string::size_type dot=n.rfind('.');
+               tex.name=n.substr(0, dot);
+               tex.texture = coll->get<Texture>(n);
        }
+       for(string::iterator i=tex.name.begin(); i!=tex.name.end(); ++i)
+               if(!isalnum(*i))
+                       *i='_';
+       obj.textures.push_back(tex);
 }
 
 void Technique::Loader::texture(const string &n)
 {
-       if(tech.main_texture)
+       if(obj.main_texture)
                throw Exception("Only one main texture may be specified");
 
-       tech.main_texture=coll.get<Texture>(n);
-       tech.textures.push_back(tech.main_texture);
-       tech.tex_names.push_back("texture");
+       obj.main_texture=coll->get<Texture>(n);
+       TextureSlot tex;
+       tex.name="texture";
+       tex.texture=obj.main_texture;
+       obj.textures.push_back(tex);
 }
 
 void Technique::Loader::texture_slot(const string &n)
 {
-       tech.tex_names.push_back(n);
-       tech.textures.push_back(0);
+       TextureSlot tex;
+       tex.name=n;
+       obj.textures.push_back(tex);
 }
 
 } // namespace GL