Changeset 4477 for OpenSceneGraph/trunk/examples/osgcamera/osgcamera.cpp

Timestamp:

08/30/05 16:41:08 (8 years ago)

Author:

robert

Message:

Clean up and fixes to GraphicThread? class, and osgcamera example.

Files:

• OpenSceneGraph/trunk/examples/osgcamera/osgcamera.cpp (modified) (9 diffs)

OpenSceneGraph/trunk/examples/osgcamera/osgcamera.cpp

@@ -48 +48 @@
     virtual void operator () (osg::GraphicsContext* context)
     {
-        std::cout<<"FrameOperation draw begin"<<context<<std::endl;
-
         _sceneView->setState(context->getState());
         _sceneView->setProjectionMatrix(_camera->getProjectionMatrix());
@@ -57 +55 @@
         _sceneView->cull();
         _sceneView->draw();
-
-        std::cout<<"FrameOperation draw end"<<context<<std::endl;
     }
     
@@ -128 +124 @@
         }
 
-        // realise the window
-        gfxc->realize();
-
         camera->setGraphicsContext(gfxc.get());
 
@@ -142 +135 @@
         camera->setViewMatrix(viewMatrix);
 
-
+        // graphics thread will realize the window.
         gfxc->createGraphicsThread();
 
@@ -163 +156 @@
     std::cout<<"nubmer of gfx."<<graphicsContextSet.size()<<std::endl;
 
-
-    GraphicsContextSet::iterator gitr;
-    for(gitr = graphicsContextSet.begin();
-        gitr != graphicsContextSet.end();
-        ++gitr)
-    {
-        std::cout<<"Issue swap."<<std::endl;
-        osg::GraphicsContext* context = *gitr;
-        context->getGraphicsThread()->add(swapOp.get(), true);
-    }
-    
     // record the timer tick at the start of rendering.    
     osg::Timer_t start_tick = osg::Timer::instance()->tick();
+    osg::Timer_t previous_tick = start_tick;
     
     bool done = false;    
@@ -182 +165 @@
     while( !done )
     {
-        std::cout<<"Frame "<<frameNum<<std::endl;
-
-        frameStamp->setReferenceTime(osg::Timer::instance()->delta_s(start_tick,osg::Timer::instance()->tick()));
+
+        osg::Timer_t current_tick = osg::Timer::instance()->tick();
+
+        frameStamp->setReferenceTime(osg::Timer::instance()->delta_s(start_tick,current_tick));
         frameStamp->setFrameNumber(frameNum++);
         
-        std::cout<<"Frame rate "<<(double)frameNum / frameStamp->getReferenceTime()<<std::endl;
+        std::cout<<"Frame rate "<<1.0/osg::Timer::instance()->delta_s(previous_tick,current_tick)<<std::endl;
+        previous_tick = current_tick;
 
 
@@ -201 +186 @@
         }
 
+        GraphicsContextSet::iterator gitr;
         for(gitr = graphicsContextSet.begin();
             gitr != graphicsContextSet.end();
@@ -210 +196 @@
         }
 
-        std::cout<<"Join frameEndBarrierOp block "<<std::endl;
+        osg::notify(osg::INFO)<<"Join frameEndBarrierOp block "<<std::endl;
         osg::Timer_t before_tick = osg::Timer::instance()->tick();
         frameEndBarrierOp->block();
         osg::Timer_t after_tick = osg::Timer::instance()->tick();
-        std::cout<<"Leave frameEndBarrierOp block "<<osg::Timer::instance()->delta_s(before_tick,after_tick)<<std::endl;
-
-        std::cout<<"Join preSwapBarrierOp block "<<std::endl;
+        osg::notify(osg::INFO)<<"Leave frameEndBarrierOp block "<<osg::Timer::instance()->delta_s(before_tick,after_tick)<<std::endl;
+
+        osg::notify(osg::INFO)<<"Join preSwapBarrierOp block "<<std::endl;
         before_tick = osg::Timer::instance()->tick();
-//        preSwapBarrierOp->block();
         after_tick = osg::Timer::instance()->tick();
-        std::cout<<"Leave preSwapBarrierOp block "<<osg::Timer::instance()->delta_s(before_tick,after_tick)<<std::endl;
+        osg::notify(osg::INFO)<<"Leave preSwapBarrierOp block "<<osg::Timer::instance()->delta_s(before_tick,after_tick)<<std::endl;
 
         for(gitr = graphicsContextSet.begin();
@@ -227 +212 @@
         {
             osg::GraphicsContext* context = *gitr;
-            context->getGraphicsThread()->add(swapOp.get(), false);
+            context->getGraphicsThread()->add(swapOp.get(), true);
         }