|
From: <mk...@us...> - 2003-04-11 23:43:09
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv5133/Include
Modified Files:
DynamicalSystem.h NumericalMethod.h ObjectModel.h
StaticObject.h
Log Message:
see CHANGES.current
Index: DynamicalSystem.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/DynamicalSystem.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DynamicalSystem.h 3 Apr 2003 10:40:22 -0000 1.2
--- DynamicalSystem.h 11 Apr 2003 23:43:06 -0000 1.3
***************
*** 37,43 ****
DynamicalSystem(unsigned short dimension);
DynamicalSystem(VectorField* pf);
! ~DynamicalSystem();
//void setVectorField(VectorField* pf);
! void setNumericalMethod(NumericalMethod* pnumericalMethod);
std::vector<double> const& flow(std::vector<double>& y0, double t0, double dt) const;
};
--- 37,43 ----
DynamicalSystem(unsigned short dimension);
DynamicalSystem(VectorField* pf);
! virtual ~DynamicalSystem();
//void setVectorField(VectorField* pf);
! void setNumericalMethod(NumericalMethod* pnumericalMethod);
std::vector<double> const& flow(std::vector<double>& y0, double t0, double dt) const;
};
Index: NumericalMethod.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/NumericalMethod.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NumericalMethod.h 4 Apr 2003 15:49:33 -0000 1.1
--- NumericalMethod.h 11 Apr 2003 23:43:06 -0000 1.2
***************
*** 53,64 ****
public:
NumericalMethod(bool deleteVF = true):
vectorField(0),
! m_bfailed(false),
! m_bdeleteVF(deleteVF) {
}
NumericalMethod(VectorField* pf, bool deleteVF = true):
vectorField(pf),
! m_bfailed(false),
! m_bdeleteVF(deleteVF) {
if (vectorField)
m_dimension = vectorField->getDimension();
--- 53,64 ----
public:
NumericalMethod(bool deleteVF = true):
+ m_bdeleteVF(deleteVF),
vectorField(0),
! m_bfailed(false) {
}
NumericalMethod(VectorField* pf, bool deleteVF = true):
+ m_bdeleteVF(deleteVF),
vectorField(pf),
! m_bfailed(false) {
if (vectorField)
m_dimension = vectorField->getDimension();
Index: ObjectModel.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/ObjectModel.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ObjectModel.h 21 Mar 2003 20:08:35 -0000 1.3
--- ObjectModel.h 11 Apr 2003 23:43:06 -0000 1.4
***************
*** 48,52 ****
typedef std::vector<simdata::Vector3> ContactList;
! SIMDATA_OBJECT(ObjectModel, 1, 0);
BEGIN_SIMDATA_XML_INTERFACE(ObjectModel)
--- 48,52 ----
typedef std::vector<simdata::Vector3> ContactList;
! SIMDATA_OBJECT(ObjectModel, 2, 0);
BEGIN_SIMDATA_XML_INTERFACE(ObjectModel)
***************
*** 58,61 ****
--- 58,62 ----
SIMDATA_XML("scale", ObjectModel::m_Scale, false)
SIMDATA_XML("smooth", ObjectModel::m_Smooth, false)
+ SIMDATA_XML("filter", ObjectModel::m_Filter, false)
SIMDATA_XML("contacts", ObjectModel::m_Contacts, false)
END_SIMDATA_XML_INTERFACE
***************
*** 85,88 ****
--- 86,90 ----
double m_Scale;
bool m_Smooth;
+ bool m_Filter;
ContactList m_Contacts;
Index: StaticObject.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/StaticObject.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StaticObject.h 26 Jan 2003 23:34:13 -0000 1.2
--- StaticObject.h 11 Apr 2003 23:43:06 -0000 1.3
***************
*** 41,47 ****
--- 41,58 ----
virtual ~StaticObject();
+
+ // EXTEND_SIMDATA_XML_INTERFACE(StaticObject, SimObject)
+ // SIMDATA_XML("direction", StaticObject::m_Direction, false)
+ // END_SIMDATA_XML_INTERFACE
+
+ SIMDATA_OBJECT(StaticObject, 0, 0)
+
protected:
virtual void pack(simdata::Packer& p) const;
virtual void unpack(simdata::UnPacker& p);
+ virtual void dump() {}
+ virtual void onUpdate(double) {}
+ virtual void initialize() {}
+ virtual unsigned int onRender() { return 0; }
};
|