update bug

This commit is contained in:
hofee 2024-09-30 18:11:00 +08:00
parent f94cb2c0d6
commit b294d389b3
2 changed files with 7 additions and 10 deletions

View File

@ -24,9 +24,12 @@ class DataGenerator:
self.min_cam_table_included_degree = config["runner"]["generate"]["min_cam_table_included_degree"] self.min_cam_table_included_degree = config["runner"]["generate"]["min_cam_table_included_degree"]
self.random_view_ratio = config["runner"]["generate"]["random_view_ratio"] self.random_view_ratio = config["runner"]["generate"]["random_view_ratio"]
self.binocular_vision = config["runner"]["generate"]["binocular_vision"] self.binocular_vision = config["runner"]["generate"]["binocular_vision"]
self.set_status_path = "http://localhost:5000/project/set_status" self.port = config["runner"]["generate"]["port"]
self.log_path = "http://localhost:5000/project/add_log" self.from_idx = config["runner"]["generate"]["from"]
self.obj_name_list = os.listdir(self.obj_dir) self.to_idx = config["runner"]["generate"]["to"]
self.set_status_path = f"http://localhost:{self.port}/project/set_status"
self.log_path = f"http://localhost:{self.port}/project/add_log"
self.obj_name_list = os.listdir(self.obj_dir)[self.from_idx: self.to_idx]
self.target_obj = None self.target_obj = None
self.stopped = False self.stopped = False
self.random_obj_list = [] self.random_obj_list = []
@ -82,9 +85,6 @@ class DataGenerator:
height = random.uniform(config["min_height"], config["max_height"]) height = random.uniform(config["min_height"], config["max_height"])
radius = random.uniform(config["min_radius"], config["max_radius"]) radius = random.uniform(config["min_radius"], config["max_radius"])
R = random.uniform(config["min_R"], config["max_R"])
G = random.uniform(config["min_G"], config["max_G"])
B = random.uniform(config["min_B"], config["max_B"])
while height > 0.5 * radius: while height > 0.5 * radius:
height = random.uniform(config["min_height"], config["max_height"]) height = random.uniform(config["min_height"], config["max_height"])
@ -112,9 +112,6 @@ class DataGenerator:
self.display_table_config = { self.display_table_config = {
"height": height, "height": height,
"radius": radius, "radius": radius,
"R": R,
"G": G,
"B": B,
"location": list(platform.location) "location": list(platform.location)
} }
return platform return platform

View File

@ -157,7 +157,7 @@ class ViewSampleUtil:
def sample_view_data_world_space(obj, distance_range:tuple = (0.3,0.5), voxel_size:float = 0.005, max_views: int=1, min_cam_table_included_degree:int=20, random_view_ratio:float = 0.2) -> dict: def sample_view_data_world_space(obj, distance_range:tuple = (0.3,0.5), voxel_size:float = 0.005, max_views: int=1, min_cam_table_included_degree:int=20, random_view_ratio:float = 0.2) -> dict:
obj_world_pose = np.asarray(obj.matrix_world) obj_world_pose = np.asarray(obj.matrix_world)
view_data = ViewSampleUtil.sample_view_data(obj, distance_range, voxel_size, max_views) view_data = ViewSampleUtil.sample_view_data(obj, distance_range, voxel_size, max_views)
view_data["cam_poses"] = ViewSampleUtil.get_cam_pose(view_data, obj_world_pose, max_views, min_cam_table_included_degree) view_data["cam_poses"] = ViewSampleUtil.get_cam_pose(view_data, obj_world_pose, max_views, min_cam_table_included_degree, random_view_ratio)
view_data["voxel_down_sampled_points"], view_data["normals"] = ViewSampleUtil.get_world_points_and_normals(view_data, obj_world_pose) view_data["voxel_down_sampled_points"], view_data["normals"] = ViewSampleUtil.get_world_points_and_normals(view_data, obj_world_pose)
return view_data return view_data