-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2008, 2010-2011 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <msp/core/refptr.h>
#include <msp/datafile/collection.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
+#include "error.h"
#include "material.h"
#include "renderpass.h"
#include "program.h"
shprog(other.shprog),
shdata(other.shdata ? new ProgramData(*other.shdata) : 0),
material(other.material),
- texturing(other.texturing ? new Texturing(*other.texturing) : 0)
+ texturing(other.texturing ? new Texturing(*other.texturing) : 0),
+ tex_names(other.tex_names)
{ }
RenderPass::~RenderPass()
texturing->attach(index, *tex);
}
+int RenderPass::get_texture_index(const string &n) const
+{
+ map<string, unsigned>::const_iterator i = tex_names.find(n);
+ if(i==tex_names.end())
+ return -1;
+ return i->second;
+}
+
RenderPass::Loader::Loader(RenderPass &p):
DataFile::CollectionObjectLoader<RenderPass>(p, 0)
void RenderPass::Loader::init()
{
- allow_pointer_reload = false;
-
add("shader", &RenderPass::shprog);
add("material", &Loader::material_inline);
add("material", &Loader::material);
add("texunit", &Loader::texunit);
+ add("texunit", &Loader::texunit_named);
add("uniforms", &Loader::uniforms);
}
-void RenderPass::Loader::finish()
-{
- // XXX Make shdata optional
- if(obj.shprog && !obj.shdata)
- obj.shdata = new ProgramData;
-}
-
void RenderPass::Loader::material_inline()
{
RefPtr<Material> mat = new Material;
void RenderPass::Loader::material(const string &name)
{
- obj.material = get_collection().get<Material>(name);
+ obj.material = &get_collection().get<Material>(name);
obj.material.keep();
}
load_sub_with(ldr);
}
+void RenderPass::Loader::texunit_named(unsigned i, const string &n)
+{
+ texunit(i);
+ obj.tex_names[n] = i;
+}
+
void RenderPass::Loader::uniforms()
{
if(!obj.shprog)
- throw InvalidState("Can't load uniforms without a shader program");
+ throw invalid_operation("RenderPass::Loader::uniforms");
if(!obj.shdata)
- obj.shdata = new ProgramData;
- load_sub(*obj.shdata, *obj.shprog);
+ obj.shdata = new ProgramData(*obj.shprog);
+ load_sub(*obj.shdata);
}
void RenderPass::TextureLoader::texenv()
{
- throw Exception("TexEnvs can't be loaded yet");
+ throw runtime_error("TexEnvs can't be loaded yet");
/*env = new TexEnv;
load_sub(*env);*/
}
void RenderPass::TextureLoader::texture(const string &name)
{
- tex = get_collection().get<Texture>(name);
+ tex = &get_collection().get<Texture>(name);
tex.keep();
}