From 8364b19892331d0a85299bd65e296c297181b2f2 Mon Sep 17 00:00:00 2001
From: Benjamin Collins <kion@dashgl.com>
Date: Sat, 22 Aug 2020 07:44:36 +0900
Subject: [PATCH] batch

---
 NinjaModel.py |  2 +-
 PowerVR.py    | 37 +++++++++++++++++-------
 __init__.py   | 80 ++++++++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 101 insertions(+), 18 deletions(-)

diff --git a/NinjaModel.py b/NinjaModel.py
index 9f3aa58..533452e 100644
--- a/NinjaModel.py
+++ b/NinjaModel.py
@@ -36,7 +36,7 @@ from NinjaMotion import NinjaMotion
 
 class NinjaModel:
 
-	def __init__(self, model_name, tex_name):
+	def __init__(self, model_name, tex_name = ''):
 
 		# File Information
 		self.model_name = model_name
diff --git a/PowerVR.py b/PowerVR.py
index f15355b..719105c 100644
--- a/PowerVR.py
+++ b/PowerVR.py
@@ -67,9 +67,11 @@ class PowerVR: # {
 	def __init__(self, filename): # {
 
 		# File Information
+
+		base = os.path.basename(filename)
+		self.name = os.path.splitext(base)[0]
+		print(self.name)
 		self.path = 'input/' + filename
-		self.file = open(self.path, 'rb')
-		self.length = os.path.getsize(self.path)
 
 		# Textures
 		self.tex_list = []
@@ -78,15 +80,31 @@ class PowerVR: # {
 		return None
 
 	def parse(self):
-		bytes = self.file.read(4)
 
-		if bytes == b'PVMH':
-			self.readPvm()
-		elif bytes == b'PVRT':
+		self.file = open(self.path, 'rb')
+		self.length = os.path.getsize(self.path)
+		
+		while self.file.tell() < self.length:
+
 			bytes = self.file.read(4)
-			p = struct.unpack('I', bytes)
-			pvrt_len = p[0]
-			self.readPvr()
+
+			if bytes == b'PVMH':
+				self.readPvm()
+				break
+			elif bytes == b'PVRT':
+				print("-- READ PVRT--")
+				bytes = self.file.read(4)
+				p = struct.unpack('I', bytes)
+				pvrt_len = p[0]
+				tex = NinjaTexture()
+				tex.setIndex(0)
+				tex.setName(self.name)
+				raw = self.readPvr()
+				tex.setRaw(raw)
+				tex.setWidth(self.width)
+				tex.setHeight(self.height)
+				self.tex_list.append(tex)
+				break
 		
 		for tex in self.tex_list:
 			if not tex.raw:
@@ -119,7 +137,6 @@ class PowerVR: # {
 		flags = p[0]
 		tex_count = p[1]
 		
-		self.tex_list = []
 		for i in range(tex_count):
 			bytes = self.file.read(2)
 			p = struct.unpack('H', bytes)
diff --git a/__init__.py b/__init__.py
index ec70412..4367f3b 100644
--- a/__init__.py
+++ b/__init__.py
@@ -25,16 +25,82 @@
 
 from NinjaModel import NinjaModel
 
+########################################################
+##              MODELS (MISC)                         ## 
+########################################################
+
+model_file = 'MISC/BUTTON01.NJ'
+texture_file = 'MISC/BUTTON01.PVR'
+nj = NinjaModel(model_file, texture_file)
+nj.parse()
+nj.export()
+
+model_file = 'MISC/BUTTON02.NJ'
+texture_file = 'MISC/BUTTON01.PVR'
+nj = NinjaModel(model_file, texture_file)
+nj.parse()
+nj.export()
+
+model_file = 'MISC/CLOUD01.NJ'
+texture_file = 'MISC/CLOUD01.PVM'
+nj = NinjaModel(model_file, texture_file)
+nj.parse()
+nj.export()
+
+model_file = 'MISC/DEMO1.NJ'
+texture_file = 'MISC/DEMO1.PVM'
+nj = NinjaModel(model_file, texture_file)
+nj.parse()
+nj.export()
+
+model_file = 'MISC/END000A_20SKY.NJ'
+texture_file = 'MISC/END000A_20SKY.PVM'
+nj = NinjaModel(model_file, texture_file)
+nj.parse()
+nj.export()
+
+model_file = 'MISC/END000A_BIRDS.NJ'
+texture_file = 'MISC/END000A_BIRDS.PVM'
+nj = NinjaModel(model_file, texture_file)
+nj.parse()
+nj.export()
+
+model_file = 'MISC/KIRI.NJ'
+texture_file = 'MISC/KIRI.PVM'
+nj = NinjaModel(model_file, texture_file)
+nj.parse()
+nj.export()
+
+model_file = 'MISC/KUMO01_KUMO01_1.NJ'
+nj = NinjaModel(model_file)
+nj.parse()
+nj.export()
+
+model_file = 'MISC/KUMO01_KUMO02_1.NJ'
+nj = NinjaModel(model_file)
+nj.parse()
+nj.export()
+
+model_file = 'MISC/LEVEL01.NJ'
+nj = NinjaModel(model_file)
+nj.parse()
+nj.export()
+
+model_file = 'MISC/LEVEL02.NJ'
+nj = NinjaModel(model_file)
+nj.parse()
+nj.export()
+
+########################################################
+##              MODELS (OBJ)                          ## 
+########################################################
+
 model_file = 'OBJ/IKAL.NJ'
 texture_file = 'OBJ/IKAL.PVM'
 nj = NinjaModel(model_file, texture_file)
 nj.parse()
 nj.export()
 
-"""
-model_file = 'MISC/BUTTON01.NJ'
-texture_file = 'MISC/BUTTON01.PVR'
-nj = NinjaModel(model_file, texture_file)
-nj.parse()
-nj.export()
-"""
+########################################################
+##              MODELS (END)                          ## 
+########################################################