mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-03 01:09:34 -05:00
macos compile and build (still needs ring shader const fix)
This commit is contained in:
@@ -186,7 +186,7 @@ namespace {
|
||||
|
||||
constexpr openspace::properties::Property::PropertyInfo ShadowMappingInfo = {
|
||||
"ShadowMapping",
|
||||
"Shadow Mapping",
|
||||
"Shadow-Mapping",
|
||||
"Enables shadow mapping algorithm. Used by renderable rings too."
|
||||
};
|
||||
|
||||
@@ -303,7 +303,7 @@ BoundingHeights boundingHeightsForChunk(const Chunk& chunk, const LayerManager&
|
||||
const bool hasTileMetaData = chunkTile.tile.metaData.has_value();
|
||||
|
||||
if (goodTile && hasTileMetaData) {
|
||||
const TileMetaData& tileMetaData = chunkTile.tile.metaData.value();
|
||||
const TileMetaData& tileMetaData = *chunkTile.tile.metaData;
|
||||
|
||||
const float minValue = settings->performLayerSettings(
|
||||
tileMetaData.minValues[HeightChannel]
|
||||
@@ -524,7 +524,7 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
|
||||
FloatProperty(OrenNayarRoughnessInfo, 0.f, 0.f, 1.f),
|
||||
IntProperty(NActiveLayersInfo, 0, 0, OpenGLCap.maxTextureUnits() / 3)
|
||||
})
|
||||
, _shadowMappingPropertyOwner({ "Shadow Mapping" })
|
||||
, _shadowMappingPropertyOwner({ "Shadow-Mapping" })
|
||||
, _debugPropertyOwner({ "Debug" })
|
||||
, _grid(DefaultSkirtedGridSegments, DefaultSkirtedGridSegments)
|
||||
, _leftRoot(Chunk(LeftHemisphereIndex))
|
||||
|
||||
@@ -166,7 +166,7 @@ documentation::Documentation ShadowComponent::Documentation() {
|
||||
}
|
||||
|
||||
ShadowComponent::ShadowComponent(const ghoul::Dictionary& dictionary)
|
||||
: properties::PropertyOwner({ "Shadows Component" })
|
||||
: properties::PropertyOwner({ "Shadows-Component" })
|
||||
, _saveDepthTexture(SaveDepthTextureInfo)
|
||||
, _distanceFraction(DistanceFractionInfo, 20, 1, 10000)
|
||||
, _enabled({ "Enabled", "Enabled", "Enable/Disable Shadows" }, true)
|
||||
|
||||
@@ -168,7 +168,7 @@ bool initTexturesFromLoadedData(DefaultTileProvider& t) {
|
||||
if (tile) {
|
||||
const cache::ProviderTileKey key = { tile->tileIndex, t.uniqueIdentifier };
|
||||
ghoul_assert(!t.tileCache->exist(key), "Tile must not be existing in cache");
|
||||
t.tileCache->createTileAndPut(key, std::move(tile.value()));
|
||||
t.tileCache->createTileAndPut(key, std::move(*tile));
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user