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

Timestamp:

01/18/07 11:44:46 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -9 +9 @@
 #include "SamplingStrategy.h"
 
-
 // the devil library
 #include <IL/il.h>
@@ -15 +14 @@
 #include <IL/ilut.h>
 
+#ifdef USE_CG
+
 #include <Cg/cg.h>
 #include <Cg/cgGL.h>
 
-//#include <QtOpenGL>
 
 namespace GtpVisibilityPreprocessor {
@@ -659 +659 @@
         
         const float leftDist = -0.5f * mWidth + mWidth * ((float)x + 0.5f) / mTexWidth;
-        //const float leftDist = 0.5f * mWidth - mWidth * ((float)x + 0.5f) / mTexWidth;
-        
-        const float upDist = -0.5f * mWidth + mWidth * ((float)y + 0.5f) / mTexHeight;
-        //const float upDist = 0.5f * mWidth - mWidth * ((float)y + 0.5f) / mTexHeight;
+        const float upDist   = -0.5f * mWidth + mWidth * ((float)y + 0.5f) / mTexHeight;
 
         hitPoint = mViewPoint + 
@@ -693 +690 @@
 
 
-void GlobalLinesRenderer::ComputeBoundingQuad(float &xMin, 
-                                                                                          float &yMin, 
-                                                                                          float &xMax,
-                                                                                          float &yMax)
+void GlobalLinesRenderer::ComputeBoundingQuad(int &xMin, 
+                                                                                          int &yMin, 
+                                                                                          int &xMax,
+                                                                                          int &yMax)
 {
         const AxisAlignedBox3 bbox = mPreprocessor->mKdTree->GetBox();
@@ -704 +701 @@
         m.Invert();
 
-        Vector3 eye(m.x[0][0], m.x[0][1], m.x[0][2]);
-        Vector3 up(m.x[1][0], m.x[1][1], m.x[1][2]);
-        Vector3 left(m.x[2][0], m.x[2][1], m.x[2][2]);
+        Vector3 eye(m.x[0][0], m.x[1][0], m.x[2][0]);
+        Vector3 up(m.x[0][0], m.x[1][1], m.x[2][1]);
+        Vector3 left(m.x[0][2], m.x[1][2], m.x[2][2]);
 
         Vector3 boxMin(1e20f);
         Vector3 boxMax(-1e20f);
         
-/*      for (int i = 0; i < 6; ++ i)
-        {
-                Vector3 pt;
+        for (int i = 0; i < 8; ++ i)
+        {
+        Vector3 vtx;
+
+                bbox.GetVertex(i, vtx);
+
+                Vector3 pt = vtx.x * eye + vtx.y * up + vtx.z * left;
+
                 // TODO
-                if (boxMin.x < pt[i].x)
-                        boxMin.x = pt[i].x;
+                if (boxMin.x > pt.x)
+                        boxMin.x = pt.x;
                 
-                if (boxMin.y < pt[i].y)
-                        boxMin.y = pt[i].y;
-
-                if (boxMin.z < pt[i].z)
-                        boxMin.z = pt[i].z;
-        }
-*/
-        xMin = boxMin.x;
-        yMin = boxMin.y;
-
-        xMax = boxMax.x;
-        yMax = boxMax.y;
+                if (boxMin.y > pt.y)
+                        boxMin.y = pt.y;
+
+                if (boxMin.z > pt.z)
+                        boxMin.z = pt.z;
+
+                if (boxMax.x < pt.x)
+                        boxMax.x = pt.x;
+                
+                if (boxMax.y < pt.y)
+                        boxMax.y = pt.y;
+
+                if (boxMax.z < pt.z)
+                        boxMax.z = pt.z;
+        }
+
+        cout << "xmin: " << boxMin.x << " ymin " << boxMin.y << " xmax: " << boxMax.x << " ymax: " << boxMax.y << endl;
+
+        xMin = (int)(-0.5f * mWidth + mWidth * (boxMin.x + 0.5f) / mTexWidth);
+        yMin = (int)(-0.5f * mWidth + mWidth * (boxMin.y + 0.5f) / mTexHeight);
+        xMax = (int)(-0.5f * mWidth + mWidth * (boxMax.x + 0.5f) / mTexWidth);
+        yMax = (int)(-0.5f * mWidth + mWidth * (boxMax.y + 0.5f) / mTexHeight);
 }
 
@@ -757 +769 @@
                 }
         }
+
+        int xMin, yMin, xMax, yMax;
+        ComputeBoundingQuad(xMin, yMin, xMax, yMax);
+        
+        cout << "xmin2: " << xMin << " ymin " << yMin << " xmax: " << xMax << " ymax: " << yMax << endl;
 
         /////////////////
@@ -1081 +1098 @@
 }
 
-
-}
+}
+
+#endif