From e64096febe8aa25f6318131042cb5c921233488e Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Wed, 6 May 2020 12:00:29 +0200 Subject: [PATCH 1/9] removed unuseful matrix44 copy constructor --- vcg/math/matrix44.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vcg/math/matrix44.h b/vcg/math/matrix44.h index 2ea806d6..2dca8aca 100644 --- a/vcg/math/matrix44.h +++ b/vcg/math/matrix44.h @@ -85,7 +85,7 @@ public: */ Matrix44() {} ~Matrix44() {} - Matrix44(const Matrix44 &m); + //Matrix44(const Matrix44 &m); Matrix44(const T v[]); T &ElementAt(const int row, const int col); @@ -243,9 +243,9 @@ typedef Matrix44 Matrix44d; -template Matrix44::Matrix44(const Matrix44 &m) { - memcpy((T *)_a, (const T *)m._a, 16 * sizeof(T)); -} +//template Matrix44::Matrix44(const Matrix44 &m) { +// memcpy((T *)_a, (const T *)m._a, 16 * sizeof(T)); +//} template Matrix44::Matrix44(const T v[]) { memcpy((T *)_a, v, 16 * sizeof(T)); From 59b67d95d37a0e8a70e79bd5bc093332d5c4ba51 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Wed, 6 May 2020 15:56:15 +0200 Subject: [PATCH 2/9] removed FacePos and PerMeshAttributeHandle assignment operators --- vcg/complex/base.h | 10 +++++----- vcg/simplex/face/pos.h | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/vcg/complex/base.h b/vcg/complex/base.h index b58baa5c..c2f17442 100644 --- a/vcg/complex/base.h +++ b/vcg/complex/base.h @@ -332,11 +332,11 @@ public: public: PerMeshAttributeHandle(){_handle=NULL;} PerMeshAttributeHandle(void *ah,const int & n):_handle ( (Attribute *)ah ),n_attr(n){} - PerMeshAttributeHandle operator = ( const PerMeshAttributeHandle & pva){ - _handle = (Attribute *)pva._handle; - n_attr = pva.n_attr; - return (*this); - } + //PerMeshAttributeHandle operator = ( const PerMeshAttributeHandle & pva){ + // _handle = (Attribute *)pva._handle; + // n_attr = pva.n_attr; + // return (*this); + //} Attribute * _handle; int n_attr; diff --git a/vcg/simplex/face/pos.h b/vcg/simplex/face/pos.h index 0f7dedc4..bfc0103f 100644 --- a/vcg/simplex/face/pos.h +++ b/vcg/simplex/face/pos.h @@ -129,12 +129,12 @@ public: } /// Assignment operator - inline PosType & operator = ( const PosType & h ){ - f=h.f; - z=h.z; - v=h.v; - return *this; - } + //inline PosType & operator = ( const PosType & h ){ + // f=h.f; + // z=h.z; + // v=h.v; + // return *this; + //} /// Set to null the half-edge void SetNull(){ From f1a642ad28df3b4cac68c73f355b8a16237e5569 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Tue, 12 May 2020 15:31:58 +0200 Subject: [PATCH 3/9] removed using namespace std from header file --- vcg/complex/algorithms/mesh_to_matrix.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/vcg/complex/algorithms/mesh_to_matrix.h b/vcg/complex/algorithms/mesh_to_matrix.h index 06ff42f6..96e4a2c1 100644 --- a/vcg/complex/algorithms/mesh_to_matrix.h +++ b/vcg/complex/algorithms/mesh_to_matrix.h @@ -28,8 +28,6 @@ #include #include -using namespace std; - namespace vcg { namespace tri { template < typename MeshType > From 385776d351ca5d7258679763ca23e525f6a9e57a Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Fri, 19 Jun 2020 14:53:06 +0200 Subject: [PATCH 4/9] introducing github actions vcg --- .github/workflows/BuildTestsMacOS.yml | 22 ++++++++++++++++++++++ .github/workflows/BuildTestsUbuntu.yml | 22 ++++++++++++++++++++++ .github/workflows/BuildTestsWindows.yml | 21 +++++++++++++++++++++ apps/sample/sample_poly.pro | 10 ---------- 4 files changed, 65 insertions(+), 10 deletions(-) create mode 100644 .github/workflows/BuildTestsMacOS.yml create mode 100644 .github/workflows/BuildTestsUbuntu.yml create mode 100644 .github/workflows/BuildTestsWindows.yml delete mode 100644 apps/sample/sample_poly.pro diff --git a/.github/workflows/BuildTestsMacOS.yml b/.github/workflows/BuildTestsMacOS.yml new file mode 100644 index 00000000..44dc0fe4 --- /dev/null +++ b/.github/workflows/BuildTestsMacOS.yml @@ -0,0 +1,22 @@ +name: BuildTestsMacOS + +on: + [push, pull_request] + +jobs: + macos_build_tests: + name: Build Tests (MacOS) + runs-on: macos-latest + + steps: + - uses: actions/checkout@v2 + - name: Install Qt + uses: jurplel/install-qt-action@v2 +# - name: Install dependencies +# run: | +# sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libglew-dev libeigen3-dev libgmp-dev +# sudo apt-get install -y libxkbcommon-x11-0 patchelf + - name: Build Tests + run: | + qmake apps/sample/sample.pro + make -j4 diff --git a/.github/workflows/BuildTestsUbuntu.yml b/.github/workflows/BuildTestsUbuntu.yml new file mode 100644 index 00000000..6a2d8dee --- /dev/null +++ b/.github/workflows/BuildTestsUbuntu.yml @@ -0,0 +1,22 @@ +name: BuildTestsUbuntu + +on: + [push, pull_request] + +jobs: + ubuntu_build_tests: + name: Build Tests (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: Install dependencies +# run: | +# sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libglew-dev libeigen3-dev libgmp-dev +# sudo apt-get install -y libxkbcommon-x11-0 patchelf + - name: Build Tests + run: | + qmake apps/sample/sample.pro + make -j4 diff --git a/.github/workflows/BuildTestsWindows.yml b/.github/workflows/BuildTestsWindows.yml new file mode 100644 index 00000000..016bd53a --- /dev/null +++ b/.github/workflows/BuildTestsWindows.yml @@ -0,0 +1,21 @@ +name: BuildTestsWindows + +on: [push, pull_request] + +jobs: + windows_build_tests: + name: Build Tests (Windows) + runs-on: windows-latest + + steps: + - uses: actions/checkout@v2 + - name: Install Qt + uses: jurplel/install-qt-action@v2 +# - name: Install dependencies +# run: | +# sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libglew-dev libeigen3-dev libgmp-dev +# sudo apt-get install -y libxkbcommon-x11-0 patchelf + - name: Build Tests + run: | + qmake apps/sample/sample.pro + make -j4 diff --git a/apps/sample/sample_poly.pro b/apps/sample/sample_poly.pro deleted file mode 100644 index 249d29b4..00000000 --- a/apps/sample/sample_poly.pro +++ /dev/null @@ -1,10 +0,0 @@ - -TEMPLATE = subdirs -SUBDIRS = polygonmesh_base \ - polygonmesh_dual \ - polygonmesh_optimize \ -# polygonmesh_quadsimpl \ - polygonmesh_smooth \ - polygonmesh_zonohedra - - From 8240b0e3fdc99e1eaee002af760dd8c418e00e85 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Fri, 19 Jun 2020 14:59:17 +0200 Subject: [PATCH 5/9] update windows tests --- .github/workflows/BuildTestsWindows.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/BuildTestsWindows.yml b/.github/workflows/BuildTestsWindows.yml index 016bd53a..c34f47dc 100644 --- a/.github/workflows/BuildTestsWindows.yml +++ b/.github/workflows/BuildTestsWindows.yml @@ -9,6 +9,18 @@ jobs: 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: Install dependencies @@ -18,4 +30,4 @@ jobs: - name: Build Tests run: | qmake apps/sample/sample.pro - make -j4 + jom -j4 From 0155d31d5ae88b5a56f44457f23cbdd21d192d18 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Fri, 19 Jun 2020 15:58:13 +0200 Subject: [PATCH 6/9] fixing some subprojects --- .github/workflows/BuildTestsMacOS.yml | 4 ---- .github/workflows/BuildTestsUbuntu.yml | 4 ---- .github/workflows/BuildTestsWindows.yml | 4 ---- apps/sample/colorspace/colorspace.pro | 8 ++------ apps/sample/polygonmesh_dual/polygonmesh_dual.pro | 4 ---- 5 files changed, 2 insertions(+), 22 deletions(-) diff --git a/.github/workflows/BuildTestsMacOS.yml b/.github/workflows/BuildTestsMacOS.yml index 44dc0fe4..deff9659 100644 --- a/.github/workflows/BuildTestsMacOS.yml +++ b/.github/workflows/BuildTestsMacOS.yml @@ -12,10 +12,6 @@ jobs: - uses: actions/checkout@v2 - name: Install Qt uses: jurplel/install-qt-action@v2 -# - name: Install dependencies -# run: | -# sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libglew-dev libeigen3-dev libgmp-dev -# sudo apt-get install -y libxkbcommon-x11-0 patchelf - name: Build Tests run: | qmake apps/sample/sample.pro diff --git a/.github/workflows/BuildTestsUbuntu.yml b/.github/workflows/BuildTestsUbuntu.yml index 6a2d8dee..830d0750 100644 --- a/.github/workflows/BuildTestsUbuntu.yml +++ b/.github/workflows/BuildTestsUbuntu.yml @@ -12,10 +12,6 @@ jobs: - uses: actions/checkout@v2 - name: Install Qt uses: jurplel/install-qt-action@v2 -# - name: Install dependencies -# run: | -# sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libglew-dev libeigen3-dev libgmp-dev -# sudo apt-get install -y libxkbcommon-x11-0 patchelf - name: Build Tests run: | qmake apps/sample/sample.pro diff --git a/.github/workflows/BuildTestsWindows.yml b/.github/workflows/BuildTestsWindows.yml index c34f47dc..aa215f4a 100644 --- a/.github/workflows/BuildTestsWindows.yml +++ b/.github/workflows/BuildTestsWindows.yml @@ -23,10 +23,6 @@ jobs: uses: ilammy/msvc-dev-cmd@v1 - name: Install Qt uses: jurplel/install-qt-action@v2 -# - name: Install dependencies -# run: | -# sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libglew-dev libeigen3-dev libgmp-dev -# sudo apt-get install -y libxkbcommon-x11-0 patchelf - name: Build Tests run: | qmake apps/sample/sample.pro diff --git a/apps/sample/colorspace/colorspace.pro b/apps/sample/colorspace/colorspace.pro index cb5f1612..76787855 100644 --- a/apps/sample/colorspace/colorspace.pro +++ b/apps/sample/colorspace/colorspace.pro @@ -1,7 +1,3 @@ +include(../common.pri) TARGET = colorspace -LIBPATH += -DEPENDPATH += . -INCLUDEPATH += . ../../.. -CONFIG += console stl -TEMPLATE = app -SOURCES += colorspace.cpp \ No newline at end of file +SOURCES += colorspace.cpp diff --git a/apps/sample/polygonmesh_dual/polygonmesh_dual.pro b/apps/sample/polygonmesh_dual/polygonmesh_dual.pro index e92bf0b3..169072de 100644 --- a/apps/sample/polygonmesh_dual/polygonmesh_dual.pro +++ b/apps/sample/polygonmesh_dual/polygonmesh_dual.pro @@ -1,7 +1,3 @@ -\macx: QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9 -QMAKE_MAC_SDK = macosx10.9 -CONFIG += c++11 - include(../common.pri) TARGET = polygonmesh_base SOURCES += polygonmesh_dual.cpp ../../../wrap/ply/plylib.cpp From b71ed2b60033d85657c0e0320d1bd84513109957 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Fri, 19 Jun 2020 16:01:58 +0200 Subject: [PATCH 7/9] fixing some subprojects --- apps/sample/polygonmesh_optimize/polygonmesh_optimize.pro | 4 ---- 1 file changed, 4 deletions(-) diff --git a/apps/sample/polygonmesh_optimize/polygonmesh_optimize.pro b/apps/sample/polygonmesh_optimize/polygonmesh_optimize.pro index bb127a8c..1bbfbcf3 100644 --- a/apps/sample/polygonmesh_optimize/polygonmesh_optimize.pro +++ b/apps/sample/polygonmesh_optimize/polygonmesh_optimize.pro @@ -1,7 +1,3 @@ -\macx: QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9 -QMAKE_MAC_SDK = macosx10.9 -CONFIG += c++11 - include(../common.pri) TARGET = polygonmesh_base SOURCES += polygonmesh_optimize.cpp ../../../wrap/ply/plylib.cpp From d4bd7f1407be98c010cf3333e9229115e503e07d Mon Sep 17 00:00:00 2001 From: Alessandro Muntoni Date: Fri, 19 Jun 2020 16:10:21 +0200 Subject: [PATCH 8/9] Update README.md --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3bb80d94..6e2487e1 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ 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. -[![Build Status](https://travis-ci.org/cnr-isti-vclab/vcglib.svg?branch=devel)](https://travis-ci.org/cnr-isti-vclab/vcglib) -[![Build status](https://ci.appveyor.com/api/projects/status/7k27s4k4xjmeowoe/branch/devel?svg=true)](https://ci.appveyor.com/project/cignoni/vcglib/branch/devel) +![BuildTestsUbuntu](https://github.com/cnr-isti-vclab/vcglib/workflows/BuildTestsUbuntu/badge.svg) +![BuildTestsMacOS](https://github.com/cnr-isti-vclab/vcglib/workflows/BuildTestsMacOS/badge.svg) +![BuildTestsWindows](https://github.com/cnr-isti-vclab/vcglib/workflows/BuildTestsWindows/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. From d907a3887ceed48ae650b1225386a146f1b8185b Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Fri, 19 Jun 2020 16:14:50 +0200 Subject: [PATCH 9/9] renaming tests to samples on workflows --- .../{BuildTestsMacOS.yml => BuildSamplesMacOS.yml} | 6 +++--- .../{BuildTestsUbuntu.yml => BuildSamplesUbuntu.yml} | 6 +++--- .../{BuildTestsWindows.yml => BuildSamplesWindows.yml} | 6 +++--- README.md | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) rename .github/workflows/{BuildTestsMacOS.yml => BuildSamplesMacOS.yml} (75%) rename .github/workflows/{BuildTestsUbuntu.yml => BuildSamplesUbuntu.yml} (79%) rename .github/workflows/{BuildTestsWindows.yml => BuildSamplesWindows.yml} (90%) diff --git a/.github/workflows/BuildTestsMacOS.yml b/.github/workflows/BuildSamplesMacOS.yml similarity index 75% rename from .github/workflows/BuildTestsMacOS.yml rename to .github/workflows/BuildSamplesMacOS.yml index deff9659..7640a8ea 100644 --- a/.github/workflows/BuildTestsMacOS.yml +++ b/.github/workflows/BuildSamplesMacOS.yml @@ -1,18 +1,18 @@ -name: BuildTestsMacOS +name: BuildSamplesMacOS on: [push, pull_request] jobs: macos_build_tests: - name: Build Tests (MacOS) + name: Build Samples (MacOS) runs-on: macos-latest steps: - uses: actions/checkout@v2 - name: Install Qt uses: jurplel/install-qt-action@v2 - - name: Build Tests + - name: Build Samples run: | qmake apps/sample/sample.pro make -j4 diff --git a/.github/workflows/BuildTestsUbuntu.yml b/.github/workflows/BuildSamplesUbuntu.yml similarity index 79% rename from .github/workflows/BuildTestsUbuntu.yml rename to .github/workflows/BuildSamplesUbuntu.yml index 830d0750..9601bba4 100644 --- a/.github/workflows/BuildTestsUbuntu.yml +++ b/.github/workflows/BuildSamplesUbuntu.yml @@ -1,18 +1,18 @@ -name: BuildTestsUbuntu +name: BuildSamplesUbuntu on: [push, pull_request] jobs: ubuntu_build_tests: - name: Build Tests (Ubuntu) + 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 Tests + - name: Build Samples run: | qmake apps/sample/sample.pro make -j4 diff --git a/.github/workflows/BuildTestsWindows.yml b/.github/workflows/BuildSamplesWindows.yml similarity index 90% rename from .github/workflows/BuildTestsWindows.yml rename to .github/workflows/BuildSamplesWindows.yml index aa215f4a..999008ea 100644 --- a/.github/workflows/BuildTestsWindows.yml +++ b/.github/workflows/BuildSamplesWindows.yml @@ -1,10 +1,10 @@ -name: BuildTestsWindows +name: BuildSamplesWindows on: [push, pull_request] jobs: windows_build_tests: - name: Build Tests (Windows) + name: Build Samples (Windows) runs-on: windows-latest steps: @@ -23,7 +23,7 @@ jobs: uses: ilammy/msvc-dev-cmd@v1 - name: Install Qt uses: jurplel/install-qt-action@v2 - - name: Build Tests + - name: Build Samples run: | qmake apps/sample/sample.pro jom -j4 diff --git a/README.md b/README.md index 6e2487e1..f9065e7e 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ 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. -![BuildTestsUbuntu](https://github.com/cnr-isti-vclab/vcglib/workflows/BuildTestsUbuntu/badge.svg) -![BuildTestsMacOS](https://github.com/cnr-isti-vclab/vcglib/workflows/BuildTestsMacOS/badge.svg) -![BuildTestsWindows](https://github.com/cnr-isti-vclab/vcglib/workflows/BuildTestsWindows/badge.svg) +![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.