ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-2.0/src/types/ShapeType.hpp
(Generate patch)

Comparing trunk/OOPSE-2.0/src/types/ShapeType.hpp (file contents):
Revision 1590 by gezelter, Mon Oct 18 16:29:53 2004 UTC vs.
Revision 1592 by tim, Mon Oct 18 17:07:27 2004 UTC

# Line 11 | Line 11
11   #include <fstream>
12   #include <vector>
13   #include "math/RealSphericalHarmonic.hpp"
14 < #include "math/Matrix3x3d.hpp"
14 > #include "math/SquareMatrix3.hpp"
15  
16   namespace oopse {
17    using namespace std;
# Line 29 | Line 29 | namespace oopse {
29      double getMass(void) {return mass;}
30      void setMass(double m) {mass = m;}
31      
32 <    Matrix3x3d* getI(void) {return I;}
33 <    void setI(Matrix3x3d* theI) {I = theI;}
32 >    Mat3x3d getI(void) {return I;}
33 >    void setI(Mat3x3d theI) {I = theI;}
34      
35      vector<RealSphericalHarmonic*> getContactFuncs(void) {return contactFuncs;}
36      vector<RealSphericalHarmonic*> getRangeFuncs(void) {return rangeFuncs;}
# Line 71 | Line 71 | namespace oopse {
71      
72      char *shapeName;             // The name of the shape
73      double mass;                 // The mass
74 <    Matrix3x3d* I;                // The moment of inertia tensor
74 >    Mat3x3d I;                // The moment of inertia tensor
75      vector<RealSphericalHarmonic*> contactFuncs;  // The contact functions
76      vector<RealSphericalHarmonic*> rangeFuncs;    // The range functions
77      vector<RealSphericalHarmonic*> strengthFuncs; // The strength functions

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines