Changeset 70

Timestamp:

Jul 20, 2010, 9:24:42 PM (14 years ago)

Author:

Torben Dannhauer

Message:

sky silverlining vereinfacht.

Location:

osgVisual

Files:

• bin/visual_master.bat (modified) (1 diff)
• bin/visual_slave.bat (modified) (1 diff)
• include/dataIO/dataIO_transportContainer.h (modified) (3 diffs)
• include/dataIO/visual_dataIO.h (modified) (1 diff)
• include/sky_Silverlining/visual_skySilverLining.h (modified) (1 diff)
• src/cluster/dataIO_clusterENet.cpp (modified) (4 diffs)
• src/core/visual_core.cpp (modified) (3 diffs)
• src/dataIO/dataIO_transportContainer.cpp (modified) (1 diff)
• src/dataIO/visual_dataIO.cpp (modified) (2 diffs)
• src/distortion/visual_distortion.cpp (modified) (1 diff)
• src/sky_Silverlining/visual_skySilverLining.cpp (modified) (3 diffs)

osgVisual/bin/visual_master.bat

@@ -1 @@
-osgVisual.exe -C center -m --window 950 50 600 350 D:/OpenSceneGraph/VPB-Testdatensatz/DB_Small/database.ive -p salzburg.path
+osgVisual.exe --SingleThreaded -C center -m --window 950 50 600 350 D:/OpenSceneGraph/VPB-Testdatensatz/DB_Small/database.ive -p salzburg.path

osgVisual/bin/visual_slave.bat

@@ -1 @@
-osgVisual.exe -C center -s --server localhost 12345 --window 950 450 600 350 D:/OpenSceneGraph/VPB-Testdatensatz/DB_Small/database.ive -p salzburg.path
+osgVisual.exe --SingleThreaded -C center -s --server localhost 12345 --window 950 450 600 350 D:/OpenSceneGraph/VPB-Testdatensatz/DB_Small/database.ive -p salzburg.path

osgVisual/include/dataIO/dataIO_transportContainer.h

@@ -34 +34 @@
                         frameID(tC_.frameID),
                         viewMatrix(tC_.viewMatrix),
+                        projectionMatrix(tC_.projectionMatrix),
                         executer(tC_.executer),
                         ioSlots(tC_.ioSlots){}
@@ -48 +49 @@
         int frameID;
         osg::Matrixd viewMatrix;
+        osg::Matrixd projectionMatrix;
         executerList executer;
         slotList ioSlots;
@@ -58 +60 @@
         void setViewMatrix(const osg::Matrixd& viewMatrix_){viewMatrix=viewMatrix_;}
         const osg::Matrixd& getViewMatrix() const {return viewMatrix;}
+
+        void setProjectionMatrix(const osg::Matrixd& projectionMatrix_){projectionMatrix=projectionMatrix_;}
+        const osg::Matrixd& getProjectionMatrix() const {return projectionMatrix;}
 
         void setExecuter(const executerList& executer_) {executer=executer_;}

osgVisual/include/dataIO/visual_dataIO.h

@@ -90 +90 @@
         osg::ref_ptr<dataIO_eventCallback> eventCallback;
 
-
         class dataIO_finalDrawCallback : public osg::Camera::DrawCallback
         {

osgVisual/include/sky_Silverlining/visual_skySilverLining.h

@@ -97 +97 @@
 
         /**
-         * \brief This function initializes the sky framework if it's used with the main camera (without any PRE_RENDER camera like the distortion module).
-         * 
-         * @param sceneGraphRoot : osg::Group* which is the rootNode and coordinateSystemNode of the scene.
-         */ 
-        void init(osg::CoordinateSystemNode *sceneGraphRoot);
-
-        /**
          * \brief This function can be called by the updateCallback. If the postInitialization for adding clouds etc. has be called already, this function will skip.
          * 

osgVisual/src/cluster/dataIO_clusterENet.cpp

@@ -125 +125 @@
                 sendContainer->setFrameID(viewer->getFrameStamp()->getFrameNumber());
                 sendContainer->setViewMatrix(viewer->getCamera()->getViewMatrix());
+                sendContainer->setProjectionMatrix(viewer->getCamera()->getProjectionMatrix());
 
                 // Writing node to stream
@@ -134 +135 @@
                         {
                                 // Send Data via ENet:
-                                OSG_NOTIFY( osg::ALWAYS ) << "dataIO_clusterUDP::sendTO_OBJvaluesToSlaves() - Bytes to send: " << myOstream.str().length() << std::endl;
-                                //sOSG_NOTIFY( osg::ALWAYS ) << "Send: " << myOstream.str() << std::endl;
+                                //OSG_NOTIFY( osg::ALWAYS ) << "dataIO_clusterUDP::sendTO_OBJvaluesToSlaves() - Bytes to send: " << myOstream.str().length() << std::endl;
+                                //OSG_NOTIFY( osg::ALWAYS ) << "Send: " << myOstream.str() << std::endl;
                                 ENetPacket * packet = enet_packet_create (myOstream.str().c_str(), 
                                                                                                   myOstream.str().size(), 
@@ -163 +164 @@
         if (bytes_received > 0 )
         {
-                OSG_NOTIFY( osg::ALWAYS ) << "dataIO_clusterENet::readTO_OBJvaluesFromMaster() - Bytes received: " << bytes_received << std::endl;
+                //OSG_NOTIFY( osg::ALWAYS ) << "dataIO_clusterENet::readTO_OBJvaluesFromMaster() - Bytes received: " << bytes_received << std::endl;
                 //OSG_NOTIFY( osg::ALWAYS ) << "Received: " << std::endl << receivedTransportContainer << std::endl;
 
@@ -177 +178 @@
                                 if (sendContainer)
                                 {
-                                        OSG_NOTIFY( osg::ALWAYS ) << "Received::FrameID is: " << sendContainer->getFrameID() << std::endl;
-                                        // Restore Viewmatrix
+                                        OSG_NOTIFY( osg::ALWAYS ) << "Received:: Settings Viewmatrix...FrameID is: " << sendContainer->getFrameID() << std::endl;
+                                        // Restore Viewmatrix / Projectionmatrix  
                                         viewer->getCamera()->setViewMatrix(sendContainer->getViewMatrix());
+                                        //viewer->getCamera()->setProjectionMatrix(sendContainer->getProjectionMatrix());
                                 }
                                 else

osgVisual/src/core/visual_core.cpp

@@ -82 +82 @@
         #else
                 OSG_NOTIFY( osg::ALWAYS ) << "Using Sky without distortion." << std::endl;
-                sky->init(rootNode);
+                sky->init(NULL, rootNode);
         #endif
 #endif
@@ -111 +111 @@
                 // next frame please....
         viewer->advance();
+                std::cout << "New frame----------------------------" << std::endl;
 
                 /*double hat, hot, lat, lon, height;
@@ -117 +118 @@
                         OSG_NOTIFY( osg::ALWAYS ) << "HOT is: " << hot << ", HAT is: " << hat << std::endl;*/
         
+                // perform all queued events
+                viewer->eventTraversal();
+
                 // update the scene by traversing it with the the update visitor which will
         // call all node update callbacks and animations.
-        viewer->eventTraversal();
+        
         viewer->updateTraversal();
                 

osgVisual/src/dataIO/dataIO_transportContainer.cpp

@@ -27 +27 @@
         ADD_INT_SERIALIZER( FrameID, 0 );
         ADD_MATRIXD_SERIALIZER( ViewMatrix, osg::Matrixd() );
+        ADD_MATRIXD_SERIALIZER( ProjectionMatrix, osg::Matrixd() );
         ADD_LIST_SERIALIZER( Executer, osgVisual::dataIO_transportContainer::executerList );
         ADD_LIST_SERIALIZER( IOSlots, osgVisual::dataIO_transportContainer::slotList );

osgVisual/src/dataIO/visual_dataIO.cpp

@@ -103 +103 @@
         viewer->getCamera()->setFinalDrawCallback( finalDrawCallback );
 
-
         initialized = true;
 }
@@ -113 +112 @@
                 OSG_NOTIFY( osg::ALWAYS ) << "Shutdown visual_dataIO..." << std::endl;
 
-                viewer->getCamera()->removeEventCallback( NULL );
+                viewer->getCamera()->removeEventCallback( eventCallback );
                 eventCallback = NULL;
                 viewer->getCamera()->setFinalDrawCallback( NULL );
                 finalDrawCallback = NULL;
+                
                 viewer = NULL;
+                
 
                 if(cluster.valid())

osgVisual/src/distortion/visual_distortion.cpp

@@ -162 +162 @@
 {
         // Copy Main Camera's matrixes to the PRE_RENDER Camera.
+        std::cout << "distortion updatecallback" << std::endl;
         sceneCamera->setViewMatrix( viewer->getCamera()->getViewMatrix() );
         sceneCamera->setProjectionMatrix( viewer->getCamera()->getProjectionMatrix() );

osgVisual/src/sky_Silverlining/visual_skySilverLining.cpp

@@ -41 +41 @@
 void visual_skySilverLining::skyUpdateCallback::operator()(osg::Node* node, osg::NodeVisitor* nv)
 {
+        std::cout << "Sky silverlining update callback" << std::endl;
         // Check if atmosphere is initialized.
         if (!sky->isInitialized())
@@ -166 +167 @@
         skyDrawable = new skySilverLining_skyDrawable(viewer, sceneRoot);
 
+        if(distortedRoot)       // if distortion used:
+        {
+                int rootKids = distortedRoot->getNumChildren();
+                for (int i = 0; i < rootKids; i++)
+                {
+                        osg::Node *n = distortedRoot->getChild(i);
+                        osg::Camera *cam = dynamic_cast<osg::Camera*>(n);
+                        if (cam && cam->getRenderOrder() == osg::Camera::PRE_RENDER)
+                                sceneCamera = cam;
+                }
+        }
+        else    // if no distortion used:
+                sceneCamera = viewer->getCamera();
+
         osg::Camera *mainCamera = viewer->getCamera();
         if (!useProjMatrixCallback)
@@ -175 +190 @@
                 mainCamera->setProjectionMatrixAsPerspective(fovy, aspect, 2, 125000);
         }
-
-    int rootKids = distortedRoot->getNumChildren();
-    for (int i = 0; i < rootKids; i++)
-    {
-        osg::Node *n = distortedRoot->getChild(i);
-        osg::Camera *cam = dynamic_cast<osg::Camera*>(n);
-        if (cam)
-        {
-            if (cam->getRenderOrder() == osg::Camera::PRE_RENDER)
-            {
-                cam->setClearMask(0);
-
-                osg::ref_ptr<skySilverLining_atmosphereReference> ar = new skySilverLining_atmosphereReference;
-                                ar->atmosphere = atmosphere;
-                cam->setUserData(ar);
-                                mainCamera->setUserData(ar);
-                                sceneCamera = cam;
-
-                                if (useProjMatrixCallback)
-                                {
-                                        skySilverLining_projectionMatrixCallback *cb = new skySilverLining_projectionMatrixCallback( atmosphere, viewer->getCamera(), sceneRoot);
-                                        cam->setClampProjectionMatrixCallback(cb);
-                                        cb->setSkyDrawable(skyDrawable);
-                                }
-            }
-        }
-    }
-
-        // Create and install updateCallback (for position etc.)
-        updateCallback = new skyUpdateCallback( sceneGraphRoot, sceneCamera, this );
-        this->setUpdateCallback( updateCallback );
-
-    // Use a RenderBin to enforce that the sky gets drawn first, then the scene, then the clouds
-        skyDrawable->getOrCreateStateSet()->setRenderBinDetails(-1, "RenderBin");
-
-    // Add the models
-    sceneGraphRoot->getOrCreateStateSet()->setRenderBinDetails(1, "RenderBin");
-
-    // Add the clouds (note, you need this even if you don't want clouds - it calls
-    // Atmosphere::EndFrame() )
-        cloudsDrawable = new skySilverLining_cloudsDrawable(viewer);
-        cloudsDrawable->getOrCreateStateSet()->setRenderBinDetails(99, "RenderBin");
-
-        // Add drawable to this geode to get rendered
-        this->addDrawable(skyDrawable);
-        this->addDrawable(cloudsDrawable);
-}
-
-void visual_skySilverLining::init(osg::CoordinateSystemNode *sceneGraphRoot)
-{
-        sceneRoot = sceneGraphRoot;
-
-        // Use projection matrix callback oder fixed Cullsettings?
-        bool useProjMatrixCallback = true;
-
-        // add Sky to SceneRoot
-        sceneGraphRoot->addChild( this );
-
-        // Deactivate culling for the sky node (required by the silverlining sky framework)
-        this->setCullingActive(false);
-
-        // Instantiate an Atmosphere and associate it with this camera. If you have multiple cameras
-        // in multiple contexts, be sure to instantiate seperate Atmosphere objects for each.
-    // ***IMPORTANT!**** Check that the path to the resources folder for SilverLining in SkyDrawable.cpp
-    // SkyDrawable::initializeSilverLining matches with where you installed SilverLining.
-        atmosphere = new SilverLining::Atmosphere(SILVERLINING_LICENSEE, SILVERLINING_LICENSE);
-        
-    // Add the sky (calls Atmosphere::BeginFrame and handles initialization once you're in
-    // the rendering thread)
-        skyDrawable = new skySilverLining_skyDrawable(viewer, sceneRoot);
- 
-        if (!useProjMatrixCallback)
-        {
-                viewer->getCamera()->setClearMask(0);
-                viewer->getCamera()->setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
-                double fovy, aspect, zNear, zFar;
-                viewer->getCamera()->getProjectionMatrixAsPerspective(fovy, aspect, zNear, zFar);
-                viewer->getCamera()->setProjectionMatrixAsPerspective(fovy, aspect, 2, 125000);
-        }
         else
         {
                 cb = new skySilverLining_projectionMatrixCallback( atmosphere, viewer->getCamera(), sceneRoot);
-                viewer->getCamera()->setClampProjectionMatrixCallback(cb);
+                sceneCamera->setClampProjectionMatrixCallback(cb);
                 cb->setSkyDrawable(skyDrawable);
         }
 
-
-    viewer->getCamera()->setClearMask(0);
-
-    osg::ref_ptr<skySilverLining_atmosphereReference> ar = new skySilverLining_atmosphereReference;
+        // append atmosphere pointer to the cameras.
+        sceneCamera->setClearMask(0);
+        osg::ref_ptr<skySilverLining_atmosphereReference> ar = new skySilverLining_atmosphereReference;
         ar->atmosphere = atmosphere;
-    viewer->getCamera()->setUserData(ar);
-        sceneCamera = viewer->getCamera();
-
-        
+        sceneCamera->setUserData(ar);
+        mainCamera->setUserData(ar);
+
         // Create and install updateCallback (for position etc.)
         updateCallback = new skyUpdateCallback( sceneGraphRoot, sceneCamera, this );