mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-16 08:51:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Read performshading from geojson file

Browse Source
This commit is contained in:
Emma Broman
2023-06-12 11:07:43 +02:00
parent 71827c2f1e
commit e5e5a22786
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/globebrowsing/src/geojson/geojsonproperties.cpp
View File

@@ -64,6 +64,8 @@ namespace geojson::propertykeys {
constexpr std::string_view AltitudeModeClamp = "clampToGround";
constexpr std::string_view AltitudeModeAbsolute = "absolute";
constexpr std::string_view AltitudeModeRelative = "relativeToGround";
constexpr std::string_view PerformShading = "performShading";
} // namespace geojson::propertykeys
namespace {
@@ -210,7 +212,8 @@ namespace {
constexpr openspace::properties::Property::PropertyInfo ExtrudeInfo = {
"Extrude",
"Extrude",
"If true, extrude the mesh or line to intersect the globe",
"If true, extrude the geometry to intersect the globe.Lines/polygons will be"
"extruded with polygons,and points with lines ",
openspace::properties::Property::Visibility::User
};
@@ -404,16 +407,16 @@ GeoJsonProperties::GeoJsonProperties()
addProperty(performShading);
altitudeModeOption.addOptions({
{ static_cast<int>(AltitudeMode::Absolute), "Absolute"},
{ static_cast<int>(AltitudeMode::Absolute), "Absolute" },
{ static_cast<int>(AltitudeMode::RelativeToGround), "Relative to Ground" }
//{ static_cast<int>(AltitudeMode::ClampToGround), "Clamp to Ground" } / TODO: add ClampToGround
});
});
addProperty(altitudeModeOption);
pointAnchorOption.addOptions({
{ static_cast<int>(PointTextureAnchor::Bottom), "Bottom"},
{ static_cast<int>(PointTextureAnchor::Bottom), "Bottom" },
{ static_cast<int>(PointTextureAnchor::Center), "Center" }
});
});
addProperty(pointAnchorOption);
addPropertySubOwner(tessellation);
@@ -555,6 +558,9 @@ GeoJsonOverrideProperties propsFromGeoJson(const geos::io::GeoJSONFeature& featu
));
}
}
else if (keyMatches(key, propertykeys::PerformShading, PerformShadingInfo)) {
result.performShading = value.getBoolean();
}
else if (keyMatches(key, propertykeys::Tessellate, TessellationEnabledInfo)) {
result.tessellationEnabled = value.getBoolean();
}
@@ -563,7 +569,13 @@ GeoJsonOverrideProperties propsFromGeoJson(const geos::io::GeoJSONFeature& featu
result.useTessellationLevel = true;
result.tessellationLevel = static_cast<int>(value.getNumber());
}
else if (keyMatches(key, propertykeys::TessellationMaxDistance, TessellationDistanceInfo)) {
else if (
keyMatches(
key,
propertykeys::TessellationMaxDistance,
TessellationDistanceInfo
))
{
result.tessellationDistance = static_cast<float>(value.getNumber());
}
};