Skip to content

Fix float compilation #611

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.

Sign up for GitHub

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

Open
bakpaul wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix float compilation #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DrawTool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ sofa::type::vector<sofa::type::Vec3> getPoints(const py::array_t<double>& array)

double* ptr = static_cast<double*>(buf.ptr);

std::vector<sofa::type::Vec3d> points;
std::vector<sofa::type::Vec3> points;
points.resize(rows);
for (size_t i = 0; i < rows; ++i)
for (size_t j = 0; j < 3; ++j)
Expand Down Expand Up @@ -235,7 +235,7 @@ void moduleAddDrawTool(py::module &m)

// Draw text
dt.def("drawText", [](DrawTool* self,
const std::array<double,3>& point,
const std::array<SReal,3>& point,
const float size,
const std::string& text,
const sofa::type::RGBAColor& color)
Expand Down
24 changes: 12 additions & 12 deletions bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ namespace sofapython3
using sofa::core::MechanicalParams;
using sofa::core::behavior::MultiMatrixAccessor;
using sofa::core::behavior::ForceField;
using sofa::defaulttype::Vec3dTypes;
using sofa::defaulttype::Vec2dTypes;
using sofa::defaulttype::Vec1dTypes;
using sofa::defaulttype::Vec6dTypes;
using sofa::defaulttype::Rigid3dTypes;
using sofa::defaulttype::Rigid2dTypes;
using sofa::defaulttype::Vec3Types;
using sofa::defaulttype::Vec2Types;
using sofa::defaulttype::Vec1Types;
using sofa::defaulttype::Vec6Types;
using sofa::defaulttype::Rigid3Types;
using sofa::defaulttype::Rigid2Types;

template<class TDOFType>
ForceField_Trampoline<TDOFType>::ForceField_Trampoline() = default;
Expand Down Expand Up @@ -254,12 +254,12 @@ namespace sofapython3


void moduleAddForceField(py::module &m) {
declare_forcefield<Vec3dTypes>(m);
declare_forcefield<Vec2dTypes>(m);
declare_forcefield<Vec1dTypes>(m);
declare_forcefield<Vec6dTypes>(m);
declare_forcefield<Rigid3dTypes>(m);
declare_forcefield<Rigid2dTypes>(m);
declare_forcefield<Vec3Types>(m);
Copy link
Copy Markdown
Contributor

@fredroy fredroy May 19, 2026

Choose a reason for hiding this comment

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

#593 (review)

I guess the remark from @alxbilger has to be solved first

declare_forcefield<Vec2Types>(m);
declare_forcefield<Vec1Types>(m);
declare_forcefield<Vec6Types>(m);
declare_forcefield<Rigid3Types>(m);
declare_forcefield<Rigid2Types>(m);
}

} // namespace sofapython3
48 changes: 24 additions & 24 deletions bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Mapping.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ namespace sofapython3
using sofa::core::behavior::MechanicalState;
using sofa::core::MechanicalParams;
using sofa::core::behavior::MultiMatrixAccessor;
using sofa::defaulttype::Vec3dTypes;
using sofa::defaulttype::Vec2dTypes;
using sofa::defaulttype::Vec1dTypes;
using sofa::defaulttype::Vec6dTypes;
using sofa::defaulttype::Rigid3dTypes;
using sofa::defaulttype::Rigid2dTypes;
using sofa::defaulttype::Vec3Types;
using sofa::defaulttype::Vec2Types;
using sofa::defaulttype::Vec1Types;
using sofa::defaulttype::Vec6Types;
using sofa::defaulttype::Rigid3Types;
using sofa::defaulttype::Rigid2Types;

template<class In, class Out>
Mapping_Trampoline<In, Out>::Mapping_Trampoline() = default;
Expand Down Expand Up @@ -174,29 +174,29 @@ namespace sofapython3
}

void moduleAddMapping(py::module &m) {
declareMapping<Vec1dTypes, Vec1dTypes>(m);
declareMapping<Vec1dTypes, Vec2dTypes>(m);
declareMapping<Vec1dTypes, Vec3dTypes>(m);
declareMapping<Vec1Types, Vec1Types>(m);
declareMapping<Vec1Types, Vec2Types>(m);
declareMapping<Vec1Types, Vec3Types>(m);

declareMapping<Vec2dTypes, Vec2dTypes>(m);
declareMapping<Vec2dTypes, Vec1dTypes>(m);
declareMapping<Vec2Types, Vec2Types>(m);
declareMapping<Vec2Types, Vec1Types>(m);

declareMapping<Vec3dTypes, Vec3dTypes>(m);
declareMapping<Vec3dTypes, Vec2dTypes>(m);
declareMapping<Vec3dTypes, Vec1dTypes>(m);
declareMapping<Vec3Types, Vec3Types>(m);
declareMapping<Vec3Types, Vec2Types>(m);
declareMapping<Vec3Types, Vec1Types>(m);

declareMapping<Vec6dTypes, Vec6dTypes>(m);
declareMapping<Vec6dTypes, Vec3dTypes>(m);
declareMapping<Vec6dTypes, Vec1dTypes>(m);
declareMapping<Vec6Types, Vec6Types>(m);
declareMapping<Vec6Types, Vec3Types>(m);
declareMapping<Vec6Types, Vec1Types>(m);

declareMapping<Rigid2dTypes, Vec2dTypes>(m);
declareMapping<Rigid2dTypes, Rigid2dTypes>(m);
declareMapping<Rigid2Types, Vec2Types>(m);
declareMapping<Rigid2Types, Rigid2Types>(m);

declareMapping<Rigid3dTypes, Vec6dTypes>(m);
declareMapping<Rigid3dTypes, Vec3dTypes>(m);
declareMapping<Rigid3dTypes, Vec1dTypes>(m);
declareMapping<Rigid3dTypes, Rigid3dTypes>(m);
declareMapping<Vec3dTypes, Rigid3dTypes>(m);
declareMapping<Rigid3Types, Vec6Types>(m);
declareMapping<Rigid3Types, Vec3Types>(m);
declareMapping<Rigid3Types, Vec1Types>(m);
declareMapping<Rigid3Types, Rigid3Types>(m);
declareMapping<Vec3Types, Rigid3Types>(m);
}

} // namespace sofapython3
12 changes: 6 additions & 6 deletions bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Mass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,12 @@ void declare_mass(py::module &m) {


void moduleAddMass(py::module &m) {
declare_mass<sofa::defaulttype::Vec3dTypes>(m);
declare_mass<sofa::defaulttype::Vec2dTypes>(m);
declare_mass<sofa::defaulttype::Vec1dTypes>(m);
declare_mass<sofa::defaulttype::Vec6dTypes>(m);
declare_mass<sofa::defaulttype::Rigid3dTypes>(m);
declare_mass<sofa::defaulttype::Rigid2dTypes>(m);
declare_mass<sofa::defaulttype::Vec3Types>(m);
declare_mass<sofa::defaulttype::Vec2Types>(m);
declare_mass<sofa::defaulttype::Vec1Types>(m);
declare_mass<sofa::defaulttype::Vec6Types>(m);
declare_mass<sofa::defaulttype::Rigid3Types>(m);
declare_mass<sofa::defaulttype::Rigid2Types>(m);
}

void moduleForwardAddBaseMass(py::module& m)
Expand Down
5 changes: 5 additions & 0 deletions bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Vec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ template<> double convertThenCast<double>(const py::object& o)
{
return py::cast<double>( py::float_(o) );
}
template<> float convertThenCast<float>(const py::object& o)
{
return py::cast<float>( py::float_(o) );
}
template<> int convertThenCast<int>(const py::object& o)
{
return py::cast<int>( py::int_(o) );
Expand Down Expand Up @@ -247,4 +251,5 @@ void moduleAddVec(py::module &m)
{
addVectorsFor<int>(m);
addVectorsFor<double>(m);
addVectorsFor<float>(m);
}
Loading