Changeset 1970

Timestamp:

01/11/07 23:46:10 (17 years ago)

Author:

mattausch

Message:

working implementation of global lines

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• GlobalLinesRenderer.cpp (modified) (8 diffs)
• Preprocessor.cpp (modified) (1 diff)
• main.cpp (modified) (1 diff)

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

@@ -278 +278 @@
         else
                 mNewTexture->BindDepth();
+
         mNewTexture->EnableTextureTarget();
         
@@ -359 +360 @@
 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());
 
@@ -457 +457 @@
 
         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;
+        cout << "cast " << rays.size() << " samples in " << layers << " layers in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs (" << rays_per_sec << " rays/sec)" << endl;
         return layers;
 }
@@ -505 +505 @@
 {
         InitDevIl();
-
+        cout << "texwidth: " << mTexWidth << " texheight: " << mTexHeight << endl;
     glutInitDisplayMode(GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE);
         glutInitWindowPosition(50, 50);
@@ -567 +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
@@ -633 +633 @@
                 cgGLLoadProgram(sCgPassThroughProgram);
         }
-cout << "here45" << endl;
+
         const float alpha = 1.1;
         const float beta = 0.9;
+
         InitScene(alpha, beta);
-cout << "here4005" << endl;
+
         PrintGLerror("init");
 }
@@ -781 +782 @@
                         Vector3 clippedOldPt, clippedNewPt;
 
-                        ClipToViewSpaceBox(oldPt, newPt, clippedOldPt, clippedNewPt);if(1)
+                        if (ClipToViewSpaceBox(oldPt, newPt, clippedOldPt, clippedNewPt))//;if(1)
                         {
                                 //clippedOldPt = oldPt;
@@ -818 +819 @@
         //const AxisAlignedBox3 bbox = mPreprocessor->mViewCellsManager->GetViewSpaceBox();
         // hack
-        const AxisAlignedBox3 bbox = mPreprocessor->mKdTree->GetBox();
-
-        if ((!bbox.ComputeMinMaxT(ray, &tmin, &tmax)) ||
-                tmin>=tmax)
+        AxisAlignedBox3 bbox = mPreprocessor->mKdTree->GetBox();
+
+        //bbox.Enlarge(1);
+        if (!bbox.ComputeMinMaxT(ray, &tmin, &tmax) || (tmin >= tmax))
         {
                 return false;
         }
         
-        if (tmin >= 1.0f || tmax <=0.0f)
+        if (tmin >= 1.0f || tmax <= 0.0f)
                 return false;
 

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

@@ -1373 +1373 @@
                                                                 sampleReverse);
                                                                 
-cout << "here2" << endl;
         mGlobalLinesRenderer->InitGl();
-cout << "here8" << endl;
-        //return mGlobalLinesRenderer;
-}
-
-}
+}
+
+}

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

@@ -272 +272 @@
         
         preprocessor->PrepareHwGlobalLines();
-        //globalLinesRenderer = new GlobalLinesRenderer(preprocessor);
-        //globalLinesRenderer->InitGl();
-        cout << "here22" << endl;
+
         globalLinesRenderer->Run();