From: Mikko Rasa <tdb@tdb.fi>
Date: Wed, 10 Dec 2014 16:08:09 +0000 (+0200)
Subject: Add some accessors
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=fc0f53b1981436d39a27884376e852dca5671fda;p=libs%2Fgl.git

Add some accessors
---

diff --git a/source/lighting.cpp b/source/lighting.cpp
index 239bdc19..a927d622 100644
--- a/source/lighting.cpp
+++ b/source/lighting.cpp
@@ -58,6 +58,11 @@ void Lighting::detach(unsigned i)
 		Light::unbind_from(i);
 }
 
+const Light *Lighting::get_attached_light(unsigned i) const
+{
+	return i<lights.size() ? lights[i] : 0;
+}
+
 void Lighting::update_shader_data(ProgramData &shdata, const Matrix &view_matrix) const
 {
 	shdata.uniform("ambient_color", ambient);
diff --git a/source/lighting.h b/source/lighting.h
index 5469cef5..8b3feb5f 100644
--- a/source/lighting.h
+++ b/source/lighting.h
@@ -52,6 +52,10 @@ public:
 	/** Detaches a light source. */
 	void detach(unsigned);
 
+	/** Returns an attached light.  If no light is attached at that index, null
+	is returned. */
+	const Light *get_attached_light(unsigned) const;
+
 	/** Updates a ProgramData object with the uniforms for the Lighting,
 	including all attached light sources.  A view matrix must be passed in. */
 	void update_shader_data(ProgramData &, const Matrix &) const;
diff --git a/source/object.h b/source/object.h
index 95ba8fab..192cf069 100644
--- a/source/object.h
+++ b/source/object.h
@@ -101,6 +101,7 @@ public:
 	void set_technique(unsigned, const Technique *);
 
 	const Technique *get_technique(unsigned = 0) const;
+	unsigned get_n_lods() const { return lods.size(); }
 
 	virtual const Geometry::BoundingSphere<float, 3> *get_bounding_sphere() const { return &bounding_sphere; }
 
diff --git a/source/program.h b/source/program.h
index 4feb862d..53daaa76 100644
--- a/source/program.h
+++ b/source/program.h
@@ -90,7 +90,7 @@ public:
 	void attach_shader(Shader &shader);
 	void attach_shader_owned(Shader *shader);
 	void detach_shader(Shader &shader);
-	const ShaderList &get_shaders() const { return shaders; }
+	const ShaderList &get_attached_shaders() const { return shaders; }
 
 	void bind_attribute(unsigned, const std::string &);
 	void bind_attribute(VertexComponent, const std::string &);
diff --git a/source/texturing.cpp b/source/texturing.cpp
index 093c602e..dff3757f 100644
--- a/source/texturing.cpp
+++ b/source/texturing.cpp
@@ -37,6 +37,11 @@ void Texturing::set_attachment(unsigned attch, const Texture *tex)
 		bind_attachment(attch);
 }
 
+const Texture *Texturing::get_attached_texture(unsigned i) const
+{
+	return i<attachments.size() ? attachments[i] : 0;
+}
+
 void Texturing::bind_attachment(unsigned i) const
 {
 	if(const Texture *tex = attachments[i])
diff --git a/source/texturing.h b/source/texturing.h
index 34141c64..0b3a9751 100644
--- a/source/texturing.h
+++ b/source/texturing.h
@@ -21,6 +21,10 @@ public:
 	void detach(unsigned);
 private:
 	void set_attachment(unsigned, const Texture *);
+public:
+	const Texture *get_attached_texture(unsigned) const;
+
+private:
 	void bind_attachment(unsigned) const;
 
 	static void unbind_attachment(unsigned);