Merge branch 'master' into compile-time-connectivity-type

.gitlab-ci.yml

@@ -259,21 +259,6 @@ VS2015-32-bit-static-no-apps:
       - build-release/*.exe
       
       
-      
-VS2013-64-bit-shared-apps:
-  stage: build
-  variables:
-    BUILD_PLATFORM: "VS2013"
-    ARCHITECTURE:   "x64"
-    SHARED:         "TRUE"
-    APPS:           "ON"
-  script: "CI\\Windows.bat"
-  tags:
-    - VS2013
-  artifacts:
-    paths:
-      - build-release/*.exe
-
 VS2013-64-bit-shared-no-apps:
   stage: build
   variables:
@@ -288,20 +273,6 @@ VS2013-64-bit-shared-no-apps:
     paths:
       - build-release/*.exe
 
-VS2013-32-bit-shared-apps:
-  stage: build
-  variables:
-    BUILD_PLATFORM: "VS2013"
-    ARCHITECTURE:   "x32"
-    SHARED:         "TRUE"
-    APPS:           "ON"
-  script: "CI\\Windows.bat"
-  tags:
-    - VS2013
-  artifacts:
-    paths:
-      - build-release/*.exe
-
 VS2013-32-bit-shared-no-apps:
   stage: build
   variables:
@@ -316,20 +287,6 @@ VS2013-32-bit-shared-no-apps:
     paths:
       - build-release/*.exe
       
-VS2013-64-bit-static-apps:
-  stage: build
-  variables:
-    BUILD_PLATFORM: "VS2013"
-    ARCHITECTURE:   "x64"
-    SHARED:         "FALSE"
-    APPS:           "ON"
-  script: "CI\\Windows.bat"
-  tags:
-    - VS2013
-  artifacts:
-    paths:
-      - build-release/*.exe
-
 VS2013-64-bit-static-no-apps:
   stage: build
   variables:
@@ -344,20 +301,6 @@ VS2013-64-bit-static-no-apps:
     paths:
       - build-release/*.exe
 
-VS2013-32-bit-static-apps:
-  stage: build
-  variables:
-    BUILD_PLATFORM: "VS2013"
-    ARCHITECTURE:   "x32"
-    SHARED:         "FALSE"
-    APPS:           "ON"
-  script: "CI\\Windows.bat"
-  tags:
-    - VS2013
-  artifacts:
-    paths:
-      - build-release/*.exe
-
 VS2013-32-bit-static-no-apps:
   stage: build
   variables:

CHANGELOG.md

-Please look into the doxygen configuration (Generated from Doc/history.docu) 
+The changelog can be found in the html Documentation.
 
 The latest changelog for the master can be found here:
-http://openmesh.org/Daily-Builds/Doc/a00002.html
+http://openmesh.org/Daily-Builds/Doc/

CI/Windows.bat

@@ -16,22 +16,6 @@ IF "%SHARED%" == "TRUE" (
   set STRING_DLL=
 )
 
-IF "%BUILD_PLATFORM%" == "VS2012" (
-    set LIBPATH=E:\libs\VS2012
-    set GTESTVERSION=gtest-1.6.0
-    set GENERATOR=Visual Studio 11%ARCH_VS%
-    set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE\devenv.com"
-    IF "%ARCHITECTURE%" == "x64" (
-      set QT_INSTALL_PATH=E:\Qt\4.8.5-vs2012-%STRING_ARCH%\
-      set QT_BASE_CONFIG=-DQT_QMAKE_EXECUTABLE=E:\Qt\4.8.5-vs2012-%STRING_ARCH%\bin\qmake.exe
-    )
-
-    IF "%ARCHITECTURE%" == "x32" (
-      set QT_INSTALL_PATH=E:\Qt\4.8.5-vs2012-%STRING_ARCH%\
-      set QT_BASE_CONFIG=-DQT_QMAKE_EXECUTABLE=E:\Qt\4.8.5-vs2012-%STRING_ARCH%\bin\qmake.exe 
-    )
-) 
-
 IF "%BUILD_PLATFORM%" == "VS2013" (
     set LIBPATH=E:\libs\VS2013
     set GTESTVERSION=gtest-1.6.0
@@ -83,10 +67,15 @@ IF "%BUILD_PLATFORM%" == "VS2017" (
 IF "%APPS%" == "ON" (
   set STRING_APPS=
 
+  ECHO "Copying Platform plugins from %QT_INSTALL_PATH%\plugins\platforms to Build\plugins\platforms"
+  
+
+  
   REM Create the platform plugins subdirectory for the qt plugins required to run the gui apps
+  mkdir Build
   mkdir Build\plugins
   mkdir Build\plugins\platforms
-
+  
   REM Copy the platform plugins subdirectory for the qt plugins required to run the gui apps
   xcopy /Y %QT_INSTALL_PATH%\plugins\platforms Build\plugins\platforms 
   set CMAKE_CONFIGURATION=%QT_BASE_CONFIG%
@@ -95,6 +84,9 @@ IF "%APPS%" == "ON" (
   set CMAKE_CONFIGURATION=
 )
 
+
+
+
 ECHO "============================================================="
 ECHO "============================================================="
 ECHO "Building with :"
@@ -111,10 +103,26 @@ ECHO "QT_INSTALL_PATH     : %QT_INSTALL_PATH%"
 ECHO "CMAKE_CONFIGURATION : %CMAKE_CONFIGURATION%"
 ECHO "============================================================="
 ECHO "============================================================="
+ECHO ""
+ECHO "Running Build environment checks"
 
+IF EXIST %LIBPATH%\ (
+  ECHO "LIBPATH ... Ok"
+) ELSE (
+  ECHO "LIBPATH not found!"
+  exit 10;
+)
+
+
+IF EXIST %QT_INSTALL_PATH%\ (
+  ECHO "QT_INSTALL_PATH ... Ok"
+) ELSE (
+  ECHO "QT_INSTALL_PATH: %QT_INSTALL_PATH%\ not found!"
+  exit 10;
+)
 
 
-"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%"  -DCMAKE_BUILD_TYPE=Release -DBUILD_APPS=%APPS% -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DCMAKE_WINDOWS_LIBS_DIR="e:\libs" -DOPENMESH_BUILD_SHARED=%SHARED% %CMAKE_CONFIGURATION% ..
+"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_ROOT="%LIBPATH%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%"  -DCMAKE_BUILD_TYPE=Release -DBUILD_APPS=%APPS% -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DCMAKE_WINDOWS_LIBS_DIR="e:\libs" -DOPENMESH_BUILD_SHARED=%SHARED% %CMAKE_CONFIGURATION% ..
 
 %VS_PATH% /Build "Release" OpenMesh.sln /Project "ALL_BUILD"
 
@@ -134,7 +142,7 @@ mkdir build-debug
 
 cd build-debug
 
-"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DOPENMESH_BUILD_UNIT_TESTS=TRUE  -DCMAKE_BUILD_TYPE=Debug -DOPENMESH_BUILD_SHARED=%SHARED% -DBUILD_APPS=%APPS% %CMAKE_CONFIGURATION% ..
+"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_ROOT="%LIBPATH%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DOPENMESH_BUILD_UNIT_TESTS=TRUE  -DCMAKE_BUILD_TYPE=Debug -DOPENMESH_BUILD_SHARED=%SHARED% -DBUILD_APPS=%APPS% %CMAKE_CONFIGURATION% ..
 
 %VS_PATH% /Build "Debug" OpenMesh.sln /Project "ALL_BUILD"
 
@@ -164,13 +172,13 @@ cd build-release
 
 del *.exe
 
-"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH%\%ARCHITECTURE%\%GTESTVERSION%"  -G "%GENERATOR%" -DBUILD_APPS=%APPS% -DCMAKE_BUILD_TYPE=Release %CMAKE_CONFIGURATION% ..
+"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_ROOT="%LIBPATH%\%ARCHITECTURE%\%GTESTVERSION%"  -G "%GENERATOR%" -DBUILD_APPS=%APPS% -DCMAKE_BUILD_TYPE=Release %CMAKE_CONFIGURATION% ..
 
 %VS_PATH% /Build "Release" OpenMesh.sln /Project "PACKAGE"
 
 IF %errorlevel% NEQ 0 exit /b %errorlevel%
 
-move OpenMesh-*.exe "OpenMesh-7.1-Git-Master-%CI_BUILD_REF%-%BUILD_PLATFORM%-%STRING_ARCH%%STRING_DLL%%STRING_APPS%.exe"
+move OpenMesh-*.exe "OpenMesh-8.0-Git-Master-%CI_BUILD_REF%-%BUILD_PLATFORM%-%STRING_ARCH%%STRING_DLL%%STRING_APPS%.exe"
 
 
 

CI/ci-linux.sh

@@ -10,12 +10,15 @@ OPTIONS=""
 MAKE_OPTIONS=""
 BUILDPATH=""
 
+# set GTEST path
+OPTIONS="-DGTEST_ROOT=~/sw/gtest-1.8.0/"
+
 if [ "$COMPILER" == "gcc" ]; then
   echo "Building with GCC";
   BUILDPATH="gcc"
 
   # without icecc: no options required
-  OPTIONS="-DCMAKE_CXX_COMPILER=/usr/lib/icecc/bin/g++ -DCMAKE_C_COMPILER=/usr/lib/icecc/bin/gcc"
+  OPTIONS="$OPTIONS -DCMAKE_CXX_COMPILER=/usr/lib/icecc/bin/g++ -DCMAKE_C_COMPILER=/usr/lib/icecc/bin/gcc"
   MAKE_OPTIONS="-j16"
   export ICECC_CXX=/usr/bin/g++ ; export ICECC_CC=/usr/bin/gcc
 

CI/ci-mac.sh

@@ -11,6 +11,9 @@ export PATH
 
 OPTIONS=""
 
+# set GTEST path
+OPTIONS="$OPTIONS -DGTEST_ROOT=~/sw/gtest-1.7.0/"
+
 if [ "$LANGUAGE" == "C++98" ]; then
   echo "Building with C++98";
   BUILDPATH="cpp98"

Doc/Concepts/MeshItems.hh

@@ -40,12 +40,7 @@
  * ========================================================================= */
 
 
-/*===========================================================================*\
- *                                                                           *             
- *   $Revision$                                                         *
- *   $Date$                   *
- *                                                                           *
-\*===========================================================================*/
+
 
 
 //=============================================================================

Doc/Concepts/MeshKernel.hh

@@ -40,14 +40,6 @@
  * ========================================================================= */
 
 
-/*===========================================================================*\
- *                                                                           *
- *   $Revision$                                                         *
- *   $Date$                   *
- *                                                                           *
-\*===========================================================================*/
-
-
 //=============================================================================
 //
 //  Kernel Concept

Doc/Tutorial/01-build_cube/build_cube.cc

@@ -39,13 +39,6 @@
  *                                                                           *
  * ========================================================================= */
 
-/*===========================================================================*\
- *                                                                           *
- *   $Revision$                                                         *
- *   $Date$                   *
- *                                                                           *
-\*===========================================================================*/
-
 
 #include <iostream>
 // -------------------- OpenMesh

Doc/Tutorial/03-properties/smooth.cc

-#include <iostream>
-#include <vector>
-// --------------------
 #include <OpenMesh/Core/IO/MeshIO.hh>
 #include <OpenMesh/Core/Mesh/TriMesh_ArrayKernelT.hh>
+#include <OpenMesh/Core/Utils/PropertyManager.hh>
 
-typedef OpenMesh::TriMesh_ArrayKernelT<>  MyMesh;
+#include <iostream>
+#include <vector>
 
+using MyMesh = OpenMesh::TriMesh_ArrayKernelT<>;
 
-int main(int argc, char **argv)
+int main(int argc, char** argv)
 {
-  MyMesh  mesh;
-
-
-  // check command line options
-  if (argc != 4) 
-  {
-    std::cerr << "Usage:  " << argv[0] << " #iterations infile outfile\n";
-    return 1;
-  }
-
-
-
-  // read mesh from stdin
-  if ( ! OpenMesh::IO::read_mesh(mesh, argv[2]) )
-  {
-     std::cerr << "Error: Cannot read mesh from " << argv[2] << std::endl;
-     return 1;
-  }
-
-
-
-  // this vertex property stores the computed centers of gravity
-  OpenMesh::VPropHandleT<MyMesh::Point> cogs;
-  mesh.add_property(cogs);
-
-  // smoothing mesh argv[1] times
-  MyMesh::VertexIter          v_it, v_end(mesh.vertices_end());
-  MyMesh::VertexVertexIter    vv_it;
-  MyMesh::Point               cog;
-  MyMesh::Scalar              valence;
-  unsigned int                i, N(atoi(argv[1]));
-
-  
-  for (i=0; i < N; ++i)
-  {
-    for (v_it=mesh.vertices_begin(); v_it!=v_end; ++v_it)
-    {      
-      mesh.property(cogs,*v_it).vectorize(0.0f);
-      valence = 0.0;
-      
-      for (vv_it=mesh.vv_iter( *v_it ); vv_it; ++vv_it)
-      {
-	mesh.property(cogs,*v_it) += mesh.point( *vv_it );
-	++valence;
-      }
-      mesh.property(cogs,*v_it) /= valence;
+    // Read command line options
+    MyMesh mesh;
+    if (argc != 4) {
+        std::cerr << "Usage: " << argv[0] << " #iterations infile outfile" << std::endl;
+        return 1;
     }
+    const int iterations = argv[1];
+    const std::string infile = argv[2];
+    const std::string outfile = argv[3];
     
-    for (v_it=mesh.vertices_begin(); v_it!=v_end; ++v_it)
-      if ( !mesh.is_boundary( *v_it ) )
-	mesh.set_point( *v_it, mesh.property(cogs,*v_it) );
-  }
-
-
-  // write mesh to stdout
-  if ( ! OpenMesh::IO::write_mesh(mesh, argv[3]) )
-  {
-    std::cerr << "Error: cannot write mesh to " << argv[3] << std::endl;
-    return 1;
-  }
+    // Read mesh file
+    if (!OpenMesh::IO::read_mesh(mesh, infile)) {
+        std::cerr << "Error: Cannot read mesh from " << infile << std::endl;
+        return 1;
+    }
 
-  return 0;
+    {
+      // Add a vertex property storing the computed centers of gravity
+      auto cog = OpenMesh::makeTemporaryProperty<OpenMesh::VertexHandle, MyMesh::Point>(mesh);
+
+      // Smooth the mesh several times
+      for (int i = 0; i < iterations; ++i) {
+          // Iterate over all vertices to compute centers of gravity
+          for (const auto& vh : mesh.vertices()) {
+              cog[vh] = {0,0,0};
+              int valence = 0;
+              // Iterate over all 1-ring vertices around vh
+              for (const auto& vvh : mesh.vv_range(vh)) {
+                  cog[vh] += mesh.point(vvh);
+                  ++valence;
+              }
+              cog[vh] /= valence;
+          }
+          // Move all vertices to the previously computed positions
+          for (const auto& vh : mesh.vertices()) {
+              mesh.point(vh) = cog[vh];
+          }
+      }
+    } // The cog vertex property is removed from the mesh at the end of this scope
+    
+    // Write mesh file
+    if (!OpenMesh::IO::read_mesh(mesh, outfile)) {
+        std::cerr << "Error: Cannot write mesh to " << outfile << std::endl;
+        return 1;
+    }
 }

Doc/Tutorial/07b-delete_geometry/delete_geometry.cc

@@ -39,14 +39,6 @@
  *                                                                           *
  * ========================================================================= */
 
-/*===========================================================================*\
- *                                                                           *
- *   $Revision: 736 $                                                         *
- *   $Date: 2012-10-08 09:30:49 +0200 (Mo, 08. Okt 2012) $                   *
- *                                                                           *
-\*===========================================================================*/
-
-
 #include <iostream>
 // -------------------- OpenMesh
 #include <OpenMesh/Core/IO/MeshIO.hh>

Doc/changelog.docu

@@ -7,17 +7,28 @@
 <!-- --------------------------------------------------------------------- -->
 
 
-<tr valign=top><td><b>7.2</b> (?/?/?)</td><td>
+<tr valign=top><td><b>8.0</b> (?/?/?)</td><td>
+
+<b>Breaking changes:</b>
+<ul>
+<li>Don't run and test on VS2013 anymore. As VS2013 still lacks some C++11 features, we remove it from our list of supported platforms</li>
+</ul>
 
 <b>Core</b>
 <ul>
 <li>TriConnectivity: Added two functions split_edge and split_edge_copy to mask the PolyConnectivity functions of the same name (Prevents creation of valence 2 vertices on trimeshes)</li>
+<li>PolyConnectivity: Fixed PolyConnectivity is_collapse_ok, missing some configurations (Thanks to Simon Flöry for the patch)</li>
 </ul>
 
 <b>IO</b>
 <ul>
 <li>PLY Reader: Allowing the PLY reader to read custom face ( Thanks to morgan Leborgne for the patch)</li>
 <li>PLY Reader: Fixed endless loop on unknown property list type</li>
+<li>PLY Reader: Fix hang when reading directly from istream (Thanks to Paul Loré for the patch)</li>
+<li>OM Writer/Reader: Update file format version to 2.0. Older files can still be read, but older OpenMesh versions cannot read new format.</li>
+<li>OM Writer/Reader: Fixed inconsistent writing/reading of edge properties</li>
+<li>OM Writer/Reader: Add option to store status</li>
+<li>OBJ Writer: Use Fixed as stream option in OBJ writer to avoid problems with other programs reading scientific notation</li>
 </ul>
 
 <b>Tools</b>
@@ -25,6 +36,11 @@
 <li>SmartTagger: Added the SmartTagger class to tag primitives (O(1) reset )</li>
 </ul>
 
+<b>Apps</b>
+<ul>
+<li>Fixed several warnings with gcc 8</li>
+</ul>
+
 <b>Build System</b>
 <ul>
 <li>Rename the DEPRECATED macro into OM_DEPRECATED to prevent a macro clash with Intel MKL (Thanks to Morgan Leborgne for the patch)</li>

Doc/compiling.docu

@@ -12,12 +12,11 @@ supports at least C++11
 <table>
 
 <tr><td> Linux </td><td>
-gcc   >= 4.8.x<br>
+gcc   >= 6.3<br>
 clang >= 3.3<br>
 </td></tr>
 
 <tr><td> Windows </td><td> 
-Microsoft Visual Studio 2013<br>
 Microsoft Visual Studio 2015<br>
 Microsoft Visual Studio 2017<br>
 </td></tr>

Doc/mainpage.docu

@@ -24,6 +24,10 @@ Here you can find information on how to build projects using the %OpenMesh libra
 as well as further information on mesh handling in %OpenMesh.
 The tutorials explain how to use %OpenMesh by demonstrating real code examples.
 
+\section openmesh-python OpenMesh Python Bindings
+We also provide python bindings for %OpenMesh. You can find them here:<br/>
+<tt>https://www.graphics.rwth-aachen.de:9000/OpenMesh/openmesh-python</tt>
+
 \section iov Building OpenMesh