Changeset 19940

Timestamp:

04/10/07 10:32:14 (1 year ago)

Author:

patrick

Message:

MFT [rev 19334, 19336]: Use more consistent formatting for output messages

(especially for warnings and errors).

Files:

• juggler/branches/2.0/modules/vrjuggler/vrj/Draw/Pf/PfDrawManager.cpp (modified) (47 diffs)

juggler/branches/2.0/modules/vrjuggler/vrj/Draw/Pf/PfDrawManager.cpp

@@ -116 +116 @@
-   mNumPipes = element->getProperty<unsigned int>("number_of_pipes");
-
-vprDBG_CONFIG_LVL) << "NumPipes: " << mNumPipes
-                                     
+ vprDBG_CONFIG_LVL)
+<< "NumPipes: " << mNumPipes
-
-   // Make sure that the user has specified a valid number of pipes in the
@@ -147 +147 @@
-         }
-      }
-
-
-
+
+
+
+
-   }
-   return true;
@@ -156 +157 @@
-void PfDrawManager::sync()
-{
-
-
+ 
+()
-   pfSync();
-}
@@ -166 +167 @@
-void PfDrawManager::draw()
-{
-
-calling appChanFunc
+ 
+Calling app channel function
-      << vprDEBUG_FLUSH;
-   callAppChanFuncs();
@@ -173 +174 @@
-   updatePfProjections();
-
-
-c
+ 
+C
-
-   pfFrame();
@@ -237 +238 @@
-   mApp->preForkInit();
-
-
+ 
-      << "[vrj::PfDrawManager::initAPI()] Entering." << std::endl
-      << vprDEBUG_FLUSH;
@@ -255 +256 @@
-   {
-      vprDEBUG_BEGIN(vrjDBG_DRAW_MGR, vprDBG_STATE_LVL)
-
+
+
-         << std::endl << vprDEBUG_FLUSH;
-      // Single process mode.
@@ -296 +298 @@
-   // debugDump(vprDBG_CONFIG_LVL);
-
-
+ 
-      << "[vrj::PfDrawManager::initAPI()] Exiting." << std::endl
-      << vprDEBUG_FLUSH;
@@ -320 +322 @@
-   {
-      vprDEBUG(vprDBG_ERROR, vprDBG_CRITICAL_LVL)
-:
-
-
+
+:
+.
-      return NULL;
-   }
@@ -341 +343 @@
-   for(unsigned pipe_num=0; pipe_num<mNumPipes; pipe_num++)
-   {
-
+ 
-         << "[vrj::PfDrawManager::initPipes()] Opening Pipe." << std::endl
-         << vprDEBUG_FLUSH;
-(vrjDBG_DRAW_MGR,
-:
+_NEXT(vrjDBG_DRAW_MGR, 
+ 
-         << vprDEBUG_FLUSH;
-
@@ -376 +378 @@
-   //        - Create viewport
-   //        - Create channels for the viewports
-vrjDBG_DRAW_MGR, vprDBG_STATE_LVL,
-                  std::string("vrj::PfDrawManager: ---- Opening new Display --------\n")
-                  std::string("vrj::PfDrawManager: ---- Display Open (done) --------\n"));
-
-
+
+vrjDBG_DRAW_MGR, vprDBG_STATE_LVL
+"[vrj::PfDrawManager::addDisplay()] ---- Opening new Display --------\n",
+
+
-
-   pfDisplay pf_disp;            // The pfDisplay to use
-   pf_disp.disp = disp;
-
-
-
+
+
+
+
+
-
-   int xo, yo, xs, ys;
@@ -456 +461 @@
-#ifdef VJ_DEBUG
-         // ouput debug info about the frame buffer config recieved
-
+ 
-            << "[vrj::PfDrawManager::addDisplay()] Got Mono FB config\n"
-            << vprDEBUG_FLUSH;
-         for ( unsigned int j = 0 ; j < fb_config.size(); ++j )
-         {
-
+ 
-               << "  " << fb_config[j] << std::endl << vprDEBUG_FLUSH;
-         }
-
+ 
-            << std::endl << vprDEBUG_FLUSH;
-#endif
-
-
+ 
-            << "[vrj::PfDrawManager::addDisplay()] "
-            << "Configuring mono window attribs.\n" << vprDEBUG_FLUSH;
@@ -487 +492 @@
-   unsigned num_vps = disp->getNumViewports();
-
-
+
+
+
-   for(unsigned vp_num=0; vp_num < num_vps; vp_num++)
-   {
@@ -571 +578 @@
-
-            vprDEBUG(vrjDBG_DRAW_MGR, vprDBG_CONFIG_LVL)
-PfDrawManager::addDisplay() c
+[vrj:;PfDrawManager::addDisplay()] C
-               << sim_element->getID() << "'\n" << vprDEBUG_FLUSH;
-
@@ -649 +656 @@
-   // Dump the state
-   vprDEBUG(vrjDBG_DRAW_MGR, vprDBG_CONFIG_LVL)
-pfDraw
+Performer Draw 
-   //vprDEBUG(vrjDBG_DRAW_MGR, vprDBG_CONFIG_LVL) << (*this) << vprDEBUG_FLUSH;
-   debugDump(vprDBG_CONFIG_LVL);
@@ -710 +717 @@
-   if(mDisplays.end() == disp_i)
-   {
-
+
+
+
-      return;
-   }
@@ -754 +763 @@
-            {
-               vprASSERT(false && "Trying to remove a non-existant channel");
-
+
+
+
-            }
-
@@ -775 +786 @@
-            {
-               vprASSERT(false && "Trying to remove a non-existant channel");
-
+
+
+
-            }
-
@@ -940 +953 @@
-            << disp->getName() << "'" << std::endl;
-         vprDEBUG_NEXTnl(vrjDBG_DRAW_MGR, vprDBG_WARNING_LVL)
-has an out of date OpenGL frame buffer configuration.
-std::endl
+         has an out of date OpenGL frame buffer 
+"configuration.\n"
-         vprDEBUG_NEXTnl(vrjDBG_DRAW_MGR, vprDBG_WARNING_LVL)
-Expected version 2
-
+         Expected version 3
+  Default values
-         vprDEBUG_NEXTnl(vrjDBG_DRAW_MGR, vprDBG_WARNING_LVL)
-Default values
+        
-            << vprDEBUG_FLUSH;
-      }
@@ -969 +982 @@
-      {
-         vprDEBUG(vrjDBG_DRAW_MGR, vprDBG_WARNING_LVL)
-:
-
+
+:
-            << red_size << ").  Setting to 1.\n" << vprDEBUG_FLUSH;
-         red_size = 1;
@@ -978 +991 @@
-      {
-         vprDEBUG(vrjDBG_DRAW_MGR, vprDBG_WARNING_LVL)
-:
-
+
+:
-            << green_size << ").  Setting to 1.\n" << vprDEBUG_FLUSH;
-         green_size = 1;
@@ -987 +1000 @@
-      {
-         vprDEBUG(vrjDBG_DRAW_MGR, vprDBG_WARNING_LVL)
-:
-
+
+:
-            << blue_size << ").  Setting to 1.\n" << vprDEBUG_FLUSH;
-         blue_size = 1;
@@ -996 +1009 @@
-      {
-         vprDEBUG(vrjDBG_DRAW_MGR, vprDBG_WARNING_LVL)
-:
-
+
+:
-            << alpha_size << ").  Setting to 1.\n" << vprDEBUG_FLUSH;
-         alpha_size = 1;
@@ -1005 +1018 @@
-      {
-         vprDEBUG(vrjDBG_DRAW_MGR, vprDBG_WARNING_LVL)
-:
-
+
+:
-            << ").  Setting to 0.\n" << vprDEBUG_FLUSH;
-         num_aux_bufs = 0;
@@ -1014 +1027 @@
-      {
-         vprDEBUG(vrjDBG_DRAW_MGR, vprDBG_WARNING_LVL)
-:
-
+
+:
-            << ").  Setting to 1.\n" << vprDEBUG_FLUSH;
-         db_size = 1;
@@ -1023 +1036 @@
-      {
-         vprDEBUG(vrjDBG_DRAW_MGR, vprDBG_WARNING_LVL)
-:
-
+
+:
-            << ").  Setting to 1.\n" << vprDEBUG_FLUSH;
-         stencil_size = 1;
@@ -1032 +1045 @@
-      {
-         vprDEBUG(vrjDBG_DRAW_MGR, vprDBG_WARNING_LVL)
-:
-
+
+:
-            << accum_red_size << ").  Setting to 1.\n" << vprDEBUG_FLUSH;
-         accum_red_size = 1;
@@ -1041 +1054 @@
-      {
-         vprDEBUG(vrjDBG_DRAW_MGR, vprDBG_WARNING_LVL)
-:
-
+
+:
-            << accum_green_size << ").  Setting to 1.\n" << vprDEBUG_FLUSH;
-         accum_green_size = 1;
@@ -1050 +1063 @@
-      {
-         vprDEBUG(vrjDBG_DRAW_MGR, vprDBG_WARNING_LVL)
-:
-
+
+:
-            << accum_blue_size << ").  Setting to 1.\n" << vprDEBUG_FLUSH;
-         accum_blue_size = 1;
@@ -1059 +1072 @@
-      {
-         vprDEBUG(vrjDBG_DRAW_MGR, vprDBG_WARNING_LVL)
-:
-
+
+:
-            << accum_alpha_size << ").  Setting to 1.\n" << vprDEBUG_FLUSH;
-         accum_alpha_size = 1;
@@ -1088 +1101 @@
-   const int pad_width_dot(40 - indent_level);
-   vprDEBUG(vrjDBG_DRAW_MGR, vprDBG_CONFIG_LVL)
-
-
+
-   vprDEBUG_NEXTnl(vrjDBG_DRAW_MGR, vprDBG_CONFIG_LVL)
-      << std::setiosflags(std::ios::left) << std::setfill('.')
@@ -1206 +1218 @@
-void PfDrawManager::updatePfProjections()
-{
-
+ 
-      << "[vrj::PfDrawManager::updatePfProjections()] Entering." << std::endl
-      << vprDEBUG_FLUSH;
@@ -1284 +1296 @@
-void PfDrawManager::updatePfProjection(pfChannel* chan, Projection* proj)  //, bool simulator)
-{
-
-
+
-      << "[vrj::PfDrawManager::updatePfProjection()] Entering. viewMat:\n"
-      << proj->getViewMatrix() << std::endl << vprDEBUG_FLUSH;
@@ -1326 +1337 @@
-   */
-
-
+ 
-      << "Frustum: l:" << proj->getFrustum()[Frustum::VJ_LEFT]
-      << "   r: " << proj->getFrustum()[Frustum::VJ_RIGHT]
@@ -1333 +1344 @@
-      << vprDEBUG_FLUSH;
-
-
+ 
-      << "[vrj::PfDrawManager::updatePfProjection()] Exiting.\n"
-      << vprDEBUG_FLUSH;
@@ -1374 +1385 @@
-void PfDrawManager::debugDump(int debugLevel)
-{
-
+ 
-      << "-- DEBUG DUMP --------- "
-      << clrOutNORM(clrCYAN,"vrj::PfDrawManager: 0x")
-
-
-
+ 
+
+ 
-      << "App: 0x" << std::hex << (void*)mApp << std::dec << std::endl
-      << vprDEBUG_FLUSH;
-
+ 
-      << "Scene: 0x" << std::hex << (void*)mRoot << std::dec << std::endl
-      << vprDEBUG_FLUSH;
-
+ 
-      << "Sim scene: 0x" << std::hex << (void*)mRootWithSim << std::dec
-      << std::endl << vprDEBUG_FLUSH;
+   vprDEBUG_NEXT(vrjDBG_DRAW_MGR, debugLevel)
+      << "Number of displays: " << mDisplays.size() << std::endl
+      << vprDEBUG_FLUSH;
+
+   for (std::vector<pfDisplay>::iterator i = mDisplays.begin(); i != mDisplays.end(); i++)
+   {
+      debugDumpPfDisp(&(*i),debugLevel);
+   }
+
+   vprDEBUG_END(vrjDBG_DRAW_MGR, debugLevel)
+      << "-------- Dump end ----\n" << vprDEBUG_FLUSH;
+}
+
+
+void PfDrawManager::debugDumpPfDisp(pfDisplay* pf_disp, int debugLevel)
+{
+   vprDEBUG_BEGIN(vrjDBG_DRAW_MGR, debugLevel)
+      << "Display: 0x" << std::hex << (void*) pf_disp->disp << std::dec
+      << std::endl << vprDEBUG_FLUSH;
-   vprDEBUG_NEXT(vrjDBG_DRAW_MGR,debugLevel)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-   vprDEBUG_NEXT(vrjDBG_DRAW_MGR,debugLevel)
-      << "visual ID: 0x" << std::hex << pf_disp->pWin->getFBConfigId()
@@ -1415 +1429 @@
-      vprASSERT((pf_disp->viewports[vp].viewport != NULL) && "NULL viewport in pf_disp. Check if it was ever set.");
-
-
-
+
+
+
+
+
-
-      for(int ch=0;ch<2;ch++)
@@ -1424 +1441 @@
-         if(cur_chan != NULL)
-            chan_mask = cur_chan->getShare();
-
-:" << ch << " -- " << (void*)
-
+ 
+ " << ch << " -- " << std::hex << (void*) 
+std::dec << 
-              << " Scene:" << (chan_mask & PFCHAN_SCENE)
-              << " AppFunc:" << (chan_mask & PFCHAN_APPFUNC)
@@ -1453 +1470 @@
-
-   // Ouput the visual id
-
+ 
-      << "[vrj::PFconfigPWin()] framebuffer id: 0x"
-      << std::hex << pWin->getFBConfigId() << std::dec << std::endl
@@ -1459 +1476 @@
-   /*
-   int disp_num = int(pWin->getWSWindow());
-
+ 
-      << "[vrj::PFConfigPWin()] Window id: 0x" << std::hex << disp_num
-      << std::dec << std::endl << vprDEBUG_FLUSH;
@@ -1469 +1486 @@
-void PfAppFunc(pfChannel *chan, void* chandata)
-{
-
-
+
+
+
+
+
-
-   pfChannel* master_chan = PfDrawManager::instance()->mMasterChan;
-   if(master_chan == chan)
-   {
-
+
+
-      if(PfDrawManager::instance()->mPfAppCalled == false)      // Haven't called it yet
-      {
-
+
+
+
-         PfDrawManager::instance()->mPfAppCalled = true;
-         pfApp();
@@ -1499 +1522 @@
-{
-   vprDEBUG_OutputGuard(vrjDBG_DRAW_MGR, vprDBG_VERB_LVL,
-
-
-
-
+
+
+
+
+
+
-
-      // Select correct buffer to draw to
@@ -1509 +1534 @@
-   {
-      vprDEBUG(vrjDBG_DRAW_MGR, vprDBG_VERB_LVL)
-
+[
-      if(left_eye)
-      {
@@ -1553 +1578 @@
-void PfDrawFuncStereoLeft(pfChannel *chan, void* chandata)
-{
-
-
+
+
+
+
+
-   PfDrawFunc(chan,chandata,true,false,true);
-}
@@ -1560 +1588 @@
-void PfDrawFuncStereoRight(pfChannel *chan, void* chandata)
-{
-
-
+
+
+
+
+
-   PfDrawFunc(chan,chandata,false,true,true);
-}
@@ -1567 +1598 @@
-void PfDrawFuncMonoBackbuffer(pfChannel *chan, void* chandata)
-{
-
-
+
+
+
+
+
-   PfDrawFunc(chan,chandata,false,false,false);
-}
@@ -1588 +1622 @@
-
-    // Swap the buffer
-
+
+
+
-
-    // Barrier for Cluster