mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-04-23 20:50:59 -05:00
Feature/globebrowsing (#281)
* Solve bug related to corrupted texture tiles for certain sizes. * Regard layer settings when sampling height map. * Make Tile in to a class instead of a struct. * Memory aware lru cache. Needs cleanup. * Clean up and comment. * Clean up and comment. * Clean up * Clean up and comment. * Fix compilation error on Windows. * Specify data type explicitly in GDAL xml config files for Utah height maps. Closes #242 * Update the key type for the memory aware lru cache and use a unordered map instead of a map. * Solve pixel row size bug. * Solve initialization bug. * Add cache size as property of the globe browsing module. * Use memory aware tile cache for text tile provider. * Log GDAL errors as GHOUL messages * Add the ability to toggle tile level limiting by available data * Add ability to toggle GDAL logging * Add lock guard to memory aware tile cache * create base class rawtiledatareader that can be extended with different implementations than GDAL. * Let GdalWrapper take care of global GDAL settings. * Move iodescription to separate file * Move some functionality from gdalrawtiledatareader to rawtiledatareader * Move functionality from gdalrawtiledatareader to rawtiledatareader. * GDAL is no longer a necessary dependency for the globebrowsing module. However to read tiles, the SimpleRawTileDataReader needs to be implemented. Otherwise GDAL is needed. * Add ifdef check for GLOBEBROWSING_USE_GDAL * Implement SimpleRawTileDataReader. Currently can only read pow 2 textures. * Change ints to unsigned long longs * Limit number of texture creations per tile provider per frame * Solve linker error on windows * Fix Windows build errors * Fix crash in reading local patches * Update lodglobe descriptions * Abstract away overviews in gdal raw tile data reader * Update Mars and Moon configs. * Update screenshot script * Update ghoul version * Remove use of interaction depth below ellipsoid * Normalize direction vector * Use scale for distance swotch * Go back to use of interaction depth below ellipsoid * Fix comments on pull request. * TileProviderByLevel error does not propagate up. * Comment on mars and moon mod file * Add model space cut off level as a property * Update ChunkTile struct * Minor clean up * Go back tu constructor for ChunkTile
This commit is contained in:
@@ -61,11 +61,12 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
|
||||
BoolProperty("showHeightIntensities", "show height intensities", false),
|
||||
BoolProperty("performFrustumCulling", "perform frustum culling", true),
|
||||
BoolProperty("performHorizonCulling", "perform horizon culling", true),
|
||||
BoolProperty("levelByProjectedAreaElseDistance", "level by projected area (else distance)",false),
|
||||
BoolProperty("levelByProjectedAreaElseDistance", "level by projected area (else distance)", true),
|
||||
BoolProperty("resetTileProviders", "reset tile providers", false),
|
||||
BoolProperty("toggleEnabledEveryFrame", "toggle enabled every frame", false),
|
||||
BoolProperty("collectStats", "collect stats", false),
|
||||
BoolProperty("onlyModelSpaceRendering", "Only Model Space Rendering", false)
|
||||
BoolProperty("limitLevelByAvailableData", "Limit level by available data", true),
|
||||
IntProperty("modelSpaceRenderingCutoffLevel", "Model Space Rendering Cutoff Level", 10, 1, 22)
|
||||
})
|
||||
, _texturePropertyOwner("Textures")
|
||||
{
|
||||
@@ -84,16 +85,21 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
|
||||
dictionary.getValue(keySegmentsPerPatch, patchSegmentsd);
|
||||
int patchSegments = patchSegmentsd;
|
||||
|
||||
dictionary.getValue(keyInteractionDepthBelowEllipsoid,
|
||||
_interactionDepthBelowEllipsoid);
|
||||
if (!dictionary.getValue(keyInteractionDepthBelowEllipsoid,
|
||||
_interactionDepthBelowEllipsoid)) {
|
||||
_interactionDepthBelowEllipsoid = 0;
|
||||
}
|
||||
|
||||
float cameraMinHeight;
|
||||
dictionary.getValue(keyCameraMinHeight, cameraMinHeight);
|
||||
_generalProperties.cameraMinHeight.set(cameraMinHeight);
|
||||
|
||||
// Init layer manager
|
||||
ghoul::Dictionary layersDictionary;
|
||||
if (!dictionary.getValue(keyLayers, layersDictionary))
|
||||
throw ghoul::RuntimeError(std::string(keyLayers) + " must be specified specified!");
|
||||
if (!dictionary.getValue(keyLayers, layersDictionary)) {
|
||||
throw ghoul::RuntimeError(
|
||||
std::string(keyLayers) + " must be specified specified!");
|
||||
}
|
||||
|
||||
_layerManager = std::make_shared<LayerManager>(layersDictionary);
|
||||
|
||||
@@ -127,8 +133,9 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
|
||||
_debugPropertyOwner.addProperty(_debugProperties.resetTileProviders);
|
||||
_debugPropertyOwner.addProperty(_debugProperties.toggleEnabledEveryFrame);
|
||||
_debugPropertyOwner.addProperty(_debugProperties.collectStats);
|
||||
_debugPropertyOwner.addProperty(_debugProperties.onlyModelSpaceRendering);
|
||||
|
||||
_debugPropertyOwner.addProperty(_debugProperties.limitLevelByAvailableData);
|
||||
_debugPropertyOwner.addProperty(_debugProperties.modelSpaceRenderingCutoffLevel);
|
||||
|
||||
addPropertySubOwner(_debugPropertyOwner);
|
||||
addPropertySubOwner(_layerManager.get());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user