mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-12 14:29:42 -05:00
Remove warnings
This commit is contained in:
+1
-1
@@ -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));
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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() {
|
||||
|
||||
Reference in New Issue
Block a user