Changeset 71

Timestamp:

Dec 20, 2004, 5:33:36 PM (20 years ago)

Author:

darran

Message:

• moving light is nearly functional
• bad paradigm though, better to have a view from this light position as an inset.

Location:

Swollen/swollen

Files:

• keyboardeventhandler.cpp (modified) (3 diffs)
• keyboardeventhandler.h (modified) (2 diffs)
• main.cpp (modified) (5 diffs)
• version.cpp (modified) (1 diff)

Swollen/swollen/keyboardeventhandler.cpp

@@ -14 +14 @@
     _prevtime = 0;
     _togglewireframe = false;
+    _togglemanipulatormode = false;
 }
 
@@ -75 +76 @@
                 handled = true;
                 break;
+
+            case 'm':
+                _togglemanipulatormode = true;
+                handled = true;
+                break;
+
             }
 
@@ -119 +126 @@
 
 
+bool KeyboardEventHandler::toggleManipulatorMode()
+{
+    if( _togglemanipulatormode )
+    {
+        _togglemanipulatormode = false;
+        return true;
+    }
+    return false;
+}
+
+

Swollen/swollen/keyboardeventhandler.h

@@ -23 +23 @@
     virtual bool timestepChanged();
     virtual bool toggleWireframe();
+    virtual bool toggleManipulatorMode();
     virtual int getTimestep(){return (unsigned int) _timestep;}
     virtual void setTime(float time);
@@ -29 +30 @@
     int _direction, _timestep, _ntimesteps;
     float _tps, _prevtime, _tpsorig;
-    bool _paused, _timestepchanged, _togglewireframe;
+    bool _paused, _timestepchanged, _togglewireframe, _togglemanipulatormode;
 };
 

Swollen/swollen/main.cpp

@@ -136 +136 @@
     // Lighting
     SpotLight* spotlight = new SpotLight(rootStateSet);
-    spotlight->setPosition( osg::Vec3(1,0,1) );  // z is up
+    spotlight->setPosition( osg::Vec3(0,1,0) );  // z is up
     spotlight->setSpotAngle( 45.0 );
 
@@ -181 +181 @@
     // initial camera position
     CustomTrackballManipulator* trackball = viewer.getTrackball();
-    viewer.getTrackball()->setNode( rootnode );
-    viewer.getTrackball()->setAutoComputeHomePosition( false );
-    viewer.getTrackball()->setHomePosition(
+    trackball->setNode( model );
+    trackball->setAutoComputeHomePosition( false );
+    trackball->setHomePosition(
+        osg::Vec3d(0,1,0),    // location
+        osg::Vec3d(0,0,0),     // target
+        osg::Vec3d(0,0,1) );   // up vector
+    trackball->moveToHome();
+    trackball->disable();
+
+
+    CustomTerrainManipulator* terrainmanipulator = viewer.getTerrainManipulator();
+    terrainmanipulator->setNode( rootnode );
+    terrainmanipulator->setAutoComputeHomePosition( false );
+    terrainmanipulator->setHomePosition(
         osg::Vec3d(0,-3,0),    // camera location
         osg::Vec3d(0,0,0),     // camera target
         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();
+    terrainmanipulator->moveToHome();
+    terrainmanipulator->enable();
 
 
@@ -204 +205 @@
     while( !viewer.done() )
     {
+    
         // wait for all cull and draw threads to complete.
         viewer.sync();
@@ -220 +222 @@
 
         // light position manipulator
-        if( viewer.getTrackball()->isEnabled() )
+        if( trackball->isEnabled() )
         {
-           osg::Matrixd matrix = trackball->getInverseMatrix();
-           //std::cout << matrix << std::endl;
+            //osg::Matrixd matrix = trackball->getInverseMatrix();
+           osg::Matrixd matrix = trackball->getMatrix();
+           osg::Vec3d position = matrix.getTrans();
+           //std::cout << "trackball position x: " << position. << std::endl;
+           spotlight->setPosition( position );
         }
+
 
         // events
@@ -230 +236 @@
             water->toggleWireframe();
 
-        // update the scene by traversing with the update visitor 
+        // click-mouse movement can change either camera view or scene light position
+        if( event_handler->toggleManipulatorMode() )
+        {
+            if( trackball->isEnabled() )
+            {
+                trackball->disable();
+                terrainmanipulator->enable();
+            }
+            else
+            {
+                trackball->enable();
+                terrainmanipulator->disable();
+            }
+        }
+        
+
+       // update the scene by traversing with the update visitor 
         viewer.update();
          

Swollen/swollen/version.cpp

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