Main: TextureUnitState - alias EnvMapType to TexCoordCalcMethod

OGRECave · Aug 25, 2024 · 5ee9c17 · 5ee9c17
1 parent 27b69b1
commit 5ee9c17
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 31 deletions.
diff --git a/OgreMain/include/Ogre.i b/OgreMain/include/Ogre.i
@@ -194,6 +194,7 @@ typedef uint8_t uint8;
 %ignore Ogre::GpuConstantType;
 %ignore Ogre::GpuProgramParameters::ElementType;
 %ignore Ogre::Capabilities;
+%ignore Ogre::TextureUnitState::EnvMapType;
 %typemap(csbase) Ogre::SceneManager::QueryTypeMask "uint";
 %csmethodmodifiers *::ToString "public override";
 // wrong "override" because of multiple inheritance

diff --git a/OgreMain/include/OgreRenderSystem.h b/OgreMain/include/OgreRenderSystem.h
@@ -31,8 +31,8 @@ THE SOFTWARE.
 // Precompiler options
 #include "OgrePrerequisites.h"
 
-#include "OgreTextureUnitState.h"
 #include "OgreCommon.h"
+#include "OgreBlendMode.h"
 
 #include "OgreRenderSystemCapabilities.h"
 #include "OgreConfigOptionMap.h"
@@ -43,6 +43,9 @@ THE SOFTWARE.
 
 namespace Ogre
 {
+    class Sampler;
+    class TextureUnitState;
+
     /** \addtogroup Core
     *  @{
     */
@@ -61,11 +64,13 @@ namespace Ogre
     {
         /// No calculated texture coordinates
         TEXCALC_NONE,
-        /// Environment map based on vertex normals
+        /// 2D texture coordinates using spherical reflection mapping based on vertex normals
         TEXCALC_ENVIRONMENT_MAP,
-        /// Environment map based on vertex positions
+        /// 2D texture coordinates using view space position. Same as #TEXCALC_ENVIRONMENT_MAP on all backends.
         TEXCALC_ENVIRONMENT_MAP_PLANAR,
+        /// 3D texture coordinates using the reflection vector
         TEXCALC_ENVIRONMENT_MAP_REFLECTION,
+        /// 3D texture coordinates using the normal vector
         TEXCALC_ENVIRONMENT_MAP_NORMAL,
         /// Projective texture
         TEXCALC_PROJECTIVE_TEXTURE

diff --git a/OgreMain/include/OgreTextureUnitState.h b/OgreMain/include/OgreTextureUnitState.h
@@ -34,6 +34,7 @@ THE SOFTWARE.
 #include "OgreMatrix4.h"
 #include "OgreTexture.h"
 #include "OgreHeaderPrefix.h"
+#include "OgreRenderSystem.h"
 
 namespace Ogre {
     enum TexCoordCalcMethod : uint8;
@@ -264,17 +265,17 @@ namespace Ogre {
 
         };
 
-        /// %Texture coordinate generation method for environment mapping.
-        enum EnvMapType
+        /// rather use @ref TexCoordCalcMethod
+        enum EnvMapType : uint8
         {
-            /// 2D texture coordinates using view space position. Same as ENV_CURVED on all backends.
-            ENV_PLANAR,
-            /// 2D texture coordinates using spherical reflection mapping
-            ENV_CURVED,
-            /// Cubic texture coordinates using the reflection vector
-            ENV_REFLECTION,
-            /// Cubic texture coordinates using the normal vector
-            ENV_NORMAL
+            /// same as #TEXCALC_ENVIRONMENT_MAP_PLANAR
+            ENV_PLANAR = TEXCALC_ENVIRONMENT_MAP_PLANAR,
+            /// same as #TEXCALC_ENVIRONMENT_MAP
+            ENV_CURVED = TEXCALC_ENVIRONMENT_MAP,
+            /// same as #TEXCALC_ENVIRONMENT_MAP_REFLECTION
+            ENV_REFLECTION = TEXCALC_ENVIRONMENT_MAP_REFLECTION,
+            /// same as #TEXCALC_ENVIRONMENT_MAP_NORMAL
+            ENV_NORMAL = TEXCALC_ENVIRONMENT_MAP_NORMAL
         };
 
         /** Useful enumeration when dealing with procedural transforms.
@@ -884,7 +885,7 @@ namespace Ogre {
             True to enable, false to disable
         @param texGenType texture coordinate generation type
         */
-        void setEnvironmentMap(bool enable, EnvMapType texGenType = ENV_CURVED);
+        void setEnvironmentMap(bool enable, int texGenType = TEXCALC_ENVIRONMENT_MAP);
 
         /** Sets up an animated scroll for the texture layer.
 

diff --git a/OgreMain/src/OgreTextureUnitState.cpp b/OgreMain/src/OgreTextureUnitState.cpp
@@ -669,7 +669,7 @@ namespace Ogre {
         return mAlphaBlendMode;
     }
     //-----------------------------------------------------------------------
-    void TextureUnitState::setEnvironmentMap(bool enable, EnvMapType envMapType)
+    void TextureUnitState::setEnvironmentMap(bool enable, int envMapType)
     {
         if (enable)
         {
@@ -1226,22 +1226,7 @@ namespace Ogre {
             switch (effi.second.type)
             {
             case ET_ENVIRONMENT_MAP:
-                if (effi.second.subtype == ENV_CURVED)
-                {
-                    texCoordCalcMethod = TEXCALC_ENVIRONMENT_MAP;
-                }
-                else if (effi.second.subtype == ENV_PLANAR)
-                {
-                    texCoordCalcMethod = TEXCALC_ENVIRONMENT_MAP_PLANAR;
-                }
-                else if (effi.second.subtype == ENV_REFLECTION)
-                {
-                    texCoordCalcMethod = TEXCALC_ENVIRONMENT_MAP_REFLECTION;
-                }
-                else if (effi.second.subtype == ENV_NORMAL)
-                {
-                    texCoordCalcMethod = TEXCALC_ENVIRONMENT_MAP_NORMAL;
-                }
+                texCoordCalcMethod = (TexCoordCalcMethod)effi.second.subtype;
                 break;
             case ET_UVSCROLL:
             case ET_USCROLL:

diff --git a/RenderSystems/Tiny/include/OgreTinyRenderSystem.h b/RenderSystems/Tiny/include/OgreTinyRenderSystem.h
@@ -8,6 +8,7 @@
 
 #include "OgreRenderWindow.h"
 #include "OgreRenderSystem.h"
+#include "OgreImage.h"
 
 namespace Ogre {
     /** \addtogroup RenderSystems RenderSystems

diff --git a/Samples/ShaderSystem/include/OgreShaderExTextureAtlasSampler.h b/Samples/ShaderSystem/include/OgreShaderExTextureAtlasSampler.h
@@ -30,6 +30,7 @@ THE SOFTWARE.
 #include "OgreShaderPrerequisites.h"
 #ifdef RTSHADER_SYSTEM_BUILD_EXT_SHADERS
 #include "OgreShaderSubRenderState.h"
+#include "OgreTextureUnitState.h"
 
 #define TAS_MAX_TEXTURES 4
 namespace Ogre {