[ViewVC] Diff of: group/trunk/OOPSE-2.0/src/primitives/StuntDouble.hpp

Comparing trunk/OOPSE-2.0/src/primitives/StuntDouble.hpp (file contents):
Revision 1698 by chrisfen, Tue Nov 2 15:28:25 2004 UTC vs.
Revision 1709 by gezelter, Thu Nov 4 16:22:03 2004 UTC

#	Line 58 \| Line 58 \| class StuntDouble {
58		virtual void setType(char* type) = 0;
59		virtual char* getType() = 0;
60
61	–
61		virtual void getTrq(double trq[3]);
62		virtual void addTrq(double trq[3]);
63
#	Line 69 \| Line 68 \| class StuntDouble {
68		virtual void setEuler(double phi, double theta, double psi);
69		virtual void getEulerAngles(double eulers[3]);
70
71	<	virtual bool isLinear();
72	<	virtual int linearAxis() {return zeroAxis;}
71	>	virtual bool isLinear() { return false;}
72	>	virtual int linearAxis() { return -1; }
73
74		virtual double getZangle();
75		virtual void setZangle(double zAngle);
#	Line 91 \| Line 90 \| class StuntDouble {
90		}
91
92		int objType;
94	–	int zeroAxis;
93
94		map<string, GenericData*> properties;
95		};

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