Changeset 888

Timestamp:

03/07/08 21:54:47

Author:

robert

Message:

Changed the baseLayer/baseTexture setting so that it takes the highest valid imager/texture as the one to inherit into empty layers

Files:

• trunk/src/vpb/Destination.cpp (modified) (6 diffs)

trunk/src/vpb/Destination.cpp

@@ -1054 +1054 @@
-    _stateset = new osg::StateSet;
-
+    bool updateBaseTextureToCurrentValidImage = true;
-    osg::Texture* baseTexture = 0;
-    for(layerNum=0;
@@ -1078 +1079 @@
-        osg::Texture2D* texture = new osg::Texture2D;
-        
-
+updateBaseTextureToCurrentValidImage || 
-        
-        texture->setImage(image);
@@ -1180 +1181 @@
-    // now fill in any blank texture units.
-    bool fillInAllTextureUnits = true;
- && baseTexture
+
-    {
-        for(layerNum=0;
@@ -1191 +1192 @@
-            {
-                ImageData& imageData = _imagery[layerNum];
-
-
+
+
+
+
-            }
-            if (applyBaseTexture)        
@@ -1428 +1431 @@
-
-    osgTerrain::ImageLayer* baseLayer = 0;
+    bool updateLayerTextureToCurrentValidLayer = true;
-    
-    // assign the imagery
@@ -1445 +1449 @@
-            terrain->setColorLayer(layerNum, imageLayer);
-
-!baseLayer
+updateLayerTextureToCurrentValidLayer || baseLayer==0
-            {
-                baseLayer = imageLayer;