Updated to v0.5.1.

Author: joemarch01

NiLBS/pose/util.py

@@ -83,7 +83,7 @@ def calculate_bone_matrices_smplh(rotation_matrices, joints, bone_hierarchy):
     return None
 
 
-def pose_from_smplh(vertex_template, full_pose, bone_hierarchy, j_regressor):
+def pose_from_smplh(vertex_template, full_pose, bone_hierarchy, joints):
     """
 
     Produces a pose from the SMPLH configuration provided.
@@ -95,7 +95,7 @@ def pose_from_smplh(vertex_template, full_pose, bone_hierarchy, j_regressor):
     :return: Fully configured Pose which ban be used on any mesh with the same vertex template.
     """
 
-    joints = calculate_joints(vertex_template, j_regressor)
+    #joints = calculate_joints(vertex_template, j_regressor)
     rotation_matrices = rodrigues(full_pose)
     bone_matrices = calculate_bone_matrices_smplh(rotation_matrices, joints, bone_hierarchy)
     result = Pose(bone_matrices)

NiLBS/sampling/pose_sampler_amass.py

@@ -1,7 +1,6 @@
 
 import numpy as np
 
-from human_body_prior.tools.omni_tools import copy2cpu as c2c
 from NiLBS.pose.util import pose_from_smplh
 
 class PoseSamplerAMASS:
@@ -16,12 +15,13 @@ class PoseSamplerAMASS:
     def __init__(self, body_model, bdata):
         """
 
-        :param body_model: human_body_prior.BodyModel
+        :param body_model: HumanBody
         :param bdata: .npz file, must contain the following attributes: 'poses'
         """
-        self.v_template = c2c(body_model.v_template)[0]
-        self.bone_hierachy = c2c(body_model.kintree_table)
-        self.j_regressor = body_model.J_regressor
+        self.v_template = body_model.vertex_template
+        self.bone_hierachy = body_model.bone_hierarchy
+        #self.j_regressor = body_model.J_regressor
+        self.joints = body_model.joints
         self.bdata = bdata
 
     def sample_frames(self, n_frames=-1, step=1, offset=0):
@@ -46,7 +46,7 @@ def sample_frames(self, n_frames=-1, step=1, offset=0):
             pose_hand = self.bdata['poses'][i:i + 1, 66:]
 
             full_pose = np.concatenate((root_orient, pose_body), axis=1).transpose()
-            pose = pose_from_smplh(self.v_template, full_pose, self.bone_hierachy, self.j_regressor)
+            pose = pose_from_smplh(self.v_template, full_pose, self.bone_hierachy, self.joints)
 
             poses.append(pose)
 

setup.py

@@ -2,7 +2,7 @@
 
 setup(
    name='NiLBS',
-   version='0.5',
+   version='0.5.1',
    description='NiLBS 3D implementation.',
    author='Joe March',
    author_email='jgm45@cam.ac.uk',