minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Clean up bumpmap code a bit

This commit is contained in:
kwolekr 2013-07-12 00:03:41 -04:00
parent 320a00e7c6
commit fc6725f14e
1 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/mapblock_mesh.cpp
View File

@ -1156,38 +1156,41 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data):
material.setFlag(video::EMF_FOG_ENABLE, true); material.setFlag(video::EMF_FOG_ENABLE, true);
//material.setFlag(video::EMF_ANTI_ALIASING, video::EAAM_OFF); //material.setFlag(video::EMF_ANTI_ALIASING, video::EAAM_OFF);
//material.setFlag(video::EMF_ANTI_ALIASING, video::EAAM_SIMPLE); //material.setFlag(video::EMF_ANTI_ALIASING, video::EAAM_SIMPLE);
material.MaterialType material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
= video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
material.setTexture(0, p.tile.texture); material.setTexture(0, p.tile.texture);
if (enable_shaders)
{ if (enable_shaders) {
if (enable_bumpmapping) video::E_MATERIAL_TYPE smat1 = shadermat1;
{ video::E_MATERIAL_TYPE smat2 = shadermat2;
video::E_MATERIAL_TYPE smat3 = shadermat3;
if (enable_bumpmapping) {
ITextureSource *tsrc = data->m_gamedef->tsrc(); ITextureSource *tsrc = data->m_gamedef->tsrc();
std::string basename,normal,replace; std::string fname_base = tsrc->getTextureName(p.tile.texture_id);
replace = "_normal.png";
basename = tsrc->getTextureName(p.tile.texture_id); std::string normal_ext = "_normal.png";
unsigned pos = basename.find("."); size_t pos = fname_base.find(".");
normal = basename.substr (0, pos) + replace; std::string fname_normal = fname_base.substr(0, pos) + normal_ext;
if (tsrc->isKnownSourceImage(normal))
{ if (tsrc->isKnownSourceImage(fname_normal)) {
// look for image extension and replace it // look for image extension and replace it
for(std::string::size_type i = 0; (i = basename.find(".", i)) != std::string::npos;) size_t i = 0;
{ while ((i = fname_base.find(".", i)) != std::string::npos) {
basename.replace(i, 4, replace); fname_base.replace(i, 4, normal_ext);
i += replace.length(); i += normal_ext.length();
} }
material.setTexture(1, tsrc->getTexture(basename));
p.tile.applyMaterialOptionsWithShaders(material, bumpmaps1,bumpmaps2, shadermat3); material.setTexture(1, tsrc->getTexture(fname_base));
smat1 = bumpmaps1;
smat2 = bumpmaps2;
} }
else
p.tile.applyMaterialOptionsWithShaders(material, shadermat1, shadermat2, shadermat3);
} }
else
p.tile.applyMaterialOptionsWithShaders(material, shadermat1, shadermat2, shadermat3); p.tile.applyMaterialOptionsWithShaders(material, smat1, smat2, smat3);
} } else {
else
p.tile.applyMaterialOptions(material); p.tile.applyMaterialOptions(material);
}
// Create meshbuffer // Create meshbuffer