Changeset 484 for trunk/VUT

Timestamp:

12/27/05 20:35:04 (19 years ago)

Author:

mattausch

Message:

work around preprocessor bug

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/default.env (modified) (1 diff)
• src/ViewCellsManager.cpp (modified) (3 diffs)
• src/VspBspTree.cpp (modified) (2 diffs)

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -146 +146 @@
         loadFromFile false
         #type kdTree
-        #type vspKdTree
+        type vspKdTree
         #type bspTree
-        type vspBspTree
+        #type vspBspTree
         
         #type sceneDependent

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -286 +286 @@
         ViewCellContainer viewcells;
         
-        /*Vector3 origin = ray.mOrigin;
-        Vector3 termination = ray.mTermination;
-        static Ray hray;
+        Ray hray(ray);
         float tmin = 0, tmax = 1.0;
-        hray.Init(ray.GetOrigin(), ray.GetDir(), Ray::LINE_SEGMENT);
-        GetSceneBbox().ComputeMinMaxT(hray, &tmin, &tmax);
-        if (tmin >= tmax)
+        // matt TODO: remove this!!
+        //hray.Init(ray.GetOrigin(), ray.GetDir(), Ray::LINE_SEGMENT);
+
+        if (!GetSceneBbox().GetRaySegment(hray, tmin, tmax) || (tmin > tmax))
                 return;
 
-        if (tmin > 0.0f)
-                origin = ray.Extrap(tmin);
-        
-        if (tmax < 1.0f)
-                termination = ray.Extrap(tmax);*/
-        
-        CastLineSegment(ray.mOrigin,
-                                        ray.mTermination,
+        Vector3 origin = hray.Extrap(tmin);
+        Vector3 termination = hray.Extrap(tmax);
+        
+        CastLineSegment(origin,
+                                        termination,
                                         viewcells);
         
@@ -1699 +1695 @@
         {
                 VssRay *vssRay = *it;
+                
+                Ray hray(*vssRay);
+                float tmin = 0, tmax = 1.0;
+        
+                //hray.Init(ray.GetOrigin(), ray.GetDir(), Ray::LINE_SEGMENT);
+
+                if (!GetSceneBbox().GetRaySegment(hray, tmin, tmax) || (tmin > tmax))
+                        continue;
+
+                Vector3 origin = hray.Extrap(tmin);
+                Vector3 termination = hray.Extrap(tmax);
+        
                 BspRay *ray = new BspRay(vssRay);
 
@@ -1704 +1712 @@
 
                 // cast line segment and store intersections with the rays
-                CastLineSegment(vssRay->mTermination, vssRay->mOrigin, viewCells);
+                CastLineSegment(origin, termination, viewCells);
 
                 ViewCellContainer::const_iterator vit, vit_end = viewCells.end();

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

@@ -229 +229 @@
         mBox.Initialize();      // initialise BSP tree bounding box
 
+        if (forcedBoundingBox)
+                mBox = *forcedBoundingBox;
+        
         PolygonContainer polys;
         RayInfoContainer *rays = new RayInfoContainer();
@@ -245 +248 @@
                 VssRay *ray = *rit;
 
-                if (ray->mTerminationObject && !ray->mTerminationObject->Mailed())
+                if ((mBox.IsInside(ray->mTermination) || !forcedBoundingBox) &&
+                        ray->mTerminationObject && 
+                        !ray->mTerminationObject->Mailed())
                 {
                         ray->mTerminationObject->Mail();
                         MeshInstance *obj = dynamic_cast<MeshInstance *>(ray->mTerminationObject);
                         AddMeshToPolygons(obj->GetMesh(), polys, obj);
-                }
-
-                if (ray->mOriginObject && !ray->mOriginObject->Mailed())
+                        //-- compute bounding box
+                        if (!forcedBoundingBox)
+                                mBox.Include(ray->mTermination);
+                }
+
+                if ((mBox.IsInside(ray->mOrigin) || !forcedBoundingBox) &&
+                        ray->mOriginObject && 
+                        !ray->mOriginObject->Mailed())
                 {
                         ray->mOriginObject->Mail();
                         MeshInstance *obj = dynamic_cast<MeshInstance *>(ray->mOriginObject);
                         AddMeshToPolygons(obj->GetMesh(), polys, obj);
+                        //-- compute bounding box
+                        if (!forcedBoundingBox)
+                                mBox.Include(ray->mOrigin);
                 }
         }
 
         //-- compute bounding box
-        if (forcedBoundingBox)
-                mBox = *forcedBoundingBox;
-        else
-                Polygon3::IncludeInBox(polys, mBox);
+        //if (!forcedBoundingBox) Polygon3::IncludeInBox(polys, mBox);
 
         //-- store rays