mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-03 19:08:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Feature/warnings (#1425)

Browse Source 
* Remove MSVC, GCC, Clang compiler warnings
* Remove cppcheck warnings
This commit is contained in:
Alexander Bock
2020-12-07 23:43:05 +01:00
committed by GitHub
parent 51470c0a0d
commit 86bb19d81c
94 changed files with 392 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/rendering/screenspacerenderable.cpp
View File

@@ -316,16 +316,16 @@ std::unique_ptr<ScreenSpaceRenderable> ScreenSpaceRenderable::createFromDictiona
}
std::string ScreenSpaceRenderable::makeUniqueIdentifier(std::string name) {
std::vector<ScreenSpaceRenderable*> r =
std::vector<ScreenSpaceRenderable*> rs =
global::renderEngine->screenSpaceRenderables();
auto nameTaken = [&r](const std::string& name) {
bool nameTaken = std::any_of(
r.begin(),
r.end(),
[&name](ScreenSpaceRenderable* r) { return r->identifier() == name; }
auto nameTaken = [&rs](const std::string& n) {
const bool taken = std::any_of(
rs.cbegin(),
rs.cend(),
[&n](ScreenSpaceRenderable* r) { return r->identifier() == n; }
);
return nameTaken;
return taken;
};
std::string baseName = name;
@@ -428,15 +428,12 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
}
if (dictionary.hasKey(UsePerspectiveProjectionInfo.identifier)) {
_usePerspectiveProjection = static_cast<bool>(
dictionary.value<bool>(UsePerspectiveProjectionInfo.identifier)
);
_usePerspectiveProjection =
dictionary.value<bool>(UsePerspectiveProjectionInfo.identifier);
}
if (dictionary.hasKey(FaceCameraInfo.identifier)) {
_faceCamera = static_cast<bool>(
dictionary.value<bool>(FaceCameraInfo.identifier)
);
_faceCamera = dictionary.value<bool>(FaceCameraInfo.identifier);
}
if (dictionary.hasKeyAndValue<std::string>(KeyTag)) {
@@ -543,9 +540,7 @@ void ScreenSpaceRenderable::createShaders() {
}
glm::mat4 ScreenSpaceRenderable::scaleMatrix() {
glm::vec2 resolution = global::windowDelegate->currentDrawBufferResolution();
//to scale the plane
// to scale the plane
float textureRatio =
static_cast<float>(_objectSize.y) / static_cast<float>(_objectSize.x);