[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 1709 by gezelter, Thu Nov 4 16:22:03 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 56 \| Line 58 \| class StuntDouble {
58		virtual void setType(char* type) = 0;
59		virtual char* getType() = 0;
60
59	–
61		virtual void getTrq(double trq[3]);
62		virtual void addTrq(double trq[3]);
63
#	Line 67 \| 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() {return false;}
72	<	virtual int linearAxis() {return -1;}
71	>	virtual bool isLinear() { return false;}
72	>	virtual int linearAxis() { return -1; }
73
74		virtual double getZangle();
75		virtual void setZangle(double zAngle);

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