Changeset 13041 for OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osgTerrain/TerrainTile.cpp
- Timestamp:
- 03/21/12 18:36:20 (14 months ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osgTerrain/TerrainTile.cpp
r12292 r13041 82 82 83 83 terrainTile.setElevationLayer(proxyLayer); 84 84 85 85 fr += 2; 86 86 … … 115 115 if (firstMatched) 116 116 { 117 fr[1].getUInt(layerNum); 117 fr[1].getUInt(layerNum); 118 118 ++fr; 119 119 } … … 153 153 154 154 terrainTile.setColorLayer(layerNum, proxyLayer); 155 } 156 155 } 156 157 157 fr += 2; 158 158 … … 198 198 } 199 199 200 if (osgTerrain::TerrainTile::getTileLoadedCallback().valid()) 200 if (osgTerrain::TerrainTile::getTileLoadedCallback().valid()) 201 201 osgTerrain::TerrainTile::getTileLoadedCallback()->loaded(&terrainTile, fr.getOptions()); 202 202 … … 229 229 230 230 fw.moveIn(); 231 231 232 232 const osgTerrain::ProxyLayer* proxyLayer = dynamic_cast<const osgTerrain::ProxyLayer*>(terrainTile.getElevationLayer()); 233 233 if (proxyLayer) … … 244 244 { 245 245 fw.indent()<<"MinLevel "<<proxyLayer->getMinLevel()<<std::endl; 246 } 246 } 247 247 248 248 if (proxyLayer->getMaxLevel()!=MAXIMUM_NUMBER_OF_LEVELS) 249 249 { 250 250 fw.indent()<<"MaxLevel "<<proxyLayer->getMaxLevel()<<std::endl; 251 } 251 } 252 252 253 253 fw.indent()<<"ProxyLayer "<<proxyLayer->getFileName()<<std::endl; … … 279 279 280 280 fw.moveIn(); 281 281 282 282 const osgTerrain::ProxyLayer* proxyLayer = dynamic_cast<const osgTerrain::ProxyLayer*>(layer); 283 283 if (proxyLayer) … … 292 292 { 293 293 fw.indent()<<"MinLevel "<<proxyLayer->getMinLevel()<<std::endl; 294 } 294 } 295 295 296 296 if (proxyLayer->getMaxLevel()!=MAXIMUM_NUMBER_OF_LEVELS) 297 297 { 298 298 fw.indent()<<"MaxLevel "<<proxyLayer->getMaxLevel()<<std::endl; 299 } 299 } 300 300 301 301 if (!proxyLayer->getFileName().empty()) fw.indent()<<"ProxyLayer "<<proxyLayer->getFileName()<<std::endl; … … 315 315 { 316 316 fw.writeObject(*terrainTile.getTerrainTechnique()); 317 } 317 } 318 318 319 319 fw.precision(prec); 320 320 321 321 return true; 322 322 }
