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.

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

Enhancement led support #5850

Merged
merged 157 commits into from
Feb 7, 2023
Merged

Enhancement led support #5850

merged 157 commits into from
Feb 7, 2023

Conversation

BenjaminDeleze
Copy link

@BenjaminDeleze BenjaminDeleze commented Feb 7, 2023

Description

Add led support for web protos.

It is possible that the color keyword is present in the x3d but is not associated with any value. It is the case when the LED is a rgb gradual LED. In this case, we set the LED to the default color: red.

Concerning the Tesla (and other vehicles) protos, we can have the impression that the representation of some LEDs does not work. However this is because the vehicles have LEDs without children (all the LEDs are present in the generic car but the Tesla does not fill all the fields)

Test it here:

https://webots.cloud/run?version=R2023b&url=https://github.com/ad-daniel/prefab/blob/master/protoExamples/protos/tesla/TeslaModel3.proto&type=undefined

https://webots.cloud/run?version=R2023b&url=https://github.com/cyberbotics/webots/blob/develop/projects/robots/softbank/nao/protos/Nao.proto&type=undefined

Benjamin Délèze and others added 15 commits January 31, 2023 10:00
* Progress

* Progress

* Progress

* Minimal functionality

* Fix encoder

* Fix simple updates

* Fix SFNode insertion

* Fix sfnode reset

* Restore regeneration

* Functional derived PROTO

* Restore restrictions

* Potential basetype structure

* Fix IS poses

* Revert "Potential basetype structure"

This reverts commit 7f05090.

* Fix grass

* Derived tests

* Rework parameter links

* Progress

* Reintroduce baseType instance

* Fix regeneration

* Rework how derived nodes are stored and fix issues with change propagation

* Implement DEF-USE

* Fix SFRotation

* Fix some issues with MFNode

* Fix issues with SFNode

* Fix more issues

* Progress in delinking instances

* Progress in delinking instances

* Fix id flagging

* Rework webotsjs notification of node changes

* Rework regeneration

* Rework MFNode insertion/removal

* Fix MF insertion & finalization issues

* Rework Parameter class

* Cleanup

* Fix MF removing too many nodes

* Fix unfinalization of sfnodes

* Cleanup

* Progress on default initializer

* functional proof of concept for default complex fields

* Debug asyncronicity

* Fix node generation in PROTO with special fields

* Fix sfnode reset

* replace default value with tokenizer in all proto models

* Status

* Fix grass

* Debug templating issue

* Fix templating

* Fix tokenizer consumption

* Debug

* Fix derived node parameters not propagating

* Cleanup Node

* Cleanup vrml

* Cleanup Parameters

* Cleanup ProtoManager

* Remove isUse

* Fix mfnode reset

* Cleanup

* Fix MFNode restrictions

* Rename parameter linksg

* improve rewind

* Merge methods

* Cleanup

* Cleanup

* Fix slot issues

* Finalize

* Fix MFFields

* Fix basenode

* Improve

* Minor

* Fix moose

* Fix slots

* Debug

* Fix Tesla

* Progress proto rework

* improve wheel proto

* Cleanup

* Fix texture url update

* Fix texture update

* Fix Tesla PROTO

* Fix

* Fix tesla lights

* Cleanup

* Finalize

* Fix

* Fix

* Fix disappering joints

* Fix joints tab on tesla

* actually commit BO fix

* Fix exporter

* Fix Nao hand slot
* remove label

* title

* reduce space

---------

Co-authored-by: Olivier Michel <[email protected]>
@BenjaminDeleze BenjaminDeleze added the enhancement Implementation of a minor feature label Feb 7, 2023
@BenjaminDeleze BenjaminDeleze added this to the R2023b milestone Feb 7, 2023
@BenjaminDeleze BenjaminDeleze self-assigned this Feb 7, 2023
@BenjaminDeleze BenjaminDeleze marked this pull request as ready for review February 7, 2023 12:50
@BenjaminDeleze BenjaminDeleze requested a review from a team as a code owner February 7, 2023 12:50
@ygoumaz ygoumaz requested a review from omichel February 7, 2023 13:04
@BenjaminDeleze BenjaminDeleze marked this pull request as draft February 7, 2023 13:24
@BenjaminDeleze
Copy link
Author

As discussed I changed the color to white when there is an empty list.

You can see it in the Nao example

@BenjaminDeleze BenjaminDeleze marked this pull request as ready for review February 7, 2023 13:31
Copy link
Member

@omichel omichel left a comment

Choose a reason for hiding this comment

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

Great, thank you.

@BenjaminDeleze BenjaminDeleze merged commit d53b15f into develop Feb 7, 2023
@BenjaminDeleze BenjaminDeleze deleted the enhancement-led-support branch February 7, 2023 14:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Implementation of a minor feature
Development

Successfully merging this pull request may close these issues.

3 participants