Changeset 121

Timestamp:

Jul 10, 2005, 11:22:30 PM (19 years ago)

Author:

darran

Message:

• working towards functional playback of .swm files
• not quite there yet ... still need to reconstitute the StateList?.

Location:

Swollen/swollen

Files:

• Makefile (modified) (2 diffs)
• customargumentparser.cpp (modified) (2 diffs)
• customargumentparser.h (modified) (2 diffs)
• main.cpp (modified) (8 diffs)
• state.cpp (modified) (2 diffs)
• state.h (modified) (2 diffs)
• version.cpp (modified) (1 diff)

Swollen/swollen/Makefile

@@ -6 +6 @@
 TOPDIR           =  ..
 
-OPTIMIZATION     =  -O2
-#OPTIMIZATION     =  -g
+#OPTIMIZATION     =  -O2
+OPTIMIZATION     =  -g
 
 OSG_INCLUDE      =  ${OSGHOME}/include
@@ -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
+                    directionallight.o state.o customviewereventhandler.o customargumentparser.o
 CPPFLAGS         =  -F/System/Library/Frameworks -Wall -DDARWIN_QUICKTIME \
                     $(OPTIMIZATION)

Swollen/swollen/customargumentparser.cpp

@@ -1 +1 @@
 
 #include "customargumentparser.h"
+#include <fstream>
+#include <iostream>
+
+
+#define MAX_LINE_LENGTH 200
 
 using namespace osg;
@@ -7 +12 @@
 CustomArgumentParser::CustomArgumentParser(int* argc, char **argv) : ArgumentParser(argc, argv)
 {
+
+   // last argument is either .sww or .swm filename
+   _filename = new std::string(argv[*argc-1]);
+
+   // ends in .swm?
+   if( _filename->substr(_filename->size()-4,4).find(".swm",0) != -1 )  
+   {
+      _isswm = 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];
+
+         // FIXME: verify this really is the SWM header ...
+         f.getline(str,MAX_LINE_LENGTH);
+
+         // read the stored argc count
+         f.getline(str,MAX_LINE_LENGTH);
+         sscanf( str, "# SWM CLP %d", &_nargs );
+
+         // we will modify the argv array to include the original 
+         // argv[1] ... argv[argc-1] (ie., ignore the final argument which is the swm 
+         // filename) extended by the stored arguments contained in the macro file.
+         char** newargv = new char*[*argc-1+_nargs];
+
+         // current command line params (sans last entry, the .swm file)
+         for( int i=0; i<*argc-1; i++ )
+            newargv[i] = argv[i];
+
+         // now fill in the stored argv[] from the macro file
+         for( int i=0; i<_nargs; i++ )
+         {
+            f.getline(str,MAX_LINE_LENGTH);
+            char *s = new char[strlen(str)+1];
+            strcpy(s,str);
+            newargv[*argc-1+i] = s;
+         }
+
+         // change baseclass private members to the extended argc/argv
+         *_argc = *argc - 1 + _nargs;
+         _argv = newargv;
+
+
+         std::cout << "Modified argument list based on SWM contents" << std::endl;
+         for( int i=0; i<*_argc; i++ )
+            std::cout << "    " << i << ":  " << _argv[i] << std::endl;
+
+      }
+      f.close();
+
+   }
+
+   else
+
+   {
+      _isswm = false;
+
+      // local copies of current argc, argv[] as we may have to save them on '3' save.
+      // note that we don't save argv[0] which is the program name.
+      _nargs = *argc - 1;
+      for( int i=1; i<*argc; i++ )
+         _vargs.push_back( std::string(argv[i]) );
+   } 
+
 }
+
+
+void CustomArgumentParser::write(std::ostream& s)
+{
+   s << "# SWM CLP " << _nargs << std::endl;
+
+   for( int i=0; i < _nargs; i++ )
+      s << _vargs[i] << std::endl;
+
+}

Swollen/swollen/customargumentparser.h

@@ -7 +7 @@
 
 #include <osg/ArgumentParser>
+#include <istream>
+#include <vector>
+#include <string>
 
 
@@ -13 +16 @@
 
 public:
+
     CustomArgumentParser(int *argc, char **argv);
+    void write(std::ostream& s);
+    bool isSWM(){ return _isswm; };
+
 
 protected:
 
+    int _nargs;
+    std::vector<std::string> _vargs;
+    std::string* _filename;
+    bool _isswm;
 };
 

Swollen/swollen/main.cpp

@@ -5 +5 @@
   copyright (C) 2004-2005 Geoscience Australia
 */
+
+#include <iostream>
+#include <fstream>
 
 #include <osg/Group>
@@ -23 +26 @@
 #include <watersurface.h>
 #include <customviewer.h>
-
+#include <customargumentparser.h>
 
 // prototypes
@@ -33 +36 @@
 {
 
-   // 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]);
-   std::cout << swmfile << std::endl;
-   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
-   osg::ArgumentParser arguments( &argc, argv );
+   // use an ArgumentParser object to manage the program arguments.
+   // this custom version handles detects if the last argument is a macro file
+   // and modifies the argument list accordingly so the following code works ...
+   CustomArgumentParser arguments( &argc, argv );
+
 
    // set up the usage document
@@ -49 +46 @@
    arguments.getApplicationUsage()->setDescription( appname );
    arguments.getApplicationUsage()->setCommandLineUsage("swollen [options] swwfile ...");
-   arguments.getApplicationUsage()->addCommandLineOption("-help","Display this information");
-   arguments.getApplicationUsage()->addCommandLineOption("-scale <float>","Vertical scale factor");
-   arguments.getApplicationUsage()->addCommandLineOption("-tps <rate>","Timesteps per second");
-   arguments.getApplicationUsage()->addCommandLineOption("-hmin <float>","Height below which transparency is set to zero");
-   arguments.getApplicationUsage()->addCommandLineOption("-hmax <float>","Height above which transparency is set to alphamax");
-   arguments.getApplicationUsage()->addCommandLineOption("-alphamin <float 0-1>","Transparency value at hmin");
-   arguments.getApplicationUsage()->addCommandLineOption("-alphamax <float 0-1>","Maximum transparency clamp value");
-   arguments.getApplicationUsage()->addCommandLineOption("-lightpos <float>,<float>,<float>","x,y,z of bedslope directional light (z is up, default is overhead)");
-   arguments.getApplicationUsage()->addCommandLineOption("-nosky","Omit background sky");
-   arguments.getApplicationUsage()->addCommandLineOption("-cullangle <float angle 0-90>","Cull triangles steeper than this value");
-   arguments.getApplicationUsage()->addCommandLineOption("-texture <file>","Image to use for bedslope topography");
-   arguments.getApplicationUsage()->addCommandLineOption("-version","Revision number and creation (not compile) date");
+   arguments.getApplicationUsage()->addCommandLineOption("-help", "Display this information");
+   arguments.getApplicationUsage()->addCommandLineOption("-scale <float>", "Vertical scale factor");
+   arguments.getApplicationUsage()->addCommandLineOption("-tps <rate>", "Timesteps per second");
+   arguments.getApplicationUsage()->addCommandLineOption("-hmin <float>", "Height below which transparency is set to zero");
+   arguments.getApplicationUsage()->addCommandLineOption("-hmax <float>", "Height above which transparency is set to alphamax");
+   arguments.getApplicationUsage()->addCommandLineOption("-alphamin <float 0-1>", "Transparency value at hmin");
+   arguments.getApplicationUsage()->addCommandLineOption("-alphamax <float 0-1>", "Maximum transparency clamp value");
+   arguments.getApplicationUsage()->addCommandLineOption("-lightpos <float>,<float>,<float>", "x,y,z of bedslope directional light (z is up, default is overhead)");
+   arguments.getApplicationUsage()->addCommandLineOption("-movie <dirname>", "Save numbered images to named directory and quit");
+   arguments.getApplicationUsage()->addCommandLineOption("-nosky", "Omit background sky");
+   arguments.getApplicationUsage()->addCommandLineOption("-cullangle <float angle 0-90>", "Cull triangles steeper than this value");
+   arguments.getApplicationUsage()->addCommandLineOption("-texture <file>", "Image to use for bedslope topography");
+   arguments.getApplicationUsage()->addCommandLineOption("-version", "Revision number and creation (not compile) date");
 
 
    // construct the viewer.
    CustomViewer viewer(arguments);
+
 
    // set up with sensible default event handlers
@@ -83 +82 @@
    }
 
+
    // same for version info
    if( arguments.read("-version") )
@@ -97 +97 @@
    if( swwfile.substr(swwfile.size()-4,4).find(".sww",0) == -1 )  // ensure filename ends in .sww
    {
-      std::cout << "Require last argument be an .sww file ... quitting" << std::endl;
+      std::cout << "Require last argument be an .sww/.swm file ... quitting" << std::endl;
       return 1; 
    }
@@ -219 +219 @@
    StateList statelist;
    bool recordingmode = false;
-   bool playbackmode = false;
+   bool playbackmode = arguments.isSWM() ? true : false;
    unsigned int playback_index = 0;
 
@@ -316 +316 @@
       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;
+         std::fstream f;
+         f.open( "movie.swm", std::fstream::out );
+         if( f.is_open() )
+         {
+            f << "# SWM 1.0 START" << std::endl;
+            arguments.write( f );
+            statelist.write( f );
+            f << "# SWM END" << std::endl;
+            f.close();
+         }
       }
 

Swollen/swollen/state.cpp

@@ -8 +8 @@
 
 #include <state.h>
-#include <fstream>
-#include <iostream>
 
 
@@ -69 +67 @@
 
 
-bool StateList::write( std::string filename )
+bool StateList::write(std::ostream& s)
 {
    if( this->size() == 0 )
-   {
-      std::cout << "Nothing to save, try '1' to start/stop recording ..." << std::endl;
       return false;
-   }
 
-   std::ofstream f;
-   f.open( filename.c_str() );
+   s << "# SWM DATA" << std::endl;
    StateList::iterator iter = this->begin();
-   for( ; iter < this->end(); iter++)
-      (*iter).write( f );
-   f.close();
-   std::cout << "Compiled animation saved to " << filename.c_str() << std::endl;
+   for( ; iter < this->end(); iter++ )
+      (*iter).write( s );
+
    return true;
 }
+
+
+bool StateList::read(std::istream& s)
+{
+   // s >> "# SWM DATA" >> std::endl;
+
+   return true;
+}

Swollen/swollen/state.h

@@ -44 +44 @@
 #include <istream>
 #include <vector>
+#include <fstream>
+#include <iostream>
+
 
 class State
@@ -87 +90 @@
 
    StateList();
-   virtual bool write(std::string filename);
-   //virtual void read(std::string filename);
-   //virtual ~StateList();
+   bool write(std::ostream& s);
+   bool read(std::istream& s);
+
+   //void ~StateList();
 
 protected:

Swollen/swollen/version.cpp

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