From 6ed590b920f8bc19c30d0cbe11cd95ce6606e10d Mon Sep 17 00:00:00 2001
From: Benjamin Collins <kion@dashgl.com>
Date: Sun, 23 Aug 2020 08:33:50 +0900
Subject: [PATCH] missing triangles

---
 NinjaModel.py | 31 +++++++++++++++++++++++++------
 missing.txt   | 28 ++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 6 deletions(-)
 create mode 100644 missing.txt

diff --git a/NinjaModel.py b/NinjaModel.py
index bb1debe..59a1884 100644
--- a/NinjaModel.py
+++ b/NinjaModel.py
@@ -40,6 +40,7 @@ class NinjaModel:
 	def __init__(self, model_name, tex_name = ''):
 		
 		self.debug = True
+		self.hasMesh = []
 
 		# File Information
 		self.model_name = model_name
@@ -102,6 +103,7 @@ class NinjaModel:
 				self.readNmdm()
 				self.file.seek(pos, 0)
 		
+		print(self.hasMesh)
 		self.file.close()
 		return None
 
@@ -170,10 +172,12 @@ class NinjaModel:
 			parentBone.add(self.bone)
 
 		if model_ofs:
+			self.hasMesh.append(self.bone.index)
 			if self.debug:
 				print("Reading Mesh @ 0x%08x" % self.file.tell())
 			self.file.seek(model_ofs + self.pof, 0)
-			self.readModel()
+			if self.bone.index in [ 22, 23, 25]:
+				self.readModel()
 
 		if child_ofs:
 			self.file.seek(child_ofs + self.pof, 0)
@@ -269,8 +273,13 @@ class NinjaModel:
 			if chunk_head == 255:
 				if self.debug:
 					print("End Chunk Found")
-				break
-			elif chunk_head == 0 or chunk_head == 9:
+				break 
+			elif chunk_head == 9:
+				if self.debug:
+					print("Null Chunk Found")
+				print("Invalid header found @ 0x%08x" % self.file.tell())
+				sys.exit()
+			elif chunk_head == 0:
 				if self.debug:
 					print("Null Chunk Found")
 				continue
@@ -349,10 +358,14 @@ class NinjaModel:
 				if self.debug:
 					print("Strip Chunk Found @ 0x%08x" % self.file.tell())
 
-				bytes = self.file.read(4)
-				h = struct.unpack('HH', bytes)
+				bytes = self.file.read(2)
+				h = struct.unpack('H', bytes)
 				chunk_len = h[0] * 2
-				chunk_body = h[1]
+				snap_to = self.file.tell() + chunk_len
+
+				bytes = self.file.read(2)
+				h = struct.unpack('H', bytes)
+				chunk_body = h[0]
 
 				if self.debug:
 					print("Strip Length (bytes): 0x%04x" % chunk_len)
@@ -389,6 +402,10 @@ class NinjaModel:
 
 					bytes = self.file.read(2)
 					strip_len = struct.unpack('h', bytes)[0]
+
+					if self.debug:
+						print("String length: %d" % strip_len)
+
 					clockwise = strip_len < 0
 					strip_len = abs(strip_len)
 					strip = []
@@ -454,8 +471,10 @@ class NinjaModel:
 
 				# }
 				
+				self.file.seek(snap_to, 0)
 				print("Actual End: 0x%08x" % self.file.tell())
 				self.strip_count = self.strip_count + 1
+
 			else:
 				print("Unknown File Position: 0x%08x" % self.file.tell())
 
diff --git a/missing.txt b/missing.txt
new file mode 100644
index 0000000..fb22514
--- /dev/null
+++ b/missing.txt
@@ -0,0 +1,28 @@
+EVIL Missing Strips
+
+[x] 0 
+[x] 1 
+[x] 3 
+[x] 4 
+[ ] 6 
+[ ] 7 
+[ ] 8
+[ ] 10 
+[ ] 11 
+[ ] 12 
+[ ] 14 
+[ ] 15 
+[ ] 17 
+[ ] 18 
+[ ] 20 
+[ ] 21 
+[ ] 22 
+[ ] 23 
+[ ] 25 
+[ ] 27 
+[ ] 29 
+[ ] 30 
+[ ] 31 
+[ ] 33 
+[ ] 35 
+[ ] 37