Skip to content

readOBJ function name, rename chair parts label, remove armrest2 support dir matrix #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
susan31213 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

readOBJ function name, rename chair parts label, remove armrest2 support dir matrix #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/matlab/GetOptimizedObj.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
20 changes: 9 additions & 11 deletions code/matlab/ReconstructFromCodeMixIntegerReadingObjinAdvance.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'};
Expand Down
2 changes: 1 addition & 1 deletion code/matlab/getlabel.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down