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

More material cleanup, move splatting where it belongs

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12759 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2013-05-14 23:04:48 +00:00
parent 40c02fba2e
commit 568c96648f
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/graphics/material.cpp
View File

@ -568,6 +568,15 @@ Material::Material(const XMLNode *node, int index, bool deprecated)
{
m_graphical_effect = GE_SPHERE_MAP;
}
else if (s == "splatting")
{
m_graphical_effect = GE_SPLATTING;
node->get("splatting-texture-1", &m_splatting_texture_1);
node->get("splatting-texture-2", &m_splatting_texture_2);
node->get("splatting-texture-3", &m_splatting_texture_3);
node->get("splatting-texture-4", &m_splatting_texture_4);
node->get("splatting-lightmap", &m_splatting_lightmap);
}
else if (s == "none")
{
}
@ -603,15 +612,6 @@ Material::Material(const XMLNode *node, int index, bool deprecated)
s.c_str());
}
node->get("splatting", &m_splatting);
if (m_splatting)
{
node->get("splatting-texture-1", &m_splatting_texture_1);
node->get("splatting-texture-2", &m_splatting_texture_2);
node->get("splatting-texture-3", &m_splatting_texture_3);
node->get("splatting-texture-4", &m_splatting_texture_4);
node->get("splatting-lightmap", &m_splatting_lightmap);
}
bool water_shader = false;
node->get("water-shader", &water_shader);
@ -727,7 +727,6 @@ void Material::init(unsigned int index)
m_parallax_map = false;
m_is_heightmap = false;
m_alpha_to_coverage = false;
m_splatting = false;
m_water_splash = false;
m_shaders.resize(SHADER_COUNT, NULL);
@ -1166,7 +1165,7 @@ void Material::setMaterialProperties(video::SMaterial *m, scene::IMeshBuffer* m
m->SpecularColor.set(0,0,0,0);
modes++;
}
if (m_splatting)
if (m_graphical_effect == GE_SPLATTING)
{
if (irr_driver->supportsSplatting())
{

6
src/graphics/material.hpp
View File

@ -57,7 +57,8 @@ public:
/** Effect that makes grass wave as in the wind */
GE_GRASS,
GE_WATER_SHADER,
GE_SPHERE_MAP};
GE_SPHERE_MAP,
GE_SPLATTING};
enum ParticleConditions
{
@ -214,9 +215,6 @@ private:
std::string m_mask;
/** Whether to use splatting */
bool m_splatting;
/** If m_splatting is true, indicates the first splatting texture */
std::string m_splatting_texture_1;