X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobject.cpp;h=ab7afc1480aaf272589df76a6dbe31ac732dd084;hb=3787ba0acb816e99eb7fa113e04760560bfcae39;hp=edfe39e56008e580e85b292c7508395260de9e71;hpb=97015ec7bddd26aa746f5227e4109b7d32438cca;p=libs%2Fgl.git

diff --git a/source/object.cpp b/source/object.cpp
index edfe39e5..ab7afc14 100644
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -1,23 +1,14 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/datafile/collection.h>
-#include <msp/strings/formatter.h>
-#include "except.h"
+#include <msp/strings/format.h>
 #include "material.h"
 #include "mesh.h"
 #include "object.h"
 #include "objectinstance.h"
-#include "objectpass.h"
 #include "program.h"
 #include "programdata.h"
+#include "renderer.h"
 #include "technique.h"
-#include "texture.h"
-#include "texunit.h"
+#include "texturing.h"
 
 using namespace std;
 
@@ -25,80 +16,171 @@ namespace Msp {
 namespace GL {
 
 Object::Object():
-	meshes(1),
-	own_technique(false),
-	technique(0)
+	meshes(1)
 { }
 
+Object::Object(const Mesh *m, const Technique *t)
+{
+	set_mesh(m);
+	set_technique(t);
+}
+
 Object::~Object()
 {
-	if(own_technique)
-		delete technique;
+}
+
+void Object::set_mesh(unsigned i, const Mesh *m)
+{
+	if(i>meshes.size())
+		throw out_of_range("Object::set_mesh");
+
+	if(i==meshes.size())
+		meshes.push_back(m);
+	else
+		meshes[i] = m;
+	meshes[i].keep();
+}
+
+const Mesh *Object::get_mesh(unsigned i) const
+{
+	if(i>=meshes.size())
+		return 0;
+
+	return meshes[i].get();
+}
+
+void Object::set_technique(const Technique *t)
+{
+	technique = t;
+	technique.keep();
 }
 
 void Object::render(const Tag &tag) const
 {
-	const RenderPass *pass=get_pass(tag);
+	const RenderPass *pass = get_pass(tag);
 	if(!pass)
 		return;
 
-	Bind bind(*pass);
-	meshes[0]->draw();
+	Bind bind_shader(pass->get_shader_program());
+	if(pass->get_shader_data())
+		pass->get_shader_data()->apply();
+	Bind bind_material(pass->get_material());
+	Bind bind_texturing(pass->get_texturing());
+
+	meshes.front()->draw();
 }
 
-void Object::render(const ObjectInstance &inst, const Tag &tag) const
+void Object::render(Renderer &renderer, const Tag &tag) const
 {
-	const RenderPass *pass=get_pass(tag);
+	const RenderPass *pass = get_pass(tag);
 	if(!pass)
 		return;
 
-	Bind bind(*pass);
-	render_instance(inst, tag);
-	meshes[0]->draw();
+	Renderer::Push push(renderer);
+	renderer.set_shader_program(pass->get_shader_program(), pass->get_shader_data());
+	renderer.set_material(pass->get_material());
+	renderer.set_texturing(pass->get_texturing());
+
+	setup_render(renderer, tag);
+	meshes.front()->draw(renderer);
+	finish_render(renderer, tag);
+}
+
+void Object::render(Renderer &renderer, const ObjectInstance &inst, const Tag &tag) const
+{
+	const RenderPass *pass = get_pass(tag);
+	if(!pass)
+		return;
+
+	Renderer::Push push(renderer);
+	renderer.set_shader_program(pass->get_shader_program(), pass->get_shader_data());
+	renderer.set_material(pass->get_material());
+	renderer.set_texturing(pass->get_texturing());
+
+	setup_render(renderer, tag);
+	inst.setup_render(renderer, tag);
+	unsigned lod = min<unsigned>(inst.get_level_of_detail(renderer), meshes.size()-1);
+	meshes[lod]->draw(renderer);
+	inst.finish_render(renderer, tag);
+	finish_render(renderer, tag);
 }
 
 const RenderPass *Object::get_pass(const Tag &tag) const
 {
-	if(!technique->has_pass(tag))
+	if(!technique || !technique->has_pass(tag))
 		return 0;
 	return &technique->get_pass(tag);
 }
 
-void Object::render_instance(const ObjectInstance &inst, const Tag &tag) const
+
+Object::Loader::Loader(Object &o):
+	DataFile::CollectionObjectLoader<Object>(o, 0)
 {
-	inst.setup_render(tag);
-	unsigned lod=min<unsigned>(inst.get_level_of_detail(), meshes.size()-1);
-	meshes[lod]->draw();
-	inst.finish_render(tag);
+	init();
 }
 
-
 Object::Loader::Loader(Object &o, Collection &c):
 	DataFile::CollectionObjectLoader<Object>(o, &c)
 {
-	add("lod_mesh", &Loader::lod_mesh);
+	init();
+}
+
+void Object::Loader::init()
+{
+	add("mesh",     &Loader::mesh_inline);
+	add("mesh",     &Loader::mesh_inline_lod);
 	add("mesh",     &Loader::mesh);
+	add("mesh",     &Loader::mesh_lod);
+	add("technique", &Loader::technique_inline);
 	add("technique", &Loader::technique);
-	add("technique", &Object::technique);
+
+	// Deprecated alias, will be removed
+	add("lod_mesh", &Loader::mesh_lod);
+}
+
+void Object::Loader::mesh_inline()
+{
+	RefPtr<Mesh> msh = new Mesh;
+	load_sub(*msh);
+	obj.meshes.front() = msh;
+}
+
+void Object::Loader::mesh_inline_lod(unsigned l)
+{
+	if(l>obj.meshes.size())
+		throw out_of_range("Object::Loader::mesh_inline_lod");
+
+	RefPtr<Mesh> msh = new Mesh;
+	load_sub(*msh);
+	if(l==obj.meshes.size())
+		obj.meshes.push_back(msh);
+	else
+		obj.meshes[l] = msh;
+}
+
+void Object::Loader::mesh(const std::string &n)
+{
+	obj.set_mesh(&get_collection().get<Mesh>(n));
 }
 
-void Object::Loader::lod_mesh(unsigned l, const string &n)
+void Object::Loader::mesh_lod(unsigned l, const string &n)
 {
-	obj.meshes.resize(l+1, 0);
-	obj.meshes[l]=get_collection().get<Mesh>(n);
+	obj.set_mesh(l, &get_collection().get<Mesh>(n));
 }
 
-void Object::Loader::mesh(const string &n)
+void Object::Loader::technique_inline()
 {
-	obj.meshes[0]=get_collection().get<Mesh>(n);
+	RefPtr<Technique> tech = new Technique;
+	if(coll)
+		load_sub(*tech, get_collection());
+	else
+		load_sub(*tech);
+	obj.technique = tech;
 }
 
-void Object::Loader::technique()
+void Object::Loader::technique(const std::string &n)
 {
-	RefPtr<Technique> tch=new Technique;
-	load_sub(*tch, get_collection());
-	obj.technique=tch.release();
-	obj.own_technique=true;
+	obj.set_technique(&get_collection().get<Technique>(n));
 }
 
 } // namespace GL