Merge pull request #43 from Trimatix/dev

v0.8.3

src/AEPi/__init__.py

@@ -4,5 +4,5 @@
 from . import codecs
 from . import lib
 
-__version__ = "0.8.2"
+__version__ = "0.8.3"
 __all__ = ["AEI", "Texture", "CompressionFormat", "CompressionQuality", "codecs", "lib", "codec"]

src/AEPi/codecs/Tex2ImgCodec.py

@@ -15,7 +15,8 @@
     CompressionFormat.ATC: 14,
     CompressionFormat.DXT1: 5,
     CompressionFormat.DXT5: 6,
-    CompressionFormat.ETC1: 0
+    CompressionFormat.ETC1: 0,
+    CompressionFormat.ETC2: 3
 }
 
 

src/AEPi/constants.py

@@ -6,6 +6,7 @@
 FORMAT_PILLOW_MODES: Dict["CompressionFormat", str] = {}
 FORMAT_BITCOUNTS: Dict["CompressionFormat", int] = {}
 BGRA_FORMATS: Set["CompressionFormat"] = set()
+MIPMAPPABLE_FORMATS: Set["CompressionFormat"] = set()
 MASK_MIPMAPPED_FLAG = 0b00000010
 MASK_FORMAT_ID = 0b11111101
 
@@ -25,11 +26,12 @@ class CompressionFormat(Enum):
     DXT3 =                      0b00100001
     DXT5 =                      0b00100100
     ETC1 =                      0b01000000
+    ETC2 =                      0b00010111
 
 
     @classmethod
     def fromBinary(cls, rawId: int) -> Tuple["CompressionFormat", bool]:
-        # Some non-mipmappable formats (uncompressed) have the mipmapping flag as 1, just as part of their ID
+        # Some non-mipmappable formats have the mipmapping flag as 1, just as part of their ID
         if any(f.value == rawId for f in CompressionFormat):
             return CompressionFormat(rawId), False
 
@@ -65,7 +67,7 @@ def bitcount(self):
     @property
     def supportsMipmapping(self):
         # This will need some more testing to validate
-        return self.isCompressed
+        return self in MIPMAPPABLE_FORMATS
 
 
     @property
@@ -84,6 +86,7 @@ def isBgra(self):
 FORMAT_PILLOW_MODES[CompressionFormat.DXT3] = "RGBA"
 FORMAT_PILLOW_MODES[CompressionFormat.DXT5] = "RGBA"
 FORMAT_PILLOW_MODES[CompressionFormat.ETC1] = "RGB"
+FORMAT_PILLOW_MODES[CompressionFormat.ETC2] = "RGBA"
 
 FORMAT_BITCOUNTS[CompressionFormat.Uncompressed] = 8 # ?
 FORMAT_BITCOUNTS[CompressionFormat.Uncompressed_UI] = 8 # ?
@@ -96,8 +99,18 @@ def isBgra(self):
 FORMAT_BITCOUNTS[CompressionFormat.DXT3] = 8
 FORMAT_BITCOUNTS[CompressionFormat.DXT5] = 8
 FORMAT_BITCOUNTS[CompressionFormat.ETC1] = 4
+FORMAT_BITCOUNTS[CompressionFormat.ETC2] = 8 # ?
 
 BGRA_FORMATS.add(CompressionFormat.ETC1)
+BGRA_FORMATS.add(CompressionFormat.ETC2)
+
+MIPMAPPABLE_FORMATS.add(CompressionFormat.PVRTC12A)
+MIPMAPPABLE_FORMATS.add(CompressionFormat.PVRTC14A)
+MIPMAPPABLE_FORMATS.add(CompressionFormat.ATC)
+MIPMAPPABLE_FORMATS.add(CompressionFormat.DXT1)
+MIPMAPPABLE_FORMATS.add(CompressionFormat.DXT3)
+MIPMAPPABLE_FORMATS.add(CompressionFormat.DXT5)
+MIPMAPPABLE_FORMATS.add(CompressionFormat.ETC1)
 
 FILE_TYPE_HEADER = b"AEimage\x00"
 ENDIANNESS = Endianness("little", "<")