Skip to content

Commit 7a8101c

Browse files
bakpaulbakpaul
authored
Fix float compilaiton (#611)
1 parent 6e1678f commit 7a8101c

5 files changed

Lines changed: 49 additions & 44 deletions

File tree

‎bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DrawTool.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ sofa::type::vector<sofa::type::Vec3> getPoints(const py::array_t<double>& array)
5656

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

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

236236
// Draw text
237237
dt.def("drawText", [](DrawTool* self,
238-
const std::array<double,3>& point,
238+
const std::array<SReal,3>& point,
239239
const float size,
240240
const std::string& text,
241241
const sofa::type::RGBAColor& color)

‎bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ namespace sofapython3
4949
using sofa::core::MechanicalParams;
5050
using sofa::core::behavior::MultiMatrixAccessor;
5151
using sofa::core::behavior::ForceField;
52-
using sofa::defaulttype::Vec3dTypes;
53-
using sofa::defaulttype::Vec2dTypes;
54-
using sofa::defaulttype::Vec1dTypes;
55-
using sofa::defaulttype::Vec6dTypes;
56-
using sofa::defaulttype::Rigid3dTypes;
57-
using sofa::defaulttype::Rigid2dTypes;
52+
using sofa::defaulttype::Vec3Types;
53+
using sofa::defaulttype::Vec2Types;
54+
using sofa::defaulttype::Vec1Types;
55+
using sofa::defaulttype::Vec6Types;
56+
using sofa::defaulttype::Rigid3Types;
57+
using sofa::defaulttype::Rigid2Types;
5858

5959
template<class TDOFType>
6060
ForceField_Trampoline<TDOFType>::ForceField_Trampoline() = default;
@@ -254,12 +254,12 @@ namespace sofapython3
254254

255255

256256
void moduleAddForceField(py::module &m) {
257-
declare_forcefield<Vec3dTypes>(m);
258-
declare_forcefield<Vec2dTypes>(m);
259-
declare_forcefield<Vec1dTypes>(m);
260-
declare_forcefield<Vec6dTypes>(m);
261-
declare_forcefield<Rigid3dTypes>(m);
262-
declare_forcefield<Rigid2dTypes>(m);
257+
declare_forcefield<Vec3Types>(m);
258+
declare_forcefield<Vec2Types>(m);
259+
declare_forcefield<Vec1Types>(m);
260+
declare_forcefield<Vec6Types>(m);
261+
declare_forcefield<Rigid3Types>(m);
262+
declare_forcefield<Rigid2Types>(m);
263263
}
264264

265265
} // namespace sofapython3

‎bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Mapping.cpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ namespace sofapython3
5050
using sofa::core::behavior::MechanicalState;
5151
using sofa::core::MechanicalParams;
5252
using sofa::core::behavior::MultiMatrixAccessor;
53-
using sofa::defaulttype::Vec3dTypes;
54-
using sofa::defaulttype::Vec2dTypes;
55-
using sofa::defaulttype::Vec1dTypes;
56-
using sofa::defaulttype::Vec6dTypes;
57-
using sofa::defaulttype::Rigid3dTypes;
58-
using sofa::defaulttype::Rigid2dTypes;
53+
using sofa::defaulttype::Vec3Types;
54+
using sofa::defaulttype::Vec2Types;
55+
using sofa::defaulttype::Vec1Types;
56+
using sofa::defaulttype::Vec6Types;
57+
using sofa::defaulttype::Rigid3Types;
58+
using sofa::defaulttype::Rigid2Types;
5959

6060
template<class In, class Out>
6161
Mapping_Trampoline<In, Out>::Mapping_Trampoline() = default;
@@ -174,29 +174,29 @@ namespace sofapython3
174174
}
175175

176176
void moduleAddMapping(py::module &m) {
177-
declareMapping<Vec1dTypes, Vec1dTypes>(m);
178-
declareMapping<Vec1dTypes, Vec2dTypes>(m);
179-
declareMapping<Vec1dTypes, Vec3dTypes>(m);
177+
declareMapping<Vec1Types, Vec1Types>(m);
178+
declareMapping<Vec1Types, Vec2Types>(m);
179+
declareMapping<Vec1Types, Vec3Types>(m);
180180

181-
declareMapping<Vec2dTypes, Vec2dTypes>(m);
182-
declareMapping<Vec2dTypes, Vec1dTypes>(m);
181+
declareMapping<Vec2Types, Vec2Types>(m);
182+
declareMapping<Vec2Types, Vec1Types>(m);
183183

184-
declareMapping<Vec3dTypes, Vec3dTypes>(m);
185-
declareMapping<Vec3dTypes, Vec2dTypes>(m);
186-
declareMapping<Vec3dTypes, Vec1dTypes>(m);
184+
declareMapping<Vec3Types, Vec3Types>(m);
185+
declareMapping<Vec3Types, Vec2Types>(m);
186+
declareMapping<Vec3Types, Vec1Types>(m);
187187

188-
declareMapping<Vec6dTypes, Vec6dTypes>(m);
189-
declareMapping<Vec6dTypes, Vec3dTypes>(m);
190-
declareMapping<Vec6dTypes, Vec1dTypes>(m);
188+
declareMapping<Vec6Types, Vec6Types>(m);
189+
declareMapping<Vec6Types, Vec3Types>(m);
190+
declareMapping<Vec6Types, Vec1Types>(m);
191191

192-
declareMapping<Rigid2dTypes, Vec2dTypes>(m);
193-
declareMapping<Rigid2dTypes, Rigid2dTypes>(m);
192+
declareMapping<Rigid2Types, Vec2Types>(m);
193+
declareMapping<Rigid2Types, Rigid2Types>(m);
194194

195-
declareMapping<Rigid3dTypes, Vec6dTypes>(m);
196-
declareMapping<Rigid3dTypes, Vec3dTypes>(m);
197-
declareMapping<Rigid3dTypes, Vec1dTypes>(m);
198-
declareMapping<Rigid3dTypes, Rigid3dTypes>(m);
199-
declareMapping<Vec3dTypes, Rigid3dTypes>(m);
195+
declareMapping<Rigid3Types, Vec6Types>(m);
196+
declareMapping<Rigid3Types, Vec3Types>(m);
197+
declareMapping<Rigid3Types, Vec1Types>(m);
198+
declareMapping<Rigid3Types, Rigid3Types>(m);
199+
declareMapping<Vec3Types, Rigid3Types>(m);
200200
}
201201

202202
} // namespace sofapython3

‎bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Mass.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@ void declare_mass(py::module &m) {
8686

8787

8888
void moduleAddMass(py::module &m) {
89-
declare_mass<sofa::defaulttype::Vec3dTypes>(m);
90-
declare_mass<sofa::defaulttype::Vec2dTypes>(m);
91-
declare_mass<sofa::defaulttype::Vec1dTypes>(m);
92-
declare_mass<sofa::defaulttype::Vec6dTypes>(m);
93-
declare_mass<sofa::defaulttype::Rigid3dTypes>(m);
94-
declare_mass<sofa::defaulttype::Rigid2dTypes>(m);
89+
declare_mass<sofa::defaulttype::Vec3Types>(m);
90+
declare_mass<sofa::defaulttype::Vec2Types>(m);
91+
declare_mass<sofa::defaulttype::Vec1Types>(m);
92+
declare_mass<sofa::defaulttype::Vec6Types>(m);
93+
declare_mass<sofa::defaulttype::Rigid3Types>(m);
94+
declare_mass<sofa::defaulttype::Rigid2Types>(m);
9595
}
9696

9797
void moduleForwardAddBaseMass(py::module& m)

‎bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Vec.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ template<> double convertThenCast<double>(const py::object& o)
4747
{
4848
return py::cast<double>( py::float_(o) );
4949
}
50+
template<> float convertThenCast<float>(const py::object& o)
51+
{
52+
return py::cast<float>( py::float_(o) );
53+
}
5054
template<> int convertThenCast<int>(const py::object& o)
5155
{
5256
return py::cast<int>( py::int_(o) );
@@ -247,4 +251,5 @@ void moduleAddVec(py::module &m)
247251
{
248252
addVectorsFor<int>(m);
249253
addVectorsFor<double>(m);
254+
addVectorsFor<float>(m);
250255
}

0 commit comments

Comments
 (0)