Changeset 74

Timestamp:

Jan 5, 2005, 6:08:53 PM (20 years ago)

Author:

darran

Message:

Removed terrible trackball light interface

Location:

Swollen/swollen

Files:

• customviewer.cpp (modified) (3 diffs)
• main.cpp (modified) (6 diffs)
• version.cpp (modified) (1 diff)

Swollen/swollen/customviewer.cpp

@@ -11 +11 @@
 CustomViewer::CustomViewer(osg::ArgumentParser& arguments) : Viewer(arguments)
 {
-  
 }
 
@@ -61 +60 @@
 
 
-    _trackball = new CustomTrackballManipulator;
-    _eventHandlerList.push_back( _trackball );
+    //_trackball = new CustomTrackballManipulator;
+    //_eventHandlerList.push_back( _trackball );
 
     _terrainmanipulator = new CustomTerrainManipulator;
-    if (options&TERRAIN_MANIPULATOR) addCameraManipulator( _terrainmanipulator );
-    //if (options&TRACKBALL_MANIPULATOR) addCameraManipulator( _trackball );
+    if( options&TERRAIN_MANIPULATOR ) addCameraManipulator( _terrainmanipulator );
 
     
-    if (options&STATE_MANIPULATOR)
+    if( options&STATE_MANIPULATOR )
     {
         osg::ref_ptr<osgGA::StateSetManipulator> statesetManipulator = new osgGA::StateSetManipulator;
@@ -76 +74 @@
     }
         
-    if (options&VIEWER_MANIPULATOR)
+    if( options&VIEWER_MANIPULATOR )
     {
        osg::ref_ptr<osgProducer::ViewerEventHandler> viewereventhandler = new osgProducer::ViewerEventHandler(this);

Swollen/swollen/main.cpp

@@ -16 +16 @@
 #include <SWWReader.h>
 #include <bedslope.h>
-#include <customtrackball.h>
 #include <customviewer.h>
 #include <hud.h>
 #include <keyboardeventhandler.h>
-//#include <spotlight.h>
 #include <directionallight.h>
 #include <watersurface.h>
@@ -99 +97 @@
 
     // default arguments and command line parameters
-    float tps;
-    if( !arguments.read("-tps",tps) || tps <= 0.0 ) tps = DEF_TPS;
-    float vscale;
-    if( !arguments.read("-scale",vscale) ) vscale = 1.0;
-
-    std::string bedslopetexture;
-    if( arguments.read("-texture",bedslopetexture) ) sww->setBedslopeTexture( bedslopetexture );
-
-    float tmpfloat;
+    float tmpfloat, tps, vscale;
+    if( !arguments.read("-tps", tps) || tps <= 0.0 ) tps = DEF_TPS;
+    if( !arguments.read("-scale", vscale) ) vscale = 1.0;
     if( arguments.read("-hmin",tmpfloat) ) sww->setHeightMin( tmpfloat );  
     if( arguments.read("-hmax",tmpfloat) ) sww->setHeightMax( tmpfloat );      
     if( arguments.read("-alphamin",tmpfloat) ) sww->setAlphaMin( tmpfloat );   
     if( arguments.read("-alphamax",tmpfloat) ) sww->setAlphaMax( tmpfloat );
-        
+
+    std::string bedslopetexture;
+    if( arguments.read("-texture",bedslopetexture) ) sww->setBedslopeTexture( bedslopetexture );
+
+
 
     // root node
@@ -177 +173 @@
     // create the windows and run the threads.
     viewer.realize();
-
-
-    // initial light position
-    CustomTrackballManipulator* lightmanipulator = viewer.getTrackball();
-    lightmanipulator->setNode( model );
-    lightmanipulator->setAutoComputeHomePosition( false );
-    lightmanipulator->setByInverseMatrix( osg::Matrixd( -0.707107, -0.408248,  0.57735,  0.0,
-                                                         0.0,       0.816497,  0.57735,  0.0,
-                                                        -0.707107,  0.408248, -0.57735,  0.0,
-                                                         0.0,       0.0,       2.0,      1.0 ) );
-    lightmanipulator->disable();
 
 
@@ -202 +187 @@
 
 
+    // second camera
+    Producer::ref_ptr<Producer::Camera> pcam1 = viewer.getCamera(0);
+    Producer::Camera* pcam2 = new Producer::Camera();
+    pcam1->setProjectionRectangle( 0.0f, 0.75f, 0.0f, 1.0f );
+
+    pcam2->setRenderSurface( pcam1->getRenderSurface() );
+    pcam2->setProjectionRectangle( 0.76f, 1.0f, 0.0f, 0.25f );
+    viewer.getCameraConfig()->addCamera( "pictureInPicture", pcam2 );
+    osgProducer::OsgSceneHandler* sh = new osgProducer::OsgSceneHandler();
+    sh->getSceneView()->setSceneData( rootnode );
+    pcam2->setSceneHandler( sh );
+
+
+
     unsigned int timestep = 0;
     while( !viewer.done() )
@@ -224 +223 @@
         }
 
-        // light position manipulator
-        if( lightmanipulator->isEnabled() )
-        {
-            osg::Matrixd matrix = lightmanipulator->getInverseMatrix();
-            //std::cout << matrix << std::endl;
-            osg::Vec3d position = matrix.getTrans();
-            light->setPosition( position );
-        }
-
-
         // events
         if( event_handler->toggleWireframe() )
@@ -241 +230 @@
         if( event_handler->toggleManipulatorMode() )
         {
-            if( lightmanipulator->isEnabled() )
-            {
-                lightmanipulator->disable();
-                terrainmanipulator->enable();
-                light->hide();
-            }
-            else
-            {
-                lightmanipulator->enable();
-                terrainmanipulator->disable();
-                light->show();
-            }
         }
         

Swollen/swollen/version.cpp

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