Merge branch 'devel'

Author: alemuntoni

.devcontainer/Dockerfile

@@ -11,6 +11,7 @@ ENV LD_LIBRARY_PATH=/opt/qt/${QT_VERSION}/gcc_64/lib/
 ENV QT_PLUGIN_PATH=/opt/qt/${QT_VERSION}/gcc_64/plugins/
 ENV QML_IMPORT_PATH=/opt/qt/${QT_VERSION}/gcc_64/qml/
 ENV QML2_IMPORT_PATH=/opt/qt/${QT_VERSION}/gcc_64/qml/
+ENV LANG=C.UTF-8
 
 RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
     build-essential \

.devcontainer/docker-compose.yml

@@ -16,9 +16,10 @@ services:
       # fuse is needed. If you don't plan to create the AppImage, you can remove the 
       # following lines
       - /lib/modules:/lib/modules
-    # flag --device /dev/fuse
+    # flag --device /dev/fuse --device /dev/dri (last one is needed for NVIDIA GPUs)
     devices:
       - /dev/fuse
+      - /dev/dri
     # flag --cap-add SYS_ADMIN
     cap_add:
       - SYS_ADMIN

README.md

@@ -53,7 +53,7 @@ The MeshLab repository is organized as follows:
 
 ```
    MeshLab
-   http://www.meshlab.net
+   https://www.meshlab.net
    All rights reserved.
 
    VCGLib  http://www.vcglib.net                                     o o

docs/README.md

@@ -1,5 +1,5 @@
    MeshLab
-   http://www.meshlab.net
+   https://www.meshlab.net
    All rights reserved.
 
    VCGLib  http://www.vcglib.net                                         o o

docs/readme.txt

@@ -1,5 +1,5 @@
    MeshLab
-   http://www.meshlab.net
+   https://www.meshlab.net
    All rights reserved.
 
    VCGLib  http://www.vcglib.net                                         o o

resources/linux/meshlab.desktop

@@ -10,3 +10,4 @@ Terminal=false
 MimeType=model/mesh;application/x-3ds;image/x-3ds;model/x-ply;application/sla;model/x-quad-object;model/x-geomview-off;application/x-cyclone-ptx;application/x-vmi;application/x-bre;model/vnd.collada+xml;model/openctm;application/x-expe-binary;application/x-expe-ascii;application/x-xyz;application/x-gts;chemical/x-pdb;application/x-tri;application/x-asc;model/x3d+xml;model/x3d+vrml;model/vrml;model/u3d;model/idtf;
 Categories=Graphics;3DGraphics;Viewer;Qt;
 Name[en_US]=MeshLab
+PrefersNonDefaultGPU=true

resources/readme.txt

@@ -1,5 +1,5 @@
    MeshLab
-   http://www.meshlab.net
+   https://www.meshlab.net
    All rights reserved.
 
    VCGLib  http://www.vcglib.net                                     o o

resources/windows/meshlab.nsi

@@ -6,7 +6,7 @@
 !define PRODUCT_NAME "MeshLab"
 !define PRODUCT_VERSION "MESHLAB_VERSION"
 !define PRODUCT_PUBLISHER "Paolo Cignoni - VCG - ISTI - CNR"
-!define PRODUCT_WEB_SITE "http://www.meshlab.net"
+!define PRODUCT_WEB_SITE "https://www.meshlab.net"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\meshlab.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
@@ -58,15 +58,25 @@ ShowUnInstDetails show
 Function .onInit
   ReadRegStr $0 HKLM "${PRODUCT_UNINST_KEY}" "UninstallString"
   ${If} $0 != "" ;2020.0x...
-    MessageBox MB_OK "Please first uninstall old MeshLab version. Starting uninstaller now..."
-	StrCpy $8 '"$0"'
-	!insertmacro ExecWaitJob r8
+    ${IfNot} ${Silent}
+      MessageBox MB_OK "Please first uninstall old MeshLab version. Starting uninstaller now..."
+    ${EndIf}
+    StrCpy $8 '"$0"'
+    ${If} ${Silent}
+      StrCpy $8 "$8 /S"
+    ${EndIf}
+    !insertmacro ExecWaitJob r8
   ${Else}
     ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\MeshLab_64b" "UninstallString"
     ${If} $0 != "" ;2016.12
-	  MessageBox MB_OK "Please first uninstall old MeshLab version. Starting uninstaller now..."
-   	  StrCpy $8 '"$0"'
-	  !insertmacro ExecWaitJob r8
+      ${IfNot} ${Silent}
+        MessageBox MB_OK "Please first uninstall old MeshLab version. Starting uninstaller now..."
+      ${EndIf}
+      StrCpy $8 '"$0"'
+      ${If} ${Silent}
+        StrCpy $8 "$8 /S"
+      ${EndIf}
+      !insertmacro ExecWaitJob r8
     ${EndIf}
   ${EndIf}
 FunctionEnd

src/CMakeLists.txt

@@ -123,6 +123,7 @@ if(NOT DEFINED MESHLAB_PLUGINS) # it may be already defined in parent directory
 	set(MESHLAB_PLUGINS
 		# IO plugins
 		meshlabplugins/io_3ds
+		meshlabplugins/io_3mf
 		meshlabplugins/io_base
 		meshlabplugins/io_bre
 		meshlabplugins/io_collada

src/common/mlapplication.h

@@ -27,8 +27,8 @@ class MeshLabApplication : public QApplication
 	static const QString completeName(const HW_ARCHITECTURE hw){return appArchitecturalName(hw) + " v" + appVer(); }
 	static const QString organization(){return tr("VCG");}
 	static const QString organizationHost() {return tr("http://vcg.isti.cnr.it");}
-	static const QString webSite() {return tr("http://www.meshlab.net/");}
-	static const QString downloadSite() {return tr("http://www.meshlab.net/#download");}
+	static const QString webSite() {return tr("https://www.meshlab.net/");}
+	static const QString downloadSite() {return tr("https://www.meshlab.net/#download");}
 
 	static const QString pluginsPathRegisterKeyName() {return tr("pluginsPath");}
 	static const QString versionRegisterKeyName() {return tr("version");}