Browse Source

代码更新

main
hesuicong 2 weeks ago
parent
commit
1b0ecb2727
  1. 2
      general.py
  2. 5
      point_cloud_layout.py

2
general.py

@ -284,6 +284,8 @@ extend_dist_model_x = 4
extend_dist_model_y = 2 extend_dist_model_y = 2
extend_dist_model_z = 2 extend_dist_model_z = 2
extend_dist_box = 1 extend_dist_box = 1
extend_dist_min_collision = 3
def is_cross_border_c(x, y, z, mx, my, mz, max_x, max_y, max_z): def is_cross_border_c(x, y, z, mx, my, mz, max_x, max_y, max_z):
if (x - mx < extend_dist_border_x_min or if (x - mx < extend_dist_border_x_min or
y - my < extend_dist_border_y_min or y - my < extend_dist_border_y_min or

5
point_cloud_layout.py

@ -12,6 +12,7 @@ from plyfile import PlyData, PlyElement
from general import mesh_tranform_to_pcd from general import mesh_tranform_to_pcd
from general import need_upload_result from general import need_upload_result
from general import read_mesh from general import read_mesh
from general import extend_dist_min_collision
from compute_print_net import arrange_models_on_platform from compute_print_net import arrange_models_on_platform
from compute_print_net import compute_bbox_all from compute_print_net import compute_bbox_all
@ -337,7 +338,7 @@ def compact_mode_for_min_dis_json(placed_models,dict_unplaced,dict_bounds_fix,ma
pcd_processed_curr = pcd_processed pcd_processed_curr = pcd_processed
else: else:
is_x_top = True is_x_top = True
if check_collision_all(pcd, pcd_processed_no_x_top,1): if check_collision_all(pcd, pcd_processed_no_x_top, extend_dist_min_collision):
name = ply_file_name name = ply_file_name
print("fail to place (x=0)", ply_file_name, dx) print("fail to place (x=0)", ply_file_name, dx)
dict_unplaced[name]=name dict_unplaced[name]=name
@ -350,7 +351,7 @@ def compact_mode_for_min_dis_json(placed_models,dict_unplaced,dict_bounds_fix,ma
y_init_big = 10 y_init_big = 10
x_init_big = y_init_big - 1 x_init_big = y_init_big - 1
if check_collision_all(pcd, pcd_processed_curr, 1): if check_collision_all(pcd, pcd_processed_curr, extend_dist_min_collision):
while True: while True:
step = 25 step = 25
pcd.translate([0, -step, 0]) pcd.translate([0, -step, 0])

Loading…
Cancel
Save