BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

reversed meshbuffer cache

Browse Source
This commit is contained in:
Perttu Ahola 2010-11-29 13:04:03 +02:00
parent 3ad212c90b
commit aaafb5add0
1 changed files with 14 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/mapblock.cpp
View File

@ -297,8 +297,6 @@ void MapBlock::updateMesh()
core::list<FastFace*> *fastfaces_new = new core::list<FastFace*>;
//TimeTaker timer1("updateMesh1", g_device);
/*
We are including the faces of the trailing edges of the block.
This means that when something changes, the caller must
@ -342,27 +340,13 @@ void MapBlock::updateMesh()
}
}
//timer1.stop();
//TimeTaker timer2("updateMesh2", g_device);
scene::SMesh *mesh_new = NULL;
//s32 appendtime = 0;
if(fastfaces_new->getSize() > 0)
{
mesh_new = new scene::SMesh();
scene::IMeshBuffer *buf = NULL;
/*
Buffer for lesser calls to
mesh_new->getMeshBuffer(g_materials[f->material]),
which is slow.
key = material id, value = meshbuffer of that material
*/
core::map<u8, scene::IMeshBuffer*> bufs;
core::list<FastFace*>::Iterator i = fastfaces_new->begin();
// MATERIAL_AIR shouldn't be used by any face
@ -375,15 +359,6 @@ void MapBlock::updateMesh()
if(f->material != material_in_use || buf == NULL)
{
// Try to get a meshbuffer associated with the material
core::map<u8, scene::IMeshBuffer*>::Node*
n = bufs.find(f->material);
if(n != NULL)
{
buf = n->getValue();
}
else
{
buf = mesh_new->getMeshBuffer(g_materials[f->material]);
// If not found, create one
if(buf == NULL)
@ -391,7 +366,6 @@ void MapBlock::updateMesh()
// This is a "Standard MeshBuffer",
// it's a typedeffed CMeshBuffer<video::S3DVertex>
buf = new scene::SMeshBuffer();
bufs[f->material] = buf;
// Set material
((scene::SMeshBuffer*)buf)->Material = g_materials[f->material];
// Use VBO
@ -401,17 +375,11 @@ void MapBlock::updateMesh()
// Mesh grabbed it
buf->drop();
}
}
material_in_use = f->material;
}
u16 indices[] = {0,1,2,2,3,0};
//TimeTaker timer("", g_device);
buf->append(f->vertices, 4, indices, 6);
//appendtime += timer.stop(true);
}
// Use VBO for mesh (this just would set this for ever buffer)
@ -422,8 +390,6 @@ void MapBlock::updateMesh()
<<" materials"<<std::endl;*/
}
//dstream<<"appendtime="<<appendtime<<std::endl;
// TODO: Get rid of the FastFace stage
core::list<FastFace*>::Iterator i;
i = fastfaces_new->begin();