Changeset 525

Timestamp:

01/12/06 14:27:18 (18 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• Beam.cpp (modified) (1 diff)
• Beam.h (modified) (1 diff)
• GlRenderer.cpp (modified) (4 diffs)
• GlRenderer.h (modified) (1 diff)
• dual_depth.cg (added)

trunk/VUT/GtpVisibilityPreprocessor/src/Beam.cpp

@@ -67 +67 @@
 
 
-void Beam::ComputeFrustum(float &near, float &far,
-                                                  float &left, float &right,
+void Beam::ComputeFrustum(float &left, float &right,
                                                   float &bottom, float &top,
-                                                  const AxisAlignedBox3 &sceneBBox)
+                                                  float &near, float &far,
+                                                  const AxisAlignedBox3 &sceneBBox) const
 {
         const float xDirRange = mDirBox.Max().x - mDirBox.Min().x;
         const float yDirRange = mDirBox.Max().y - mDirBox.Min().y;
 
-        near = 1; // NOTE: what is the best value for near and far plane?
-        far = sceneBBox.Size(sceneBBox.Size().DrivingAxis());
+        near = 0.1; // NOTE: what is the best value for near and far plane?
+        far = 2.0f * Magnitude(sceneBBox.Diagonal());
 
-        left = 1.0f / tan(xDirRange * 0.5);
-        right = 1.0f / tan(xDirRange * 0.5);
+        left = near / tan(xDirRange * 0.5);
+        right = near / tan(xDirRange * 0.5);
 
-        bottom = 1.0f / tan(yDirRange * 0.5);
-        top = 1.0f / tan(yDirRange * 0.5);
+        bottom = near / tan(yDirRange * 0.5);
+        top = near / tan(yDirRange * 0.5);
 }
+
+Vector3 Beam::GetMainDirection() const
+{
+         Vector3 directions[4];
+         
+         directions[0] = VssRay::GetDirection(dBox.Min().x, dBox.Min().y);
+         directions[1] = VssRay::GetDirection(dBox.Max().x, dBox.Min().y);
+         directions[2] = VssRay::GetDirection(dBox.Max().x, dBox.Max().y);
+         directions[3] = VssRay::GetDirection(dBox.Min().x, dBox.Max().y);
+
+        return Normalize(direction[0], direction[1], direction[2], direction[3]);
+}

trunk/VUT/GtpVisibilityPreprocessor/src/Beam.h

@@ -35 +35 @@
           const AxisAlignedBox3 &dBox);
   
-  void ComputeFrustum(float &near, float &far,
-                                          float &left, float &right,
+  void ComputeFrustum(float &left, float &right,
                                           float &bottom, float &top,
-                                          const AxisAlignedBox3 &sceneBBox);
+                                          float &near, float &far,
+                                          const AxisAlignedBox3 &sceneBBox) const;
 
   int ComputeIntersection(const AxisAlignedBox3 &box);
+
+  Vector3 GetMainDirection() const;
 
   bool IsValid() { return mFlags & VALID; }

trunk/VUT/GtpVisibilityPreprocessor/src/GlRenderer.cpp

@@ -53 +53 @@
 static void handleCgError() 
 {
-    fprintf(stderr, "Cg error: %s\n", cgGetErrorString(cgGetError()));
+    Debug << "Cg error: " << cgGetErrorString(cgGetError()) << endl;
     exit(1);
 }
@@ -639 +639 @@
 {
         // 1. setup the view port to match the desired samples
+        glViewport(0, 0, desiredSamples, desiredSamples);
+
         // 2. setup the projection matrix and view matrix to match the viewpoint + beam.mDirBox
-  
+        SetupProjectionForViewPoint(viewPoint, beam, sourceObject);
+        
         // 3. reset z-buffer to 0 and render the source object for the beam
         //    with glCullFace(Enabled) and glFrontFace(GL_CW)
@@ -740 +743 @@
         {
                 glBeginOcclusionQueryNV(sQueries[queryIdx ++]);
-  
+
                 RenderIntersectable(*vit);
-  
+                
                 glEndOcclusionQueryNV();
         }
@@ -785 +788 @@
         }
 }
+
+void GlRendererBuffer::SetupProjectionForViewPoint(const Vector3 &viewPoint, 
+                                                                                                 const Beam &beam, 
+                                                                                                 Intersectable *sourceObject)
+{
+        float left, right, bottom, top, znear, zfar;
+
+        beam.ComputeFrustum(left, right, bottom, top, znear, zfar,
+                                                mSceneGraph->GetBox());
+
+        glFrustum(left, right, bottom, top, znear, zfar);
+
+    const Vector3 eye = viewPoint + beam.GetMainDirection;
+        const Vector3 up = AbitraryNormal(eye);
+
+        gluLookAt(eye, viewPoint, up);
+}                         

trunk/VUT/GtpVisibilityPreprocessor/src/GlRenderer.h

@@ -175 +175 @@
 private:
         static void GenQueries(const int numQueries);
-
+        void SetupProjectionForViewPoint(const Vector3 &viewPoint, 
+                                                                         const Beam &beam, 
+                                                                         Intersectable *sourceObject);
 };