// Get rotation for things like chests
u8 facedir = mn.getFaceDir(ndef);
- assert(facedir <= 23);
+ if (facedir > 23)
+ facedir = 0;
static const u16 dir_to_tile[24 * 16] =
{
// 0 +X +Y +Z -Z -Y -X -> value=tile,rotation
0,0, 0,2 , 5,3 , 3,1 , 0,0, 2,3 , 4,3 , 1,0 ,
0,0, 0,1 , 2,3 , 5,1 , 0,0, 4,3 , 3,3 , 1,1 ,
0,0, 0,0 , 4,3 , 2,1 , 0,0, 3,3 , 5,3 , 1,2 ,
-
+
0,0, 1,1 , 2,1 , 4,3 , 0,0, 5,1 , 3,1 , 0,1 , // rotate around x- 16 - 19
0,0, 1,2 , 4,1 , 3,3 , 0,0, 2,1 , 5,1 , 0,0 ,
0,0, 1,3 , 3,1 , 5,3 , 0,0, 4,1 , 2,1 , 0,3 ,
0,0, 1,0 , 5,1 , 2,3 , 0,0, 3,1 , 4,1 , 0,2 ,
-
+
0,0, 3,2 , 1,2 , 4,2 , 0,0, 5,2 , 0,2 , 2,2 , // rotate around y- 20 - 23
0,0, 5,2 , 1,3 , 3,2 , 0,0, 2,2 , 0,1 , 4,2 ,
0,0, 2,2 , 1,0 , 5,2 , 0,0, 4,2 , 0,0 , 3,2 ,
0,0, 4,2 , 1,1 , 2,2 , 0,0, 3,2 , 0,3 , 5,2
-
+
};
u16 tile_index=facedir*16 + dir_i;
TileSpec spec = getNodeTileN(mn, p, dir_to_tile[tile_index], data);
/*
Convert MeshCollector to SMesh
*/
+ bool enable_shaders = g_settings->getBool("enable_shaders");
bool enable_bumpmapping = g_settings->getBool("enable_bumpmapping");
- bool enable_shaders = g_settings->getBool("enable_shaders");
- video::E_MATERIAL_TYPE shadermat1 = m_gamedef->getShaderSource()->
- getShader("test_shader_1").material;
- video::E_MATERIAL_TYPE shadermat2 = m_gamedef->getShaderSource()->
- getShader("test_shader_2").material;
- video::E_MATERIAL_TYPE shadermat3 = m_gamedef->getShaderSource()->
- getShader("test_shader_3").material;
- video::E_MATERIAL_TYPE bumpmaps1 = m_gamedef->getShaderSource()->
- getShader("bumpmaps_solids").material;
- video::E_MATERIAL_TYPE bumpmaps2 = m_gamedef->getShaderSource()->
- getShader("bumpmaps_liquids").material;
+ bool enable_parallax_occlusion = g_settings->getBool("enable_parallax_occlusion");
+
+ video::E_MATERIAL_TYPE shadermat1, shadermat2, shadermat3,
+ shadermat4, shadermat5;
+ shadermat1 = shadermat2 = shadermat3 = shadermat4 = shadermat5 =
+ video::EMT_SOLID;
+
+ if (enable_shaders) {
+ IShaderSource *shdrsrc = m_gamedef->getShaderSource();
+ shadermat1 = shdrsrc->getShader("solids_shader").material;
+ shadermat2 = shdrsrc->getShader("liquids_shader").material;
+ shadermat3 = shdrsrc->getShader("alpha_shader").material;
+ shadermat4 = shdrsrc->getShader("leaves_shader").material;
+ shadermat5 = shdrsrc->getShader("plants_shader").material;
+ }
for(u32 i = 0; i < collector.prebuffers.size(); i++)
{
material.setFlag(video::EMF_FOG_ENABLE, true);
//material.setFlag(video::EMF_ANTI_ALIASING, video::EAAM_OFF);
//material.setFlag(video::EMF_ANTI_ALIASING, video::EAAM_SIMPLE);
- material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
+ //material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
material.setTexture(0, p.tile.texture);
-
+
if (enable_shaders) {
- 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();
+ material.setTexture(2, tsrc->getTexture("disable_img.png"));
+ if (enable_bumpmapping || enable_parallax_occlusion) {
std::string fname_base = tsrc->getTextureName(p.tile.texture_id);
-
std::string normal_ext = "_normal.png";
size_t pos = fname_base.find(".");
std::string fname_normal = fname_base.substr(0, pos) + normal_ext;
-
+
if (tsrc->isKnownSourceImage(fname_normal)) {
// look for image extension and replace it
size_t i = 0;
fname_base.replace(i, 4, normal_ext);
i += normal_ext.length();
}
-
material.setTexture(1, tsrc->getTexture(fname_base));
-
- smat1 = bumpmaps1;
- smat2 = bumpmaps2;
+ material.setTexture(2, tsrc->getTexture("enable_img.png"));
}
}
-
- p.tile.applyMaterialOptionsWithShaders(material, smat1, smat2, smat3);
+ p.tile.applyMaterialOptionsWithShaders(material,
+ shadermat1, shadermat2, shadermat3, shadermat4, shadermat5);
} else {
p.tile.applyMaterialOptions(material);
}
-
// Create meshbuffer
// This is a "Standard MeshBuffer",
bool MapBlockMesh::animate(bool faraway, float time, int crack, u32 daynight_ratio)
{
- bool enable_shaders = (g_settings->getS32("enable_shaders") > 0);
+ bool enable_shaders = g_settings->getBool("enable_shaders");
bool enable_bumpmapping = g_settings->getBool("enable_bumpmapping");
-
+ bool enable_parallax_occlusion = g_settings->getBool("enable_parallax_occlusion");
+
if(!m_has_animation)
{
m_animation_force_timer = 100000;
os<<"^[verticalframe:"<<(int)tile.animation_frame_count<<":"<<frame;
// Set the texture
buf->getMaterial().setTexture(0, tsrc->getTexture(os.str()));
- if (enable_shaders && enable_bumpmapping)
+ buf->getMaterial().setTexture(2, tsrc->getTexture("disable_img.png"));
+ if (enable_shaders && (enable_bumpmapping || enable_parallax_occlusion))
{
- std::string basename,normal;
- basename = tsrc->getTextureName(tile.texture_id);
+ std::string fname_base,fname_normal;
+ fname_base = tsrc->getTextureName(tile.texture_id);
unsigned pos;
- pos = basename.find(".");
- normal = basename.substr (0, pos);
- normal += "_normal.png";
- os.str("");
- os<<normal<<"^[verticalframe:"<<(int)tile.animation_frame_count<<":"<<frame;
- if (tsrc->isKnownSourceImage(normal))
+ pos = fname_base.find(".");
+ fname_normal = fname_base.substr (0, pos);
+ fname_normal += "_normal.png";
+ if (tsrc->isKnownSourceImage(fname_normal)){
+ os.str("");
+ os<<fname_normal<<"^[verticalframe:"<<(int)tile.animation_frame_count<<":"<<frame;
buf->getMaterial().setTexture(1, tsrc->getTexture(os.str()));
+ buf->getMaterial().setTexture(2, tsrc->getTexture("enable_img.png"));
+ }
}
}
projects / oweals / minetest.git / blobdiff