X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fmaterial.cpp;h=a2814cff1ad6ccfdac3347e14f5a3ce130451e45;hb=HEAD;hp=ef3662e964d8be98421e6e187256b0f028daa232;hpb=fd62e55d37716787fe909883a1b18e5b8128ec80;p=libs%2Fgl.git

diff --git a/source/material.cpp b/source/material.cpp
deleted file mode 100644
index ef3662e9..00000000
--- a/source/material.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-#include <msp/core/hash.h>
-#include <msp/strings/format.h>
-#include "basicmaterial.h"
-#include "gl.h"
-#include "resources.h"
-#include "texturing.h"
-#include "uniform.h"
-
-using namespace std;
-
-namespace Msp {
-namespace GL {
-
-Program *Material::create_compatible_shader() const
-{
-	return new Program(create_program_source());
-}
-
-const Program *Material::create_compatible_shader(DataFile::Collection &coll) const
-{
-	string source = create_program_source();
-	string name = format("_material_%016x.glsl", hash64(source));
-	Program *shprog = coll.find<Program>(name);
-	if(shprog)
-		return shprog;
-
-	shprog = new Program(create_program_source());
-	try
-	{
-		coll.add(name, shprog);
-	}
-	catch(...)
-	{
-		delete shprog;
-		throw;
-	}
-
-	return shprog;
-}
-
-void Material::attach_texture_to(const Texture *tex, Texturing &texturing, ProgramData &tex_shdata, const string &name) const
-{
-	if(!tex)
-		return;
-
-	int unit = -1;
-
-	if(const Uniform *uni = tex_shdata.find_uniform(name))
-		if(const Uniform1i *uni_int = dynamic_cast<const Uniform1i *>(uni))
-			unit = uni_int->get();
-
-	if(unit<0)
-		unit = texturing.find_free_unit(name);
-	if(unit<0)
-		throw runtime_error("no free texunit");
-
-	texturing.attach(unit, *tex);
-	tex_shdata.uniform(name, unit);
-}
-
-Material::MaterialRegistry &Material::get_material_registry()
-{
-	static MaterialRegistry registry;
-	static bool initialized = false;
-	if(!initialized)
-	{
-		registry.register_type<BasicMaterial>("basic");
-	}
-	return registry;
-}
-
-
-DataFile::Loader::ActionMap Material::GenericLoader::shared_actions;
-
-Material::GenericLoader::GenericLoader(DataFile::Collection *c):
-	coll(c)
-{
-	set_actions(shared_actions);
-}
-
-void Material::GenericLoader::init_actions()
-{
-	get_material_registry().add_all(*this);
-}
-
-} // namespace GL
-} // namespace Msp