From 991c51f6ac18e58607ae4e2f122e52389da2424e Mon Sep 17 00:00:00 2001 From: Luca Grementieri Date: Mon, 26 Jun 2023 11:26:25 +0200 Subject: [PATCH 1/3] Update curvature.h --- vcg/complex/algorithms/update/curvature.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcg/complex/algorithms/update/curvature.h b/vcg/complex/algorithms/update/curvature.h index e61e2ce81..e5491b0f6 100644 --- a/vcg/complex/algorithms/update/curvature.h +++ b/vcg/complex/algorithms/update/curvature.h @@ -475,7 +475,7 @@ static void MeanAndGaussian(MeshType & m) angle2 = M_PI-(angle0+angle1); // Skip degenerate triangles. - if(angle0==0 || angle1==0 || angle1==0) continue; + if(angle0==0 || angle1==0 || angle2==0) continue; e01v = ( (*fi).V(1)->cP() - (*fi).V(0)->cP() ) ; e12v = ( (*fi).V(2)->cP() - (*fi).V(1)->cP() ) ; From 8d00179b9915881042e105aab8910180a6f59ca2 Mon Sep 17 00:00:00 2001 From: Alessandro Muntoni Date: Fri, 21 Jul 2023 15:34:13 +0200 Subject: [PATCH 2/3] just one workflow to build examples --- .github/workflows/BuildExamples.yml | 30 ++++++++++++++++++++++ .github/workflows/BuildExamplesLinux.yml | 20 --------------- .github/workflows/BuildExamplesMacOS.yml | 20 --------------- .github/workflows/BuildExamplesWindows.yml | 25 ------------------ 4 files changed, 30 insertions(+), 65 deletions(-) create mode 100644 .github/workflows/BuildExamples.yml delete mode 100644 .github/workflows/BuildExamplesLinux.yml delete mode 100644 .github/workflows/BuildExamplesMacOS.yml delete mode 100644 .github/workflows/BuildExamplesWindows.yml diff --git a/.github/workflows/BuildExamples.yml b/.github/workflows/BuildExamples.yml new file mode 100644 index 000000000..3637518b5 --- /dev/null +++ b/.github/workflows/BuildExamples.yml @@ -0,0 +1,30 @@ +name: BuildExamplesLinux + +on: + [push, pull_request] + +jobs: + ubuntu_build_tests: + name: Build Examples + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] + + steps: + - uses: actions/checkout@v3 + - name: Install Qt + uses: jurplel/install-qt-action@v3 + with: + cache: true + version: '5.15.2' + - name: Setup MSVC + uses: ilammy/msvc-dev-cmd@v1 + - name: Build Samples + shell: bash + run: | + mkdir build + cd build + cmake -GNinja -DVCG_BUILD_EXAMPLES=ON .. + ninja diff --git a/.github/workflows/BuildExamplesLinux.yml b/.github/workflows/BuildExamplesLinux.yml deleted file mode 100644 index e2fa3b37b..000000000 --- a/.github/workflows/BuildExamplesLinux.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: BuildExamplesLinux - -on: - [push, pull_request] - -jobs: - ubuntu_build_tests: - name: Build Examples (Linux) - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Install Qt - uses: jurplel/install-qt-action@v2 - - name: Build Samples - run: | - mkdir build - cd build - cmake -DVCG_BUILD_EXAMPLES=ON .. - make -j4 diff --git a/.github/workflows/BuildExamplesMacOS.yml b/.github/workflows/BuildExamplesMacOS.yml deleted file mode 100644 index 1c86276f8..000000000 --- a/.github/workflows/BuildExamplesMacOS.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: BuildExamplesMacOS - -on: - [push, pull_request] - -jobs: - macos_build_tests: - name: Build Examples (MacOS) - runs-on: macos-latest - - steps: - - uses: actions/checkout@v2 - - name: Install Qt - uses: jurplel/install-qt-action@v2 - - name: Build Samples - run: | - mkdir build - cd build - cmake -DVCG_BUILD_EXAMPLES=ON .. - make -j4 diff --git a/.github/workflows/BuildExamplesWindows.yml b/.github/workflows/BuildExamplesWindows.yml deleted file mode 100644 index 193024c09..000000000 --- a/.github/workflows/BuildExamplesWindows.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: BuildExamplesWindows - -on: [push, pull_request] - -jobs: - windows_build_tests: - name: Build Examples (Windows) - runs-on: windows-latest - - steps: - - uses: actions/checkout@v2 - - name: Setup env variables - id: envs - run: | - echo "VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC" >> $GITHUB_ENV - - name: Setup MSVC - uses: ilammy/msvc-dev-cmd@v1 - - name: Install Qt - uses: jurplel/install-qt-action@v2 - - name: Build Samples - run: | - mkdir build - cd build - cmake -GNinja -DVCG_BUILD_EXAMPLES=ON .. - ninja From 38b82aa3c8cac12bb08bf8f3c433a3789a9954b8 Mon Sep 17 00:00:00 2001 From: Alessandro Muntoni Date: Fri, 21 Jul 2023 15:44:20 +0200 Subject: [PATCH 3/3] install ninja before build --- .github/workflows/BuildExamples.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/BuildExamples.yml b/.github/workflows/BuildExamples.yml index 3637518b5..e44d703c4 100644 --- a/.github/workflows/BuildExamples.yml +++ b/.github/workflows/BuildExamples.yml @@ -1,4 +1,4 @@ -name: BuildExamplesLinux +name: BuildExamples on: [push, pull_request] @@ -21,6 +21,14 @@ jobs: version: '5.15.2' - name: Setup MSVC uses: ilammy/msvc-dev-cmd@v1 + - name: Setup env Linux + if: runner.os == 'Linux' + run: | + sudo apt-get install -y ninja-build + - name: Setup env macOS + if: runner.os == 'macOS' + run: | + brew install ninja - name: Build Samples shell: bash run: |