Changeset 125

Timestamp:

Jul 11, 2005, 5:45:03 PM (20 years ago)

Author:

darran

Message:

• adding -movie ability ...

Location:

Swollen/swollen

Files:

• Makefile (modified) (1 diff)
• animation.cpp (added)
• animation.h (added)
• customargumentparser.h (modified) (1 diff)
• customviewer.h (modified) (2 diffs)
• main.cpp (modified) (7 diffs)
• saveImage.cpp (added)
• state.cpp (modified) (3 diffs)
• state.h (modified) (2 diffs)
• version.cpp (modified) (1 diff)

Swollen/swollen/Makefile

@@ -29 +29 @@
 OBJ              =  customviewer.o hud.o keyboardeventhandler.o watersurface.o main.o version.o \
                     bedslope.o createSky.o customtrackball.o customterrainmanipulator.o spotlight.o \
-                    directionallight.o state.o customviewereventhandler.o customargumentparser.o
+                    directionallight.o state.o customviewereventhandler.o customargumentparser.o \
+                    animation.o
 CPPFLAGS         =  -F/System/Library/Frameworks -Wall -DDARWIN_QUICKTIME \
                     $(OPTIMIZATION)

Swollen/swollen/customargumentparser.h

@@ -20 +20 @@
     void write(std::ostream& s);
     bool isSWM(){ return _isswm; };
+    std::string getFilename(){ return *_filename; }
 
 

Swollen/swollen/customviewer.h

@@ +1 @@
+/*
+    CustomViewer Class
+
+    An OpenSceneGraph viewer for pyVolution .sww files.
+    copyright (C) 2004-2005 Geoscience Australia
+*/
+
+
+#ifndef CUSTOMVIEWER_H
+#define CUSTOMVIEWER_H
+
 
 #include <project.h>
@@ -25 +36 @@
 };
 
+#endif  // CUSTOMVIEWER_H

Swollen/swollen/main.cpp

@@ -17 +17 @@
 #include <osgDB/FileNameUtils>
 
+#include <animation.h>
 #include <project.h>
 #include <SWWReader.h>
@@ -37 +38 @@
 
    // use an ArgumentParser object to manage the program arguments.
-   // this custom version handles detects if the last argument is a macro file
+   // this custom version detects if the last argument is a macro file
    // and modifies the argument list accordingly so the following code works ...
    CustomArgumentParser arguments( &argc, argv );
@@ -72 +73 @@
 
 
+   // animation
+   StateList statelist;
+   bool playbackmode;
+   bool recordingmode = false;
+   bool savemovie = false;
+   unsigned int playback_index = 0;
+   std::string moviedir;
+   Animation animation;
+
+   if( arguments.isSWM() )
+   {
+      playbackmode = true;
+      statelist.read( arguments.getFilename() );
+      if( arguments.read("-movie",moviedir) ) 
+      {
+         savemovie = true;  // flag to store frames and quit ...
+         animation.setDirectory( moviedir );
+         animation.setViewer( viewer );
+      }
+   }
+   else
+   {
+      playbackmode = false;
+      savemovie = false;
+   }
+
+
    // get details on keyboard and mouse bindings used by the viewer
    viewer.getUsage(*arguments.getApplicationUsage());
 
    // if user requested help, write it out to cout
-   if( arguments.read("-help") )
+   if( arguments.read("-help") || arguments.read("--help") || arguments.read("-h") )
    {
       arguments.getApplicationUsage()->write(std::cout);
@@ -147 +175 @@
    HeadsUpDisplay* hud = new HeadsUpDisplay();
    hud->setTitle("pyVolution SWW Viewer");
+   if( arguments.isSWM() )
+      hud->setMode("playback");
 
 
@@ -214 +244 @@
    terrainmanipulator->moveToHome();
    terrainmanipulator->enable();
-
-
-   // animation
-   StateList statelist;
-   bool recordingmode = false;
-   bool playbackmode = arguments.isSWM() ? true : false;
-   unsigned int playback_index = 0;
 
  
@@ -290 +313 @@
 
       {
+         // might need to save image from previous pass ...
+         if( savemovie )
+            animation.saveImage( playback_index );
+
          // in playback mode
          State state = statelist.at( playback_index );
@@ -313 +340 @@
       }
 
+
       // '3' key causes compiled animation to be saved to disk
       if( event_handler->toggleSave() )

Swollen/swollen/state.cpp

@@ -6 +6 @@
 */
 
+
+#define MAX_LINE_LENGTH 200
 
 #include <state.h>
@@ -34 +36 @@
 
 // reconstitute self from named stream
-void State::read(std::istream s)
+bool State::read(std::istream& s)
 {
-   s >> _timestep;
-   s >> _position.x() >> _position.y() >> _position.z();
-   s >> _orientation.x() >> _orientation.y() >> _orientation.z() >> _orientation.w();
-   s >> _culling;
-   s >> _wireframe;
+   s >> _timestep
+     >>  _position.x() >> _position.y() >> _position.z()
+     >>  _orientation.x() >> _orientation.y() >> _orientation.z() >> _orientation.w()
+     >> _culling
+     >> _wireframe;
+
+   return s.fail() ? false : true;
 }
 
@@ -81 +85 @@
 
 
-bool StateList::read(std::istream& s)
+
+
+
+bool StateList::read(std::string filename)
 {
-   // s >> "# SWM DATA" >> std::endl;
 
-   return true;
+   // attempt to open the macro file ...
+   std::fstream f;
+   f.open( filename.c_str(), std::fstream::in );
+   if( f.is_open() )
+   {
+      char str[MAX_LINE_LENGTH];
+      char *p;
+      int index = 0;
+
+      // search for data section
+      // FIXME: not very safe, what if data section missing?
+      do 
+      {
+         f.getline(str, MAX_LINE_LENGTH);
+         p = strstr(str, "# SWM DATA");
+         index++;
+
+      } while( p != str );
+
+
+      bool valid;
+      index = 0;
+      do
+      {
+         State* s = new State();
+         valid = s->read(f);
+         if( valid )
+         {
+            this->push_back( *s );
+            index++;
+         }
+      } while( valid );
+
+      std::cout << "Read " << index << " frames of animation for playback ..." << std::endl;
+
+      f.close();
+
+      // success only on non-empty animation
+      if( index )
+         return true;
+   }
+
+   return false;
+
 }

Swollen/swollen/state.h

@@ -65 +65 @@
 
     virtual void write(std::ostream &s);
-    virtual void read(std::istream s);
+    virtual bool read(std::istream& s);
 
     virtual ~State();
@@ -91 +91 @@
    StateList();
    bool write(std::ostream& s);
-   bool read(std::istream& s);
+   bool read(std::string filename);
 
    //void ~StateList();

Swollen/swollen/version.cpp

@@ -1 @@
-const char* version() { const char* s = "Revision: 120M"; return s; }
+const char* version() { const char* s = "Revision: 120:121M"; return s; }