Commit 5d87bcec authored by Matthias Möller's avatar Matthias Möller
Browse files

- add dllexport and fix some linker error for windows

- add includes
- fix gl function names (from no_ext to arb extension)
- rearrange includes, so that glew.h is included before gl.h (through qt5.0) is included
- add some missing file properties

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@19018 383ad7c9-94d9-4d36-a494-682f7c89f535
parent bffecfe5
......@@ -50,13 +50,6 @@
//== INCLUDES =================================================================
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "SmootherPlugin.hh"
#include <iostream>
......@@ -68,6 +61,12 @@
#include "SmootherObject.hh"
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#define SMOOTHER "SmootherData"
//== IMPLEMENTATION ==========================================================
......
......@@ -41,13 +41,6 @@
\*===========================================================================*/
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "SubdividerPlugin.hh"
#include <iostream>
......@@ -66,6 +59,12 @@
#include <OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
SubdividerPlugin::SubdividerPlugin() :
tool_(0),
......
......@@ -41,25 +41,24 @@
\*===========================================================================*/
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "TextureControl.hh"
#include <iostream>
#include <ACG/GL/GLState.hh>
#include "OpenFlipper/BasePlugin/PluginFunctions.hh"
#include "OpenFlipper/BasePlugin/PluginFunctionsViewControls.hh"
#include "OpenFlipper/common/GlobalOptions.hh"
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/BasePlugin/PluginFunctionsViewControls.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#include "ImageStorage.hh"
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#ifdef ENABLE_OPENVOLUMEMESH_SUPPORT
#include "ObjectTypes/VolumeMeshObject/VolumeMeshDrawModesContainer.hh"
#include <ObjectTypes/VolumeMeshObject/VolumeMeshDrawModesContainer.hh>
#endif
#define TEXTUREDATA "TextureData"
......
......@@ -40,11 +40,6 @@
* *
\*===========================================================================*/
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "TopologyPlugin.hh"
#include <iostream>
......@@ -62,6 +57,13 @@
#include <OpenMesh/Core/System/omstream.hh>
#include <cfloat>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
//******************************************************************************
TopologyPlugin::TopologyPlugin() :
......
......@@ -40,13 +40,7 @@
* *
\*===========================================================================*/
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QBrush>
#include "TreeModel.hh"
......@@ -54,7 +48,15 @@
#include <OpenFlipper/common/Types.hh>
#include "../OpenFlipper/BasePlugin/PluginFunctions.hh"
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <QBrush>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
//******************************************************************************
......
......@@ -41,12 +41,6 @@
\*===========================================================================*/
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "ViewControlPlugin.hh"
#include <iostream>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
......@@ -57,6 +51,12 @@
#include <OpenFlipper/ACGHelper/DrawModeConverter.hh>
#include <ACG/Scenegraph/CoordsysNode.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#define SHOW_SELECTION "Selections"
#define SHOW_AREAS "Modeling Areas"
#define SHOW_AREA "Modeling Area"
......
......@@ -34,12 +34,15 @@
/*===========================================================================*\
* *
* $Revision: 7936 $ *
* $Author: kremer $ *
* $Date: 2009-12-15 14:01:19 +0100 (Tue, 15 Dec 2009) $ *
* $Revision$ *
* $Author$ *
* $Date$ *
* *
\*===========================================================================*/
#include "FileBVH.hh"
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
......@@ -49,15 +52,10 @@
#include <QFileInfo>
#include "FileBVH.hh"
#include <iostream>
#include <fstream>
#include <sstream>
#include "OpenFlipper/BasePlugin/PluginFunctions.hh"
#include "OpenFlipper/common/GlobalOptions.hh"
#include <ACG/Geometry/AlgorithmsAngleT.hh>
#include <bitset>
......
......@@ -34,9 +34,9 @@
/*===========================================================================*\
* *
* $Revision: 7918 $ *
* $Author: wilden $ *
* $Date: 2009-12-15 10:05:44 +0100 (Tue, 15 Dec 2009) $ *
* $Revision$ *
* $Author$ *
* $Date$ *
* *
\*===========================================================================*/
......@@ -56,6 +56,9 @@
#include <ObjectTypes/Skeleton/Skeleton.hh>
class QCheckBox;
class QPushButton;
class FileBVHPlugin : public QObject, BaseInterface, FileInterface, LoadSaveInterface,
LoggingInterface, ScriptInterface
{
......
......@@ -40,6 +40,8 @@
* *
\*===========================================================================*/
#include "FileHeightFieldImage.hh"
#include "ImageDialog.hh"
#if QT_VERSION >= 0x050000
#include <QtWidgets>
......@@ -49,11 +51,7 @@
#include <QFileInfo>
#include <QSettings>
#include "FileHeightFieldImage.hh"
#include "ImageDialog.hh"
#include "OpenFlipper/BasePlugin/PluginFunctions.hh"
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
void FileHeightFieldPNGPlugin::initializePlugin() {
}
......
......@@ -40,7 +40,13 @@
* *
\*===========================================================================*/
#include "FileLgt.hh"
#include <ACG/GL/GLState.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenFlipper/ACGHelper/DrawModeConverter.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
......@@ -51,17 +57,7 @@
#include <QFileInfo>
#include <QSettings>
#include "FileLgt.hh"
#include <iostream>
#include <ACG/GL/GLState.hh>
#include "OpenFlipper/BasePlugin/PluginFunctions.hh"
#include "OpenFlipper/common/GlobalOptions.hh"
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenFlipper/ACGHelper/DrawModeConverter.hh>
void FileLightPlugin::initializePlugin() {
}
......
......@@ -39,7 +39,15 @@
* $Date$ *
* *
\*===========================================================================*/
#include <ACG/GL/GLState.hh>
#include "OpenFlipper/BasePlugin/PluginFunctions.hh"
#include "OpenFlipper/common/GlobalOptions.hh"
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenFlipper/ACGHelper/DrawModeConverter.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
......@@ -54,15 +62,7 @@
#include "FileOBJ.hh"
#include <iostream>
#include <ACG/GL/GLState.hh>
#include "OpenFlipper/BasePlugin/PluginFunctions.hh"
#include "OpenFlipper/common/GlobalOptions.hh"
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenFlipper/ACGHelper/DrawModeConverter.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
// Defines for the type handling drop down box
#define TYPEAUTODETECT 0
......
......@@ -40,6 +40,7 @@
* *
\*===========================================================================*/
#include "FileOFF.hh"
#if QT_VERSION >= 0x050000
#include <QtWidgets>
......@@ -51,15 +52,13 @@
#include <QSettings>
#include <QPushButton>
#include "FileOFF.hh"
#include <iostream>
#include <fstream>
#include <sstream>
#include <ACG/GL/GLState.hh>
#include "OpenFlipper/BasePlugin/PluginFunctions.hh"
#include "OpenFlipper/common/GlobalOptions.hh"
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenMesh/Core/Utils/color_cast.hh>
......
......@@ -39,7 +39,14 @@
* $Date$ *
* *
\*===========================================================================*/
#include <ACG/GL/GLState.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenFlipper/ACGHelper/DrawModeConverter.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
......@@ -54,14 +61,7 @@
#include "FileOM.hh"
#include <iostream>
#include <ACG/GL/GLState.hh>
#include "OpenFlipper/BasePlugin/PluginFunctions.hh"
#include "OpenFlipper/common/GlobalOptions.hh"
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenFlipper/ACGHelper/DrawModeConverter.hh>
// Defines for the type handling drop down box
#define TYPEAUTODETECT 0
......
......@@ -44,6 +44,8 @@
#define FILEOMPLUGIN_HH
#include <QObject>
class QCheckBox;
class QComboBox;
#include <OpenFlipper/common/Types.hh>
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
......
......@@ -45,15 +45,6 @@
#include <map>
#include <string>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QFileInfo>
#include <ACG/GL/GLState.hh>
#include <OpenMesh/Core/IO/IOManager.hh>
......@@ -65,6 +56,15 @@
#include "FileOpenVolumeMesh.hh"
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QFileInfo>
FileOpenVolumeMeshPlugin::FileOpenVolumeMeshPlugin() :
loadOptions_(0),
saveOptions_(0),
......
......@@ -39,7 +39,14 @@
* $Date$ *
* *
\*===========================================================================*/
#include <ACG/GL/GLState.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenFlipper/ACGHelper/DrawModeConverter.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
......@@ -53,14 +60,7 @@
#include "FileOfv.hh"
#include <iostream>
#include <ACG/GL/GLState.hh>
#include "OpenFlipper/BasePlugin/PluginFunctions.hh"
#include "OpenFlipper/common/GlobalOptions.hh"
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenFlipper/ACGHelper/DrawModeConverter.hh>
void FileViewPlugin::initializePlugin() {
}
......
......@@ -40,6 +40,16 @@
* *
\*===========================================================================*/
#include "FilePLY.hh"
#include <ACG/GL/GLState.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenFlipper/ACGHelper/DrawModeConverter.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
......@@ -51,17 +61,8 @@
#include <QSettings>
#include <QPushButton>
#include "FilePLY.hh"
#include <iostream>
#include <ACG/GL/GLState.hh>
#include "OpenFlipper/BasePlugin/PluginFunctions.hh"
#include "OpenFlipper/common/GlobalOptions.hh"
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenFlipper/ACGHelper/DrawModeConverter.hh>
// Defines for the type handling drop down box
#define TYPEAUTODETECT 0
......
......@@ -44,6 +44,10 @@
#define FILEPLYPLUGIN_HH
#include <QObject>
class QCheckBox;
class QLabel ;
class QSpinBox;
class QComboBox;
#include <OpenFlipper/common/Types.hh>
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
......
......@@ -60,6 +60,9 @@
#include <QObject>
class QCheckBox;
class QComboBox;
class QPushButton;
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include <OpenFlipper/BasePlugin/FileInterface.hh>
......
......@@ -40,7 +40,16 @@
* *
\*===========================================================================*/
#include "FilePla.hh"
#include <ACG/GL/GLState.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenFlipper/ACGHelper/DrawModeConverter.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
......@@ -51,17 +60,8 @@
#include <QFileInfo>
#include <QSettings>
#include "FilePla.hh"
#include <iostream>
#include <ACG/GL/GLState.hh>
#include "OpenFlipper/BasePlugin/PluginFunctions.hh"
#include "OpenFlipper/common/GlobalOptions.hh"
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenFlipper/ACGHelper/DrawModeConverter.hh>
void FilePlaPlugin::initializePlugin() {
}
......
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