Changeset 119

Timestamp:

Jul 7, 2005, 11:00:08 PM (19 years ago)

Author:

darran

Message:

• working towards swm playback ability
• removed unneeded time from state ...

Location:

Swollen/swollen

Files:

• main.cpp (modified) (8 diffs)
• state.cpp (modified) (2 diffs)
• state.h (modified) (2 diffs)

Swollen/swollen/main.cpp

@@ -32 +32 @@
 int main( int argc, char **argv )
 {
+
+   // check if last argument is an swm macro recording, in which case the configuration parameters
+   // are in the swm header
+   std::string swmfile = std::string(argv[argc-1]);
+   if( swmfile.substr(swmfile.size()-4,4).find(".swm",0) == -1 )  // filename ends in .swm?
+   {
+      std::cout << "swm file ... need to read" << std::endl;
+   }
 
    // use an ArgumentParser object to manage the program arguments
@@ -53 +61 @@
    arguments.getApplicationUsage()->addCommandLineOption("-version","Revision number and creation (not compile) date");
 
+
    // construct the viewer.
    CustomViewer viewer(arguments);
@@ -81 +90 @@
 
 
-   // load sww file specified as final argument on command line (static bedslope
-   // geometry only, per timestep height field geometry is done in loop below)
+   // last argument is either an sww file or an swm macro recording
    int lastarg = arguments.argc()-1;
    std::string swwfile = arguments.argv()[lastarg];
@@ -265 +273 @@
             event_handler->setPaused( true );
             playback_index = 0;
-            // store current state
          }
 
@@ -272 +279 @@
             State state = State();
             state.setTimestep( event_handler->getTimestep() );
-            state.setTime( sww->getTime(timestep) );
             state.setCulling( sww->getCulling() );
             state.setWireframe( water->getWireframe() );
@@ -288 +294 @@
          water->setWireframe( state.getWireframe() );
          water->setCulling( state.getCulling() );
-         hud->setTime( state.getTime() );
+         hud->setTime( sww->getTime(state.getTimestep()) );
 
          // loop playback
@@ -301 +307 @@
             hud->setMode("");
             event_handler->setPaused( true );
-            // pop saved state
          }
 
@@ -309 +314 @@
       // '3' key causes compiled animation to be saved to disk
       if( event_handler->toggleSave() )
+      {
          statelist.write( std::string("movie.swm") );
-
+         std::cout << argc << std::endl;
+         for( int i=0; i < argc; i++ )
+            std::cout << argv[i] << std::endl;
+      }
 
       // scene-graph updates

Swollen/swollen/state.cpp

@@ -27 +27 @@
 void State::write(std::ostream& s)
 {
-    s << _time << " ";
     s << _timestep << " ";
-
     s << _position.x() << " " << _position.y() << " " << _position.z() << " ";
     s << _orientation.x() << " " << _orientation.y() << " " << _orientation.z() << " " << _orientation.w() << " ";
-
     s << _culling << " ";
     s << _wireframe << std::endl;
@@ -41 +38 @@
 void State::read(std::istream s)
 {
-   s >> _time;
    s >> _timestep;
-
    s >> _position.x() >> _position.y() >> _position.z();
    s >> _orientation.x() >> _orientation.y() >> _orientation.z() >> _orientation.w();
-
    s >> _culling;
    s >> _wireframe;

Swollen/swollen/state.h

@@ -51 +51 @@
 
     State();
-    virtual void setTime(double value){ _time = value; }
     virtual void setTimestep(unsigned int value){ _timestep = value; }
-    //virtual void setPosition(osg::Vec3 value){ _position = value; }
-    //virtual void setOrientation(osg::Quat value){ _orientation = value; }
     virtual void setCulling(bool value){ _culling = value; }
     virtual void setWireframe(bool value){ _wireframe = value; }
     virtual void setMatrix(osg::Matrix value);
 
-    virtual double getTime(){ return _time; }
     virtual unsigned int getTimestep(){ return _timestep; }
-    //virtual osg::Vec3 getPosition(){ return _position; }
-    //virtual osg::Quat getOrientation(){ return _orientation; }
     virtual osg::Matrix getMatrix();
     virtual bool getCulling(){ return _culling; }
@@ -75 +69 @@
 protected:
 
-    double _time;
     unsigned int _timestep;
     osg::Vec3d _position;