mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-07 20:09:58 -05:00
Update GLM version
Correctly initialize all values as they are no longer default-initialized
This commit is contained in:
@@ -1177,7 +1177,7 @@ void FramebufferRenderer::performRaycasterTasks(const std::vector<RaycasterTask>
|
||||
glBindFramebuffer(GL_FRAMEBUFFER, _gBuffers.framebuffer);
|
||||
}
|
||||
|
||||
glm::vec3 cameraPosition;
|
||||
glm::vec3 cameraPosition = glm::vec3(0.f);
|
||||
bool isCameraInside = raycaster->isCameraInside(
|
||||
raycasterTask.renderData,
|
||||
cameraPosition
|
||||
|
||||
@@ -224,7 +224,7 @@ void LoadingScreen::render() {
|
||||
rendering::helper::Anchor::Center
|
||||
);
|
||||
|
||||
glm::vec4 color;
|
||||
glm::vec4 color = glm::vec4(0.f);
|
||||
switch (_phase) {
|
||||
case Phase::PreStart:
|
||||
break;
|
||||
@@ -273,8 +273,8 @@ void LoadingScreen::render() {
|
||||
|
||||
renderer.render(*_loadingFont, loadingLl, headline);
|
||||
|
||||
glm::vec2 messageLl;
|
||||
glm::vec2 messageUr;
|
||||
glm::vec2 messageLl = glm::vec2(0.f);
|
||||
glm::vec2 messageUr = glm::vec2(0.f);
|
||||
if (_showMessage) {
|
||||
std::lock_guard<std::mutex> guard(_messageMutex);
|
||||
|
||||
@@ -325,8 +325,8 @@ void LoadingScreen::render() {
|
||||
// we make use with an overlap in the worst case
|
||||
bool foundSpace = false;
|
||||
|
||||
glm::vec2 ll;
|
||||
glm::vec2 ur;
|
||||
glm::vec2 ll = glm::vec2(0.f);
|
||||
glm::vec2 ur = glm::vec2(0.f);
|
||||
int i = 0;
|
||||
for (; i < MaxNumberLocationSamples && !foundSpace; ++i) {
|
||||
std::uniform_int_distribution<int> distX(
|
||||
|
||||
@@ -142,7 +142,7 @@ LuaConsole::LuaConsole()
|
||||
)
|
||||
, _historyTextColor(
|
||||
HistoryTextColorInfo,
|
||||
glm::vec4(1.0f, 1.0f, 1.0f, 0.65f),
|
||||
glm::vec4(1.f, 1.f, 1.f, 0.65f),
|
||||
glm::vec4(0.f),
|
||||
glm::vec4(1.f)
|
||||
)
|
||||
@@ -646,7 +646,7 @@ void LuaConsole::render() {
|
||||
glDisable(GL_DEPTH_TEST);
|
||||
|
||||
rendering::helper::renderBox(
|
||||
glm::vec2(0.f, 0.f),
|
||||
glm::vec2(0.f),
|
||||
glm::vec2(1.f, _currentHeight / res.y),
|
||||
_backgroundColor
|
||||
);
|
||||
@@ -793,7 +793,7 @@ void LuaConsole::render() {
|
||||
};
|
||||
|
||||
if (_remoteScripting) {
|
||||
const glm::vec4 Red(1, 0, 0, 1);
|
||||
const glm::vec4 Red(1.f, 0.f, 0.f, 1.f);
|
||||
|
||||
ParallelConnection::Status status = global::parallelPeer.status();
|
||||
const int nClients =
|
||||
@@ -809,7 +809,7 @@ void LuaConsole::render() {
|
||||
const glm::vec2 loc = locationForRightJustifiedText(nClientsText);
|
||||
RenderFont(*_font, loc, nClientsText, Red);
|
||||
} else if (global::parallelPeer.isHost()) {
|
||||
const glm::vec4 LightBlue(0.4, 0.4, 1, 1);
|
||||
const glm::vec4 LightBlue(0.4f, 0.4f, 1.f, 1.f);
|
||||
|
||||
const std::string localExecutionText = "Local script execution";
|
||||
const glm::vec2 loc = locationForRightJustifiedText(localExecutionText);
|
||||
|
||||
@@ -647,6 +647,7 @@ void RenderEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMat
|
||||
case WindowDelegate::Frustum::Mono: return "";
|
||||
case WindowDelegate::Frustum::LeftEye: return "(left)";
|
||||
case WindowDelegate::Frustum::RightEye: return "(right)";
|
||||
default: throw std::logic_error("Unhandled case label");
|
||||
}
|
||||
}(frustum);
|
||||
|
||||
@@ -761,8 +762,8 @@ void RenderEngine::renderEndscreen() {
|
||||
glEnable(GL_BLEND);
|
||||
|
||||
rendering::helper::renderBox(
|
||||
glm::vec2(0.f, 0.f),
|
||||
glm::vec2(1.f, 1.f),
|
||||
glm::vec2(0.f),
|
||||
glm::vec2(1.f),
|
||||
glm::vec4(0.f, 0.f, 0.f, 0.5f)
|
||||
);
|
||||
|
||||
@@ -1414,7 +1415,7 @@ void RenderEngine::renderScreenLog() {
|
||||
white
|
||||
);
|
||||
|
||||
glm::vec4 color(glm::uninitialize);
|
||||
glm::vec4 color = glm::vec4(0.f);
|
||||
switch (e->level) {
|
||||
case ghoul::logging::LogLevel::Debug:
|
||||
color = glm::vec4(0.f, 1.f, 0.f, alpha);
|
||||
|
||||
@@ -132,7 +132,7 @@ namespace {
|
||||
float phi = spherical.z;
|
||||
|
||||
// Sanitize coordinates.
|
||||
float theta = wrap(spherical.y, 0.0, glm::two_pi<float>());
|
||||
float theta = wrap(spherical.y, 0.f, glm::two_pi<float>());
|
||||
if (theta > glm::pi<float>()) {
|
||||
theta = glm::two_pi<float>() - theta;
|
||||
phi += glm::pi<float>();
|
||||
|
||||
@@ -141,7 +141,7 @@ void TransferFunction::setTextureFromTxt(std::shared_ptr<ghoul::opengl::Texture>
|
||||
upper = glm::clamp(upper, lower, 1.f);
|
||||
} else if (key == "mappingkey") {
|
||||
float intensity;
|
||||
glm::vec4 rgba = glm::vec4(0.0f);
|
||||
glm::vec4 rgba = glm::vec4(0.f);
|
||||
iss >> intensity;
|
||||
for(int i = 0; i < 4; ++i) {
|
||||
iss >> rgba[i];
|
||||
|
||||
Reference in New Issue
Block a user