Commit b27412a1 authored by Pierre Kraemer's avatar Pierre Kraemer

add dll export symbols in SCHNApps plugins

parent e1a5b57c
......@@ -4,6 +4,8 @@ SET( PLUGIN_NAME Surface_Deformation )
SET( PLUGIN_ROOT_DIR ${SCHNApps_ROOT_DIR}/Plugins/surface_deformation )
ADD_DEFINITIONS(-DSURFACE_DEFORMATION_DLL_EXPORT)
INCLUDE_DIRECTORIES(
${PLUGIN_ROOT_DIR}/include
${CMAKE_CURRENT_BINARY_DIR}
......
#ifdef WIN32
#if defined SURFACE_DEFORMATION_DLL_EXPORT
#define SURFACE_DEFORMATION_API __declspec(dllexport)
#else
#define SURFACE_DEFORMATION_API __declspec(dllimport)
#endif
#else
#define SURFACE_DEFORMATION_API
#endif
#ifndef _SURFACE_DEFORMATION_PLUGIN_H_
#define _SURFACE_DEFORMATION_PLUGIN_H_
#include "dll.h"
#include "plugin_interaction.h"
#include "surface_deformation_dockTab.h"
......@@ -46,7 +47,7 @@ struct MapParameters
NLContext nlContext;
};
class Surface_Deformation_Plugin : public PluginInteraction
class SURFACE_DEFORMATION_API Surface_Deformation_Plugin : public PluginInteraction
{
Q_OBJECT
Q_INTERFACES(CGoGN::SCHNApps::Plugin)
......
......@@ -4,6 +4,8 @@ SET( PLUGIN_NAME Surface_DifferentialProperties )
SET( PLUGIN_ROOT_DIR ${SCHNApps_ROOT_DIR}/Plugins/surface_differentialProperties )
ADD_DEFINITIONS(-DSURFACE_DIFFERENTIAL_PROPERTIES_DLL_EXPORT)
INCLUDE_DIRECTORIES(
${PLUGIN_ROOT_DIR}/include
${CMAKE_CURRENT_BINARY_DIR}
......
#ifdef WIN32
#if defined SURFACE_DIFFERENTIAL_PROPERTIES_DLL_EXPORT
#define SURFACE_DIFFERENTIAL_PROPERTIES_API __declspec(dllexport)
#else
#define SURFACE_DIFFERENTIAL_PROPERTIES_API __declspec(dllimport)
#endif
#else
#define SURFACE_DIFFERENTIAL_PROPERTIES_API
#endif
#ifndef _SURFACE_DIFFERENTIALPROPERTIES_PLUGIN_H_
#define _SURFACE_DIFFERENTIALPROPERTIES_PLUGIN_H_
#include "dll.h"
#include "plugin_processing.h"
#include "dialog_computeNormal.h"
......@@ -16,7 +17,7 @@ namespace SCHNApps
* - Normals
* - Curvatures
*/
class Surface_DifferentialProperties_Plugin : public PluginProcessing
class SURFACE_DIFFERENTIAL_PROPERTIES_API Surface_DifferentialProperties_Plugin : public PluginProcessing
{
Q_OBJECT
Q_INTERFACES(CGoGN::SCHNApps::Plugin)
......
......@@ -4,6 +4,8 @@ SET( PLUGIN_NAME Surface_Distance )
SET( PLUGIN_ROOT_DIR ${SCHNApps_ROOT_DIR}/Plugins/surface_distance )
ADD_DEFINITIONS(-DSURFACE_DISTANCE_DLL_EXPORT)
INCLUDE_DIRECTORIES(
${PLUGIN_ROOT_DIR}/include
${CMAKE_CURRENT_BINARY_DIR}
......
#ifdef WIN32
#if defined SURFACE_DISTANCE_DLL_EXPORT
#define SURFACE_DISTANCE_API __declspec(dllexport)
#else
#define SURFACE_DISTANCE_API __declspec(dllimport)
#endif
#else
#define SURFACE_DISTANCE_API
#endif
#ifndef _SURFACE_DISTANCE_PLUGIN_H_
#define _SURFACE_DISTANCE_PLUGIN_H_
#include "dll.h"
#include "plugin_processing.h"
#include "dialog_computeDistance.h"
......@@ -11,7 +12,7 @@ namespace CGoGN
namespace SCHNApps
{
class Surface_Distance_Plugin : public PluginProcessing
class SURFACE_DISTANCE_API Surface_Distance_Plugin : public PluginProcessing
{
Q_OBJECT
Q_INTERFACES(CGoGN::SCHNApps::Plugin)
......
......@@ -4,6 +4,8 @@ SET( PLUGIN_NAME Surface_Import )
SET( PLUGIN_ROOT_DIR ${SCHNApps_ROOT_DIR}/Plugins/surface_import )
ADD_DEFINITIONS(-DSURFACE_IMPORT_DLL_EXPORT)
INCLUDE_DIRECTORIES(
${PLUGIN_ROOT_DIR}/include
${CMAKE_CURRENT_BINARY_DIR}
......
#ifdef WIN32
#if defined SURFACE_IMPORT_DLL_EXPORT
#define SURFACE_IMPORT_API __declspec(dllexport)
#else
#define SURFACE_IMPORT_API __declspec(dllimport)
#endif
#else
#define SURFACE_IMPORT_API
#endif
#ifndef _SURFACE_IMPORT_PLUGIN_H_
#define _SURFACE_IMPORT_PLUGIN_H_
#include "dll.h"
#include "plugin_processing.h"
namespace CGoGN
......@@ -13,7 +14,7 @@ namespace SCHNApps
* The import image function allow the creation of a mesh with a face by pixel.
* Image format support is given by Qt.
*/
class Surface_Import_Plugin : public PluginProcessing
class SURFACE_IMPORT_API Surface_Import_Plugin : public PluginProcessing
{
Q_OBJECT
Q_INTERFACES(CGoGN::SCHNApps::Plugin)
......
......@@ -4,6 +4,8 @@ SET( PLUGIN_NAME Surface_LSM )
SET( PLUGIN_ROOT_DIR ${SCHNApps_ROOT_DIR}/Plugins/surface_lsm )
ADD_DEFINITIONS(-DSURFACE_LSM_DLL_EXPORT)
INCLUDE_DIRECTORIES(
${PLUGIN_ROOT_DIR}/include
${CMAKE_CURRENT_BINARY_DIR}
......@@ -25,8 +27,8 @@ file(
SET(
PLUGIN_QOBJECT_FILES
${PLUGIN_ROOT_DIR}/include/surface_deformation.h
${PLUGIN_ROOT_DIR}/include/surface_deformation_dockTab.h
${PLUGIN_ROOT_DIR}/include/surface_lsm.h
${PLUGIN_ROOT_DIR}/include/surface_lsm_dockTab.h
)
include( ${SCHNApps_ROOT_DIR}/Plugins/plugins_cmake.txt )
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Surface_Deformation_TabWidget</class>
<widget class="QWidget" name="Surface_Deformation_TabWidget">
<class>Surface_LSM_TabWidget</class>
<widget class="QWidget" name="Surface_LSM_TabWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>207</width>
<width>216</width>
<height>545</height>
</rect>
</property>
......
#ifdef WIN32
#if defined SURFACE_LSM_DLL_EXPORT
#define SURFACE_LSM_API __declspec(dllexport)
#else
#define SURFACE_LSM_API __declspec(dllimport)
#endif
#else
#define SURFACE_LSM_API
#endif
#ifndef _SURFACE_DEFORMATION_PLUGIN_H_
#define _SURFACE_DEFORMATION_PLUGIN_H_
#include "dll.h"
#include "plugin_interaction.h"
#include "surface_deformation_dockTab.h"
#include "surface_lsm_dockTab.h"
#include "mapHandler.h"
......@@ -35,15 +36,13 @@ struct MapParameters
bool initialized;
VertexAttribute<PFP2::VEC3, PFP2::MAP> positionInit;
VertexAttribute<unsigned int, PFP2::MAP> vIndex;
unsigned int nb_vertices;
NLContext nlContext;
};
class Surface_Deformation_Plugin : public PluginInteraction
class SURFACE_LSM_API Surface_LSM_Plugin : public PluginInteraction
{
Q_OBJECT
Q_INTERFACES(CGoGN::SCHNApps::Plugin)
......@@ -51,15 +50,15 @@ class Surface_Deformation_Plugin : public PluginInteraction
Q_PLUGIN_METADATA(IID "CGoGN.SCHNapps.Plugin")
#endif
friend class Surface_Deformation_DockTab;
friend class Surface_LSM_DockTab;
public:
Surface_Deformation_Plugin() :
Surface_LSM_Plugin() :
m_draginit(false),
m_dragging(false)
{}
~Surface_Deformation_Plugin()
~Surface_LSM_Plugin()
{}
virtual bool enable();
......@@ -101,7 +100,7 @@ protected:
void lsm(MapHandlerGen* map);
protected:
Surface_Deformation_DockTab* m_dockTab;
Surface_LSM_DockTab* m_dockTab;
QHash<MapHandlerGen*, MapParameters> h_parameterSet;
bool m_draginit;
......
#ifndef _SURFACE_DEFORMATION_DOCK_TAB_H_
#define _SURFACE_DEFORMATION_DOCK_TAB_H_
#include "ui_surface_deformation.h"
#include "ui_surface_lsm.h"
namespace CGoGN
{
......@@ -10,21 +10,21 @@ namespace SCHNApps
{
class SCHNApps;
class Surface_Deformation_Plugin;
class Surface_LSM_Plugin;
struct MapParameters;
class Surface_Deformation_DockTab : public QWidget, public Ui::Surface_Deformation_TabWidget
class Surface_LSM_DockTab : public QWidget, public Ui::Surface_LSM_TabWidget
{
Q_OBJECT
friend class Surface_Deformation_Plugin;
friend class Surface_LSM_Plugin;
public:
Surface_Deformation_DockTab(SCHNApps* s, Surface_Deformation_Plugin* p);
Surface_LSM_DockTab(SCHNApps* s, Surface_LSM_Plugin* p);
private:
SCHNApps* m_schnapps;
Surface_Deformation_Plugin* m_plugin;
Surface_LSM_Plugin* m_plugin;
bool b_updatingUI;
private slots:
......
#include "surface_deformation.h"
#include "surface_lsm.h"
#include "Algo/Geometry/normal.h"
#include "Algo/Geometry/laplacian.h"
......@@ -38,18 +38,12 @@ void MapParameters::start(MapHandlerGen* mhg)
{
MapHandler<PFP2>* mh = static_cast<MapHandler<PFP2>*>(mhg);
positionInit = mh->getAttribute<PFP2::VEC3, VERTEX>("positionInit");
if(!positionInit.isValid())
positionInit = mh->addAttribute<PFP2::VEC3, VERTEX>("positionInit");
vIndex = mh->getAttribute<unsigned int, VERTEX>("vIndex");
if(!vIndex.isValid())
vIndex = mh->addAttribute<unsigned int, VERTEX>("vIndex");
PFP2::MAP* map = static_cast<MapHandler<PFP2>*>(mh)->getMap();
map->copyAttribute(positionInit, positionAttribute);
nb_vertices = Algo::Topo::computeIndexCells<VERTEX>(*map, vIndex);
if(nlContext)
......@@ -68,9 +62,6 @@ void MapParameters::stop(MapHandlerGen* mh)
{
if(initialized)
{
// if(positionInit.isValid())
// mh->removeAttribute(positionInit);
// if(vIndex.isValid())
// mh->removeAttribute(vIndex);
......@@ -85,13 +76,13 @@ void MapParameters::stop(MapHandlerGen* mh)
bool Surface_Deformation_Plugin::enable()
bool Surface_LSM_Plugin::enable()
{
// magic line that init static variables of GenericMap in the plugins
GenericMap::copyAllStatics(m_schnapps->getStaticPointers());
m_dockTab = new Surface_Deformation_DockTab(m_schnapps, this);
m_schnapps->addPluginDockTab(this, m_dockTab, "Surface_Deformation");
m_dockTab = new Surface_LSM_DockTab(m_schnapps, this);
m_schnapps->addPluginDockTab(this, m_dockTab, "Surface_LSM");
connect(m_schnapps, SIGNAL(selectedMapChanged(MapHandlerGen*, MapHandlerGen*)), this, SLOT(selectedMapChanged(MapHandlerGen*, MapHandlerGen*)));
connect(m_schnapps, SIGNAL(mapAdded(MapHandlerGen*)), this, SLOT(mapAdded(MapHandlerGen*)));
......@@ -105,16 +96,16 @@ bool Surface_Deformation_Plugin::enable()
return true;
}
void Surface_Deformation_Plugin::disable()
void Surface_LSM_Plugin::disable()
{
disconnect(m_schnapps, SIGNAL(selectedMapChanged(MapHandlerGen*, MapHandlerGen*)), this, SLOT(selectedMapChanged(MapHandlerGen*, MapHandlerGen*)));
}
void Surface_Deformation_Plugin::draw(View *view)
void Surface_LSM_Plugin::draw(View *view)
{
}
void Surface_Deformation_Plugin::keyPress(View* view, QKeyEvent* event)
void Surface_LSM_Plugin::keyPress(View* view, QKeyEvent* event)
{
switch(event->key())
{
......@@ -161,7 +152,7 @@ void Surface_Deformation_Plugin::keyPress(View* view, QKeyEvent* event)
}
}
void Surface_Deformation_Plugin::mouseMove(View* view, QMouseEvent* event)
void Surface_LSM_Plugin::mouseMove(View* view, QMouseEvent* event)
{
if (m_dragging)
{
......@@ -213,7 +204,7 @@ void Surface_Deformation_Plugin::mouseMove(View* view, QMouseEvent* event)
void Surface_Deformation_Plugin::selectedMapChanged(MapHandlerGen *prev, MapHandlerGen *cur)
void Surface_LSM_Plugin::selectedMapChanged(MapHandlerGen *prev, MapHandlerGen *cur)
{
m_dockTab->updateMapParameters();
if (cur==NULL)
......@@ -222,7 +213,7 @@ void Surface_Deformation_Plugin::selectedMapChanged(MapHandlerGen *prev, MapHand
m_dockTab->setDisabled(false);
}
void Surface_Deformation_Plugin::mapAdded(MapHandlerGen* map)
void Surface_LSM_Plugin::mapAdded(MapHandlerGen* map)
{
connect(map, SIGNAL(attributeAdded(unsigned int, const QString&)), this, SLOT(attributeAdded(unsigned int, const QString&)));
connect(map, SIGNAL(cellSelectorAdded(unsigned int, const QString&)), this, SLOT(cellSelectorAdded(unsigned int, const QString&)));
......@@ -230,7 +221,7 @@ void Surface_Deformation_Plugin::mapAdded(MapHandlerGen* map)
connect(map, SIGNAL(selectedCellsChanged(CellSelectorGen*)), this, SLOT(selectedCellsChanged(CellSelectorGen*)));
}
void Surface_Deformation_Plugin::mapRemoved(MapHandlerGen* map)
void Surface_LSM_Plugin::mapRemoved(MapHandlerGen* map)
{
disconnect(map, SIGNAL(attributeAdded(unsigned int, const QString&)), this, SLOT(attributeAdded(unsigned int, const QString&)));
disconnect(map, SIGNAL(cellSelectorAdded(unsigned int, const QString&)), this, SLOT(cellSelectorAdded(unsigned int, const QString&)));
......@@ -242,7 +233,7 @@ void Surface_Deformation_Plugin::mapRemoved(MapHandlerGen* map)
void Surface_Deformation_Plugin::attributeAdded(unsigned int orbit, const QString& name)
void Surface_LSM_Plugin::attributeAdded(unsigned int orbit, const QString& name)
{
MapHandlerGen* map = static_cast<MapHandlerGen*>(QObject::sender());
......@@ -250,7 +241,7 @@ void Surface_Deformation_Plugin::attributeAdded(unsigned int orbit, const QStrin
m_dockTab->addVertexAttribute(name);
}
void Surface_Deformation_Plugin::cellSelectorAdded(unsigned int orbit, const QString& name)
void Surface_LSM_Plugin::cellSelectorAdded(unsigned int orbit, const QString& name)
{
MapHandlerGen* map = static_cast<MapHandlerGen*>(QObject::sender());
......@@ -258,7 +249,7 @@ void Surface_Deformation_Plugin::cellSelectorAdded(unsigned int orbit, const QSt
m_dockTab->addVertexSelector(name);
}
void Surface_Deformation_Plugin::cellSelectorRemoved(unsigned int orbit, const QString& name)
void Surface_LSM_Plugin::cellSelectorRemoved(unsigned int orbit, const QString& name)
{
MapHandlerGen* map = static_cast<MapHandlerGen*>(QObject::sender());
......@@ -282,7 +273,7 @@ void Surface_Deformation_Plugin::cellSelectorRemoved(unsigned int orbit, const Q
}
}
void Surface_Deformation_Plugin::selectedCellsChanged(CellSelectorGen* cs)
void Surface_LSM_Plugin::selectedCellsChanged(CellSelectorGen* cs)
{
MapHandlerGen* map = static_cast<MapHandlerGen*>(QObject::sender());
MapParameters& p = h_parameterSet[map];
......@@ -297,7 +288,7 @@ void Surface_Deformation_Plugin::selectedCellsChanged(CellSelectorGen* cs)
void Surface_Deformation_Plugin::changePositionAttribute(const QString& map, const QString& name)
void Surface_LSM_Plugin::changePositionAttribute(const QString& map, const QString& name)
{
MapHandlerGen* m = m_schnapps->getMap(map);
if(m)
......@@ -313,7 +304,7 @@ void Surface_Deformation_Plugin::changePositionAttribute(const QString& map, con
}
}
void Surface_Deformation_Plugin::changeHandleSelector(const QString& map, const QString& name)
void Surface_LSM_Plugin::changeHandleSelector(const QString& map, const QString& name)
{
MapHandlerGen* m = m_schnapps->getMap(map);
if(m)
......@@ -329,7 +320,7 @@ void Surface_Deformation_Plugin::changeHandleSelector(const QString& map, const
}
}
void Surface_Deformation_Plugin::changeFreeSelector(const QString& map, const QString& name)
void Surface_LSM_Plugin::changeFreeSelector(const QString& map, const QString& name)
{
MapHandlerGen* m = m_schnapps->getMap(map);
if(m)
......@@ -349,7 +340,7 @@ void Surface_Deformation_Plugin::changeFreeSelector(const QString& map, const QS
void Surface_Deformation_Plugin::toggleMapDeformation(MapHandlerGen* map)
void Surface_LSM_Plugin::toggleMapDeformation(MapHandlerGen* map)
{
if(map)
{
......@@ -369,7 +360,7 @@ void Surface_Deformation_Plugin::toggleMapDeformation(MapHandlerGen* map)
}
}
void Surface_Deformation_Plugin::lsm(MapHandlerGen* mh)
void Surface_LSM_Plugin::lsm(MapHandlerGen* mh)
{
PFP2::MAP* map = static_cast<MapHandler<PFP2>*>(mh)->getMap();
MapParameters& p = h_parameterSet[mh];
......@@ -393,7 +384,7 @@ void Surface_Deformation_Plugin::lsm(MapHandlerGen* mh)
#if CGOGN_QT_DESIRED_VERSION == 5
Q_PLUGIN_METADATA(IID "CGoGN.SCHNapps.Plugin")
#else
Q_EXPORT_PLUGIN2(Surface_Deformation_Plugin, Surface_Deformation_Plugin)
Q_EXPORT_PLUGIN2(Surface_LSM_Plugin, Surface_LSM_Plugin)
#endif
} // namespace SCHNApps
......
#include "surface_deformation_dockTab.h"
#include "surface_lsm_dockTab.h"
#include "surface_deformation.h"
#include "surface_lsm.h"
#include "schnapps.h"
#include "mapHandler.h"
......@@ -10,7 +10,7 @@ namespace CGoGN
namespace SCHNApps
{
Surface_Deformation_DockTab::Surface_Deformation_DockTab(SCHNApps* s, Surface_Deformation_Plugin* p) :
Surface_LSM_DockTab::Surface_LSM_DockTab(SCHNApps* s, Surface_LSM_Plugin* p) :
m_schnapps(s),
m_plugin(p),
b_updatingUI(false)
......@@ -27,7 +27,7 @@ Surface_Deformation_DockTab::Surface_Deformation_DockTab(SCHNApps* s, Surface_De
void Surface_Deformation_DockTab::positionAttributeChanged(int index)
void Surface_LSM_DockTab::positionAttributeChanged(int index)
{
if(!b_updatingUI)
{
......@@ -46,7 +46,7 @@ void Surface_Deformation_DockTab::positionAttributeChanged(int index)
}
}
void Surface_Deformation_DockTab::handleSelectorChanged(int index)
void Surface_LSM_DockTab::handleSelectorChanged(int index)
{
if(!b_updatingUI)
{
......@@ -61,7 +61,7 @@ void Surface_Deformation_DockTab::handleSelectorChanged(int index)
}
}
void Surface_Deformation_DockTab::freeSelectorChanged(int index)
void Surface_LSM_DockTab::freeSelectorChanged(int index)
{
if(!b_updatingUI)
{
......@@ -75,7 +75,7 @@ void Surface_Deformation_DockTab::freeSelectorChanged(int index)
}
}
void Surface_Deformation_DockTab::startStopButtonClicked()
void Surface_LSM_DockTab::startStopButtonClicked()
{
if(!b_updatingUI)
{
......@@ -89,7 +89,7 @@ void Surface_Deformation_DockTab::startStopButtonClicked()
void Surface_Deformation_DockTab::addVertexAttribute(const QString& name)
void Surface_LSM_DockTab::addVertexAttribute(const QString& name)
{
b_updatingUI = true;
QString vec3TypeName = QString::fromStdString(nameOfType(PFP2::VEC3()));
......@@ -99,7 +99,7 @@ void Surface_Deformation_DockTab::addVertexAttribute(const QString& name)
b_updatingUI = false;
}
void Surface_Deformation_DockTab::addVertexSelector(const QString& name)
void Surface_LSM_DockTab::addVertexSelector(const QString& name)
{
b_updatingUI = true;
combo_handleSelector->addItem(name);
......@@ -107,7 +107,7 @@ void Surface_Deformation_DockTab::addVertexSelector(const QString& name)
b_updatingUI = false;
}
void Surface_Deformation_DockTab::removeVertexSelector(const QString& name)
void Surface_LSM_DockTab::removeVertexSelector(const QString& name)
{
b_updatingUI = true;
int curIndex = combo_handleSelector->currentIndex();
......@@ -124,7 +124,7 @@ void Surface_Deformation_DockTab::removeVertexSelector(const QString& name)
b_updatingUI = false;
}
void Surface_Deformation_DockTab::mapParametersInitialized(bool b)
void Surface_LSM_DockTab::mapParametersInitialized(bool b)
{
b_updatingUI = true;
combo_positionAttribute->setEnabled(!b);
......@@ -135,7 +135,7 @@ void Surface_Deformation_DockTab::mapParametersInitialized(bool b)
b_updatingUI = false;
}
void Surface_Deformation_DockTab::updateMapParameters()
void Surface_LSM_DockTab::updateMapParameters()
{
b_updatingUI = true;
......
......@@ -4,6 +4,8 @@ SET( PLUGIN_NAME Surface_Modelisation )
SET( PLUGIN_ROOT_DIR ${SCHNApps_ROOT_DIR}/Plugins/surface_modelisation )
ADD_DEFINITIONS(-DSURFACE_MODELISATION_DLL_EXPORT)
INCLUDE_DIRECTORIES(
${PLUGIN_ROOT_DIR}/include
${CMAKE_CURRENT_BINARY_DIR}
......
#ifdef WIN32
#if defined SURFACE_MODELISATION_DLL_EXPORT
#define SURFACE_MODELISATION_API __declspec(dllexport)
#else
#define SURFACE_MODELISATION_API __declspec(dllimport)
#endif
#else
#define SURFACE_MODELISATION_API
#endif
#ifndef _SURFACE_MODELISATION_PLUGIN_H_
#define _SURFACE_MODELISATION_PLUGIN_H_
#include "dll.h"
#include "plugin_interaction.h"
#include "surface_modelisation_dockTab.h"
......@@ -32,7 +33,7 @@ struct MapParameters
CellSelector<PFP2::MAP, FACE>* faceSelector;
};
class Surface_Modelisation_Plugin : public PluginInteraction
class SURFACE_MODELISATION_API Surface_Modelisation_Plugin : public PluginInteraction
{
Q_OBJECT
Q_INTERFACES(CGoGN::SCHNApps::Plugin)
......
......@@ -4,6 +4,8 @@ SET( PLUGIN_NAME Surface_Radiance )
SET( PLUGIN_ROOT_DIR ${SCHNApps_ROOT_DIR}/Plugins/surface_radiance )
ADD_DEFINITIONS(-DSURFACE_RADIANCE_DLL_EXPORT)
INCLUDE_DIRECTORIES(
${PLUGIN_ROOT_DIR}/include
${CMAKE_CURRENT_BINARY_DIR}
......
#ifdef WIN32
#if defined SURFACE_RADIANCE_DLL_EXPORT
#define SURFACE_RADIANCE_API __declspec(dllexport)
#else
#define SURFACE_RADIANCE_API __declspec(dllimport)
#endif
#else
#define SURFACE_RADIANCE_API
#endif
#ifndef _SURFACE_RADIANCE_PLUGIN_H_
#define _SURFACE_RADIANCE_PLUGIN_H_
#include "dll.h"
#include "plugin_interaction.h"
#include "surface_radiance_dockTab.h"
#include "dialog_computeRadianceDistance.h"
......@@ -62,7 +63,7 @@ struct MapParameters
Algo::Surface::Decimation::Selector<PFP2>* selector;
};
class Surface_Radiance_Plugin : public PluginInteraction
class SURFACE_RADIANCE_API Surface_Radiance_Plugin : public PluginInteraction
{
Q_OBJECT
Q_INTERFACES(CGoGN::SCHNApps::Plugin)
......
......@@ -4,6 +4,8 @@ SET( PLUGIN_NAME Surface_Render )
SET( PLUGIN_ROOT_DIR ${SCHNApps_ROOT_DIR}/Plugins/surface_render )
ADD_DEFINITIONS(-DSURFACE_RENDER_DLL_EXPORT)
INCLUDE_DIRECTORIES(
${PLUGIN_ROOT_DIR}/include
${CMAKE_CURRENT_BINARY_DIR}
......
#ifdef WIN32
#if defined SURFACE_RENDER_DLL_EXPORT
#define SURFACE_RENDER_API __declspec(dllexport)
#else
#define SURFACE_RENDER_API __declspec(dllimport)
#endif
#else
#define SURFACE_RENDER_API
#endif
#ifndef _SURFACE_RENDER_PLUGIN_H_
#define _SURFACE_RENDER_PLUGIN_H_
#include "dll.h"
#include "plugin_interaction.h"
#include "surface_render_dockTab.h"
#include "Utils/Shaders/shaderFlat.h"
#include "Utils/Shaders/shaderPhong.h"
......@@ -60,6 +60,8 @@ struct MapParameters
Geom::Vec4f backColor;
};
class Surface_Render_DockTab;
/**
* @brief Plugin for 2-Maps topology rendering.
* Some parameters are per view / per map:
......@@ -69,7 +71,7 @@ struct MapParameters
* - position attribute
* - scale factors
*/
class Surface_Render_Plugin : public PluginInteraction
class SURFACE_RENDER_API Surface_Render_Plugin : public PluginInteraction
{
Q_OBJECT
......
#include "surface_render.h"
#include "surface_render_dockTab.h"
#include "mapHandler.h"
#include "slot_debug.h"
......@@ -143,7 +144,6 @@ void Surface_Render_Plugin::drawMap(View* view, MapHandlerGen* map)
void Surface_Render_Plugin::selectedViewChanged(View *prev, View *cur)
{
DEBUG_SLOT();
......
......@@ -4,6 +4,8 @@ SET( PLUGIN_NAME Surface_RenderScalar )
SET( PLUGIN_ROOT_DIR ${SCHNApps_ROOT_DIR}/Plugins/surface_renderScalar )