diff --git a/src/DDS/DDSDefinitions.py b/src/DDS/DDSDefinitions.py index 39d86b9..2b61103 100644 --- a/src/DDS/DDSDefinitions.py +++ b/src/DDS/DDSDefinitions.py @@ -463,10 +463,10 @@ def buildConverter(byteCount, usedBitCounts = {8}, bitmasks = None, intmasks = N bIntMask = unpackCombiner(*struct.unpack("<" + unpackFormat, bitmasks["b"][:byteCount])) if "a" in bitmasks: aIntMask = unpackCombiner(*struct.unpack("<" + unpackFormat, bitmasks["a"][:byteCount])) - if "l" in bitmasks: - rIntMask = unpackCombiner(*struct.unpack("<" + unpackFormat, bitmasks["l"][:byteCount])) - gIntMask = unpackCombiner(*struct.unpack("<" + unpackFormat, bitmasks["l"][:byteCount])) - bIntMask = unpackCombiner(*struct.unpack("<" + unpackFormat, bitmasks["l"][:byteCount])) + if "luminance" in bitmasks: + rIntMask = unpackCombiner(*struct.unpack("<" + unpackFormat, bitmasks["luminance"][:byteCount])) + gIntMask = unpackCombiner(*struct.unpack("<" + unpackFormat, bitmasks["luminance"][:byteCount])) + bIntMask = unpackCombiner(*struct.unpack("<" + unpackFormat, bitmasks["luminance"][:byteCount])) rDivisor = 2 ** bin(rIntMask).count("1") - 1 gDivisor = 2 ** bin(gIntMask).count("1") - 1 @@ -573,9 +573,9 @@ def getGLFormat(pixelFormat, dxt10Header = None): starts["a"] = firstBit(aBitmask) namedBitmasks["a"] = aBitmask if lumBitmask: - bitCounts["l"] = bitCount(lumBitmask) - starts["l"] = firstBit(lumBitmask) - namedBitmasks["l"] = lumBitmask + bitCounts["luminance"] = bitCount(lumBitmask) + starts["luminancel"] = firstBit(lumBitmask) + namedBitmasks["luminance"] = lumBitmask toSort = [] for key in starts: @@ -676,4 +676,4 @@ def sizeFromFormat(dxgiFormat, width, height): currentNum = "" pixelSize = (count + 7) // 8 return width * height * pixelSize - pass \ No newline at end of file + pass