From fb3011751315cf47bf4cce4d26e60206da9dbfe0 Mon Sep 17 00:00:00 2001 From: Zac Zhang Date: Fri, 12 Jan 2024 17:29:19 +0100 Subject: [PATCH 1/6] update for the review --- CHANGELOG.md | 2 +- src/compas_view2/objects/meshobject.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 856e161de..fa6eec16b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed - +* Fixed bug [#212](https://github.com/compas-dev/compas_view2/issues/212). ### Removed diff --git a/src/compas_view2/objects/meshobject.py b/src/compas_view2/objects/meshobject.py index f46aaf93e..dee45f29e 100644 --- a/src/compas_view2/objects/meshobject.py +++ b/src/compas_view2/objects/meshobject.py @@ -180,9 +180,9 @@ def _frontfaces_data(self): positions.append(b) positions.append(c) if self.use_vertex_color: - colors.append(vertex_color[a]) - colors.append(vertex_color[b]) - colors.append(vertex_color[c]) + colors.append(vertex_color[vertices[0]]) + colors.append(vertex_color[vertices[1]]) + colors.append(vertex_color[vertices[2]]) else: colors.append(color) colors.append(color) @@ -254,9 +254,9 @@ def _backfaces_data(self): positions.append(b) positions.append(c) if self.use_vertex_color: - colors.append(vertex_color[a]) - colors.append(vertex_color[b]) - colors.append(vertex_color[c]) + colors.append(vertex_color[vertices[0]]) + colors.append(vertex_color[vertices[1]]) + colors.append(vertex_color[vertices[2]]) else: colors.append(color) colors.append(color) From 99f520bd900f196c283e8957ce7b80a20199703f Mon Sep 17 00:00:00 2001 From: Zac Zhang Date: Wed, 17 Jan 2024 11:34:58 +0100 Subject: [PATCH 2/6] test action: doc --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 5a683392b..8492d9235 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -12,7 +12,7 @@ on: jobs: docs: - runs-on: windows-latest + runs-on: ubuntu-latest steps: - uses: compas-dev/compas-actions.docs@v2 with: From 3b1c1a35321a83cd107421b880d7e39e5b4a64e7 Mon Sep 17 00:00:00 2001 From: Zac Zhang Date: Wed, 17 Jan 2024 11:40:44 +0100 Subject: [PATCH 3/6] announcement --- docs/conf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/conf.py b/docs/conf.py index 4b1993bd4..f1b5c78f6 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -137,6 +137,7 @@ def setup(app): "image_dark": "_static/compas_icon_white.png", # relative to parent of conf.py "text": project, }, + "announcement": "This is the achieve documentation for the COMPAS_View2 for compas<=1.17.9. The next generation of the viewer for compas>2 is available here.", } html_context = { From 5da9375218e880fb44878d174c46cf4841272052 Mon Sep 17 00:00:00 2001 From: Zac Zhang Date: Wed, 17 Jan 2024 11:41:54 +0100 Subject: [PATCH 4/6] patch --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 8492d9235..9c37beb2f 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,7 +14,7 @@ jobs: docs: runs-on: ubuntu-latest steps: - - uses: compas-dev/compas-actions.docs@v2 + - uses: compas-dev/compas-actions.docs@v3 with: github_token: ${{ secrets.GITHUB_TOKEN }} use_conda: true From 772a206ef2ce171d248cb68d7602e38432855af9 Mon Sep 17 00:00:00 2001 From: Zac Zhang Date: Wed, 17 Jan 2024 11:48:40 +0100 Subject: [PATCH 5/6] patch --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 9c37beb2f..3f02f6b51 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -12,7 +12,7 @@ on: jobs: docs: - runs-on: ubuntu-latest + runs-on: windows-latest steps: - uses: compas-dev/compas-actions.docs@v3 with: From 709a02eb02ee42b9e9c758fa0e013e1d1575952b Mon Sep 17 00:00:00 2001 From: Zac Zhang Date: Wed, 17 Jan 2024 11:57:46 +0100 Subject: [PATCH 6/6] patch --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 3f02f6b51..5a683392b 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,7 +14,7 @@ jobs: docs: runs-on: windows-latest steps: - - uses: compas-dev/compas-actions.docs@v3 + - uses: compas-dev/compas-actions.docs@v2 with: github_token: ${{ secrets.GITHUB_TOKEN }} use_conda: true