mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-03 02:48:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Feature/cmake cleanup (#381)

Browse Source 
* Rename OnScreenGui module to ImGui
* Support multiple external module folders (closes #31)
* Cleaning up CMake files
  * Restructure application specification
  * Add parameter for library mode to all modules
  * Add functions to handle global variable state
* Misc/remove warnings (#383)
* Increase build timeout and do a clean rebuild every commit
This commit is contained in:
Alexander Bock
2017-08-14 09:38:32 -04:00
committed by GitHub
parent 0b063827b8
commit c275b2f833
321 changed files with 2201 additions and 1892 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/debugging/CMakeLists.txt
View File

@@ -46,5 +46,6 @@ source_group("Shader Files" FILES ${SHADER_FILES})
create_new_module(
"Debugging"
debugging_module
STATIC
${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES}
)

2
modules/debugging/rendering/renderabledebugplane.cpp
View File

@@ -272,7 +272,7 @@ void RenderableDebugPlane::createPlane() {
glBindBuffer(GL_ARRAY_BUFFER, _vertexPositionBuffer); // bind buffer
glBufferData(GL_ARRAY_BUFFER, sizeof(vertex_data), vertex_data, GL_STATIC_DRAW);
glEnableVertexAttribArray(0);
glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, sizeof(GLfloat) * 6, reinterpret_cast<void*>(0));
glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, sizeof(GLfloat) * 6, nullptr);
glEnableVertexAttribArray(1);
glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, sizeof(GLfloat) * 6, reinterpret_cast<void*>(sizeof(GLfloat) * 4));
}