Remove warnings

This commit is contained in:
Alexander Bock
2018-09-01 21:48:53 -04:00
parent 518b43db02
commit 35855de9f5
4 changed files with 17 additions and 11 deletions
+1 -1
View File
@@ -39,7 +39,7 @@
#include <ghoul/logging/logmanager.h>
#include <ghoul/logging/consolelog.h>
int main(int argc, char** argv) {
int main(int, char**) {
using namespace openspace;
ghoul::initialize();
@@ -855,9 +855,9 @@ void RenderableBillboardsCloud::renderLabels(const RenderData& data,
scaledPos,
pair.second,
textColor,
pow(10.0, _textSize.value()),
_textMinSize,
_textMaxSize,
pow(10.f, _textSize.value()),
static_cast<int>(_textMinSize),
static_cast<int>(_textMaxSize),
modelViewProjectionMatrix,
orthoRight,
orthoUp,
@@ -897,7 +897,7 @@ void RenderableBillboardsCloud::render(const RenderData& data, RendererTasks&) {
float fadeInVariable = 1.f;
if (!_disableFadeInDistance) {
float distCamera = glm::length(data.camera.positionVec3());
float distCamera = static_cast<float>(glm::length(data.camera.positionVec3()));
const glm::vec2 fadeRange = _fadeInDistance;
const float a = 1.f / ((fadeRange.y - fadeRange.x) * scale);
const float b = -(fadeRange.x / (fadeRange.y - fadeRange.x));
+6 -2
View File
@@ -699,8 +699,12 @@ void OpenSpaceEngine::loadSingleAsset(const std::string& assetPath) {
progressInfo.progress = (*it)->progress();
if ((*it)->nTotalBytesIsKnown()) {
progressInfo.currentSize = static_cast<float>((*it)->nSynchronizedBytes());
progressInfo.totalSize = static_cast<float>((*it)->nTotalBytes());
progressInfo.currentSize = static_cast<int>(
(*it)->nSynchronizedBytes()
);
progressInfo.totalSize = static_cast<int>(
(*it)->nTotalBytes()
);
}
loading = true;
+6 -4
View File
@@ -117,10 +117,12 @@ void KeyframeNavigator::updateCamera(Camera& camera) {
// We want to affect view scaling, such that we achieve
// logarithmic interpolation of distance to an imagined focus node.
// To do this, we interpolate the scale reciprocal logarithmically.
const float prevInvScaleExp = glm::log(1.0 / prevPose.scale);
const float nextInvScaleExp = glm::log(1.0 / nextPose.scale);
const float interpolatedInvScaleExp = prevInvScaleExp * (1 - t) + nextInvScaleExp * t;
camera.setScaling(1.0 / glm::exp(interpolatedInvScaleExp));
const float prevInvScaleExp = glm::log(1.f / prevPose.scale);
const float nextInvScaleExp = glm::log(1.f / nextPose.scale);
const float interpolatedInvScaleExp = static_cast<float>(
prevInvScaleExp * (1 - t) + nextInvScaleExp * t
);
camera.setScaling(1.f / glm::exp(interpolatedInvScaleExp));
}
Timeline<KeyframeNavigator::CameraPose>& KeyframeNavigator::timeline() {