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

Update GLFW to 3.03

Browse Source 
Remove some warnings
This commit is contained in:
Alexander Bock
2020-10-10 16:29:12 +02:00
parent 5b7679bab1
commit 9a030bd7db
7 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/OpenSpace/ext/sgct

Submodule apps/OpenSpace/ext/sgct updated: b43fdda4f4...1dd1160fbf

2
ext/ghoul

Submodule ext/ghoul updated: cc65370084...a1e2f46953

4
modules/base/dashboard/dashboarditemframerate.cpp
View File

@@ -322,8 +322,8 @@ glm::vec2 DashboardItemFramerate::size() const {
ZoneScoped
const FrametimeType t = FrametimeType(_frametimeType.value());
format(_buffer, t, _minDeltaTimeCache, _maxDeltaTimeCache);
std::string_view output = _buffer.data();
char* end = format(_buffer, t, _minDeltaTimeCache, _maxDeltaTimeCache);
std::string_view output = std::string_view(_buffer.data(), end - _buffer.data());
if (output.empty()) {
return { 0.f, 0.f };

36
modules/galaxy/rendering/renderablegalaxy.cpp
View File

@@ -199,13 +199,37 @@ RenderableGalaxy::RenderableGalaxy(const ghoul::Dictionary& dictionary)
{
dictionary.getValue("VolumeRenderingEnabled", _volumeRenderingEnabled);
dictionary.getValue("StarRenderingEnabled", _starRenderingEnabled);
dictionary.getValue("StepSize", _stepSize);
dictionary.getValue("AbsorptionMultiply", _absorptionMultiply);
dictionary.getValue("EmissionMultiply", _emissionMultiply);
{
double stepSize;
dictionary.getValue("StepSize", stepSize);
_stepSize = static_cast<float>(stepSize);
}
{
double absorptionMultiply = _absorptionMultiply;
dictionary.getValue("AbsorptionMultiply", absorptionMultiply);
_absorptionMultiply = static_cast<float>(absorptionMultiply);
}
{
double emissionMultiply = _emissionMultiply;
dictionary.getValue("EmissionMultiply", emissionMultiply);
_emissionMultiply = static_cast<float>(emissionMultiply);
}
dictionary.getValue("StarRenderingMethod", _starRenderingMethod);
dictionary.getValue("EnabledPointsRatio", _enabledPointsRatio);
dictionary.getValue("Translation", _translation);
dictionary.getValue("Rotation", _rotation);
{
double enabledPointsRatio = _enabledPointsRatio;
dictionary.getValue("EnabledPointsRatio", enabledPointsRatio);
_enabledPointsRatio = static_cast<float>(enabledPointsRatio);
}
{
glm::dvec3 translation = glm::vec3(_translation);
dictionary.getValue("Translation", translation);
_translation = glm::vec3(translation);
}
{
glm::dvec3 rotation = glm::vec3(_rotation);
dictionary.getValue("Rotation", rotation);
_rotation = glm::vec3(rotation);
}
if (dictionary.hasKeyAndValue<bool>(VolumeRenderingEnabledInfo.identifier)) {
_volumeRenderingEnabled = dictionary.value<bool>(

2
modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
View File

@@ -230,7 +230,7 @@ void DashboardItemInstruments::render(glm::vec2& penPosition) {
ghoul::fontrendering::CrDirection::Down
);
std::string_view str = SpiceManager::ref().dateFromEphemerisTime(
std::string str = SpiceManager::ref().dateFromEphemerisTime(
sequencer.nextCaptureTime(global::timeManager.time().j2000Seconds()),
"YYYY MON DD HR:MN:SC"
);

2
src/interaction/tasks/convertrecformattask.cpp
View File

@@ -35,8 +35,6 @@
namespace {
constexpr const char* _loggerCat = "ConvertRecFormatTask";
constexpr const char* KeyConvertToAscii = "ConvertToAscii";
constexpr const char* KeyConvertToBinary = "ConvertToBinary";
constexpr const char* KeyInFilePath = "InputFilePath";
constexpr const char* KeyOutFilePath = "OutputFilePath";
} // namespace

1
src/scene/assetloader.cpp
View File

@@ -43,7 +43,6 @@ namespace {
constexpr const char* AssetGlobalVariableName = "asset";
constexpr const char* RequireFunctionName = "require";
constexpr const char* RequestFunctionName = "request";
constexpr const char* ExistsFunctionName = "exists";
constexpr const char* ExportFunctionName = "export";