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

Fix devices scale #5751

Merged
merged 3 commits into from
Jan 18, 2023
Merged

Fix devices scale #5751

merged 3 commits into from
Jan 18, 2023

Conversation

BenjaminDeleze
Copy link

The introduction of the root node broke the scale of the devices

@BenjaminDeleze BenjaminDeleze added the bug Something isn't working label Jan 18, 2023
@BenjaminDeleze BenjaminDeleze added this to the R2023b milestone Jan 18, 2023
@BenjaminDeleze BenjaminDeleze requested a review from a team as a code owner January 18, 2023 09:24
@BenjaminDeleze BenjaminDeleze self-assigned this Jan 18, 2023
@BenjaminDeleze BenjaminDeleze marked this pull request as draft January 18, 2023 09:36
@BenjaminDeleze BenjaminDeleze changed the base branch from feature-web-proto to cleanup-web-proto January 18, 2023 10:02
@BenjaminDeleze BenjaminDeleze removed request for a team and ad-daniel January 18, 2023 10:05
@BenjaminDeleze BenjaminDeleze marked this pull request as ready for review January 18, 2023 10:05
@BenjaminDeleze BenjaminDeleze merged commit a87767a into cleanup-web-proto Jan 18, 2023
@BenjaminDeleze BenjaminDeleze deleted the fix-devices-scale branch January 18, 2023 10:06
BenjaminDeleze pushed a commit that referenced this pull request Jan 18, 2023
* remove protos and test.html

* Fix devices scale

* solve todos

* Fix devices scale (#5751)

* Fix devices scale

* solve todos

* remove console.log

* modify colormap

* pose to update

* html
BenjaminDeleze pushed a commit that referenced this pull request Feb 28, 2023
* Add pen optional rendering to the web proto viewer (#5635)

* abstract camera

* buggy

* advance but still buggy

* working frustum

* always enable

* fix scrollbar and improve style

* improvement (linescale + list of cameras)

* enable and disable optional rendering

* all parameters

* display correctly rows

* Update toolbar.css

* style

* cleanup

* Update ProtoCamera.proto

* Update ProtoCamera.proto

* Update resources/web/wwi/nodes/WbAbstractCamera.js

Co-authored-by: ad-daniel <[email protected]>

* Update resources/web/wwi/nodes/WbCamera.js

Co-authored-by: ad-daniel <[email protected]>

* change color

* parent

* split in two methods

* click and co

* rangefinder

* sanitize abstract camera

* Revert "rangefinder"

This reverts commit 8d43b63.

* sanitize

* renable hover correctly

* Revert "Revert "rangefinder""

This reverts commit 83804e5.

* fix near sanitization

* color

* improve style

* correct color

* progress lidar

* progress

* progress

* progress

* progress

* finish lidar

* const

* cleanup lidar and abstract camera

* code done, but not working

* style

* working

* udpates

* lightSensor

* name

* cleanup

* pen

Co-authored-by: ad-daniel <[email protected]>
Co-authored-by: Olivier Michel <[email protected]>

* Add delete function in devices (#5644)

* add delete function in devices

* style

* display connector (#5645)

* Display distance sensor in web proto viewer (#5641)

* distance sensor class

* fix bugs

* updates

* lookuptable parsing

* add and remove

* improve +/-

* +/- row

* updates (buggy)

* missing init of reset button

* send update

* update lookuptable

* reset and gui

* add scale

* wrenjs url

* add missing tooltip

* fix bool

* fix bulma

* Slider joint in web proto viewer (#5660)

* initial implementation (not working)

* initialization

* fixed size

* test on cabinet

* open once

* fix webots:// url handling in local setup

* clean protos

* test.html

* allow more flexibility in urls

* cleanup

* cleanup

* display name

* Enhancement hinge2joints slider (#5664)

* initial implementation (not working)

* initialization

* fixed size

* test on cabinet

* open once

* fix webots:// url handling in local setup

* clean protos

* test.html

* allow more flexibility in urls

* cleanup

* cleanup

* begin

* display

* update

* 1 2

* Ball joint slider (#5668)

* implementation

* fix

* even if no parameters

* Enhancement display axis system for other devices (#5684)

* axis and beginning boundingSphere

* bounding sphere in geometry

* progress

* fix bugs and working version

* fix bug elevationgrid

* typo

* first scaling

* convert to device

* fix delete

* classify some solid as device

* show BO of TouchSensor

* cleanup

* relocate viewpoint (buggy)

* cleanup

* fix moveToViewpoint

* title

* motor

* devices details

* rename

* proto coupled motor

* begin mfstring

* solidreference

* css path

* cleanup

* cleanup

* typos

* improve display

* fix for bulma

* fix default position

* Merge develop in feature-web-proto (#5693)

* Fix infinite dictionary update (#5676)

* Port changes to master branch

* Check if field triggers regeneration before using it after changing the value

* Fix brackets

* Update changelog

* Disable Select button in WbExtendedStringEditor for restricted fields (#5663)

* Update WbExtendedStringEditor.hpp

* Disable select button for restricted fields

* Update changelog-r2023.md

* Fix wrong assertion failure for console redirection (#5671)

* Add null if nothing was read

* Update src/controller/c/robot.c

Co-authored-by: Olivier Michel <[email protected]>

Co-authored-by: Olivier Michel <[email protected]>

* Improve automobile documentation (#5653)

* Add vehicles documentation

* Improve PROTO descriptions and fix default translations

* update icon_creator

* Update images

* Update generated sources

* Update model image

* Add image thumbnails

* Reuse script for generating vehicles doc

* Reuse script for generating vehicles doc

* Fix image path

* Update car.md

* Fix anchors

* Update vehicle-citroen.md

* Update vehicle-lincoln.md

* Update vehicle-range-rover.md

* Update vehicle-tesla.md

* Update vehicle-toyota.md

* Update ToyotaPrius.proto

* Update vehicle-toyota.md

* Update car.md

* Update vehicle-generic.md

* Update BusWheel.proto

* Update vehicle-bmw.md

* Update vehicle-citroen.md

* Update vehicle-toyota.md

* Update BmwX5Wheel.proto

* Update CitroenCZeroFrontWheel.proto

* Update CitroenCZeroRearWheel.proto

* Update ToyotaPrius.proto

* Fix documentation generated from PROTO files

* Fix pep8 error

* Update car.md

* Add car PROTO field descriptions

* Add description to generic vehicle fields

* Regenerate documentation

* Remove duplicated util file

* Add entry in Changelog

* Improve robustness to NaN values in robot window plots (#5680)

* Ignore NaN values when adjusting the plot range

* Add ChangeLog entry

* Better working directory on Windows (#5685)

Co-authored-by: Stefania Pedrazzi <[email protected]>
Co-authored-by: Yannick Goumaz <[email protected]>
Co-authored-by: Olivier Michel <[email protected]>

* Support coupled motors on slider update (#5711)

* Add support for SFNode editing in Web PROTO (#5435)

* init

* Add modal

* List proto nodes

* Load proto-list and parse

* Parse inserted node

* Progress on notification of insertion

* Semi functional node insertion

* cleanup

* add configure button, Allow navigation between sub-proto, Handle NULL nodes

* Progress add-node

* Minor

* Slot filtering

* Filter geometries and appearances

* Fix configure layout

* Add proto icon preview and fix add-node layout

* Change configure button

* Add filter input to layout

* Progress refactoring of NodeSelector

* Finish refactoring

* Restore filtering

* Add accept/cancel buttons, bigger window and cleanup

* Add filtering based on input

* cleanup

* Debug DEF/USE

* Add NULL to node list

* Debug USE/DEF change notifications on webotsJS side

* Remove extra use links

* Fix deletion and insertion propagation

* Functional propagation through USE

* Fix insersion in previously NULL node

* Update button based on selection

* Ensure IS notifications set clones of the origin node

* cleanup

* Highlight selection

* Progress description

* Add description, license, and minor fixes

* Minor

* Fix regeneration

* Debug

* Functional but dirty

* Improve use node notification

* Improve add-node window

* Fix node selector

* Make node selector a separate window and close when clicking outside

* CSS fixes

* Add not found warning

* Remove NULL references

* Add node remover

* Cleanup

* Replace scenetree with root group

* Refactor but broken

* Fix bug

* Commit prior to reset rework

* Rework reset

* Functional reset for sfnode

* Refactor node selector and greatly simplify

* Cleanup

* fix

* add temporary proto list

* cleanup

* Debug partial removal

* Fix deletion rendering bug

* Change css of node button

* Fix back button

* Cleanup node selector

* cleanup x3dscene

* More cleanup

* Add robot descendant check

* Fix checkboxes

* Restore toolbar

* Cleanup

* Remote proto-list

* chrome fixes

* Sort nodes in list

* Use current node as default selection

* Cleanup

* Fix sources

* Fix sources

* Fix loading

* More css fixes

* Fix css again

* Fix progress bar

* Fix progress

* cleanup

* Review fixes

* Fixes

* Debug

* Cleanup

* Debug nested regeneration

* Fix nested proto

* Fix slots

* Fix scenes and animations

* Fix streaming

* Fix margin

* Debug local regeneration

* Cleanup

* Progress

* Fix regeneration

* Cleanup

* Cleanup

* Cleanup

* Finalize

* Missing semicolons

* Review fixes

* Fix vrml writer

* Update resources/web/wwi/FloatingProtoParameterWindow.js

Co-authored-by: Benjamin Délèze <[email protected]>

* Update resources/web/wwi/FloatingProtoParameterWindow.js

Co-authored-by: Benjamin Délèze <[email protected]>

* Update resources/web/wwi/FloatingProtoParameterWindow.js

Co-authored-by: Benjamin Délèze <[email protected]>

* Update resources/web/wwi/X3dScene.js

Co-authored-by: Benjamin Délèze <[email protected]>

Co-authored-by: Benjamin Délèze <[email protected]>

* Add support for field restrictions to web proto (#5720)

* Progress

* Add restriced string insertion

* Add SFFloat restrictions

* Add all other types

* Use selection index to insert

* Handle unsupported types

* Add reset functionality and selection

* Add support for restricted SFNodes

* Fixes

* Cleanup

* Fix refresh for SFNodes

* Fix error

* Finalize

* Review fixes

* Web proto viewer: add support for missing parameters type (#5718)

* refactor and sfvec2

* sfcolor

* fix bug when urls built from js

* MFString

* mfvec2

* mfFloat

* mfint

* MFBool

* add mfRotation

* cleanup

* mfcolor

* fix delete bug

* cleanup

* correct reset

* mf beginning

* Cleanup parameters (#5721)

* remove useless function parameter

* trash position

* clean up trash position

* correct padding of letters

* sfnode

* refactor mf pipeline

* addition cleanup

* furter simplify

* restore css address

* Update resources/web/wwi/FloatingProtoParameterWindow.js

Co-authored-by: ad-daniel <[email protected]>

* remove isInt

Co-authored-by: ad-daniel <[email protected]>

Co-authored-by: ad-daniel <[email protected]>

* Add support for MFNode in web proto (#5728)

* refactor and sfvec2

* sfcolor

* fix bug when urls built from js

* MFString

* mfvec2

* mfFloat

* mfint

* MFBool

* add mfRotation

* cleanup

* mfcolor

* fix delete bug

* cleanup

* correct reset

* mf beginning

* Cleanup parameters (#5721)

* remove useless function parameter

* trash position

* clean up trash position

* correct padding of letters

* sfnode

* refactor mf pipeline

* addition cleanup

* furter simplify

* restore css address

* Update resources/web/wwi/FloatingProtoParameterWindow.js

Co-authored-by: ad-daniel <[email protected]>

* remove isInt

Co-authored-by: ad-daniel <[email protected]>

* Progress

* Progress

* Progress

* Functional insertion and removal

* Fix configure button

* Fix delete row button

* Attempts

* Minor

* Fix deletion

* Funtional MFNode insertion, deletion, changea and refresh

* Fix reset

* Cleanup

* Fixes

* Fix css

* Minor

* Minor

* Minor

* Fix insertion rules

* Fix multiple MF

* Fix list

* Fix alignment

* Update resources/web/wwi/FloatingProtoParameterWindow.js

Co-authored-by: Benjamin Délèze <[email protected]>

* Update resources/web/wwi/FloatingProtoParameterWindow.js

Co-authored-by: Benjamin Délèze <[email protected]>

* Update resources/web/wwi/FloatingProtoParameterWindow.js

Co-authored-by: Benjamin Délèze <[email protected]>

* Update resources/web/wwi/FloatingProtoParameterWindow.js

Co-authored-by: Benjamin Délèze <[email protected]>

* Update resources/web/wwi/FloatingProtoParameterWindow.js

Co-authored-by: Benjamin Délèze <[email protected]>

* Update resources/web/wwi/NodeSelectorWindow.js

Co-authored-by: Benjamin Délèze <[email protected]>

* Update resources/web/wwi/NodeSelectorWindow.js

Co-authored-by: Benjamin Délèze <[email protected]>

* Update resources/web/wwi/protoVisualizer/Vrml.js

Co-authored-by: Benjamin Délèze <[email protected]>

* Fix useless import

Co-authored-by: BenjaminDeleze <[email protected]>

* handle blank field (#5730)

* Enhancement sphere for appearances (#5731)

* Sphere for appearances

* remove transformid

* modularize

* Fix notification after regeneration (#5733)

* Fix grass

* Fix USE-DEF

* Finalize

* Fix transparency in webotsjs (#5735)

* Fix transparency

* Fixes

* Enhancement tab (#5737)

* tabs

* repopulate on MFNode

* update on mf change

* sf

* fix bug and simplify

* improvement

* Update resources/web/wwi/FloatingProtoParameterWindow.js

Co-authored-by: Olivier Michel <[email protected]>

* rename

* fix html

Co-authored-by: Olivier Michel <[email protected]>

* Add documentation to webots.cloud (#5734)

* nao md

* nao

* img

* rename

* move folder

* test

* test

* url

* change documentation link

* links

* file location

* add nao license

* insertbefore correct

* appearance

* change

* correct

* remove print

* unified font

* hide useless tabs

* cleanup

* blank

* typo

* cleanup

* change nao url

* additional links

* thumbnail

* grass thumbnail

* remove thumbnail

* omit docs images from test sources

* remove docs images from assets cache

* restore doc

* missing export

* restore reference

* cleanup

* test url

* doc

* yaml

* yaml

* missing export

* update md and for

* Enhancement get rid of proto list for webotsjs (#5749)

* finialize prerequisite

* finalize

* missing image

* Cleanup web proto viewer (#5750)

* remove protos and test.html

* Fix devices scale

* solve todos

* Fix devices scale (#5751)

* Fix devices scale

* solve todos

* remove console.log

* modify colormap

* pose to update

* html

* cleanup

* let to const

* let

* log

* Update resources/web/wwi/nodes/WbAbstractAppearance.js

Co-authored-by: ad-daniel <[email protected]>

* Update resources/web/wwi/nodes/WbIndexedFaceSet.js

Co-authored-by: ad-daniel <[email protected]>

* Update resources/web/wwi/ProtoManager.js

Co-authored-by: ad-daniel <[email protected]>

* remove translatioN

* yaml

* doc

* folder

* test multiplier

* revert

* add multiplier

* irb

* doc

* wrong branch

* docs

* adept

* pionneer

* Add multiplier support for web protos (#5756)

* yaml

* doc

* folder

* test multiplier

* revert

* add multiplier

* change initial position

* Update Portal.proto

* Add description to basenode_encode.py

* Update scripts/packaging/files_core.txt

Co-authored-by: Olivier Michel <[email protected]>

* Fix template engine

* tolerance lower

* comment html

* fix hinge2 and balljoint

* add a add button for mf field (#5764)

* fix import

* new fieldModel

* css scroll

* fix bug

* Fix floating window resize (#5772)

* z-index

* Rework node building logic, remove node cloning & fix several issues (#5794)

* 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

* Remove unused material references (#5800)

* remove unreferenced

* More

* Fix missing mtl import (#5802)

* Fix web proto issues related to vehicles (#5811)

* 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

* Fix link (#5830)

* Enhancement display of vectors (#5831)

* remove label

* title

* reduce space

---------

Co-authored-by: Olivier Michel <[email protected]>

* replace urls

* portal

* typo

* typo

* doc crazyflie

* url

* irb doc url

* doc url

* yaml

* boston, moose

* pr2

* mavic2

* url

* default translation

* yaml

* biorob

* ghostdog default translation

* salamander

* alignement

* cleanup

* blimp

* move md

* links

* scarat6

* name

* naming

* doc

* robotino doc

* robotino3

* doc

* panda

* panda md

* hoap2

* hoap2

* panda test

* elisa3

* e-puck

* update md

* rosbot

* create

* md

* tinkerbot

* tinkerbots

* khr2

* khr3hv

* rename

* test

* hemisson

* fix add button on mfnode reset

* khepera

* koala

* kukabox

* youbot

* md

* proto link released

* Enhancement webotsjs propeller (#5864)

* change tag

* propeller

* cleanup

* slider

* Update resources/web/wwi/nodes/WbPropeller.js

Co-authored-by: Olivier Michel <[email protected]>

---------

Co-authored-by: Olivier Michel <[email protected]>

* tinkerbotbase

* test

* documentation tinkerbots

* doc husarion

* tinkerbots.com

* mindstorm

* naming

* mantis

* doc url

* translation

* mir100

* thymio

* link

* add documentation url to appearance

* sojourner

* sojourner offset

* fix md

* rename

* 3at anchor

* ipr

* iprs

* urls

* remove icub

* Scout

* firebird

* ned

* ned

* proto

* jetbot

* remove md

* fix jetbot

* tiago

* rename md

* boebot

* link

* fix IPR table

* base translation

* microbot

* fabtino

* fabtino

* bioloid

* rename

* remove figure ref

* darwin-op

* proto

* rename tiago++ in tiagopp

* rename tiago++

* missing file

* turtlebot

* summit_xl

* summit

* altino

* altino

* proto doc url

* offset

* aibo

* namin

* qrio

* bb8

* naming

* surveyor

* fix surveyor

* puma

* typo

* test

* yaml

* ure

* test

* released

* typos

* Slot Tiago (#5911)

* front arm and body

* slots

* protos and docs

* fix urdf test

* fix doc

* test

* doc url

* fix bioloiddog md

* link robotisop2

* moose translation

* cleanup

* first batch github link

* github url progress

* github links

* fix links

* fix links

* fix name

* fix path

* typos

* remove private video

* typo

---------

Co-authored-by: ad-daniel <[email protected]>
Co-authored-by: Olivier Michel <[email protected]>
Co-authored-by: Stefania Pedrazzi <[email protected]>
Co-authored-by: Yannick Goumaz <[email protected]>
Co-authored-by: ad-daniel <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Development

Successfully merging this pull request may close these issues.

1 participant