X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fobject.h;h=48e3045930559fd354af6d868a935100a2fab09d;hb=HEAD;hp=e38afb5c4c1b16fb92946785143bed0fb4824a6d;hpb=a361efc05fcad11b2918f3cd7abdebe794b131d8;p=libs%2Fgl.git

diff --git a/source/object.h b/source/object.h
deleted file mode 100644
index e38afb5c..00000000
--- a/source/object.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#ifndef MSP_GL_OBJECT_H_
-#define MSP_GL_OBJECT_H_
-
-#include <vector>
-#include <msp/datafile/collection.h>
-#include "objectpass.h"
-
-namespace Msp {
-namespace GL {
-
-class Material;
-class Mesh;
-class ObjectInstance;
-class Program;
-class ProgramData;
-class Texture;
-
-/**
-Stores data for a complete 3D object.  This includes a mesh, a shader and data
-for it and a number of textures.  Only the mesh is mandatory, other components
-are optional.
-
-See also class ObjectInstance.
-*/
-class Object
-{
-private:
-	std::vector<Mesh *> meshes;
-	std::vector<Texture *> textures;
-	std::map<std::string, ObjectPass> passes;
-	Material *material;
-	ObjectPass *normal_pass;
-
-public:
-	class Loader: public DataFile::Loader
-	{
-	public:
-		typedef DataFile::Collection Collection;
-
-	protected:
-		Object &obj;
-		Collection &coll;
-	private:
-		std::vector<std::string> textures;
-	
-	public:
-		Loader(Object &, Collection &);
-		~Loader();
-
-		Object &get_object() const { return obj; }
-		Collection &get_collection() const { return coll; }
-	private:
-		void lod_mesh(unsigned, const std::string &);
-		void material_inline();
-		void mesh(const std::string &);
-		void pass(const std::string &);
-		void shader(const std::string &);
-		void texture(const std::string &);
-	};
-
-	Object();
-	~Object();
-
-	bool has_pass(const std::string &) const;
-	const ObjectPass &get_pass(const std::string &) const;
-
-	/**
-	Renders the object.  If an ObjectInstance is provided, its hook functions
-	are called.
-	*/
-	void render(const ObjectInstance * =0) const;
-	void render(const std::string &, const ObjectInstance *) const;
-
-	/**
-	Renders multiple instances of the object in one go.  This may be a
-	performance improvement, as the object-specific render setup only has to be
-	done once.
-	*/
-	void render(const std::list<const ObjectInstance *> &) const;
-	void render(const std::string &, const std::list<const ObjectInstance *> &) const;
-private:
-	void setup_render(const ObjectPass &) const;
-	void finish_render(const ObjectPass &) const;
-	void render(const ObjectPass &, const ObjectInstance *) const;
-	void render(const ObjectPass &, const std::list<const ObjectInstance *> &) const;
-};
-
-} // namespace GL
-} // namespace Msp
-
-#endif