X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Finstancearray.cpp;h=427976129d65b1a4e5f0c82caf725822111a44b7;hb=74c995a4ce89d52100f2e9967f61a719a8affe67;hp=231bebe1beaabe28df632d9dc0ce1f1b58db0109;hpb=3a6eb030fb4eca4c2a317f270704fddf31613130;p=libs%2Fgl.git

diff --git a/source/render/instancearray.cpp b/source/render/instancearray.cpp
index 231bebe1..42797612 100644
--- a/source/render/instancearray.cpp
+++ b/source/render/instancearray.cpp
@@ -46,15 +46,18 @@ 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(ARRAY_BUFFER);
+		instance_buffer = new Buffer;
 		instance_data->use_buffer(instance_buffer);
 
+		const Mesh *mesh = object.get_mesh();
+
 		vtx_setup = new VertexSetup;
-		vtx_setup->set_vertex_array(object.get_mesh()->get_vertices());
-		vtx_setup->set_index_buffer(*object.get_mesh()->get_index_buffer());
-		vtx_setup->set_instance_array(instance_data);
+		vtx_setup->set_format_instanced(mesh->get_vertices().get_format(), fmt);
+		vtx_setup->set_vertex_array(mesh->get_vertices());
+		vtx_setup->set_index_buffer(*mesh->get_index_buffer(), mesh->get_batches().front().get_index_type());
+		vtx_setup->set_instance_array(*instance_data);
 	}
 	else
 		static Require req(ARB_vertex_shader);
@@ -81,7 +84,7 @@ void InstanceArray::append(ObjectInstance *inst)
 			if(instance_buffer->get_size()>0 && instance_buffer->get_size()<req_size)
 			{
 				delete instance_buffer;
-				instance_buffer = new Buffer(ARRAY_BUFFER);
+				instance_buffer = new Buffer;
 				instance_data->use_buffer(instance_buffer);
 			}
 		}