Changeset 850

Timestamp:

01/21/08 21:22:04

Author:

robert

Message:

From David Callu, support for handling forests and division of shapefile that cover tile boundaries.

Files:

• trunk/include/vpb/ExtrudeVisitor (modified) (4 diffs)
• trunk/src/vpb/ExtrudeVisitor.cpp (modified) (4 diffs)
• trunk/src/vpb/HeightFieldMapper.cpp (modified) (7 diffs)
• trunk/src/vpb/ShapeFilePlacer.cpp (modified) (3 diffs)

trunk/include/vpb/ExtrudeVisitor

@@ -26 +26 @@
-    public:
-
-
+Output
-        {
-            Replace,
@@ -32 +32 @@
-        };
-        
-Typ
+Mod
-        {
-            PER_VERTEX,
@@ -38 +38 @@
-        };
-        
-
-
-
+
+
+
+
+
+
+
-
-        Mode getMode() { return _mode; }
-        void setMode(Mode mode) { _mode = mode; }
-
+
-        osg::Vec3d & getExtrudeVector() { return _extrudeVector; }
-        const osg::Vec3d & getExtrudeVector() const { return _extrudeVector; }
-        void setExtrudeVector(osg::Vec3d extrudeVector) { _extrudeVector = extrudeVector; }
-
-, osg::Vec3d & extrudeVector
+
-        
-        virtual void apply(osg::Geode& node);
@@ -58 +62 @@
-                                                    osg::UIntArray & extrudeIndexArray);
-        Mode _mode;
+        OutputMode _outputMode;
+        
-        osg::Vec3d _extrudeVector;
-};

trunk/src/vpb/ExtrudeVisitor.cpp

@@ -48 +48 @@
-typedef osgUtil::OperationArrayFunctor<DuplicateIndexOperator> DuplicateIndexFunctor;
-
+struct DuplicateAndInterlaceOperator
+{
+    template <typename ArrayType>
+    void process(ArrayType & array) 
+    {   
+        unsigned int size = array.size();
+        osg::ref_ptr<ArrayType> newArray(new ArrayType(size * 2));
+        ArrayType & refNewArray = *newArray.get();
+        
+        for (unsigned int i=0; i<size; ++i)
+            refNewArray[2*i] = refNewArray[2*i+1] = array[i];
+        
+        array = refNewArray;
+    }
+};   
+typedef osgUtil::OperationArrayFunctor<DuplicateAndInterlaceOperator> DuplicateAndInterlaceFunctor;
+
+struct AddOddOperator
+{
+    template <typename ArrayType>
+    void process(ArrayType & array) 
+    {   
+        typedef typename ArrayType::ElementDataType ElementDataType;
+                        
+        ElementDataType convertedVector;
+        osgUtil::ConvertVec<osg::Vec3d, ElementDataType>::convert(_vector, convertedVector);
+        
+        
+        std::size_t size = array.size();
+        for (unsigned int i = 1; i<size; i+=2)
+            array[i] += convertedVector;
+    }
+    
+    osg::Vec3d _vector;
+};   
+typedef osgUtil::OperationArrayFunctor<AddOddOperator> AddOddFunctor;
-
-
@@ -64 +100 @@
-// ** search BoundaryEdgeloop in the geometry, extrude this loop
-// **  and create primitiveSet to link original loop and extruded loop
-, osg::Vec3d & extrudeVector
+
-{
-//    osg::notify(osg::INFO)<<"****************Extruder : Start ************"<<std::endl;
@@ -70 +106 @@
-    unsigned int originalVertexArraySize = geometry.getVertexArray()->getNumElements();
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        osgUtil::EdgeCollector::IndexArrayList::iterator iaIt, iaEnd = originalIndexArrayList.end();
-        for (iaIt = originalIndexArrayList.begin(); iaIt != iaEnd; ++iaIt)
-        {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            {
-                osgUtil::ReversePrimitiveFunctor rpf;
-(*it)
-
-newPs = rpf.getReversedPrimitiveSet(
+de
+
+geometry.addPrimitiveSet(rpf._reversedPrimitiveSet.get()
-            }
-            else
-            {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-}
-
@@ -281 +315 @@
-        if (geo)
-        {
-, _extrudeVector
+
-        }
-    }

trunk/src/vpb/HeightFieldMapper.cpp

@@ -23 +23 @@
-#include <osgUtil/EdgeCollector>
-#include <osgUtil/ConvertVec>
+#include <osgUtil/Tessellator>
-
-namespace vpb {
@@ -51 +52 @@
-
-
-
-
+
-{
-    public:
-        
-        ComputeCentroidVisitor(osg::UIntArray & ia) : _ia(ia) {}
-        
-        
-        void apply(osg::Vec3Array& array) { computeCentroid<osg::Vec3Array>(array); }
@@ -65 +62 @@
-        void apply(osg::Vec4dArray& array) { computeCentroid<osg::Vec4dArray>(array); }
-    
-
+
-        template <typename ArrayType>
-        void computeCentroid(ArrayType & array)
-        {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        template <typename ArrayType>
-        void computeCentroid(ArrayType & array)
-        {
-
-
+
-            osg::Vec3d total(0.0,0.0,0.0);
-            
-osg::UIntArray::iterator it = _ia.begin(); it != _ia.end(); ++it
-
-*it
+unsigned int i=0; i<size; ++i
+
+i
-                total.x() += vec.x();
-                total.y() += vec.y();
@@ -119 +98 @@
-            }
-            
-
-
-
-
-
-
-
+
+
+
-        osg::Vec3d _centroid;
-};
-
+struct CopyIndexedOperator
+{ 
+    template <typename ArrayType>
+    void process(ArrayType & array) 
+    {   
+        ArrayType * va = new ArrayType();
+        
+        osg::UIntArray::iterator it, end = _indexArray->end();
+        for (it = _indexArray->begin(); it < end; ++it)
+            va->push_back(array[*it]);
+        
+        _copyArray = va;
+    }
+        
+    osg::ref_ptr<osg::UIntArray> _indexArray;
+    osg::ref_ptr<osg::Array> _copyArray;
+};
+typedef osgUtil::OperationArrayFunctor<CopyIndexedOperator> CopyIndexedFunctor;  
+
+struct IsConvexPolygonVisitor : public osg::ArrayVisitor
+{ 
+    virtual void apply(osg::Vec3Array& array) { process<osg::Vec3Array>(array); }
+    virtual void apply(osg::Vec4Array& array) { process<osg::Vec4Array>(array); }
+
+
+    virtual void apply(osg::Vec3dArray& array) { process<osg::Vec3dArray>(array); }
+    virtual void apply(osg::Vec4dArray& array) { process<osg::Vec4dArray>(array); }
+    
+    template <typename ArrayType>
+    void process(ArrayType & array) 
+    {   
+        typedef typename ArrayType::ElementDataType VecType;
+        
+        bool positif;
+        
+        {
+            const VecType & v1 = array[0];
+            const VecType & v2 = array[1];
+            const VecType & v3 = array[2];
+            
+            positif = (((v1.x() - v2.x()) * (v3.y() - v2.y()) - (v1.y() - v2.y()) * (v3.x() - v2.x())) >= 0.0);
+        }
+        
+        
+        unsigned int size = array.size() - 2;
+        unsigned int i;
+        for (i=1; i<size; ++i)
+        {
+            const VecType & v1 = array[i];
+            const VecType & v2 = array[i+1];
+            const VecType & v3 = array[i+2];
+            
+            if (positif != (((v1.x() - v2.x()) * (v3.y() - v2.y()) - (v1.y() - v2.y()) * (v3.x() - v2.x())) >= 0.0))
+            {
+                _isConvex = false;
+                return;
+            }
+        }
+        
+        {
+            const VecType & v1 = array[i];
+            const VecType & v2 = array[i+1];
+            const VecType & v3 = array[0];
+            
+            if (positif != (((v1.x() - v2.x()) * (v3.y() - v2.y()) - (v1.y() - v2.y()) * (v3.x() - v2.x())) >= 0.0))
+            {
+                _isConvex = false;
+                return;
+            }
+        }
+        
+        {
+            const VecType & v1 = array[i+1];
+            const VecType & v2 = array[0];
+            const VecType & v3 = array[1];
+            
+            if (positif != (((v1.x() - v2.x()) * (v3.y() - v2.y()) - (v1.y() - v2.y()) * (v3.x() - v2.x())) >= 0.0))
+            {
+                _isConvex = false;
+                return;
+            }
+        }
+        
+        _isConvex = true;
+    }
+        
+    bool _isConvex;
+};
+
+
+// ** This operator map each vertex and add them only if they overlap the HeightField
-class HeightFieldMapperArrayVisitor : public osg::ArrayVisitor
-{
+public:
+    
+    HeightFieldMapperArrayVisitor(const HeightFieldMapper & hfm) : _hfm(hfm) {}
+    
+    virtual void apply(osg::Vec3Array& array) { process<osg::Vec3Array>(array); }
+    virtual void apply(osg::Vec4Array& array) { process<osg::Vec4Array>(array); }
+
+
+    virtual void apply(osg::Vec3dArray& array) { process<osg::Vec3dArray>(array); }
+    virtual void apply(osg::Vec4dArray& array) { process<osg::Vec4dArray>(array); }
+    
+    template <typename ArrayType>
+    void process(ArrayType & array) 
+    {   
+        unsigned int size = array.size();
+        osg::ref_ptr<ArrayType> newArray(new ArrayType);
+        newArray->reserve(size);
+        
+        ArrayType & refNewArray = *newArray.get();
+        
+        
+        for (unsigned int i=0; i<size; ++i)
+        {
+            typename ArrayType::ElementDataType & vec = array[i];
+            vec.z() = _hfm.getZfromXY(vec.x(), vec.y());
+            
+            if (vec.z() != DBL_MAX) refNewArray.push_back(vec);
+        }
+        
+        array = refNewArray;
+    }
+    
+    const HeightFieldMapper & _hfm;
+};
+
+
+// ** This operator reverse the array if its normal is not (0,0,1)
+class AssertUpNormalVisitor : public osg::ArrayVisitor
+{
-    public:
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        };
-        
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+