Changeset 19938

Timestamp:

04/10/07 09:54:25 (1 year ago)

Author:

patrick

Message:

Fixed coding standard violations. No functional changes.

Files:

• juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfDrawManager.cpp (modified) (64 diffs)
• juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfDrawManager.h (modified) (4 diffs)

juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfDrawManager.cpp

@@ -74 +74 @@
-
-// Draw Callbacks
- *
- *
- *
+* 
+* 
+* 
-//void PfDrawFuncSimulator(pfChannel* chan, void* chandata);
- *
-
-
- *p, pfPipeWindow *
+* 
+
+
+* p, pfPipeWindow* 
-
-vprSingletonImp(PfDrawManager);
@@ -88 +88 @@
-{
-   //TODO: Add thread safety.
-for ( std::vector<PfInputHandler*>::iterator itr = mPfInputHandlers.begin()
-      itr != mPfInputHandlers.end() ; itr++
+typedef std::vector<PfInputHandler*>::iterator iter_type
+for ( iter_type itr = mPfInputHandlers.begin(); itr != mPfInputHandlers.end(); ++itr 
-   {
-      delete *itr;
@@ -117 +117 @@
-   // pipes when creating a new display_system element is 0. It needs to be this
-   // because we can not fill in the list of pipes with default values.
-(mNumPipes < 1
+ ( mNumPipes < 1 
-   {
-      mNumPipes = 1;
-   }
-
-unsigned int i=0;i<mNumPipes;i++
+ unsigned int i = 0; i < mNumPipes; ++i 
-   {
-      std::string cur_disp_name = "-1";
-
- value is
-not present. So if a pipe string is not specified for this pipe then
-
+
+value is not present. So if a pipe string is not specified for
+this pipe then 
-      mPipeStrs.push_back(element->getProperty<std::string>("x11_pipes", i));
-
-(mPipeStrs[i] == cur_disp_name
+ ( mPipeStrs[i] == cur_disp_name 
-      {
-         std::string display_env;
@@ -146 +146 @@
-         << vprDEBUG_FLUSH;
-   }
+
-   return true;
-}
@@ -173 +174 @@
-   pfFrame();
-
-for (std::vector<PfInputHandler*>::iterator itr = mPfInputHandlers.begin() 
-     itr != mPfInputHandlers.end() ; itr++
+typedef std::vector<PfInputHandler*>::iterator iter_type
+for ( iter_type itr = mPfInputHandlers.begin(); itr != mPfInputHandlers.end(); ++itr 
-   {
-      (*itr)->checkEvents();
-   }
-}
-
-
-// XXX: Hack for now
@@ -187 +187 @@
-   //    for(each viewport)
-   //       for(each channel)
-(unsigned int dispIndex=0;dispIndex<mDisplays.size();dispIndex++
-
-(unsigned vp=0;vp<mDisplays[dispIndex].viewports.size();vp++
-
-(unsigned ch=0;ch<2;ch++
+ ( unsigned int dispIndex = 0; dispIndex < mDisplays.size(); ++dispIndex 
+
+ ( unsigned int vp = 0; vp < mDisplays[dispIndex].viewports.size(); ++vp 
+
+ ( unsigned int ch = 0; ch < 2; ++ch 
-         {
-
+
+
-               mApp->appChanFunc(mDisplays[dispIndex].viewports[vp].chans[ch]);
+            }
-         }
-      }
-   }
-}
-
-
-/**
@@ -206 +207 @@
- * @post dynamic_cast<> of the app to a Pf app.
- */
-_
+
-{
-   //vprASSERT(app != NULL);
-
-
-
-
+
+
+
+
+
+
+
-}
-
@@ -226 +230 @@
-   pfuInitUtil();
-   
-
+
+
-   vprASSERT(mDisplayManager != NULL);
-
+
+
+
-
-   mApp->preForkInit();
@@ -246 +253 @@
-#else
-   // If we are running in a cluster then we must run in single process mode.
-(
-jccl::ConfigManager::instance()->isElementTypeInActiveList("cluster_manager")
+ ( 
+ jccl::ConfigManager::instance()->isElementTypeInActiveList("cluster_manager") 
-   {
-      vprDEBUG_BEGIN(vrjDBG_DRAW_MGR, vprDBG_STATE_LVL)
@@ -263 +270 @@
-#endif
-
-
+
+
-//   initLoaders();          // Must call before pfConfig
-
@@ -275 +283 @@
-
-   // Initialize the pipes that the system may need
-
+
+
-   initPipes();
-
-   initPerformerGraph();        // Create the other scene graph nodes
-
+
+
-      initAppGraph();           // App was already set, but pf was not loaded.  So load graph now
-
+
-
-   vprASSERT(mRoot != NULL && "We have a NULL root in PfDrawManager");
-
-
+
+
+
+
-
-   //pfFrame();
@@ -300 +312 @@
- * Gets a Performer pipe.
- *
-_n
+N
- *       Fork must have happened.
- */
-pipe_n
+int pipeN
-{
-   vprASSERT((mPfHasForked) && "Tried to get pipe before forking happened");
-_n
-_n
-_n
+N
+N
+N
-
-   // Print an error message if an invalid pipe was requested.  This will
-   // probably only happen when a configuration is broken.
-_num >= mNumPipes || pipe_n
-_n
+Num >= mNumPipes || pipeN
+N
-   {
-      vprDEBUG(vprDBG_ERROR, vprDBG_CRITICAL_LVL)
-         << clrOutNORM(clrRED, "ERROR")
-_n
+N
-         << "Check display system configuration.\n" << vprDEBUG_FLUSH;
-      return NULL;
@@ -324 +336 @@
-   {
-      // Return the actual pipe
-_n
+N
-   }
-}
@@ -335 +347 @@
-   mPipes.resize(mNumPipes, NULL);     // Resize the vector
-
-(unsigned pipe_num=0; pipe_num<mNumPipes; pipe_num++
+ ( unsigned int pipe_num = 0; pipe_num < mNumPipes; ++pipe_num 
-   {
-      vprDEBUG(vrjDBG_DRAW_MGR, vprDBG_CONFIG_LVL)
@@ -349 +361 @@
-
-      pfPipeWindow* pw = allocatePipeWin(pipe_num);   // new pfPipeWindow(mPipes[pipe_num]);
-0,1,
+ 0, 1, 
-
-      // XXX: Set the swap func
- PfPipeSwapFunc );    
+PfPipeSwapFunc);
-   }
-}
@@ -365 +377 @@
-{
-   vprASSERT(disp.get() != NULL);    // Can't add a null display
-
+
+
-
-   //  For the display
@@ -408 +421 @@
-   // Setup window border
-   if (disp->shouldDrawBorder())
+   {
-      pf_disp.pWin->setName(disp->getName().c_str()); // Give the window a name
+   }
-   else
-
+
+
+
-
-   jccl::ConfigElementPtr fb_elt = disp->getGlFrameBufferConfig();
@@ -484 +501 @@
-   //   - Setup master chans
-   Viewport* viewport = NULL;
-unsigned
+const unsigned int
-
-   vprDEBUG(vrjDBG_DRAW_MGR, vprDBG_CONFIG_LVL)
-      << "   Num viewports: " << num_vps << std::endl << vprDEBUG_FLUSH;
-
-(unsigned vp_num=0; vp_num < num_vps; vp_num++
+ ( unsigned int vp_num = 0; vp_num < num_vps; ++vp_num 
-   {
-      viewport = disp->getViewport(vp_num);
-
-(viewport->isActive()
+ ( viewport->isActive() 
-      {
-         //Viewport::View view = viewport->getView();
-       
+
-         pf_viewport.viewport = viewport;
-         float vp_ox, vp_oy, vp_sx, vp_sy;
@@ -504 +521 @@
-         viewport->getOriginAndSize(vp_ox, vp_oy, vp_sx, vp_sy);
-         pf_viewport.chans[pfViewport::PRIMARY] = new pfChannel(pipe);
-
+
+
+
+
-         pf_disp.pWin->addChan(pf_viewport.chans[pfViewport::PRIMARY]);
-
-         // Secondary channel - (Right in stereo)
-(disp->isStereoRequested()
+ ( disp->isStereoRequested() 
-         {
-            pf_viewport.chans[pfViewport::SECONDARY] = new pfChannel(pipe);
-
+
+
+
+
-            pf_disp.pWin->addChan(pf_viewport.chans[pfViewport::SECONDARY]);
-         }
-
-         // Set draw function
-(disp->isStereoRequested()
+ ( disp->isStereoRequested() 
-         {
-
-
+
+
+
+
-         }
-         else
-         {
-
+
+
-         }
-
-         // if surface ==> Setup surface channels
-viewport->isSurface()
+ viewport->isSurface() 
-         {
-            vprASSERT(pf_viewport.chans[pfViewport::PRIMARY] != NULL);
-
-            // Primary
-(NULL == mSurfMasterChan
+ ( NULL == mSurfMasterChan 
-            {
-               mSurfMasterChan = pf_viewport.chans[pfViewport::PRIMARY];
@@ -546 +572 @@
-
-            // Secondary
-(NULL != pf_viewport.chans[pfViewport::SECONDARY]
+ ( NULL != pf_viewport.chans[pfViewport::SECONDARY] 
-            {
-               mSurfChannels.push_back(pf_viewport.chans[pfViewport::SECONDARY]);
-               mSurfMasterChan->attach(pf_viewport.chans[pfViewport::SECONDARY]);
-            }
-
-         }
-         // if sim ==> setup sim channels
-(viewport->isSimulator()
+ ( viewport->isSimulator() 
-         {
-            // -- Finish Simulator setup
@@ -566 +591 @@
-
-            // Create the simulator stuff
-
+
+
-
-            jccl::ConfigElementPtr sim_element =
@@ -590 +616 @@
-
-            // Primary
-(NULL == mSimMasterChan
+ ( NULL == mSimMasterChan 
-            {
-               mSimMasterChan = pf_viewport.chans[pfViewport::PRIMARY];
@@ -604 +630 @@
-
-            // Secondary
-(NULL != pf_viewport.chans[pfViewport::SECONDARY]
+ ( NULL != pf_viewport.chans[pfViewport::SECONDARY] 
-            {
-               mSimChannels.push_back(pf_viewport.chans[pfViewport::SECONDARY]);
@@ -613 +639 @@
-         // Add viewport to the display list
-         pf_disp.viewports.push_back(pf_viewport);
-
-      }  // is viewport active
-   }     // for each viewport
@@ -629 +654 @@
-   // Performer says that if you trigger a window from the applciation proccess
-   // you must wait for the window to open during the draw process.
-( !pfIsPWinOpen( pf_disp.pWin 
+ ( ! pfIsPWinOpen(pf_disp.pWin
-   {
-      pfFrame();
-
-
-
-
+
+
+
+
+
-   
-   // Configure the Performer window to accept events.
@@ -641 +667 @@
-   new_input_handler->config(display_elt, disp);
-
-   
-   mPfInputHandlers.push_back(new_input_handler);
-
-(pf_disp.disp->shouldHideMouse()
+ ( pf_disp.disp->shouldHideMouse() 
-   {
-      pfuLoadPWinCursor(pf_disp.pWin, PFU_CURSOR_OFF);
@@ -680 +705 @@
-*/
-
-
-
-
-/**
- * Callback when display is removed to display manager.
@@ -704 +726 @@
-   }
-#else
-
-
-
+
+
+
+
-#endif
-
-
-
+
-   {
-      vprDEBUG(vrjDBG_DRAW_MGR, vprDBG_CRITICAL_LVL)
@@ -718 +740 @@
-   }
-
-
-   // Release the pfDisplay
-   releaseDisplay(*disp_i);
@@ -729 +750 @@
-{
-   // Release all viewports
-
+
+
-   {
-      releaseViewport(disp, *i);
@@ -738 +760 @@
-}
-
-
-void PfDrawManager::releaseViewport(pfDisplay& disp, pfViewport& vp)
-{
@@ -744 +765 @@
-
-   // Release the channel stuff
-(int i=0;i<2;i++
+ ( int i = 0; i < 2; ++i 
-   {
-      pfChannel* chan = vp.chans[i];
-
-      // if we have a channel to delete
-(chan != NULL
-
-(vp.viewport->isSurface()
+ ( chan != NULL 
+
+ ( vp.viewport->isSurface() 
-         {
-            // Remove the channel from the list of channels
-
-
+
+
+
+
-            {
-               vprASSERT(false && "Trying to remove a non-existant channel");
@@ -764 +787 @@
-
-            // Check if we were the master
-(chan == mSurfMasterChan
+ ( chan == mSurfMasterChan 
-            {
-
-
+
+
+
-                  mSurfMasterChan = mSurfChannels[0];
+               }
-            }
-
-
+
+
-               chan->detach(mSurfMasterChan);
+            }
-         }
-(vp.viewport->isSimulator()
+ ( vp.viewport->isSimulator() 
-         {
-            // Remove the channel from the list of channels
-            chan_i = std::find(mSimChannels.begin(), mSimChannels.end(), chan);
-(chan_i == mSimChannels.end()
+ ( chan_i == mSimChannels.end() 
-            {
-               vprASSERT(false && "Trying to remove a non-existant channel");
@@ -787 +814 @@
-
-            // Check if we were the master
-(chan == mSimMasterChan
+ ( chan == mSimMasterChan 
-            {
-
-
+
+
+
-                  mSimMasterChan = mSimChannels[0];
+               }
-            }
-
-
+
+
-               chan->detach(mSimMasterChan);
+            }
-         }
-
-         chan->setScene(NULL);
-         disp.pWin->removeChan(chan);     // Remove channel from pwin
-
-
-
-
-
-
+
+
+
+
-
-// Get a pipe window to use
-
-
+
+
+
-{
-   pfPipeWindow* ret_val;
@@ -819 +849 @@
-   }
-
-(mPipeWindows[pipeNum].size() > 0
+ ( mPipeWindows[pipeNum].size() > 0 
-   {
-      ret_val = mPipeWindows[pipeNum].back();
@@ -826 +856 @@
-   else
-   {
-     
+
-   }
-
@@ -835 +865 @@
-
-// Just store the old pipe window in the list
-
+
+
-{
-   mPipeWindows[pipeNum].push_back(pipeWin);
-}
-
-
-
-// Initialize the parameters of the master channel
@@ -859 +888 @@
-   // Set the Channel attribs based on cur settings
-   //
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-   //masterChan->setTravFunc(PFTRAV_APP, PfAppFunc);
@@ -876 +906 @@
-   //                     PFCHAN_APPFUNC | PFCHAN_CULLFUNC );
-}
-
-
-/** Returns the needed mono frame buffer config. */
@@ -1184 +1213 @@
-   mRootWithSim = new pfScene;
-
-     
+
-   mRoot->addChild(mSceneGroup);        // Create the base scene without sim
-     
+
-}
-
@@ -1196 +1225 @@
-{
-   mApp->initScene();
-
+
+
-      mSceneGroup->removeChild(mSceneRoot);
+   }
-
-   mSceneRoot = mApp->getScene();
@@ -1225 +1256 @@
-   //   for(each viewport)
-   //       update Performer specific stuff.
-unsigned disp_id=0;disp_id<mDisplays.size();disp_id++
+ unsigned int disp_id = 0; disp_id < mDisplays.size(); ++disp_id 
-   {
-      pfDisplay* cur_disp = &(mDisplays[disp_id]);
-
-      vprASSERT(cur_disp->disp != NULL);
-(unsigned vp=0;vp<cur_disp->viewports.size();vp++) 
+ ( unsigned int vp = 0; vp < cur_disp->viewports.size(); ++vp )
-      {
-         pfViewport* pf_vp = &(cur_disp->viewports[vp]);
@@ -1245 +1276 @@
-         // --- All viewports --- //
-         //surf_vp = dynamic_cast<SurfaceViewport*>(pf_vp->viewport);
-
+
+
-         view = cur_vp->getView();
-
-(Viewport::LEFT_EYE == view
+ ( Viewport::LEFT_EYE == view 
-         {
-
+
+
-         }
-(Viewport::RIGHT_EYE == view
+ ( Viewport::RIGHT_EYE == view 
-         {
-
+
+
-         }
-(Viewport::STEREO == view
+ ( Viewport::STEREO == view 
-         {
-
-
+
+
+
+
-         }
-         else
@@ -1267 +1303 @@
-
-         // Sim viewport
-(cur_vp->isSimulator()
+ ( cur_vp->isSimulator() 
-         {
-            SimViewport*      sim_vp(NULL);
@@ -1273 +1309 @@
-
-            sim_vp = dynamic_cast<SimViewport*>(pf_vp->viewport);
-
+
+
-
-            draw_sim_i =
@@ -1284 +1321 @@
-            draw_sim_i->updateSimulatorSceneGraph();
-         }
-
-      }
-   }
@@ -1361 +1397 @@
-{
-   // Search surface displays
-(unsigned int i=0;i<mSurfDisps.size();i++
+ ( unsigned int i = 0; i < mSurfDisps.size(); ++i 
-   {
-      pfChannel* primary_chan = mSurfDisps[i].chans[pfDisp::PRIMARY];
-      pfChannel* secondary_chan = mSurfDisps[i].chans[pfDisp::SECONDARY];
-
-
+
+
+
+
-   }
-
-   // Search simulator displays
-(unsigned int i=0;i<mSimDisps.size();i++
+ ( unsigned int i = 0; i < mSimDisps.size(); ++i 
-   {
-      pfChannel* primary_chan = mSimDisps[i].chans[pfDisp::PRIMARY];
-      pfChannel* secondary_chan = mSimDisps[i].chans[pfDisp::SECONDARY];
-
-
+
+
+
+
-   }
-
@@ -1382 +1422 @@
-*/
-
-
+const 
-{
-   vprDEBUG_BEGIN(vrjDBG_DRAW_MGR, debugLevel)
@@ -1390 +1430 @@
-      << vprDEBUG_FLUSH;
-   vprDEBUG_NEXT(vrjDBG_DRAW_MGR, debugLevel)
-
+ 
-      << vprDEBUG_FLUSH;
-   vprDEBUG_NEXT(vrjDBG_DRAW_MGR, debugLevel)
-
+ 
-      << vprDEBUG_FLUSH;
-   vprDEBUG_NEXT(vrjDBG_DRAW_MGR, debugLevel)
-
+ 
-      << std::endl << vprDEBUG_FLUSH;
-   vprDEBUG_NEXT(vrjDBG_DRAW_MGR, debugLevel)
@@ -1402 +1442 @@
-      << vprDEBUG_FLUSH;
-
-
+
+
-   {
-      debugDumpPfDisp(&(*i),debugLevel);
@@ -1411 +1452 @@
-}
-
-
-
+
-{
-   vprDEBUG_BEGIN(vrjDBG_DRAW_MGR, debugLevel)
-_d
+D
-      << std::endl << vprDEBUG_FLUSH;
-
-_d
+ 
+D
-      << std::endl << vprDEBUG_FLUSH;
-
-_d
+ 
+D
-      << std::dec << std::endl << vprDEBUG_FLUSH;
-
-
-
-
+
+
+
+
-
-      vprDEBUG_NEXT(vrjDBG_DRAW_MGR, debugLevel)
-         << "Viewport " << vp << vprDEBUG_FLUSH;
-      vprDEBUG_NEXT(vrjDBG_DRAW_MGR, debugLevel)
-_d
+D
-         << vprDEBUG_FLUSH;
-
-
-
-
-
-
+
+
+
+
+
+
-            chan_mask = cur_chan->getShare();
+         }
-         vprDEBUG_NEXT(vrjDBG_DRAW_MGR, debugLevel)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-// Config function called in draw proc after window is set up
@@ -1481 +1522 @@
-}
-
-
-/*
- *
+* 
-{
-   vprDEBUG(vrjDBG_DRAW_MGR, vprDBG_CRITICAL_LVL)
@@ -1492 +1532 @@
-
-   pfChannel* master_chan = PfDrawManager::instance()->mMasterChan;
-(master_chan == chan
+ ( master_chan == chan 
-   {
-      vprDEBUG(vrjDBG_DRAW_MGR, vprDBG_CRITICAL_LVL)
-         << "I am the master of the house:\n" << vprDEBUG_FLUSH;
-(PfDrawManager::instance()->mPfAppCalled == false
+ ( PfDrawManager::instance()->mPfAppCalled == false 
-      {
-         vprDEBUG(vrjDBG_DRAW_MGR, vprDBG_CRITICAL_LVL)
@@ -1507 +1547 @@
-   else
-   {
-
+