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

Comparing trunk/OOPSE-4/src/primitives/StuntDouble.hpp (file contents):
Revision 1490 by gezelter, Fri Sep 24 04:16:43 2004 UTC vs.
Revision 1698 by chrisfen, Tue Nov 2 15:28:25 2004 UTC

#	Line 2 \| Line 2
2		#define __STUNTDOUBLE_HPP__
3
4		#include <map>
5	<	#include "GenericData.hpp"
5	>	#include "utils/GenericData.hpp"
6
7		#define OT_ATOM 0
8		#define OT_DATOM 1
9		#define OT_RIGIDBODY 2
10
11		using namespace std;
12	+	using namespace oopse;
13	+
14		class BaseVisitor;
15
16		class StuntDouble {
#	Line 67 \| Line 69 \| class StuntDouble {
69		virtual void setEuler(double phi, double theta, double psi);
70		virtual void getEulerAngles(double eulers[3]);
71
72	<	virtual bool isLinear() {return false;}
73	<	virtual int linearAxis() {return -1;}
72	>	virtual bool isLinear();
73	>	virtual int linearAxis() {return zeroAxis;}
74
75		virtual double getZangle();
76		virtual void setZangle(double zAngle);
#	Line 89 \| Line 91 \| class StuntDouble {
91		}
92
93		int objType;
94	+	int zeroAxis;
95
96		map<string, GenericData*> properties;
97		};

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