Changeset 949

Timestamp:

10/14/08 21:21:36

Author:

robert

Message:

Added support for control whether imagery is forced to be PowerOfTwo? or not.

Files:

• trunk/TODO.txt (modified) (1 diff)
• 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/Commandline.cpp (modified) (1 diff)
• trunk/src/vpb/Destination.cpp (modified) (2 diffs)

trunk/TODO.txt

@@ -3 +3 @@
-Already completed:
- 1) Added vpbmaster better cancellation.
+ 2) Progress reporting with estimated time to completion.
+ 3) Better split level estimation
- 4) Incremental build - i.e. ability to rerun from an existing tasks file.
+ 5) Automatic set up of reprojection task if required.
- 6) Handling of ten of thousands of input files (i.e. will currently break the number of permissable open file handles.)
-
-Items left to do:
- 2) Progress reporting with estimated time to completion.
- 3) Better split level estimation
- 5) Automatic set up of reprojection task if required.
- 7) Write up on the VPB wiki website about use of distributed/incremental build.

trunk/include/vpb/BuildOptions

@@ -63 +63 @@
-        void setDestinationImageExtension(const std::string& extension) { _imageExtension = extension; }
-        const std::string& getDestinationImageExtension() const { return _imageExtension; }
+
+        void setPowerOfTwoImages(bool powerOfTwoImages) { _powerOfTwoImages = powerOfTwoImages; }
+        bool getPowerOfTwoImages() const { return _powerOfTwoImages; }
-        
-        /** Set the Archive name if one is to be used.*/
@@ -339 +342 @@
-        bool                                        _outputTaskDirectories;
-        std::string                                 _imageExtension;
+        bool                                        _powerOfTwoImages;
-        std::string                                 _intermediateBuildName;
-        std::string                                 _logFileName;

trunk/src/vpb/BuildOptions.cpp

@@ -40 +40 @@
-    _geometryType = POLYGONAL;
-    _imageExtension = ".dds";
+    _powerOfTwoImages = true;
-    _intermediateBuildName = "";
-    _logFileName = "";
@@ -121 +122 @@
-    _geometryType = rhs._geometryType;
-    _imageExtension = rhs._imageExtension;
+    _powerOfTwoImages = rhs._powerOfTwoImages;
-    _intermediateBuildName = rhs._intermediateBuildName;
-    _logFileName = rhs._logFileName;

trunk/src/vpb/BuildOptionsIO.cpp

@@ -245 +245 @@
-        ADD_STRING_PROPERTY(DestinationTileExtension);
-        ADD_STRING_PROPERTY(DestinationImageExtension);
+        ADD_BOOL_PROPERTY(PowerOfTwoImages);
-        ADD_STRING_PROPERTY(ArchiveName);
-        ADD_STRING_PROPERTY(IntermediateBuildName);

trunk/src/vpb/Commandline.cpp

@@ -793 +793 @@
-    }
-
+    while (arguments.read("--npot")) { buildOptions->setPowerOfTwoImages(false); }
+    while (arguments.read("--pot")) { buildOptions->setPowerOfTwoImages(true); }
+
-    while (arguments.read("--height-attribute",heightAttributeName)) {}
-

trunk/src/vpb/Destination.cpp

@@ -248 +248 @@
-        unsigned int numRowsRequired    = osg::minimum(_image_maxNumRows,numRowsAtFullRes);
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        // set up properly for vector and raster (previously always vector)
-        // assume raster if _dataType not set (default for Destination Tile)
@@ -1215 +1234 @@
-            if (_dataSet->getMipMappingMode()==DataSet::MIP_MAPPING_HARDWARE)
-                texture->setFilter(osg::Texture::MIN_FILTER,osg::Texture::LINEAR);
+
+            // make sure the OSG doesn't rescale images if it doesn't need to.
+            texture->setResizeNonPowerOfTwoHint(_dataSet->getPowerOfTwoImages());
+
-
-            // get OpenGL driver to create texture from image.