Changeset 8803

Timestamp:

08/27/08 12:13:30

Author:

robert

Message:

Introduced SwitchLayer? which will form the basis of provided support for varients

Files:

• OpenSceneGraph/trunk/include/osgTerrain/Layer (modified) (1 diff)
• OpenSceneGraph/trunk/src/osgPlugins/ive/CMakeLists.txt (modified) (2 diffs)
• OpenSceneGraph/trunk/src/osgPlugins/ive/DataInputStream.cpp (modified) (2 diffs)
• OpenSceneGraph/trunk/src/osgPlugins/ive/DataOutputStream.cpp (modified) (2 diffs)
• OpenSceneGraph/trunk/src/osgPlugins/ive/Layer.cpp (modified) (3 diffs)
• OpenSceneGraph/trunk/src/osgPlugins/ive/ReadWrite.h (modified) (1 diff)
• OpenSceneGraph/trunk/src/osgPlugins/ive/SwitchLayer.cpp (added)
• OpenSceneGraph/trunk/src/osgPlugins/ive/SwitchLayer.h (added)
• OpenSceneGraph/trunk/src/osgPlugins/osgTerrain/CMakeLists.txt (modified) (1 diff)
• OpenSceneGraph/trunk/src/osgPlugins/osgTerrain/SwitchLayer.cpp (added)
• OpenSceneGraph/trunk/src/osgTerrain/Layer.cpp (modified) (1 diff)

OpenSceneGraph/trunk/include/osgTerrain/Layer

@@ -419 +419 @@
-};
-
+
+
+class OSGTERRAIN_EXPORT SwitchLayer : public Layer
+{
+    public:
+
+        SwitchLayer();
+
+        /** Copy constructor using CopyOp to manage deep vs shallow copy.*/
+        SwitchLayer(const SwitchLayer& switchLayer,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
+        
+        META_Object(osgTerrain, SwitchLayer);
+
+        void clear();
+        
+        void setActiveLayer(unsigned int i) { _activeLayer = i; }
+        unsigned int getActiveLayer() const { return _activeLayer; }
+
+        void setFileName(unsigned int i, const std::string& filename) { _layers[i].first = filename; if (_layers[i].second.valid()) _layers[i].second->setFileName(filename); }
+        const std::string& getFileName(unsigned int i) const { return _layers[i].second.valid() ? _layers[i].second->getFileName() : _layers[i].first; }
+
+        void setLayer(unsigned int i, Layer* layer) { _layers[i].second = layer; }
+        Layer* getLayer(unsigned int i) { return _layers[i].second.get(); }
+        const Layer* getLayer(unsigned int i) const { return _layers[i].second.get(); }
+
+        void addLayer(const std::string& filename) { _layers.push_back(FileNameLayerPair(filename,0)); }
+        
+        void addLayer(Layer* layer) { _layers.push_back(FileNameLayerPair(layer->getFileName(),layer)); }
+
+        void removeLayer(unsigned int i) { _layers.erase(_layers.begin()+i); }
+        
+        unsigned int getNumLayers() const { return _layers.size(); }
+
+    protected:
+
+        virtual ~SwitchLayer() {}
+        
+        typedef std::pair< std::string, osg::ref_ptr<Layer> > FileNameLayerPair;
+        
+        typedef std::vector< FileNameLayerPair > Layers;
+        
+        unsigned int _activeLayer;
+        Layers _layers;
+};
+
-}
-

OpenSceneGraph/trunk/src/osgPlugins/ive/CMakeLists.txt

@@ -21 +21 @@
-    ColorMask.cpp
-    CompositeLayer.cpp
+    SwitchLayer.cpp
-    ConeSector.cpp
-    ConvexPlanarOccluder.cpp
@@ -134 +135 @@
-    ColorMask.h
-    CompositeLayer.h
+    SwitchLayer.h
-    ConeSector.h
-    ConvexPlanarOccluder.h

OpenSceneGraph/trunk/src/osgPlugins/ive/DataInputStream.cpp

@@ -106 +106 @@
-#include "HeightFieldLayer.h"
-#include "CompositeLayer.h"
+#include "SwitchLayer.h"
-
-#include "FadeText.h"
@@ -1586 +1587 @@
-        ((ive::ImageLayer*)(layer))->read(this);
-    }
+    else if (layerid==IVESWITCHLAYER)
+    {
+        layer = new osgTerrain::SwitchLayer;
+        ((ive::SwitchLayer*)(layer))->read(this);
+    }
-    else if (layerid==IVECOMPOSITELAYER)
-    {

OpenSceneGraph/trunk/src/osgPlugins/ive/DataOutputStream.cpp

@@ -107 +107 @@
-#include "HeightFieldLayer.h"
-#include "CompositeLayer.h"
+#include "SwitchLayer.h"
-
-#include <osg/Notify>
@@ -1290 +1291 @@
-            ((ive::ImageLayer*)(layer))->write(this);
-        }
+        else if (dynamic_cast<const osgTerrain::SwitchLayer*>(layer))
+        {
+            ((ive::SwitchLayer*)(layer))->write(this);
+        }
-        else if (dynamic_cast<const osgTerrain::CompositeLayer*>(layer))
-        {

OpenSceneGraph/trunk/src/osgPlugins/ive/Layer.cpp

@@ -20 +20 @@
-#include "HeightFieldLayer.h"
-#include "CompositeLayer.h"
+#include "SwitchLayer.h"
-
-#include <osgDB/ReadFile>
@@ -109 +110 @@
-            ((ive::ImageLayer*)(layer))->write(out);
-        }
+        else if (dynamic_cast<osgTerrain::SwitchLayer*>(layer))
+        {
+            ((ive::SwitchLayer*)(layer))->write(out);
+        }
-        else if (dynamic_cast<osgTerrain::CompositeLayer*>(layer))
-        {
@@ -149 +154 @@
-        osgTerrain::ImageLayer* layer = new osgTerrain::ImageLayer;
-        ((ive::ImageLayer*)(layer))->read(in);
+        return layer;
+    }
+    else if (id==IVESWITCHLAYER)
+    {
+        osgTerrain::SwitchLayer* layer = new osgTerrain::SwitchLayer;
+        ((ive::SwitchLayer*)(layer))->read(in);
-        return layer;
-    }

OpenSceneGraph/trunk/src/osgPlugins/ive/ReadWrite.h

@@ -136 +136 @@
-#define IVEGEOMETRYTECHNIQUE            0x00200009
-#define IVEVALIDDATAOPERATOR            0x0020000A
-
-
+
+
+
-//#define IVETERRAIN                      0x0020000A
-

OpenSceneGraph/trunk/src/osgPlugins/osgTerrain/CMakeLists.txt

@@ -7 +7 @@
-    HeightFieldLayer.cpp
-    CompositeLayer.cpp
+    SwitchLayer.cpp
-    Layer.cpp
-    TerrainTile.cpp

OpenSceneGraph/trunk/src/osgTerrain/Layer.cpp

@@ -567 +567 @@
-}
-
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// SwitchLayer
+//
+SwitchLayer::SwitchLayer():
+    _activeLayer(0)
+{
+}
+
+SwitchLayer::SwitchLayer(const SwitchLayer& switchLayer,const osg::CopyOp& copyop):
+    Layer(switchLayer,copyop),
+    _activeLayer(0)
+{
+}
+
+
+void SwitchLayer::clear()
+{
+    _layers.clear();
+}
+