Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade NanoGUI to fix Apple M1 builds #1195

Merged
merged 1 commit into from
Jan 15, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/MaterialXView/NanoGUI
Submodule NanoGUI updated 73 files
+22 −48 .github/workflows/build.yml
+73 −0 .github/workflows/wheels.yml
+1 −0 .gitignore
+3 −3 .gitmodules
+31 −18 CMakeLists.txt
+7 −11 README.rst
+14 −0 docs/release.rst
+0 −26 ext/coro/LICENSE
+0 −6 ext/coro/README
+0 −800 ext/coro/coro.c
+0 −441 ext/coro/coro.h
+1 −0 ext/nanobind
+0 −1 ext/pybind11
+2 −2 include/nanogui/button.h
+1 −1 include/nanogui/checkbox.h
+2 −2 include/nanogui/colorpicker.h
+1 −1 include/nanogui/colorwheel.h
+1 −1 include/nanogui/combobox.h
+2 −2 include/nanogui/common.h
+1 −1 include/nanogui/imagepanel.h
+2 −5 include/nanogui/layout.h
+1 −1 include/nanogui/messagedialog.h
+116 −52 include/nanogui/object.h
+65 −26 include/nanogui/python.h
+9 −8 include/nanogui/renderpass.h
+5 −1 include/nanogui/screen.h
+3 −3 include/nanogui/shader.h
+2 −2 include/nanogui/slider.h
+3 −3 include/nanogui/tabwidget.h
+1 −1 include/nanogui/textbox.h
+3 −3 include/nanogui/texture.h
+0 −4 include/nanogui/theme.h
+11 −2 include/nanogui/vector.h
+4 −3 include/nanogui/widget.h
+1 −1 nanogui/__init__.py
+2 −1 pyproject.toml
+2 −2 setup.py
+1 −0 src/canvas.cpp
+91 −9 src/common.cpp
+1 −1 src/darwin.mm
+1 −1 src/example1.cpp
+2 −1 src/example2.cpp
+7 −1 src/example3.cpp
+4 −10 src/python/CMakeLists.txt
+19 −19 src/python/basics.cpp
+13 −12 src/python/button.cpp
+9 −8 src/python/canvas.cpp
+6 −6 src/python/color.cpp
+2 −2 src/python/example1.py
+197 −27 src/python/example3.py
+0 −227 src/python/example4.py
+3 −3 src/python/formhelper.cpp
+158 −37 src/python/glfw.cpp
+973 −961 src/python/icons.cpp
+13 −13 src/python/layout.cpp
+45 −162 src/python/main.cpp
+12 −11 src/python/misc.cpp
+13 −15 src/python/nanovg.cpp
+1 −1 src/python/py_doc.h
+7 −8 src/python/python.h
+96 −86 src/python/render.cpp
+1 −1 src/python/render_test_2.py
+1 −1 src/python/render_test_3.py
+3 −3 src/python/render_test_4.py
+5 −5 src/python/tabs.cpp
+3 −3 src/python/textarea.cpp
+8 −8 src/python/textbox.cpp
+3 −3 src/python/theme.cpp
+63 −60 src/python/vector.cpp
+119 −15 src/python/widget.cpp
+29 −16 src/renderpass_gl.cpp
+36 −22 src/renderpass_metal.mm
+4 −4 src/shader_metal.mm