Skip to content

Commit dd51fbe

Browse files
hugtalbothugtalbot
authored
Merge branch 'master' into 26_05_fix_float_compilation
2 parents 829f9a4 + e054fcb commit dd51fbe

112 files changed

Lines changed: 2208 additions & 1906 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci-macos-linux-windows-pixi.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ jobs:
3838
env:
3939
SOFA_BUILD_TYPE: ${{ matrix.build_type }}
4040
run: |
41+
pixi run -e ${{ matrix.environment }} configure -DCMAKE_CUDA_ARCHITECTURES="60;89"
4142
pixi run -e ${{ matrix.environment }} build
4243
4344
- name: Testing - Run SOFA in batch mode [MacOS/Linux/Windows]

‎Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/CompositeCollisionPipeline.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
#include <sofa/core/collision/ContactManager.h>
3131

3232
#include <sofa/simulation/Node.h>
33-
#include <sofa/simulation/MainTaskSchedulerFactory.h>
34-
#include <sofa/simulation/ParallelForEach.h>
33+
#include <sofa/simulation/task/MainTaskSchedulerFactory.h>
34+
#include <sofa/simulation/task/ParallelForEach.h>
3535

3636
#include <sofa/helper/ScopedAdvancedTimer.h>
3737
using sofa::helper::ScopedAdvancedTimer ;

‎Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/CCDTightInclusionIntersection.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828

2929
#include <sofa/core/collision/Intersection.inl>
3030

31-
#include <sofa/component/collision/geometry/LineModel.h>
32-
#include <sofa/component/collision/geometry/TriangleModel.h>
31+
#include <sofa/component/collision/geometry/LineCollisionModel.h>
32+
#include <sofa/component/collision/geometry/TriangleCollisionModel.h>
3333
#include <sofa/linearalgebra/EigenVector.h>
3434

3535
#include <tight_inclusion/ccd.hpp>

‎Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/CCDTightInclusionIntersection.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424

2525
#include <sofa/component/collision/detection/intersection/BaseProximityIntersection.h>
2626

27-
#include <sofa/component/collision/geometry/SphereModel.h>
28-
#include <sofa/component/collision/geometry/TriangleModel.h>
29-
#include <sofa/component/collision/geometry/LineModel.h>
30-
#include <sofa/component/collision/geometry/PointModel.h>
31-
#include <sofa/component/collision/geometry/CubeModel.h>
32-
#include <sofa/component/collision/geometry/RayModel.h>
27+
#include <sofa/component/collision/geometry/SphereCollisionModel.h>
28+
#include <sofa/component/collision/geometry/TriangleCollisionModel.h>
29+
#include <sofa/component/collision/geometry/LineCollisionModel.h>
30+
#include <sofa/component/collision/geometry/PointCollisionModel.h>
31+
#include <sofa/component/collision/geometry/CubeCollisionModel.h>
32+
#include <sofa/component/collision/geometry/RayCollisionModel.h>
3333

3434
namespace sofa::component::collision::detection::intersection
3535
{

‎Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/CubeModel.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@
2323
#include <sofa/component/collision/geometry/config.h>
2424
#include <sofa/component/collision/geometry/CubeCollisionModel.h>
2525

26-
SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/CubeCollisionModel.h")
26+
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/CubeCollisionModel.h")

‎Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/CylinderModel.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@
2323
#include <sofa/component/collision/geometry/config.h>
2424
#include <sofa/component/collision/geometry/CylinderCollisionModel.h>
2525

26-
SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/CylinderCollisionModel.h")
26+
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/CylinderCollisionModel.h")

‎Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/CylinderModel.inl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@
2323
#include <sofa/component/collision/geometry/config.h>
2424
#include <sofa/component/collision/geometry/CylinderCollisionModel.inl>
2525

26-
SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/CylinderCollisionModel.inl")
26+
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/CylinderCollisionModel.inl")

‎Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/LineModel.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@
2323
#include <sofa/component/collision/geometry/config.h>
2424
#include <sofa/component/collision/geometry/LineCollisionModel.h>
2525

26-
SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/LineCollisionModel.h")
26+
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/LineCollisionModel.h")

‎Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/LineModel.inl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@
2323
#include <sofa/component/collision/geometry/config.h>
2424
#include <sofa/component/collision/geometry/LineCollisionModel.inl>
2525

26-
SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/LineCollisionModel.inl")
26+
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/LineCollisionModel.inl")

‎Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/PointModel.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@
2323
#include <sofa/component/collision/geometry/config.h>
2424
#include <sofa/component/collision/geometry/PointCollisionModel.h>
2525

26-
SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/PointCollisionModel.h")
26+
SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/PointCollisionModel.h")

0 commit comments

Comments
 (0)