From f33ff16ca1d78d1bcf46f838dba0b264aa45887d Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Wed, 19 May 2021 09:26:40 +0200 Subject: [PATCH] fix snap build --- snapcraft.yaml | 2 +- src/meshlabplugins/filter_ao/filter_ao.cpp | 2 +- src/meshlabplugins/filter_camera/filter_camera.cpp | 9 ++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index e674494d5..95d4da7d5 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -29,10 +29,10 @@ apps: parts: meshlab: + plugin: [qmake, cmake] qt-version: qt5 source: https://github.com/cnr-isti-vclab/meshlab.git build-snaps: [cmake] - plugin: cmake build-packages: - cmake - qt5-default diff --git a/src/meshlabplugins/filter_ao/filter_ao.cpp b/src/meshlabplugins/filter_ao/filter_ao.cpp index 7accbca6f..615fd987f 100644 --- a/src/meshlabplugins/filter_ao/filter_ao.cpp +++ b/src/meshlabplugins/filter_ao/filter_ao.cpp @@ -134,7 +134,7 @@ void AmbientOcclusionPlugin::initParameterList(const QAction *action, const Mesh " - 1 means that all the light cames from the specified cone of directions
" " - other values mix the two set of lighting directions ")); parlst.addParam(RichInt ("reqViews",AMBOCC_DEFAULT_NUM_VIEWS,"Requested views", "Number of different views uniformly placed around the mesh. More views means better accuracy at the cost of increased calculation time")); - parlst.addParam(RichPoint3f("coneDir",Point3f(0,1,0),"Lighting Direction", "Number of different views placed around the mesh. More views means better accuracy at the cost of increased calculation time")); + parlst.addParam(RichPoint3f("coneDir",Point3m(0,1,0),"Lighting Direction", "Number of different views placed around the mesh. More views means better accuracy at the cost of increased calculation time")); parlst.addParam(RichFloat("coneAngle",30,"Cone amplitude", "Number of different views uniformly placed around the mesh. More views means better accuracy at the cost of increased calculation time")); parlst.addParam(RichBool("useGPU",AMBOCC_USEGPU_BY_DEFAULT,"Use GPU acceleration","Only works for per-vertex AO. In order to use GPU-Mode, your hardware must support FBOs, FP32 Textures and Shaders. Normally increases the performance by a factor of 4x-5x")); //parlst.addParam(RichBool("useVBO",AMBOCC_USEVBO_BY_DEFAULT,"Use VBO if supported","By using VBO, Meshlab loads all the vertex structure in the VRam, greatly increasing rendering speed (for both CPU and GPU mode). Disable it if problem occurs")); diff --git a/src/meshlabplugins/filter_camera/filter_camera.cpp b/src/meshlabplugins/filter_camera/filter_camera.cpp index 7b07e71d9..b7cad21af 100644 --- a/src/meshlabplugins/filter_camera/filter_camera.cpp +++ b/src/meshlabplugins/filter_camera/filter_camera.cpp @@ -111,8 +111,8 @@ void FilterCameraPlugin::initParameterList(const QAction *action, const MeshDocu rotCenter.push_back("custom point"); parlst.addParam(RichEnum("rotCenter", 0, rotCenter, tr("Center of rotation:"), tr("Choose a method"))); parlst.addParam(RichDynamicFloat("angle",0,-360,360,"Rotation Angle","Angle of rotation (in degree). If snapping is enabled this value is rounded according to the snap value")); - parlst.addParam(RichPoint3f("customAxis",Point3f(0,0,0),"Custom axis","This rotation axis is used only if the 'custom axis' option is chosen.")); - parlst.addParam(RichPoint3f("customCenter",Point3f(0,0,0),"Custom center","This rotation center is used only if the 'custom point' option is chosen.")); + parlst.addParam(RichPoint3f("customAxis",Point3m(0,0,0),"Custom axis","This rotation axis is used only if the 'custom axis' option is chosen.")); + parlst.addParam(RichPoint3f("customCenter",Point3m(0,0,0),"Custom center","This rotation center is used only if the 'custom point' option is chosen.")); parlst.addParam(RichBool ("toallRaster", false, "Apply to all active Raster layers", "Apply the same scaling to all the active Raster layers: it is taken into account only if 'Raster Camera' is selected")); parlst.addParam(RichBool ("toall", false, "Apply to all active Raster and visible Mesh layers", "Apply the same scaling to all the layers, including any visible 3D layer")); } @@ -128,7 +128,7 @@ void FilterCameraPlugin::initParameterList(const QAction *action, const MeshDocu scaleCenter.push_back("camera viewpoint"); scaleCenter.push_back("custom point"); parlst.addParam(RichEnum("scaleCenter", 0, scaleCenter, tr("Center of scaling:"), tr("Choose a method"))); - parlst.addParam(RichPoint3f("customCenter",Point3f(0,0,0),"Custom center","This scaling center is used only if the 'custom point' option is chosen.")); + parlst.addParam(RichPoint3f("customCenter",Point3m(0,0,0),"Custom center","This scaling center is used only if the 'custom point' option is chosen.")); parlst.addParam(RichFloat("scale", 1.0, "Scale factor", "The scale factor that has to be applied to the camera")); parlst.addParam(RichBool ("toallRaster", false, "Apply to all active Raster layers", "Apply the same scaling to all the active Raster layers: it is taken into account only if 'Raster Camera' is selected")); parlst.addParam(RichBool ("toall", false, "Apply to all active Raster and visible Mesh layers", "Apply the same scaling to all the layers, including any visible 3D layer")); @@ -158,8 +158,7 @@ void FilterCameraPlugin::initParameterList(const QAction *action, const MeshDocu behaviour.push_back("The matrix is the transformation to apply to the extrinsics"); behaviour.push_back("The matrix represent the new extrinsics"); - Matrix44m mat; mat.SetIdentity(); - parlst.addParam(RichMatrix44f("TransformMatrix",mat,"")); + parlst.addParam(RichMatrix44f("TransformMatrix",Matrix44m::Identity(),"")); parlst.addParam(RichEnum("camera", 0, shotType, tr("Camera type"), tr("Choose the camera to scale"))); parlst.addParam(RichEnum("behaviour", 0, behaviour, tr("Matrix semantic"), tr("What the matrix is used for"))); parlst.addParam(RichBool ("toallRaster", false, "Apply to all active Raster layers", "Apply the same scaling to all the active Raster layers: it is taken into account only if 'Raster Camera' is selected"));