From ec1fd733b8b3933805dae22bcf91c5572c3c0f0f Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Sun, 21 Mar 2004 12:17:44 +0000
Subject: [PATCH] Added TextureType and GeometryType parameters to DataSet. 
 These will be used to control what type of database is generated.

---
 examples/osgdem/osgdem.cpp | 56 ++++++++++++++++++++++++++------------
 include/osgTerrain/DataSet | 20 ++++++++++++++
 src/osgTerrain/DataSet.cpp |  4 ++-
 3 files changed, 61 insertions(+), 19 deletions(-)

diff --git a/examples/osgdem/osgdem.cpp b/examples/osgdem/osgdem.cpp
index dc6991c12..1e4cf3fa4 100644
--- a/examples/osgdem/osgdem.cpp
+++ b/examples/osgdem/osgdem.cpp
@@ -136,8 +136,6 @@ int main( int argc, char **argv )
     int pos = 1;
     while(pos<arguments.argc())
     {
-        argumentRead = false;
-    
         std::string def;
         osgTerrain::DataSet::Source* source = 0;
 
@@ -149,50 +147,78 @@ int main( int argc, char **argv )
         }
         else if (arguments.read(pos, "--identity"))
         {
-            argumentRead = true;
             geoTransformSet = false;
             geoTransform.makeIdentity();            
         }
+
+        // x vector
         else if (arguments.read(pos, "--xx",geoTransform(0,0)))
         {
-            argumentRead = true;
             geoTransformSet = true;
-            std::cout<<"--xs "<<geoTransform(0,0)<<std::endl;
+            std::cout<<"--xx "<<geoTransform(0,0)<<std::endl;
+        }
+        else if (arguments.read(pos, "--xy",geoTransform(1,0)))
+        {
+            geoTransformSet = true;
+            std::cout<<"--xy "<<geoTransform(1,0)<<std::endl;
+        }
+        else if (arguments.read(pos, "--xz",geoTransform(2,0)))
+        {
+            geoTransformSet = true;
+            std::cout<<"--xz "<<geoTransform(2,0)<<std::endl;
         }
         else if (arguments.read(pos, "--xt",geoTransform(3,0)))
         {
-            argumentRead = true;
             geoTransformSet = true;
             std::cout<<"--xo "<<geoTransform(3,0)<<std::endl;
         }
+
+        // y vector
+        else if (arguments.read(pos, "--yx",geoTransform(0,1)))
+        {
+            geoTransformSet = true;
+            std::cout<<"--yx "<<geoTransform(0,1)<<std::endl;
+        }
         else if (arguments.read(pos, "--yy",geoTransform(1,1)))
         {
-            argumentRead = true;
             geoTransformSet = true;
             std::cout<<"--yy "<<geoTransform(1,1)<<std::endl;
         }
+        else if (arguments.read(pos, "--yz",geoTransform(2,1)))
+        {
+            geoTransformSet = true;
+            std::cout<<"--yz "<<geoTransform(2,1)<<std::endl;
+        }
         else if (arguments.read(pos, "--yt",geoTransform(3,1)))
         {
-            argumentRead = true;
             geoTransformSet = true;
             std::cout<<"--yt "<<geoTransform(3,1)<<std::endl;
         }
+
+        // z vector
+        else if (arguments.read(pos, "--zx",geoTransform(0,2)))
+        {
+            geoTransformSet = true;
+            std::cout<<"--zx "<<geoTransform(0,2)<<std::endl;
+        }
+        else if (arguments.read(pos, "--zy",geoTransform(1,2)))
+        {
+            geoTransformSet = true;
+            std::cout<<"--zy "<<geoTransform(1,2)<<std::endl;
+        }
         else if (arguments.read(pos, "--zz",geoTransform(2,2)))
         {
-            argumentRead = true;
             geoTransformSet = true;
             std::cout<<"--zz "<<geoTransform(2,2)<<std::endl;
         }
         else if (arguments.read(pos, "--zt",geoTransform(3,2)))
         {
-            argumentRead = true;
             geoTransformSet = true;
             std::cout<<"--zt "<<geoTransform(3,2)<<std::endl;
         }
+
         else if (arguments.read(pos, "-d",filename))
         {
-            argumentRead = true;
-
             if (!filename.empty())
             {
                 std::cout<<"-d "<<filename<<std::endl;
@@ -202,8 +228,6 @@ int main( int argc, char **argv )
         }
         else if (arguments.read(pos, "-t",filename))
         {
-            argumentRead = true;
-
             if (!filename.empty())
             {
                 std::cout<<"-t "<<filename<<std::endl;
@@ -212,8 +236,6 @@ int main( int argc, char **argv )
         }
         else if (arguments.read(pos, "-m",filename))
         {
-            argumentRead = true;
-
             if (!filename.empty())
             {
                 std::cout<<"-m "<<filename<<std::endl;
@@ -224,8 +246,6 @@ int main( int argc, char **argv )
         {
             std::cout<<"-o "<<filename<<std::endl;
 
-            argumentRead = true;
-
             std::string path = osgDB::getFilePath(filename);
             std::string base = path.empty()?osgDB::getStrippedName(filename):
                                             path +'/'+ osgDB::getStrippedName(filename);
diff --git a/include/osgTerrain/DataSet b/include/osgTerrain/DataSet
index 140cc9f6e..eae1cc998 100644
--- a/include/osgTerrain/DataSet
+++ b/include/osgTerrain/DataSet
@@ -878,6 +878,24 @@ class DataSet : public osg::Referenced
         void setDatabaseType(DatabaseType type) { _databaseType = type; }
         DatabaseType getDatabaseType() const { return _databaseType; }
 
+        enum GeometryType
+        {
+            HEIGHT_FIELD,
+            POLYGONAL,
+        };
+        void setGeometryType(GeometryType type) { _geometryType = type; }
+        GeometryType getGeometryType() const { return _geometryType; }
+
+        enum TextureType
+        {
+            RGB_24_BIT,
+            RGB_16_BIT,
+            COMPRESSED_TEXTURE
+        };
+        void setTextureType(TextureType type) { _textureType = type; }
+        TextureType getTextureType() const { return _textureType; }
+
+
         void writeDestination();
         
         osg::Node* getDestinationRootNode() { return _rootNode.get(); }
@@ -909,6 +927,8 @@ class DataSet : public osg::Referenced
         std::string                                 _tileExtension;
         osg::Vec4                                   _defaultColor;
         DatabaseType                                _databaseType;
+        GeometryType                                _geometryType;
+        TextureType                                 _textureType;
         
         
         osg::ref_ptr<osg::Node>                     _rootNode;
diff --git a/src/osgTerrain/DataSet.cpp b/src/osgTerrain/DataSet.cpp
index 9ab677e88..aaff8cd9f 100644
--- a/src/osgTerrain/DataSet.cpp
+++ b/src/osgTerrain/DataSet.cpp
@@ -2147,7 +2147,9 @@ DataSet::DataSet()
     
     _defaultColor.set(0.5f,0.5f,1.0f,1.0f);
     _databaseType = PagedLOD_DATABASE;
-    
+    _geometryType = POLYGONAL;
+    _textureType = COMPRESSED_TEXTURE;
+
 }
 
 void DataSet::init()