From 4d23b6edeb71082e18abd937a12eb3b7cddc9102 Mon Sep 17 00:00:00 2001 From: Jan Hanca Date: Fri, 2 Aug 2024 09:59:29 +0200 Subject: [PATCH] Fixes for templates (#723) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix ROSBot prefab: wheelbase and track * Fix project.json in templates * Bump RosRobotSample patch version Signed-off-by: Jan Hanca Signed-off-by: Kacper Dąbrowski Co-authored-by: Kacper Dąbrowski --- Gems/RosRobotSample/Assets/ROSbot.prefab | 17 +++++++++-------- Gems/RosRobotSample/gem.json | 2 +- .../Template/project.json | 3 ++- .../Template/Gem/Source/${Name}EditorModule.cpp | 2 +- .../Template/Gem/Source/${Name}Module.cpp | 2 +- .../Gem/Source/${Name}SampleComponent.cpp | 2 +- .../Ros2ProjectTemplate/Template/project.json | 3 ++- .../Template/Gem/Source/${Name}Module.cpp | 2 +- .../Gem/Source/${Name}SystemComponent.cpp | 2 +- .../Gem/Source/${Name}SystemComponent.h | 2 +- .../Template/project.json | 3 ++- 11 files changed, 22 insertions(+), 18 deletions(-) diff --git a/Gems/RosRobotSample/Assets/ROSbot.prefab b/Gems/RosRobotSample/Assets/ROSbot.prefab index e4999340bc..5ba740f225 100755 --- a/Gems/RosRobotSample/Assets/ROSbot.prefab +++ b/Gems/RosRobotSample/Assets/ROSbot.prefab @@ -284,7 +284,8 @@ "MaterialAsset": { "assetId": { "guid": "{D5BE771A-53A9-534E-8DCC-A91D6127540D}" - } + }, + "assetHint": "robot/rosbot_xl_description/meshes/materials/antenna_plastic_-_matte_black_.azmaterial" } } } @@ -332,7 +333,8 @@ "MaterialAsset": { "assetId": { "guid": "{D5BE771A-53A9-534E-8DCC-A91D6127540D}" - } + }, + "assetHint": "robot/rosbot_xl_description/meshes/materials/antenna_plastic_-_matte_black_.azmaterial" } } } @@ -1306,7 +1308,7 @@ "guid": "{7F445A99-8C11-5417-9D63-8BCC7DCA76C8}", "subId": 1509562746 }, - "assetHint": "robot/rosbot_xl_description/meshes/body_colision.pxmesh" + "assetHint": "robot/rosbot_xl_description/meshes/body_colision.stl.pxmesh" }, "Configuration": { "PhysicsAsset": { @@ -1315,7 +1317,7 @@ "subId": 1509562746 }, "loadBehavior": "QueueLoad", - "assetHint": "robot/rosbot_xl_description/meshes/body_colision.pxmesh" + "assetHint": "robot/rosbot_xl_description/meshes/body_colision.stl.pxmesh" }, "UseMaterialsFromAsset": false } @@ -1389,8 +1391,8 @@ "IsDrive": true } ], - "Track": 0.17000000178813934, - "Wheelbase": 0.24799999594688416 + "Track": 0.27000001072883606, + "Wheelbase": 0.3319999873638153 }, "DriveModel": { "Limits": { @@ -2032,8 +2034,7 @@ "Id": 16056351394850261418, "Controller": { "Configuration": { - "Field of View": 60.0, - "EditorEntityId": 15598184734561212878 + "Field of View": 60.0 } } }, diff --git a/Gems/RosRobotSample/gem.json b/Gems/RosRobotSample/gem.json index 7101ff7e81..f54e69cfe0 100644 --- a/Gems/RosRobotSample/gem.json +++ b/Gems/RosRobotSample/gem.json @@ -1,6 +1,6 @@ { "gem_name": "RosRobotSample", - "version": "2.0.0", + "version": "2.0.1", "display_name": "ROS Robot Sample", "license": "Apache-2.0 or MIT", "license_url": "https://opensource.org/licenses/Apache-2.0", diff --git a/Templates/Ros2FleetRobotTemplate/Template/project.json b/Templates/Ros2FleetRobotTemplate/Template/project.json index 9d7185cf0d..7e398b843f 100644 --- a/Templates/Ros2FleetRobotTemplate/Template/project.json +++ b/Templates/Ros2FleetRobotTemplate/Template/project.json @@ -39,6 +39,7 @@ "StartingPointInput", "TextureAtlas", "WhiteBox", - "WarehouseAssets" + "WarehouseAssets", + "${Name}" ] } diff --git a/Templates/Ros2ProjectTemplate/Template/Gem/Source/${Name}EditorModule.cpp b/Templates/Ros2ProjectTemplate/Template/Gem/Source/${Name}EditorModule.cpp index b91b487c87..6e6552c5cd 100644 --- a/Templates/Ros2ProjectTemplate/Template/Gem/Source/${Name}EditorModule.cpp +++ b/Templates/Ros2ProjectTemplate/Template/Gem/Source/${Name}EditorModule.cpp @@ -11,7 +11,7 @@ #include <${Name}ModuleInterface.h> #include "${Name}EditorSystemComponent.h" -#include "${SanitizedCppName}SampleComponent.h" +#include "${Name}SampleComponent.h" namespace ${SanitizedCppName} { class ${SanitizedCppName}EditorModule diff --git a/Templates/Ros2ProjectTemplate/Template/Gem/Source/${Name}Module.cpp b/Templates/Ros2ProjectTemplate/Template/Gem/Source/${Name}Module.cpp index 681b2b6b5c..45b8dea530 100644 --- a/Templates/Ros2ProjectTemplate/Template/Gem/Source/${Name}Module.cpp +++ b/Templates/Ros2ProjectTemplate/Template/Gem/Source/${Name}Module.cpp @@ -12,7 +12,7 @@ #include #include "${Name}SystemComponent.h" -#include "${SanitizedCppName}SampleComponent.h" +#include "${Name}SampleComponent.h" namespace ${SanitizedCppName} { diff --git a/Templates/Ros2ProjectTemplate/Template/Gem/Source/${Name}SampleComponent.cpp b/Templates/Ros2ProjectTemplate/Template/Gem/Source/${Name}SampleComponent.cpp index b9300fa678..d6dbfcee35 100755 --- a/Templates/Ros2ProjectTemplate/Template/Gem/Source/${Name}SampleComponent.cpp +++ b/Templates/Ros2ProjectTemplate/Template/Gem/Source/${Name}SampleComponent.cpp @@ -9,7 +9,7 @@ */ // {END_LICENSE} -#include "${SanitizedCppName}SampleComponent.h" +#include "${Name}SampleComponent.h" #include #include #include diff --git a/Templates/Ros2ProjectTemplate/Template/project.json b/Templates/Ros2ProjectTemplate/Template/project.json index e2d89410e2..bc6c16502b 100644 --- a/Templates/Ros2ProjectTemplate/Template/project.json +++ b/Templates/Ros2ProjectTemplate/Template/project.json @@ -41,6 +41,7 @@ "StartingPointInput", "TextureAtlas", "WhiteBox", - "WarehouseSample" + "WarehouseSample", + "${Name}" ] } diff --git a/Templates/Ros2RoboticManipulationTemplate/Template/Gem/Source/${Name}Module.cpp b/Templates/Ros2RoboticManipulationTemplate/Template/Gem/Source/${Name}Module.cpp index f2468f443b..a76bdf5e3b 100644 --- a/Templates/Ros2RoboticManipulationTemplate/Template/Gem/Source/${Name}Module.cpp +++ b/Templates/Ros2RoboticManipulationTemplate/Template/Gem/Source/${Name}Module.cpp @@ -2,7 +2,7 @@ #include #include -#include "${SanitizedCppName}SystemComponent.h" +#include "${Name}SystemComponent.h" namespace ${SanitizedCppName} { diff --git a/Templates/Ros2RoboticManipulationTemplate/Template/Gem/Source/${Name}SystemComponent.cpp b/Templates/Ros2RoboticManipulationTemplate/Template/Gem/Source/${Name}SystemComponent.cpp index f48dd955b1..e88192e24f 100644 --- a/Templates/Ros2RoboticManipulationTemplate/Template/Gem/Source/${Name}SystemComponent.cpp +++ b/Templates/Ros2RoboticManipulationTemplate/Template/Gem/Source/${Name}SystemComponent.cpp @@ -3,7 +3,7 @@ #include #include -#include "${SanitizedCppName}SystemComponent.h" +#include "${Name}SystemComponent.h" namespace ${SanitizedCppName} { diff --git a/Templates/Ros2RoboticManipulationTemplate/Template/Gem/Source/${Name}SystemComponent.h b/Templates/Ros2RoboticManipulationTemplate/Template/Gem/Source/${Name}SystemComponent.h index abdeb6b81b..02d840b970 100644 --- a/Templates/Ros2RoboticManipulationTemplate/Template/Gem/Source/${Name}SystemComponent.h +++ b/Templates/Ros2RoboticManipulationTemplate/Template/Gem/Source/${Name}SystemComponent.h @@ -3,7 +3,7 @@ #include -#include <${SanitizedCppName}/${SanitizedCppName}Bus.h> +#include <${Name}/${Name}Bus.h> namespace ${SanitizedCppName} { diff --git a/Templates/Ros2RoboticManipulationTemplate/Template/project.json b/Templates/Ros2RoboticManipulationTemplate/Template/project.json index 4f9c448c64..aa4e4f4696 100644 --- a/Templates/Ros2RoboticManipulationTemplate/Template/project.json +++ b/Templates/Ros2RoboticManipulationTemplate/Template/project.json @@ -40,6 +40,7 @@ "Compression", "WarehouseAssets", "WarehouseAutomation>=2.0.0", - "ROS2>=3.1.0" + "ROS2>=3.1.0", + "${Name}" ] }