Przeglądaj źródła

Demo videos

Signed-off-by: Piotr Jaroszek <[email protected]>
Piotr Jaroszek 3 lat temu
rodzic
commit
ac95ee7802

+ 36 - 35
Assets/RoboVac/AstroVacRobot.prefab

@@ -110,14 +110,14 @@
                     "Parent Entity": "Entity_[30055431164411]",
                     "Parent Entity": "Entity_[30055431164411]",
                     "Transform Data": {
                     "Transform Data": {
                         "Translate": [
                         "Translate": [
-                            -1.484060287475586,
-                            0.11170625686645508,
-                            0.7430511116981506
+                            -1.4058618545532227,
+                            0.10479402542114258,
+                            1.2001819610595703
                         ],
                         ],
                         "Rotate": [
                         "Rotate": [
-                            0.8662934899330139,
-                            9.706164360046387,
-                            -95.1249771118164
+                            2.812905788421631,
+                            29.03843116760254,
+                            -95.78008270263672
                         ]
                         ]
                     }
                     }
                 }
                 }
@@ -907,7 +907,7 @@
                         "MaterialSlots": {
                         "MaterialSlots": {
                             "Slots": [
                             "Slots": [
                                 {
                                 {
-                                    "Name": "Entire object"
+                                    "Name": "Paint - Enamel Glossy (Black)"
                                 }
                                 }
                             ]
                             ]
                         },
                         },
@@ -3894,7 +3894,7 @@
                         "MaterialSlots": {
                         "MaterialSlots": {
                             "Slots": [
                             "Slots": [
                                 {
                                 {
-                                    "Name": "Entire object"
+                                    "Name": "ABS (White)"
                                 }
                                 }
                             ]
                             ]
                         },
                         },
@@ -4769,17 +4769,6 @@
             "Id": "Entity_[30055431164411]",
             "Id": "Entity_[30055431164411]",
             "Name": "AstroVacRobot",
             "Name": "AstroVacRobot",
             "Components": {
             "Components": {
-                "Component_[10044771047696910406]": {
-                    "$type": "GenericComponentWrapper",
-                    "Id": 10044771047696910406,
-                    "m_template": {
-                        "$type": "ROS2FrameComponent",
-                        "Namespace Configuration": {
-                            "Namespace Strategy": 1
-                        },
-                        "Frame Name": "base_link"
-                    }
-                },
                 "Component_[12335778149585122117]": {
                 "Component_[12335778149585122117]": {
                     "$type": "EditorEntityIconComponent",
                     "$type": "EditorEntityIconComponent",
                     "Id": 12335778149585122117
                     "Id": 12335778149585122117
@@ -4803,7 +4792,7 @@
                             "roll": 0.0,
                             "roll": 0.0,
                             "pitch": 0.0,
                             "pitch": 0.0,
                             "yaw": 0.0,
                             "yaw": 0.0,
-                            "scale": 100.0
+                            "scale": 0.009999999776482582
                         }
                         }
                     }
                     }
                 },
                 },
@@ -4843,22 +4832,15 @@
                         "Entity_[8859800736551]"
                         "Entity_[8859800736551]"
                     ]
                     ]
                 },
                 },
-                "Component_[15975670446214446929]": {
+                "Component_[15910097906063283013]": {
                     "$type": "GenericComponentWrapper",
                     "$type": "GenericComponentWrapper",
-                    "Id": 15975670446214446929,
+                    "Id": 15910097906063283013,
                     "m_template": {
                     "m_template": {
-                        "$type": "ROS2RobotControlComponent",
-                        "ControlConfiguration": {
-                            "Topic": "cmd_vel",
-                            "BroadcastBusMode": false,
-                            "RobotConfiguration": {
-                                "Body": "Entity_[30055431164411]",
-                                "Front left wheel": "",
-                                "Front right wheel": "",
-                                "Rear left wheel": "",
-                                "Rear right wheel": ""
-                            }
-                        }
+                        "$type": "ROS2FrameComponent",
+                        "Namespace Configuration": {
+                            "Namespace Strategy": 1
+                        },
+                        "Frame Name": "base_link"
                     }
                     }
                 },
                 },
                 "Component_[16572099067667838198]": {
                 "Component_[16572099067667838198]": {
@@ -4910,6 +4892,24 @@
                     "$type": "EditorPendingCompositionComponent",
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 5957548067248555519
                     "Id": 5957548067248555519
                 },
                 },
+                "Component_[7715341178742189308]": {
+                    "$type": "GenericComponentWrapper",
+                    "Id": 7715341178742189308,
+                    "m_template": {
+                        "$type": "ROS2RobotControlComponent",
+                        "ControlConfiguration": {
+                            "Topic": "/cmd_vel",
+                            "BroadcastBusMode": false,
+                            "RobotConfiguration": {
+                                "Body": "Entity_[30055431164411]",
+                                "Front left wheel": "",
+                                "Front right wheel": "",
+                                "Rear left wheel": "",
+                                "Rear right wheel": ""
+                            }
+                        }
+                    }
+                },
                 "Component_[8050084937550776360]": {
                 "Component_[8050084937550776360]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 8050084937550776360,
                     "Id": 8050084937550776360,
@@ -5048,6 +5048,7 @@
                     "m_template": {
                     "m_template": {
                         "$type": "ROS2LidarSensorComponent",
                         "$type": "ROS2LidarSensorComponent",
                         "SensorConfiguration": {
                         "SensorConfiguration": {
+                            "Visualise": false,
                             "Publishers": {
                             "Publishers": {
                                 "sensor_msgs::msg::PointCloud2": {
                                 "sensor_msgs::msg::PointCloud2": {
                                     "Type": "sensor_msgs::msg::PointCloud2",
                                     "Type": "sensor_msgs::msg::PointCloud2",
@@ -5283,7 +5284,7 @@
                 {
                 {
                     "op": "replace",
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[6700600896017100313]/Transform Data/Translate/2",
                     "path": "/ContainerEntity/Components/Component_[6700600896017100313]/Transform Data/Translate/2",
-                    "value": 0.08034273982048035
+                    "value": 0.04095920920372009
                 },
                 },
                 {
                 {
                     "op": "replace",
                     "op": "replace",

+ 12 - 0
Levels/Demo/tags.txt

@@ -0,0 +1,12 @@
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0

+ 46 - 66
Levels/archvis/Loft/Interior_03.prefab

@@ -19,7 +19,7 @@
                 "$type": "EditorEntitySortComponent",
                 "$type": "EditorEntitySortComponent",
                 "Id": 14126657869720434043,
                 "Id": 14126657869720434043,
                 "Child Entity Order": [
                 "Child Entity Order": [
-                    "Instance_[2485335167382]/ContainerEntity",
+                    "",
                     "Entity_[2511113093496]",
                     "Entity_[2511113093496]",
                     "Entity_[4844759642882]",
                     "Entity_[4844759642882]",
                     "Entity_[4857644544770]",
                     "Entity_[4857644544770]",
@@ -52,6 +52,11 @@
                     }
                     }
                 }
                 }
             },
             },
+            "Component_[6517238246329906992]": {
+                "$type": "LocalViewBookmarkComponent",
+                "Id": 6517238246329906992,
+                "LocalBookmarkFileName": "Interior_03_1388466444937.setreg"
+            },
             "Component_[6545738857812235305]": {
             "Component_[6545738857812235305]": {
                 "$type": "SelectionComponent",
                 "$type": "SelectionComponent",
                 "Id": 6545738857812235305
                 "Id": 6545738857812235305
@@ -589,14 +594,14 @@
                     "Parent Entity": "Entity_[50747416825914]",
                     "Parent Entity": "Entity_[50747416825914]",
                     "Transform Data": {
                     "Transform Data": {
                         "Translate": [
                         "Translate": [
-                            4.550556182861328,
-                            -7.3159894943237305,
-                            0.4337831735610962
+                            4.551455497741699,
+                            -7.316291809082031,
+                            0.43408381938934326
                         ],
                         ],
                         "Rotate": [
                         "Rotate": [
-                            -9.12112045288086,
-                            7.361390590667725,
-                            -38.59132385253906
+                            -9.127589225769043,
+                            7.356801509857178,
+                            -38.5538444519043
                         ]
                         ]
                     }
                     }
                 },
                 },
@@ -5870,65 +5875,6 @@
                 }
                 }
             ]
             ]
         },
         },
-        "Instance_[2485335167382]": {
-            "Source": "Assets/RoboVac/AstroVacRobot.prefab",
-            "Patches": [
-                {
-                    "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[10968750635921263389]/Parent Entity",
-                    "value": "../Entity_[1146574390643]"
-                },
-                {
-                    "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[10968750635921263389]/Transform Data/Translate/0",
-                    "value": -1.3768727779388428
-                },
-                {
-                    "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[10968750635921263389]/Transform Data/Translate/1",
-                    "value": 7.608648777008057
-                },
-                {
-                    "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[10968750635921263389]/Transform Data/Translate/2",
-                    "value": 0.06635439395904541
-                },
-                {
-                    "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[10968750635921263389]/Transform Data/Rotate/2",
-                    "value": -46.42683410644531
-                },
-                {
-                    "op": "remove",
-                    "path": "/ContainerEntity/Components/Component_[761745188714332364]/Child Entity Order/1"
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[15934909250224]/Components/Component_[4358438849696264694]/Controller/Configuration/EditorEntityId",
-                    "value": 13495511068447120829
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[30055431164411]/Components/Component_[13195787262642532680]/Configuration/Mass",
-                    "value": 0.13886816799640656
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[30055431164411]/Components/Component_[13195787262642532680]/Configuration/Centre of mass offset/0",
-                    "value": 2.091176787288873e-9
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[30055431164411]/Components/Component_[13195787262642532680]/Configuration/Centre of mass offset/1",
-                    "value": 3.9075187530102085e-9
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[30055431164411]/Components/Component_[13195787262642532680]/Configuration/Centre of mass offset/2",
-                    "value": -7.555317482754731e-11
-                }
-            ]
-        },
         "Instance_[25190231870688]": {
         "Instance_[25190231870688]": {
             "Source": "Props/Potted_Plant_TRBP000045/potted_plant.prefab",
             "Source": "Props/Potted_Plant_TRBP000045/potted_plant.prefab",
             "Patches": [
             "Patches": [
@@ -6469,6 +6415,40 @@
                 }
                 }
             ]
             ]
         },
         },
+        "Instance_[5038061704469]": {
+            "Source": "Assets/RoboVac/AstroVacRobot.prefab",
+            "Patches": [
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[10968750635921263389]/Parent Entity",
+                    "value": "../Entity_[1146574390643]"
+                },
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[10968750635921263389]/Transform Data/Translate/0",
+                    "value": 1.2663843631744385
+                },
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[10968750635921263389]/Transform Data/Translate/1",
+                    "value": 3.818905830383301
+                },
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[10968750635921263389]/Transform Data/Translate/2",
+                    "value": 0.053635746240615845
+                },
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[10968750635921263389]/Transform Data/Rotate/2",
+                    "value": 65.050537109375
+                },
+                {
+                    "op": "remove",
+                    "path": "/ContainerEntity/Components/Component_[761745188714332364]/Child Entity Order/1"
+                }
+            ]
+        },
         "Instance_[54387565070505]": {
         "Instance_[54387565070505]": {
             "Source": "Props/Wall_Painting/Wall_Painting.prefab",
             "Source": "Props/Wall_Painting/Wall_Painting.prefab",
             "Patches": [
             "Patches": [

+ 4 - 0
dev_notes.md

@@ -0,0 +1,4 @@
+# Dev notes
+
+1. Can't save default editor camera per level. Camera always resets to default position while loading level.
+2. Viewport helpers are on by default, should be off.

Plik diff jest za duży
+ 3 - 14
launch/config/config.rviz


Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików