Merge branch 'devel'

.github/actions/1_build/action.yml

@@ -53,4 +53,4 @@ runs:
     - name: Configure and Build
       shell: bash
       run: |
-        bash scripts/${{ runner.os }}/1_build.sh ${{ steps.envs.outputs.build_option }} ${{ steps.envs.outputs.nightly }} --ccache
+        bash scripts/${{ runner.os }}/1_build.sh ${{ steps.envs.outputs.build_option }} ${{ steps.envs.outputs.nightly }} --use_brew_llvm --ccache

.github/workflows/CreateRelease.yml

@@ -128,7 +128,6 @@ jobs:
         read -a strarrd <<< "$STR_VERSION"
         ML_VERSION_D=${strarrd[1]} #get the meshlab version from the string
         echo "ml_version_d=$ML_VERSION_D" >> $GITHUB_OUTPUT
-        #access to this variable using ${{steps.envs.outputs.ml_version}} or ${{steps.envs.outputs.ml_version_d}}
     - name: Create MeshLab Portable Linux Archive
       run: |
         cd meshlab_linux_portable
@@ -148,27 +147,6 @@ jobs:
       with:
         name: MeshLab_macOS_packages_double
         path: meshlab_macos_dmg_double
-    - name: Download MacOS Portable
-      uses: actions/download-artifact@v3
-      with:
-        name: MeshLab_macOS_portable
-        path: meshlab_macos_portable
-    - name: Download MacOS Portable-d
-      uses: actions/download-artifact@v3
-      with:
-        name: MeshLab_macOS_portable_double
-        path: meshlab_macos_portable_double
-    - name: Change Permissions
-      run: |
-        chmod +x meshlab_macos_portable/MeshLab*.app/Contents/MacOS/meshlab
-        chmod +x meshlab_macos_portable_double/MeshLab*.app/Contents/MacOS/meshlab
-    - name: Create MeshLab Portable MacOS
-      run: |
-        cd meshlab_macos_portable
-        tar -cvzf ../MeshLab${{steps.envs.outputs.ml_version}}-macos.tar.gz *
-        cd ../meshlab_macos_portable_double
-        tar -cvzf ../MeshLab${{steps.envs.outputs.ml_version_d}}-macos.tar.gz *
-        cd ..
 
     #Download Windows Packages
     - name: Download Windows ZIP
@@ -211,8 +189,6 @@ jobs:
           MeshLab${{steps.envs.outputs.ml_version_d}}-linux.tar.gz
           meshlab_linux_appimage/MeshLab${{steps.envs.outputs.ml_version}}-linux.AppImage
           meshlab_linux_appimage_double/MeshLab${{steps.envs.outputs.ml_version_d}}-linux.AppImage
-          MeshLab${{steps.envs.outputs.ml_version}}-macos.tar.gz
-          MeshLab${{steps.envs.outputs.ml_version_d}}-macos.tar.gz
           meshlab_macos_dmg/MeshLab${{steps.envs.outputs.ml_version}}-macos.dmg
           meshlab_macos_dmg_double/MeshLab${{steps.envs.outputs.ml_version_d}}-macos.dmg
           MeshLab${{steps.envs.outputs.ml_version}}-windows.zip

resources/privacy.txt

@@ -2,8 +2,8 @@
 Privacy Disclaimer
 Please read it carefully.
 
-MeshLab will automatically check for the availability of updated versions and will notify the need of upgrading the software to the users. For this reason, from time to time, MeshLab will issue a http network connection. If you prefer that MeshLab does not communicate in any way with its developers, simply use a plain firewall and prevent any MeshLab access to the network. This will not limit in any way the normal behaviour of MeshLab. When using MeshLab some aggregated statistical data about only the specific usage of MeshLab are collected: the number and size of the opened/saved meshes; nothing more. Periodically this information is sent back to the developers. This data will be used for statistical analysis only. 
-Paranoids can also look at the sources for seeing what is transmitted.
+MeshLab will automatically check for the availability of updated versions and will notify the need of upgrading the software to the users. For this reason, from time to time, MeshLab will issue a http network connection. If you prefer that MeshLab does not communicate in any way with its developers, simply use a plain firewall and prevent any MeshLab access to the network, or disable the update check in the system preferences. This will not limit in any way the normal behaviour of MeshLab apart from getting notified when new releases are distributed. 
+Important: when using MeshLab the following aggregated statistical data are collected: the number of opened meshes, the number of saved meshes, and the total sum of the number of vertices opened by the user. This statistically aggregated information (three integers) is sent back to the developer when checking for updates. Disabling the check for updates also disable this data collection. 
 
 We would like to remark that the kind of aggregated information collected by MeshLab is probably by far less sensitive than the information that is silently collected by most web sites when you surf them: ip address, visited pages, frequency of return. We would also like to stress that we really need this information in order to assess how diffusely MeshLab is used and what is its impact on the 3D community. 
 

sample/TextureSingle.ply

@@ -0,0 +1,19 @@
+ply
+format ascii 1.0
+comment VCGLIB generated
+comment TextureFile TextureDouble_A.png
+element vertex 4
+property float x
+property float y
+property float z
+element face 2
+property list uchar int vertex_indices
+property list uchar float texcoord
+property int texnumber
+end_header
+0 0 0 
+1 0 0
+1 1 0
+0 1 0
+3 0 1 2 6 0 0 2 0 2 2 0
+3 0 2 3 6 0 0 2 2 0 2 0

scripts/Linux/0_setup_env.sh

@@ -5,7 +5,8 @@
 # Run this script if you never installed any of the MeshLab dependencies.
 
 DONT_INSTALL_QT=false
-DONT_INSTALL_CGAL_BOOST=false
+DONT_INSTALL_CGAL_BOOST=true
+DONT_INSTALL_EMBREE=true
 
 #checking for parameters
 for i in "$@"
@@ -19,6 +20,10 @@ case $i in
         DONT_INSTALL_CGAL_BOOST=true
         shift # past argument=value
         ;;
+    --dont_install_embree)
+        DONT_INSTALL_EMBREE=true
+        shift # past argument=value
+        ;;
     *)
         # unknown option
         ;;
@@ -30,7 +35,7 @@ echo "=== installing mesa packages..."
 sudo apt-get install -y mesa-common-dev libglu1-mesa-dev
 
 echo "=== installing cmake, patchelf, gmp, mpfr and xcerces-c..."
-sudo apt-get install -y cmake ninja-build patchelf libgmp-dev libmpfr-dev libxerces-c-dev
+sudo apt-get install -y cmake ninja-build patchelf libgmp-dev libmpfr-dev libxerces-c-dev libtbb-dev
 
 if [ "$DONT_INSTALL_QT" = false ] ; then
     echo "=== installing qt packages..."
@@ -50,3 +55,10 @@ if [ "$DONT_INSTALL_CGAL_BOOST" = false ] ; then
 else
     echo "=== jumping installation of cgal and boost packages..."
 fi
+
+if [ "$DONT_INSTALL_EMBREE" = false ] ; then
+    echo "=== installing embree..."
+    sudo apt-get install -y libembree-dev
+else
+	echo "=== jumping installation of embree package..."
+fi

scripts/macOS/0_setup_env.sh

@@ -22,7 +22,7 @@ case $i in
 esac
 done
 
-brew install coreutils node cmake ninja libomp cgal xerces-c 
+brew install coreutils node cmake ninja llvm libomp cgal xerces-c tbb embree
 npm install -g appdmg
 
 if [ "$DONT_INSTALL_QT" = false ] ; then

scripts/macOS/1_build.sh

@@ -7,6 +7,7 @@ BUILD_PATH=$SOURCE_PATH/build
 INSTALL_PATH=$SOURCE_PATH/install
 DOUBLE_PRECISION_OPTION=""
 NIGHTLY_OPTION=""
+USE_BREW_LLVM=false
 QT_DIR=""
 CCACHE=""
 
@@ -38,6 +39,14 @@ case $i in
         QT_DIR=${i#*=}
         shift # past argument=value
         ;;
+    --use_brew_llvm)
+        USE_BREW_LLVM=true
+        shift # past argument=value
+        ;;
+    --use_brew_qt)
+        QT_DIR=$(brew --prefix qt5)
+        shift # past argument=value
+        ;;
     --ccache)
         CCACHE="-DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
         shift # past argument=value
@@ -65,6 +74,20 @@ then
     export Qt5_DIR=$QT_DIR
 fi
 
+if [ "$USE_BREW_LLVM" = true ] ; then
+    BREW_PATH="$(brew --prefix)"
+    LLVM_PATH="$(brew --prefix llvm)"
+    export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
+    export LIBRARY_PATH="$LIBRARY_PATH:$SDKROOT/usr/lib"
+    export PATH="$LLVM_PATH/bin:$PATH"
+    export CC="$LLVM_PATH/bin/clang"
+    export CXX="$LLVM_PATH/bin/clang++"
+    export COMPILER=${CXX}
+    export CFLAGS="-I $BREW_PATH/include -I $LLVM_PATH/include"
+    export CXXFLAGS="-I $BREW_PATH/include -I $LLVM_PATH/include"
+    export LDFLAGS="-L $LIBRARY_PATH -L $BREW_PATH/lib -L $LLVM_PATH/lib"
+fi
+
 BUILD_PATH=$(realpath $BUILD_PATH)
 INSTALL_PATH=$(realpath $INSTALL_PATH)
 

src/CMakeLists.txt

@@ -104,6 +104,7 @@ set(EXTERNAL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external)
 add_subdirectory(${EXTERNAL_DIR})
 
 add_subdirectory(common)
+add_subdirectory(common_gui)
 
 if (NOT MESHLAB_BUILD_ONLY_LIBRARIES)
 	add_subdirectory(meshlab)
@@ -147,7 +148,10 @@ if(NOT DEFINED MESHLAB_PLUGINS) # it may be already defined in parent directory
 		meshlabplugins/filter_color_projection
 		meshlabplugins/filter_colorproc
 		meshlabplugins/filter_create
+		meshlabplugins/filter_cubization
+		meshlabplugins/filter_developability
 		meshlabplugins/filter_dirt
+		meshlabplugins/filter_embree
 		meshlabplugins/filter_fractal
 		meshlabplugins/filter_func
 		meshlabplugins/filter_img_patch_param
@@ -157,6 +161,7 @@ if(NOT DEFINED MESHLAB_PLUGINS) # it may be already defined in parent directory
 		meshlabplugins/filter_layer
 		meshlabplugins/filter_measure
 		meshlabplugins/filter_mesh_booleans
+		meshlabplugins/filter_mesh_alpha_wrap
 		meshlabplugins/filter_meshing
 		meshlabplugins/filter_mls
 		meshlabplugins/filter_mutualglobal

src/common/CMakeLists.txt

@@ -41,6 +41,8 @@ else()
 endif()
 
 set(HEADERS
+	filter_history/filter.h
+	filter_history/filter_history.h
 	ml_document/helpers/mesh_document_state_data.h
 	ml_document/helpers/mesh_model_state_data.h
 	ml_document/base_types.h
@@ -53,9 +55,34 @@ set(HEADERS
 	ml_shared_data_context/ml_plugin_gl_context.h
 	ml_shared_data_context/ml_scene_gl_shared_data_context.h
 	ml_shared_data_context/ml_shared_data_context.h
-	parameters/rich_parameter.h
+	parameters/rich_parameters.h
+	parameters/values.h
 	parameters/rich_parameter_list.h
-	parameters/value.h
+	parameters/rich_parameter/rich_bool.h
+	parameters/rich_parameter/rich_color.h
+	parameters/rich_parameter/rich_direction.h
+	parameters/rich_parameter/rich_dynamic_float.h
+	parameters/rich_parameter/rich_enum.h
+	parameters/rich_parameter/rich_file_open.h
+	parameters/rich_parameter/rich_file_save.h
+	parameters/rich_parameter/rich_float.h
+	parameters/rich_parameter/rich_int.h
+	parameters/rich_parameter/rich_matrix44.h
+	parameters/rich_parameter/rich_mesh.h
+	parameters/rich_parameter/rich_parameter.h
+	parameters/rich_parameter/rich_percentage.h
+	parameters/rich_parameter/rich_position.h
+	parameters/rich_parameter/rich_shot.h
+	parameters/rich_parameter/rich_string.h
+	parameters/value/bool_value.h
+	parameters/value/color_value.h
+	parameters/value/float_value.h
+	parameters/value/int_value.h
+	parameters/value/matrix44_value.h
+	parameters/value/point3_value.h
+	parameters/value/shot_value.h
+	parameters/value/string_value.h
+	parameters/value/value.h
 	plugins/containers/generic_container_iterator.h
 	plugins/containers/decorate_plugin_container.h
 	plugins/containers/edit_plugin_container.h
@@ -89,6 +116,8 @@ set(HEADERS
 	mlexception.h)
 
 set(SOURCES
+	filter_history/filter.cpp
+	filter_history/filter_history.cpp
 	ml_document/helpers/mesh_document_state_data.cpp
 	ml_document/cmesh.cpp
 	ml_document/mesh_document.cpp
@@ -99,9 +128,32 @@ set(SOURCES
 	ml_shared_data_context/ml_plugin_gl_context.cpp
 	ml_shared_data_context/ml_scene_gl_shared_data_context.cpp
 	ml_shared_data_context/ml_shared_data_context.cpp
-	parameters/rich_parameter.cpp
+	parameters/rich_parameters.cpp
 	parameters/rich_parameter_list.cpp
-	parameters/value.cpp
+	parameters/rich_parameter/rich_bool.cpp
+	parameters/rich_parameter/rich_color.cpp
+	parameters/rich_parameter/rich_direction.cpp
+	parameters/rich_parameter/rich_dynamic_float.cpp
+	parameters/rich_parameter/rich_enum.cpp
+	parameters/rich_parameter/rich_file_open.cpp
+	parameters/rich_parameter/rich_file_save.cpp
+	parameters/rich_parameter/rich_float.cpp
+	parameters/rich_parameter/rich_int.cpp
+	parameters/rich_parameter/rich_matrix44.cpp
+	parameters/rich_parameter/rich_mesh.cpp
+	parameters/rich_parameter/rich_parameter.cpp
+	parameters/rich_parameter/rich_percentage.cpp
+	parameters/rich_parameter/rich_position.cpp
+	parameters/rich_parameter/rich_shot.cpp
+	parameters/rich_parameter/rich_string.cpp
+	parameters/value/bool_value.cpp
+	parameters/value/color_value.cpp
+	parameters/value/float_value.cpp
+	parameters/value/int_value.cpp
+	parameters/value/matrix44_value.cpp
+	parameters/value/point3_value.cpp
+	parameters/value/shot_value.cpp
+	parameters/value/string_value.cpp
 	plugins/containers/decorate_plugin_container.cpp
 	plugins/containers/edit_plugin_container.cpp
 	plugins/containers/filter_plugin_container.cpp