Skip to content

Commit

Permalink
Merge branch 'devel' into devel-davidboening
Browse files Browse the repository at this point in the history
  • Loading branch information
alemuntoni committed Jul 21, 2023
2 parents cee85d9 + 7a1dbaf commit f547640
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 66 deletions.
38 changes: 38 additions & 0 deletions .github/workflows/BuildExamples.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: BuildExamples

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: 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: |
mkdir build
cd build
cmake -GNinja -DVCG_BUILD_EXAMPLES=ON ..
ninja
20 changes: 0 additions & 20 deletions .github/workflows/BuildExamplesLinux.yml

This file was deleted.

20 changes: 0 additions & 20 deletions .github/workflows/BuildExamplesMacOS.yml

This file was deleted.

25 changes: 0 additions & 25 deletions .github/workflows/BuildExamplesWindows.yml

This file was deleted.

2 changes: 1 addition & 1 deletion vcg/complex/algorithms/update/curvature.h
Original file line number Diff line number Diff line change
Expand Up @@ -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() ) ;
Expand Down

0 comments on commit f547640

Please sign in to comment.