Changeset 1969 for GTP/trunk/Lib/Vis/Preprocessing/src/GlobalLinesRenderer.cpp

Timestamp:

01/11/07 21:40:49 (18 years ago)

Author:

mattausch

Message:

global lines nearly useable!

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/GlobalLinesRenderer.cpp (modified) (17 diffs)

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

@@ -7 +7 @@
 #include "Exporter.h"
 #include "ViewCellsManager.h"
+#include "SamplingStrategy.h"
 
 
@@ -161 +162 @@
                         return;
                 }
+        case '5':
+                {
+                        VssRayContainer rays;
+
+                        HwGlobalLinesDistribution glStrategy(*globalLinesRenderer->mPreprocessor);
+
+                        SimpleRayContainer simpleRays;
+                        glStrategy.GenerateSamples(5, simpleRays);
+
+                        //cout << "simple ray: " << simpleRays[4] << endl;
+                        globalLinesRenderer->CastGlobalLines(simpleRays[1], rays);
+
+                        // visualize
+                        VssRayContainer outRays;
+                        VssRayContainer::const_iterator vit, vit_end = rays.end();
+
+                        const float p = 8.0f / (float)rays.size();
+
+                        for (vit = rays.begin(); vit != vit_end; ++ vit)
+                        {
+                                if (Random(1.0f) < p)
+                                {
+                                        outRays.push_back(*vit);
+                                }
+                        }
+
+                        globalLinesRenderer->Visualize(rays);
+
+                        CLEAR_CONTAINER(rays);
+                        return;
+                }
         case '8':
                 {
@@ -170 +202 @@
                         VssRayContainer rays;
                         globalLinesRenderer->ApplyDepthPeeling(rays);
+
+                        // visualize
                         VssRayContainer outRays;
                         VssRayContainer::const_iterator vit, vit_end = rays.end();
@@ -209 +243 @@
 mOldTexture(NULL), 
 mPreprocessor(preprocessor),
-mTexHeight(mTexHeight),
-mTexWidth(mTexWidth),
+mTexHeight(texHeight),
+mTexWidth(texWidth),
 mEpsilon(eps),
 mMaxDepth(maxDepth),
@@ -325 +359 @@
 void GlobalLinesRenderer::InitScene(const float alpha, const float beta)
 {
+        cout << "here44"<<endl;
         AxisAlignedBox3 bbox = 
                 globalLinesRenderer->mPreprocessor->mKdTree->GetBox();
-        
+        cout << "here77"<<endl;
         const float sceneSize = Magnitude(bbox.Diagonal());
 
@@ -356 +391 @@
         mViewPoint = mTermination - 0.5f * sceneSize * mEyeVec;
 
-        cout << "termination point: " << mTermination << endl;
-        cout << "view point: " << mViewPoint << endl;
-        cout << "scene: " << bbox << endl;
+        //cout << "termination point: " << mTermination << endl;
+        //cout << "view point: " << mViewPoint << endl;
+        //cout << "scene: " << bbox << endl;
 
         InitRenderTexture(mNewTexture);
         InitRenderTexture(mOldTexture);
         
-        cout << "eye: " << mEyeVec << " left: " << mLeftVec << " up: " << mUpVec << endl;
+        //cout << "eye: " << mEyeVec << " left: " << mLeftVec << " up: " << mUpVec << endl;
 }
 
@@ -385 +420 @@
 
         mEyeVec.RightHandedBase(mUpVec, mLeftVec);
-    mViewPoint = mTermination - 0.5f * sceneSize * mEyeVec;
-
-        cout << "termination point: " << mTermination << endl;
-        cout << "view point: " << mViewPoint << endl;
-        cout << "scene: " << bbox << endl;
+
+        //cout << "termination point: " << mTermination << endl;
+        //cout << "view point: " << mViewPoint << endl;
+        //cout << "scene: " << bbox << endl;
 
         InitRenderTexture(mNewTexture);
         InitRenderTexture(mOldTexture);
         
-        cout << "eye: " << mEyeVec << " left: " << mLeftVec << " up: " << mUpVec << endl;
-}
-
-
-void GlobalLinesRenderer::CastGlobalLines(const float alpha, 
+        //cout << "eye: " << mEyeVec << " left: " << mLeftVec << " up: " << mUpVec << endl;
+}
+
+
+int GlobalLinesRenderer::CastGlobalLines(const float alpha, 
                                                                                   const float beta, 
-                                                                                  //const int samples,
                                                                                   VssRayContainer &rays)
 {
@@ -406 +439 @@
 
         // bind pixel shader implementing the front depth buffer functionality
-        ApplyDepthPeeling(rays);
-}
-
-
-void GlobalLinesRenderer::CastGlobalLines(const SimpleRay &ray, 
+        const int layers = ApplyDepthPeeling(rays);
+
+        return layers;
+}
+
+
+int GlobalLinesRenderer::CastGlobalLines(const SimpleRay &ray, 
                                                                                   VssRayContainer &rays)
 {
+        const long startTime = GetTime();
+        cout << "casting global lines ... " << endl;
+
         InitScene(ray);
 
         // bind pixel shader implementing the front depth buffer functionality
-        ApplyDepthPeeling(rays);
-}
-
-void GlobalLinesRenderer::RenderObject(Intersectable *obj)
-{
-        mRenderer->RenderIntersectable(obj);
+        const int layers = ApplyDepthPeeling(rays);
+
+        const float rays_per_sec = rays.size() / TimeDiff(startTime, GetTime()) * 1e-3;
+        cout << "cast " << rays.size() << " samples in " << layers << " layers in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs (" << rays_per_sec << " r / s)" << endl;
+        return layers;
 }
 
@@ -436 +473 @@
 
                 Intersectable::NewMail();
-
-                for (oit = mPreprocessor->mObjects.begin(); oit != oit_end; ++ oit)
-                {
-                        //cout << (*oit)->GetId() << " ";
-                        RenderObject(*oit);
-                }
+        
+                mRenderer->RenderScene();
         }
         glPopMatrix();
@@ -534 +567 @@
         // depth and stencil.
         // Note that RT_COPY_TO_TEXTURE is required for depth textures on ATI hardware
-        
+        cout << "texwidth: " << mTexWidth << " texheight: " << mTexHeight << endl;
         mNewTexture = new RenderTexture(mTexWidth, mTexHeight, true, true);
 #ifdef ATI
-        mNewTexture->Initialize(true, true, false, true, true, 8, 8, 8, 8, RenderTexture::RT_COPY_TO_TEXTURE);
+        mNewTexture->Initialize(true, true, false, false, false, 8, 8, 8, 8, RenderTexture::RT_COPY_TO_TEXTURE);
 #else
-        mNewTexture->Initialize(true, true, false, true, true, 8, 8, 8, 8);//, RenderTexture::RT_COPY_TO_TEXTURE);
+        mNewTexture->Initialize(true, true, false, false, false, 8, 8, 8, 8);//, RenderTexture::RT_COPY_TO_TEXTURE);
 #endif
 
@@ -545 +578 @@
 
 #ifdef ATI
-        mOldTexture ->Initialize(true, true, false, true, true, 8, 8, 8, 8, RenderTexture::RT_COPY_TO_TEXTURE);
+        mOldTexture ->Initialize(true, true, false, false, false, 8, 8, 8, 8, RenderTexture::RT_COPY_TO_TEXTURE);
 #else
-        mOldTexture ->Initialize(true, true, false, true, true, 8, 8, 8, 8);//, RenderTexture::RT_COPY_TO_TEXTURE);
+        mOldTexture ->Initialize(true, true, false, false, false, 8, 8, 8, 8);//, RenderTexture::RT_COPY_TO_TEXTURE);
 #endif
 
@@ -579 +612 @@
                 if (!mNewTexture->IsRectangleTexture()) 
                 {
-                        sTexWidthParam = cgGetNamedParameter(sCgDepthPeelingProgram, "texWidth");
+                        sTexWidthParam = cgGetNamedParameter(sCgDepthPeelingProgram, "invTexWidth");
                 }
 
                 sStepSizeParam = cgGetNamedParameter(sCgDepthPeelingProgram, "stepSize"); 
 
-                cgGLSetParameter1f(sTexWidthParam, (float)mTexWidth);
+                cgGLSetParameter1f(sTexWidthParam, 1.0f / (float)mTexWidth);
                 cgGLSetParameter1f(sStepSizeParam, mEpsilon);
         }
@@ -600 +633 @@
                 cgGLLoadProgram(sCgPassThroughProgram);
         }
-
+cout << "here45" << endl;
         const float alpha = 1.1;
         const float beta = 0.9;
         InitScene(alpha, beta);
-
+cout << "here4005" << endl;
         PrintGLerror("init");
 }
@@ -748 +781 @@
                         Vector3 clippedOldPt, clippedNewPt;
 
-                        ClipToViewSpaceBox(oldPt, newPt, clippedOldPt, clippedNewPt);
-                        //clippedOldPt = oldPt;
-                        //clippedNewPt = newPt;
-
-                        // create rays in both directions
-                        if (termObj1)
+                        ClipToViewSpaceBox(oldPt, newPt, clippedOldPt, clippedNewPt);if(1)
                         {
-                                vssRays.push_back(new VssRay(clippedOldPt, clippedNewPt, NULL, termObj1, pass));
-                                //cout << "new pt: " << newPt << endl;
-                        }
-
-                        if (mSampleReverse && termObj2)
-                        {
-                                vssRays.push_back(new VssRay(clippedNewPt, clippedOldPt, NULL, termObj2, pass));
-                                //cout << "old pt: " << oldPt << endl;
+                                //clippedOldPt = oldPt;
+                                //clippedNewPt = newPt;
+
+                                // create rays in both directions
+                                if (termObj1)
+                                {
+                                        vssRays.push_back(new VssRay(clippedOldPt, clippedNewPt, NULL, termObj1, pass));
+                                        //cout << "new pt: " << newPt << endl;
+                                }
+
+                                if (mSampleReverse && termObj2)
+                                {
+                                        vssRays.push_back(new VssRay(clippedNewPt, clippedOldPt, NULL, termObj2, pass));
+                                        //cout << "old pt: " << oldPt << endl;
+                                }
                         }
                 }
@@ -936 +971 @@
 
 
-void GlobalLinesRenderer::ApplyDepthPeeling(VssRayContainer &rays)
-{
+int GlobalLinesRenderer::ApplyDepthPeeling(VssRayContainer &rays)
+{
+        int layers = 1;
+
         mNewTexture->BeginCapture();
         {
@@ -952 +989 @@
         ProcessDepthBuffer(rays, false, 0);
 
-        for(int i = 1; i < mMaxDepth; ++ i) 
+        for(; layers < mMaxDepth; ++ layers) 
         {
                 // Peel another layer
@@ -976 +1013 @@
                 // process the buffers for following layer
                 // jump out of loop for the first invalid buffer
-                if (!ProcessDepthBuffer(rays, true, i))
+                if (!ProcessDepthBuffer(rays, true, layers))
                         break;
         }
 
         PrintGLerror("endpeeling");
-}
-
-
-}
+
+        return layers;
+}
+
+
+}