Merge pull request #55 from lindemeier/feature/gpu-texture-brush

feature/gpu texture brush
lindemeier · Nov 22, 2020 · 41edd9b · 41edd9b
2 parents a7c52d8 + 09e439c
commit 41edd9b
Show file tree

Hide file tree

Showing 73 changed files with 2,234 additions and 767 deletions.
diff --git a/.bazelrc b/.bazelrc
diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -28,7 +28,7 @@ jobs:
     - name: Install dependencies, opencv, Qt5 for GUIs and clang-10
       run: |
         sudo apt-get update
-        sudo apt-get install libopencv-dev qtbase5-dev clang-10 ninja-build libeigen3-dev libceres-dev
+        sudo apt-get install libopencv-dev qtbase5-dev clang-10 ninja-build libeigen3-dev libceres-dev libglfw3 libglfw3-dev libglew-dev
 
     - name: Create Build Environment
       # Some projects don't allow in-source building, so create a separate build directory

diff --git a/.gitignore b/.gitignore
@@ -32,6 +32,7 @@
 *.app
 
 build/*
+.vscode/*
 linear_rgb.png
 luminance.png
 hugo.png

diff --git a/3rdParty/BUILD.bazel b/3rdParty/BUILD.bazel
diff --git a/3rdParty/eigen.BUILD b/3rdParty/eigen.BUILD
diff --git a/3rdParty/nlohmann_json.BUILD b/3rdParty/nlohmann_json.BUILD
diff --git a/BUILD.bazel b/BUILD.bazel
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,10 +38,18 @@ if(NOT json_POPULATED)
   add_subdirectory(${json_SOURCE_DIR} ${json_BINARY_DIR} EXCLUDE_FROM_ALL)
 endif()
 
+FetchContent_Declare(
+  prgl
+  GIT_REPOSITORY https://github.com/lindemeier/prgl.git
+  GIT_TAG        develop
+)
+FetchContent_MakeAvailable(prgl)
+
 
 # modules
 add_subdirectory(painty/core)
 add_subdirectory(painty/image)
+add_subdirectory(painty/gpu)
 add_subdirectory(painty/io)
 add_subdirectory(painty/mixer)
 add_subdirectory(painty/renderer)

diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
diff --git a/apps/BUILD.bazel b/apps/BUILD.bazel
diff --git a/apps/painty_gui/BUILD.bazel b/apps/painty_gui/BUILD.bazel
diff --git a/apps/palette_extraction/BUILD.bazel b/apps/palette_extraction/BUILD.bazel
diff --git a/apps/sbr_painter/BUILD.bazel b/apps/sbr_painter/BUILD.bazel