[Core] Merge Context into BaseContext by damienmarchal · Pull Request #6266 · sofa-framework/sofa

damienmarchal · 2026-08-27T15:24:24Z

The Context class is the only implementation of BaseContext.
This extra layer is probably over-engineered, so I merge the two.
Ideally BaseContext should have been merged down into Context.... but given that it would generate a huge amount of code change I prefer to merge Context up in BaseContext.

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

[with-all-tests]

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).

- BaseContext is now a concrete class with Data members (is_activated, worldGravity_, dt_, time_, animate_, d_isSleeping, d_canChangeSleepingState) - All Context methods implemented in BaseContext - Node now inherits directly from BaseNode and BaseContext (instead of Context) - Context class kept as compatibility layer, inheriting from BaseContext - Updated includes in Contact.h, UniformMass.inl, VisualStyle.cpp, Main.cpp - Fixed casts in Node.cpp to use BaseContext instead of Context Generated by Mistral Vibe. Co-Authored-By: Mistral Vibe <vibe@mistral.ai>

sofabot · 2026-09-02T07:20:52Z

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

To unlock the merge button, you must

Merge or close Apply changes from PR #6266 SofaPython3#636
For this build, the following CMake flags will be set
-DSOFAPYTHON3_GIT_REPOSITORY='https://github.com/sofa-framework/SofaPython3'
-DSOFAPYTHON3_GIT_TAG='342fbf9bebdc16bc65246dd001b6e5a41a9abf39'

sofabot · 2026-09-02T09:25:17Z

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

To unlock the merge button, you must

Merge or close Apply changes from PR #6266 SofaPython3#636
For this build, the following CMake flags will be set
-DSOFAPYTHON3_GIT_REPOSITORY='https://github.com/sofa-framework/SofaPython3'
-DSOFAPYTHON3_GIT_TAG='342fbf9bebdc16bc65246dd001b6e5a41a9abf39'

damienmarchal · 2026-09-02T13:28:02Z

Beware, sadly the PR does not compile on windows (on linux/clang it is ok), this is caused by a subtle problem related to a circular include dependency between BaseComponent and BaseContext.
BaseComponent need the full definition of BaseContext to provide the default implemetation of the create static metho
BaseContext needs BaseComponent's because the addObject method is going through a sptr which rely in intrusive_ptr, which imply intrusion in BaseComponent.

I'm not sure I will be able to fix that, any idea welcome.

To fix compilation issue on windows.

sofabot · 2026-09-02T14:03:59Z

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

To unlock the merge button, you must

Merge or close Apply changes from PR #6266 SofaPython3#636
For this build, the following CMake flags will be set
-DSOFAPYTHON3_GIT_REPOSITORY='https://github.com/sofa-framework/SofaPython3'
-DSOFAPYTHON3_GIT_TAG='342fbf9bebdc16bc65246dd001b6e5a41a9abf39'

sofabot · 2026-09-03T12:36:00Z

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

To unlock the merge button, you must

Merge or close Apply changes from PR #6266 SofaPython3#636
For this build, the following CMake flags will be set
-DSOFAPYTHON3_GIT_REPOSITORY='https://github.com/sofa-framework/SofaPython3'
-DSOFAPYTHON3_GIT_TAG='342fbf9bebdc16bc65246dd001b6e5a41a9abf39'

alxbilger · 2026-09-04T07:06:10Z

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

sofabot · 2026-09-04T07:06:19Z

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

To unlock the merge button, you must

Merge or close Apply changes from PR #6266 SofaPython3#636
For this build, the following CMake flags will be set
-DSOFAPYTHON3_GIT_REPOSITORY='https://github.com/sofa-framework/SofaPython3'
-DSOFAPYTHON3_GIT_TAG='8313a746ae795eafb7346613c12222b4aeaf82bc'

Co-authored-by: Alex Bilger <alxbilger@users.noreply.github.com>

sofabot · 2026-09-04T08:39:09Z

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

To unlock the merge button, you must

Merge or close Apply changes from PR #6266 SofaPython3#636
For this build, the following CMake flags will be set
-DSOFAPYTHON3_GIT_REPOSITORY='https://github.com/sofa-framework/SofaPython3'
-DSOFAPYTHON3_GIT_TAG='8313a746ae795eafb7346613c12222b4aeaf82bc'

sofabot · 2026-09-04T08:39:34Z

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

To unlock the merge button, you must

Merge or close Apply changes from PR #6266 SofaPython3#636
For this build, the following CMake flags will be set
-DSOFAPYTHON3_GIT_REPOSITORY='https://github.com/sofa-framework/SofaPython3'
-DSOFAPYTHON3_GIT_TAG='8313a746ae795eafb7346613c12222b4aeaf82bc'

fredroy · 2026-09-06T23:39:43Z

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

sofabot · 2026-09-06T23:39:52Z

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

To unlock the merge button, you must

Merge or close Apply changes from PR #6266 SofaPython3#636
For this build, the following CMake flags will be set
-DSOFAPYTHON3_GIT_REPOSITORY='https://github.com/sofa-framework/SofaPython3'
-DSOFAPYTHON3_GIT_TAG='8313a746ae795eafb7346613c12222b4aeaf82bc'

sofabot · 2026-09-09T16:52:53Z

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

To unlock the merge button, you must

Merge or close Apply changes from PR #6266 SofaPython3#636
For this build, the following CMake flags will be set
-DSOFAPYTHON3_GIT_REPOSITORY='https://github.com/sofa-framework/SofaPython3'
-DSOFAPYTHON3_GIT_TAG='8313a746ae795eafb7346613c12222b4aeaf82bc'

Co-authored-by: Frederick Roy <fredroy@users.noreply.github.com>

sofabot · 2026-09-10T13:02:16Z

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

To unlock the merge button, you must

Merge or close Apply changes from PR #6266 SofaPython3#636
For this build, the following CMake flags will be set
-DSOFAPYTHON3_GIT_REPOSITORY='https://github.com/sofa-framework/SofaPython3'
-DSOFAPYTHON3_GIT_TAG='7b358038ae19b59c3d75a16c1a246a5bed3152ab'

damienmarchal and others added 2 commits August 27, 2026 15:49

FIXUP

994d787

damienmarchal added pr: status to review To notify reviewers to review this pull-request pr: refactoring Refactor code labels Aug 27, 2026

damienmarchal mentioned this pull request Aug 27, 2026

Apply changes from PR #6266 sofa-framework/SofaPython3#636

Open

damienmarchal added the pr: AI-aided Label notifying the reviewers that part or all of the PR has been generated with the help of an AI label Aug 27, 2026

damienmarchal changed the title ~~Merge Context into BaseContext~~ [CORE] Merge Context into BaseContext Aug 27, 2026

damienmarchal added the pr: breaking Change possibly inducing a compilation error label Aug 27, 2026

damienmarchal changed the title ~~[CORE] Merge Context into BaseContext~~ [Core] Merge Context into BaseContext Aug 27, 2026

Merge branch 'master' into pr-merge-context-basecontext

6a51b91

damienmarchal mentioned this pull request Aug 28, 2026

[Sofa.Core] Merge BaseContext and Context #5608

Closed

Merge branch 'master' into pr-merge-context-basecontext

c9dc248

alxbilger reviewed Aug 31, 2026

View reviewed changes

Comment thread Sofa/framework/Core/src/sofa/core/objectmodel/Context.h Outdated

Replace Context by an alias to BaseContext.

aa2827c

damienmarchal added pr: status to review To notify reviewers to review this pull-request and removed pr: status to review To notify reviewers to review this pull-request labels Sep 2, 2026

damienmarchal closed this Sep 2, 2026

damienmarchal reopened this Sep 2, 2026

alxbilger approved these changes Sep 2, 2026

View reviewed changes

Attempt to avoid the instantiation of the sptr in BaseContext.

3834f21

To fix compilation issue on windows.

Merge branch 'master' into pr-merge-context-basecontext

7f0c320

alxbilger reviewed Sep 3, 2026

View reviewed changes

Comment thread Sofa/framework/Core/src/sofa/core/objectmodel/Context.h Outdated

Comment thread Sofa/framework/Core/src/sofa/core/objectmodel/Context.h

Update Sofa/framework/Core/src/sofa/core/objectmodel/Context.h

ac18686

Co-authored-by: Alex Bilger <alxbilger@users.noreply.github.com>

Merge branch 'master' into pr-merge-context-basecontext

101b8a5

fredroy requested changes Sep 9, 2026

View reviewed changes

Comment thread Sofa/framework/Core/src/sofa/core/objectmodel/Context.h Outdated

Add deprecation layer

50cb78a

fredroy requested changes Sep 10, 2026

View reviewed changes

Comment thread Sofa/framework/Core/src/sofa/core/objectmodel/Context.h

Apply suggestion from @fredroy

05e034e

Co-authored-by: Frederick Roy <fredroy@users.noreply.github.com>

Uh oh!

Conversation

damienmarchal commented Aug 27, 2026 • edited by fredroy Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

sofabot commented Sep 2, 2026

Uh oh!

sofabot commented Sep 2, 2026

Uh oh!

damienmarchal commented Sep 2, 2026

Uh oh!

sofabot commented Sep 2, 2026

Uh oh!

sofabot commented Sep 3, 2026

Uh oh!

Uh oh!

Uh oh!

alxbilger commented Sep 4, 2026

Uh oh!

sofabot commented Sep 4, 2026

Uh oh!

sofabot commented Sep 4, 2026

Uh oh!

sofabot commented Sep 4, 2026

Uh oh!

fredroy commented Sep 6, 2026

Uh oh!

sofabot commented Sep 6, 2026

Uh oh!

Uh oh!

sofabot commented Sep 9, 2026

Uh oh!

Uh oh!

sofabot commented Sep 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

damienmarchal commented Aug 27, 2026 •

edited by fredroy

Loading