X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobject.h;h=f432177e7ebfd7cb221491d58ce35543af66f989;hb=e2765175f4a083623c1a9549695140ca902ce0b2;hp=69759c80a7fde69b7ffe9ccc2a35abb064a758fa;hpb=1e974e526806cf1dd5f65b146dfbbb5bf4d7c19b;p=libs%2Fgl.git

diff --git a/source/object.h b/source/object.h
index 69759c80..f432177e 100644
--- a/source/object.h
+++ b/source/object.h
@@ -5,6 +5,7 @@
 #include "bindable.h"
 #include "renderable.h"
 #include "renderpass.h"
+#include "resourcewatcher.h"
 
 namespace Msp {
 namespace GL {
@@ -16,12 +17,14 @@ class Technique;
 class Texture;
 
 /**
-Stores a Mesh together with a Technique to determine its appearance.
+Combines a Mesh with a Technique to give it an appearance.  The Technique will
+define which render passes the Object supports.
 
-It is possible to use a single Object for rendering multiple identical or
-similar objects.  See class ObjectInstance.
+In many cases, it's desirable to include multiple copies of an Object in a
+Scene, with different model matrices.  ObjectInstances can be used to alter the
+rendering of an object on a per-instance basis.
 */
-class Object: public Renderable
+class Object: public Renderable, private ResourceWatcher
 {
 public:
 	class Loader: public DataFile::CollectionObjectLoader<Object>
@@ -31,8 +34,8 @@ public:
 		Loader(Object &, Collection &);
 	private:
 		void init();
+		virtual void finish();
 
-	private:
 		void mesh_inline();
 		void mesh_inline_lod(unsigned);
 		void mesh(const std::string &);
@@ -44,6 +47,7 @@ public:
 private:
 	std::vector<RefPtr<const Mesh> > meshes;
 	RefPtr<const Technique> technique;
+	Geometry::BoundingSphere<float, 3> bounding_sphere;
 
 public:
 	Object();
@@ -52,26 +56,31 @@ public:
 
 	void set_mesh(const Mesh *m) { set_mesh(0, m); }
 	void set_mesh(unsigned, const Mesh *);
+private:
+	void update_bounding_sphere();
+public:
 	const Mesh *get_mesh(unsigned = 0) const;
 	void set_technique(const Technique *);
 	const Technique *get_technique() const { return technique.get(); }
 
-	/**
-	Renders the object.  A tag can be provided to render a non-default pass.
-	*/
+	virtual const Geometry::BoundingSphere<float, 3> *get_bounding_sphere() const { return &bounding_sphere; }
+
 	virtual void render(const Tag &tag = Tag()) const;
 
 	virtual void render(Renderer &, const Tag & = Tag()) const;
 
-	/**
-	Renders the object with an instance.  The instance's hook functions are
-	called before and after drawing the mesh.  A tag may also be given to render
-	a non-default pass.
-	*/
+	/** Renders an instance of the object.  The instance's hook functions are
+	called before and after drawing the mesh. */
 	virtual void render(Renderer &, const ObjectInstance &, const Tag & = Tag()) const;
 
+protected:
+	virtual void setup_render(Renderer &, const Tag &) const { }
+	virtual void finish_render(Renderer &, const Tag &) const { }
+
 private:
 	const RenderPass *get_pass(const Tag &) const;
+
+	virtual void resource_loaded(Resource &);
 };
 
 } // namespace GL