Skip to content

Commit 5fc65e5

Browse files
nmwsharpnmwsharp
authored
Merge branch 'master' into mgs/prismsAndPyramids
2 parents 84133d0 + 5450f00 commit 5fc65e5

149 files changed

Lines changed: 16460 additions & 2526 deletions

File tree

Some content is hidden

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

‎.github/workflows/linux.yml‎

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,20 @@ on:
88

99
jobs:
1010
build:
11+
if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
12+
13+
name: Build and Test (linux) - ${{ matrix.os }}-${{ matrix.arch }}
14+
runs-on: ${{ matrix.os }}
15+
1116
strategy:
1217
matrix:
13-
os: [ubuntu-latest]
14-
runs-on: ${{ matrix.os }}
15-
if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
18+
include:
19+
- os: ubuntu-latest
20+
arch: x64
21+
- os: ubuntu-24.04-arm
22+
arch: aarch64
23+
24+
1625
steps:
1726
- uses: actions/checkout@v1
1827
with:
@@ -25,7 +34,7 @@ jobs:
2534
run: cd test && mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DPOLYSCOPE_BACKEND_OPENGL3_GLFW=ON -DPOLYSCOPE_BACKEND_OPENGL_MOCK=ON ..
2635

2736
- name: build
28-
run: cd test/build && make
37+
run: cd test/build && cmake --build "." --parallel
2938

3039
- name: run test mock backend
3140
run: cd test/build && ./bin/polyscope-test --gtest_catch_exceptions=0 backend=openGL_mock
@@ -37,11 +46,19 @@ jobs:
3746
run: cd test/build && ASAN_OPTIONS=detect_leaks=0 ./bin/polyscope-test --gtest_catch_exceptions=0 backend=openGL3_egl
3847

3948
build_shared:
49+
if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
50+
51+
name: Build Shared and Test (linux) - ${{ matrix.os }}-${{ matrix.arch }}
52+
runs-on: ${{ matrix.os }}
53+
4054
strategy:
4155
matrix:
42-
os: [ubuntu-latest]
43-
runs-on: ${{ matrix.os }}
44-
if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
56+
include:
57+
- os: ubuntu-latest
58+
arch: x64
59+
- os: ubuntu-24.04-arm
60+
arch: aarch64
61+
4562
steps:
4663
- uses: actions/checkout@v1
4764
with:
@@ -54,7 +71,7 @@ jobs:
5471
run: cd test && mkdir build && cd build && cmake -DBUILD_SHARED_LIBS=TRUE -DCMAKE_BUILD_TYPE=Debug -DPOLYSCOPE_BACKEND_OPENGL3_GLFW=ON -DPOLYSCOPE_BACKEND_OPENGL_MOCK=ON -DPOLYSCOPE_BACKEND_OPENGL3_EGL=ON ..
5572

5673
- name: build
57-
run: cd test/build && make
74+
run: cd test/build && cmake --build "." --parallel
5875

5976
- name: run test mock backend
6077
run: cd test/build && ./bin/polyscope-test --gtest_catch_exceptions=0 backend=openGL_mock
@@ -63,4 +80,5 @@ jobs:
6380
# We get memory leaks inside of EGL that I can't track down. With ASAN, this means the exit code is always nonzero,
6481
# which is indistinguishable from tests failing. The ASAN_OPTIONS=detect_leaks=0 skips checking leaks for this test
6582
# as a workaround.
66-
run: cd test/build && ASAN_OPTIONS=detect_leaks=0 ./bin/polyscope-test --gtest_catch_exceptions=0 backend=openGL3_egl
83+
# run: cd test/build && ASAN_OPTIONS=detect_leaks=0 ./bin/polyscope-test --gtest_catch_exceptions=0 backend=openGL3_egl
84+
run: cd test/build && ./bin/polyscope-test --gtest_catch_exceptions=0 backend=openGL3_egl

‎.github/workflows/macos.yml‎

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,19 @@ on:
88

99
jobs:
1010
build:
11-
runs-on: macos-latest
1211
if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
12+
13+
name: Build and Test (macOS) - ${{ matrix.os }}-${{ matrix.arch }}
14+
runs-on: ${{ matrix.os }}
15+
16+
strategy:
17+
matrix:
18+
include:
19+
- os: macos-15-intel
20+
arch: x64
21+
- os: macos-latest
22+
arch: arm64
23+
1324
steps:
1425
- uses: actions/checkout@v1
1526
with:
@@ -19,14 +30,25 @@ jobs:
1930
run: cd test && mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DPOLYSCOPE_BACKEND_OPENGL3_GLFW=ON -DPOLYSCOPE_BACKEND_OPENGL_MOCK=ON ..
2031

2132
- name: build
22-
run: cd test/build && make
33+
run: cd test/build && cmake --build "." --parallel
2334

2435
- name: run test
2536
run: cd test/build && ./bin/polyscope-test --gtest_catch_exceptions=0 backend=openGL_mock
2637

2738
build_shared:
28-
runs-on: macos-latest
2939
if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
40+
41+
name: Build Shared and Test (macOS) - ${{ matrix.os }}-${{ matrix.arch }}
42+
runs-on: ${{ matrix.os }}
43+
44+
strategy:
45+
matrix:
46+
include:
47+
- os: macos-15-intel
48+
arch: x64
49+
- os: macos-latest
50+
arch: arm64
51+
3052
steps:
3153
- uses: actions/checkout@v1
3254
with:
@@ -36,7 +58,7 @@ jobs:
3658
run: cd test && mkdir build && cd build && cmake -DBUILD_SHARED_LIBS=TRUE -DCMAKE_BUILD_TYPE=Debug -DPOLYSCOPE_BACKEND_OPENGL3_GLFW=ON -DPOLYSCOPE_BACKEND_OPENGL_MOCK=ON ..
3759

3860
- name: build
39-
run: cd test/build && make
61+
run: cd test/build && cmake --build "." --parallel
4062

4163
- name: run test
4264
run: cd test/build && ./bin/polyscope-test --gtest_catch_exceptions=0 backend=openGL_mock

‎.github/workflows/windows.yml‎

Lines changed: 38 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,19 @@ on:
88

99
jobs:
1010
build:
11-
runs-on: windows-latest
1211
if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
12+
13+
name: Build and Test (Windows) - ${{ matrix.os }}-${{ matrix.arch }}
14+
runs-on: ${{ matrix.os }}
15+
16+
strategy:
17+
matrix:
18+
include:
19+
- os: windows-latest
20+
arch: x64
21+
- os: windows-11-arm
22+
arch: arm64
23+
1324
steps:
1425
- uses: actions/checkout@v1
1526
with:
@@ -19,25 +30,36 @@ jobs:
1930
run: cd test && mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DPOLYSCOPE_BACKEND_OPENGL3_GLFW=ON -DPOLYSCOPE_BACKEND_OPENGL_MOCK=ON ..
2031

2132
- name: build
22-
run: cd test/build && cmake --build "."
33+
run: cd test/build && cmake --build "." --parallel
2334

2435
- name: run test
2536
run: cd test/build && ./bin/Debug/polyscope-test.exe --gtest_catch_exceptions=0 backend=openGL_mock
2637

27-
# windows shared builds: disabled for now
28-
#build_shared:
29-
#runs-on: windows-latest
30-
#if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
31-
#steps:
32-
#- uses: actions/checkout@v1
33-
#with:
34-
#submodules: true
38+
# windows shared builds: disabled for now, link failure that I don't know how to debug in CI
39+
# build_shared:
40+
# if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
41+
42+
# name: Build Shared and Test (Windows) - ${{ matrix.os }}-${{ matrix.arch }}
43+
# runs-on: ${{ matrix.os }}
44+
45+
# strategy:
46+
# matrix:
47+
# include:
48+
# - os: windows-latest
49+
# arch: x64
50+
# - os: windows-11-arm
51+
# arch: arm64
52+
53+
# steps:
54+
# - uses: actions/checkout@v1
55+
# with:
56+
# submodules: true
3557

36-
#- name: configure
37-
#run: cd test && mkdir build && cd build && cmake -DBUILD_SHARED_LIBS=TRUE -DCMAKE_BUILD_TYPE=Debug -DPOLYSCOPE_BACKEND_OPENGL3_GLFW=ON -DPOLYSCOPE_BACKEND_OPENGL_MOCK=ON ..
58+
# - name: configure
59+
# run: cd test && mkdir build && cd build && cmake -DBUILD_SHARED_LIBS=TRUE -DCMAKE_BUILD_TYPE=Debug -DPOLYSCOPE_BACKEND_OPENGL3_GLFW=ON -DPOLYSCOPE_BACKEND_OPENGL_MOCK=ON ..
3860

39-
#- name: build
40-
#run: cd test/build && cmake --build "."
61+
# - name: build
62+
# run: cd test/build && cmake --build "." --parallel
4163

42-
#- name: run test
43-
#run: cd test/build && ./bin/Debug/polyscope-test.exe --gtest_catch_exceptions=0 backend=openGL_mock
64+
# - name: run test
65+
# run: cd test/build && ./bin/Debug/polyscope-test.exe --gtest_catch_exceptions=0 backend=openGL_mock

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ misc/file2c/file2cpp
55

66
# Editor and OS things
77
imgui.ini
8+
.polyscope.ini
89
.DS_Store
910
.vscode
1011
*.swp

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,6 @@
1515
[submodule "deps/imgui/implot"]
1616
path = deps/imgui/implot
1717
url = https://github.com/epezent/implot
18+
[submodule "deps/imgui/ImGuizmo"]
19+
path = deps/imgui/ImGuizmo
20+
url = https://github.com/nmwsharp/ImGuizmo.git

‎deps/CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,8 @@ endif()
4141
if(NOT TARGET stb)
4242
add_subdirectory(stb)
4343
endif()
44+
45+
## IconFontCppHeaders
46+
if(NOT TARGET IconFontCppHeaders)
47+
add_subdirectory(IconFontCppHeaders)
48+
endif()

‎deps/IconFontCppHeaders/CMakeLists.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
add_library(IconFontCppHeaders INTERFACE)
2+
3+
target_include_directories(IconFontCppHeaders INTERFACE "include")

0 commit comments

Comments
 (0)