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

- 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
......@@ -46,6 +46,7 @@
#include "DrawMesh.hh"
#include <ACG/GL/gl.hh>
#include <ACG/Geometry/GPUCacheOptimizer.hh>
#include <ACG/GL/VertexDeclaration.hh>
#include <ACG/GL/ShaderCache.hh>
......@@ -1413,7 +1414,7 @@ void ACG::DrawMeshT<Mesh>::addTriRenderObjects(IRenderer* _renderer, const Rende
}
else // no texture map specified, use whatever texture is currently bound to the first texture stage
{
glActiveTexture(GL_TEXTURE0);
glActiveTextureARB(GL_TEXTURE0);
GLint textureID = 0;
glGetIntegerv(GL_TEXTURE_BINDING_2D, &textureID);
......
......@@ -174,7 +174,7 @@ public:
//== CLASS DEFINITION =========================================================
class Texture
class ACGDLLEXPORT Texture
{
public:
......@@ -341,7 +341,7 @@ public:
#if defined(GL_ARB_texture_buffer_object)
class TextureBuffer : public Texture
class ACGDLLEXPORT TextureBuffer : public Texture
{
public:
TextureBuffer(GLenum u=GL_NONE)
......
......@@ -39,16 +39,16 @@
* $Date$ *
* *
\*===========================================================================*/
#include <ObjectTypes/Light/LightNode.hh>
#include <ui_lightWidget.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <ObjectTypes/Light/LightNode.hh>
#include <OpenFlipper/common/GlobalDefines.hh>
#include "Light.hh"
......
......@@ -44,12 +44,8 @@
#ifndef FILEINTERFACE_HH
#define FILEINTERFACE_HH
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class QWidget;
#include <QString>
#include <OpenFlipper/common/Types.hh>
......
......@@ -49,6 +49,7 @@
#include <QStringList>
#include <QList>
#include <QDockWidget>
#include <QToolBar>
struct KeyBinding{
int key;
......
......@@ -34,16 +34,18 @@
/*===========================================================================*\
* *
* $Revision: 18440 $ *
* $LastChangedBy: moebius $ *
* $Date: 2014-04-08 08:26:27 +0200 (Tue, 08 Apr 2014) $ *
* $Revision$ *
* $LastChangedBy$ *
* $Date$ *
* *
\*===========================================================================*/
#include "glew_wrappers.hh"
#include <GL/glew.h>
#include <stdio.h>
void initGlew() {
DLLEXPORT void initGlew() {
GLenum err = glewInit();
if (GLEW_OK != err)
{
......@@ -52,6 +54,6 @@ void initGlew() {
}
}
const char *getGlewVersion() {
DLLEXPORT const char * getGlewVersion() {
return (const char *)glewGetString(GLEW_VERSION);
}
......@@ -34,16 +34,18 @@
/*===========================================================================*\
* *
* $Revision: 18440 $ *
* $LastChangedBy: moebius $ *
* $Date: 2014-04-08 08:26:27 +0200 (Tue, 08 Apr 2014) $ *
* $Revision$ *
* $LastChangedBy$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef GLEW_WRAPPERS_HH_
#define GLEW_WRAPPERS_HH_
void initGlew();
const char *getGlewVersion();
#include <OpenFlipper/common/GlobalDefines.hh>
DLLEXPORT void initGlew();
DLLEXPORT const char * getGlewVersion();
#endif /* GLEW_WRAPPERS_HH_ */
......@@ -40,6 +40,7 @@
* *
\*===========================================================================*/
#include <OpenFlipper/common/Types.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
......@@ -54,7 +55,7 @@
#include <iostream>
#include <OpenFlipper/common/Types.hh>
#include "../OpenFlipper/BasePlugin/PluginFunctions.hh"
......
......@@ -39,14 +39,13 @@
* $Date$ *
* *
\*===========================================================================*/
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#include "PluginDialog.hh"
#include <QMessageBox>
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
const QColor PluginDialog::blockColor_ = QColor(228, 155, 18);
const QColor PluginDialog::unloadColor_ = QColor(172, 172, 172);
const QColor PluginDialog::loadedBuiltInColor_ = QColor(208, 240, 192);
......
......@@ -46,6 +46,8 @@
#ifndef ADDEMPTYWIDGET_HH
#define ADDEMPTYWIDGET_HH
#include <OpenFlipper/common/Types.hh>
#include "ui_addEmpty.hh"
#if QT_VERSION >= 0x050000
......@@ -55,7 +57,7 @@
#endif
#include "OpenFlipper/common/Types.hh"
class addEmptyWidget : public QDialog, public Ui::addEmpty
{
......
......@@ -8,11 +8,13 @@
#ifndef FILEPICKER_HH_
#define FILEPICKER_HH_
#include <OpenFlipper/common/RecentFiles.hh>
#include <QWidget>
#include <QComboBox>
#include <QLineEdit>
#include <QPushButton>
#include <OpenFlipper/common/RecentFiles.hh>
class DLLEXPORT FilePicker : public QWidget {
Q_OBJECT
......
......@@ -40,6 +40,8 @@
* *
\*===========================================================================*/
#include <OpenFlipper/common/Types.hh>
#include <OpenFlipper/Core/Core.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
......@@ -48,9 +50,6 @@
#endif
#include <OpenFlipper/common/Types.hh>
#include <OpenFlipper/Core/Core.hh>
class FileOptionsDialog : public QDialog
{
Q_OBJECT
......
......@@ -40,6 +40,8 @@
* *
\*===========================================================================*/
#include <OpenFlipper/common/Types.hh>
#include <OpenFlipper/Core/Core.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
......@@ -49,8 +51,6 @@
#include <QDirModel>
#include <OpenFlipper/common/Types.hh>
#include <OpenFlipper/Core/Core.hh>
#include <map>
class LoadWidget : public QFileDialog
......
......@@ -40,12 +40,12 @@
* *
\*===========================================================================*/
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include "optionsWidget.hh"
#include <OpenFlipper/common/GlobalOptions.hh>
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include "ShortcutButton.hh"
#include <QMessageBox>
......
......@@ -42,16 +42,16 @@
#include "optionsWidget.hh"
#include <iostream>
#include <OpenFlipper/common/GlobalOptions.hh>
#include <ACG/Scenegraph/DrawModes.hh>
#include <OpenFlipper/ACGHelper/DrawModeConverter.hh>
#include <OpenFlipper/INIFile/INIFile.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#include <ACG/Scenegraph/DrawModes.hh>
#include <ACG/GL/ShaderCache.hh>
#include "optionsWidget.hh"
#include <iostream>
#include <QColorDialog>
#include <QMessageBox>
......
......@@ -46,6 +46,9 @@
#ifndef OPTIONSWIDGET_HH
#define OPTIONSWIDGET_HH
#include <OpenFlipper/Core/PluginInfo.hh>
#include <ACG/Scenegraph/DrawModes.hh>
#include "ui_optionsWidget.hh"
#if QT_VERSION >= 0x050000
......@@ -58,8 +61,6 @@
#include <QProgressDialog>
#include <QtNetwork>
#include <OpenFlipper/Core/PluginInfo.hh>
#include <ACG/Scenegraph/DrawModes.hh>
//map for keyBindings
typedef std::multimap< std::pair< QObject*, int >, std::pair< int, Qt::KeyboardModifiers > > InverseKeyMap;
......
......@@ -34,12 +34,16 @@
/*===========================================================================*\
* *
* $Revision: 15910 $ *
* $LastChangedBy: moeller $ *
* $Date: 2012-12-05 12:53:39 +0100 (Mi, 05 Dez 2012) $ *
* $Revision$ *
* $LastChangedBy$ *
* $Date$ *
* *
\*===========================================================================*/
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/RendererInfo.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
......@@ -50,10 +54,6 @@
#include <functional>
#include <algorithm>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/RendererInfo.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#include <QMenu>
......
......@@ -40,14 +40,13 @@
* *
\*===========================================================================*/
#include "BackupPlugin.hh"
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "BackupPlugin.hh"
#include <iostream>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
......
......@@ -43,9 +43,6 @@
#ifndef BACKUPPLUGIN_HH
#define BACKUPPLUGIN_HH
#include <QObject>
#include <QMenuBar>
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include <OpenFlipper/BasePlugin/KeyInterface.hh>
#include <OpenFlipper/BasePlugin/LoggingInterface.hh>
......@@ -56,6 +53,9 @@
#include <OpenFlipper/BasePlugin/ContextMenuInterface.hh>
#include <OpenFlipper/common/Types.hh>
#include <QObject>
#include <QMenuBar>
#include "GroupData.hh"
class BackupPlugin : public QObject, BaseInterface , KeyInterface, MenuInterface, BackupInterface, LoggingInterface, ToolbarInterface, LoadSaveInterface, ContextMenuInterface
......
......@@ -40,6 +40,7 @@
* *
\*===========================================================================*/
#include "ColorPlugin.hh"
#if QT_VERSION >= 0x050000
#include <QtWidgets>
......@@ -47,8 +48,6 @@
#include <QtGui>
#endif
#include "ColorPlugin.hh"
#include <iostream>
#include <ACG/GL/GLState.hh>
......
......@@ -43,14 +43,6 @@
#ifndef COLORPLUGIN_HH
#define COLORPLUGIN_HH
#include <QObject>
#include <QMenuBar>
#include "ColorPlugin.hh"
#include "ColorOptions.hh"
#include "OpenFlipper/INIFile/INIFile.hh"
#include <OpenFlipper/common/Types.hh>
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include <OpenFlipper/BasePlugin/MenuInterface.hh>
......@@ -60,6 +52,14 @@
#include "OpenFlipper/BasePlugin/OptionsInterface.hh"
#include "OpenFlipper/BasePlugin/INIInterface.hh"
#include <QObject>
#include <QMenuBar>
#include "ColorPlugin.hh"
#include "ColorOptions.hh"
#include "OpenFlipper/INIFile/INIFile.hh"
class ColorPlugin : public QObject, BaseInterface, MenuInterface, ScriptInterface, ToolbarInterface, StatusbarInterface, OptionsInterface, INIInterface
{
......
......@@ -40,10 +40,14 @@
* *
\*===========================================================================*/
#include <QtGui>
#include "ComponentsPlugin.hh"
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <MeshTools/MeshInfoT.hh>
const char *SPLIT_COMPONENTS = "SplitComponents";
......
......@@ -40,14 +40,14 @@
* *
\*===========================================================================*/
#include "DataControlPlugin.hh"
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "DataControlPlugin.hh"
#include <QLayout>
#include <QGridLayout>
#include <QItemSelectionModel>
......
......@@ -40,7 +40,7 @@
* *
\*===========================================================================*/
#include "TreeModel.hh"
#if QT_VERSION >= 0x050000
#include <QtWidgets>
......@@ -50,8 +50,6 @@
#include <QBrush>
#include "TreeModel.hh"
#include <iostream>
......
......@@ -50,6 +50,10 @@
//== INCLUDES =================================================================
#include "DecimaterPlugin.hh"
#include <ACG/GL/GLState.hh>
#include <ACG/Scenegraph/ManipulatorNode.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
......@@ -58,15 +62,10 @@
#endif
#include <memory>
#include "DecimaterPlugin.hh"
#include <iostream>
#include <ACG/GL/GLState.hh>
#include <QStringList>
#include <ACG/Scenegraph/ManipulatorNode.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#define DECIMATER "DecimaterData"
......
......@@ -40,6 +40,11 @@
* *
\*===========================================================================*/
#include "GaussCurvature.hh"
#include <ACG/GL/GLState.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
......@@ -47,13 +52,6 @@
#include <QtGui>
#endif
#include "GaussCurvature.hh"
#include <ACG/GL/GLState.hh>
#include "OpenFlipper/BasePlugin/PluginFunctions.hh"
#include <MeshTools/Curvature.hh>
#include <ObjectTypes/PolyMesh/PolyMesh.hh>
......
......@@ -49,12 +49,6 @@
//== INCLUDES =================================================================
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "MeshObjectInfoPlugin.hh"
......@@ -72,6 +66,12 @@
#include <cfloat>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
//== IMPLEMENTATION ==========================================================
......
......@@ -50,13 +50,6 @@
//== INCLUDES =================================================================
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "SkeletonObjectInfoPlugin.hh"
#include <iostream>
......@@ -73,6 +66,12 @@
#include <cfloat>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
//== IMPLEMENTATION ==========================================================
void InfoSkeletonObjectPlugin::initializePlugin() {
......
......@@ -44,13 +44,6 @@
#define ISOTROPICREMESHERPLUGIN_HH
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include <OpenFlipper/BasePlugin/ToolboxInterface.hh>
#include <OpenFlipper/BasePlugin/LoggingInterface.hh>
......@@ -65,6 +58,12 @@
#include "IsotropicRemesherToolbox.hh"
#include "ProgressEmitter.hh"
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class IsotropicRemesherPlugin : public QObject, BaseInterface, BackupInterface , ToolboxInterface, LoggingInterface,
RPCInterface, ProcessInterface, ScriptInterface
......
......@@ -41,13 +41,6 @@
\*===========================================================================*/
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "LaplacePlugin.hh"
#include <iostream>
......@@ -61,6 +54,12 @@
#include <omp.h>
#endif
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#define UNIFORM_LAPLACE_NAME "Uniform Laplace Length"
#define UNIFORM_LAPLACE_SQUARED_NAME "Uniform Laplace Squared Length"
......
......@@ -41,18 +41,12 @@
\*===========================================================================*/
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "MeanCurvature.hh"
#include <iostream>
#include <ACG/GL/GLState.hh>
#include "OpenFlipper/BasePlugin/PluginFunctions.hh"
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <ObjectTypes/PolyMesh/PolyMesh.hh>
#include <ObjectTypes/TriangleMesh/TriangleMesh.hh>
......@@ -62,6 +56,12 @@
#include <omp.h>
#endif
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
MeanCurvaturePlugin::MeanCurvaturePlugin()
{
}
......
......@@ -41,12 +41,6 @@
\*===========================================================================*/
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "MeshRepairPlugin.hh"
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
......@@ -55,6 +49,12 @@
#include <ACG/Geometry/Algorithms.hh>
#include <Math_Tools/Math_Tools.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
//-----------------------------------------------------------------------------
MeshRepairPlugin::MeshRepairPlugin() :
......
......@@ -41,12 +41,6 @@
\*===========================================================================*/
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "MovePlugin.hh"
#include <iostream>
......@@ -64,6 +58,12 @@
#include <omp.h>
#endif
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#ifdef ENABLE_POLYLINE_SUPPORT
#include <ObjectTypes/PolyLine/PolyLine.hh>
#endif
......
......@@ -40,6 +40,8 @@
* *
\*===========================================================================*/
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include "ui_setProps.hh"
#if QT_VERSION >= 0x050000
......@@ -48,9 +50,6 @@
#include <QtGui>
#endif
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
class movePropsWidget : public QWidget, public Ui::setProps
{
Q_OBJECT
......
......@@ -8,13 +8,6 @@
//== INCLUDES =================================================================