Changeset 1261 for trunk/Source/System/Depreciated/State/OSGTextureChunkBase.h

Timestamp:

05/30/08 01:57:13 (3 months ago)

Author:

vossg

Message:

merged: system 1.x changes

Files:

• trunk/Source/System/Depreciated/State/OSGTextureChunkBase.h (modified) (8 diffs)

trunk/Source/System/Depreciated/State/OSGTextureChunkBase.h

@@ -121 +121 @@
-#include "OSGUInt32Fields.h" // BorderWidth type
-#include "OSGUInt32Fields.h" // NPOTMatrixScale type
+#include "OSGReal32Fields.h" // SkipMipMapLevels type
-
-#include "OSGTextureChunkFields.h"
@@ -203 +204 @@
-        BorderWidthFieldId = DepthModeFieldId + 1,
-        NPOTMatrixScaleFieldId = BorderWidthFieldId + 1,
-
+
+
-    };
-
@@ -316 +318 @@
-    static const OSG::BitVector NPOTMatrixScaleFieldMask =
-        (TypeTraits<BitVector>::One << NPOTMatrixScaleFieldId);
+    static const OSG::BitVector SkipMipMapLevelsFieldMask =
+        (TypeTraits<BitVector>::One << SkipMipMapLevelsFieldId);
-    static const OSG::BitVector NextFieldMask =
-        (TypeTraits<BitVector>::One << NextFieldId);
@@ -669 +673 @@
-            const SFUInt32            *getSFNPOTMatrixScale (void) const;
-
+#ifdef OSG_1_GET_COMPAT
+                  SFReal32            *getSFSkipMipMapLevels (void);
+#endif
+                  SFReal32            *editSFSkipMipMapLevels(void);
+            const SFReal32            *getSFSkipMipMapLevels (void) const;
+
-
-                  Image * getImage          (void) const;
@@ -996 +1006 @@
-                  UInt32              &editNPOTMatrixScale(void);
-            const UInt32               getNPOTMatrixScale (void) const;
+
+#ifdef OSG_1_GET_COMPAT
+                  Real32              &getSkipMipMapLevels (void);
+#endif
+                  Real32              &editSkipMipMapLevels(void);
+            const Real32               getSkipMipMapLevels (void) const;
-
-    /*! \}                                                                 */
@@ -1056 +1072 @@
-            void setBorderWidth    (const UInt32 &value);
-            void setNPOTMatrixScale(const UInt32 &value);
+            void setSkipMipMapLevels(const Real32 &value);
-
-    /*! \}                                                                 */
@@ -1171 +1188 @@
-    SFUInt32          _sfBorderWidth;
-    SFUInt32          _sfNPOTMatrixScale;
+    SFReal32          _sfSkipMipMapLevels;
-
-    /*! \}                                                                 */
@@ -1309 +1327 @@
-    GetFieldHandlePtr  getHandleNPOTMatrixScale (void) const;
-    EditFieldHandlePtr editHandleNPOTMatrixScale(void);
+    GetFieldHandlePtr  getHandleSkipMipMapLevels (void) const;
+    EditFieldHandlePtr editHandleSkipMipMapLevels(void);
-
-    /*! \}                                                                 */