Changeset 70

Timestamp:

Dec 17, 2004, 12:09:36 AM (19 years ago)

Author:

darran

Message:

• work in progress ...

Location:

Swollen/swollen

Files:

• customtrackball.h (modified) (1 diff)
• customviewer.cpp (modified) (1 diff)
• main.cpp (modified) (4 diffs)
• version.cpp (modified) (1 diff)

Swollen/swollen/customtrackball.h

@@ -20 +20 @@
     void disable(){ _disabled = true ;}
     void enable(){ _disabled = false ;}
+    bool isEnabled(){ return !_disabled ;}
 
 

Swollen/swollen/customviewer.cpp

@@ -78 +78 @@
     if (options&VIEWER_MANIPULATOR)
     {
-        getEventHandlerList().push_back(new osgProducer::ViewerEventHandler(this));
+       osg::ref_ptr<osgProducer::ViewerEventHandler> viewereventhandler = new osgProducer::ViewerEventHandler(this);
+       getEventHandlerList().push_back( viewereventhandler.get() );
     }
     

Swollen/swollen/main.cpp

@@ -32 +32 @@
 {
 
-    // use an ArgumentParser object to manage the program arguments.
+    // use an ArgumentParser object to manage the program arguments
     osg::ArgumentParser arguments(&argc,argv);
 
-    // set up the usage document, in case we need to print out how to use this program.
-    arguments.getApplicationUsage()->setDescription(arguments.getApplicationName());
+    // set up the usage document
+    std::string appname = arguments.getApplicationName();
+    arguments.getApplicationUsage()->setDescription( appname );
     arguments.getApplicationUsage()->setCommandLineUsage("swollen [options] swwfile ...");
     arguments.getApplicationUsage()->addCommandLineOption("-help","Display this information");
@@ -52 +53 @@
     CustomViewer viewer(arguments);
 
-    // set up the value with sensible default event handlers.
-    viewer.setUpViewer(osgProducer::Viewer::STANDARD_SETTINGS);
-    viewer.setClearColor(osg::Vec4(DEF_BACKGROUND_COLOUR));
+    // set up with sensible default event handlers
+    viewer.setUpViewer( osgProducer::Viewer::STANDARD_SETTINGS );
+    viewer.setClearColor( osg::Vec4(DEF_BACKGROUND_COLOUR) );
     viewer.getCamera(0)->getRenderSurface()->setWindowRectangle(200,100,800,600);
     viewer.getCullSettings().setComputeNearFarMode( osg::CullSettings::COMPUTE_NEAR_FAR_USING_PRIMITIVES );
 
 
-    // get details on keyboard and mouse bindings used by the viewer.
+    // get details on keyboard and mouse bindings used by the viewer
     viewer.getUsage(*arguments.getApplicationUsage());
 
-    // if user request help write it out to cout.
+    // if user requested help, write it out to cout
     if( arguments.read("-help") )
     {
@@ -69 +70 @@
     }
 
-    // version info
+    // same for version info
     if( arguments.read("-version") )
     {
@@ -216 +217 @@
             water->setTimeStep(timestep);
             hud->setTime( sww->getTime(timestep) );
-
-            // light position manipulator matrix
-            osg::Matrixd matrix = trackball->getInverseMatrix();
-            //std::cout << matrix << std::endl;
-
         }
+
+        // light position manipulator
+        if( viewer.getTrackball()->isEnabled() )
+        {
+           osg::Matrixd matrix = trackball->getInverseMatrix();
+           //std::cout << matrix << std::endl;
+        }
 
         // events

Swollen/swollen/version.cpp

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