Changeset 511 for trunk/VUT

Timestamp:

01/10/06 11:59:58 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• Beam.cpp (modified) (2 diffs)
• Beam.h (modified) (2 diffs)
• Environment.cpp (modified) (1 diff)
• GlRenderer.cpp (modified) (4 diffs)
• GlRenderer.h (modified) (3 diffs)
• KdTree.cpp (modified) (1 diff)
• KdTree.h (modified) (2 diffs)
• RssTree.h (modified) (3 diffs)
• VspBspTree.cpp (modified) (5 diffs)
• VspBspTree.h (modified) (1 diff)

trunk/VUT/GtpVisibilityPreprocessor/src/Beam.cpp

@@ +1 @@
+#include "VssRay.h"
 #include "Beam.h"
-#include "VssRay.h"
-
 
 
 
 void
-Beam::Construct(const  AxisAlignedBox3 &box,
+MyBeam::Construct(const  AxisAlignedBox3 &box,
                                 const  AxisAlignedBox3 &dBox)
 {
@@ -54 +53 @@
 
 int
-Beam::ComputeIntersection(const  AxisAlignedBox3 &box)
+MyBeam::ComputeIntersection(const AxisAlignedBox3 &box)
 {
   int i;

trunk/VUT/GtpVisibilityPreprocessor/src/Beam.h

@@ -3 +3 @@
 
 #include <vector>
+#include "AxisAlignedBox3.h"
+
 using namespace std;
 
 class KdNode;
 class Intersectable;
-#include "AxisAlignedBox3.h"
 
-class Beam {
+class MyBeam {
   
 public:                 
@@ -28 +29 @@
   vector<Plane3> mPlanes;
 
+    
+  void Construct(const AxisAlignedBox3 &box,
+          const AxisAlignedBox3 &dBox);
+  
+  
+  int
+          ComputeIntersection(const AxisAlignedBox3 &box);
+
   bool IsValid() { return mFlags & VALID; }
   bool SetValid() { return mFlags |= VALID; }
 
-  Beam():mFlags(STORE_KD_NODES+STORE_OBJECTS),mKdNodes(0), mObjects(0)
+  MyBeam():mFlags(STORE_KD_NODES+STORE_OBJECTS), mKdNodes(0), mObjects(0)
   {
   }
-  
-  void Construct(const  AxisAlignedBox3 &box,
-                                 const  AxisAlignedBox3 &dBox);
-  
-  
-  int
-  ComputeIntersection(const  AxisAlignedBox3 &box);
-
   
 };

trunk/VUT/GtpVisibilityPreprocessor/src/Environment.cpp

@@ -1229 +1229 @@
                         "0");
 
-        RegisterOption("ViewCells.maxPvs",
-                                        optInt,
-                                        "view_cells_max_pvs=",
-                                        "300");
+        RegisterOption("ViewCells.maxPvsRatio",
+                                        optFloat,
+                                        "view_cells_max_pvs_ratio=",
+                                        "0.1");
 
         RegisterOption("ViewCells.filename",

trunk/VUT/GtpVisibilityPreprocessor/src/GlRenderer.cpp

@@ -5 +5 @@
 #include "Pvs.h"
 #include "Viewcell.h"
-#include "Beam.cpp"
+#include "Beam.h"
 
 #include <GL/glext.h>
@@ -118 +118 @@
   glGetOcclusionQueryuivNV = (PFNGLGETOCCLUSIONQUERYUIVNVPROC)
         wglGetProcAddress("glGetOcclusionQueryuivNV");
+
+  // second depth buffer texture
+  GLuint shadowMap;
+  const int shadowMapSize=512;
+ 
+
+  glGenTextures(1, &shadowMap);
+  glBindTexture(GL_TEXTURE_2D, shadowMap);
+  
+  glTexImage2D( GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT, shadowMapSize, 
+          shadowMapSize, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, NULL);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
 }
 
@@ -535 +550 @@
 GlRendererBuffer::SampleBeamContributions(
                                                                                   Intersectable *sourceObject,
-                                                                                  Beam &beam,
+                                                                                  MyBeam &beam,
                                                                                   const int desiredSamples,
                                                                                   BeamSampleStatistics &stat
@@ -589 +604 @@
 GlRendererBuffer::SampleViewpointContributions(
                                                                                            Intersectable *sourceObject,
-                                                                                           Beam &beam,
+                                                                                           MyBeam &beam,
                                                                                            const int desiredSamples,
                                                                                            BeamSampleStatistics &stat

trunk/VUT/GtpVisibilityPreprocessor/src/GlRenderer.h

@@ -17 +17 @@
 class Intersectable;
 class Material;
-class Beam;
+class MyBeam;
 
 struct PvsRenderStatistics {
@@ -159 +159 @@
   void SampleBeamContributions(
                                                            Intersectable *sourceObject,
-                                                           Beam &beam,
+                                                           MyBeam &beam,
                                                            const int samples,
                                                            BeamSampleStatistics &stat
@@ -167 +167 @@
   SampleViewpointContributions(
                                                            Intersectable *sourceObject,
-                                                           Beam &beam,
+                                                           MyBeam &beam,
                                                            const int desiredSamples,
                                                            BeamSampleStatistics &stat

trunk/VUT/GtpVisibilityPreprocessor/src/KdTree.cpp

@@ -968 +968 @@
 int
 KdTree::CastBeam(
-                                 Beam &beam
+                                 MyBeam &beam
                                  )
 {

trunk/VUT/GtpVisibilityPreprocessor/src/KdTree.h

@@ -16 +16 @@
 class Intersectable;
 //class KdViewCell;
-class Beam;
+class MyBeam;
 
 // --------------------------------------------------------------
@@ -289 +289 @@
   int
   CastBeam(
-                   Beam &beam
+                   MyBeam &beam
                    );
   

trunk/VUT/GtpVisibilityPreprocessor/src/RssTree.h

@@ -22 +22 @@
 #include "AxisAlignedBox3.h"
 #include "Halton.h"
-#include "beam.h"
+#include "Beam.h"
+#include "Statistics.h"
+#include "Ray.h"
+
+#include "Containers.h"
 
 #define USE_KDNODE_VECTORS 1
@@ -29 +33 @@
 
 
-#include "Statistics.h"
-#include "Ray.h"
-
-#include "Containers.h"
 // --------------------------------------------------------------
 // Static statistics for kd-tree search
@@ -420 +420 @@
   HaltonSequence halton;
 
-  Beam mBeam;
+  MyBeam mBeam;
   
   RssTreeLeaf(RssTreeInterior *p,

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

@@ -87 +87 @@
         environment->GetBoolValue("VspBspTree.splitUseOnlyDrivingAxis", mOnlyDrivingAxis);
         environment->GetBoolValue("VspBspTree.PostProcess.useRaysForMerge", mUseRaysForMerge);
-        environment->GetIntValue("ViewCells.maxPvs", mMaxPvs);
+
+        environment->GetIntValue("ViewCells.pvsInvalid", mMaxPvsRatio);
 
         //-- termination criteria for axis aligned split
@@ -275 +276 @@
         Intersectable::NewMail();
 
+        int numObj = 0;
         //-- extract polygons intersected by the rays
         for (rit = sampleRays.begin(); rit != rit_end; ++ rit)
@@ -287 +289 @@
                         MeshInstance *obj = dynamic_cast<MeshInstance *>(ray->mTerminationObject);
                         AddMeshToPolygons(obj->GetMesh(), polys, obj);
+                        ++ numObj;
                         //-- compute bounding box
                         if (!forcedBoundingBox)
@@ -299 +302 @@
                         MeshInstance *obj = dynamic_cast<MeshInstance *>(ray->mOriginObject);
                         AddMeshToPolygons(obj->GetMesh(), polys, obj);
+                        ++ numObj;
+
                         //-- compute bounding box
                         if (!forcedBoundingBox)
@@ -305 +310 @@
         }
 
-        //-- compute bounding box
-        //if (!forcedBoundingBox) Polygon3::IncludeInBox(polys, mBox);
+        mMaxPvs = (int)(mMaxPvsRatio * (float)numObj);
 
         //-- store rays

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.h

@@ -692 +692 @@
         int mMaxPvs;
 
+        int mMaxPvsRatio;
+
         /// View cell corresponding to the space outside the valid view space
         BspViewCell *mOutOfBoundsCell;