Changeset 890

Timestamp:

03/11/08 13:48:27

Author:

robert

Message:

Added LayerInheritance? paramter to BuildOptions? and use of this in the source reading and scene building code in Destination.cpp

Files:

• trunk/include/vpb/BuildOptions (modified) (2 diffs)
• trunk/src/vpb/BuildOptions.cpp (modified) (2 diffs)
• trunk/src/vpb/BuildOptionsIO.cpp (modified) (1 diff)
• trunk/src/vpb/Destination.cpp (modified) (6 diffs)

trunk/include/vpb/BuildOptions

@@ -250 +250 @@
-        void setBuildOptionsString(const std::string& str) { _buildOptionsString = str; }
-        const std::string& getBuildOptionsString() const { return _buildOptionsString; }
+
+        enum LayerInheritance
+        {
+            INHERIT_LOWEST_AVAILABLE,
+            INHERIT_NEAREST_AVAILABLE,
+            NO_INHERITANCE
+        };
+        
+        void setLayerInheritance(LayerInheritance inheritance) { _layerInheritance = inheritance; }
+        LayerInheritance getLayerInheritance() const { return _layerInheritance; }
+
-        
-    protected:
@@ -310 +321 @@
-        
-        std::string                                 _buildOptionsString;
+
+        LayerInheritance                            _layerInheritance;
-};
-

trunk/src/vpb/BuildOptions.cpp

@@ -72 +72 @@
-    _numReadThreadsToCoresRatio = 0.0f;
-    _numWriteThreadsToCoresRatio = 0.0f;
+    
+    _layerInheritance = INHERIT_NEAREST_AVAILABLE;
-}
-
@@ -144 +146 @@
-    
-    _buildOptionsString = rhs._buildOptionsString;
+    
+    _layerInheritance = rhs._layerInheritance;
-}
-

trunk/src/vpb/BuildOptionsIO.cpp

@@ -218 +218 @@
-
-        ADD_STRING_PROPERTY(BuildOptionsString);
+
+        { AEP(LayerInheritance); AEV(INHERIT_LOWEST_AVAILABLE); AEV(INHERIT_NEAREST_AVAILABLE); AEV(NO_INHERITANCE); }
+
-    }
-    

trunk/src/vpb/Destination.cpp

@@ -1054 +1054 @@
-    _stateset = new osg::StateSet;
-
-    bool updateBaseTextureToCurrentValidImage = true;
-    osg::Texture* baseTexture = 0;
-    for(layerNum=0;
-        layerNum<_imagery.size();
@@ -1078 +1076 @@
-
-        osg::Texture2D* texture = new osg::Texture2D;
-        
-        if (updateBaseTextureToCurrentValidImage || baseTexture==0) baseTexture=texture;
-        
-        texture->setImage(image);
@@ -1179 +1175 @@
-    }
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                {
-
+
+
+
+
-                }
-            }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
+            if (noBlanks>0 && noBlanks != _dataSet->getNumOfTextureLevels())
+            {
+                // inherit downards to fill in any blanks
+                for(int layerNum=_dataSet->getNumOfTextureLevels()-1;
+                    layerNum>=0;
+                    --layerNum)
+                {
+                    osg::StateAttribute* localTexture = _stateset->getTextureAttribute(layerNum,osg::StateAttribute::TEXTURE);
+                    if (localTexture) texture = localTexture;
+                    else if (texture) _stateset->setTextureAttributeAndModes(layerNum,texture,osg::StateAttribute::ON);
+                }
+            }
+            break;
+        }
+        case(BuildOptions::NO_INHERITANCE):
+        {
+            // do nothing..
+            break;
+        }
+    }
-    return _stateset.get();
-}
@@ -1430 +1465 @@
-    
-
-    osgTerrain::ImageLayer* baseLayer = 0;
-    bool updateLayerTextureToCurrentValidLayer = true;
-    
-    // assign the imagery
-    for(unsigned int layerNum=0;
@@ -1448 +1480 @@
-
-            terrain->setColorLayer(layerNum, imageLayer);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    // assign the terrain technique that will be used to render the terrain tile.
@@ -2162 +2239 @@
-            {
-                unsigned int layerNum = source->getLayer();
-
-
+
-                {
-
-
+
-                    {
-_imagery[i]._imagery.valid()
+layerNum==0
-                        {
-
+
+
+
+
+
+
+
+
-                        }
+                        else
+                        {
+                            // copy specific layer.
+                            if (layerNum<_imagery.size() && _imagery[layerNum]._imagery.valid())
+                            {
+                                data->read(*(_imagery[layerNum]._imagery));
+                            }
+                        }
+                        break;
-                    }
-
-
-
-
-
+
-                    {
-
+
+
+
+
+
+
+
+
+
-                    }
-
+
+
+
+
+
+
+
+
+
-                break;
-            }