[ViewVC] Diff of: group/branches/new_design/OOPSE-3.0/src/primitives/StuntDouble.cpp

Comparing branches/new_design/OOPSE-3.0/src/primitives/StuntDouble.cpp (file contents):
Revision 1692 by tim, Mon Nov 1 20:15:58 2004 UTC vs.
Revision 1883 by tim, Mon Dec 13 22:30:27 2004 UTC

#	Line 35 \| Line 35 \| StuntDouble::StuntDouble(ObjectType objType, DataStora
35		namespace oopse {
36
37		StuntDouble::StuntDouble(ObjectType objType, DataStoragePointer storage) :
38	<	objType_(objType), storage_(storage),
39	<	linear_(false), linearAxis_(-1), globalIndex_(-1), localIndex_(-1), snapshotMan_(NULL){
38	>	objType_(objType), storage_(storage), snapshotMan_(NULL),
39	>	linear_(false), linearAxis_(-1), globalIndex_(-1), localIndex_(-1){
40		}
41
42		StuntDouble::~StuntDouble() {
43
44		}
45
46	<	void StuntDouble::zeroForces() {
46	>	void StuntDouble::zeroForcesAndTorques() {
47		setFrc(V3Zero);
48	+	setTrq(V3Zero);
49		}
50		void StuntDouble::addProperty(GenericData* genData) {
51		properties_.addProperty(genData);
52		}
53
54	<	void StuntDouble::removeProperty(std::string& propName) {
54	>	void StuntDouble::removeProperty(const std::string& propName) {
55		properties_.removeProperty(propName);
56		}
57
#	Line 66 \| Line 67 \| *GenericData StuntDouble::getPropertyByName(std::strin**
67		return properties_.getProperties();
68		}
69
70	<	GenericData* StuntDouble::getPropertyByName(std::string& propName) {
70	>	GenericData* StuntDouble::getPropertyByName(const std::string& propName) {
71		return properties_.getPropertyByName(propName);
72		}
73

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines