Test angles before

This commit is contained in:
Arkadiy Strelnikov
2021-12-12 20:09:02 +07:00
parent a28855b99e
commit 7cc5954609
4 changed files with 34 additions and 14 deletions

View File

@@ -45,7 +45,7 @@ def getAngle(avec0, avec1, bvec0, bvec1):
znam2 = float(np.sqrt(pow(bvec0, 2) + pow(bvec1, 2)))
if (znam1*znam2) == 0:
return None
return np.arccos(chis / (znam1 * znam2))
return np.arccos(chis / (znam1 * znam2)) * 180. / np.pi
def checkRot(tvec0, tvec1, tvec0_apose, tvec1_apose, rvec_apose):
# tvec0 - parent bone by root
@@ -490,7 +490,7 @@ def updateValueAPoseWorld(data, dataxyz, parent_name, current_name):
data[current_name]["rotation"]["rotx"] = rvec[0]
data[current_name]["rotation"]["roty"] = rvec[1]
data[current_name]["rotation"]["rotz"] = rvec[2]
data[current_name]["visible"] = dataxyz[current_name]
data[current_name]["visible"] = dataxyz[current_name][3]
def bodyconvertwithrot(poseslms, data, coef, maxy):
dataxyz = {}
@@ -667,12 +667,12 @@ def bodyconvertwithrot(poseslms, data, coef, maxy):
updateValueAPoseWorld(data, dataxyz, "clavicle_l", "shoulder_l")
updateValueAPoseWorld(data, dataxyz, "spine_05", "clavicle_r")
updateValueAPoseWorld(data, dataxyz, "spine_05", "clavicle_l")
updateValueAPoseWorld(data, dataxyz, "head", "clavicle_l")
updateValueAPoseWorld(data, dataxyz, "spine_05", "head")
updateValueAPoseWorld(data, dataxyz, "spine_04", "spine_05")
updateValueAPoseWorld(data, dataxyz, "spine_02", "spine_04")
updateValueAPoseWorld(data, dataxyz, "pelvis", "spine_02")
updateValueAPoseWorld(data, dataxyz, "ankle_l", "ball_l")
updateValueAPoseWorld(data, dataxyz, "ball_r", "ankle_r")
updateValueAPoseWorld(data, dataxyz, "ankle_r", "ball_r")
updateValueAPoseWorld(data, dataxyz, "ankle_l", "heel_l")
updateValueAPoseWorld(data, dataxyz, "ankle_r", "heel_r")
updateValueAPoseWorld(data, dataxyz, "knee_l", "ankle_l")
@@ -877,6 +877,12 @@ def bonetranslation(data, bone_name, tvec):
def rhandconverttranslation(data):
tvec = [data["hand_r"]["translation"]["x"], data["hand_r"]["translation"]["y"], data["hand_r"]["translation"]["z"]]
data_apose = {}
bodyaposeworld(data_apose)
tvec_pose = [data_apose["hand_r"]["translation"]["x"], data_apose["hand_r"]["translation"]["y"], data_apose["hand_r"]["translation"]["z"]]
tvec[0] = tvec[0] - tvec_pose[0]
tvec[1] = tvec[1] - tvec_pose[1]
tvec[2] = tvec[2] - tvec_pose[2]
bonetranslation(data, "pinky_4_r", tvec)
bonetranslation(data, "pinky_3_r", tvec)
@@ -897,6 +903,12 @@ def rhandconverttranslation(data):
def lhandconverttranslation(data):
tvec = [data["hand_l"]["translation"]["x"], data["hand_l"]["translation"]["y"], data["hand_l"]["translation"]["z"]]
data_apose = {}
bodyaposeworld(data_apose)
tvec_pose = [data_apose["hand_l"]["translation"]["x"], data_apose["hand_l"]["translation"]["y"], data_apose["hand_l"]["translation"]["z"]]
tvec[0] = tvec[0] - tvec_pose[0]
tvec[1] = tvec[1] - tvec_pose[1]
tvec[2] = tvec[2] - tvec_pose[2]
bonetranslation(data, "pinky_4_l", tvec)
bonetranslation(data, "pinky_3_l", tvec)