Drop _IRR_MATERIAL_MAX_TEXTURES_

diff --git a/include/IVideoDriver.h b/include/IVideoDriver.h
index a8cea1317440a182913574b2765ed19c750d0f67..e3ea22106cde972e0bdc3f6d008a50ec0f722c93 100644 (file)
--- a/include/IVideoDriver.h
+++ b/include/IVideoDriver.h
@@ -56,32 +56,13 @@ namespace video
                ETS_WORLD,\r
                //! Projection transformation\r
                ETS_PROJECTION,\r
-               //! Texture transformation\r
+               //! Texture 0 transformation\r
+               //! Use ETS_TEXTURE_0 + texture_number to access other texture transformations\r
                ETS_TEXTURE_0,\r
-               //! Texture transformation\r
+               //! Texture 1 transformation\r
                ETS_TEXTURE_1,\r
-               //! Texture transformation\r
-               ETS_TEXTURE_2,\r
-               //! Texture transformation\r
-               ETS_TEXTURE_3,\r
-#if _IRR_MATERIAL_MAX_TEXTURES_>4\r
-               //! Texture transformation\r
-               ETS_TEXTURE_4,\r
-#if _IRR_MATERIAL_MAX_TEXTURES_>5\r
-               //! Texture transformation\r
-               ETS_TEXTURE_5,\r
-#if _IRR_MATERIAL_MAX_TEXTURES_>6\r
-               //! Texture transformation\r
-               ETS_TEXTURE_6,\r
-#if _IRR_MATERIAL_MAX_TEXTURES_>7\r
-               //! Texture transformation\r
-               ETS_TEXTURE_7,\r
-#endif\r
-#endif\r
-#endif\r
-#endif\r
                //! Only used internally\r
-               ETS_COUNT = ETS_TEXTURE_0 + _IRR_MATERIAL_MAX_TEXTURES_\r
+               ETS_COUNT = ETS_TEXTURE_0 + MATERIAL_MAX_TEXTURES\r
        };\r
 \r
        //! Special render targets, which usually map to dedicated hardware\r

diff --git a/include/IrrCompileConfig.h b/include/IrrCompileConfig.h
index d186a2cb4d0c5fe9f3d5489ded94fffe04b0a71b..027128947658f41da2a77c09b5d40bc94550aebc 100644 (file)
--- a/include/IrrCompileConfig.h
+++ b/include/IrrCompileConfig.h
@@ -20,10 +20,6 @@
 \r
 #include <stdio.h> // TODO: Although included elsewhere this is required at least for mingw\r
 \r
-\r
-//! Maximum number of texture an SMaterial can have, up to 8 are supported by Irrlicht.\r
-#define _IRR_MATERIAL_MAX_TEXTURES_ 4\r
-\r
 #ifdef _WIN32\r
 #define IRRCALLCONV __stdcall\r
 #else\r

diff --git a/include/SMaterial.h b/include/SMaterial.h
index 43dadb6e25128932754bf542a1012c6968959b9c..92dc822a73bfdfe5c72de1e9ae40fd418b4f7239 100644 (file)
--- a/include/SMaterial.h
+++ b/include/SMaterial.h
@@ -280,7 +280,7 @@ namespace video
        /** SMaterial might ignore some textures in most function, like assignment and comparison,\r
                when SIrrlichtCreationParameters::MaxTextureUnits is set to a lower number.\r
        */\r
-       const u32 MATERIAL_MAX_TEXTURES = _IRR_MATERIAL_MAX_TEXTURES_;\r
+       const u32 MATERIAL_MAX_TEXTURES = 4;\r
 \r
        //! Struct for holding parameters for a material renderer\r
        // Note for implementors: Serialization is in CNullDriver\r

diff --git a/source/Irrlicht/CNullDriver.cpp b/source/Irrlicht/CNullDriver.cpp
index 5834e01caba97a8cb9dcba37ae6bf44c756349f9..2cbd47cd70c676c5ac5016c0fb26a07664034fab 100644 (file)
--- a/source/Irrlicht/CNullDriver.cpp
+++ b/source/Irrlicht/CNullDriver.cpp
@@ -53,8 +53,8 @@ CNullDriver::CNullDriver(io::IFileSystem* io, const core::dimension2d<u32>& scre
        #endif\r
 \r
        DriverAttributes = new io::CAttributes();\r
-       DriverAttributes->addInt("MaxTextures", _IRR_MATERIAL_MAX_TEXTURES_);\r
-       DriverAttributes->addInt("MaxSupportedTextures", _IRR_MATERIAL_MAX_TEXTURES_);\r
+       DriverAttributes->addInt("MaxTextures", MATERIAL_MAX_TEXTURES);\r
+       DriverAttributes->addInt("MaxSupportedTextures", MATERIAL_MAX_TEXTURES);\r
        DriverAttributes->addInt("MaxAnisotropy", 1);\r
 //     DriverAttributes->addInt("MaxUserClipPlanes", 0);\r
 //     DriverAttributes->addInt("MaxAuxBuffers", 0);\r