mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-26 05:58:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Some changes to PR #432

Browse Source
This commit is contained in:
Alexander Bock
2017-12-18 16:25:02 -05:00
parent a3185a0cfa
commit db668b5342
31 changed files with 1437 additions and 1315 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/geometry/ellipsoid.cpp
+2 -1
View File
@@ -167,7 +167,8 @@ glm::dvec3 Ellipsoid::cartesianPosition(const Geodetic3& geodetic3) const {
}
void Ellipsoid::setShadowConfigurationArray(
const std::vector<Ellipsoid::ShadowConfiguration>& shadowConfArray) {
const std::vector<Ellipsoid::ShadowConfiguration>& shadowConfArray)
{
_shadowConfArray = shadowConfArray;
}
modules/globebrowsing/geometry/ellipsoid.h
+3 -1
View File
@@ -92,7 +92,9 @@ public:
glm::dvec3 cartesianSurfacePosition(const Geodetic2& geodetic2) const;
glm::dvec3 cartesianPosition(const Geodetic3& geodetic3) const;
void setShadowConfigurationArray(const std::vector<Ellipsoid::ShadowConfiguration>& shadowConfArray);
void setShadowConfigurationArray(
const std::vector<Ellipsoid::ShadowConfiguration>& shadowConfArray
);
std::vector<Ellipsoid::ShadowConfiguration> shadowConfigurationArray() const;
bool hasEclipseShadows() const;
modules/globebrowsing/globes/chunkedlodglobe.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
modules/globebrowsing/globes/renderableglobe.h
+1 -2
View File
@@ -82,7 +82,7 @@ public:
properties::BoolProperty eclipseShadowsEnabled;
properties::BoolProperty eclipseHardShadows;
properties::FloatProperty lodScaleFactor;
properties::FloatProperty cameraMinHeight;
properties::FloatProperty cameraMinHeight;
properties::FloatProperty orenNayarRoughness;
};
@@ -149,7 +149,6 @@ private:
DebugProperties _debugProperties;
GeneralProperties _generalProperties;
properties::PropertyOwner _debugPropertyOwner;
};
} // namespace openspace::globebrowsing