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

Starting the merge with the swatter branch. Now it should be automatic with karts, but doesn't work with items (yet).

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9275 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
funto66
2011-07-15 23:38:40 +00:00
parent 747489c917
commit d26b406780
21 changed files with 271 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/graphics/material_manager.cpp
View File

@@ -113,22 +113,17 @@ void MaterialManager::adjustForFog(video::ITexture* t,
void MaterialManager::setAllUntexturedMaterialFlags(scene::IMeshBuffer *mb) const
{
// BEGIN BOUM
// for(int i = (int)m_materials.size()-1; i>=0; i-- )
// {
irr::video::SMaterial& material = mb->getMaterial();
if (material.getTexture(0) == NULL)
{
//material.AmbientColor = video::SColor(255, 50, 50, 50);
//material.DiffuseColor = video::SColor(255, 150, 150, 150);
material.EmissiveColor = video::SColor(255, 0, 0, 0);
material.SpecularColor = video::SColor(255, 0, 0, 0);
//material.Shininess = 0.0f;
material.ColorMaterial = irr::video::ECM_DIFFUSE_AND_AMBIENT;
material.MaterialType = irr::video::EMT_SOLID;
}
// } // for i
// END BOUM
irr::video::SMaterial& material = mb->getMaterial();
if (material.getTexture(0) == NULL)
{
//material.AmbientColor = video::SColor(255, 50, 50, 50);
//material.DiffuseColor = video::SColor(255, 150, 150, 150);
material.EmissiveColor = video::SColor(255, 0, 0, 0);
material.SpecularColor = video::SColor(255, 0, 0, 0);
//material.Shininess = 0.0f;
material.ColorMaterial = irr::video::ECM_DIFFUSE_AND_AMBIENT;
material.MaterialType = irr::video::EMT_SOLID;
}
}
//-----------------------------------------------------------------------------
int MaterialManager::addEntity(Material *m)