ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the newly introduced material

Browse Source
This commit is contained in:
vlj 2014-09-28 01:12:10 +02:00
parent 38b9c059d1
commit 6061a77884
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/graphics/stkmesh.cpp
View File

@ -12,21 +12,26 @@
MeshMaterial MaterialTypeToMeshMaterial(video::E_MATERIAL_TYPE MaterialType, video::E_VERTEX_TYPE tp, Material* material)
{
if (MaterialType == irr_driver->getShader(ES_SPHERE_MAP))
switch (material->getShaderType())
{
case Material::SHADERTYPE_SPHERE_MAP:
return MAT_SPHEREMAP;
if (MaterialType == irr_driver->getShader(ES_NORMAL_MAP))
return MAT_NORMAL_MAP;
else if (MaterialType == irr_driver->getShader(ES_OBJECTPASS_REF) || MaterialType == video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF)
case Material::SHADERTYPE_ALPHA_TEST:
return MAT_ALPHA_REF;
else if (MaterialType == irr_driver->getShader(ES_GRASS) || MaterialType == irr_driver->getShader(ES_GRASS_REF))
case Material::SHADERTYPE_VEGETATION:
return MAT_GRASS;
else if (MaterialType == irr_driver->getShader(ES_SPLATTING))
case Material::SHADERTYPE_SPLATTING:
return MAT_SPLATTING;
else if (MaterialType == irr_driver->getShader(ES_OBJECT_UNLIT))
case Material::SHADERTYPE_SOLID_UNLIT:
return MAT_UNLIT;
else if (tp == video::EVT_2TCOORDS)
return MAT_DETAIL;
return MAT_DEFAULT;
default:
if (MaterialType == irr_driver->getShader(ES_NORMAL_MAP))
return MAT_NORMAL_MAP;
else if (tp == video::EVT_2TCOORDS)
return MAT_DETAIL;
return MAT_DEFAULT;
}
}
TransparentMaterial MaterialTypeToTransparentMaterial(video::E_MATERIAL_TYPE type, f32 MaterialTypeParam, Material* material)