Changeset 132 for Swollen/swollen

Timestamp:

Aug 15, 2005, 9:28:17 PM (20 years ago)

Author:

darran

Message:

Last release version changes

Location:

Swollen/swollen

Files:

• animation.cpp (modified) (3 diffs)
• animation.h (modified) (1 diff)
• customargumentparser.cpp (modified) (2 diffs)
• main.cpp (modified) (8 diffs)
• main.vcproj (modified) (2 diffs)

Swollen/swollen/animation.cpp

@@ -8 +8 @@
 
 #include <iostream>
+#include <string>
 #include <osg/Image>
 #include <osgDB/WriteFile>
-#include <osgDB/FileNameUtils>
+#include <osgDB/FileUtils>
+//#include <osgDB/FileNameUtils>
 #include <animation.h>
 
@@ -16 +18 @@
 Animation::Animation()
 {
-   _save = false;
+   _valid = false;
    _image = new osg::Image;
 
@@ -42 +44 @@
 bool Animation::saveImage( unsigned int playback_index )
 {
-
    _image->readPixels( _x, _y, _width, _height, GL_RGB, GL_UNSIGNED_BYTE);
 
-   if ( osgDB::writeImageFile(*_image, "image.jpg") )
+   // restricted to 9999 frames (famous last words but that should be enough ;-)
+   char nstr[5];
+   sprintf(nstr, "%04d", playback_index);
+   
+   std::string filename = std::string( _dirname + "/frame" + nstr + ".jpg" );
+   if ( osgDB::writeImageFile(*_image, filename) )
    {
-      std::cout << "Saved image " << playback_index << std::endl;
+      std::cout << "Saved " << filename << std::endl;
       return true;
    }

Swollen/swollen/animation.h

@@ -33 +33 @@
    unsigned int _width, _height;
    osg::ref_ptr<osg::Image> _image;
-   bool _save;
+   bool _valid;
 };
 

Swollen/swollen/customargumentparser.cpp

@@ +1 @@
+/*
+  SWWViewer
+
+  An OpenSceneGraph viewer for pyVolution SWW files.
+  copyright (C) 2004-2005 Geoscience Australia
+*/
 
 #include "customargumentparser.h"
 #include <fstream>
 #include <iostream>
+#include <osgDB/FileNameUtils>
 
 
@@ -16 +23 @@
    _filename = new std::string(argv[*argc-1]);
 
-   // ends in .swm?
-   if( _filename->substr(_filename->size()-4,4).find(".swm",0) != -1 )  
+   // macro file?
+   if( osgDB::getLowerCaseFileExtension(*_filename) == std::string("swm") )
    {
       _isswm = true;

Swollen/swollen/main.cpp

@@ -56 +56 @@
    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("-loop", "Repeated (looped) playback of .swm files");
    arguments.getApplicationUsage()->addCommandLineOption("-nosky", "Omit background sky");
    arguments.getApplicationUsage()->addCommandLineOption("-cullangle <float angle 0-90>", "Cull triangles steeper than this value");
@@ -78 +79 @@
    bool recordingmode = false;
    bool savemovie = false;
+   bool loop = false;
    unsigned int playback_index = 0;
    std::string moviedir;
@@ -92 +94 @@
          animation.setViewer( viewer );
       }
+      if( arguments.read("-loop") ) 
+         loop = true;
    }
    else
@@ -97 +101 @@
       playbackmode = false;
       savemovie = false;
+      loop = true;  // playback in none macro mode should loop (otherwise you don't get a chance to save)
    }
 
@@ -123 +128 @@
    std::string swwfile = arguments.argv()[lastarg];
    arguments.remove(lastarg);
-   if( swwfile.substr(swwfile.size()-4,4).find(".sww",0) == -1 )  // ensure filename ends in .sww
+   if( osgDB::getLowerCaseFileExtension(swwfile) != std::string("sww") )
    {
       std::cout << "Require last argument be an .sww/.swm file ... quitting" << std::endl;
@@ -247 +252 @@
  
    unsigned int timestep = 0;
-   while( !viewer.done() )
+   bool done = false;
+   while( !done )
    {
     
       // wait for all cull and draw threads to complete.
       viewer.sync();
+
+      // user hits 'escape' to exit
+      if( viewer.done() )
+         done = true;
 
 
@@ -327 +337 @@
          playback_index ++;
          if( playback_index == statelist.size() )
-            playback_index = 0;
+         {
+            if( loop )
+               playback_index = 0;
+            else
+               done = true;
+         }
 
          // '2' key stops playback of recorded frames
@@ -354 +369 @@
             f.close();
          }
+         std::cout << "Wrote macro file movie.swm" << std::endl;
       }
 

Swollen/swollen/main.vcproj

@@ -123 +123 @@
                         UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
                         <File
+                                RelativePath=".\animation.cpp">
+                        </File>
+                        <File
                                 RelativePath=".\bedslope.cpp">
                         </File>
@@ -176 +179 @@
                         UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
                         <File
+                                RelativePath=".\animation.h">
+                        </File>
+                        <File
                                 RelativePath=".\bedslope.h">
                         </File>