Changeset 899

Timestamp:

03/19/08 17:10:09

Author:

robert

Message:

Fixed error in intersection with height field code.

Files:

• trunk/src/vpb/DataSet.cpp (modified) (1 diff)
• trunk/src/vpb/HeightFieldMapper.cpp (modified) (1 diff)

trunk/src/vpb/DataSet.cpp

@@ -1116 +1116 @@
-    if (getBuildOptionsString().find("old_dg")!=std::string::npos)
-    {
+        log(osg::NOTICE,"Old DataSet::createDestinationGraph() selected"); 
+    
-        _destinationGraph = createDestinationGraph(0,
-                                                   _intermediateCoordinateSystem.get(),

trunk/src/vpb/HeightFieldMapper.cpp

@@ -723 +723 @@
-    
-    if ((c>=0 && c<_hf.getNumColumns()) && (r>=0 && r<_hf.getNumRows())) 
-
-= (1.0-rx)*(1.0-ry)
-= _hf.getHeight(c,r)
+ double local_ratio = (1.0-rx)*(1.0-ry);
++= local_ratio
++= _hf.getHeight(c,r)*local_ratio
-    }
-    
-    if (((c+1)>=0 && (c+1)<_hf.getNumColumns()) && (r>=0 && r<_hf.getNumRows()))
-    {  
-
-
+
+
+
-    }
-
-    if ((c>=0 && c<_hf.getNumColumns()) && ((r+1)>=0 && (r+1)<_hf.getNumRows()))
-    {  
-
-
+
+
+
-    }
-
-    if (((c+1)>=0 && (c+1)<_hf.getNumColumns()) && ((r+1)>=0 && (r+1)<_hf.getNumRows()))
-    {  
-
-
+
+
+
-    }
-