From 08b6b755cc151930aaaa5150fe82893294d8bf6e Mon Sep 17 00:00:00 2001
From: Benjamin Collins <kion@dashgl.com>
Date: Mon, 24 Aug 2020 00:18:21 +0900
Subject: [PATCH] quaternion

---
 NinjaModel.py  |  8 ++------
 NinjaMotion.py | 16 +++++++++++++---
 PowerVR.py     |  3 +--
 __init__.py    | 35 ++++++++++++++++++++++++++++++-----
 4 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/NinjaModel.py b/NinjaModel.py
index 040b1c5..f197f6e 100644
--- a/NinjaModel.py
+++ b/NinjaModel.py
@@ -100,7 +100,7 @@ class NinjaModel:
 				length = struct.unpack('I', bytes)[0]
 				pos = self.file.tell() + length
 				self.pof = self.file.tell()
-				#self.readNmdm()
+				self.readNmdm()
 				self.file.seek(pos, 0)
 		
 		print(self.hasMesh)
@@ -439,11 +439,7 @@ class NinjaModel:
 							'uv' : { 'u' : u, 'v' : v }
 						})
 
-					# }
-					
-					print(strip)
-
-					for k in range(len(strip) - 2): #{
+					for k in range(len(strip) - 2):
 						
 						if ((clockwise and not (k % 2)) or ( not clockwise and k % 2)):
 							a = strip[k + 2]
diff --git a/NinjaMotion.py b/NinjaMotion.py
index 0acfbe0..5e5782e 100644
--- a/NinjaMotion.py
+++ b/NinjaMotion.py
@@ -112,9 +112,19 @@ class NinjaMotion:
 			if 'rot' not in keyFrame.keys():
 				continue
 
-			mat4 = Mat4()
-			mat4.rotate(keyFrame['rot'])
-			keyFrame['quat'] = mat4.toQuat()
+			c1 = math.cos( keyFrame['rot'][0] / 2 );
+			c2 = math.cos( keyFrame['rot'][1] / 2 );
+			c3 = math.cos( keyFrame['rot'][2] / 2 );
+
+			s1 = math.sin( keyFrame['rot'][0] / 2 );
+			s2 = math.sin( keyFrame['rot'][1] / 2 );
+			s3 = math.sin( keyFrame['rot'][2] / 2 );
+
+			x = s1 * c2 * c3 + c1 * s2 * s3
+			y = c1 * s2 * c3 - s1 * c2 * s3
+			z = c1 * c2 * s3 + s1 * s2 * c3
+			w = c1 * c2 * c3 - s1 * s2 * s3
+			keyFrame['quat'] = [ x, y, z, w ]
 
 		return None
 	
diff --git a/PowerVR.py b/PowerVR.py
index 2d31c04..99ddbb1 100644
--- a/PowerVR.py
+++ b/PowerVR.py
@@ -120,9 +120,8 @@ class PowerVR: # {
 			data = f.read()
 			f.close()
 			tex.setData(data)
-			#os.remove(imgName)
+			os.remove(imgName)
 
-		
 		self.file.close()
 		return self.tex_list
 
diff --git a/__init__.py b/__init__.py
index 764aa7a..21c33f3 100644
--- a/__init__.py
+++ b/__init__.py
@@ -97,7 +97,6 @@ nj.export()
 ##              MODELS (OBJ)                          ## 
 ########################################################
 
-"""
 model_file = 'OBJ/COCK_GPOT.NJ'
 texture_file = 'OBJ/COCK_GPOT.PVM'
 nj = NinjaModel(model_file, texture_file)
@@ -121,22 +120,48 @@ texture_file = 'OBJ/COCK.PVM'
 nj = NinjaModel(model_file, texture_file)
 nj.parse()
 nj.export()
-"""
 
 model_file = 'OBJ/EVIL.NJ'
 texture_file = 'OBJ/EVIL.PVM'
 nj = NinjaModel(model_file, texture_file)
 nj.parse()
 nj.export()
-nj.exportObj()
 
-"""
+model_file = 'OBJ/FISH.NJ'
+texture_file = 'OBJ/FISH.PVM'
+nj = NinjaModel(model_file, texture_file)
+nj.parse()
+nj.export()
+
+model_file = 'OBJ/GUN_JUNK.NJ'
+texture_file = 'OBJ/GUN_JUNK.PVM'
+nj = NinjaModel(model_file, texture_file)
+nj.parse()
+nj.export()
+
+model_file = 'OBJ/GUN.NJ'
+texture_file = 'OBJ/GUN.PVM'
+nj = NinjaModel(model_file, texture_file)
+nj.parse()
+nj.export()
+
+model_file = 'OBJ/HATO_GPOT.NJ'
+texture_file = 'OBJ/HATO_GPOT.PVM'
+nj = NinjaModel(model_file, texture_file)
+nj.parse()
+nj.export()
+
+model_file = 'OBJ/HATO.NJ'
+texture_file = 'OBJ/HATO.PVM'
+nj = NinjaModel(model_file, texture_file)
+nj.parse()
+nj.export()
+
 model_file = 'OBJ/IKAL.NJ'
 texture_file = 'OBJ/IKAL.PVM'
 nj = NinjaModel(model_file, texture_file)
 nj.parse()
 nj.export()
-"""
 
 
 ########################################################