Merge pull request #266 from patriciogonzalezvivo/ncurses

Ncurses
patriciogonzalezvivo · May 10, 2022 · e3b46d0 · e3b46d0
2 parents 788bb17 + 81afd28
commit e3b46d0
Show file tree

Hide file tree

Showing 12 changed files with 1,079 additions and 453 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,7 +17,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 add_subdirectory(deps)
 
 if(MSVC)
-	add_definitions( -DPLATFORM_WINDOWS )
+    add_definitions( -DPLATFORM_WINDOWS )
 endif()
 
 if (NO_X11 OR FORCE_GBM)
@@ -90,6 +90,12 @@ if (EMSCRIPTEN)
     target_link_libraries(glslViewer PRIVATE glfw)
 
 else()
+    find_package(Curses)
+    if (CURSES_FOUND)
+        target_compile_definitions(glslViewer PUBLIC SUPPORT_NCURSES)
+        include_directories(${CURSES_INCLUDE_DIR})
+        target_link_libraries(glslViewer PRIVATE ${CURSES_LIBRARY})
+    endif()
 
     target_compile_definitions(glslViewer PUBLIC 
         SUPPORT_MULTITHREAD_RECORDING 

diff --git a/deps/ada b/deps/ada
+0 −2		deps/glob/CMakeLists.txt
+1 −1		include/ada/gl/textureStream.h
+1 −1		include/ada/gl/textureStreamAV.h
+1 −1		include/ada/shaders/defaultShaders.h
+0 −62		include/ada/shaders/histogram.h
+466 −0		include/ada/shaders/plot.h
+5 −5		include/ada/tools/text.h
+12 −10		src/gl/shader.cpp
+4 −4		src/shaders/defaultShaders.cpp
+22 −22		src/tools/text.cpp