mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-03 09:20:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Ubuntu 22.04 and GCC11 fixes (#2163)

Browse Source 
* Update CEF version
* Update Ghoul
* Update SGCT
* Update codegen
* Remove warnings happening on Ubuntu 22.04 with GCC 11
* AppleClang warning fixes
* Compile fix for Ubuntu and MacOS
* Add Qt 6.2.3 to the CMAKE_PREFIX_PATH
This commit is contained in:
Alexander Bock
2022-06-28 00:46:01 +02:00
committed by GitHub
parent fd1589209d
commit 9b1143f02f
139 changed files with 172 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/interaction/joystickcamerastates.cpp
+5 -5
View File
@@ -238,7 +238,7 @@ void JoystickCameraStates::setAxisMapping(std::string joystickName,
}
// If the axis index is too big for the vector then resize it to have room
if (axis >= joystickCameraState->axisMapping.size()) {
if (axis >= static_cast<int>(joystickCameraState->axisMapping.size())) {
joystickCameraState->axisMapping.resize(axis + 1);
joystickCameraState->prevAxisValues.resize(axis + 1);
}
@@ -266,7 +266,7 @@ void JoystickCameraStates::setAxisMappingProperty(std::string joystickName,
}
// If the axis index is too big for the vector then resize it to have room
if (axis >= joystickCameraState->axisMapping.size()) {
if (axis >= static_cast<int>(joystickCameraState->axisMapping.size())) {
joystickCameraState->axisMapping.resize(axis + 1);
joystickCameraState->prevAxisValues.resize(axis + 1);
}
@@ -292,7 +292,7 @@ JoystickCameraStates::AxisInformation JoystickCameraStates::axisMapping(
return dummy;
}
if (axis >= joystick->axisMapping.size()) {
if (axis >= static_cast<int>(joystick->axisMapping.size())) {
JoystickCameraStates::AxisInformation dummy;
return dummy;
}
@@ -309,7 +309,7 @@ void JoystickCameraStates::setDeadzone(const std::string& joystickName, int axis
}
// If the axis index is too big for the vector then resize it to have room
if (axis >= joystickCameraState->axisMapping.size()) {
if (axis >= static_cast<int>(joystickCameraState->axisMapping.size())) {
joystickCameraState->axisMapping.resize(axis + 1);
joystickCameraState->prevAxisValues.resize(axis + 1);
}
@@ -323,7 +323,7 @@ float JoystickCameraStates::deadzone(const std::string& joystickName, int axis)
return 0.f;
}
if (axis >= joystick->axisMapping.size()) {
if (axis >= static_cast<int>(joystick->axisMapping.size())) {
return 0.f;
}
src/navigation/orbitalnavigator.cpp
-1
View File
@@ -312,7 +312,6 @@ OrbitalNavigator::IdleBehavior::IdleBehavior()
, defaultBehavior(IdleBehaviorInfo)
{
addProperty(apply);
using Behavior = IdleBehavior::Behavior;
defaultBehavior.addOptions({
{ static_cast<int>(Behavior::Orbit), IdleKeyOrbit },
{ static_cast<int>(Behavior::OrbitAtConstantLat), IdleKeyOrbitAtConstantLat },
src/rendering/luaconsole.cpp
+1 -2
View File
@@ -781,10 +781,9 @@ void LuaConsole::render() {
}
// Computes the location for right justified text on the same y height as the entry
auto locationForRightJustifiedText = [this, res](const std::string& text) {
auto locationForRightJustifiedText = [this, res, dpi](const std::string& text) {
using namespace ghoul::fontrendering;
const float dpi = global::windowDelegate->osDpiScaling();
const glm::vec2 loc = glm::vec2(
EntryFontSize * dpi / 2.f,
res.y - _currentHeight + EntryFontSize * dpi