diff --git a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp index c2a79f07b5..eb5e7c32d8 100644 --- a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp +++ b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp @@ -1026,7 +1026,8 @@ std::vector RenderableBillboardsCloud::createDataSlice() { case DistanceUnit::Gigalightyear: unitValue = 6; break; - default: ghoul::MissingCaseException(); + default: + throw ghoul::MissingCaseException(); } glm::vec4 position(transformedPos, unitValue); @@ -1057,7 +1058,7 @@ std::vector RenderableBillboardsCloud::createDataSlice() { } if (_isColorMapExact) { - int colorIndex = variableColor + cmin; + int colorIndex = static_cast(variableColor + cmin); for (int j = 0; j < 4; ++j) { result.push_back(_colorMap.entries[colorIndex][j]); } @@ -1090,11 +1091,14 @@ std::vector RenderableBillboardsCloud::createDataSlice() { } else { float ncmap = static_cast(_colorMap.entries.size()); - float normalization = ((cmax != cmin) && (ncmap > 2)) ? - (ncmap - 2) / (cmax - cmin) : 0; - int colorIndex = (variableColor - cmin) * normalization + 1; + float normalization = ((cmax != cmin) && (ncmap > 2.f)) ? + (ncmap - 2.f) / (cmax - cmin) : 0; + int colorIndex = static_cast( + (variableColor - cmin) * normalization + 1.f + ); colorIndex = colorIndex < 0 ? 0 : colorIndex; - colorIndex = colorIndex >= ncmap ? ncmap - 1 : colorIndex; + colorIndex = colorIndex >= ncmap ? + static_cast(ncmap - 1.f) : colorIndex; for (int j = 0; j < 4; ++j) { result.push_back(_colorMap.entries[colorIndex][j]); diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.cpp b/modules/digitaluniverse/rendering/renderabledumeshes.cpp index 84bcfe2243..83e1dd0f7d 100644 --- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp +++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp @@ -358,7 +358,7 @@ void RenderableDUMeshes::renderLabels(const RenderData& data, const glm::vec3& orthoRight, const glm::vec3& orthoUp) { - float scale = toMeter(_unit); + float scale = static_cast(toMeter(_unit)); ghoul::fontrendering::FontRenderer::ProjectedLabelsInformation labelInfo; labelInfo.orthoRight = orthoRight; @@ -581,7 +581,7 @@ void RenderableDUMeshes::createMeshes() { LDEBUG("Creating planes"); for (std::pair& p : _renderingMeshesMap) { - float scale = toMeter(_unit); + float scale = static_cast(toMeter(_unit)); for (GLfloat& v : p.second.vertices) { v *= scale; diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp index e082cdac98..326a5a0f09 100644 --- a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp +++ b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp @@ -30,11 +30,11 @@ namespace { struct [[codegen::Dictionary(TileProviderByLevel)]] Parameters { int layerGroupID; - struct Providers { + struct Provider { int maxLevel [[codegen::greaterequal(0)]]; ghoul::Dictionary tileProvider; }; - std::vector levelTileProviders; + std::vector levelTileProviders; }; #include "tileproviderbylevel_codegen.cpp" } // namespace @@ -51,13 +51,14 @@ TileProviderByLevel::TileProviderByLevel(const ghoul::Dictionary& dictionary) { const Parameters p = codegen::bake(dictionary); layergroupid::GroupID layerGroup = static_cast(p.layerGroupID); - - for (Parameters::Providers p : p.levelTileProviders) { - p.tileProvider.setValue("LayerGroupID", static_cast(layerGroup)); - + + for (Parameters::Provider provider : p.levelTileProviders) { + ghoul::Dictionary& tileProviderDict = provider.tileProvider; + tileProviderDict.setValue("LayerGroupID", static_cast(layerGroup)); + layergroupid::TypeID typeID = layergroupid::TypeID::DefaultTileLayer; - if (p.tileProvider.hasValue("Type")) { - std::string type = p.tileProvider.value("Type"); + if (tileProviderDict.hasValue("Type")) { + std::string type = tileProviderDict.value("Type"); typeID = ghoul::from_string(type); if (typeID == layergroupid::TypeID::Unknown) { @@ -65,23 +66,24 @@ TileProviderByLevel::TileProviderByLevel(const ghoul::Dictionary& dictionary) { } } - std::unique_ptr tp = createFromDictionary(typeID, p.tileProvider); + std::unique_ptr tp = createFromDictionary(typeID, tileProviderDict); - std::string provId = p.tileProvider.value("Identifier"); + std::string provId = tileProviderDict.value("Identifier"); tp->setIdentifier(provId); - std::string providerName = p.tileProvider.value("Name"); + std::string providerName = tileProviderDict.value("Name"); tp->setGuiName(providerName); addPropertySubOwner(tp.get()); _levelTileProviders.push_back(std::move(tp)); // Ensure we can represent the max level - if (static_cast(_providerIndices.size()) < p.maxLevel) { - _providerIndices.resize(p.maxLevel + 1, -1); + if (static_cast(_providerIndices.size()) < provider.maxLevel) { + _providerIndices.resize(provider.maxLevel + 1, -1); } // map this level to the tile provider index - _providerIndices[p.maxLevel] = static_cast(_levelTileProviders.size()) - 1; + _providerIndices[provider.maxLevel] = + static_cast(_levelTileProviders.size()) - 1; } // Fill in the gaps (value -1 ) in provider indices, from back to end diff --git a/modules/volume/rawvolumereader.inl b/modules/volume/rawvolumereader.inl index 4963ff95d2..285a3b4a21 100644 --- a/modules/volume/rawvolumereader.inl +++ b/modules/volume/rawvolumereader.inl @@ -110,8 +110,10 @@ std::unique_ptr> RawVolumeReader::read(bool inve const glm::uvec3& coords = volume->indexToCoords(i); glm::uvec3 newcoords = glm::uvec3(coords.x, coords.y, dims.z - coords.z - 1); - size_t newIndex = volume->coordsToIndex(newcoords); - size_t oldIndex = volume->coordsToIndex(coords); + // @TODO (emmbr, 2022-02-10) Not sure why they are here, but commented them + // out for now as they aren't used + //size_t newIndex = volume->coordsToIndex(newcoords); + //size_t oldIndex = volume->coordsToIndex(coords); newVolume->set(newcoords, volume->get(coords)); } diff --git a/modules/volume/rendering/renderabletimevaryingvolume.cpp b/modules/volume/rendering/renderabletimevaryingvolume.cpp index 929f65e997..d10d7e3e56 100644 --- a/modules/volume/rendering/renderabletimevaryingvolume.cpp +++ b/modules/volume/rendering/renderabletimevaryingvolume.cpp @@ -142,7 +142,7 @@ namespace { std::optional opacity; // [[codegen::verbatim(StepSizeInfo.description)]] - std::optional stepSize; + std::optional stepSize; // [[codegen::verbatim(GridTypeInfo.description)]] std::optional gridType; diff --git a/src/scene/assetmanager.cpp b/src/scene/assetmanager.cpp index e58f1a2af8..f5bb5804d1 100644 --- a/src/scene/assetmanager.cpp +++ b/src/scene/assetmanager.cpp @@ -619,7 +619,7 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) { exportName = identifier; targetLocation = 1; } - + if (n == 2) { exportName = ghoul::lua::value( L, diff --git a/src/util/timemanager.cpp b/src/util/timemanager.cpp index 0a50fdd0c1..1af38c1529 100644 --- a/src/util/timemanager.cpp +++ b/src/util/timemanager.cpp @@ -422,7 +422,7 @@ void TimeManager::clearKeyframes() { void TimeManager::setTimeNextFrame(Time t) { OpenSpaceEngine::Mode m = global::openSpaceEngine->currentMode(); - if (global::openSpaceEngine->currentMode() == OpenSpaceEngine::Mode::CameraPath) { + if (m == OpenSpaceEngine::Mode::CameraPath) { LERROR("Cannot change simulation time during camera path"); return; }