File tree Expand file tree Collapse file tree 3 files changed +0
-22
lines changed Expand file tree Collapse file tree 3 files changed +0
-22
lines changed Original file line number Diff line number Diff line change @@ -180,23 +180,11 @@ Errors Compiler::read(tinyxml2::XMLElement* element)
180
180
const std::string inertiafromgeom
181
181
= getAttributeString (element, " inertiafromgeom" );
182
182
if (inertiafromgeom == " false" ) {
183
- #if DART_OS_WINDOWS
184
183
mInertiaFromGeom = InertiaFromGeom::IFG_FALSE;
185
- #else
186
- mInertiaFromGeom = InertiaFromGeom::FALSE ;
187
- #endif
188
184
} else if (inertiafromgeom == " true" ) {
189
- #if DART_OS_WINDOWS
190
185
mInertiaFromGeom = InertiaFromGeom::IFG_TRUE;
191
- #else
192
- mInertiaFromGeom = InertiaFromGeom::TRUE ;
193
- #endif
194
186
} else if (inertiafromgeom == " auto" ) {
195
- #if DART_OS_WINDOWS
196
187
mInertiaFromGeom = InertiaFromGeom::IFG_AUTO;
197
- #else
198
- mInertiaFromGeom = InertiaFromGeom::AUTO;
199
- #endif
200
188
} else {
201
189
errors.emplace_back (
202
190
ErrorCode::ATTRIBUTE_INVALID,
Original file line number Diff line number Diff line change @@ -100,11 +100,7 @@ class Compiler final
100
100
bool mConvexHull {true };
101
101
bool mUserThread {true };
102
102
bool mFuseStatic {false };
103
- #if DART_OS_WINDOWS
104
103
InertiaFromGeom mInertiaFromGeom {InertiaFromGeom::IFG_AUTO};
105
- #else
106
- InertiaFromGeom mInertiaFromGeom {InertiaFromGeom::AUTO};
107
- #endif
108
104
Eigen::Vector2i mInertiaGroupRange {Eigen::Vector2i (0 , 5 )};
109
105
};
110
106
Original file line number Diff line number Diff line change @@ -77,15 +77,9 @@ enum class Integrator
77
77
78
78
enum class InertiaFromGeom
79
79
{
80
- #if DART_OS_WINDOWS
81
80
IFG_FALSE,
82
81
IFG_TRUE,
83
82
IFG_AUTO,
84
- #else
85
- FALSE ,
86
- TRUE ,
87
- AUTO,
88
- #endif
89
83
};
90
84
91
85
enum class CollisionType
You can’t perform that action at this time.
0 commit comments