Changeset 1940 for GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface

Timestamp:

01/04/07 21:39:44 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface

Files:

• GlobalLinesRenderer.cpp (modified) (3 diffs)
• GlobalLinesRenderer.h (modified) (4 diffs)
• QtGlRenderer.cpp (modified) (1 diff)
• QtGlRenderer.h (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/GlobalLinesRenderer.cpp

@@ -6 +6 @@
 #include <Cg/cgGL.h>
 
-//#include <QVBoxLayout>
+#include <QtOpenGL>
 
 namespace GtpVisibilityPreprocessor {
@@ -14 +14 @@
 static CGprofile sCgFragmentProfile;
 
+
 static void handleCgError() 
 {
-    Debug << "Cg error: " << cgGetErrorString(cgGetError()) << endl;
+    cerr << "Cg error: " << cgGetErrorString(cgGetError()) << endl;
     exit(1);
 }
 
-/*QtGlRendererBuffer::~QtGlRendererBuffer()
+
+GlobalLinesRenderer::GlobalLinesRenderer(QGLPixelBuffer *buffer1, QGLPixelBuffer *buffer2):
+mNewBuffer(buffer1), mOldBuffer(buffer2)
 {
-        if (sCgFragmentProgram)
-                cgDestroyProgram(sCgFragmentProgram);
+}
+
+
+GlobalLinesRenderer::~GlobalLinesRenderer()
+{
         if (sCgDepthPeelingProgram)
                 cgDestroyProgram(sCgDepthPeelingProgram);
@@ -30 +36 @@
 }
 
-*/
+ 
+void GlobalLinesRenderer::CastGlobalLines(Beam &beam, const int samples)
+{
+        // bind pixel shader implementing the front depth buffer functionality
+        cgGLBindProgram(sCgDepthPeelingProgram);
+        cgGLEnableProfile(sCgFragmentProfile);
+
+        ApplyDepthPeeling(beam, samples);
+}
+
+
+void GlobalLinesRenderer::DrawGeometry()
+{
+}
+
+void GlobalLinesRenderer::ApplyDepthPeeling(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();
+   }*/
+}
 
 

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/GlobalLinesRenderer.h

@@ -7 +7 @@
 class Beam;
 class Intersectable;
+class QGLPixelBuffer;
+
 struct VssRayContainer;
 
@@ -14 +16 @@
 class __declspec(dllexport) GlobalLinesRenderer
 {
-        GlobalLinesRenderer();//(QtGlPixelBuffer *buffer1, QtGlPixelBuffer *buffer2);
-
+        GlobalLinesRenderer(QGLPixelBuffer *buffer1, QGLPixelBuffer *buffer2);
         ~GlobalLinesRenderer();
 
         void CastGlobalLines(Beam &beam, const int samples);
-
 
         void InitGL();
@@ -33 +33 @@
 private:
 
+        /** Draws the geometry for one pass.
+        */
+        void DrawGeometry();
+
         void ApplyDepthPeeling(Beam &beam, const int samples);
 
@@ -38 +42 @@
                                                  const Beam &beam);
 
+        QGLPixelBuffer *mNewBuffer;
+        QGLPixelBuffer *mOldBuffer;
 };
 

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

@@ -786 +786 @@
                           up.x, up.y, up.z);
 }               
-
-  
-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();
-   }*/
-}
 
 

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

@@ -94 +94 @@
                 );
 
-        void CastGlobalLine(Beam &beam,
-                                                const int samples);
-
-        void DepthPeeling(Beam &beam, const int samples);
-
         void InitGL();