Changeset 621

Timestamp:

04/05/07 16:10:41

Author:

robert

Message:

Various updates to build properly.

Files:

• trunk/Make/help.sh (modified) (1 diff)
• trunk/Make/makedefs (modified) (1 diff)
• trunk/Make/makedirdefs (modified) (1 diff)
• trunk/VisualStudio (added)
• trunk/VisualStudio/MUST_READ_ME.txt (added)
• trunk/VisualStudio/VirtualPlanetBuilder.dsw (added)
• trunk/VisualStudio/applications (added)
• trunk/VisualStudio/applications/osgdem (added)
• trunk/VisualStudio/applications/osgdem/osgdem.dsp (added)
• trunk/VisualStudio/collect_mangled_names.bat (added)
• trunk/VisualStudio/collect_mangled_names.js (added)
• trunk/VisualStudio/create_static_workspace.js (added)
• trunk/VisualStudio/fixup-vc6-dsps.pl (added)
• trunk/VisualStudio/osgPlugins (added)
• trunk/VisualStudio/osgPlugins/gdal (added)
• trunk/VisualStudio/osgPlugins/gdal/gdal.dsp (added)
• trunk/VisualStudio/reset-64bit-outdirs.pl (added)
• trunk/VisualStudio/vpb (added)
• trunk/VisualStudio/vpb/vpb.dsp (added)
• trunk/applications/osgdem/GNUmakefile (modified) (1 diff)
• trunk/applications/osgdem/GNUmakefile.inst (modified) (1 diff)
• trunk/applications/osgdem/osgdem.cpp (modified) (18 diffs)

trunk/Make/help.sh

@@ -125 +125 @@
-above 'make' usage.  For example,
-
-
-
+
-       install
-

trunk/Make/makedefs

@@ -95 +95 @@
-INST_INCLUDE   = $(INST_LOCATION)/include
-INST_SHARE     = $(INST_LOCATION)/share
-
-
-
-
-
+
-LINK           = ln -sf
-INSTBINCMD     = install -m 755

trunk/Make/makedirdefs

@@ -10 +10 @@
-# Directories traversed in the TOPDIR/src directory
-SRC_DIRS = \
-
+
+
-        
-################################################################

trunk/applications/osgdem/GNUmakefile

@@ -5 +5 @@
-        osgdem.cpp\
-
-osgTerrain
+vpb
-
-INSTFILES = \

trunk/applications/osgdem/GNUmakefile.inst

@@ -6 +6 @@
-
-
-osgTerrain
+vpb
-
-EXEC = osgdem

trunk/applications/osgdem/osgdem.cpp

@@ -36 +36 @@
-#include <osg/Switch>
-
-osgTerrain
+vpb
-
-#include <iostream>
@@ -112 +112 @@
-
-void processFile(std::string filename,
-
+
+
-                   std::string currentCS, 
-                   osg::Matrixd &geoTransform,
@@ -119 +120 @@
-                   bool minmaxLevelSet, unsigned int min_level, unsigned int max_level,
-                   unsigned int layerNum,
-osgTerrain
+vpb
-
-    if(filename.empty()) return;
@@ -125 +126 @@
-    if(osgDB::fileType(filename) == osgDB::REGULAR_FILE) {
-        
-osgTerrain::DataSet::Source* source = new osgTerrain
+vpb::DataSet::Source* source = new vpb
-        if (source)
-        {
+            // set type of data
+            source->_dataType = dataType;
+
-            if (!currentCS.empty())
-            {
-                std::cout<<"source->setCoordySystem "<<currentCS<<std::endl;
-osgTerrain
+vpb
-                source->setCoordinateSystem(currentCS);
-            } 
@@ -139 +143 @@
-                std::cout<<"source->setGeoTransform "<<geoTransform<<std::endl;
-                source->setGeoTransformPolicy(geoTransformScale ? 
-osgTerrain
-osgTerrain
+vpb
+vpb
-                source->setGeoTransform(geoTransform);
-            }
@@ -164 +168 @@
-            if((*i != ".") && (*i != "..")) {
-                fullfilename = filename + '/' + *i;
-
+dataType, 
-                            geoTransform, geoTransformSet, geoTransformScale, 
-                            minmaxLevelSet, min_level, max_level,
@@ -211 +215 @@
-    arguments.getApplicationUsage()->addCommandLineOption("--RGB-16","Use 16bit RGBA destination imagery");     
-    arguments.getApplicationUsage()->addCommandLineOption("--RGBA","Use 32bit RGBA destination imagery");     
+    arguments.getApplicationUsage()->addCommandLineOption("--vector","Interpret input as a vector data set");
+    arguments.getApplicationUsage()->addCommandLineOption("--raster","Interpret input as a raster data set (default)");
-    arguments.getApplicationUsage()->addCommandLineOption("--max-visible-distance-of-top-level","Set the maximum visible distance that the top most tile can be viewed at");     
-    arguments.getApplicationUsage()->addCommandLineOption("--no-terrain-simplification","Switch off terrain simplification.");
@@ -235 +241 @@
-    arguments.getApplicationUsage()->addCommandLineOption("-O","string option to pass to write plugins, use \" \" for multiple options");    
-    // create DataSet.
-osgTerrain::DataSet> dataset = new osgTerrain
+vpb::DataSet> dataset = new vpb
-
-
@@ -241 +247 @@
-    while (arguments.read("-e",x,y,w,h))
-    {
-osgTerrain
+vpb
-    }
-    
-    while (arguments.read("--HEIGHT_FIELD"))
-    {
-osgTerrain
+vpb
-    }
-
-    while (arguments.read("--POLYGONAL"))
-    {
-osgTerrain
+vpb
-    }
-
-    while (arguments.read("--LOD"))
-    {
-osgTerrain
+vpb
-    }
-    
-    while (arguments.read("--PagedLOD"))
-    {
-osgTerrain
-
-
-osgTerrain
-osgTerrain
-osgTerrain
-osgTerrain
-osgTerrain
-osgTerrain
-
-osgTerrain
-osgTerrain
-osgTerrain
+vpb
+
+
+vpb
+vpb
+vpb
+vpb
+vpb
+vpb
+
+vpb
+vpb
+vpb
-
-    float maxAnisotropy;
@@ -392 +398 @@
-    unsigned int min_level=0, max_level=maximumPossibleLevel;
-    unsigned int currentLayerNum = 0;
+    vpb::DataSet::SpatialProperties::DataType dataType = vpb::DataSet::SpatialProperties::RASTER;
-         
-    int pos = 1;
@@ -400 +407 @@
-        if (arguments.read(pos, "--cs",def))
-        {
-osgTerrain
+vpb
-            std::cout<<"--cs \""<<def<<"\" converted to "<<currentCS<<std::endl;
-        }
@@ -431 +438 @@
-        else if (arguments.read(pos, "--bluemarble-east"))
-        {
-osgTerrain
+vpb
-            geoTransformSet = true;
-            geoTransformScale = true;
@@ -442 +449 @@
-        else if (arguments.read(pos, "--bluemarble-west"))
-        {
-osgTerrain
+vpb
-            geoTransformSet = true;
-            geoTransformScale = true;
@@ -453 +460 @@
-        else if (arguments.read(pos, "--whole-globe"))
-        {
-osgTerrain
+vpb
-            geoTransformSet = true;
-            geoTransformScale = true;
@@ -566 +573 @@
-        }
-
+        else if (arguments.read(pos, "--vector"))
+        {
+            dataType = vpb::DataSet::SpatialProperties::VECTOR;
+            std::cout<<"--vector input data"<<std::endl;
+        }
+
+        else if (arguments.read(pos, "--raster"))
+        {
+            dataType = vpb::DataSet::SpatialProperties::RASTER;
+            std::cout<<"--raster input data"<<std::endl;
+        }
+
-        else if (arguments.read(pos, "-d",filename))
-        {
-            std::cout<<"-d "<<filename<<std::endl;
-osgTerrain::DataSet::Source::HEIGHT_FIELD
+vpb::DataSet::Source::HEIGHT_FIELD, dataType
-                        geoTransform, geoTransformSet, geoTransformScale,
-                        minmaxLevelSet, min_level, max_level,
@@ -583 +602 @@
-            geoTransformScale = false;
-            geoTransform.makeIdentity();
-
+
-        }
-        else if (arguments.read(pos, "-t",filename))
-        {
-            std::cout<<"-t "<<filename<<std::endl;
-osgTerrain::DataSet::Source::IMAGE
+vpb::DataSet::Source::IMAGE, dataType
-                        geoTransform, geoTransformSet, geoTransformScale, 
-                        minmaxLevelSet, min_level, max_level, 
@@ -602 +621 @@
-            geoTransformScale = false;
-            geoTransform.makeIdentity();            
+            dataType = vpb::DataSet::SpatialProperties::RASTER;
-        }
-/*        
@@ -607 +627 @@
-        {
-            std::cout<<"-m "<<filename<<std::endl;
-osgTerrain
+vpb
-                        geoTransform, geoTransformSet, geoTransformScale, 
-                        minmaxLevelSet, min_level, max_level,