[All] VisualModel: implement NVI for init/updateVisual() #4827

fredroy · 2024-07-12T05:38:33Z

... and add VisualParameters as a parameter to their signature.

Based on

[Sofa.GL] OglModel: Deprecate/Remove isEnabled Data #4822

Continue on what has been introduced by:

[all] Use NVI design pattern for drawVisual #3931

Little difference, this PR does not only do the NVI thing but it adds the visualparameters as input.
This seems consistent (to me) with the fact that init/update visual as supposed to be called when there is a draw context (like drawVisual).
The nice side effect (and it was the intent at the beginning) is that updatevisual wont be called anymore if the component state is wrong, showVisualModels flag is not set or not enabled.

+ cleanings here and there in the visual/gl components

Unfortunately, breaking ⚠️

[ci-depends-on https://github.com/sofa-framework/SofaPython3/pull/423]
[ci-depends-on https://github.com/sofa-framework/SofaSphFluid/pull/1]

TEMP:
[ci-depends-on https://github.com/sofa-framework/BeamAdapter/pull/153]

By submitting this pull request, I acknowledge that
I have read, understand, and agree SOFA Developer Certificate of Origin (DCO).

Reviewers will merge this pull-request only if

it builds with SUCCESS for all platforms on the CI.
it does not generate new warnings.
it does not generate new unit test failures.
it does not generate new scene test failures.
it does not break API compatibility.
it is more than 1 week old (or has fast-merge label).

sofabot · 2024-07-12T05:41:22Z

[ci-depends-on] detected during build #2.

To unlock the merge button, you must

Merge or close Follow SOFA change for init/updatevisual SofaPython3#423
For this build, SofaPython3/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/SofaPython3
GIT_TAG 50033e58449dbc76a9938a31179cf6069d5ab570

fredroy · 2024-07-12T06:32:03Z

[ci-build][with-all-tests]

sofabot · 2024-07-12T06:32:11Z

[ci-depends-on] detected during build #3.

To unlock the merge button, you must

Merge or close Follow SOFA change for init/updatevisual SofaPython3#423
For this build, SofaPython3/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/SofaPython3
GIT_TAG 50033e58449dbc76a9938a31179cf6069d5ab570
Merge or close Follow Sofa change for init/updatevisual SofaSphFluid#1
For this build, SofaSphFluid/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/SofaSphFluid
GIT_TAG e745fcbb470a2388710ca613d1c11a3003457053

sofabot · 2024-07-12T06:38:57Z

[ci-depends-on] detected during build #4.

To unlock the merge button, you must

Merge or close Follow SOFA change for init/updatevisual SofaPython3#423
For this build, SofaPython3/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/SofaPython3
GIT_TAG 50033e58449dbc76a9938a31179cf6069d5ab570
Merge or close Follow Sofa change for init/updatevisual SofaSphFluid#1
For this build, SofaSphFluid/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/SofaSphFluid
GIT_TAG e745fcbb470a2388710ca613d1c11a3003457053

Sofa/GL/Component/Rendering3D/src/sofa/gl/component/rendering3d/OglModel.cpp

Sofa/GL/Component/Shader/src/sofa/gl/component/shader/Light.cpp

damienmarchal · 2024-07-12T06:49:27Z

Sofa/framework/Core/src/sofa/core/visual/VisualModel.cpp

@@ -54,6 +54,32 @@ void VisualModel::drawVisual(const VisualParams* vparams)
    doDrawVisual(vparams);
 }

+void VisualModel::updateVisual(const VisualParams* vparams)


I have a deep feeling of cleaness when I see this kind of refactoring (factoring things in the base class)

sofabot · 2024-07-12T08:04:53Z

[ci-depends-on] detected during build #5.

To unlock the merge button, you must

Merge or close Follow SOFA change for init/updatevisual SofaPython3#423
For this build, SofaPython3/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/SofaPython3
GIT_TAG 50033e58449dbc76a9938a31179cf6069d5ab570
Merge or close Follow Sofa change for init/updatevisual SofaSphFluid#1
For this build, SofaSphFluid/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/SofaSphFluid
GIT_TAG e745fcbb470a2388710ca613d1c11a3003457053

sofabot · 2024-07-12T08:20:33Z

[ci-depends-on] detected during build #6.

To unlock the merge button, you must

Merge or close Follow SOFA change for init/updatevisual SofaPython3#423
For this build, SofaPython3/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/SofaPython3
GIT_TAG 50033e58449dbc76a9938a31179cf6069d5ab570
Merge or close Follow Sofa change for init/updatevisual SofaSphFluid#1
For this build, SofaSphFluid/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/SofaSphFluid
GIT_TAG e745fcbb470a2388710ca613d1c11a3003457053

sofabot · 2024-07-15T05:37:47Z

[ci-depends-on] detected during build #7.

To unlock the merge button, you must

Merge or close Follow SOFA change for init/updatevisual SofaPython3#423
For this build, SofaPython3/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/SofaPython3
GIT_TAG 50033e58449dbc76a9938a31179cf6069d5ab570
Merge or close Follow Sofa change for init/updatevisual SofaSphFluid#1
For this build, SofaSphFluid/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/SofaSphFluid
GIT_TAG e745fcbb470a2388710ca613d1c11a3003457053

fredroy · 2024-07-16T01:06:03Z

[ci-build][with-all-tests][force-full-build]

sofabot · 2024-07-16T01:06:12Z

[ci-depends-on] detected during build #8.

To unlock the merge button, you must

Merge or close Follow SOFA change for init/updatevisual SofaPython3#423
For this build, SofaPython3/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/SofaPython3
GIT_TAG 50033e58449dbc76a9938a31179cf6069d5ab570
Merge or close Follow Sofa change for init/updatevisual SofaSphFluid#1
For this build, SofaSphFluid/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/SofaSphFluid
GIT_TAG e745fcbb470a2388710ca613d1c11a3003457053
Merge or close [scenes] Fix scene warnings in xml and python BeamAdapter#153
For this build, BeamAdapter/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/BeamAdapter
GIT_TAG 6277256cee40af54c58870a062fd091796c3028f

sofabot · 2024-07-24T00:31:40Z

[ci-depends-on] detected during build #9.

To unlock the merge button, you must

Merge or close Follow SOFA change for init/updatevisual SofaPython3#423
For this build, SofaPython3/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/SofaPython3
GIT_TAG 4e59e1351995920e3f2e16fedf6a9cec2ff407ec
Merge or close Follow Sofa change for init/updatevisual SofaSphFluid#1
For this build, SofaSphFluid/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/SofaSphFluid
GIT_TAG e745fcbb470a2388710ca613d1c11a3003457053

sofabot · 2024-07-25T18:38:27Z

[ci-depends-on] detected during build #10.

To unlock the merge button, you must

Merge or close Follow SOFA change for init/updatevisual SofaPython3#423
For this build, SofaPython3/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/SofaPython3
GIT_TAG 4e59e1351995920e3f2e16fedf6a9cec2ff407ec
Merge or close Follow Sofa change for init/updatevisual SofaSphFluid#1
For this build, SofaSphFluid/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/SofaSphFluid
GIT_TAG e745fcbb470a2388710ca613d1c11a3003457053

sofabot · 2024-07-26T00:38:42Z

[ci-depends-on] detected during build #11.

To unlock the merge button, you must

Merge or close Follow SOFA change for init/updatevisual SofaPython3#423
For this build, SofaPython3/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/SofaPython3
GIT_TAG 0d51e42c961405fceedf5c78904fa76b419f572a
Merge or close Follow Sofa change for init/updatevisual SofaSphFluid#1
For this build, SofaSphFluid/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/SofaSphFluid
GIT_TAG e745fcbb470a2388710ca613d1c11a3003457053

…of them

…l break overriding)

sofabot · 2024-07-26T01:20:26Z

[ci-depends-on] detected during build #12.

To unlock the merge button, you must

Merge or close Follow SOFA change for init/updatevisual SofaPython3#423
For this build, SofaPython3/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/SofaPython3
GIT_TAG 0d51e42c961405fceedf5c78904fa76b419f572a
Merge or close Follow Sofa change for init/updatevisual SofaSphFluid#1
For this build, SofaSphFluid/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/SofaSphFluid
GIT_TAG e745fcbb470a2388710ca613d1c11a3003457053

sofabot · 2024-07-29T08:03:06Z

[ci-depends-on] detected during build #13.

To unlock the merge button, you must

Merge or close Follow SOFA change for init/updatevisual SofaPython3#423
For this build, SofaPython3/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/SofaPython3
GIT_TAG 0d51e42c961405fceedf5c78904fa76b419f572a
Merge or close Follow Sofa change for init/updatevisual SofaSphFluid#1
For this build, SofaSphFluid/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/SofaSphFluid
GIT_TAG e745fcbb470a2388710ca613d1c11a3003457053

hugtalbot · 2024-07-29T08:10:33Z

[ci-build][with-all-tests]

sofabot · 2024-07-29T08:10:44Z

[ci-depends-on] detected during build #14.

All dependencies are merged/closed and all ExternalProject pointers are up-to-date. Congrats! 👍

fredroy added enhancement About a possible enhancement pr: breaking Change possibly inducing a compilation error pr: fix Fix a bug pr: status to review To notify reviewers to review this pull-request pr: clean Cleaning the code labels Jul 12, 2024

fredroy mentioned this pull request Jul 12, 2024

Follow SOFA change for init/updatevisual sofa-framework/SofaPython3#423

Merged

fredroy mentioned this pull request Jul 12, 2024

Follow Sofa change for init/updatevisual sofa-framework/SofaSphFluid#1

Merged

damienmarchal reviewed Jul 12, 2024

View reviewed changes

Sofa/GL/Component/Rendering3D/src/sofa/gl/component/rendering3d/OglModel.cpp Outdated Show resolved Hide resolved

damienmarchal reviewed Jul 12, 2024

View reviewed changes

Sofa/GL/Component/Shader/src/sofa/gl/component/shader/Light.cpp Outdated Show resolved Hide resolved

damienmarchal reviewed Jul 12, 2024

View reviewed changes

fredroy force-pushed the upgrade_updatevisual branch from d4e7b0a to fd4e090 Compare July 24, 2024 00:31

hugtalbot added pr: status ready Approved a pull-request, ready to be squashed and removed pr: status to review To notify reviewers to review this pull-request labels Jul 24, 2024

fredroy force-pushed the upgrade_updatevisual branch from b782d08 to e8a69ca Compare July 26, 2024 00:38

fredroy added 4 commits July 26, 2024 10:20

Use VisualParameters for init and updateVisual; and use NVI for both …

8679785

…of them

apply to Sofa.Component.Visual

fbae82c

apply to Sofa.GL

d3fd613

apply to plugins

f352665

fredroy added 7 commits July 26, 2024 10:20

fix VisualModelImpl

e8a46b9

remove warnings, and add some info for the dev

448b327

use init/updateVisual(vparams) for Geomagic plugin

e5d85a3

use init/updateVisual(vparams) for sensableemu plugin

5cb0ba6

restore possibility to call initvisual() with a deprecation (but stil…

23ccdf8

…l break overriding)

pass visualparams to drawLight

5cce900

fix updatevisual infinite loop in OglShaderVisualModel

4b3a46b

fredroy force-pushed the upgrade_updatevisual branch from e8a69ca to 4b3a46b Compare July 26, 2024 01:20

Merge branch 'master' into upgrade_updatevisual

b1e5b93

hugtalbot merged commit e092b4a into sofa-framework:master Jul 29, 2024
11 checks passed

hugtalbot deleted the upgrade_updatevisual branch July 29, 2024 09:36

hugtalbot added this to the v24.12 milestone Jul 31, 2024

alxbilger mentioned this pull request Aug 1, 2024

[VolumetricRendering.CUDA] Fix compilation after SOFA changes #4879

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[All] VisualModel: implement NVI for init/updateVisual() #4827

[All] VisualModel: implement NVI for init/updateVisual() #4827

fredroy commented Jul 12, 2024 •

edited

Loading

sofabot commented Jul 12, 2024

fredroy commented Jul 12, 2024

sofabot commented Jul 12, 2024

sofabot commented Jul 12, 2024

damienmarchal Jul 12, 2024

sofabot commented Jul 12, 2024

sofabot commented Jul 12, 2024

sofabot commented Jul 15, 2024

fredroy commented Jul 16, 2024

sofabot commented Jul 16, 2024

sofabot commented Jul 24, 2024

sofabot commented Jul 25, 2024

sofabot commented Jul 26, 2024

sofabot commented Jul 26, 2024

sofabot commented Jul 29, 2024

hugtalbot commented Jul 29, 2024

sofabot commented Jul 29, 2024

[All] VisualModel: implement NVI for init/updateVisual() #4827

[All] VisualModel: implement NVI for init/updateVisual() #4827

Conversation

fredroy commented Jul 12, 2024 • edited Loading

sofabot commented Jul 12, 2024

fredroy commented Jul 12, 2024

sofabot commented Jul 12, 2024

sofabot commented Jul 12, 2024

damienmarchal Jul 12, 2024

Choose a reason for hiding this comment

sofabot commented Jul 12, 2024

sofabot commented Jul 12, 2024

sofabot commented Jul 15, 2024

fredroy commented Jul 16, 2024

sofabot commented Jul 16, 2024

sofabot commented Jul 24, 2024

sofabot commented Jul 25, 2024

sofabot commented Jul 26, 2024

sofabot commented Jul 26, 2024

sofabot commented Jul 29, 2024

hugtalbot commented Jul 29, 2024

sofabot commented Jul 29, 2024

fredroy commented Jul 12, 2024 •

edited

Loading