small vq

NinjaTexture.py

@@ -252,16 +252,30 @@ class NinjaTexture: # {
 
 		if self.isCompressed:
 			print("Reading codebook")
-			cb_len = 2 * 4 * self.codebook_size
-			self.codebook = self.file.read(cb_len)
+			self.codebook = []
+			for i in range(self.codebook_size):
+				bytes = self.file.read(8)
+				color = struct.unpack('HHHH', bytes)
+				entry = []
+				for p in range(4):
+					if self.color_format == 0:
+						rgba = self.ARGB_1555(color[p])
+					elif self.color_format == 1:
+						rgba = self.RGB_565(color[p])
+					elif self.color_format == 2:
+						rgba = self.ARGB_4444(color[p])
+					entry.append(rgba)
+				self.codebook.append(entry)
+			print(self.codebook)
 
 		if self.isMipmap:
 			print("Seeking passed mipmaps")
 			seek_ofs = self.get_mipmap_size()
 			self.file.read(seek_ofs)
 
+		self.startOfs = self.file.tell()
+
 		if self.isTwiddled:
-			self.startOfs = self.file.tell()
 			for y in range(self.height):
 				for x in range(self.width):
 					i = self.untwiddle(x, y)
@@ -278,7 +292,15 @@ class NinjaTexture: # {
 					self.bitmap[y][x*4 + 1] = rgba[1]
 					self.bitmap[y][x*4 + 2] = rgba[2]
 					self.bitmap[y][x*4 + 3] = rgba[3]
-			return self.bitmap
+		elif self.isCompressed:
+			for y in range(self.height / 2):
+				for x in range(self.width / 2):
+					i = self.untwiddle(x, y)
+					self.file.seek(self.startOfs + i , 0)
+					b = self.file.read(1)
+					index = struct.unpack('B', b)[0]
+
+		return self.bitmap
 
 	def get_mipmap_size(self):
 		mipCount = 0