Added all the agriculture assets, that are being transferred to this repository. #6

Jakub-Krakowiak · 2024-09-09T15:50:09Z

depends on #5

Signed-off-by: Artur Kamieniecki <[email protected]>

…ag, PlanterBox, RustedSpade

…r and fixed the NOTICE

Co-authored-by: Paweł Budziszewski <[email protected]>

…om their names

… Gem files: gem.json, NOTICE

Signed-off-by: Jan Hanca <[email protected]>

jhanca-robotecai

I removed from this PR the following gems:

RobotecAgricultureDecorationsAssets - it was merged already in PR added RobotecAgricultureDecorationsAssets gem #5
RobotecAgricultureGradientsAssets - it is not needed
RobotecAgricultureSkyboxesAssets - this was separated to PR Add RobotecAgricultureSkyboxesAssets Gem #8
RobotecAgricultureVegetationAssets - this was separated to PR Add RobotecAgricultureVegetationAssets Gem #7

I believe RobotecAgricultureMaterialsAssets Gem should be removed as not needed and the content of RobotecAgricultureScriptsAssets should be moved to RobotecAgricultureMachines. Additionally, all fbx files should be checked (I have not done it in my review).

RobotecAgricultureMachinesAssets/gem.json

RobotecAgricultureMachinesAssets/NOTICE

jhanca-robotecai · 2024-09-13T08:00:19Z

RobotecAgricultureMachines/gem.json

+    "dependencies": [
+        "RobotecAgricultureMachinesAssets==1.0.0",
+        "RobotecAgricultureScriptsAssets==1.0.0",
+        "ROS2==2.0.0"


This is a big issue if we want to switch between 2310.x and 2409

Yep. And it concerns all gems dependent on ROS, created before O3DE 24.X. I see no easy solution to this issue. At some point, we'll just have to migrate everything, braking the compatibility.

RobotecAgricultureMachines/gem.json

RobotecAgricultureMachines/Assets/Tractor/Tractor.prefab

- Moved all content to one gem - Renamed sprayers - Renamed tractor prefabs - Updated license - Minor fixes Signed-off-by: Paweł Budziszewski <[email protected]>

pawelbudziszewski · 2024-09-17T12:19:51Z

I performed some reorganization and cleaning up:

Moved all content to one gem (which depends on ROS)
Renamed sprayers (it was impossible to guess the difference between SprayerBackpack and TractorSprayer)
Renamed tractor prefabs (added _Ackermann suffix)
Updated license (as pointed out in the review)
Some minor fixes

arturkamieniecki

I've noticed some issues in this PR.

For both of backpack sprayers the root transform is offset from the center (might me intentional)
TractorGenericSmall from farming vehicle assets is broken

In addition the structure of files in this PR is weird. RobotecAgricultureMachines is outside of the Gems folder.

arturkamieniecki · 2024-09-18T09:02:54Z

README.md

@@ -1,2 +1,4 @@
 # robotec-agriculture-assets
 Repository for all agriculture specific O3DE assets
+## Gems
+1. [RobotecAgricultureDecorationsAssets](./RobotecAgricultureDecorationsAssets/)


RobotecAgricultureDecorationsAssets was removed from this PR but is included in the readme.

Agri decoration assets gem was removed from the current PR to #5. README.md is outdated, but I suggest to update it after merging all gems.

The README should be recreated, based on #1. I've created an issue for this: #10

jhanca-robotecai

Only nitpick comments. All assets work in my setup.

jhanca-robotecai · 2024-09-18T07:49:26Z

...es/Assets/BackpackAirSprayer/Models/Materials/Textures/BackpackSprayerCanister_BaseColor.png

What is the difference between BackpackSprayerCanister_BaseColor.png and BackpackSprawyer_BaseColor.png? Do we need both?

These are different textures

RobotecAgricultureMachines/Assets/BackpackAirSprayer/Models/Materials/BackpackSprayer.material

jhanca-robotecai · 2024-09-18T10:55:09Z

TractorGenericSmall from farming vehicle assets is broken

I did not have any problems with this asset.

jhanca-robotecai · 2024-09-18T10:58:21Z

I did not have any problems with this asset.

Correction. It looks good, but it does not drive with the keyboard due to the incorrect script path!

jhanca-robotecai · 2024-09-18T10:59:51Z

Fixed issue: #9

Signed-off-by: Jan Hanca <[email protected]>

Signed-off-by: Paweł Budziszewski <[email protected]>

...to match prefab names Signed-off-by: Paweł Budziszewski <[email protected]>

pawelbudziszewski · 2024-09-19T15:57:27Z

@arturkamieniecki:

I've noticed some issues in this PR.

For both of backpack sprayers the root transform is offset from the center (might me intentional)

It is intentional. The origin of both backpacks is in the same place as the origin of the tractor (if the backpack is attached). So if you spawn a tractor and a backpack in the same coordinates, the backpack will be correctly positioned. This is the easiest solution for positioning both assets if placed on the scene side-by-side.

TractorGenericSmall from farming vehicle assets is broken

Double-checked, works fine for me. Also @jhanca-robotecai tested it.

In addition the structure of files in this PR is weird. RobotecAgricultureMachines is outside of the Gems folder.

I see no reason why we should have an additional folder Gems in such repos. We don't plan to keep templates or projects in them. Did I miss any O3DE recommendations in this case?

I've checked other repos, and we have some inconsistencies. It seems, that in case of all robotec-* repos gems are placed on the root level, while in rosi-* gems are in Gems folder. Is it reasonable to unify this at this point? @jhanca-robotecai, how do you think?

jhanca-robotecai · 2024-09-23T09:54:28Z

I've checked other repos, and we have some inconsistencies. It seems, that in case of all robotec-* repos gems are placed on the root level, while in rosi-* gems are in Gems folder. Is it reasonable to unify this at this point? @jhanca-robotecai, how do you think?

Both are fine for me and this is one of the least important issues. Let's keep it as it is for now and focus on moving more assets to final repos.

jhanca-robotecai

Double-checked all prefabs again, everything works as expected.

arturkamieniecki and others added 16 commits August 27, 2024 13:03

Add lfs tracking

f67b16e

Signed-off-by: Artur Kamieniecki <[email protected]>

added RobotecAgricultureDecorationsAssets Gem with 3 Assets: CompostB…

f4c6a77

…ag, PlanterBox, RustedSpade

updated the README.md and added the Registry folder for AssetProcesso…

2bc0884

…r and fixed the NOTICE

updated the Notice file to better explain where the assets came from

40d05c3

Co-authored-by: Paweł Budziszewski <[email protected]>

reattached meshes and materials to prefabs, removed _Visual suffix fr…

7be5f94

…om their names

reattached meshes and materials

6a7dc6b

added first tractor prefab

4b67733

added Tractor and TractorSmall (both with sensors) prefabs

f4080c8

created prefabs for working tractor, tractor small and sprayer

c48c481

added raw type prefabs of tractor, tractor small and sprayer

ab1ebd6

renamed Sprayer to TractorSprayed and added BackpackSprayer

f4ad33a

added Vegetation, Skyboxes, Materials, Gradients Gems and updated the…

a6cfb6d

… Gem files: gem.json, NOTICE

updated the NOTICE files

0a79978

renamed Skyboxes to fit naming convention

8cd3adc

added MapleTree model CC Attribution

11681c6

added assetinfo to some textures

b7d7655

jhanca-robotecai mentioned this pull request Sep 12, 2024

added RobotecAgricultureDecorationsAssets gem #5

Merged

Base automatically changed from jk/add_agriculture_decorations_assets_gem to main September 12, 2024 11:33

This was referenced Sep 12, 2024

Add RobotecAgricultureVegetationAssets Gem #7

Merged

Add RobotecAgricultureSkyboxesAssets Gem #8

Closed

Remove gems that were merged separately

361f625

Signed-off-by: Jan Hanca <[email protected]>

jhanca-robotecai requested changes Sep 13, 2024

View reviewed changes

Reorganisation

66f9099

- Moved all content to one gem - Renamed sprayers - Renamed tractor prefabs - Updated license - Minor fixes Signed-off-by: Paweł Budziszewski <[email protected]>

arturkamieniecki reviewed Sep 18, 2024

View reviewed changes

jhanca-robotecai approved these changes Sep 18, 2024

View reviewed changes

jhanca-robotecai self-requested a review September 18, 2024 10:59

jhanca-robotecai and others added 3 commits September 18, 2024 15:59

Fix keyboard script path (#9)

2a6291e

Signed-off-by: Jan Hanca <[email protected]>

Cleaned up texture paths in fbx files

0f63b0d

Signed-off-by: Paweł Budziszewski <[email protected]>

Updated material and texture names

ef3c328

...to match prefab names Signed-off-by: Paweł Budziszewski <[email protected]>

jhanca-robotecai approved these changes Sep 23, 2024

View reviewed changes

jhanca-robotecai merged commit 1dc56b8 into main Sep 23, 2024

jhanca-robotecai deleted the jk/add_agriculture_vegetation_and_tractor_gems branch September 23, 2024 10:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added all the agriculture assets, that are being transferred to this repository. #6

Added all the agriculture assets, that are being transferred to this repository. #6

Jakub-Krakowiak commented Sep 9, 2024 •

edited

Loading

jhanca-robotecai left a comment

jhanca-robotecai Sep 13, 2024

pawelbudziszewski Sep 16, 2024

pawelbudziszewski commented Sep 17, 2024

arturkamieniecki left a comment •

edited

Loading

arturkamieniecki Sep 18, 2024

pawelbudziszewski Sep 19, 2024

pawelbudziszewski Sep 19, 2024

jhanca-robotecai left a comment

jhanca-robotecai Sep 18, 2024

pawelbudziszewski Sep 19, 2024

jhanca-robotecai commented Sep 18, 2024

jhanca-robotecai commented Sep 18, 2024

jhanca-robotecai commented Sep 18, 2024

pawelbudziszewski commented Sep 19, 2024

jhanca-robotecai commented Sep 23, 2024

jhanca-robotecai left a comment

Added all the agriculture assets, that are being transferred to this repository. #6

Added all the agriculture assets, that are being transferred to this repository. #6

Conversation

Jakub-Krakowiak commented Sep 9, 2024 • edited Loading

jhanca-robotecai left a comment

Choose a reason for hiding this comment

jhanca-robotecai Sep 13, 2024

Choose a reason for hiding this comment

pawelbudziszewski Sep 16, 2024

Choose a reason for hiding this comment

pawelbudziszewski commented Sep 17, 2024

arturkamieniecki left a comment • edited Loading

Choose a reason for hiding this comment

arturkamieniecki Sep 18, 2024

Choose a reason for hiding this comment

pawelbudziszewski Sep 19, 2024

Choose a reason for hiding this comment

pawelbudziszewski Sep 19, 2024

Choose a reason for hiding this comment

jhanca-robotecai left a comment

Choose a reason for hiding this comment

jhanca-robotecai Sep 18, 2024

Choose a reason for hiding this comment

pawelbudziszewski Sep 19, 2024

Choose a reason for hiding this comment

jhanca-robotecai commented Sep 18, 2024

jhanca-robotecai commented Sep 18, 2024

jhanca-robotecai commented Sep 18, 2024

pawelbudziszewski commented Sep 19, 2024

jhanca-robotecai commented Sep 23, 2024

jhanca-robotecai left a comment

Choose a reason for hiding this comment

Jakub-Krakowiak commented Sep 9, 2024 •

edited

Loading

arturkamieniecki left a comment •

edited

Loading