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

Add support for parallax mapping

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7823 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2011-03-05 23:04:26 +00:00
parent 6f42b9c18f
commit 9af2cc36eb
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/graphics/material.cpp
View File

@ -93,6 +93,12 @@ Material::Material(const XMLNode *node, int index)
{ {
m_normal_map = true; m_normal_map = true;
} }
else if (node->get("parallax-map", &m_normal_map_tex))
{
m_parallax_map = true;
m_parallax_height = 0.2f;
node->get("parallax-height", &m_parallax_height);
}
s=""; s="";
node->get("graphical-effect", &s ); node->get("graphical-effect", &s );
@ -217,6 +223,7 @@ void Material::init(unsigned int index)
m_zipper_max_speed_increase = -1.0f; m_zipper_max_speed_increase = -1.0f;
m_zipper_speed_gain = -1.0f; m_zipper_speed_gain = -1.0f;
m_normal_map = false; m_normal_map = false;
m_parallax_map = false;
for (int n=0; n<EMIT_KINDS_COUNT; n++) for (int n=0; n<EMIT_KINDS_COUNT; n++)
{ {
@ -420,7 +427,14 @@ void Material::setMaterialProperties(video::SMaterial *m) const
if (m_normal_map) if (m_normal_map)
{ {
m->setTexture(1, irr_driver->getTexture(m_normal_map_tex)); m->setTexture(1, irr_driver->getTexture(m_normal_map_tex));
m->MaterialType = video::EMT_NORMAL_MAP_SOLID; // video::EMT_PARALLAX_MAP_SOLID m->MaterialType = video::EMT_NORMAL_MAP_SOLID;
modes++;
}
if (m_parallax_map)
{
m->setTexture(1, irr_driver->getTexture(m_normal_map_tex));
m->MaterialType = video::EMT_PARALLAX_MAP_SOLID;
m->MaterialTypeParam = m_parallax_height;
modes++; modes++;
} }

3
src/graphics/material.hpp
View File

@ -85,6 +85,9 @@ private:
bool m_normal_map; bool m_normal_map;
std::string m_normal_map_tex; std::string m_normal_map_tex;
bool m_parallax_map;
float m_parallax_height;
/** Texture clamp bitmask */ /** Texture clamp bitmask */
unsigned int m_clamp_tex; unsigned int m_clamp_tex;
bool m_lighting; bool m_lighting;