From 390fc25e131effac538a95fa821e71f91642a47f Mon Sep 17 00:00:00 2001 From: Florent Berthaut <florent.berthaut@univ-lille.fr> Date: Tue, 17 Jan 2023 22:39:40 +0100 Subject: [PATCH] Fixed loading file with new name --- src/Reveal.cpp | 2 +- src/modules/PreviewModule.cpp | 2 +- src/modules/ProjectorModule.cpp | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Reveal.cpp b/src/Reveal.cpp index 5458bef..44c7273 100644 --- a/src/Reveal.cpp +++ b/src/Reveal.cpp @@ -252,7 +252,7 @@ void Reveal::open(const std::string& fileName) { DEBUG("Could not open file "<<fileName); open=false; } - else if(xmlStrcmp(rootNode->name, (const xmlChar*)"Revil")) { + else if(xmlStrcmp(rootNode->name, (const xmlChar*)"Rivill")) { xmlFreeDoc(doc); DEBUG("Could not open file "<<fileName); open=false; diff --git a/src/modules/PreviewModule.cpp b/src/modules/PreviewModule.cpp index 2335286..8e88d7b 100644 --- a/src/modules/PreviewModule.cpp +++ b/src/modules/PreviewModule.cpp @@ -58,7 +58,7 @@ PreviewModule::PreviewModule():Module() { updateViewProjMatrix(); //create preview window - m_previewWindow = glfwCreateWindow(600, 480, "Revil - Preview", NULL, NULL); + m_previewWindow = glfwCreateWindow(600, 480, "Rivill - Preview", NULL, NULL); if (!m_previewWindow) { glfwTerminate(); exit(EXIT_FAILURE); diff --git a/src/modules/ProjectorModule.cpp b/src/modules/ProjectorModule.cpp index 5eb5052..d59f868 100644 --- a/src/modules/ProjectorModule.cpp +++ b/src/modules/ProjectorModule.cpp @@ -1908,6 +1908,7 @@ void ProjectorModule::processOutput() { if(outputProcessed) { //reset output image to 0 glBindTexture(GL_TEXTURE_2D, m_outputTex); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, -- GitLab