mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-03-07 04:49:00 -06:00
Make regular settings default in RenderableGlobe and GDALWrapper
Fix spelling error in Asset Wrap initializeGL in try/catch block to catch error
This commit is contained in:
@@ -165,7 +165,7 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
|
||||
BoolProperty(HeightIntensityInfo, false),
|
||||
BoolProperty(FrustumCullingInfo, true),
|
||||
BoolProperty(HorizonCullingInfo, true),
|
||||
BoolProperty(LevelProjectedAreaInfo, true),
|
||||
BoolProperty(LevelProjectedAreaInfo, false),
|
||||
BoolProperty(ResetTileProviderInfo, false),
|
||||
BoolProperty(CollectStatsInfo, false),
|
||||
BoolProperty(LimitLevelInfo, true),
|
||||
|
||||
@@ -110,7 +110,7 @@ bool GdalWrapper::logGdalErrors() const {
|
||||
|
||||
GdalWrapper::GdalWrapper(size_t maximumCacheSize, size_t maximumMaximumCacheSize)
|
||||
: PropertyOwner({ "GdalWrapper" })
|
||||
, _logGdalErrors(LogGdalErrorInfo, true)
|
||||
, _logGdalErrors(LogGdalErrorInfo, false)
|
||||
, _gdalMaximumCacheSize (
|
||||
GdalMaximumCacheInfo,
|
||||
static_cast<int>(maximumCacheSize / (1024ULL * 1024ULL)), // Default
|
||||
|
||||
@@ -576,7 +576,7 @@ void Asset::deinitialize() {
|
||||
if (!isInitialized()) {
|
||||
return;
|
||||
}
|
||||
LDEBUG("Denitializing asset " << id());
|
||||
LDEBUG("Deintializing asset " << id());
|
||||
|
||||
// Perform inverse actions as in initialize, in reverse order (7 - 1)
|
||||
|
||||
|
||||
@@ -305,7 +305,11 @@ void Scene::update(const UpdateData& data) {
|
||||
_initializer->getInitializedNodes();
|
||||
|
||||
for (SceneGraphNode* node : initializedNodes) {
|
||||
node->initializeGL();
|
||||
try {
|
||||
node->initializeGL();
|
||||
} catch (const ghoul::RuntimeError& e) {
|
||||
LERRORC(e.component, e.message);
|
||||
}
|
||||
}
|
||||
if (_dirtyNodeRegistry) {
|
||||
updateNodeRegistry();
|
||||
|
||||
Reference in New Issue
Block a user