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

Fixed lighthouse trees (adding a couple code cleanup that I did while searching for the issue)

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4602 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2010-02-01 20:03:32 +00:00
parent a24fe6d2a4
commit 4595c5adb3
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/graphics/material.cpp
View File

@ -28,8 +28,8 @@
#include "utils/string_utils.hpp" #include "utils/string_utils.hpp"
#define UCLAMP 1 const unsigned int UCLAMP = 1;
#define VCLAMP 2 const unsigned int VCLAMP = 2;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
/** Create a new material using the parameters specified in the xml file. /** Create a new material using the parameters specified in the xml file.
@ -38,6 +38,7 @@
*/ */
Material::Material(const XMLNode *node, int index) Material::Material(const XMLNode *node, int index)
{ {
node->get("name", &m_texname); node->get("name", &m_texname);
if (m_texname=="") if (m_texname=="")
{ {
@ -45,9 +46,9 @@ Material::Material(const XMLNode *node, int index)
} }
init(index); init(index);
bool b = false; bool b = false;
node->get("clampU", &b); if(b) m_clamp_tex +=UCLAMP; node->get("clampU", &b); if (b) m_clamp_tex |= UCLAMP;
b = false; b = false;
node->get("clampV", &b); if(b) m_clamp_tex +=VCLAMP; node->get("clampV", &b); if (b) m_clamp_tex |= VCLAMP;
node->get("transparency", &m_alpha_testing ); node->get("transparency", &m_alpha_testing );
node->get("lightmap", &m_lightmap ); node->get("lightmap", &m_lightmap );
node->get("alpha", &m_alpha_blending ); node->get("alpha", &m_alpha_blending );
@ -152,7 +153,7 @@ void Material::setMaterialProperties(video::SMaterial *m) const
#if (IRRLICHT_VERSION_MAJOR == 1) && (IRRLICHT_VERSION_MINOR >= 7) #if (IRRLICHT_VERSION_MAJOR == 1) && (IRRLICHT_VERSION_MINOR >= 7)
if (m_clamp_tex & UCLAMP) if (m_clamp_tex & UCLAMP != 0)
{ {
// m->setFlag(); // m->setFlag();
// n1->getMaterial(0).TextureLayer[0].TextureWrap = video::ETC_CLAMP; // n1->getMaterial(0).TextureLayer[0].TextureWrap = video::ETC_CLAMP;
@ -169,13 +170,14 @@ void Material::setMaterialProperties(video::SMaterial *m) const
m->TextureLayer[n].TextureWrapU = video::ETC_CLAMP_TO_EDGE; m->TextureLayer[n].TextureWrapU = video::ETC_CLAMP_TO_EDGE;
} }
} }
if (m_clamp_tex & VCLAMP) if (m_clamp_tex & VCLAMP != 0)
{ {
for (unsigned int n=0; n<video::MATERIAL_MAX_TEXTURES; n++) for (unsigned int n=0; n<video::MATERIAL_MAX_TEXTURES; n++)
{ {
m->TextureLayer[n].TextureWrapV = video::ETC_CLAMP_TO_EDGE; m->TextureLayer[n].TextureWrapV = video::ETC_CLAMP_TO_EDGE;
} }
} }
#endif #endif
// FIXME: more parameters need to be set! // FIXME: more parameters need to be set!
} // setMaterialProperties } // setMaterialProperties

3
src/graphics/material.hpp
View File

@ -40,7 +40,8 @@ private:
bool m_zipper; bool m_zipper;
bool m_resetter; bool m_resetter;
bool m_ignore; bool m_ignore;
int m_clamp_tex; /** Texture clamp bitmask */
unsigned int m_clamp_tex;
bool m_lighting; bool m_lighting;
bool m_sphere_map; bool m_sphere_map;
bool m_alpha_testing; bool m_alpha_testing;