Merge branch 'develop' of https://github.com/StanfordVL/bddl into dev…

…elop
StanfordVL · Mar 9, 2024 · ee00d35 · ee00d35
2 parents 08c05b7 + 19ac9ae
commit ee00d35
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 24 deletions.
diff --git a/bddl/generated_data/combined_room_object_list.json b/bddl/generated_data/combined_room_object_list.json
@@ -3988,7 +3988,7 @@
                 "door-bexenl": 1,
                 "garage_door-prdjyt": 1,
                 "floors-csxnnw": 2,
-                "wall_nail-wlnail": 1
+                "wall_nail-wlnail": 2
             },
             "garden_0": {
                 "car-supuws": 1,
@@ -3997,7 +3997,7 @@
                 "floors-qwzkxn": 2,
                 "driveway-qbxmgb": 2,
                 "window-lhzwtz": 1,
-                "fence-owbrvb": 5,
+                "fence-owbrvb": 6,
                 "grill-sxfjac": 1,
                 "garden_light-qyfrwj": 9,
                 "playground-xdlcdi": 1,
@@ -5929,8 +5929,7 @@
                 "window-cbudyv": 2,
                 "bottom_cabinet-bamfsz": 11,
                 "shelf-xsfeyi": 5,
-                "ceilings-qtktaq": 2,
-                "wall_nail-wlnail": 1
+                "ceilings-qtktaq": 2
             },
             "break_room_0": {
                 "carpet-giqcnw": 1,
@@ -5945,7 +5944,8 @@
                 "eames_chair-mmqvnh": 5,
                 "conference_table-jxixdw": 1,
                 "ceilings-lvnwja": 2,
-                "floors-txgvpv": 2
+                "floors-txgvpv": 2,
+                "wall_nail-wlnail": 1
             },
             "corridor_0": {
                 "floors-gfrihe": 2,

diff --git a/bddl/generated_data/combined_room_object_list_future.json b/bddl/generated_data/combined_room_object_list_future.json
@@ -4015,7 +4015,7 @@
                 "door-bexenl": 1,
                 "garage_door-prdjyt": 1,
                 "floors-csxnnw": 2,
-                "wall_nail-wlnail": 1
+                "wall_nail-wlnail": 2
             },
             "garden_0": {
                 "car-supuws": 1,
@@ -4024,7 +4024,7 @@
                 "floors-qwzkxn": 2,
                 "driveway-qbxmgb": 2,
                 "window-lhzwtz": 1,
-                "fence-owbrvb": 5,
+                "fence-owbrvb": 6,
                 "grill-sxfjac": 1,
                 "garden_light-qyfrwj": 9,
                 "playground-xdlcdi": 1,
@@ -5956,8 +5956,7 @@
                 "window-cbudyv": 2,
                 "bottom_cabinet-bamfsz": 11,
                 "shelf-xsfeyi": 5,
-                "ceilings-qtktaq": 2,
-                "wall_nail-wlnail": 1
+                "ceilings-qtktaq": 2
             },
             "break_room_0": {
                 "carpet-giqcnw": 1,
@@ -5972,7 +5971,8 @@
                 "eames_chair-mmqvnh": 5,
                 "conference_table-jxixdw": 1,
                 "ceilings-lvnwja": 2,
-                "floors-txgvpv": 2
+                "floors-txgvpv": 2,
+                "wall_nail-wlnail": 1
             },
             "corridor_0": {
                 "floors-gfrihe": 2,

diff --git a/bddl/generated_data/object_inventory.json b/bddl/generated_data/object_inventory.json
@@ -6175,7 +6175,6 @@
         "armchair-hgunnf": "scenes/house_double_floor_lower",
         "armchair-uofiqj": "scenes/house_double_floor_lower",
         "armchair-zdhnyg": "scenes/house_double_floor_lower",
-        "background-vtfqjb": "scenes/house_double_floor_lower",
         "bidet-lcyvov": "scenes/house_double_floor_lower",
         "blender-xnjqix": "scenes/house_double_floor_lower",
         "bottom_cabinet-byvbuc": "scenes/house_double_floor_lower",
@@ -28872,9 +28871,6 @@
         "armchair-zdhnyg": [
             "scenes/house_double_floor_lower"
         ],
-        "background-vtfqjb": [
-            "scenes/house_double_floor_lower"
-        ],
         "bidet-lcyvov": [
             "scenes/house_double_floor_lower",
             "scenes/house_double_floor_upper"
@@ -45767,9 +45763,6 @@
         "walls-ovzcgo": [
             "collision"
         ],
-        "background-vtfqjb": [
-            "collision"
-        ],
         "bidet-lcyvov": [
             "fluidsource",
             "togglebutton"

diff --git a/bddl/generated_data/object_inventory_future.json b/bddl/generated_data/object_inventory_future.json
@@ -6198,7 +6198,6 @@
         "armchair-hgunnf": "scenes/house_double_floor_lower",
         "armchair-uofiqj": "scenes/house_double_floor_lower",
         "armchair-zdhnyg": "scenes/house_double_floor_lower",
-        "background-vtfqjb": "scenes/house_double_floor_lower",
         "bidet-lcyvov": "scenes/house_double_floor_lower",
         "blender-xnjqix": "scenes/house_double_floor_lower",
         "bottom_cabinet-byvbuc": "scenes/house_double_floor_lower",
@@ -28964,9 +28963,6 @@
         "armchair-zdhnyg": [
             "scenes/house_double_floor_lower"
         ],
-        "background-vtfqjb": [
-            "scenes/house_double_floor_lower"
-        ],
         "bidet-lcyvov": [
             "scenes/house_double_floor_lower",
             "scenes/house_double_floor_upper"
@@ -45889,9 +45885,6 @@
         "walls-ovzcgo": [
             "collision"
         ],
-        "background-vtfqjb": [
-            "collision"
-        ],
         "bidet-lcyvov": [
             "fluidsource",
             "togglebutton"