Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed redifinition

Browse Source
This commit is contained in:
Jan Möbius
2020-04-22 08:21:21 +02:00
parent 2749fa4f05
commit 8470d00960
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/ACGQt.cmake
View File

@@ -102,9 +102,7 @@ macro (acg_qt5)
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.17") if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.17")
cmake_policy(SET CMP0100 NEW) cmake_policy(SET CMP0100 NEW)
message("Version greater 3.17, enable policy")
endif() endif()

6
src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh
View File

@@ -91,18 +91,18 @@ struct MyTraits : public DEFAULT_TRAITS
}; };
typedef TRIMESH_KERNEL<MyTraits> mesh_t; typedef TRIMESH_KERNEL<MyTraits> mesh_t;
typedef MeshViewerWidgetT<mesh_t> MeshViewerWidget; typedef MeshViewerWidgetT<mesh_t> MeshViewerWidgetDecimaterBase;
//== CLASS DEFINITION ========================================================= //== CLASS DEFINITION =========================================================
class DecimaterViewerWidget : public MeshViewerWidget class DecimaterViewerWidget : public MeshViewerWidgetDecimaterBase
{ {
Q_OBJECT Q_OBJECT
public: public:
typedef MeshViewerWidget inherited_t; typedef MeshViewerWidgetDecimaterBase inherited_t;
typedef Decimater::DecimaterT<mesh_t> decimater_t; typedef Decimater::DecimaterT<mesh_t> decimater_t;
typedef Decimater::ModQuadricT< mesh_t >::Handle mod_quadric_t; typedef Decimater::ModQuadricT< mesh_t >::Handle mod_quadric_t;

10
src/OpenMesh/Apps/ProgViewer/ProgViewerWidget.hh
View File

@@ -63,7 +63,7 @@ using namespace OpenMesh;
using namespace OpenMesh::Attributes; using namespace OpenMesh::Attributes;
struct MyTraits : public OpenMesh::DefaultTraits struct ProgTraits : public OpenMesh::DefaultTraits
{ {
VertexAttributes ( OpenMesh::Attributes::Normal | VertexAttributes ( OpenMesh::Attributes::Normal |
OpenMesh::Attributes::Status ); OpenMesh::Attributes::Status );
@@ -74,21 +74,21 @@ struct MyTraits : public OpenMesh::DefaultTraits
}; };
typedef OpenMesh::TriMesh_ArrayKernelT<MyTraits> MyMesh; typedef OpenMesh::TriMesh_ArrayKernelT<ProgTraits> MyMesh;
typedef MeshViewerWidgetT<MyMesh> MeshViewerWidget; typedef MeshViewerWidgetT<MyMesh> MeshViewerWidgetProgBase;
//== CLASS DEFINITION ========================================================= //== CLASS DEFINITION =========================================================
class ProgViewerWidget : public MeshViewerWidget class ProgViewerWidget : public MeshViewerWidgetProgBase
{ {
Q_OBJECT Q_OBJECT
public: public:
typedef MeshViewerWidget Base; typedef MeshViewerWidgetProgBase Base;
typedef ProgViewerWidget This; typedef ProgViewerWidget This;