Changeset 66

Timestamp:

Dec 16, 2004, 5:29:40 PM (19 years ago)

Author:

darran

Message:

 

Location:

Swollen/swollen

Files:

• Makefile (modified) (1 diff)
• customterrainmanipulator.cpp (added)
• customterrainmanipulator.h (added)
• customtrackball.cpp (modified) (1 diff)
• customtrackball.h (modified) (2 diffs)
• customviewer.cpp (modified) (1 diff)
• customviewer.h (modified) (2 diffs)
• keyboardeventhandler.h (modified) (1 diff)
• main.cpp (modified) (8 diffs)
• version.h (added)

Swollen/swollen/Makefile

@@ -27 +27 @@
 COMPILER         =  g++
 OBJ              =  customviewer.o hud.o keyboardeventhandler.o watersurface.o main.o \
-                    bedslope.o createSky.o customtrackball.o spotlight.o
+                    bedslope.o createSky.o customtrackball.o customterrainmanipulator.o spotlight.o
 CPPFLAGS         =  -F/System/Library/Frameworks -Wall -DDARWIN_QUICKTIME \
                     $(OPTIMIZATION)

Swollen/swollen/customtrackball.cpp

@@ -6 +6 @@
 */
 
+#include <iostream>
 #include "customtrackball.h"
+
 
 void CustomTrackballManipulator::moveToHome()
 {
-    computePosition(_homeEye, _homeCenter, _homeUp);
+    computePosition( _homeEye, _homeCenter, _homeUp );
 }
+
+
+bool CustomTrackballManipulator::handle( const osgGA::GUIEventAdapter &ea, osgGA::GUIActionAdapter &us )
+{
+    if( _disabled )
+        return false;
+    else
+    {
+        // std::cout << "customtrackballmanipulator active" << std::endl;
+        return osgGA::TrackballManipulator::handle( ea, us );
+    }
+}
+

Swollen/swollen/customtrackball.h

@@ +1 @@
+
+
+#ifndef CUSTOMTRACKBALL_H
+#define CUSTOMTRACKBALL_H
+
 
 #include <project.h>
 #include <osgGA/TrackballManipulator>
+#include <osgGA/GUIActionAdapter>
+#include <osgGA/GUIEventAdapter>
+
 
 class CustomTrackballManipulator : public osgGA::TrackballManipulator
@@ -7 +15 @@
 
 public:
+
     void moveToHome();
+    virtual bool handle( const osgGA::GUIEventAdapter &ea, osgGA::GUIActionAdapter &us );
+    void disable(){ _disabled = true ;}
+    void enable(){ _disabled = false ;}
+
 
 protected:
 
+    bool _disabled;
+
 };
 
+#endif  // CUSTOMTRACKBALL_H

Swollen/swollen/customviewer.cpp

@@ -60 +60 @@
     _updateVisitor->setFrameStamp(_frameStamp.get());
 
+
     _trackball = new CustomTrackballManipulator;
+    _eventHandlerList.push_back( _trackball );
 
-    // FIXME: trying to eliminate need for keyswitchmanipulator
-    //_eventHandlerList.push_back( _trackball );
-    if (options&TRACKBALL_MANIPULATOR) addCameraManipulator(_trackball);
+    _terrainmanipulator = new CustomTerrainManipulator;
+    if (options&TERRAIN_MANIPULATOR) addCameraManipulator( _terrainmanipulator );
+    //if (options&TRACKBALL_MANIPULATOR) addCameraManipulator( _trackball );
+
     
     if (options&STATE_MANIPULATOR)
     {
         osg::ref_ptr<osgGA::StateSetManipulator> statesetManipulator = new osgGA::StateSetManipulator;
-        statesetManipulator->setStateSet(getGlobalStateSet());
-        _eventHandlerList.push_back(statesetManipulator.get());
+        statesetManipulator->setStateSet( getGlobalStateSet() );
+        _eventHandlerList.push_back( statesetManipulator.get() );
     }
         

Swollen/swollen/customviewer.h

@@ -3 +3 @@
 #include <osgProducer/Viewer>
 #include "customtrackball.h"
+#include "customterrainmanipulator.h"
 
 
@@ -12 +13 @@
     void setUpViewer(unsigned int options=STANDARD_SETTINGS);
     virtual CustomTrackballManipulator* getTrackball(){return _trackball;}
+    virtual CustomTerrainManipulator* getTerrainManipulator(){return _terrainmanipulator;}
 
 protected:
     CustomTrackballManipulator* _trackball;
+    CustomTerrainManipulator* _terrainmanipulator;
 
 };

Swollen/swollen/keyboardeventhandler.h

@@ -17 +17 @@
 
 public:
-        KeyboardEventHandler( int nTimesteps, float tps);
+    KeyboardEventHandler( int nTimesteps, float tps);
     virtual bool handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter&);
-        virtual void accept(osgGA::GUIEventHandlerVisitor&) {}
-        virtual bool isPaused(){return _paused;}
-        virtual bool timestepChanged();
-        virtual bool toggleWireframe();
-        virtual int getTimestep(){return (unsigned int) _timestep;}
-        virtual void setTime(float time);
+    virtual void accept(osgGA::GUIEventHandlerVisitor&) {}
+    virtual bool isPaused(){return _paused;}
+    virtual bool timestepChanged();
+    virtual bool toggleWireframe();
+    virtual int getTimestep(){return (unsigned int) _timestep;}
+    virtual void setTime(float time);
 
 private:
-        int _direction, _timestep, _ntimesteps;
-        float _tps, _prevtime, _tpsorig;
-        bool _paused, _timestepchanged, _togglewireframe;
+    int _direction, _timestep, _ntimesteps;
+    float _tps, _prevtime, _tpsorig;
+    bool _paused, _timestepchanged, _togglewireframe;
 };
 

Swollen/swollen/main.cpp

@@ -16 +16 @@
 #include <SWWReader.h>
 #include <bedslope.h>
+#include <customtrackball.h>
 #include <customviewer.h>
 #include <hud.h>
@@ -21 +22 @@
 #include <spotlight.h>
 #include <watersurface.h>
+#include <version.h>
 
 
@@ -46 +48 @@
     arguments.getApplicationUsage()->addCommandLineOption("-nosky","Omit background sky");
     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.
@@ -66 +69 @@
         return 1;
     }
+
+    // version info
+    if( arguments.read("-version") )
+    {
+        std::cout << version() << std::endl;
+        return 1;
+    }
+
 
 
@@ -169 +180 @@
 
     // initial camera position
+    CustomTrackballManipulator* trackball = viewer.getTrackball();
     viewer.getTrackball()->setNode( rootnode );
     viewer.getTrackball()->setAutoComputeHomePosition( false );
@@ -176 +188 @@
         osg::Vec3d(0,0,1) );   // camera up vector
     viewer.getTrackball()->moveToHome();
+    viewer.getTrackball()->disable();
+
+
+    viewer.getTerrainManipulator()->setNode( rootnode );
+    viewer.getTerrainManipulator()->setAutoComputeHomePosition( false );
+    viewer.getTerrainManipulator()->setHomePosition(
+        osg::Vec3d(0,-3,0),    // camera location
+        osg::Vec3d(0,0,0),     // camera target
+        osg::Vec3d(0,0,1) );   // camera up vector
+    viewer.getTerrainManipulator()->moveToHome();
+    viewer.getTerrainManipulator()->enable();
 
 
@@ -194 +217 @@
             water->setTimeStep(timestep);
             hud->setTime( sww->getTime(timestep) );
+
+            // light position manipulator matrix
+            osg::Matrixd matrix = trackball->getInverseMatrix();
+            std::cout << matrix << std::endl;
+
         }
 
@@ -199 +227 @@
         if( event_handler->toggleWireframe() )
             water->toggleWireframe();
-
 
         // update the scene by traversing with the update visitor