Browse Source

Remove deprecated formats from Image (w/o changing enum ordinal)

shadowislord 11 years ago
parent
commit
0c41d1725f
1 changed files with 19 additions and 45 deletions
  1. 19 45
      jme3-core/src/main/java/com/jme3/texture/Image.java

+ 19 - 45
jme3-core/src/main/java/com/jme3/texture/Image.java

@@ -66,20 +66,16 @@ public class Image extends NativeObject implements Savable /*, Cloneable*/ {
          */
         Alpha8(8),
         
-        /**
-         * 16-bit alpha
-         */
-        Alpha16(16),
+        @Deprecated
+        Reserved1(0),
 
         /**
          * 8-bit grayscale/luminance.
          */
         Luminance8(8),
         
-        /**
-         * 16-bit grayscale/luminance.
-         */
-        Luminance16(16),
+        @Deprecated
+        Reserved2(0),
         
         /**
          * half-precision floating-point grayscale/luminance.
@@ -100,10 +96,8 @@ public class Image extends NativeObject implements Savable /*, Cloneable*/ {
          */
         Luminance8Alpha8(16),
         
-        /**
-         * 16-bit luminance/grayscale and 16-bit alpha.
-         */
-        Luminance16Alpha16(32),
+        @Deprecated
+        Reserved3(0),
         
         /**
          * half-precision floating-point grayscale/luminance and alpha.
@@ -113,10 +107,10 @@ public class Image extends NativeObject implements Savable /*, Cloneable*/ {
         Luminance16FAlpha16F(32,true),
 
         @Deprecated
-        Intensity8(8),
+        Reserved4(0),
         
         @Deprecated
-        Intensity16(16),
+        Reserved5(0),
 
         /**
          * 8-bit blue, green, and red.
@@ -129,22 +123,18 @@ public class Image extends NativeObject implements Savable /*, Cloneable*/ {
         RGB8(24),
         
         @Deprecated
-        RGB10(30),
+        Reserved6(0),
         
-        /**
-         * 16-bit red, green, and blue.
-         */
-        RGB16(48),
+        @Deprecated
+        Reserved7(0),
 
         /**
          * 5-bit red, 6-bit green, and 5-bit blue.
          */
         RGB565(16),
         
-        /**
-         * 4-bit alpha, red, green, and blue. Used on Android only.
-         */
-        ARGB4444(16),
+        @Deprecated
+        Reserved8(0),
         
         /**
          * 5-bit red, green, and blue with 1-bit alpha.
@@ -171,10 +161,8 @@ public class Image extends NativeObject implements Savable /*, Cloneable*/ {
          */
         BGRA8(32),
         
-        /**
-         * 16-bit red, green, blue and alpha
-         */
-        RGBA16(64),
+        @Deprecated
+        Reserved9(0),
 
         /**
          * S3TC compression DXT1. 
@@ -203,7 +191,7 @@ public class Image extends NativeObject implements Savable /*, Cloneable*/ {
          * @deprecated Not supported by OpenGL 3.0.
          */
         @Deprecated
-        LATC(8, false, true, false),
+        Reserved10(0),
 
         /**
          * Arbitrary depth format. The precision is chosen by the video
@@ -293,14 +281,8 @@ public class Image extends NativeObject implements Savable /*, Cloneable*/ {
          */
         RGBA32F(128,true),
 
-        /**
-         * Luminance/grayscale texture compression. 
-         * Called BC4 in DirectX10.
-         * 
-         * @deprecated Not supported by OpenGL 3.0.
-         */
         @Deprecated
-        LTC(4, false, true, false),
+        Reserved11(0),
         
         /**
          * 24-bit depth with 8-bit stencil. 
@@ -308,16 +290,8 @@ public class Image extends NativeObject implements Savable /*, Cloneable*/ {
          */
         Depth24Stencil8(32, true, false, false),
         
-        /**
-         * 10 bits each for RGB, 2 for Alpha. This can be a useful format for
-         * framebuffers, if you do not need a high-precision destination alpha
-         * value. It carries more color depth, thus preserving subtle
-         * gradations. They can also be used for normals, though there is no
-         * signed-normalized version, so you have to do the conversion manually.
-         * It is also a required format, so you can count on it
-         * being present.
-         */
-        RGB10_A2(32, false),
+        @Deprecated
+        Reserved12(0),
         
         /**
          * Ericsson Texture Compression. Typically used on Android.