Merge pull request #45 from Trimatix/dev

v0.8.3.1
Trimatix · May 8, 2024 · c2eedde · c2eedde · github-actions · May 8, 2024
2 parents 6e5b384 + 5db2660
commit c2eedde
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/AEPi/codecs/Tex2ImgCodec.py b/src/AEPi/codecs/Tex2ImgCodec.py
@@ -16,7 +16,7 @@
     CompressionFormat.DXT1: 5,
     CompressionFormat.DXT5: 6,
     CompressionFormat.ETC1: 0,
-    CompressionFormat.ETC2: 3
+    CompressionFormat.ETC2: 2
 }
 
 

diff --git a/src/AEPi/constants.py b/src/AEPi/constants.py
@@ -5,7 +5,7 @@
 
 FORMAT_PILLOW_MODES: Dict["CompressionFormat", str] = {}
 FORMAT_BITCOUNTS: Dict["CompressionFormat", int] = {}
-BGRA_FORMATS: Set["CompressionFormat"] = set()
+BGR_FORMATS: Set["CompressionFormat"] = set()
 MIPMAPPABLE_FORMATS: Set["CompressionFormat"] = set()
 MASK_MIPMAPPED_FLAG = 0b00000010
 MASK_FORMAT_ID = 0b11111101
@@ -72,7 +72,7 @@ def supportsMipmapping(self):
 
     @property
     def isBgra(self):
-        return self in BGRA_FORMATS
+        return self in BGR_FORMATS
 
 
 FORMAT_PILLOW_MODES[CompressionFormat.Uncompressed] = "RGBA" # ?
@@ -86,7 +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_PILLOW_MODES[CompressionFormat.ETC2] = "RGB"
 
 FORMAT_BITCOUNTS[CompressionFormat.Uncompressed] = 8 # ?
 FORMAT_BITCOUNTS[CompressionFormat.Uncompressed_UI] = 8 # ?
@@ -101,8 +101,7 @@ def isBgra(self):
 FORMAT_BITCOUNTS[CompressionFormat.ETC1] = 4
 FORMAT_BITCOUNTS[CompressionFormat.ETC2] = 8 # ?
 
-BGRA_FORMATS.add(CompressionFormat.ETC1)
-BGRA_FORMATS.add(CompressionFormat.ETC2)
+BGR_FORMATS.add(CompressionFormat.ETC1)
 
 MIPMAPPABLE_FORMATS.add(CompressionFormat.PVRTC12A)
 MIPMAPPABLE_FORMATS.add(CompressionFormat.PVRTC14A)
File	Stmts	Miss	Cover	Missing
src/AEPi
codec.py	37	3	92%	22, 40, 119
constants.py	83	7	92%	38–44, 64, 70
exceptions.py	40	11	72%	18–19, 28–29, 39–40, 47, 54, 61, 68–69
src/AEPi/codecs
EtcPakCodec.py	29	14	52%	11–12, 22–30, 35–41
RawCodec.py	13	2	85%	15, 20
Tex2ImgCodec.py	19	3	84%	10–11, 28
__init__.py	8	2	75%	11–12
src/AEPi/image
AEI.py	241	27	89%	121, 181, 185, 198, 225, 288, 294–297, 302, 326, 333, 341–342, 347–351, 382, 396–397, 436–437, 444–445, 488–489
texture.py	19	2	89%	29, 49
src/AEPi/lib
binaryio.py	24	1	96%	64
imageOps.py	9	2	78%	13–14
src/tests/image
test_AEI.py	199	1	99%	29
TOTAL	843	75	91%