Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix template preview images; add obj #586

Merged
merged 3 commits into from
Oct 30, 2023
Merged

fix template preview images; add obj #586

merged 3 commits into from
Oct 30, 2023

Conversation

jhanca-robotecai
Copy link
Contributor

Closes #556

This PR fixes two problems with templates:

  1. It adds .obj format to registry settings ensuring, that .obj files can be imported when a project is generated based on the template following the default behavior of o3de
  2. It updates preview images for templates (corrects aspect ratio), the images are the following:
    preview3x

All aspect ratio seems fixed now:

jhanca@jhanca-buntu ~/devroot/dev_o3de-extras [jh/update_templates]
± % find | grep preview.png | xargs identify -ping -format '%i: %w %h\n'
./Templates/Multiplayer/preview.png: 140 140
./Templates/Multiplayer/Template/preview.png: 210 280
./Templates/Multiplayer/Template/Gem/preview.png: 140 80
./Templates/Ros2FleetRobotTemplate/preview.png: 140 140
./Templates/Ros2FleetRobotTemplate/Template/preview.png: 210 280
./Templates/Ros2RoboticManipulationTemplate/preview.png: 140 140
./Templates/Ros2RoboticManipulationTemplate/Template/preview.png: 210 280
./Templates/Ros2ProjectTemplate/preview.png: 140 140
./Templates/Ros2ProjectTemplate/Template/preview.png: 210 280
./Projects/OpenXRTest/preview.png: 210 280
./Gems/ProteusRobot/preview.png: 140 80
./Gems/RosRobotSample/preview.png: 140 80
./Gems/WarehouseSample/preview.png: 140 80
./Gems/MachineLearning/preview.png: 140 80
./Gems/WarehouseAutomation/preview.png: 140 80
./Gems/WarehouseAssets/preview.png: 140 80
./Gems/XR/preview.png: 70 40
./Gems/ROS2/preview.png: 140 80
./Gems/AzQtComponentsForPython/preview.png: 70 40
./Gems/OpenXRVk/preview.png: 70 40

@jhanca-robotecai
add obj format to importer registry
5abc5e5 
Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>
@jhanca-robotecai
update template preview images
7ad2b5e 
Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>
@spham-amzn
Copy link
Contributor

Can you also update the display name for the Manipulation Robot Template? Maybe call it "ROS2 Robotic Manipulation Template"

@jhanca-robotecai
fix Ros2RoboticManipulationTemlate template.json
2c342c2 
Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>
@jhanca-robotecai
Copy link
Contributor Author

Can you also update the display name for the Manipulation Robot Template? Maybe call it "ROS2 Robotic Manipulation Template"

I set ROS2 Robotic Manipulation name to match the other templates. I also removed an extra template.json file from the Source directory, I believe it was pushed by mistake.

spham-amzn
spham-amzn approved these changes Oct 20, 2023
View reviewed changes
Copy link
Contributor

@spham-amzn spham-amzn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks Good

@michalpelka michalpelka merged commit 23774c5 into o3de:development Oct 30, 2023
2 checks passed
@jhanca-robotecai jhanca-robotecai deleted the jh/update_templates branch November 7, 2023 14:01
michalpelka pushed a commit to RobotecAI/o3de-extras that referenced this pull request Nov 17, 2023
@jhanca-robotecai @michalpelka
fix template preview images; add obj (o3de#586)
6ea799f 
* add obj format to importer registry
* update template preview images
* fix Ros2RoboticManipulationTemlate template.json
---------
Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>
michalpelka pushed a commit to RobotecAI/o3de-extras that referenced this pull request Nov 17, 2023
@jhanca-robotecai @michalpelka
fix template preview images; add obj (o3de#586)
2a9e41a 
* add obj format to importer registry
* update template preview images
* fix Ros2RoboticManipulationTemlate template.json
---------
Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>
michalpelka pushed a commit to RobotecAI/o3de-extras that referenced this pull request Nov 17, 2023
@jhanca-robotecai @michalpelka
fix template preview images; add obj (o3de#586)
21c189d 
* add obj format to importer registry
* update template preview images
* fix Ros2RoboticManipulationTemlate template.json
---------
Signed-off-by: Jan Hanca <134940295+jhanca-robotecai@users.noreply.github.com>
adamdbrw added a commit that referenced this pull request Nov 24, 2023
@michalpelka @jhanca-robotecai
@adamdbrw @arturkamieniecki
Cherry pick recent changes from developement to point release 23.10.1 (…
19d7c72 
…#614)

* fix template preview images; add obj (#586)

* add obj format to importer registry
* update template preview images
* fix Ros2RoboticManipulationTemlate template.json
---------
Signed-off-by: Jan Hanca <134940295+jhanca-robotecai@users.noreply.github.com>

* Updated readmes to include new features, fix typos etc. (#580)

* Updated readmes to include new features, fix typos etc.
* Update Gems/ROS2/README.md
---------
Signed-off-by: Adam Dąbrowski <adam.dabrowski@robotec.ai>
Co-authored-by: Paweł Budziszewski <pawel.budziszewski@robotec.ai>

* Broadcast transforms en masse (#584)

Signed-off-by: Adam Dąbrowski <adam.dabrowski@robotec.ai>

* Change kinematic update to pre-simulation (#583)

Signed-off-by: Adam Dąbrowski <adam.dabrowski@robotec.ai>

* Change spawnning of robots during import (#598)

* Change spawnning of robots during import

---------

Signed-off-by: Artur Kamieniecki <130671280+arturkamieniecki@users.noreply.github.com>

* Change reflect in spawn points (#602)

Signed-off-by: Artur Kamieniecki <130671280+arturkamieniecki@users.noreply.github.com>

* fix lidars in ROSBot prefabs (#588)

Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>
Signed-off-by: Michał Pełka <michal.pelka@robotec.ai>

---------

Signed-off-by: Adam Dąbrowski <adam.dabrowski@robotec.ai>
Signed-off-by: Artur Kamieniecki <130671280+arturkamieniecki@users.noreply.github.com>
Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>
Signed-off-by: Michał Pełka <michal.pelka@robotec.ai>
Co-authored-by: Jan Hanca <134940295+jhanca-robotecai@users.noreply.github.com>
Co-authored-by: Adam Dąbrowski <adam.dabrowski@robotec.ai>
Co-authored-by: Artur Kamieniecki <130671280+arturkamieniecki@users.noreply.github.com>
adamdbrw pushed a commit that referenced this pull request Nov 24, 2023
@jhanca-robotecai @adamdbrw
fix template preview images; add obj (#586)
d60967c 
* add obj format to importer registry
* update template preview images
* fix Ros2RoboticManipulationTemlate template.json
---------
Signed-off-by: Jan Hanca <134940295+jhanca-robotecai@users.noreply.github.com>
adamdbrw pushed a commit that referenced this pull request Nov 24, 2023
@jhanca-robotecai @adamdbrw
fix template preview images; add obj (#586)
740f72e 
* add obj format to importer registry
* update template preview images
* fix Ros2RoboticManipulationTemlate template.json
---------
Signed-off-by: Jan Hanca <134940295+jhanca-robotecai@users.noreply.github.com>

Signed-off-by: Adam Dąbrowski <adam.dabrowski@robotec.ai>
michalpelka pushed a commit that referenced this pull request Nov 28, 2023
@jhanca-robotecai @michalpelka
fix template preview images; add obj (#586)
24d0957 
* add obj format to importer registry
* update template preview images
* fix Ros2RoboticManipulationTemlate template.json
---------
Signed-off-by: Jan Hanca <134940295+jhanca-robotecai@users.noreply.github.com>

Signed-off-by: Adam Dąbrowski <adam.dabrowski@robotec.ai>
@michalpelka michalpelka mentioned this pull request Nov 30, 2023
Open
michalpelka added a commit that referenced this pull request Dec 6, 2023
@michalpelka @jhanca-robotecai
@adamdbrw @arturkamieniecki
Cherry pick recent changes from developement to point release 23.10.1 (…
05c17b4 
…#614)

* fix template preview images; add obj (#586)

* add obj format to importer registry
* update template preview images
* fix Ros2RoboticManipulationTemlate template.json
---------
Signed-off-by: Jan Hanca <134940295+jhanca-robotecai@users.noreply.github.com>

* Updated readmes to include new features, fix typos etc. (#580)

* Updated readmes to include new features, fix typos etc.
* Update Gems/ROS2/README.md
---------
Signed-off-by: Adam Dąbrowski <adam.dabrowski@robotec.ai>
Co-authored-by: Paweł Budziszewski <pawel.budziszewski@robotec.ai>

* Broadcast transforms en masse (#584)

Signed-off-by: Adam Dąbrowski <adam.dabrowski@robotec.ai>

* Change kinematic update to pre-simulation (#583)

Signed-off-by: Adam Dąbrowski <adam.dabrowski@robotec.ai>

* Change spawnning of robots during import (#598)

* Change spawnning of robots during import

---------

Signed-off-by: Artur Kamieniecki <130671280+arturkamieniecki@users.noreply.github.com>

* Change reflect in spawn points (#602)

Signed-off-by: Artur Kamieniecki <130671280+arturkamieniecki@users.noreply.github.com>

* fix lidars in ROSBot prefabs (#588)

Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>
Signed-off-by: Michał Pełka <michal.pelka@robotec.ai>

---------

Signed-off-by: Adam Dąbrowski <adam.dabrowski@robotec.ai>
Signed-off-by: Artur Kamieniecki <130671280+arturkamieniecki@users.noreply.github.com>
Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>
Signed-off-by: Michał Pełka <michal.pelka@robotec.ai>
Co-authored-by: Jan Hanca <134940295+jhanca-robotecai@users.noreply.github.com>
Co-authored-by: Adam Dąbrowski <adam.dabrowski@robotec.ai>
Co-authored-by: Artur Kamieniecki <130671280+arturkamieniecki@users.noreply.github.com>
michalpelka pushed a commit that referenced this pull request Dec 6, 2023
@jhanca-robotecai @michalpelka
fix template preview images; add obj (#586)
e083824 
* add obj format to importer registry
* update template preview images
* fix Ros2RoboticManipulationTemlate template.json
---------
Signed-off-by: Jan Hanca <134940295+jhanca-robotecai@users.noreply.github.com>

Signed-off-by: Adam Dąbrowski <adam.dabrowski@robotec.ai>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michalpelka michalpelka michalpelka approved these changes

@spham-amzn spham-amzn spham-amzn approved these changes

@adamdbrw adamdbrw Awaiting requested review from adamdbrw

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

The preview image for the ROS2 Project Template and ROS2 Fleet Robot Templates are the wrong size
3 participants
@jhanca-robotecai @spham-amzn @michalpelka