Merge pull request #4120 from nickbianco/test_serialize_object_fix

Patch issues related to invalid property values in `testSerializeOpenSimObjects.cpp`

Author: nickbianco

Bindings/OpenSimHeaders_simulation.h

@@ -74,9 +74,6 @@
 #include <OpenSim/Simulation/Wrap/WrapObjectSet.h>
 #include <OpenSim/Simulation/Wrap/PathWrap.h>
 #include <OpenSim/Simulation/Wrap/PathWrapSet.h>
-#include <OpenSim/Simulation/Wrap/WrapCylinderObst.h>
-#include <OpenSim/Simulation/Wrap/WrapSphereObst.h>
-#include <OpenSim/Simulation/Wrap/WrapDoubleCylinderObst.h>
 
 #include <OpenSim/Simulation/SimbodyEngine/Body.h>
 #include <OpenSim/Simulation/Model/BodySet.h>

Bindings/simulation.i

@@ -164,9 +164,6 @@ OpenSim::ModelComponentSet<OpenSim::Controller>;
 %include <OpenSim/Simulation/Wrap/PathWrap.h>
 %template(SetPathWrap) OpenSim::Set<OpenSim::PathWrap, OpenSim::Object>;
 %include <OpenSim/Simulation/Wrap/PathWrapSet.h>
-%include <OpenSim/Simulation/Wrap/WrapCylinderObst.h>
-%include <OpenSim/Simulation/Wrap/WrapSphereObst.h>
-%include <OpenSim/Simulation/Wrap/WrapDoubleCylinderObst.h>
 
 %include <OpenSim/Simulation/Model/Probe.h>
 %template(SetProbes) OpenSim::Set<OpenSim::Probe, OpenSim::ModelComponent>;

CHANGELOG.md

@@ -15,6 +15,7 @@ v4.6
 - Updated the dependency `spdlog` to `v1.15.3`. (#4067)
 - Fixed bug in `C3DFileAdapter` where there was an error when reading C3D files with more than 255 markers. It now excludes non-marker points (POINT:ANGLES, POINT:POWERS, POINT:FORCES, POINT:MOMENTS, and POINT:SCALARS). (#3606)
 - updated `ezc3d` version to `1.5.19`.
+- Removed `WrapCylinderObst`, `WrapDoubleCylinderObst`, and `WrapSphereObst`. (#4120)
 
 v4.5.2
 ======

OpenSim/Simulation/RegisterTypes_osimSimulation.cpp

@@ -102,9 +102,6 @@
 #include "Wrap/WrapSphere.h"
 #include "Wrap/WrapTorus.h"
 #include "Wrap/WrapObjectSet.h"
-#include "Wrap/WrapCylinderObst.h"
-#include "Wrap/WrapSphereObst.h"
-#include "Wrap/WrapDoubleCylinderObst.h"
 
 #include "SimbodyEngine/SimbodyEngine.h"
 #include "SimbodyEngine/Body.h"
@@ -214,9 +211,6 @@ OSIMSIMULATION_API void RegisterTypes_osimSimulation()
     Object::registerType( WrapSphere() );
     Object::registerType( WrapTorus() );
     Object::registerType( WrapObjectSet() );
-    Object::registerType( WrapCylinderObst() );
-    Object::registerType( WrapSphereObst() );
-    Object::registerType( WrapDoubleCylinderObst() );
 
     // CURRENT RELEASE
     Object::registerType( SimbodyEngine() );