Daniele Bartolini 12 лет назад
Родитель
Сommit
5ca4a2ce15
2 измененных файлов с 7 добавлено и 7 удалено
  1. 6 6
      samples/terrain/Terrain.cpp
  2. 1 1
      samples/terrain/terrain.cpp

+ 6 - 6
samples/terrain/Terrain.cpp

@@ -149,10 +149,10 @@ void Terrain::CreateTerrain(uint32_t xSize, uint32_t zSize, uint32_t tilePerMete
 		}
 	}
 
-	m_vertex_buffer = device()->renderer()->create_dynamic_vertex_buffer(mVertices, mVertexCount, VF_XYZ_FLOAT_32);
-	m_normal_buffer = device()->renderer()->create_dynamic_vertex_buffer(mNormals, mNormalCount, VF_XYZ_NORMAL_FLOAT_32);
-	m_tex_coord_buffer = device()->renderer()->create_vertex_buffer(mTexCoords, mTexCoordCount, VF_UV_FLOAT_32);
-	m_index_buffer = device()->renderer()->create_index_buffer(mIndices, mIndexCount);
+	m_vertex_buffer = device()->renderer()->create_dynamic_vertex_buffer(mVertexCount, VF_XYZ_FLOAT_32, mVertices);
+	m_normal_buffer = device()->renderer()->create_dynamic_vertex_buffer(mNormalCount, VF_XYZ_NORMAL_FLOAT_32, mNormals);
+	m_tex_coord_buffer = device()->renderer()->create_vertex_buffer(mTexCoordCount, VF_UV_FLOAT_32, mTexCoords);
+	m_index_buffer = device()->renderer()->create_index_buffer(mIndexCount, mIndices);
 }
 
 void Terrain::UpdateVertexBuffer(bool recomputeNormals)
@@ -166,7 +166,7 @@ void Terrain::UpdateVertexBuffer(bool recomputeNormals)
 			vIndex++;
 		}
 
-		device()->renderer()->update_vertex_buffer(m_vertex_buffer, mVertices, mVertexCount, 0);
+		device()->renderer()->update_vertex_buffer(m_vertex_buffer, 0, mVertexCount, mVertices);
 	}
 
 	if (recomputeNormals)
@@ -187,7 +187,7 @@ void Terrain::UpdateVertexBuffer(bool recomputeNormals)
 			mNormals[mIndices[i + 2]] = normal;
 		}
 
-		device()->renderer()->update_vertex_buffer(m_normal_buffer, mNormals, mNormalCount, 0);
+		device()->renderer()->update_vertex_buffer(m_normal_buffer, 0, mNormalCount, mNormals);
 	}
 }
 

+ 1 - 1
samples/terrain/terrain.cpp

@@ -128,7 +128,7 @@ public:
 		device()->resource_manager()->flush();
 
 		TextureResource* grass_texture = (TextureResource*)device()->data(grass);
-		grass_id = device()->renderer()->create_texture(grass_texture->width(), grass_texture->height(), grass_texture->data(), grass_texture->format());
+		grass_id = device()->renderer()->create_texture(grass_texture->width(), grass_texture->height(), grass_texture->format(), grass_texture->data());
 
 		//rb_id = device()->renderer()->create_render_buffer(200, 200, PF_RGBA_8);
 	}