Commit 42f4ff45 authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Merge branch 'campvis-core-dll' into 'development'

Campvis Core Dll
parents 0be65bc3 92a0b826
......@@ -37,7 +37,7 @@ namespace campvis {
*
* \todo Number of channels
*/
class ImageRepresentationDisk : public GenericAbstractImageRepresentation<ImageRepresentationDisk> {
class CAMPVIS_CORE_API ImageRepresentationDisk : public GenericAbstractImageRepresentation<ImageRepresentationDisk> {
public:
/**
* Creates a new ImageRepresentationDisk with the given parameters and automatically
......
......@@ -42,7 +42,7 @@ namespace campvis {
* Stores image data as OpenGL texture.
* Can bei instantiated either by a WeaklyTypedPointer or strongly typed by an GenericImageRepresentationLocal.
*/
class ImageRepresentationGL : public GenericAbstractImageRepresentation<ImageRepresentationGL> {
class CAMPVIS_CORE_API ImageRepresentationGL : public GenericAbstractImageRepresentation<ImageRepresentationGL> {
public:
/**
* Creates a new ImageRepresentationGL representation from a tgt::Texture and automatically
......
......@@ -40,7 +40,7 @@ namespace campvis {
*
* \todo implement padding, add some kind of cool iterators
*/
class ImageRepresentationLocal : public GenericAbstractImageRepresentation<ImageRepresentationLocal> {
class CAMPVIS_CORE_API ImageRepresentationLocal : public GenericAbstractImageRepresentation<ImageRepresentationLocal> {
public:
/**
* Destructor
......
......@@ -35,7 +35,7 @@ namespace campvis {
/**
* Class encapsulating a series of images.
*/
class ImageSeries : public AbstractData {
class CAMPVIS_CORE_API ImageSeries : public AbstractData {
public:
/**
* Constructor
......
......@@ -43,7 +43,7 @@ namespace campvis {
* \note Like all Geometry classes IndexedMeshGeometry has value-sematics: Once created, the
* faces cannot be altered anymore.
*/
class IndexedMeshGeometry : public GeometryData {
class CAMPVIS_CORE_API IndexedMeshGeometry : public GeometryData {
public:
/**
* Creates a new IndexedMeshGeometry built from the given faces.
......
......@@ -40,7 +40,7 @@ namespace campvis {
*
* The internal OpenGL buffers are lazy-instantiated.
*/
class MeshGeometry : public GeometryData {
class CAMPVIS_CORE_API MeshGeometry : public GeometryData {
public:
/**
* Creates a new MeshGeometry built from the given faces.
......
......@@ -42,7 +42,7 @@ namespace campvis {
*
* The internal OpenGL buffers are lazy-instantiated.
*/
class MultiIndexedGeometry : public GeometryData {
class CAMPVIS_CORE_API MultiIndexedGeometry : public GeometryData {
public:
/**
* Creates a new MultiIndexedGeometry using the given geometry. Indices are to be provided later.
......
......@@ -49,7 +49,7 @@ namespace campvis {
* \note RenderData does not care whether its textures have the same size and their formats
* make sense.
*/
class RenderData : public AbstractData {
class CAMPVIS_CORE_API RenderData : public AbstractData {
public:
/**
* Constructor, creates empty RenderData.
......
......@@ -28,13 +28,15 @@
#include "tgt/logmanager.h"
#include "tgt/event/eventlistener.h"
#include "core/coreapi.h"
namespace campvis {
class INumericProperty;
/**
* Event handler that maps mouse wheel events to a numeric property.
*/
class MWheelToNumericPropertyEventListener : public tgt::EventListener {
class CAMPVIS_CORE_API MWheelToNumericPropertyEventListener : public tgt::EventListener {
public:
/**
* Creates a MWheelToNumericPropertyEventListener.
......
......@@ -32,6 +32,7 @@
#include "tgt/event/eventlistener.h"
#include "tgt/navigation/trackball.h"
#include "core/coreapi.h"
#include "core/datastructures/datahandle.h"
#include "core/properties/numericproperty.h"
......@@ -45,7 +46,7 @@ namespace campvis {
/**
* Wrapper to adapt a CameraProperty to the tgt::Trackball interface.
*/
class CamPropNavigationWrapper : public tgt::IHasCamera {
class CAMPVIS_CORE_API CamPropNavigationWrapper : public tgt::IHasCamera {
public:
/**
* Constructor
......@@ -78,7 +79,7 @@ namespace campvis {
* \note Also takes care of automatically adjusting the window ratio for the wrapped
* camera when the viewport size changes.
*/
class TrackballNavigationEventListener : public tgt::EventListener, public sigslot::has_slots<> {
class CAMPVIS_CORE_API TrackballNavigationEventListener : public tgt::EventListener, public sigslot::has_slots<> {
public:
/**
* Creates a TrackballNavigationEventListener.
......
......@@ -29,6 +29,8 @@
#include "tgt/vector.h"
#include "tgt/event/eventlistener.h"
#include "core/coreapi.h"
namespace campvis {
class TransferFunctionProperty;
......@@ -36,7 +38,7 @@ namespace campvis {
* Event handler that maps mouse click-and-drag events to the windowing of a transfer function.
*
*/
class TransFuncWindowingEventListener : public tgt::EventListener {
class CAMPVIS_CORE_API TransFuncWindowingEventListener : public tgt::EventListener {
public:
/**
* Creates a TransFuncWindowingEventListener.
......
......@@ -35,6 +35,7 @@
#include <tbb/spin_mutex.h>
#include <tbb/mutex.h>
#include "core/coreapi.h"
#include "core/datastructures/datacontainer.h"
#include "core/properties/datanameproperty.h"
#include "core/properties/floatingpointproperty.h"
......@@ -53,7 +54,7 @@ namespace campvis {
/**
* Abstract base class for CAMPVis Pipelines.
*/
class AbstractPipeline : public HasPropertyCollection, public tgt::EventHandler, public tgt::EventListener {
class CAMPVIS_CORE_API AbstractPipeline : public HasPropertyCollection, public tgt::EventHandler, public tgt::EventListener {
public:
/**
* Creates a AbstractPipeline.
......
......@@ -29,6 +29,8 @@
#include <tbb/atomic.h>
#include <tbb/concurrent_queue.h>
#include "tgt/logmanager.h"
#include "core/coreapi.h"
#include "core/datastructures/datacontainer.h"
#include "core/properties/propertycollection.h"
......@@ -51,7 +53,7 @@ namespace campvis {
*
* \sa AbstractPipeline
*/
class AbstractProcessor : public HasPropertyCollection {
class CAMPVIS_CORE_API AbstractProcessor : public HasPropertyCollection {
public:
/**
* Available invalidation levels
......@@ -249,7 +251,7 @@ namespace campvis {
* Scoped lock of an AbstractProcessor that automatically unlocks the processor on destruction.
* Useful for exception safety.
*/
struct ScopedLock {
struct CAMPVIS_CORE_API ScopedLock {
/**
* Constructs a new Scoped lock, locking \a p and unlocking \a p on destruction.
* \param p Processor to lock
......
......@@ -28,6 +28,8 @@
#include <vector>
#include <string>
#include "core/coreapi.h"
namespace tgt {
class Shader;
}
......@@ -41,7 +43,7 @@ namespace campvis {
* ProcessorDecorators are created and assigned to a processor during its construction. The
* virtual methods are then calles at an appropriate time.
*/
class AbstractProcessorDecorator {
class CAMPVIS_CORE_API AbstractProcessorDecorator {
public:
/**
* Pure virtual Destructor
......@@ -86,7 +88,7 @@ namespace campvis {
/**
* Pure virtual base class for processors using decorators.
*/
class HasProcessorDecorators {
class CAMPVIS_CORE_API HasProcessorDecorators {
public:
/**
* Virtual Destructor, deletes all Decorators
......
......@@ -42,7 +42,7 @@ namespace campvis {
* \param dc Pointer to the DataContainer containing local working set of data for this
* pipeline, must not be 0, must be valid the whole lifetime of this pipeline.
*/
class AutoEvaluationPipeline : public AbstractPipeline {
class CAMPVIS_CORE_API AutoEvaluationPipeline : public AbstractPipeline {
public:
/**
* Creates a AutoEvaluationPipeline.
......
......@@ -30,7 +30,7 @@
namespace campvis {
class ProcessorDecoratorBackground : public AbstractProcessorDecorator {
class CAMPVIS_CORE_API ProcessorDecoratorBackground : public AbstractProcessorDecorator {
public:
ProcessorDecoratorBackground();
virtual ~ProcessorDecoratorBackground();
......
......@@ -39,7 +39,7 @@ namespace campvis {
* generateHeader() to define computeGradient(tex, texParams, texCoords) in GLSL calling
* the selected function.
*/
class ProcessorDecoratorGradient : public AbstractProcessorDecorator {
class CAMPVIS_CORE_API ProcessorDecoratorGradient : public AbstractProcessorDecorator {
public:
/// Method for online-calculating gradients
enum GradientMethod {
......
......@@ -35,7 +35,7 @@
namespace campvis {
class ProcessorDecoratorMasking : public AbstractProcessorDecorator, public sigslot::has_slots<> {
class CAMPVIS_CORE_API ProcessorDecoratorMasking : public AbstractProcessorDecorator, public sigslot::has_slots<> {
public:
ProcessorDecoratorMasking();
virtual ~ProcessorDecoratorMasking();
......
......@@ -33,7 +33,7 @@
namespace campvis {
class ProcessorDecoratorShading : public ProcessorDecoratorGradient {
class CAMPVIS_CORE_API ProcessorDecoratorShading : public ProcessorDecoratorGradient {
public:
explicit ProcessorDecoratorShading(const std::string& lightUniformName = "_lightSource");
......
......@@ -52,7 +52,7 @@ namespace campvis {
* Of course you can also directly overwrite process() yourself, but then you will need to to the
* sanity checks yourself.
*/
class RaycastingProcessor : public VisualizationProcessor, public HasProcessorDecorators {
class CAMPVIS_CORE_API RaycastingProcessor : public VisualizationProcessor, public HasProcessorDecorators {
public:
/**
* Creates a RaycastingProcessor.
......
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