Commit 8bfc3c8e authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum
Browse files

[CHANGE] - renamed export defines to sound a little bit less Windows-specific...

[CHANGE] - renamed export defines to sound a little bit less Windows-specific (and therefore make this visual studio specific evil sound a little bit less evil)
parent 73fb4abb
......@@ -33,7 +33,7 @@
/**
* Indicates invalid element access of a container.
*/
class EXPORT_OWCOMMON_DLL WPropertyUnknown : public WException
class OWCOMMON_EXPORT WPropertyUnknown : public WException
{
public:
/**
......
......@@ -42,7 +42,7 @@ namespace wmath
* A line is an ordered sequence of WPositions.
*/
// typedef WMixinVector< WPosition > WLine;
class EXPORT_OWCOMMON_DLL WLine : public WMixinVector< WPosition >
class OWCOMMON_EXPORT WLine : public WMixinVector< WPosition >
{
public:
/**
......
......@@ -39,7 +39,7 @@ namespace wmath
* \param mat 3x3 matrix
* \param vec vector
*/
WVector3D EXPORT_OWCOMMON_DLL multMatrixWithVector3D( WMatrix<double> mat, WVector3D vec );
WVector3D OWCOMMON_EXPORT multMatrixWithVector3D( WMatrix<double> mat, WVector3D vec );
/**
* Applies a coordinate transformation in homogenous coordinates to a vector.
......@@ -48,7 +48,7 @@ namespace wmath
* \param mat 4x4 matrix
* \param vec vector
*/
WVector3D EXPORT_OWCOMMON_DLL transformVector3DWithMatrix4D( WMatrix<double> mat, WVector3D vec );
WVector3D OWCOMMON_EXPORT transformVector3DWithMatrix4D( WMatrix<double> mat, WVector3D vec );
/**
* Applies a coordinate transformation in homogenous coordinates to a position.
......@@ -57,7 +57,7 @@ namespace wmath
* \param mat 4x4 matrix
* \param vec vector
*/
WVector3D EXPORT_OWCOMMON_DLL transformPosition3DWithMatrix4D( WMatrix<double> mat, WPosition vec );
WVector3D OWCOMMON_EXPORT transformPosition3DWithMatrix4D( WMatrix<double> mat, WPosition vec );
/**
* helper routine to invert a 3x3 matrix
......@@ -66,7 +66,7 @@ namespace wmath
*
* \return inverted 3x3 matrix
*/
WMatrix<double> EXPORT_OWCOMMON_DLL invertMatrix3x3( WMatrix<double> mat );
WMatrix<double> OWCOMMON_EXPORT invertMatrix3x3( WMatrix<double> mat );
/**
* helper routine to invert a 4x4 matrix
......@@ -75,7 +75,7 @@ namespace wmath
*
* \return inverted 4x4 matrix
*/
WMatrix<double> EXPORT_OWCOMMON_DLL invertMatrix4x4( WMatrix<double> mat );
WMatrix<double> OWCOMMON_EXPORT invertMatrix4x4( WMatrix<double> mat );
/**
* Checks if the given two vectors are linearly independent.
......@@ -87,7 +87,7 @@ namespace wmath
*
* \note This check is performed with the cross product != (0,0,0) but in numerical stability with FLT_EPS.
*/
bool EXPORT_OWCOMMON_DLL linearIndependent( const wmath::WVector3D& u, const wmath::WVector3D& v );
bool OWCOMMON_EXPORT linearIndependent( const wmath::WVector3D& u, const wmath::WVector3D& v );
}
#endif // WLINEARALGEBRAFUNCTIONS_H
......@@ -38,7 +38,7 @@ namespace wmath
* Class for symmetric spherical harmonics
* The index scheme of the coefficients/basis values is like in the Descoteaux paper "Regularized, Fast, and Robust Analytical Q-Ball Imaging".
*/
class EXPORT_OWCOMMON_DLL WSymmetricSphericalHarmonic // NOLINT
class OWCOMMON_EXPORT WSymmetricSphericalHarmonic // NOLINT
{
// TODO(all): implement test
// friend class WSymmetricSphericalHarmonicTest;
......
......@@ -36,7 +36,7 @@ namespace wmath
/**
* This class stores coordinates on the unit sphere.
*/
class EXPORT_OWCOMMON_DLL WUnitSphereCoordinates // NOLINT
class OWCOMMON_EXPORT WUnitSphereCoordinates // NOLINT
{
// TODO(all): implement test
// friend class WUnitSphereCoordinatesTest;
......
......@@ -40,7 +40,7 @@ namespace wmath
/**
* Efficient three-dimensional vector that allows many vector algebra operations
*/
class EXPORT_OWCOMMON_DLL WVector3D : public WValue< double >
class OWCOMMON_EXPORT WVector3D : public WValue< double >
{
/**
* Only UnitTests are allowed to be friends of this class
......
......@@ -30,14 +30,14 @@
#pragma warning( disable: 4251 )
#ifdef OWge_EXPORTS
#define EXPORT_OWGE_DLL __declspec( dllexport )
#define WGE_EXPORT __declspec( dllexport )
#else
#define EXPORT_OWGE_DLL __declspec( dllimport )
#define WGE_EXPORT __declspec( dllimport )
#endif
#else
#define EXPORT_OWGE_DLL
#define WGE_EXPORT
#endif // _MSC_VER
......
......@@ -32,7 +32,7 @@
* A manipulator which changes the view of a 2D scene. Does things like panning
* and zooming.
*/
class EXPORT_OWGE_DLL WGE2DManipulator : public osgGA::MatrixManipulator
class WGE_EXPORT WGE2DManipulator : public osgGA::MatrixManipulator
{
public:
/**
......
......@@ -38,7 +38,7 @@
* This class contains a label layout for positioning labels at the side of the screen. There is a line from the point of interest to the label
* on the side of the screen.
*/
class EXPORT_OWGE_DLL WGEBorderLayout: public WGEGroupNode
class WGE_EXPORT WGEBorderLayout: public WGEGroupNode
{
friend class SafeUpdateCallback;
public:
......
......@@ -34,7 +34,7 @@
* functions for simply setting some camera defaults.
* \ingroup ge
*/
class EXPORT_OWGE_DLL WGECamera: public osg::Camera
class WGE_EXPORT WGECamera: public osg::Camera
{
public:
/**
......
......@@ -50,7 +50,7 @@ namespace wge
*
* \return The OSG geode containing the 12 edges of the box.
*/
osg::ref_ptr< osg::Geode > EXPORT_OWGE_DLL generateBoundingBoxGeode( const wmath::WPosition& pos1,
osg::ref_ptr< osg::Geode > WGE_EXPORT generateBoundingBoxGeode( const wmath::WPosition& pos1,
const wmath::WPosition& pos2,
const WColor& color );
......@@ -65,7 +65,7 @@ namespace wge
*
* \return The OSG node containing the 12 edges of the box.
*/
osg::ref_ptr< osg::Node > EXPORT_OWGE_DLL generateSolidBoundingBoxNode( const wmath::WPosition& pos1,
osg::ref_ptr< osg::Node > WGE_EXPORT generateSolidBoundingBoxNode( const wmath::WPosition& pos1,
const wmath::WPosition& pos2,
const WColor& color,
bool threeDTexCoords = true );
......@@ -77,7 +77,7 @@ namespace wge
*
* \return the geometry
*/
osg::ref_ptr< osg::Geometry > EXPORT_OWGE_DLL createUnitCube( const WColor& color );
osg::ref_ptr< osg::Geometry > WGE_EXPORT createUnitCube( const WColor& color );
/**
* Extract the vertices and triangles from a WTriangleMesh and save them
......@@ -88,7 +88,7 @@ namespace wge
* them into the geometry.
* \return an osg::Geometry containing the mesh
*/
osg::ref_ptr< osg::Geometry > EXPORT_OWGE_DLL convertToOsgGeometry( WTriangleMesh* mesh, bool includeNormals = false );
osg::ref_ptr< osg::Geometry > WGE_EXPORT convertToOsgGeometry( WTriangleMesh* mesh, bool includeNormals = false );
/**
* Generates a line geode with thickness and color as parameters.
......@@ -99,7 +99,7 @@ namespace wge
*
* \return The new assembled geode for this line
*/
osg::ref_ptr< osg::Geode > EXPORT_OWGE_DLL generateLineStripGeode( const wmath::WLine& line,
osg::ref_ptr< osg::Geode > WGE_EXPORT generateLineStripGeode( const wmath::WLine& line,
const float thickness = 3.0f,
const WColor& color = WColor( 0, 0, 0, 0 ) );
......@@ -110,7 +110,7 @@ namespace wge
* \param text text
* \return a positionattitudetransfom object containing the label
*/
osg::ref_ptr< osg::PositionAttitudeTransform > EXPORT_OWGE_DLL addLabel( osg::Vec3 position, std::string text );
osg::ref_ptr< osg::PositionAttitudeTransform > WGE_EXPORT addLabel( osg::Vec3 position, std::string text );
/**
* helper function to add a label with it's position vector
......@@ -118,7 +118,7 @@ namespace wge
* \param position position of the label
* \return a positionattitudetransfom object containing the label
*/
osg::ref_ptr< osg::PositionAttitudeTransform > EXPORT_OWGE_DLL vector2label( osg::Vec3 position );
osg::ref_ptr< osg::PositionAttitudeTransform > WGE_EXPORT vector2label( osg::Vec3 position );
} // end of namespace wge
......
......@@ -63,7 +63,7 @@ namespace wge
*
* \return OSG vertex array where every four vertices describing a QUAD.
*/
osg::ref_ptr< osg::Vec3Array > EXPORT_OWGE_DLL generateCuboidQuads( const std::vector< wmath::WPosition >& corners );
osg::ref_ptr< osg::Vec3Array > WGE_EXPORT generateCuboidQuads( const std::vector< wmath::WPosition >& corners );
/**
* Generates for a QUAD given via 3 three points ( the fourth is not needed ) the
......@@ -75,7 +75,7 @@ namespace wge
*
*\return OSG Vector of the normal of the QUAD
*/
osg::Vec3 EXPORT_OWGE_DLL getQuadNormal( const wmath::WPosition& a, const wmath::WPosition& b, const wmath::WPosition& c );
osg::Vec3 WGE_EXPORT getQuadNormal( const wmath::WPosition& a, const wmath::WPosition& b, const wmath::WPosition& c );
/**
* Generates for all QUADS of the Cuboid the normals in the following order:
......@@ -103,7 +103,7 @@ namespace wge
*
*\return Array of normals in the order as shown above.
*/
osg::ref_ptr< osg::Vec3Array > EXPORT_OWGE_DLL generateCuboidQuadNormals( const std::vector< wmath::WPosition >& corners );
osg::ref_ptr< osg::Vec3Array > WGE_EXPORT generateCuboidQuadNormals( const std::vector< wmath::WPosition >& corners );
/**
* Calculate the Delaunay Triangulation of the given points.
......@@ -124,7 +124,7 @@ namespace wge
* triangulation
* \return triangulation as WTriangleMesh
*/
WTriangleMesh EXPORT_OWGE_DLL triangulate( const std::vector< wmath::WPosition >& points, double transformationFactor = 0.0 );
WTriangleMesh WGE_EXPORT triangulate( const std::vector< wmath::WPosition >& points, double transformationFactor = 0.0 );
}
#endif // WGEGEOMETRYUTILS_H
......@@ -44,7 +44,7 @@
*
* \ingroup GE
*/
class EXPORT_OWGE_DLL WGEGroupNode: public osg::MatrixTransform
class WGE_EXPORT WGEGroupNode: public osg::MatrixTransform
{
public:
......
......@@ -35,7 +35,7 @@
* Label layout-item. An layoutable item which displays text. This is nice for labeling elements on the screen. It can be used stand-alone (as it
* simply is an osgText::Text instance or in conjunction with an WGEItemLayouter.
*/
class EXPORT_OWGE_DLL WGELabel: public osgText::Text,
class WGE_EXPORT WGELabel: public osgText::Text,
WGELayoutableItem
{
public:
......
......@@ -39,7 +39,7 @@
*
* \ingroup GE
*/
class EXPORT_OWGE_DLL WGEManagedGroupNode: public WGEGroupNode
class WGE_EXPORT WGEManagedGroupNode: public WGEGroupNode
{
public:
......
......@@ -37,7 +37,7 @@
* IO class for writing the graphics engine state to a project file. Currently it only writes the camera settings for the main view with the
* WGEZoomTrackbalManipulator.
*/
class EXPORT_OWGE_DLL WGEProjectFileIO: public WProjectFileIO
class WGE_EXPORT WGEProjectFileIO: public WProjectFileIO
{
public:
......
......@@ -32,7 +32,7 @@
* Class for managing the OpenSceneGraph root node. It can handle new nodes, removing nodes and so on.
* \ingroup ge
*/
class EXPORT_OWGE_DLL WGEScene: public WGEGroupNode
class WGE_EXPORT WGEScene: public WGEGroupNode
{
public:
......
......@@ -38,7 +38,7 @@
/**
* This is a uniform callback setting the uniform to the current time in milliseconds, hundredth of a second or tenth of a second.
*/
class EXPORT_OWGE_DLL WGEShaderAnimationCallback: public osg::Uniform::Callback
class WGE_EXPORT WGEShaderAnimationCallback: public osg::Uniform::Callback
{
public:
......
......@@ -70,7 +70,7 @@ namespace wge
*
* \return Refernce to the same vector but as osg::Vec3Array.
*/
osg::ref_ptr< osg::Vec3Array > EXPORT_OWGE_DLL osgVec3Array( const std::vector< wmath::WPosition >& posArray );
osg::ref_ptr< osg::Vec3Array > WGE_EXPORT osgVec3Array( const std::vector< wmath::WPosition >& posArray );
/**
* Converts screen coordinates into Camera coordinates.
......@@ -78,7 +78,7 @@ namespace wge
* \param screen the screen coordinates
* \param camera The matrices of this camera will used for unprojecting.
*/
osg::Vec3 EXPORT_OWGE_DLL unprojectFromScreen( const osg::Vec3 screen, osg::ref_ptr< osg::Camera > camera );
osg::Vec3 WGE_EXPORT unprojectFromScreen( const osg::Vec3 screen, osg::ref_ptr< osg::Camera > camera );
/**
* Conversion of WVector3D to osg::Vec3
......
......@@ -55,7 +55,7 @@
* It is, besides WGraphicsEngine, the ONLY entry point for each widget for accessing the graphics engine.
* \ingroup ge
*/
class EXPORT_OWGE_DLL WGEViewer: public WGEGraphicsWindow,
class WGE_EXPORT WGEViewer: public WGEGraphicsWindow,
public boost::enable_shared_from_this< WGEViewer >
{
public:
......
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