X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Finstancearray.cpp;h=be3f17d4bc24cd6e2cd3d612321448a7302caf02;hb=1b23728908f5ec9beb08b2b70737c3903745fddc;hp=039a50ecde32a7500850ca107f040169fe0b5692;hpb=73567be7cd9e01e620cb2a8fa0ca381723b9a71f;p=libs%2Fgl.git

diff --git a/source/render/instancearray.cpp b/source/render/instancearray.cpp
index 039a50ec..be3f17d4 100644
--- a/source/render/instancearray.cpp
+++ b/source/render/instancearray.cpp
@@ -10,6 +10,7 @@
 #include "mesh.h"
 #include "object.h"
 #include "objectinstance.h"
+#include "program.h"
 #include "renderer.h"
 #include "technique.h"
 #include "vertexsetup.h"
@@ -28,10 +29,9 @@ InstanceArray::InstanceArray(const Object &o):
 	matrix_offset(0)
 {
 	const Technique *tech = object.get_technique();
-	const Technique::PassMap &passes = tech->get_passes();
-	for(Technique::PassMap::const_iterator i=passes.begin(); i!=passes.end(); ++i)
+	for(const auto &kvp: tech->get_passes())
 	{
-		const Program *shprog = i->second.get_shader_program();
+		const Program *shprog = kvp.second.get_shader_program();
 		if(!shprog)
 			throw invalid_argument("InstanceArray::InstanceArray");
 
@@ -46,7 +46,7 @@ InstanceArray::InstanceArray(const Object &o):
 	{
 		instance_data = new VertexArray((RAW_ATTRIB4,matrix_location, RAW_ATTRIB4,matrix_location+1, RAW_ATTRIB4,matrix_location+2));
 		const VertexFormat &fmt = instance_data->get_format();
-		matrix_offset = fmt.offset(make_indexed_attribute(RAW_ATTRIB4, matrix_location));
+		matrix_offset = fmt.offset((RAW_ATTRIB4,matrix_location));
 
 		instance_buffer = new Buffer;
 		instance_data->use_buffer(instance_buffer);
@@ -65,8 +65,8 @@ InstanceArray::InstanceArray(const Object &o):
 
 InstanceArray::~InstanceArray()
 {
-	for(vector<ObjectInstance *>::iterator i=instances.begin(); i!=instances.end(); ++i)
-		delete *i;
+	for(ObjectInstance *i: instances)
+		delete i;
 	delete vtx_setup;
 	delete instance_data;
 	delete instance_buffer;
@@ -94,7 +94,7 @@ void InstanceArray::append(ObjectInstance *inst)
 
 void InstanceArray::remove(ObjectInstance &inst)
 {
-	vector<ObjectInstance *>::iterator i = find(instances, &inst);
+	auto i = find(instances, &inst);
 	if(i==instances.end())
 		throw key_error(&inst);
 
@@ -110,9 +110,9 @@ void InstanceArray::update_instance_matrix(unsigned index)
 
 	const Matrix &m = *instances[index]->get_matrix();
 
-	float *d = instance_data->modify(instances.size()-1);
+	float *d = reinterpret_cast<float *>(instance_data->modify(instances.size()-1)+matrix_offset);
 	for(unsigned i=0; i<12; ++i)
-		d[matrix_offset+i] = m(i/4, i%4);
+		d[i] = m(i/4, i%4);
 }
 
 void InstanceArray::render(Renderer &renderer, Tag tag) const
@@ -141,12 +141,12 @@ void InstanceArray::render(Renderer &renderer, Tag tag) const
 	}
 	else
 	{
-		for(vector<ObjectInstance *>::const_iterator i=instances.begin(); i!=instances.end(); ++i)
+		for(ObjectInstance *i: instances)
 		{
-			const Matrix &m = *(*i)->get_matrix();
+			const Matrix &m = *i->get_matrix();
 			for(unsigned j=0; j<3; ++j)
 				glVertexAttrib4f(matrix_location+j, m(j, 0), m(j, 1), m(j, 2), m(j, 3));
-			(*i)->render(renderer, tag);
+			i->render(renderer, tag);
 		}
 	}
 }