Skip to content

Commit 41edd9b

Browse files
authored
Merge pull request #55 from lindemeier/feature/gpu-texture-brush
feature/gpu texture brush
2 parents a7c52d8 + 09e439c commit 41edd9b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+2234
-767
lines changed

.bazelrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/workflows/bazel.yml

Lines changed: 0 additions & 51 deletions
This file was deleted.

.github/workflows/cmake.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Install dependencies, opencv, Qt5 for GUIs and clang-10
2929
run: |
3030
sudo apt-get update
31-
sudo apt-get install libopencv-dev qtbase5-dev clang-10 ninja-build libeigen3-dev libceres-dev
31+
sudo apt-get install libopencv-dev qtbase5-dev clang-10 ninja-build libeigen3-dev libceres-dev libglfw3 libglfw3-dev libglew-dev
3232
3333
- name: Create Build Environment
3434
# Some projects don't allow in-source building, so create a separate build directory

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
*.app
3333

3434
build/*
35+
.vscode/*
3536
linear_rgb.png
3637
luminance.png
3738
hugo.png

3rdParty/BUILD.bazel

Lines changed: 0 additions & 29 deletions
This file was deleted.

3rdParty/eigen.BUILD

Lines changed: 0 additions & 59 deletions
This file was deleted.

3rdParty/nlohmann_json.BUILD

Lines changed: 0 additions & 12 deletions
This file was deleted.

BUILD.bazel

Whitespace-only changes.

CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,18 @@ if(NOT json_POPULATED)
3838
add_subdirectory(${json_SOURCE_DIR} ${json_BINARY_DIR} EXCLUDE_FROM_ALL)
3939
endif()
4040

41+
FetchContent_Declare(
42+
prgl
43+
GIT_REPOSITORY https://github.com/lindemeier/prgl.git
44+
GIT_TAG develop
45+
)
46+
FetchContent_MakeAvailable(prgl)
47+
4148

4249
# modules
4350
add_subdirectory(painty/core)
4451
add_subdirectory(painty/image)
52+
add_subdirectory(painty/gpu)
4553
add_subdirectory(painty/io)
4654
add_subdirectory(painty/mixer)
4755
add_subdirectory(painty/renderer)

WORKSPACE.bazel

Lines changed: 0 additions & 137 deletions
This file was deleted.

0 commit comments

Comments
 (0)