Changeset 1980 for GTP/trunk/Lib

Timestamp:

01/15/07 15:24:30 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• GlobalLinesRenderer.cpp (modified) (1 diff)
• GlobalLinesRenderer.h (modified) (1 diff)
• Matrix4x4.cpp (modified) (1 diff)
• TestPreprocessor.vcproj (modified) (1 diff)

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

@@ -693 +693 @@
 
 
+void GlobalLinesRenderer::ComputeBoundingQuad(float &xMin, 
+                                                                                          float &yMin, 
+                                                                                          float &xMax,
+                                                                                          float &yMax)
+{
+        const AxisAlignedBox3 bbox = mPreprocessor->mKdTree->GetBox();
+
+        Matrix4x4 m(mEyeVec, mUpVec, mLeftVec);
+
+        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 boxMin(1e20f);
+        Vector3 boxMax(-1e20f);
+        
+/*      for (int i = 0; i < 6; ++ i)
+        {
+                Vector3 pt;
+                // TODO
+                if (boxMin.x < pt[i].x)
+                        boxMin.x = pt[i].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;
+}
+
+
 bool GlobalLinesRenderer::ProcessDepthBuffer(VssRayContainer &vssRays, 
                                                                                          const bool oldBufferInitialised,

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

@@ -49 +49 @@
                                                 VssRayContainer &rays);
 
+
+        void ComputeBoundingQuad(float &xMin, 
+                                                         float &yMin, 
+                                                         float &xMax,
+                                                         float &yMax);
 
         void InitGl();

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

@@ -61 +61 @@
 // full constructor
 Matrix4x4::Matrix4x4(float x11, float x12, float x13, float x14,
-                     float x21, float x22, float x23, float x24,
-                     float x31, float x32, float x33, float x34,
-                     float x41, float x42, float x43, float x44)
+                                         float x21, float x22, float x23, float x24,
+                                         float x31, float x32, float x33, float x34,
+                                         float x41, float x42, float x43, float x44)
 {
   // first index is column [x], the second is row [y]

GTP/trunk/Lib/Vis/Preprocessing/src/TestPreprocessor.vcproj

@@ -194 +194 @@
                                 OptimizeForWindowsApplication="TRUE"
                                 AdditionalIncludeDirectories="..\include;..\..\..\..\..\..\NonGTP\Boost;..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;"$(QTDIR)\include\QtOpenGl";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtCore";"$(QTDIR)\include";QtInterface"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GTP_INTERNAL;USE_QT"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GTP_INTERNAL;USE_QT;TRY_GLOBAL_LINES"
                                 RuntimeLibrary="2"
                                 RuntimeTypeInfo="TRUE"