Changeset 118

Timestamp:

Jul 5, 2005, 9:27:04 PM (19 years ago)

Author:

darran

Message:

• now using position/orientation only for view matrix save
• can remove setTime ...

Location:

Swollen

Files:

• swollen/state.cpp (modified) (2 diffs)
• swollen/state.h (modified) (4 diffs)
• visualstudio/sww.suo (modified) (previous)

Swollen/swollen/state.cpp

@@ -30 +30 @@
     s << _timestep << " ";
 
-    for( unsigned int i = 0; i < 16; i++ )
-       s << *(_matrix.ptr()+i) << " ";
+    s << _position.x() << " " << _position.y() << " " << _position.z() << " ";
+    s << _orientation.x() << " " << _orientation.y() << " " << _orientation.z() << " " << _orientation.w() << " ";
 
     s << _culling << " ";
@@ -44 +44 @@
    s >> _timestep;
 
-   for( unsigned int i = 0; i < 16; i++ )
-      s >> *(_matrix.ptr()+i);
+   s >> _position.x() >> _position.y() >> _position.z();
+   s >> _orientation.x() >> _orientation.y() >> _orientation.z() >> _orientation.w();
 
    s >> _culling;
    s >> _wireframe;
+}
+
+
+void State::setMatrix(osg::Matrix m)
+{
+   m.get(_orientation);
+   _position = m.getTrans();
+
+}
+
+osg::Matrix State::getMatrix()
+{
+   osg::Matrix m;
+   m.set(_orientation);
+   m.setTrans(_position);
+   return m;
 }
 

Swollen/swollen/state.h

@@ -57 +57 @@
     virtual void setCulling(bool value){ _culling = value; }
     virtual void setWireframe(bool value){ _wireframe = value; }
-    virtual void setMatrix(osg::Matrix value){ _matrix = value; }
+    virtual void setMatrix(osg::Matrix value);
 
     virtual double getTime(){ return _time; }
@@ -63 +63 @@
     //virtual osg::Vec3 getPosition(){ return _position; }
     //virtual osg::Quat getOrientation(){ return _orientation; }
-    virtual osg::Matrix getMatrix(){ return _matrix; }
+    virtual osg::Matrix getMatrix();
     virtual bool getCulling(){ return _culling; }
     virtual bool getWireframe(){ return _wireframe; }
@@ -77 +77 @@
     double _time;
     unsigned int _timestep;
-    //osg::Vec3d _position;
-    //osg::Quat _orientation;
-    osg::Matrix _matrix;
+    osg::Vec3d _position;
+    osg::Quat _orientation;
+    //osg::Matrix _matrix;
     bool _culling;
     bool _wireframe;
@@ -96 +96 @@
    virtual bool write(std::string filename);
    //virtual void read(std::string filename);
-
    //virtual ~StateList();