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

irr: Add materialtype override

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13005 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
curaga 2013-06-28 12:11:44 +00:00
parent 9bfe9026ed
commit 448a7d02bd
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/irrlicht/changes.stk
View File

@ -3,3 +3,4 @@ The following changes have been made:
- primary sort by material type - primary sort by material type
- stencil RTT support - stencil RTT support
- drawall types - drawall types
- materialtype override

5
lib/irrlicht/include/EMaterialFlags.h
View File

@ -84,7 +84,10 @@ namespace video
EMF_BLEND_OPERATION = 0x40000, EMF_BLEND_OPERATION = 0x40000,
//! Flag for polygon offset //! Flag for polygon offset
EMF_POLYGON_OFFSET = 0x80000 EMF_POLYGON_OFFSET = 0x80000,
//! MaterialType override
EMF_MATERIAL_TYPE = 0x100000
}; };
} // end namespace video } // end namespace video

1
lib/irrlicht/include/IVideoDriver.h
View File

@ -192,6 +192,7 @@ namespace video
material.TextureLayer[0].TextureWrapU = Material.TextureLayer[0].TextureWrapU; material.TextureLayer[0].TextureWrapU = Material.TextureLayer[0].TextureWrapU;
material.TextureLayer[0].TextureWrapV = Material.TextureLayer[0].TextureWrapV; material.TextureLayer[0].TextureWrapV = Material.TextureLayer[0].TextureWrapV;
break; break;
case EMF_MATERIAL_TYPE: material.MaterialType = Material.MaterialType; break;
case EMF_ANTI_ALIASING: material.AntiAliasing = Material.AntiAliasing; break; case EMF_ANTI_ALIASING: material.AntiAliasing = Material.AntiAliasing; break;
case EMF_COLOR_MASK: material.ColorMask = Material.ColorMask; break; case EMF_COLOR_MASK: material.ColorMask = Material.ColorMask; break;
case EMF_COLOR_MATERIAL: material.ColorMaterial = Material.ColorMaterial; break; case EMF_COLOR_MATERIAL: material.ColorMaterial = Material.ColorMaterial; break;

2
lib/irrlicht/include/SMaterial.h
View File

@ -617,6 +617,8 @@ namespace video
return BlendOperation != EBO_NONE; return BlendOperation != EBO_NONE;
case EMF_POLYGON_OFFSET: case EMF_POLYGON_OFFSET:
return PolygonOffsetFactor != 0; return PolygonOffsetFactor != 0;
default:
break;
} }
return false; return false;