Changeset 1935 for GTP/trunk/Lib/Vis/Preprocessing/src/QtGlRenderer

Timestamp:

01/04/07 00:23:09 (18 years ago)

Author:

mattausch

Message:

started depth peeling

Location:

GTP/trunk/Lib/Vis/Preprocessing/src/QtGlRenderer

Files:

• QtGlRenderer.cpp (modified) (8 diffs)
• QtGlRenderer.h (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/src/QtGlRenderer/QtGlRenderer.cpp

@@ -21 +21 @@
 static CGcontext sCgContext = NULL;
 static CGprogram sCgFragmentProgram = NULL;
+static CGprogram sCgDepthPeelingProgram = NULL;
 static CGprofile sCgFragmentProfile;
 
@@ -140 +141 @@
         if (sCgFragmentProgram)
                 cgDestroyProgram(sCgFragmentProgram);
+        if (sCgDepthPeelingProgram)
+                cgDestroyProgram(sCgDepthPeelingProgram);
         if (sCgContext)
                 cgDestroyContext(sCgContext);
@@ -692 +695 @@
         }
 
-
-
         // at this point, if possible, go and do some other computation
-
-
         
         // 7. The number of visible pixels is the number of sample rays which see the source
@@ -739 +738 @@
 #endif
 
-
-
+        ////////
         //-- cleanup
-
 
         // reset gl state
@@ -791 +788 @@
 
   
+void QtGlRendererBuffer::CastGlobalLine(Beam &beam, const int samples)
+{
+        // bind pixel shader implementing the front depth buffer functionality
+        cgGLBindProgram(sCgFragmentProgram);
+        cgGLEnableProfile(sCgFragmentProfile);
+
+        DepthPeeling(beam, samples);
+}
+
+
+void QtGlRendererBuffer::DepthPeeling(Beam &beam, const int samples)
+{
+/*      if (rtNew->IsDoubleBuffered()) 
+                glDrawBuffer(GL_BACK);
+        
+        rtNew->BeginCapture();
+        {
+                cgGLBindProgram(passthru);
+                glColor3f(0,0.0,0.0);
+                DrawGeometry();   //just random geomerty   
+        }
+        rtNew->EndCapture();
+
+        for(int l = 0; l < mCurrentDepth; l++) 
+        {
+                // Peel another layer
+                pingpong(); // switch pointer between rendertextures
+     
+                rtNew->BeginCapture();
+                {
+                        if (rtNew->IsDoubleBuffered()) 
+                                glDrawBuffer(GL_BACK);
+        
+                        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);         
+                        
+                        cgGLBindProgram(fragmentProgram);
+                        cgGLSetTextureParameter(input1, rtOld->GetDepthTextureID());
+                        cgGLEnableTextureParameter(input1);
+
+            glColor3f(0,0.0,0.0);
+                        DrawGeometry();
+                        cgGLDisableTextureParameter(input1);
+                }
+                rtNew->EndCapture();
+   }*/
+}
+
+
 void QtGlRendererBuffer::InitGL()
 {
- makeCurrent(); 
- GlRenderer::InitGL();
+        makeCurrent(); 
+        GlRenderer::InitGL();
 
 #if 1
@@ -851 +896 @@
   Debug << "---- PROGRAM BEGIN ----\n" <<
           cgGetProgramString(sCgFragmentProgram, CG_COMPILED_PROGRAM) << "---- PROGRAM END ----\n";
+
+
+  sCgDepthPeelingProgram = 
+          cgCreateProgramFromFile(sCgContext,
+                                                          CG_SOURCE, 
+                                                          "../src/depth_peeling.cg",
+                                                          sCgFragmentProfile,
+                                                          NULL, 
+                                                          NULL);
+
+  if (!cgIsProgramCompiled(sCgDepthPeelingProgram))
+          cgCompileProgram(sCgDepthPeelingProgram);
+
+  cgGLLoadProgram(sCgDepthPeelingProgram);
+  cgGLBindProgram(sCgDepthPeelingProgram);
+
+  Debug << "---- PROGRAM BEGIN ----\n" 
+            << cgGetProgramString(sCgDepthPeelingProgram, CG_COMPILED_PROGRAM) 
+                << "---- PROGRAM END ----\n";
 
 #endif
@@ -1742 +1806 @@
 
 
-
 void
 QtRendererControlWidget::FocusNextPvsErrorFrame(void)
@@ -1752 +1815 @@
 void
 QtRendererControlWidget::UpdatePvsErrorItem(int row,
-                                                                                  GlRendererBuffer::PvsErrorEntry &pvsErrorEntry)
+                                                                                        GlRendererBuffer::PvsErrorEntry &pvsErrorEntry)
 {
 

GTP/trunk/Lib/Vis/Preprocessing/src/QtGlRenderer/QtGlRenderer.h

@@ -79 +79 @@
 
         void SampleBeamContributions(
-                Intersectable *sourceObject,
-                Beam &beam,
-                const int samples,
-                BeamSampleStatistics &stat
+                        Intersectable *sourceObject,
+                        Beam &beam,
+                        const int samples,
+                        BeamSampleStatistics &stat
                 );
 
         void
                 SampleViewpointContributions(
-                Intersectable *sourceObject,
-                const Vector3 viewPoint,
-                Beam &beam,
-                const int desiredSamples,
-                BeamSampleStatistics &stat
+                        Intersectable *sourceObject,
+                        const Vector3 viewPoint,
+                        Beam &beam,
+                        const int desiredSamples,
+                        BeamSampleStatistics &stat
                 );
 
+        void CastGlobalLine(Beam &beam,
+                                                const int samples);
+
+        void DepthPeeling(Beam &beam, const int samples);
+
         void InitGL();
 
-        /** Computes rays from information gained with hw sampling-
+        /** Computes rays from information gained with hw sampling
         */
         void ComputeRays(Intersectable *sourceObj, VssRayContainer &rays);