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
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
/*===========================================================================*\
* *
* OpenFlipper *
* Copyright (C) 2001-2014 by Computer Graphics Group, RWTH Aachen *
* www.openflipper.org *
* *
*--------------------------------------------------------------------------- *
* This file is part of OpenFlipper. *
* *
* OpenFlipper is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Lesser General Public License as *
* published by the Free Software Foundation, either version 3 of *
* the License, or (at your option) any later version with the *
* following exceptions: *
* *
* If other files instantiate templates or use macros *
* or inline functions from this file, or you compile this file and *
* link it with other files to produce an executable, this file does *
* not by itself cause the resulting executable to be covered by the *
* GNU Lesser General Public License. This exception does not however *
* invalidate any other reasons why the executable file might be *
* covered by the GNU Lesser General Public License. *
* *
* OpenFlipper is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU LesserGeneral Public *
* License along with OpenFlipper. If not, *
* see <http://www.gnu.org/licenses/>. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision$ *
* $LastChangedBy$ *
* $Date$ *
* *
\*===========================================================================*/
#include "FilePolyLine.hh"
#include <iostream>
#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>
......@@ -18,7 +52,13 @@
#include <ObjectTypes/PolyLine/PolyLineObjectSerializer.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <iostream>
//-----------------------------------------------------------------------------
......
......@@ -34,12 +34,19 @@
/*===========================================================================*\
* *
* $Revision: 10274 $ *
* $LastChangedBy: wilden $ *
* $Date: 2010-11-24 17:49:09 +0100 (Wed, 24 Nov 2010) $ *
* $Revision$ *
* $LastChangedBy$ *
* $Date$ *
* *
\*===========================================================================*/
#include "FileSkeleton.hh"
#include <ACG/GL/GLState.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#include <OpenMesh/Core/IO/IOManager.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
......@@ -49,16 +56,11 @@
#include <QFileInfo>
#include "FileSkeleton.hh"
#include <iostream>
#include <fstream>
#include <ACG/GL/GLState.hh>
#include "OpenFlipper/BasePlugin/PluginFunctions.hh"
#include "OpenFlipper/common/GlobalOptions.hh"
#include <OpenMesh/Core/IO/IOManager.hh>
void FileSKLPlugin::initializePlugin() {
}
......
......@@ -40,6 +40,16 @@
* *
\*===========================================================================*/
#include "FileSPH.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>
#else
......@@ -49,17 +59,8 @@
#include <QFileInfo>
#include <QSettings>
#include "FileSPH.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 FileSPHPlugin::initializePlugin() {
......
......@@ -40,6 +40,18 @@
* *
\*===========================================================================*/
#include "FileSTL.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>
#else
......@@ -49,17 +61,7 @@
#include <QFileInfo>
#include <QSettings>
#include "FileSTL.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>
/// Constructor
FileSTLPlugin::FileSTLPlugin() :
......
......@@ -45,6 +45,9 @@
#define FILESTLPLUGIN_HH
#include <QObject>
class QCheckBox;
class QLabel;
class QSpinBox;
#include <OpenFlipper/common/Types.hh>
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
......
......@@ -40,6 +40,10 @@
* *
\*===========================================================================*/
#include "FileScript.hh"
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
......@@ -50,12 +54,9 @@
#include <QFileInfo>
#include <QSettings>
#include "FileScript.hh"
#include <iostream>
#include "OpenFlipper/BasePlugin/PluginFunctions.hh"
#include "OpenFlipper/common/GlobalOptions.hh"
QString FileScriptPlugin::getLoadFilters() {
return QString( tr("OpenFlipper Scripting Files ( *.ofs )") );
......
......@@ -40,6 +40,21 @@
* *
\*===========================================================================*/
#include "FileVTK.hh"
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#include <OpenFlipper/ACGHelper/DrawModeConverter.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#ifdef ENABLE_OPENVOLUMEMESH_HEXAHEDRAL_SUPPORT
#include <ObjectTypes/HexahedralMesh/HexahedralMesh.hh>
#endif
#ifdef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT
#include <ObjectTypes/PolyhedralMesh/PolyhedralMesh.hh>
#endif
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
......@@ -50,27 +65,13 @@
#include <QSettings>
#include <QPushButton>
#include "FileVTK.hh"
#include <iostream>
#include <set>
#include <vector>
#include <algorithm>
#include "OpenFlipper/BasePlugin/PluginFunctions.hh"
#include "OpenFlipper/common/GlobalOptions.hh"
#include <OpenFlipper/ACGHelper/DrawModeConverter.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#ifdef ENABLE_OPENVOLUMEMESH_HEXAHEDRAL_SUPPORT
#include <ObjectTypes/HexahedralMesh/HexahedralMesh.hh>
#endif
#ifdef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT
#include <ObjectTypes/PolyhedralMesh/PolyhedralMesh.hh>
#endif
//-----------------------------------------------------------------------------------------------------
namespace{
template<typename T>
......
......@@ -34,19 +34,12 @@
/*===========================================================================*\
* *
* $Revision: 10990 $ *
* $LastChangedBy: moebius $ *
* $Date: 2011-02-24 10:08:09 +0100 (Do, 24 Feb 2011) $ *
* $Revision$ *
* $LastChangedBy$ *
* $Date$ *
* *
\*===========================================================================*/
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "RenderPickingPlugin.hh"
#include <iostream>
......@@ -58,6 +51,12 @@
#include <QGLFormat>
#include <QMenu>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
void RenderPickingPlugin::initializePlugin()
{
pickRendererMode_ = ACG::SceneGraph::PICK_ANYTHING;
......
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