Revision 1226352

Go back to digest for 3rd April 2011

Features in Graphics

Dennis Nienhüser committed changes in /branches/marble/marble-1.1:

Allow using absolute source directories in texture layers in .dgml files.
Extend .dgml by a tileSize tag (width and height attribute), usable inside textureLayer tags. Such .dgml files are backwards compatible.
Handle 'base tile missing' case more gracefully and return an empty image instead of triggering an assertion.
Move the default tile size (675) to global.h and replace hardcoded default tile sizes with it.

REVIEW: 6334
Backport of commit 1217541.

File Changes

Added 2 files
  • /branches/marble/marble-1.1/src/lib/geodata/handlers/dgml
  •   /DgmlTileSizeTagHandler.cpp
  •   /DgmlTileSizeTagHandler.h
Modified 13 files
  • /branches/marble/marble-1.1
  •   /src/lib/FileStoragePolicy.cpp
  •   /src/lib/global.h
  •   /src/lib/ImageLoadThread.cpp
  •   /src/lib/TileCreator.cpp
  •   /src/lib/TileLoader.cpp
  •   /data/maps/earth/bluemarble/bluemarble.dgml
  •   /data/maps/earth/openstreetmap/openstreetmap.dgml
  •   /src/lib/geodata/scene/GeoSceneTexture.cpp
  •   /src/lib/geodata/scene/GeoSceneTexture.h
  •   /src/lib/geodata/handlers/dgml/DgmlAttributeDictionary.cpp
  •   /src/lib/geodata/handlers/dgml/DgmlAttributeDictionary.h
  •   /src/lib/geodata/handlers/dgml/DgmlElementDictionary.cpp
  •   /src/lib/geodata/handlers/dgml/DgmlElementDictionary.h
15 files changed in total