solve merge

2024-10-23 13:59:12 +08:00
parent b18c1591b7 c55a398b6d
commit 64b22fd0f4
11 changed files with 215 additions and 112 deletions
--- a/configs/local/view_generate_config.yaml
+++ b/configs/local/view_generate_config.yaml
@@ -7,12 +7,21 @@ runner:
    name: debug
    root_dir: experiments
  generate:
+<<<<<<< HEAD
    port: 5002
    from: 600
    to: -1 # -1 means all
    object_dir: /media/hofee/data/data/object_meshes_part1
    table_model_path: "/media/hofee/data/data/others/table.obj"
    output_dir: /media/hofee/repository/data_part_1
+=======
+    port: 5000
+    from: 0
+    to: -1 # -1 means all
+    object_dir: H:\\AI\\Datasets\\object_meshes_part2
+    table_model_path: "H:\\AI\\Datasets\\table.obj"
+    output_dir: C:\\Document\\Datasets\\nbv_rec_part2
+>>>>>>> c55a398b6d5c347497b528bdd460e26ffdd184e8
    binocular_vision: true
    plane_size: 10
    max_views: 512