diff --git a/__init__.py b/__init__.py index 806206a..fa9e9ae 100644 --- a/__init__.py +++ b/__init__.py @@ -1,5 +1,6 @@ from PIL import Image from quicktex.s3tc.bc1 import BC1Block +from quicktex.s3tc.bc4 import BC4Block from quicktex import RawTexture import os.path @@ -9,7 +10,7 @@ image_path = os.path.dirname(os.path.realpath(__file__)) class BC1Blocks: class Entry: def __init__(self, filename, block): - path = os.path.join(image_path, 'blocks', filename) + path = os.path.join(image_path, 'bc1', filename) self.image = Image.open(path).convert('RGBA') self.texture = RawTexture.frombytes(self.image.tobytes('raw', 'RGBA'), *self.image.size) self.block = block @@ -17,3 +18,16 @@ class BC1Blocks: greyscale = Entry('greyscale_unpacked.png', BC1Block.frombytes(b'\xFF\xFF\x49\x4A\x78\x78\x78\x78')) three_color = Entry('3color_unpacked.png', BC1Block.frombytes(b'\xE0\x07\x00\xF8\x29\x29\x29\x29')) three_color_black = Entry('3color_black_unpacked.png', BC1Block.frombytes(b'\xE0\x07\x00\xF8\x27\x27\x27\x27')) + + +class BC4Blocks: + class Entry: + def __init__(self, filename, block): + path = os.path.join(image_path, 'bc4', filename) + self.image = Image.open(path).convert('RGBA') + self.texture = RawTexture.frombytes(self.image.tobytes('raw', 'RGBA'), *self.image.size) + self.block = block + + six_value = Entry('6value.png', BC4Block(8, 248, [[0, 1, 2, 3]] * 2 + [[4, 5, 6, 7]] * 2)) + eight_value = Entry('8value.png', BC4Block(240, 16, [[0, 1, 2, 3]] * 2 + [[4, 5, 6, 7]] * 2)) + diff --git a/blocks/3color.dds b/bc1/3color.dds similarity index 100% rename from blocks/3color.dds rename to bc1/3color.dds diff --git a/blocks/3color.png b/bc1/3color.png similarity index 100% rename from blocks/3color.png rename to bc1/3color.png diff --git a/blocks/3color_black.dds b/bc1/3color_black.dds similarity index 100% rename from blocks/3color_black.dds rename to bc1/3color_black.dds diff --git a/blocks/3color_black.png b/bc1/3color_black.png similarity index 100% rename from blocks/3color_black.png rename to bc1/3color_black.png diff --git a/blocks/3color_black_unpacked.png b/bc1/3color_black_unpacked.png similarity index 100% rename from blocks/3color_black_unpacked.png rename to bc1/3color_black_unpacked.png diff --git a/blocks/3color_unpacked.png b/bc1/3color_unpacked.png similarity index 100% rename from blocks/3color_unpacked.png rename to bc1/3color_unpacked.png diff --git a/blocks/greyscale.dds b/bc1/greyscale.dds similarity index 100% rename from blocks/greyscale.dds rename to bc1/greyscale.dds diff --git a/blocks/greyscale.png b/bc1/greyscale.png similarity index 100% rename from blocks/greyscale.png rename to bc1/greyscale.png diff --git a/blocks/greyscale_unpacked.png b/bc1/greyscale_unpacked.png similarity index 100% rename from blocks/greyscale_unpacked.png rename to bc1/greyscale_unpacked.png diff --git a/bc4/6value.dds b/bc4/6value.dds new file mode 100644 index 0000000..c6ecd81 --- /dev/null +++ b/bc4/6value.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8a6f4c31ac9bf32d7650b39d6b77a6e6c32f7e78bab73f97109cc43fe6e75d1 +size 136 diff --git a/bc4/6value.png b/bc4/6value.png new file mode 100644 index 0000000..cde4ab3 --- /dev/null +++ b/bc4/6value.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1baf03516c65f146b0d2abedf7e40efa6a1c93d6632599d6582bdce6b461211 +size 513 diff --git a/bc4/8value.dds b/bc4/8value.dds new file mode 100644 index 0000000..d624b1b --- /dev/null +++ b/bc4/8value.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0578d62e5876686d734d2e3b443bf8d106f249f0f0b5247dbb8002a5044fe29d +size 136 diff --git a/bc4/8value.png b/bc4/8value.png new file mode 100644 index 0000000..ea5d5cb --- /dev/null +++ b/bc4/8value.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7bb5a0a6761110ac6373e5942d995d1758519aff54a598e9dff80c95bf10e22 +size 509 diff --git a/blocks/blocks.afdesign b/blocks.afdesign similarity index 100% rename from blocks/blocks.afdesign rename to blocks.afdesign