mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-12 16:28:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Feature/alex is flying (#729)

Browse Source 
* Correctly specify maximum text sizes for grids
 * Use StaticScale transformations in grids and remove fixed radius
 * Fix Verifier to let grids accept non-integer min and max sizes
 * Add a new scale that changes it's value based on the current time and a reference time
 * Add a proper radiosphere that grows in real time (closes #728)
 * Add default globe customization folders to the assets (closes #724)
 * Add new dashboarditem that shows the current camera velocity (closes #702)
 * Add ability to add interesting times to a scene (closes #715)
 * Reenable keybindings gui element
 * Add ShortcutManager
 * Add ability to bind keyless keybinds to use as arbitrary shortcuts (closes #710)
This commit is contained in:
Alexander Bock
2018-10-08 03:00:35 -04:00
committed by GitHub
parent 53eebb05ba
commit 8ddc794cda
31 changed files with 1063 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
modules/base/rendering/renderablesphericalgrid.cpp
View File

@@ -62,12 +62,6 @@ namespace {
"Line Width",
"This value specifies the line width of the spherical grid."
};
constexpr openspace::properties::Property::PropertyInfo RadiusInfo = {
"Radius",
"Radius",
"This value specifies the radius of the grid."
};
} // namespace
namespace openspace {
@@ -101,12 +95,6 @@ documentation::Documentation RenderableSphericalGrid::Documentation() {
new DoubleVerifier,
Optional::Yes,
LineWidthInfo.description
},
{
RadiusInfo.identifier,
new DoubleVerifier,
Optional::Yes,
RadiusInfo.description
}
}
};
@@ -125,7 +113,6 @@ RenderableSphericalGrid::RenderableSphericalGrid(const ghoul::Dictionary& dictio
)
, _segments(SegmentsInfo, 36, 4, 200)
, _lineWidth(LineWidthInfo, 0.5f, 0.f, 20.f)
, _radius(RadiusInfo, 1e20f, 1.f, 1e35f)
{
documentation::testSpecificationAndThrow(
Documentation(),
@@ -159,14 +146,6 @@ RenderableSphericalGrid::RenderableSphericalGrid(const ghoul::Dictionary& dictio
);
}
addProperty(_lineWidth);
if (dictionary.hasKey(RadiusInfo.identifier)) {
_radius = static_cast<float>(
dictionary.value<double>(RadiusInfo.identifier)
);
}
_radius.onChange([&]() { _gridIsDirty = true; });
addProperty(_radius);
}
bool RenderableSphericalGrid::isReady() const {
@@ -257,7 +236,6 @@ void RenderableSphericalGrid::update(const UpdateData&) {
int nr = 0;
const float fsegments = static_cast<float>(_segments);
const float r = _radius;
for (int nSegment = 0; nSegment <= _segments; ++nSegment) {
// define an extra vertex around the y-axis due to texture mapping
@@ -271,9 +249,9 @@ void RenderableSphericalGrid::update(const UpdateData&) {
// azimuth angle (east to west)
const float phi = fj * glm::pi<float>() * 2.0f / fsegments; // 0 -> 2*PI
const float x = r * sin(phi) * sin(theta); //
const float y = r * cos(theta); // up
const float z = r * cos(phi) * sin(theta); //
const float x = sin(phi) * sin(theta); //
const float y = cos(theta); // up
const float z = cos(phi) * sin(theta); //
glm::vec3 normal = glm::vec3(x, y, z);
if (!(x == 0.f && y == 0.f && z == 0.f)) {