mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-04 10:40:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Updated submodules (#1444)

Browse Source 
* Update submodules
 - Ghoul
   - assimp (5.0.0 -> 5.0.1)
   - catch2 (2.11.1 -> 2.13.3)
   - fmt (7.0.3 -> 7.1.3)
   - freetype2 (2.10.1 -> 2.10.4)
   - glbinding (3.1 -> 3.2)
   - glm (0.9.9.5 -> 0.9.9.8)
   - websocketpp (0.7.x -> 0.8.2)
 - SGCT
   - fmt (7.0.3 -> 7.1.3)
   - freetype (2.9.1 -> 2.10.4)
   - GLM (0.9.9.6 -> 0.9.9.8)
* Update to new include external definition
* Remove warning about no eof newline
This commit is contained in:
Alexander Bock
2020-12-29 13:44:57 +01:00
committed by GitHub
parent ad8af3ffeb
commit 7bf7a25401
6 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/OpenSpace/ext/sgct

Submodule apps/OpenSpace/ext/sgct updated: 930239ffee...aac6ab65af

2
ext/ghoul

Submodule ext/ghoul updated: c59ca6051e...f30b6f6410

2
modules/imgui/CMakeLists.txt
View File

@@ -78,4 +78,4 @@ create_new_module(
${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES}
)
include_external_library(${imgui_module} PRIVATE Imgui ${CMAKE_CURRENT_SOURCE_DIR}/ext/imgui ${CMAKE_CURRENT_SOURCE_DIR}/ext/imgui)
include_external_library(${imgui_module} PRIVATE Imgui ${CMAKE_CURRENT_SOURCE_DIR}/ext/imgui)

2
modules/touch/CMakeLists.txt
View File

@@ -57,5 +57,5 @@ create_new_module(
${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES}
)
include_external_library(${touch_module} PRIVATE libTUIO11 ${CMAKE_CURRENT_SOURCE_DIR}/ext ${CMAKE_CURRENT_SOURCE_DIR}/ext)
include_external_library(${touch_module} PRIVATE libTUIO11 ${CMAKE_CURRENT_SOURCE_DIR}/ext)
disable_external_warnings_for_file(${CMAKE_CURRENT_SOURCE_DIR}/ext/levmarq.cpp)

6
src/rendering/framebufferrenderer.cpp
View File

@@ -385,7 +385,11 @@ void FramebufferRenderer::initialize() {
glDisablei(GL_BLEND, 1);
glDisablei(GL_BLEND, 2);
glClampColor(GL_CLAMP_READ_COLOR, GL_FALSE);
// glClampColor is weird as it requires a GLenum in the function definition, but
// the OpenGL standard says that it only accepts GL_FALSE and GL_TRUE, which are
// of type GLboolean *eye rolling*
// GLenum(0) == GLboolen(0) == GL_FALSE
glClampColor(GL_CLAMP_READ_COLOR, GLenum(0));
glEnable(GL_DEPTH_TEST);

1
support/cmake/set_openspace_compile_settings.cmake
View File

@@ -134,7 +134,6 @@ function (set_openspace_compile_settings target)
"-Wmismatched-tags"
"-Wmissing-field-initializers"
"-Wmissing-noreturn"
"-Wnewline-eof"
"-Wnon-virtual-dtor"
"-Wold-style-cast"
"-Woverloaded-virtual"