[Opal-commits] opal/src AttractorMotorData.h,1.3,1.4 BoxShapeData.h,1.4,1.5 CapsuleShapeData.h,1.4,1
Status: Inactive
Brought to you by:
tylerstreeter
|
From: tylerstreeter <tyl...@us...> - 2005-03-11 05:32:10
|
Update of /cvsroot/opal/opal/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32461/src Modified Files: AttractorMotorData.h BoxShapeData.h CapsuleShapeData.h GearedMotorData.h JointData.h MeshShapeData.h MotorData.h PlaneShapeData.h RaycastSensor.cpp RaycastSensor.h RaycastSensorData.h SensorData.h ServoMotorData.h ShapeData.h Simulator.h SolidData.h SphereShapeData.h SpringMotorData.h ThrusterMotorData.h Log Message: made data classes exported through win32 dll interface Index: SolidData.h =================================================================== RCS file: /cvsroot/opal/opal/src/SolidData.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SolidData.h 25 Feb 2005 06:40:26 -0000 1.6 --- SolidData.h 11 Mar 2005 05:31:56 -0000 1.7 *************** *** 38,63 **** { public: ! SolidData(); /// Copy constructor. ! SolidData(const SolidData& data); ! virtual ~SolidData(); /// Adds a new Shape to the SolidData. This automatically /// allocates the right ShapeData type. ! virtual void OPAL_CALL addShape(const ShapeData& data); /// Returns the number of Shapes in this SolidData. ! virtual int OPAL_CALL getNumShapes()const; /// Returns a pointer to the ShapeData at the given index. ! virtual ShapeData* OPAL_CALL getShapeData(unsigned int i)const; /// Destroys all Shapes in the SolidData. ! virtual void OPAL_CALL destroyShapes(); /// Makes a deep copy. ! virtual void OPAL_CALL operator=(const SolidData& data); /// Determines whether the Solid is enabled. --- 38,64 ---- { public: ! OPAL_DECL SolidData(); /// Copy constructor. ! OPAL_DECL SolidData(const SolidData& data); ! OPAL_DECL virtual ~SolidData(); /// Adds a new Shape to the SolidData. This automatically /// allocates the right ShapeData type. ! OPAL_DECL virtual void OPAL_CALL addShape(const ShapeData& data); /// Returns the number of Shapes in this SolidData. ! OPAL_DECL virtual int OPAL_CALL getNumShapes()const; /// Returns a pointer to the ShapeData at the given index. ! OPAL_DECL virtual ShapeData* OPAL_CALL getShapeData( ! unsigned int i)const; /// Destroys all Shapes in the SolidData. ! OPAL_DECL virtual void OPAL_CALL destroyShapes(); /// Makes a deep copy. ! OPAL_DECL virtual void OPAL_CALL operator=(const SolidData& data); /// Determines whether the Solid is enabled. Index: SphereShapeData.h =================================================================== RCS file: /cvsroot/opal/opal/src/SphereShapeData.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SphereShapeData.h 8 Mar 2005 16:10:23 -0000 1.4 --- SphereShapeData.h 11 Mar 2005 05:31:56 -0000 1.5 *************** *** 38,42 **** { public: ! SphereShapeData() : ShapeData() { --- 38,42 ---- { public: ! OPAL_DECL SphereShapeData() : ShapeData() { *************** *** 46,60 **** /// Copy constructor. ! SphereShapeData(const SphereShapeData& data) { (*this) = data; } ! virtual ~SphereShapeData() { } /// Makes a deep copy. ! virtual void OPAL_CALL operator=(const SphereShapeData& data) { mType = data.mType; --- 46,61 ---- /// Copy constructor. ! OPAL_DECL SphereShapeData(const SphereShapeData& data) { (*this) = data; } ! OPAL_DECL virtual ~SphereShapeData() { } /// Makes a deep copy. ! OPAL_DECL virtual void OPAL_CALL operator=( ! const SphereShapeData& data) { mType = data.mType; Index: ShapeData.h =================================================================== RCS file: /cvsroot/opal/opal/src/ShapeData.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ShapeData.h 8 Mar 2005 16:10:23 -0000 1.6 --- ShapeData.h 11 Mar 2005 05:31:56 -0000 1.7 *************** *** 49,53 **** { public: ! ShapeData() { // The initial type doesn't matter since the abstract base --- 49,53 ---- { public: ! OPAL_DECL ShapeData() { // The initial type doesn't matter since the abstract base *************** *** 59,68 **** } ! virtual ~ShapeData() { } /// Returns the Shape's type. ! virtual ShapeType OPAL_CALL getType()const { return mType; --- 59,68 ---- } ! OPAL_DECL virtual ~ShapeData() { } /// Returns the Shape's type. ! OPAL_DECL virtual ShapeType OPAL_CALL getType()const { return mType; Index: SensorData.h =================================================================== RCS file: /cvsroot/opal/opal/src/SensorData.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SensorData.h 9 Mar 2005 02:09:49 -0000 1.4 --- SensorData.h 11 Mar 2005 05:31:56 -0000 1.5 *************** *** 45,49 **** { public: ! SensorData() { // The initial type doesn't matter since the abstract base --- 45,49 ---- { public: ! OPAL_DECL SensorData() { // The initial type doesn't matter since the abstract base *************** *** 56,65 **** } ! virtual ~SensorData() { } /// Returns the Sensor's type. ! virtual SensorType OPAL_CALL getType()const { return mType; --- 56,65 ---- } ! OPAL_DECL virtual ~SensorData() { } /// Returns the Sensor's type. ! OPAL_DECL virtual SensorType OPAL_CALL getType()const { return mType; Index: MotorData.h =================================================================== RCS file: /cvsroot/opal/opal/src/MotorData.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MotorData.h 25 Feb 2005 06:40:26 -0000 1.2 --- MotorData.h 11 Mar 2005 05:31:56 -0000 1.3 *************** *** 47,51 **** { public: ! MotorData() { // The initial type doesn't matter since the abstract base --- 47,51 ---- { public: ! OPAL_DECL MotorData() { // The initial type doesn't matter since the abstract base *************** *** 56,65 **** } ! virtual ~MotorData() { } /// Returns the Motor's type. ! virtual MotorType OPAL_CALL getType()const { return mType; --- 56,65 ---- } ! OPAL_DECL virtual ~MotorData() { } /// Returns the Motor's type. ! OPAL_DECL virtual MotorType OPAL_CALL getType()const { return mType; Index: BoxShapeData.h =================================================================== RCS file: /cvsroot/opal/opal/src/BoxShapeData.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BoxShapeData.h 8 Mar 2005 16:10:23 -0000 1.4 --- BoxShapeData.h 11 Mar 2005 05:31:56 -0000 1.5 *************** *** 38,42 **** { public: ! BoxShapeData() : ShapeData() { --- 38,42 ---- { public: ! OPAL_DECL BoxShapeData() : ShapeData() { *************** *** 46,60 **** /// Copy constructor. ! BoxShapeData(const BoxShapeData& data) { (*this) = data; } ! virtual ~BoxShapeData() { } /// Makes a deep copy. ! virtual void OPAL_CALL operator=(const BoxShapeData& data) { mType = data.mType; --- 46,60 ---- /// Copy constructor. ! OPAL_DECL BoxShapeData(const BoxShapeData& data) { (*this) = data; } ! OPAL_DECL virtual ~BoxShapeData() { } /// Makes a deep copy. ! OPAL_DECL virtual void OPAL_CALL operator=(const BoxShapeData& data) { mType = data.mType; Index: CapsuleShapeData.h =================================================================== RCS file: /cvsroot/opal/opal/src/CapsuleShapeData.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CapsuleShapeData.h 8 Mar 2005 16:10:23 -0000 1.4 --- CapsuleShapeData.h 11 Mar 2005 05:31:56 -0000 1.5 *************** *** 38,42 **** { public: ! CapsuleShapeData() : ShapeData() { --- 38,42 ---- { public: ! OPAL_DECL CapsuleShapeData() : ShapeData() { *************** *** 47,61 **** /// Copy constructor. ! CapsuleShapeData(const CapsuleShapeData& data) { (*this) = data; } ! virtual ~CapsuleShapeData() { } /// Makes a deep copy. ! virtual void OPAL_CALL operator=(const CapsuleShapeData& data) { mType = data.mType; --- 47,62 ---- /// Copy constructor. ! OPAL_DECL CapsuleShapeData(const CapsuleShapeData& data) { (*this) = data; } ! OPAL_DECL virtual ~CapsuleShapeData() { } /// Makes a deep copy. ! OPAL_DECL virtual void OPAL_CALL operator=( ! const CapsuleShapeData& data) { mType = data.mType; Index: RaycastSensorData.h =================================================================== RCS file: /cvsroot/opal/opal/src/RaycastSensorData.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RaycastSensorData.h 9 Mar 2005 02:09:50 -0000 1.1 --- RaycastSensorData.h 11 Mar 2005 05:31:56 -0000 1.2 *************** *** 38,42 **** { public: ! RaycastSensorData() : SensorData() { --- 38,42 ---- { public: ! OPAL_DECL RaycastSensorData() : SensorData() { *************** *** 46,60 **** /// Copy constructor. ! RaycastSensorData(const RaycastSensorData& data) { (*this) = data; } ! virtual ~RaycastSensorData() { } /// Makes a deep copy. ! virtual void OPAL_CALL operator=(const RaycastSensorData& data) { mType = data.mType; --- 46,61 ---- /// Copy constructor. ! OPAL_DECL RaycastSensorData(const RaycastSensorData& data) { (*this) = data; } ! OPAL_DECL virtual ~RaycastSensorData() { } /// Makes a deep copy. ! OPAL_DECL virtual void OPAL_CALL operator=( ! const RaycastSensorData& data) { mType = data.mType; Index: GearedMotorData.h =================================================================== RCS file: /cvsroot/opal/opal/src/GearedMotorData.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GearedMotorData.h 26 Feb 2005 10:22:23 -0000 1.3 --- GearedMotorData.h 11 Mar 2005 05:31:56 -0000 1.4 *************** *** 38,42 **** { public: ! GearedMotorData() : MotorData() { --- 38,42 ---- { public: ! OPAL_DECL GearedMotorData() : MotorData() { *************** *** 52,66 **** /// Copy constructor. ! GearedMotorData(const GearedMotorData& data) { (*this) = data; } ! virtual ~GearedMotorData() { } /// Makes a deep copy. ! virtual void OPAL_CALL operator=(const GearedMotorData& data) { mType = data.mType; --- 52,67 ---- /// Copy constructor. ! OPAL_DECL GearedMotorData(const GearedMotorData& data) { (*this) = data; } ! OPAL_DECL virtual ~GearedMotorData() { } /// Makes a deep copy. ! OPAL_DECL virtual void OPAL_CALL operator=( ! const GearedMotorData& data) { mType = data.mType; Index: Simulator.h =================================================================== RCS file: /cvsroot/opal/opal/src/Simulator.h,v retrieving revision 1.83 retrieving revision 1.84 diff -C2 -d -r1.83 -r1.84 *** Simulator.h 10 Mar 2005 21:13:00 -0000 1.83 --- Simulator.h 11 Mar 2005 05:31:56 -0000 1.84 *************** *** 226,235 **** /// Helper function used for ray casting. Immediately fires a ray ! /// into the scene and returns intersections results. Takes an ! /// unnormalized ray, which is important because the ray's length ! /// is used when casting the ray into the scene. ! virtual const RaycastResult& OPAL_CALL internal_fireRay( const Rayr& r) = 0; ! ! virtual const RaycastResult& OPAL_CALL internal_fireRay( const Rayr& r, real length ) = 0; /// Returns the Simulator's contact group flags. --- 226,232 ---- /// Helper function used for ray casting. Immediately fires a ray ! /// into the scene and returns intersections results. ! virtual const RaycastResult& OPAL_CALL internal_fireRay( ! const Rayr& r, real length) = 0; /// Returns the Simulator's contact group flags. Index: AttractorMotorData.h =================================================================== RCS file: /cvsroot/opal/opal/src/AttractorMotorData.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AttractorMotorData.h 26 Feb 2005 10:22:23 -0000 1.3 --- AttractorMotorData.h 11 Mar 2005 05:31:56 -0000 1.4 *************** *** 38,42 **** { public: ! AttractorMotorData() : MotorData() { --- 38,42 ---- { public: ! OPAL_DECL AttractorMotorData() : MotorData() { *************** *** 53,67 **** /// Copy constructor. ! AttractorMotorData(const AttractorMotorData& data) { (*this) = data; } ! virtual ~AttractorMotorData() { } /// Makes a deep copy. ! virtual void OPAL_CALL operator=(const AttractorMotorData& data) { mType = data.mType; --- 53,68 ---- /// Copy constructor. ! OPAL_DECL AttractorMotorData(const AttractorMotorData& data) { (*this) = data; } ! OPAL_DECL virtual ~AttractorMotorData() { } /// Makes a deep copy. ! OPAL_DECL virtual void OPAL_CALL operator=( ! const AttractorMotorData& data) { mType = data.mType; Index: PlaneShapeData.h =================================================================== RCS file: /cvsroot/opal/opal/src/PlaneShapeData.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PlaneShapeData.h 8 Mar 2005 16:10:23 -0000 1.4 --- PlaneShapeData.h 11 Mar 2005 05:31:56 -0000 1.5 *************** *** 38,42 **** { public: ! PlaneShapeData() : ShapeData() { --- 38,42 ---- { public: ! OPAL_DECL PlaneShapeData() : ShapeData() { *************** *** 50,64 **** /// Copy constructor. ! PlaneShapeData(const PlaneShapeData& data) { (*this) = data; } ! virtual ~PlaneShapeData() { } /// Makes a deep copy. ! virtual void OPAL_CALL operator=(const PlaneShapeData& data) { mType = data.mType; --- 50,64 ---- /// Copy constructor. ! OPAL_DECL PlaneShapeData(const PlaneShapeData& data) { (*this) = data; } ! OPAL_DECL virtual ~PlaneShapeData() { } /// Makes a deep copy. ! OPAL_DECL virtual void OPAL_CALL operator=(const PlaneShapeData& data) { mType = data.mType; Index: RaycastSensor.cpp =================================================================== RCS file: /cvsroot/opal/opal/src/RaycastSensor.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RaycastSensor.cpp 10 Mar 2005 21:13:00 -0000 1.2 --- RaycastSensor.cpp 11 Mar 2005 05:31:56 -0000 1.3 *************** *** 55,59 **** const RaycastResult& RaycastSensor::fireRay() { ! return mSim->internal_fireRay(mData.ray); } --- 55,59 ---- const RaycastResult& RaycastSensor::fireRay() { ! return mSim->internal_fireRay(mData.ray, mData.ray.getLength()); } Index: SpringMotorData.h =================================================================== RCS file: /cvsroot/opal/opal/src/SpringMotorData.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SpringMotorData.h 26 Feb 2005 10:22:23 -0000 1.3 --- SpringMotorData.h 11 Mar 2005 05:31:56 -0000 1.4 *************** *** 52,56 **** { public: ! SpringMotorData() : MotorData() { --- 52,56 ---- { public: ! OPAL_DECL SpringMotorData() : MotorData() { *************** *** 71,85 **** /// Copy constructor. ! SpringMotorData(const SpringMotorData& data) { (*this) = data; } ! virtual ~SpringMotorData() { } /// Makes a deep copy. ! virtual void OPAL_CALL operator=(const SpringMotorData& data) { mType = data.mType; --- 71,86 ---- /// Copy constructor. ! OPAL_DECL SpringMotorData(const SpringMotorData& data) { (*this) = data; } ! OPAL_DECL virtual ~SpringMotorData() { } /// Makes a deep copy. ! OPAL_DECL virtual void OPAL_CALL operator=( ! const SpringMotorData& data) { mType = data.mType; Index: RaycastSensor.h =================================================================== RCS file: /cvsroot/opal/opal/src/RaycastSensor.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RaycastSensor.h 10 Mar 2005 21:13:00 -0000 1.2 --- RaycastSensor.h 11 Mar 2005 05:31:56 -0000 1.3 *************** *** 68,72 **** /// every time step because that would be a waste of time in most /// cases; it must be "fired" manually. ! class OPAL_DECL RaycastSensor : public Sensor { public: --- 68,72 ---- /// every time step because that would be a waste of time in most /// cases; it must be "fired" manually. ! class RaycastSensor : public Sensor { public: Index: ThrusterMotorData.h =================================================================== RCS file: /cvsroot/opal/opal/src/ThrusterMotorData.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ThrusterMotorData.h 26 Feb 2005 10:22:23 -0000 1.3 --- ThrusterMotorData.h 11 Mar 2005 05:31:56 -0000 1.4 *************** *** 38,42 **** { public: ! ThrusterMotorData() : MotorData() { --- 38,42 ---- { public: ! OPAL_DECL ThrusterMotorData() : MotorData() { *************** *** 49,63 **** /// Copy constructor. ! ThrusterMotorData(const ThrusterMotorData& data) { (*this) = data; } ! virtual ~ThrusterMotorData() { } /// Makes a deep copy. ! virtual void OPAL_CALL operator=(const ThrusterMotorData& data) { mType = data.mType; --- 49,64 ---- /// Copy constructor. ! OPAL_DECL ThrusterMotorData(const ThrusterMotorData& data) { (*this) = data; } ! OPAL_DECL virtual ~ThrusterMotorData() { } /// Makes a deep copy. ! OPAL_DECL virtual void OPAL_CALL operator=( ! const ThrusterMotorData& data) { mType = data.mType; Index: ServoMotorData.h =================================================================== RCS file: /cvsroot/opal/opal/src/ServoMotorData.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ServoMotorData.h 26 Feb 2005 10:22:23 -0000 1.3 --- ServoMotorData.h 11 Mar 2005 05:31:56 -0000 1.4 *************** *** 50,54 **** { public: ! ServoMotorData() : MotorData() { --- 50,54 ---- { public: ! OPAL_DECL ServoMotorData() : MotorData() { *************** *** 66,80 **** /// Copy constructor. ! ServoMotorData(const ServoMotorData& data) { (*this) = data; } ! virtual ~ServoMotorData() { } /// Makes a deep copy. ! virtual void OPAL_CALL operator=(const ServoMotorData& data) { mType = data.mType; --- 66,80 ---- /// Copy constructor. ! OPAL_DECL ServoMotorData(const ServoMotorData& data) { (*this) = data; } ! OPAL_DECL virtual ~ServoMotorData() { } /// Makes a deep copy. ! OPAL_DECL virtual void OPAL_CALL operator=(const ServoMotorData& data) { mType = data.mType; Index: JointData.h =================================================================== RCS file: /cvsroot/opal/opal/src/JointData.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JointData.h 8 Mar 2005 22:05:03 -0000 1.5 --- JointData.h 11 Mar 2005 05:31:56 -0000 1.6 *************** *** 82,86 **** { public: ! JointData() { mType = defaults::joint::type; --- 82,86 ---- { public: ! OPAL_DECL JointData() { mType = defaults::joint::type; *************** *** 107,121 **** /// Copy constructor. ! JointData(const JointData& data) { (*this) = data; } ! virtual ~JointData() { } /// Makes a deep copy. ! void operator=(const JointData& data) { mType = data.mType; --- 107,121 ---- /// Copy constructor. ! OPAL_DECL JointData(const JointData& data) { (*this) = data; } ! OPAL_DECL virtual ~JointData() { } /// Makes a deep copy. ! OPAL_DECL void operator=(const JointData& data) { mType = data.mType; *************** *** 143,147 **** /// Sets the Joint's type. ! virtual void OPAL_CALL setType(JointType type) { mType = type; --- 143,147 ---- /// Sets the Joint's type. ! OPAL_DECL virtual void OPAL_CALL setType(JointType type) { mType = type; *************** *** 149,153 **** /// Returns the Joint's type. ! virtual JointType OPAL_CALL getType()const { return mType; --- 149,153 ---- /// Returns the Joint's type. ! OPAL_DECL virtual JointType OPAL_CALL getType()const { return mType; Index: MeshShapeData.h =================================================================== RCS file: /cvsroot/opal/opal/src/MeshShapeData.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MeshShapeData.h 8 Mar 2005 16:10:23 -0000 1.3 --- MeshShapeData.h 11 Mar 2005 05:31:56 -0000 1.4 *************** *** 42,46 **** { public: ! MeshShapeData() : ShapeData() { --- 42,46 ---- { public: ! OPAL_DECL MeshShapeData() : ShapeData() { *************** *** 53,67 **** /// Copy constructor. ! MeshShapeData(const MeshShapeData& data) { (*this) = data; } ! virtual ~MeshShapeData() { } /// Makes a shallow copy, simply copying data pointers. ! virtual void OPAL_CALL operator=(const MeshShapeData& data) { mType = data.mType; --- 53,67 ---- /// Copy constructor. ! OPAL_DECL MeshShapeData(const MeshShapeData& data) { (*this) = data; } ! OPAL_DECL virtual ~MeshShapeData() { } /// Makes a shallow copy, simply copying data pointers. ! OPAL_DECL virtual void OPAL_CALL operator=(const MeshShapeData& data) { mType = data.mType; |