Explorar o código

Moved Panda robot from Ros2RoboticManipulationTemplate to ROS2SampleRobots gem (#884)

Signed-off-by: Paweł Budziszewski <[email protected]>
Paweł Budziszewski hai 3 meses
pai
achega
bdb3b3a7d0
Modificáronse 46 ficheiros con 235 adicións e 646 borrados
  1. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/Materials/Shell_gray.material
  2. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/Materials/Shell_white.material
  3. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/finger.dae
  4. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/finger.dae.assetinfo
  5. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/finger_c.stl
  6. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/finger_c.stl.assetinfo
  7. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/hand.dae
  8. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/hand.dae.assetinfo
  9. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/hand_c.stl
  10. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/hand_c.stl.assetinfo
  11. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link0.dae
  12. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link0.dae.assetinfo
  13. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link0_c.stl
  14. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link0_c.stl.assetinfo
  15. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link1.dae
  16. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link1.dae.assetinfo
  17. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link1_c.stl
  18. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link1_c.stl.assetinfo
  19. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link2.dae
  20. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link2.dae.assetinfo
  21. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link2_c.stl
  22. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link2_c.stl.assetinfo
  23. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link3.dae
  24. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link3.dae.assetinfo
  25. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link3_c.stl
  26. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link3_c.stl.assetinfo
  27. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link4.dae
  28. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link4.dae.assetinfo
  29. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link4_c.stl
  30. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link4_c.stl.assetinfo
  31. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link5.dae
  32. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link5.dae.assetinfo
  33. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link5_c.stl
  34. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link5_c.stl.assetinfo
  35. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link6.dae
  36. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link6.dae.assetinfo
  37. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link6_c.stl
  38. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link6_c.stl.assetinfo
  39. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link7.dae
  40. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link7.dae.assetinfo
  41. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link7_c.stl
  42. 0 0
      Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link7_c.stl.assetinfo
  43. 228 429
      Gems/ROS2SampleRobots/Assets/PandaRobot/PandaRobot.prefab
  44. 6 36
      Templates/Ros2RoboticManipulationTemplate/Template/Levels/RoboticManipulation/RoboticManipulation.prefab
  45. 1 0
      Templates/Ros2RoboticManipulationTemplate/Template/project.json
  46. 0 181
      Templates/Ros2RoboticManipulationTemplate/template.json

+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/Materials/Shell_gray.material → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/Materials/Shell_gray.material


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/Materials/Shell_white.material → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/Materials/Shell_white.material


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/finger.dae → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/finger.dae


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/finger.dae.assetinfo → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/finger.dae.assetinfo


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/finger_c.stl → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/finger_c.stl


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/finger_c.stl.assetinfo → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/finger_c.stl.assetinfo


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/hand.dae → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/hand.dae


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/hand.dae.assetinfo → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/hand.dae.assetinfo


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/hand_c.stl → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/hand_c.stl


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/hand_c.stl.assetinfo → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/hand_c.stl.assetinfo


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link0.dae → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link0.dae


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link0.dae.assetinfo → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link0.dae.assetinfo


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link0_c.stl → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link0_c.stl


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link0_c.stl.assetinfo → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link0_c.stl.assetinfo


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link1.dae → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link1.dae


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link1.dae.assetinfo → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link1.dae.assetinfo


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link1_c.stl → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link1_c.stl


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link1_c.stl.assetinfo → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link1_c.stl.assetinfo


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link2.dae → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link2.dae


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link2.dae.assetinfo → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link2.dae.assetinfo


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link2_c.stl → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link2_c.stl


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link2_c.stl.assetinfo → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link2_c.stl.assetinfo


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link3.dae → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link3.dae


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link3.dae.assetinfo → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link3.dae.assetinfo


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link3_c.stl → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link3_c.stl


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link3_c.stl.assetinfo → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link3_c.stl.assetinfo


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link4.dae → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link4.dae


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link4.dae.assetinfo → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link4.dae.assetinfo


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link4_c.stl → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link4_c.stl


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link4_c.stl.assetinfo → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link4_c.stl.assetinfo


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link5.dae → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link5.dae


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link5.dae.assetinfo → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link5.dae.assetinfo


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link5_c.stl → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link5_c.stl


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link5_c.stl.assetinfo → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link5_c.stl.assetinfo


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link6.dae → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link6.dae


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link6.dae.assetinfo → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link6.dae.assetinfo


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link6_c.stl → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link6_c.stl


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link6_c.stl.assetinfo → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link6_c.stl.assetinfo


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link7.dae → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link7.dae


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link7.dae.assetinfo → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link7.dae.assetinfo


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link7_c.stl → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link7_c.stl


+ 0 - 0
Templates/Ros2RoboticManipulationTemplate/Template/Assets/Panda/link7_c.stl.assetinfo → Gems/ROS2SampleRobots/Assets/PandaRobot/Models/link7_c.stl.assetinfo


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 228 - 429
Gems/ROS2SampleRobots/Assets/PandaRobot/PandaRobot.prefab


+ 6 - 36
Templates/Ros2RoboticManipulationTemplate/Template/Levels/RoboticManipulation/RoboticManipulation.prefab

@@ -19,10 +19,10 @@
                 "$type": "EditorEntitySortComponent",
                 "Id": 14126657869720434043,
                 "Child Entity Order": [
-                    "Instance_[712990187248]/ContainerEntity",
                     "Entity_[3876413040103]",
                     "Entity_[440535597152]",
-                    "Entity_[513550041184]"
+                    "Entity_[513550041184]",
+                    "Instance_[12517228203983]/ContainerEntity"
                 ]
             },
             "Component_[15230859088967841193]": {
@@ -5356,7 +5356,7 @@
                 "EditorLookAtComponent": {
                     "$type": "EditorLookAtComponent",
                     "Id": 4050310940192040969,
-                    "Target": "Instance_[712990187248]/Entity_[751644892912]",
+                    "Target": "Instance_[12517228203983]/Entity_[10700457037775]",
                     "ForwardAxis": 2
                 },
                 "EditorOnlyEntityComponent": {
@@ -5401,39 +5401,9 @@
         }
     },
     "Instances": {
-        "Instance_[712990187248]": {
-            "Source": "Prefabs/PandaRobot.prefab",
+        "Instance_[12517228203983]": {
+            "Source": "PandaRobot/PandaRobot.prefab",
             "Patches": [
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[768824762096]/Components/TransformComponent/Transform Data/Translate/0",
-                    "value": 0.07862424850463867
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[768824762096]/Components/TransformComponent/Transform Data/Translate/1",
-                    "value": -0.02395105361938477
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[768824762096]/Components/TransformComponent/Transform Data/Translate/2",
-                    "value": 0.02015829086303711
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[768824762096]/Components/TransformComponent/Transform Data/Rotate/0",
-                    "value": -0.0008067800663411617
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[768824762096]/Components/TransformComponent/Transform Data/Rotate/1",
-                    "value": -15.406730651855469
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[768824762096]/Components/TransformComponent/Transform Data/Rotate/2",
-                    "value": 89.99694061279297
-                },
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/TransformComponent/Parent Entity",
@@ -5457,4 +5427,4 @@
             ]
         }
     }
-}
+}

+ 1 - 0
Templates/Ros2RoboticManipulationTemplate/Template/project.json

@@ -34,6 +34,7 @@
         "TextureAtlas",
         "DiffuseProbeGrid",
         "ROS2>=3.1.0",
+        "ROS2SampleRobots",
         "${Name}"
     ]
 }

+ 0 - 181
Templates/Ros2RoboticManipulationTemplate/template.json

@@ -66,174 +66,6 @@
             "file": "Assets/BoxToyPuzzle/texture/BoxToyPuzzle_MCube_pazzle_Specular.png",
             "isTemplated": false
         },
-        {
-            "file": "Assets/Panda/Materials/Shell_gray.material",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/Materials/Shell_white.material",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/finger.dae",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/finger.dae.assetinfo",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/finger_c.stl",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/finger_c.stl.assetinfo",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/hand.dae",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/hand.dae.assetinfo",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/hand_c.stl",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/hand_c.stl.assetinfo",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link0.dae",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link0.dae.assetinfo",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link0_c.stl",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link0_c.stl.assetinfo",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link1.dae",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link1.dae.assetinfo",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link1_c.stl",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link1_c.stl.assetinfo",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link2.dae",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link2.dae.assetinfo",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link2_c.stl",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link2_c.stl.assetinfo",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link3.dae",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link3.dae.assetinfo",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link3_c.stl",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link3_c.stl.assetinfo",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link4.dae",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link4.dae.assetinfo",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link4_c.stl",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link4_c.stl.assetinfo",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link5.dae",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link5.dae.assetinfo",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link5_c.stl",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link5_c.stl.assetinfo",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link6.dae",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link6.dae.assetinfo",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link6_c.stl",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link6_c.stl.assetinfo",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link7.dae",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link7.dae.assetinfo",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link7_c.stl",
-            "isTemplated": false
-        },
-        {
-            "file": "Assets/Panda/link7_c.stl.assetinfo",
-            "isTemplated": false
-        },
         {
             "file": "Assets/Room/Desk.fbx",
             "isTemplated": false
@@ -446,10 +278,6 @@
             "file": "Platform/Windows/windows_project.json",
             "isTemplated": false
         },
-        {
-            "file": "Prefabs/PandaRobot.prefab",
-            "isTemplated": false
-        },
         {
             "file": "Registry/assetprocessor_settings.setreg",
             "isTemplated": false
@@ -602,12 +430,6 @@
         {
             "dir": "Assets/BoxToyPuzzle/texture/Roughness"
         },
-        {
-            "dir": "Assets/Panda"
-        },
-        {
-            "dir": "Assets/Panda/Materials"
-        },
         {
             "dir": "Assets/Room"
         },
@@ -680,9 +502,6 @@
         {
             "dir": "Platform/Windows"
         },
-        {
-            "dir": "Prefabs"
-        },
         {
             "dir": "Registry"
         },

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio