banis - wrap the rot range

OpenNaja · Sep 26, 2023 · a1130dc · a1130dc
1 parent c0095ae
commit a1130dc
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/generated/formats/bani/__init__.py b/generated/formats/bani/__init__.py
@@ -6,6 +6,9 @@
 import math
 import numpy as np
 
+# +-
+rot_range = 180
+
 
 def export_key(key):
 	# this seems to be a modulo equivalent
@@ -56,7 +59,7 @@ def load(self, filepath):
 			stream.readinto(keys_packed)
 			keys_float = keys_packed.astype(self.dt_float)
 			print(keys_packed[0, :, ])
-			keys_float["euler"] = keys_float["euler"] / 32767.0 * 180
+			keys_float["euler"] = keys_float["euler"] / 32767.0 * rot_range
 			# keys_float["euler"] = keys_float["euler"] / 32768.0 * 180 + 90.0
 			keys_float["euler"][:, :, 0] += 90.0
 			keys_float["euler"][:, :, 1] += 90.0
@@ -101,7 +104,10 @@ def save(self, filepath):
 		keys_float["euler"][:, :, 0] -= 90.0
 		keys_float["euler"][:, :, 1] -= 90.0
 		keys_float["euler"][:, :, 2] += 90.0
-		keys_float["euler"] = keys_float["euler"] * 32767.0 / 180
+		# wrap if they exceed the valid range
+		keys_float["euler"][keys_float["euler"] > rot_range] -= rot_range
+		keys_float["euler"][keys_float["euler"] < -rot_range] += rot_range
+		keys_float["euler"] = keys_float["euler"] * 32767.0 / rot_range
 		# round parts separately
 		keys_float["euler"].round(out=keys_float["euler"])
 		keys_float["loc"].round(out=keys_float["loc"])

diff --git a/plugin/export_banis.py b/plugin/export_banis.py
@@ -101,8 +101,8 @@ def save(filepath=""):
 				key = corrector.blender_bind_to_nif_bind(posed_armature_space[bone_i])
 				# this maybe adds the loc transforms, doesn't seem to correctly transform rot ??
 				# key = binds[bone_i].inverted() @ key
-				# key = key @ binds[bone_i].inverted()
-				key.translation -= binds[bone_i].translation
+				key = key @ binds[bone_i].inverted()
+				# key.translation += binds[bone_i].translation
 				frame["loc"][bone_i] = key.translation
 				frame["euler"][bone_i] = [math.degrees(v) for v in key.to_euler()]
 

diff --git a/source/formats/bani/__init__.py b/source/formats/bani/__init__.py
@@ -5,6 +5,9 @@
 import math
 import numpy as np
 
+# +-
+rot_range = 180
+
 
 def export_key(key):
 	# this seems to be a modulo equivalent
@@ -55,7 +58,7 @@ def load(self, filepath):
 			stream.readinto(keys_packed)
 			keys_float = keys_packed.astype(self.dt_float)
 			print(keys_packed[0, :, ])
-			keys_float["euler"] = keys_float["euler"] / 32767.0 * 180
+			keys_float["euler"] = keys_float["euler"] / 32767.0 * rot_range
 			# keys_float["euler"] = keys_float["euler"] / 32768.0 * 180 + 90.0
 			keys_float["euler"][:, :, 0] += 90.0
 			keys_float["euler"][:, :, 1] += 90.0
@@ -100,7 +103,10 @@ def save(self, filepath):
 		keys_float["euler"][:, :, 0] -= 90.0
 		keys_float["euler"][:, :, 1] -= 90.0
 		keys_float["euler"][:, :, 2] += 90.0
-		keys_float["euler"] = keys_float["euler"] * 32767.0 / 180
+		# wrap if they exceed the valid range
+		keys_float["euler"][keys_float["euler"] > rot_range] -= rot_range
+		keys_float["euler"][keys_float["euler"] < -rot_range] += rot_range
+		keys_float["euler"] = keys_float["euler"] * 32767.0 / rot_range
 		# round parts separately
 		keys_float["euler"].round(out=keys_float["euler"])
 		keys_float["loc"].round(out=keys_float["loc"])

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-a2570101b - Sun Sep 24 23:15:47 2023 +0200
+c0095aed9 - Mon Sep 25 18:50:21 2023 +0200
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		a2570101b - Sun Sep 24 23:15:47 2023 +0200
		c0095aed9 - Mon Sep 25 18:50:21 2023 +0200