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

move texture on conveyor belt mesh #21

Merged
merged 8 commits into from
Jun 28, 2023
Merged

move texture on conveyor belt mesh #21

merged 8 commits into from
Jun 28, 2023

Conversation

jhanca-robotecai
Copy link

  • add functionality to move texture on conveyor belt mesh (using speed parameter)
  • add mesh and textures to ROS2 assets
  • fix typos

@jhanca-robotecai
Copy link
Author

jhanca-robotecai commented Jun 26, 2023 •
edited
Loading

It was tested using the empty level with the following setup:
image

@jhanca-robotecai
Copy link
Author

PR updated to the newest conveyor belt model, tested with level robotic_test of o3de-physics-test-scene robotic_arm_template commit ec99bd4c2759f997a5cae2a9c7bf2b370d69df80

in which conveyor belt physics component needs to be connected with the mesh+material component:
image

@jhanca-robotecai
Copy link
Author

Added another commit with material selector for the physics.

@jhanca-robotecai
Copy link
Author

jhanca-robotecai commented Jun 28, 2023 •
edited
Loading

Another commit with texture scaling added (it allows to change the speed of the texture movement if the mesh/texture size is different than 1 meter)

image

@michalpelka
Copy link
Collaborator

looks ok, please keep this PR only with code, no assets.

@jhanca-robotecai
remove obsolete assets
2b28120 
Signed-off-by: Jan Hanca <[email protected]>
@jhanca-robotecai
Copy link
Author

jhanca-robotecai commented Jun 28, 2023 •
edited
Loading

looks ok, please keep this PR only with code, no assets.

I removed the assets

@michalpelka michalpelka merged commit 2af4d45 into RobotecAI:mp/conveyor_belt Jun 28, 2023
michalpelka pushed a commit that referenced this pull request Jun 29, 2023
@jhanca-robotecai @michalpelka
move texture on conveyor belt mesh (#21)
7dd700f 
* comment out asserts
* add moving texture to belt
* add conveyor belt asset
* revert comment out asserts; remove debug code
* add entity id; change v->u in texture move
* add material selector to belt physics
* add texture scaling factor
* remove obsolete assets
---------

Signed-off-by: Jan Hanca <[email protected]>
Signed-off-by: Michał Pełka <[email protected]>
michalpelka pushed a commit that referenced this pull request Jun 29, 2023
@jhanca-robotecai @michalpelka
move texture on conveyor belt mesh (#21)
3ec57c7 
* comment out asserts
* add moving texture to belt
* add conveyor belt asset
* revert comment out asserts; remove debug code
* add entity id; change v->u in texture move
* add material selector to belt physics
* add texture scaling factor
* remove obsolete assets
---------

Signed-off-by: Jan Hanca <[email protected]>
Signed-off-by: Michał Pełka <[email protected]>
michalpelka pushed a commit that referenced this pull request Jul 6, 2023
@jhanca-robotecai @michalpelka
move texture on conveyor belt mesh (#21)
9edd6b4 
* comment out asserts
* add moving texture to belt
* add conveyor belt asset
* revert comment out asserts; remove debug code
* add entity id; change v->u in texture move
* add material selector to belt physics
* add texture scaling factor
* remove obsolete assets
---------

Signed-off-by: Jan Hanca <[email protected]>
Signed-off-by: Michał Pełka <[email protected]>
michalpelka pushed a commit that referenced this pull request Jul 7, 2023
@jhanca-robotecai @michalpelka
move texture on conveyor belt mesh (#21)
1c05c21 
* comment out asserts
* add moving texture to belt
* add conveyor belt asset
* revert comment out asserts; remove debug code
* add entity id; change v->u in texture move
* add material selector to belt physics
* add texture scaling factor
* remove obsolete assets
---------

Signed-off-by: Jan Hanca <[email protected]>
Signed-off-by: Michał Pełka <[email protected]>
@jhanca-robotecai jhanca-robotecai deleted the jh/conveyor_belt branch July 13, 2023 10:25
@jhanca-robotecai jhanca-robotecai restored the jh/conveyor_belt branch July 13, 2023 10:25
michalpelka added a commit that referenced this pull request Jul 21, 2023
@michalpelka @jhanca-robotecai
@adamdbrw @spham-amzn
Kinematic based implementation of conveyor belt
984a371 
move texture on conveyor belt mesh (#21)
Add ConveyorBeltRequestBus (#24)

Co-authored-by: Jan Hanca <[email protected]>
Co-authored-by: Adam Dąbrowski <[email protected]>
Co-authored-by: Steve Pham <[email protected]>
Signed-off-by: Michał Pełka <[email protected]>
michalpelka added a commit that referenced this pull request Jul 27, 2023
@michalpelka @jhanca-robotecai
@adamdbrw @spham-amzn
Kinematic based implementation of conveyor belt (o3de#367)
363a184 
- move texture on conveyor belt mesh (#21)
- Add ConveyorBeltRequestBus (#24)

Co-authored-by: Jan Hanca <[email protected]>
Co-authored-by: Adam Dąbrowski <[email protected]>
Co-authored-by: Steve Pham <[email protected]>
Signed-off-by: Michał Pełka <[email protected]>
MateuszWasilewski pushed a commit that referenced this pull request Oct 11, 2023
@amzn-changml
Merge pull request #21 from aws-lumberyard-dev/fix_bracket
a6d1dfb 
fix bracket
MateuszWasilewski pushed a commit that referenced this pull request Oct 11, 2023
@adamdbrw
Applied corresponding review remarks for #21
1d6d262 
Signed-off-by: Adam Dąbrowski <[email protected]>
MateuszWasilewski pushed a commit that referenced this pull request Oct 11, 2023
@adamdbrw
applied review remark from #21
cad8661 
Signed-off-by: Adam Dąbrowski <[email protected]>
@jhanca-robotecai jhanca-robotecai deleted the jh/conveyor_belt branch November 7, 2023 14:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jhanca-robotecai @michalpelka