Commit 8c752d54 authored by Richard Torenvliet's avatar Richard Torenvliet

refactoring some namings

parent be4ae8da
...@@ -183,13 +183,13 @@ def sample_from_triangles(src, points2d_src, points2d_dst, triangles, dst): ...@@ -183,13 +183,13 @@ def sample_from_triangles(src, points2d_src, points2d_dst, triangles, dst):
) )
def build_texture_feature_vectors(files, get_image_with_points, MeanPoints, triangles): def build_texture_feature_vectors(files, get_image_with_points, mean_points, triangles):
""" """
Args: Args:
files (list): list files files (list): list files
flattened (bool): Flatten the inner feature vectors, see flattened (bool): Flatten the inner feature vectors, see
flatten_feature_vectors. flatten_feature_vectors.
MeanPoints(AAMPoints): AAMPoints object mean_points(AAMPoints): AAMPoints object
Returns: Returns:
list: list of feature vectors list: list of feature vectors
...@@ -197,9 +197,9 @@ def build_texture_feature_vectors(files, get_image_with_points, MeanPoints, tria ...@@ -197,9 +197,9 @@ def build_texture_feature_vectors(files, get_image_with_points, MeanPoints, tria
mean_texture = [] mean_texture = []
image, points = get_image_with_points(files[0]) image, points = get_image_with_points(files[0])
MeanPoints.get_scaled_points(image.shape) mean_points.get_scaled_points(image.shape)
x, y, w_slice, h_slice = MeanPoints.get_bounding_box() x, y, w_slice, h_slice = mean_points.get_bounding_box()
for i, f in enumerate(files): for i, f in enumerate(files):
image, points = get_image_with_points(f) image, points = get_image_with_points(f)
...@@ -215,7 +215,7 @@ def build_texture_feature_vectors(files, get_image_with_points, MeanPoints, tria ...@@ -215,7 +215,7 @@ def build_texture_feature_vectors(files, get_image_with_points, MeanPoints, tria
sample_from_triangles( sample_from_triangles(
image, image,
Points.get_scaled_points(image.shape), Points.get_scaled_points(image.shape),
MeanPoints.get_scaled_points(image.shape), mean_points.get_scaled_points(image.shape),
triangles, triangles,
dst dst
) )
......
...@@ -97,20 +97,8 @@ def save_pca_model_texture(args): ...@@ -97,20 +97,8 @@ def save_pca_model_texture(args):
assert args.model_texture_file, '--model_texture_file needs to be provided to save the pca model' assert args.model_texture_file, '--model_texture_file needs to be provided to save the pca model'
shape_model = pca.PcaModel(args.model_shape_file) shape_model = pca.PcaModel(args.model_shape_file)
mean_points = imm.IMMPoints(points_list=shape_model.mean_values) mean_points = imm.IMMPoints(points_list=shape_model.mean_values)
#reconstruction.reconstruct_texture(
# input_image, # src image
# input_image, # dst image
# texture_model,
# input_points, # shape points input
# mean_points, # shape points mean
#)
# old
#Vt, s, n_components, mean_shape, triangles = pca.load(args.model_shape_file)
textures = aam.build_texture_feature_vectors( textures = aam.build_texture_feature_vectors(
args.files, args.files,
imm.get_imm_image_with_landmarks, imm.get_imm_image_with_landmarks,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment