Merge branch 'devel'

.appveyor.yml

@@ -0,0 +1,59 @@
+branches:
+  only:
+    - devel
+
+# Build worker image (VM template)
+image: Visual Studio 2015
+
+# clone directory
+clone_folder: c:\projects\vcglib
+# Build Configuration, i.e. Debug, Release, etc.
+configuration:
+  - release
+#  - debug
+
+environment:
+  matrix:
+    # MinGW 32bit
+    - QTDIR: C:\Qt\5.6\mingw49_32
+      SPEC: win32-g++
+      COMPILER: mingw32-make
+      #ARTIFACT: $(APPVEYOR_PROJECT_NAME)-%APPVEYOR_REPO_TAG_NAME%.%APPVEYOR_BUILD_NUMBER%-win32.zip
+      #ARTIFACT: $(APPVEYOR_PROJECT_NAME)-%APPVEYOR_REPO_TAG_NAME%-win32.zip
+    # Microsoft Visual Studio 64bit
+    - QTDIR: C:\Qt\5.6\msvc2015_64
+      VSVER: 14.0
+      SPEC: win32-msvc2015
+      COMPILER: nmake
+      #ARTIFACT: $(APPVEYOR_PROJECT_NAME)-%APPVEYOR_REPO_TAG_NAME%.%APPVEYOR_BUILD_NUMBER%-win64.zip
+      #ARTIFACT: $(APPVEYOR_PROJECT_NAME)-%APPVEYOR_REPO_TAG_NAME%-win64.zip
+
+
+
+# Set paths, etc.
+before_build:
+  # Set paths
+  #- '%QTDIR%\bin\qtenv2.bat'
+  - call "%QTDIR%\bin\qtenv2.bat"
+  # Show qmake and make version
+  - qmake -v
+  - if %COMPILER%==mingw32-make call %COMPILER% -v
+  # Detect architecture (32bit or 64bit)
+  - if %QTDIR:_64=%==%QTDIR% (set ARCH=x86) else (set ARCH=x64)
+  # Set more... if Microsoft Visual Studio
+  - if %COMPILER%==nmake call "%ProgramFiles(x86)%\Microsoft Visual Studio %VSVER%\VC\vcvarsall.bat" %ARCH%
+  # Show build folder
+  #- echo %APPVEYOR_BUILD_FOLDER%
+  #- echo %CONFIGURATION%
+
+# To run your custom scripts instead of automatic MSBuild
+build_script:
+  # Go to clone directory
+  - cd %APPVEYOR_BUILD_FOLDER%
+  - cd apps
+  - cd sample
+  # Run qmake
+  - qmake sample.pro -r -spec %SPEC% "CONFIG+=%CONFIGURATION%"
+  # Run compiler
+  #- '%COMPILER%'
+  - call %COMPILER%

.github/pull_request_template.md

@@ -0,0 +1,14 @@
+## Thank you for sending a Pull Request to the VCGLib! 
+
+VCGLib is fully owned by CNR, and all the VCGLib contributors that do not work at the VCLab of CNR must first sign the contributor license agreement that you can find at the following link: https://github.com/cnr-isti-vclab/vcglib/blob/devel/docs/ContributorLicenseAgreement.pdf
+
+If you will sign the CLA, then we will be able to merge your pull request after reviewing it.
+Please send the signed document to [email protected] and [email protected] .
+If you will not sign the CLA, we will review and then apply your changes as soon as possible.
+
+Before opening the PR, please leave the follwing form with a check for your particluar case:
+
+##### Check with `[x]` what is your case:
+- [ ] I already signed and sent via email the CLA;
+- [ ] I wil sign and send the CLA via email as soon as possible;
+- [ ] I don't want to sign the CLA.

.github/workflows/BuildSamplesMacOS.yml

@@ -0,0 +1,18 @@
+name: BuildSamplesMacOS
+
+on:
+  [push, pull_request]
+
+jobs:
+  macos_build_tests:
+    name: Build Samples (MacOS)
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v2
+    - name: Build Samples
+      run: |
+        qmake apps/sample/sample.pro
+        make -j4

.github/workflows/BuildSamplesUbuntu.yml

@@ -0,0 +1,18 @@
+name: BuildSamplesUbuntu
+
+on:
+  [push, pull_request]
+
+jobs:
+  ubuntu_build_tests:
+    name: Build Samples (Ubuntu)
+    runs-on: ubuntu-latest #in order to deploy, need to use oldest supported version
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v2
+    - name: Build Samples
+      run: |
+        qmake apps/sample/sample.pro
+        make -j4

.github/workflows/BuildSamplesWindows.yml

@@ -0,0 +1,29 @@
+name: BuildSamplesWindows
+
+on: [push, pull_request]
+
+jobs:
+  windows_build_tests:
+    name: Build Samples (Windows)
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Downlaod Jom
+      run: |
+        Invoke-WebRequest -Uri "http://download.qt.io/official_releases/jom/jom_1_1_3.zip" -OutFile "jom_1_1_3.zip"
+        New-Item -Name "jom" -ItemType "directory"
+        Expand-Archive -Path jom_1_1_3.zip -DestinationPath .\jom
+        echo "::add-path::$(Get-Location)\jom"
+    - name: Setup env variables
+      id: envs
+      run: |
+        echo '::set-env name=VCINSTALLDIR::C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC'
+    - name: Setup MSVC
+      uses: ilammy/msvc-dev-cmd@v1
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v2
+    - name: Build Samples
+      run: |
+        qmake apps/sample/sample.pro
+        jom -j4

.gitignore

@@ -1,3 +1,7 @@
+# Please do not add here all kind of intermediate files just by extension. 
+# Try whenever possible to match folder and to try to use 
+# building rules that put all the generated files into separate folders
+
 # QTCreator user prefs
 *.user
 
@@ -9,4 +13,15 @@ release/
 /docs/Doxygen/html/
 
 # Intermediate Files
-*.bc
+*.bc
+
+# Visual Studio Project files
+*.vcxproj
+*.vcxproj.filters
+*.suo
+*.ply
+wrap/nanoply/nanoply_vcg/nanoply_vcg.sln
+*.db
+wrap/nanoply/nanoply_vcg/nanoply_vcg.VC.VC.opendb
+wrap/nanoply/nanoply_vcg/.vs/nanoply_vcg/v15/ipch/AutoPCH/NANOPLY_VCG-1b6b1a83/MAIN-5f62d91f/MAIN.ipch
+*.sln

.travis.yml

@@ -0,0 +1,49 @@
+
+# Enable C++ support
+language: cpp
+
+os:
+  - linux
+  - osx
+
+
+# Compiler selection
+compiler:
+  - clang
+  - gcc
+
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - gcc-4.8
+    - g++-4.8
+    - clang
+
+matrix:
+    exclude:
+    - os: osx
+      compiler: gcc
+
+
+install:
+# Linux Setup 
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then wget --no-check-certificate http://cmake.org/files/v3.1/cmake-3.1.3-Linux-x86_64.tar.gz   ;fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then tar -xzf cmake-3.1.3-Linux-x86_64.tar.gz                                                  ;fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8" ;fi                         ;fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export PATH=$PWD/cmake-3.1.3-Linux-x86_64/bin:$PATH                                       ;fi 
+# OSX Setup 
+  - if [[ "$TRAVIS_OS_NAME" == "osx"   ]]; then which cmake                                                                               ;fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx"   ]]; then wget --no-check-certificate http://cmake.org/files/v3.7/cmake-3.7.2-Darwin-x86_64.tar.gz  ;fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx"   ]]; then tar -xzf cmake-3.7.2-Darwin-x86_64.tar.gz                                                 ;fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx"   ]]; then export PATH=$PWD/cmake-3.1.3-Darwin-x86_64/CMake.app/Contents/bin:$PATH                   ;fi 
+  - if [[ "$TRAVIS_OS_NAME" == "osx"   ]]; then which cmake                                                                               ;fi
+
+# Build steps
+script:
+  - cd apps
+  - mkdir build
+  - cd build
+  - cmake ..
+  - make

README.md

@@ -1,6 +1,10 @@
 The **_Visualization and Computer Graphics Library_** (VCGlib for short) is a open source, portable, C++, templated, no dependency, library for manipulation, processing, cleaning, simplifying triangle meshes.
 
-The library, composed by more than 100k lines of code, is released under the GPL license, and it is the base of most of the software tools of the [Visual Computing Lab](http://vcg.isti.cnr.it) of the Italian National Research Council Institute ISTI , like MeshLab, metro and many others.
+![BuildSamplesUbuntu](https://github.com/cnr-isti-vclab/vcglib/workflows/BuildSamplesUbuntu/badge.svg)
+![BuildSamplesMacOS](https://github.com/cnr-isti-vclab/vcglib/workflows/BuildSamplesMacOS/badge.svg)
+![BuildSamplesWindows](https://github.com/cnr-isti-vclab/vcglib/workflows/BuildSamplesWindows/badge.svg)
+
+The library, composed by more than 100k lines of code, is released under the GPL license, and it is the base of most of the software tools of the [Visual Computing Lab](http://vcg.isti.cnr.it) of the Italian National Research Council Institute ISTI, like MeshLab, metro and many others.
 
 The VCG library is tailored to mostly manage triangular meshes: The library is fairly large and offers many state of the art functionalities for processing meshes, like:
 

apps/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_BUILD_TYPE Release)
+set(CMAKE_CXX_STANDARD_REQUIRED ON) #...is required...
+set(CMAKE_CXX_EXTENSIONS OFF) #...without compiler extensions like gnu++11
+include_directories(../)
+include_directories(../eigenlib)
+add_subdirectory(metro)
+add_subdirectory(tridecimator)

apps/sample/trimesh_QT/trimesh_qt.pro → apps/QT/trimesh_QT/trimesh_qt.pro

@@ -17,6 +17,7 @@ OBJECTS_DIR = build/obj
 # Lib headers
 INCLUDEPATH += .
 INCLUDEPATH += ../../..
+INCLUDEPATH += ../../../eigenlib
 
 # Lib sources
 SOURCES += ../../../wrap/ply/plylib.cpp