Changeset 950

Timestamp:

10/20/08 10:43:41

Author:

robert

Message:

Added support for compression, and non power of two textures.

Files:

• trunk/include/vpb/BuildOptions (modified) (1 diff)
• trunk/src/vpb/Commandline.cpp (modified) (1 diff)
• trunk/src/vpb/Destination.cpp (modified) (15 diffs)

trunk/include/vpb/BuildOptions

@@ -66 +66 @@
-        void setPowerOfTwoImages(bool powerOfTwoImages) { _powerOfTwoImages = powerOfTwoImages; }
-        bool getPowerOfTwoImages() const { return _powerOfTwoImages; }
-
+
-        /** Set the Archive name if one is to be used.*/
-        void setArchiveName(const std::string& filename) { _archiveName = filename; }

trunk/src/vpb/Commandline.cpp

@@ -455 +455 @@
-    usage.addCommandLineOption("--RGBA-compressed","Use OpenGL compression on RGBA destination imagery");     
-    usage.addCommandLineOption("--RGB-16","Use 16bit RGB destination imagery");     
-A
-
+
+A
-    usage.addCommandLineOption("--RGBA","Use 32bit RGBA destination imagery");     
-    usage.addCommandLineOption("--vector","Interpret input as a vector data set");

trunk/src/vpb/Destination.cpp

@@ -271 +271 @@
-            }
-            
-osg::notify(osg::NOTICE)<<"numColumnsAtFullRes = "<<numColumnsRequired<<"\tnumColumns = "<< numColumns<<std::endl
-osg::notify(osg::NOTICE)<<"numRowsAtFullRes = "<<numRowsRequired<<"\tnumRows = "<< numRows<<std::endl
+log(osg::NOTICE,"numColumnsAtFullRes = %itnumColumns = %i",numColumnsRequired,numColumns)
+log(osg::NOTICE,"numRowsAtFullRes = %i\tnumRows = ",numRowsRequired,numRows)
-        }
-        
@@ -1192 +1192 @@
-          case(DataSet::NO_MIP_MAPPING):
-            {
+                log(osg::NOTICE,"DestinationTile::createStateSet() - DataSet::NO_MIP_MAPPING");
+            
-                texture->setFilter(osg::Texture::MIN_FILTER,osg::Texture::LINEAR);
-                texture->setFilter(osg::Texture::MAG_FILTER,osg::Texture::LINEAR);
@@ -1198 +1200 @@
-          case(DataSet::MIP_MAPPING_HARDWARE):
-            {
+                log(osg::NOTICE,"DestinationTile::createStateSet() - DataSet::MIP_MAPPING_HARDWARE");
-                texture->setFilter(osg::Texture::MIN_FILTER,osg::Texture::LINEAR_MIPMAP_LINEAR);
-                texture->setFilter(osg::Texture::MAG_FILTER,osg::Texture::LINEAR);
@@ -1204 +1207 @@
-          case(DataSet::MIP_MAPPING_IMAGERY):
-            {
+                log(osg::NOTICE,"DestinationTile::createStateSet() - DataSet::MIP_MAPPING_IMAGERY");
-                texture->setFilter(osg::Texture::MIN_FILTER,osg::Texture::LINEAR_MIPMAP_LINEAR);
-                texture->setFilter(osg::Texture::MAG_FILTER,osg::Texture::LINEAR);
@@ -1214 +1218 @@
-
-        bool inlineImageFile = _dataSet->getDestinationTileExtension()==".ive";
-.
+
-        bool mipmapImageSupported = compressedImageSupported; // inlineImageFile;
-        
@@ -1225 +1229 @@
-            (image->getPixelFormat()==GL_RGB || image->getPixelFormat()==GL_RGBA))
-        {
+            log(osg::NOTICE,"Compressed image");
-        
-            if (image->s()>=minumDXT3CompressedTextureSize && image->t()>=minumDXT3CompressedTextureSize)
@@ -1233 +1238 @@
-            // force the mip mapping off temporay if we intend the graphics hardware to do the mipmapping.
-            if (_dataSet->getMipMappingMode()==DataSet::MIP_MAPPING_HARDWARE)
+            {
+                log(osg::INFO,"   switching off MIP_MAPPING for compile");
-                texture->setFilter(osg::Texture::MIN_FILTER,osg::Texture::LINEAR);
+            }
-
-            // make sure the OSG doesn't rescale images if it doesn't need to.
@@ -1258 +1266 @@
-        else
-        {
+            log(osg::NOTICE,"Non compressed image mipmapImageSupported=%i imageExtension=%s",mipmapImageSupported,imageExtension.c_str());
+
-            if (_dataSet->getTextureType()==DataSet::RGB_16 && image->getPixelFormat()==GL_RGB)
-            {
@@ -1269 +1279 @@
-            if (mipmapImageSupported && _dataSet->getMipMappingMode()==DataSet::MIP_MAPPING_IMAGERY)
-            {
-
-
+
+
+
+
-
-                // get OpenGL driver to create texture from image.
@@ -1349 +1361 @@
-        }
-    }
+
+    _dataSet->getState()->checkGLErrors("DestinationTile::createStateSet()");
+
-    return _stateset.get();
-}
@@ -1365 +1380 @@
-        _terrain->_heightField->allocate(8,8);
-        _terrain->_heightField->setOrigin(osg::Vec3(_extents.xMin(),_extents.yMin(),0.0f));
-
-
+/7.0
+/7.0
-    }
-
@@ -1576 +1591 @@
-    }
-    
+    osg::Texture::FilterMode minFilter = _dataSet->getMipMappingMode()==BuildOptions::NO_MIP_MAPPING ? 
+                    osg::Texture::LINEAR :
+                    osg::Texture::LINEAR_MIPMAP_LINEAR;
+
+    osg::Texture::FilterMode magFilter = osg::Texture::LINEAR;
-
-    // assign the imagery
@@ -1591 +1611 @@
-            osgTerrain::SwitchLayer* switchLayer = new osgTerrain::SwitchLayer;
-            switchLayer->setLocator(locator);
+            switchLayer->setMinFilter(minFilter);
+            switchLayer->setMagFilter(magFilter);
-            for(ImageSet::LayerSetImageDataMap::iterator litr = imageSet._layerSetImageDataMap.begin();
-                litr != imageSet._layerSetImageDataMap.end();
@@ -1601 +1623 @@
-
-                    osgTerrain::ImageLayer* imageLayer = new osgTerrain::ImageLayer;
+                    imageLayer->setMinFilter(minFilter);
+                    imageLayer->setMagFilter(magFilter);
-                    imageLayer->setImage(image);
-                    imageLayer->setSetName(litr->first);
@@ -1621 +1645 @@
-                imageLayer->setImage(image);
-                imageLayer->setLocator(locator);
+                imageLayer->setMinFilter(minFilter);
+                imageLayer->setMagFilter(magFilter);
-
-                terrainTile->setColorLayer(layerNum, imageLayer);