Start of MegaMol 1.3 release

fixed ignores, fixed glad, included lua, configurator
invor · Sep 26, 2017 · f6a2d3e · f6a2d3e
1 parent 0082453
commit f6a2d3e
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,7 @@ configurator/.vs/
 configurator/bin/
 configurator/MegaMolConf/obj/
 configurator/packages/
+
+configurator/MegaMolConf/Properties/AssemblyInfo\.cs
+
+configurator/MegaMolConf/Resources/mmconfig\.res
diff --git a/console/CMakeLists.txt b/console/CMakeLists.txt
@@ -52,7 +52,7 @@ if(BUILD_CONSOLE)
   endif()
 
   set(LIBS vislib core glad ${GLFW3_LIBRARIES} ${VERSION_LIBRARY} ${LIBUNWIND_LIBRARIES} ${EGL_LIBRARIES})
-  include_directories(${GLFW3_INCLUDE_DIRS} ${LIBUNWIND_INCLUDE_DIR} ${EGL_INCLUDE_DIR})
+  include_directories(${GLFW3_INCLUDE_DIRS} ${LIBUNWIND_INCLUDE_DIR} ${EGL_INCLUDE_DIR} "src" "include")
 
   if(NOT USE_EGL)
     option(USE_INTERNAL_ANTTWEAKBAR "use internal AntTweakBar" ON)

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -103,7 +103,7 @@ if(BUILD_CORE)
   endif()
 
   set(LIBS vislib glad lua ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES} ${PNG_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${ZMQ_LIB})
-  include_directories(${EXPAT_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS} ${EXTERNAL_INSTALL_LOCATION}/include)
+  include_directories(${EXPAT_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS} ${EXTERNAL_INSTALL_LOCATION}/include "src" "include")
   link_directories(${EXTERNAL_INSTALL_LOCATION}/lib)
 
   if (OPENMP_FOUND OR WIN32)

diff --git a/core/remoteconsole/CMakeLists.txt b/core/remoteconsole/CMakeLists.txt
@@ -34,7 +34,7 @@ if(BUILD_REMOTECONSOLE)
     INSTALL_COMMAND ${CXXOPTS_INSTALL_CMD} ${CXXOPTS_INSTALL_ARGS}
   )
 
-  set(LIBS vislib glload lua ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES} ${PNG_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${ZMQ_LIB})
+  set(LIBS vislib glad lua ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES} ${PNG_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${ZMQ_LIB})
   include_directories(${EXPAT_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS} ${EXTERNAL_INSTALL_LOCATION}/include)
   link_directories(${EXTERNAL_INSTALL_LOCATION}/lib)
 
@@ -48,6 +48,7 @@ if(BUILD_REMOTECONSOLE)
   add_executable(${PROJECT_NAME} ${public_header_files} ${header_files} ${shader_files} ${source_files})
   target_link_libraries(${PROJECT_NAME} PRIVATE ${LIBS})
   target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
+  add_dependencies(${PROJECT_NAME} core glad)
 
   set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER base)
   source_group("Header Files" FILES ${header_files})

diff --git a/plugins/imageviewer2/CMakeLists.txt b/plugins/imageviewer2/CMakeLists.txt
@@ -29,7 +29,7 @@ if(BUILD_${EXPORT_NAME}_PLUGIN)
   # Target definition
   #add_library(${PROJECT_NAME} SHARED ${public_header_files} ${header_files} ${shader_files} ${source_files})
   add_library(${PROJECT_NAME} SHARED ${public_header_files} ${header_files} ${source_files})
-  add_dependencies(${PROJECT_NAME} vislib glload core)
+  add_dependencies(${PROJECT_NAME} vislib glad core)
   # Set target naming conventions for different build types
   set_target_properties(${PROJECT_NAME} PROPERTIES SUFFIX ".mmplg")
   # Dependent projects only need to link against the core.so itself.

diff --git a/plugins/infovis/CMakeLists.txt b/plugins/infovis/CMakeLists.txt
@@ -13,7 +13,7 @@ if(BUILD_${EXPORT_NAME}_PLUGIN)
   # afterwards list the dependencies.
   set(DEP_LIST "${DEP_LIST};BUILD_${EXPORT_NAME}_PLUGIN BUILD_CORE BUILD_MMSTD_DATATOOLS_PLUGIN" CACHE INTERNAL "")
 
-  set(LIBS vislib core glload mmstd_datatools)
+  set(LIBS vislib core glad mmstd_datatools)
   include_directories("include" "src")
 
   file(GLOB_RECURSE public_header_files RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "include/*.h")
@@ -23,7 +23,7 @@ if(BUILD_${EXPORT_NAME}_PLUGIN)
 
   # Target definition
   add_library(${PROJECT_NAME} SHARED ${public_header_files} ${header_files} ${shader_files} ${source_files})
-  add_dependencies(${PROJECT_NAME} vislib glload core mmstd_datatools)
+  add_dependencies(${PROJECT_NAME} vislib glad core mmstd_datatools)
   # Set target naming conventions for different build types
   set_target_properties(${PROJECT_NAME} PROPERTIES SUFFIX ".mmplg")
   # Dependent projects only need to link against the core.so itself.

diff --git a/plugins/infovis/src/NGParallelCoordinatesRenderer2D.cpp b/plugins/infovis/src/NGParallelCoordinatesRenderer2D.cpp
@@ -418,10 +418,10 @@ bool NGParallelCoordinatesRenderer2D::create(void) {
     if (!makeComputeProgram("::pc_item_pick", this->pickProgram)) return false;
     if (!makeComputeProgram("::pc_item_stroke", this->strokeProgram)) return false;
 
-    glGetProgramiv(this->filterProgram, GL_COMPUTE_LOCAL_WORK_SIZE, filterWorkgroupSize);
-    glGetProgramiv(this->minMaxProgram, GL_COMPUTE_LOCAL_WORK_SIZE, counterWorkgroupSize);
-    glGetProgramiv(this->pickProgram, GL_COMPUTE_LOCAL_WORK_SIZE, pickWorkgroupSize);
-    glGetProgramiv(this->strokeProgram, GL_COMPUTE_LOCAL_WORK_SIZE, strokeWorkgroupSize);
+    glGetProgramiv(this->filterProgram, GL_COMPUTE_WORK_GROUP_SIZE, filterWorkgroupSize);
+    glGetProgramiv(this->minMaxProgram, GL_COMPUTE_WORK_GROUP_SIZE, counterWorkgroupSize);
+    glGetProgramiv(this->pickProgram, GL_COMPUTE_WORK_GROUP_SIZE, pickWorkgroupSize);
+    glGetProgramiv(this->strokeProgram, GL_COMPUTE_WORK_GROUP_SIZE, strokeWorkgroupSize);
 
     glGetIntegeri_v(GL_MAX_COMPUTE_WORK_GROUP_COUNT, 0, &maxWorkgroupCount[0]);
     glGetIntegeri_v(GL_MAX_COMPUTE_WORK_GROUP_COUNT, 1, &maxWorkgroupCount[1]);