From ad227eb53ef7df209d43fe10d94399838f28064b Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 14 Nov 2022 09:55:53 +0100 Subject: [PATCH 1/4] Add Download link to setup.cfg [skip ci] --- setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.cfg b/setup.cfg index b77a116c14..886f85f894 100644 --- a/setup.cfg +++ b/setup.cfg @@ -35,6 +35,7 @@ classifiers = author = Panda3D Team author_email = etc-panda3d@lists.andrew.cmu.edu project_urls = + Download=https://www.panda3d.org/download/ Source=https://github.com/panda3d/panda3d Tracker=https://github.com/panda3d/panda3d/issues Documentation=https://www.panda3d.org/manual/ From 75cbe98b1d004bb7ca54e52daa21e84009c267ec Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 14 Nov 2022 10:03:57 +0100 Subject: [PATCH 2/4] Update BACKERS.md file [skip ci] --- BACKERS.md | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/BACKERS.md b/BACKERS.md index c34cb2a9d3..fec17f55ef 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -2,20 +2,12 @@ This is a list of all the people who are contributing financially to Panda3D. If you'd like to join them, visit [our campaign on OpenCollective](https://opencollective.com/panda3d)! -## Gold Sponsors - -![Gold Sponsors](https://opencollective.com/panda3d/tiers/gold-sponsor.svg?avatarHeight=48&width=600) - -* [tcdude](https://opencollective.com/tizilogic) - ## Bronze Sponsors [ChangeCrab](https://changecrab.com/) ![Bronze Sponsors](https://opencollective.com/panda3d/tiers/bronze-sponsor.svg?avatarHeight=48&width=600) -* [Mitchell Stokes](https://opencollective.com/mitchell-stokes) * [Daniel Stokes](https://opencollective.com/daniel-stokes) * [David Rose](https://opencollective.com/david-rose) -* [ChangeCrab](https://changecrab.com) ## Benefactors @@ -24,17 +16,16 @@ This is a list of all the people who are contributing financially to Panda3D. I * Sam Edwards * Max Voss * Hawkheart -* Dan Mlodecki +* Veronica ## Enthusiasts ![Enthusiasts](https://opencollective.com/panda3d/tiers/enthusiast.svg?avatarHeight=48&width=600) * Eric Thomson -* Kyle Roach * Brian Lach -* C0MPU73R * Maxwell Dreytser +* SureBet ## Backers From e92d993ceac7d8d6119ecfe49cb07c5c3da771d9 Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 14 Nov 2022 10:25:09 +0100 Subject: [PATCH 3/4] glgsg: Fix failure to unset divisor after rendering w/ instancing This would normally be done by `disable_shader_vertex_arrays()` but it apparently isn't called between shader changes --- panda/src/glstuff/glCgShaderContext_src.cxx | 8 +++----- panda/src/glstuff/glShaderContext_src.cxx | 4 +--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/panda/src/glstuff/glCgShaderContext_src.cxx b/panda/src/glstuff/glCgShaderContext_src.cxx index c0a3b7d284..4a71b074c6 100644 --- a/panda/src/glstuff/glCgShaderContext_src.cxx +++ b/panda/src/glstuff/glCgShaderContext_src.cxx @@ -905,11 +905,9 @@ update_shader_vertex_arrays(ShaderContext *prev, bool force) { stride, client_pointer); } - if (divisor > 0) { - _glgsg->set_vertex_attrib_divisor(p, divisor); - } - - } else { + _glgsg->set_vertex_attrib_divisor(p, divisor); + } + else { // It's a conventional vertex attribute. Ugh. #ifdef SUPPORT_FIXED_FUNCTION switch (p) { diff --git a/panda/src/glstuff/glShaderContext_src.cxx b/panda/src/glstuff/glShaderContext_src.cxx index aad4305b20..79db239f35 100644 --- a/panda/src/glstuff/glShaderContext_src.cxx +++ b/panda/src/glstuff/glShaderContext_src.cxx @@ -2568,9 +2568,7 @@ update_shader_vertex_arrays(ShaderContext *prev, bool force) { stride, client_pointer); } - if (divisor > 0) { - _glgsg->set_vertex_attrib_divisor(p, divisor); - } + _glgsg->set_vertex_attrib_divisor(p, divisor); ++p; client_pointer += element_stride; From 9508b040e77d7f9d6cd318d2e55827e84e0cf95f Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 14 Nov 2022 10:50:30 +0100 Subject: [PATCH 4/4] Update to 1.10.13 thirdparty tools on macOS These contain OpenCV libraries with fixed relative references on arm64 Fixes #1393 --- .github/workflows/ci.yml | 8 ++++---- README.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a73a2992e0..0ab254bb7e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,10 +26,10 @@ jobs: - name: Get thirdparty packages (macOS) if: runner.os == 'macOS' run: | - curl -O https://www.panda3d.org/download/panda3d-1.10.11/panda3d-1.10.11-tools-mac.tar.gz - tar -xf panda3d-1.10.11-tools-mac.tar.gz - mv panda3d-1.10.11/thirdparty thirdparty - rmdir panda3d-1.10.11 + curl -O https://www.panda3d.org/download/panda3d-1.10.13/panda3d-1.10.13-tools-mac.tar.gz + tar -xf panda3d-1.10.13-tools-mac.tar.gz + mv panda3d-1.10.13/thirdparty thirdparty + rmdir panda3d-1.10.13 (cd thirdparty/darwin-libs-a && rm -rf rocket) - name: Set up Python 3.9 uses: actions/setup-python@v2 diff --git a/README.md b/README.md index fd73771869..03c50bd2eb 100644 --- a/README.md +++ b/README.md @@ -136,7 +136,7 @@ macOS ----- On macOS, you will need to download a set of precompiled thirdparty packages in order to -compile Panda3D, which can be acquired from [here](https://www.panda3d.org/download/panda3d-1.10.12/panda3d-1.10.12-tools-mac.tar.gz). +compile Panda3D, which can be acquired from [here](https://www.panda3d.org/download/panda3d-1.10.13/panda3d-1.10.13-tools-mac.tar.gz). After placing the thirdparty directory inside the panda3d source directory, you may build Panda3D using a command like the following: