Make material flag enum combinable.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2192 dfc29bdd-3216-0410-991c-e03cc46cb475

include/EMaterialFlags.h

@@ -14,48 +14,48 @@ namespace video
 	enum E_MATERIAL_FLAG
 	{
 		//! Draw as wireframe or filled triangles? Default: false
-		EMF_WIREFRAME = 0,
+		EMF_WIREFRAME = 0x1,
 
 		//! Draw as point cloud or filled triangles? Default: false
-		EMF_POINTCLOUD,
+		EMF_POINTCLOUD = 0x2,
 
 		//! Flat or Gouraud shading? Default: true
-		EMF_GOURAUD_SHADING,
+		EMF_GOURAUD_SHADING = 0x4,
 
 		//! Will this material be lighted? Default: true
-		EMF_LIGHTING,
+		EMF_LIGHTING = 0x8,
 
 		//! Is the ZBuffer enabled? Default: true
-		EMF_ZBUFFER,
+		EMF_ZBUFFER = 0x10,
 
 		//! May be written to the zbuffer or is it readonly. Default: true
 		/** This flag is ignored, if the material type is a transparent type. */
-		EMF_ZWRITE_ENABLE,
+		EMF_ZWRITE_ENABLE = 0x20,
 
 		//! Is backface culling enabled? Default: true
-		EMF_BACK_FACE_CULLING,
+		EMF_BACK_FACE_CULLING = 0x40,
 
 		//! Is frontface culling enabled? Default: false
 		/** Overrides EMF_BACK_FACE_CULLING if both are enabled. */
-		EMF_FRONT_FACE_CULLING,
+		EMF_FRONT_FACE_CULLING = 0x80,
 
 		//! Is bilinear filtering enabled? Default: true
-		EMF_BILINEAR_FILTER,
+		EMF_BILINEAR_FILTER = 0x100,
 
 		//! Is trilinear filtering enabled? Default: false
 		/** If the trilinear filter flag is enabled,
 		the bilinear filtering flag is ignored. */
-		EMF_TRILINEAR_FILTER,
+		EMF_TRILINEAR_FILTER = 0x200,
 
 		//! Is anisotropic filtering? Default: false
 		/** In Irrlicht you can use anisotropic texture filtering in
 		conjunction with bilinear or trilinear texture filtering
 		to improve rendering results. Primitives will look less
 		blurry with this flag switched on. */
-		EMF_ANISOTROPIC_FILTER,
+		EMF_ANISOTROPIC_FILTER = 0x400,
 
 		//! Is fog enabled? Default: false
-		EMF_FOG_ENABLE,
+		EMF_FOG_ENABLE = 0x800,
 
 		//! Normalizes normals. Default: false
 		/** You can enable this if you need to scale a dynamic lighted
@@ -63,19 +63,16 @@ namespace video
 		will get darker. If you enable the EMF_NORMALIZE_NORMALS flag,
 		the normals will be normalized again, and the model will look
 		as bright as it should. */
-		EMF_NORMALIZE_NORMALS,
+		EMF_NORMALIZE_NORMALS = 0x1000,
 
 		//! Access to all layers texture wrap settings. Overwrites separate layer settings.
-		EMF_TEXTURE_WRAP,
+		EMF_TEXTURE_WRAP = 0x2000,
 
 		//! AntiAliasing mode
-		EMF_ANTI_ALIASING,
+		EMF_ANTI_ALIASING = 0x4000,
 
 		//! ColorMask bits, for enabling the color planes
-		EMF_COLOR_MASK,
-
-		//! This is not a flag, but a value indicating how much flags there are.
-		EMF_MATERIAL_FLAG_COUNT
+		EMF_COLOR_MASK = 0x8000
 	};
 
 } // end namespace video

include/SMaterial.h

@@ -462,8 +462,6 @@ namespace video
 					return (AntiAliasing==1);
 				case EMF_COLOR_MASK:
 					return (ColorMask!=ECP_NONE);
-				case EMF_MATERIAL_FLAG_COUNT:
-					break;
 			}
 
 			return false;