diff --git a/code/matlab/GetOptimizedObj.m b/code/matlab/GetOptimizedObj.m index 31b3ada..aecb5ea 100644 --- a/code/matlab/GetOptimizedObj.m +++ b/code/matlab/GetOptimizedObj.m @@ -88,7 +88,7 @@ function GetOptimizedObj(recon_inter_random_dir, type, recon_inter_random, use_s if ispc [part_pc, part_face] = cotlp(obj_filename); else - [part_pc, part_face] = readObj(obj_filename); + [part_pc, part_face] = readOBJ(obj_filename); part_face = part_face'; end part_pcs{j} = part_pc; diff --git a/code/matlab/ReconstructFromCodeMixIntegerReadingObjinAdvance.m b/code/matlab/ReconstructFromCodeMixIntegerReadingObjinAdvance.m index 6c6b50b..6377364 100644 --- a/code/matlab/ReconstructFromCodeMixIntegerReadingObjinAdvance.m +++ b/code/matlab/ReconstructFromCodeMixIntegerReadingObjinAdvance.m @@ -1,17 +1,15 @@ function [total_pc, total_face, total_optimized_pc, total_optimized_face] = ReconstructFromCodeMixIntegerReadingObjinAdvance(code, part_pcs, part_faces, type) if strcmp(type, 'chair') == 1 -% part_names = {'armrest1_1', 'armrest1_2', 'back', 'leg1_1', 'leg1_2', 'leg2_1', 'leg2_2', 'seat', 'armrest2_1', 'armrest2_2'}; +% part_names = {'armrest_1', 'armrest_2', 'back', 'leg1_1', 'leg1_2', 'leg2_1', 'leg2_2', 'seat'}; support_directions = [ - 0, 0, 1, 0, 0, 0, 0, 1, 2, 0; - 0, 0, 1, 0, 0, 0, 0, 1, 0, 2; - 1, 1, 0, 2, 2, 2, 2, 2, 0, 0; - 0, 0, 2, 0, 0, 0, 0, 2, 0, 0; - 0, 0, 2, 0, 0, 0, 0, 2, 0, 0; - 0, 0, 2, 0, 0, 0, 0, 2, 0, 0; - 0, 0, 2, 0, 0, 0, 0, 2, 0, 0; - 1, 1, 2, 2, 2, 2, 2, 0, 0, 0; - 2, 0, 0, 0, 0, 0, 0, 0, 0, 0; - 0, 2, 0, 0, 0, 0, 0, 0, 0, 0; + 0, 0, 1, 0, 0, 0, 0, 1; + 0, 0, 1, 0, 0, 0, 0, 1; + 1, 1, 0, 2, 2, 2, 2, 2; + 0, 0, 2, 0, 0, 0, 0, 2; + 0, 0, 2, 0, 0, 0, 0, 2; + 0, 0, 2, 0, 0, 0, 0, 2; + 0, 0, 2, 0, 0, 0, 0, 2; + 1, 1, 2, 2, 2, 2, 2, 0; ]; elseif strcmp(type, 'knife') == 1 % part_names = {'part1', 'part2'}; diff --git a/code/matlab/getlabel.m b/code/matlab/getlabel.m index 2e5a9dd..b7eefca 100644 --- a/code/matlab/getlabel.m +++ b/code/matlab/getlabel.m @@ -1,7 +1,7 @@ function part_names = getlabel(cate) type = cate; if strcmp(type, 'chair') == 1 - part_names = {'armrest1_1', 'armrest1_2', 'back', 'leg1_1', 'leg1_2', 'leg2_1', 'leg2_2', 'seat', 'armrest2_1', 'armrest2_2'}; + part_names = {'armrest_1', 'armrest_2', 'back', 'leg1_1', 'leg1_2', 'leg2_1', 'leg2_2', 'seat'}; elseif strcmp(type, 'knife') == 1 part_names = {'part1', 'part2'}; elseif strcmp(type, 'guitar') == 1