kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[Mesh] Core A-D: remove unused includes

Browse Source 
- also some sorting
This commit is contained in:
Uwe
2022-11-21 02:51:23 +01:00
parent 3283107f38
commit 577ba5ba58
14 changed files with 50 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/Mesh/App/Core/Algorithm.cpp
View File

@@ -20,13 +20,15 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <algorithm>
#endif
#include <Base/Console.h>
#include <Base/Sequencer.h>
#include "Algorithm.h"
#include "Approximation.h"
#include "Elements.h"
@@ -34,8 +36,6 @@
#include "Grid.h"
#include "Triangulation.h"
#include <Base/Console.h>
#include <Base/Sequencer.h>
using namespace MeshCore;
using Base::BoundBox3f;

7
src/Mod/Mesh/App/Core/Algorithm.h
View File

@@ -20,17 +20,16 @@
* *
***************************************************************************/
#ifndef MESHALGORITHM_H
#define MESHALGORITHM_H
#include <map>
#include <set>
#include <vector>
#include <map>
#include "MeshKernel.h"
#include "Elements.h"
#include <Base/Vector3D.h>
#include "MeshKernel.h"
// forward declarations

24
src/Mod/Mesh/App/Core/Approximation.cpp
View File

@@ -20,7 +20,6 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
@@ -29,32 +28,27 @@
# include <iterator>
#endif
#include "Approximation.h"
#include "Elements.h"
#include "Utilities.h"
#include "CylinderFit.h"
#include "SphereFit.h"
#include <Base/BoundBox.h>
#include <Base/Console.h>
#include <boost/math/special_functions/fpclassify.hpp>
#include <Mod/Mesh/App/WildMagic4/Wm4ApprQuadraticFit3.h>
#include <Mod/Mesh/App/WildMagic4/Wm4ApprPlaneFit3.h>
#include <Mod/Mesh/App/WildMagic4/Wm4DistVector3Plane3.h>
#include <Mod/Mesh/App/WildMagic4/Wm4Matrix3.h>
#include <Mod/Mesh/App/WildMagic4/Wm4ApprPolyFit3.h>
#include <Mod/Mesh/App/WildMagic4/Wm4ApprQuadraticFit3.h>
#include <Mod/Mesh/App/WildMagic4/Wm4ApprSphereFit3.h>
#include <Mod/Mesh/App/WildMagic4/Wm4Sphere3.h>
#include <Mod/Mesh/App/WildMagic4/Wm4ApprCylinderFit3.h>
//#define FC_USE_EIGEN
#include <Eigen/QR>
#include <Eigen/Eigen>
#include <unsupported/Eigen/NonLinearOptimization>
#ifdef FC_USE_EIGEN
#include <Eigen/Eigenvalues>
# include <Eigen/Eigenvalues>
#endif
#include "Approximation.h"
#include "CylinderFit.h"
#include "Elements.h"
#include "SphereFit.h"
#include "Utilities.h"
using namespace MeshCore;
Approximation::Approximation()

11
src/Mod/Mesh/App/Core/Approximation.h
View File

@@ -20,25 +20,22 @@
* *
***************************************************************************/
#ifndef MESH_APPROXIMATION_H
#define MESH_APPROXIMATION_H
#include <Mod/Mesh/App/WildMagic4/Wm4Vector3.h>
#include <Mod/Mesh/App/WildMagic4/Wm4QuadricSurface.h>
#include <Mod/Mesh/App/WildMagic4/Wm4Eigen.h>
#include <Mod/Mesh/App/WildMagic4/Wm4ImplicitSurface.h>
#ifndef MESH_GLOBAL_H
#include <Mod/Mesh/MeshGlobal.h>
# include <Mod/Mesh/MeshGlobal.h>
#endif
#include <algorithm>
#include <list>
#include <set>
#include <vector>
#include <Base/Vector3D.h>
#include <Base/Matrix.h>
#include <Base/BoundBox.h>
#include <Base/Matrix.h>
#include <Base/Vector3D.h>
namespace Wm4
{

6
src/Mod/Mesh/App/Core/Builder.cpp
View File

@@ -20,21 +20,21 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <algorithm>
#endif
#include <Base/Sequencer.h>
#include <Base/Exception.h>
#include <Base/Sequencer.h>
#include "Builder.h"
#include "MeshKernel.h"
#include "Functional.h"
#include "MeshKernel.h"
#include <QVector>
using namespace MeshCore;

2
src/Mod/Mesh/App/Core/Builder.h
View File

@@ -27,7 +27,7 @@
#include <vector>
#include "MeshKernel.h"
#include <Base/Vector3D.h>
namespace Base {
class SequencerLauncher;

14
src/Mod/Mesh/App/Core/Curvature.cpp
View File

@@ -30,22 +30,22 @@
#include <QFutureWatcher>
#include <QtConcurrentMap>
#include <Base/Sequencer.h>
#include <Base/Tools.h>
//#define OPTIMIZE_CURVATURE
#ifdef OPTIMIZE_CURVATURE
#include <Eigen/Eigenvalues>
# include <Eigen/Eigenvalues>
#else
#include <Mod/Mesh/App/WildMagic4/Wm4Vector3.h>
#include <Mod/Mesh/App/WildMagic4/Wm4MeshCurvature.h>
# include <Mod/Mesh/App/WildMagic4/Wm4MeshCurvature.h>
#endif
#include "Curvature.h"
#include "Algorithm.h"
#include "Approximation.h"
#include "MeshKernel.h"
#include "Iterator.h"
#include "MeshKernel.h"
#include "Tools.h"
#include <Base/Sequencer.h>
#include <Base/Tools.h>
using namespace MeshCore;
namespace sp = std::placeholders;

4
src/Mod/Mesh/App/Core/CylinderFit.cpp
View File

@@ -61,10 +61,12 @@
# include <iterator>
#endif
#include "CylinderFit.h"
#include <Base/Console.h>
#include <Mod/Mesh/App/WildMagic4/Wm4ApprLineFit3.h>
#include "CylinderFit.h"
using namespace MeshCoreFit;
CylinderFit::CylinderFit()

5
src/Mod/Mesh/App/Core/CylinderFit.h
View File

@@ -20,13 +20,14 @@
* *
***************************************************************************/
#ifndef MESH_CYLINDER_FIT_H
#define MESH_CYLINDER_FIT_H
#include "Approximation.h"
#include <Eigen/Eigenvalues>
#include "Approximation.h"
// -------------------------------------------------------------------------------
namespace MeshCoreFit {

7
src/Mod/Mesh/App/Core/Decimation.cpp
View File

@@ -20,17 +20,10 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
#endif
#include "Decimation.h"
#include "MeshKernel.h"
#include "Algorithm.h"
#include "Iterator.h"
#include "TopoAlgorithm.h"
#include <Base/Tools.h>
#include "Simplify.h"

4
src/Mod/Mesh/App/Core/Definitions.cpp
View File

@@ -20,13 +20,13 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#include <cmath>
#include "Definitions.h"
#include <Base/Tools.h>
#include "Definitions.h"
namespace MeshCore {

15
src/Mod/Mesh/App/Core/Definitions.h
View File

@@ -20,27 +20,26 @@
* *
***************************************************************************/
#ifndef MESH_DEFINITIONS_H
#define MESH_DEFINITIONS_H
#ifndef MESH_GLOBAL_H
#include <Mod/Mesh/MeshGlobal.h>
# include <Mod/Mesh/MeshGlobal.h>
#endif
#include <climits>
// default values
#define MESH_MIN_PT_DIST 1.0e-6f
#define MESH_MIN_EDGE_LEN 1.0e-3f
#define MESH_MIN_EDGE_ANGLE 2.0
#define MESH_REMOVE_MIN_LEN true
#define MESH_REMOVE_G3_EDGES true
#define MESH_MIN_PT_DIST 1.0e-6f
#define MESH_MIN_EDGE_LEN 1.0e-3f
#define MESH_MIN_EDGE_ANGLE 2.0
#define MESH_REMOVE_MIN_LEN true
#define MESH_REMOVE_G3_EDGES true
/*
* general constant definitions
*/
#define FLOAT_EPS 1.0e-4f
#define FLOAT_EPS 1.0e-4f
#ifndef FLOAT_MAX
# define FLOAT_MAX 1e30f

12
src/Mod/Mesh/App/Core/Degeneration.cpp
View File

@@ -20,7 +20,6 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
@@ -29,19 +28,14 @@
# include <queue>
#endif
#include <boost/math/special_functions/fpclassify.hpp>
#include "Degeneration.h"
#include "Definitions.h"
#include "Iterator.h"
#include "Helpers.h"
#include "MeshKernel.h"
#include "Algorithm.h"
#include "Info.h"
#include "Grid.h"
#include "Iterator.h"
#include "TopoAlgorithm.h"
#include "Triangulation.h"
#include <boost/math/special_functions/fpclassify.hpp>
#include <Base/Sequencer.h>
using namespace MeshCore;

4
src/Mod/Mesh/App/Core/Degeneration.h
View File

@@ -20,7 +20,6 @@
* *
***************************************************************************/
#ifndef MESH_DEGENERATION_H
#define MESH_DEGENERATION_H
@@ -28,8 +27,9 @@
#include <string>
#include <vector>
#include "Evaluation.h"
#include "Definitions.h"
#include "Evaluation.h"
namespace MeshCore {