diff --git a/openspace-data b/openspace-data index 66d2872808..1eeafe77a9 160000 --- a/openspace-data +++ b/openspace-data @@ -1 +1 @@ -Subproject commit 66d2872808c646bd9c142b37e5bdf44d8c062b11 +Subproject commit 1eeafe77a9d9c961308135e868ba02d04105a2db diff --git a/src/interaction/interactionhandler.cpp b/src/interaction/interactionhandler.cpp index 7f9032adf9..aa255be9e9 100644 --- a/src/interaction/interactionhandler.cpp +++ b/src/interaction/interactionhandler.cpp @@ -353,15 +353,23 @@ void InteractionHandler::keyboardCallback(int key, int action) { if (key == SGCT_KEY_F) { PowerScaledScalar dist(speed * dt, 0.0); distance(dist); - } - if (key == SGCT_KEY_T) { - PowerScaledScalar dist(-speed * 100.0 * dt, 0.0); - distance(dist); - } - if (key == SGCT_KEY_G) { - PowerScaledScalar dist(speed * 100.0 * dt, 0.0); - distance(dist); - } + } + if (key == SGCT_KEY_T) { + PowerScaledScalar dist(-speed * 100.0 * dt, 0.0); + distance(dist); + } + if (key == SGCT_KEY_G) { + PowerScaledScalar dist(speed * 100.0 * dt, 0.0); + distance(dist); + } + if (key == SGCT_KEY_Y) { + PowerScaledScalar dist(-speed * 100.0 * dt, 2.0); + distance(dist); + } + if (key == SGCT_KEY_H) { + PowerScaledScalar dist(speed * 100.0 * dt, 2.0); + distance(dist); + } } /* if (key == '1') { diff --git a/src/rendering/planets/simplespheregeometry.cpp b/src/rendering/planets/simplespheregeometry.cpp index e016f37f4c..bd08f2368f 100644 --- a/src/rendering/planets/simplespheregeometry.cpp +++ b/src/rendering/planets/simplespheregeometry.cpp @@ -65,14 +65,14 @@ SimpleSphereGeometry::SimpleSphereGeometry(const ghoul::Dictionary& dictionary) else _radius = radius; - int segments; + double segments; success = dictionary.getValueSafe(keySegments, segments); if (!success) { LERROR("SimpleSphereGeometry of '" << name << "' did not provide a key '" << keySegments << "'"); } else - _segments = segments; + _segments = static_cast(segments); addProperty(_radius); _radius.onChange(std::bind(&SimpleSphereGeometry::createSphere, this)); diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp index 95649b45e5..1f0cca415d 100644 --- a/src/rendering/renderengine.cpp +++ b/src/rendering/renderengine.cpp @@ -169,7 +169,7 @@ void RenderEngine::postSynchronizationPreDraw() // Move time forward. //_runtimeData->advanceTimeBy(1, DAY); - _runtimeData->advanceTimeBy(1, HOUR); + //_runtimeData->advanceTimeBy(1, HOUR); //_runtimeData->advanceTimeBy(30, MINUTE); //_runtimeData->advanceTimeBy(1, MILLISECOND);