Commit 1bef055e authored by Martin Schultz's avatar Martin Schultz

removed unnecessary includes

moved includes out of header
renamed compile unit for templated functions as we only need two explicit instatiations of them, they can be compiled seperately
parent ffbe5889
......@@ -3,11 +3,12 @@
#include "MergePlugin.hh"
#include <iostream>
#include "OpenFlipper/BasePlugin/PluginFunctions.hh"
#include <OpenFlipper/BasePlugin/RPCWrappers.hh>
#include <ObjectTypes/PolyMesh/PolyMesh.hh>
#include <ObjectTypes/TriangleMesh/TriangleMesh.hh>
/**
* Helper functions
*/
......
......@@ -2,19 +2,12 @@
#define MERGEPLUGIN_HH
#include <QObject>
#include <QtGui>
#include <QCheckBox>
#include <QMenuBar>
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include <OpenFlipper/BasePlugin/ToolboxInterface.hh>
#include <OpenFlipper/BasePlugin/LoadSaveInterface.hh>
#include <OpenFlipper/BasePlugin/LoggingInterface.hh>
#include <OpenFlipper/BasePlugin/ScriptInterface.hh>
#include <OpenFlipper/common/Types.hh>
#include <ObjectTypes/PolyMesh/PolyMesh.hh>
#include <ObjectTypes/TriangleMesh/TriangleMesh.hh>
#include "MergeToolbox.hh"
......@@ -107,9 +100,9 @@ private:
};
#if defined(INCLUDE_TEMPLATES) && !defined(MERGEPLUGIN_C)
#define MERGEPLUGIN_TEMPLATES
#include "MergePluginT.cc"
#endif
//#if defined(INCLUDE_TEMPLATES) && !defined(MERGEPLUGIN_C)
//#define MERGEPLUGIN_TEMPLATES
//#include "MergePluginT.cc"
//#endif
#endif //MERGEPLUGIN_HH
......@@ -2,6 +2,9 @@
#define MERGEPLUGIN_C
#include "MergePlugin.hh"
#include <OpenMesh/Core/Utils/Property.hh>
#include <ObjectTypes/PolyMesh/PolyMesh.hh>
#include <ObjectTypes/TriangleMesh/TriangleMesh.hh>
///merges Meshes into the first mesh
template< class MeshT >
......@@ -72,3 +75,6 @@ void MergePlugin::mergeMeshes(const std::vector< MeshT* >& _meshes, typename Mes
_vhB = tmp;
}
template void MergePlugin::mergeMeshes(const std::vector< PolyMesh* >& _meshes);
template void MergePlugin::mergeMeshes(const std::vector< TriMesh* >& _meshes);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment