Changeset 869

Show
Ignore:
Timestamp:
01/29/08 14:13:09
Author:
robert
Message:

Fixed the handling of input data which has coordinate system assigned to it.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/vpb/Commandline.cpp

    r859 r869  
    133133    if (!currentCS.empty() || geoTransformSet) 
    134134    { 
    135         osg::ref_ptr<osg::Object> loadedObject = osgDB::readObjectFile(filename+".gdal"); 
    136         osgTerrain::Layer* loadedLayer = dynamic_cast<osgTerrain::Layer*>(loadedObject.get()); 
    137  
    138         if (loadedLayer) 
     135        osg::ref_ptr<osgTerrain::ProxyLayer> loadedLayer = new osgTerrain::ProxyLayer; 
     136        loadedLayer->setFileName(filename); 
     137 
     138        if (loadedLayer.valid()) 
    139139        { 
    140140            osgTerrain::Locator* locator = loadedLayer->getLocator(); 
    …… 
    166166            if (max_level!=maximumPossibleLevel) loadedLayer->setMaxLevel(max_level); 
    167167 
    168             compositeLayer->addLayer(loadedLayer); 
    169         }                     
     168            log(osg::NOTICE,"loaded layer %s",filename.c_str()); 
     169 
     170            compositeLayer->addLayer(loadedLayer.get()); 
     171        } 
     172        else 
     173        { 
     174            log(osg::NOTICE,"Error: unable to load %s",filename.c_str()); 
     175        }  
    170176    } 
    171177    else 

  • trunk/src/vpb/DataSet.cpp

    r862 r869  
    20842084 
    20852085    osgTerrain::CompositeLayer* compositeLayer = dynamic_cast<osgTerrain::CompositeLayer*>(layer); 
     2086    if (compositeLayer) 
    20862087    { 
    20872088        for(unsigned int i=0; i<compositeLayer->getNumLayers();++i)