made it compile, export symbols and pass tests using MSVC

Author: RomanMeusch

BoundingSphere.h

@@ -43,25 +43,25 @@ namespace BoundingSphere {
  * @author Benjamin Eikel
  * @date 2012-03-20
  */
-Sphere_f computeMiniball(const std::vector<Vec3f> & points);
+GEOMETRYAPI Sphere_f computeMiniball(const std::vector<Vec3f> & points);
 
 /**
  * @see computeEPOS98()
  * @note This version uses 3 normals
  */
-Sphere_f computeEPOS6(const std::vector<Vec3f> & points);
+GEOMETRYAPI Sphere_f computeEPOS6(const std::vector<Vec3f> & points);
 
 /**
  * @see computeEPOS98()
  * @note This version uses 7 normals
  */
-Sphere_f computeEPOS14(const std::vector<Vec3f> & points);
+GEOMETRYAPI Sphere_f computeEPOS14(const std::vector<Vec3f> & points);
 
 /**
  * @see computeEPOS98()
  * @note This version uses 13 normals
  */
-Sphere_f computeEPOS26(const std::vector<Vec3f> & points);
+GEOMETRYAPI Sphere_f computeEPOS26(const std::vector<Vec3f> & points);
 
 /**
  * Bounding sphere algorithm using an extremal points heuristic.
@@ -73,7 +73,7 @@ Sphere_f computeEPOS26(const std::vector<Vec3f> & points);
  * @author Benjamin Eikel
  * @date 2012-03-23
  */
-Sphere_f computeEPOS98(const std::vector<Vec3f> & points);
+GEOMETRYAPI Sphere_f computeEPOS98(const std::vector<Vec3f> & points);
 }
 }
 

BoxHelper.h

@@ -29,10 +29,10 @@ using Vec3f = _Vec3<float>;
 namespace Helper {
 
 //! Return the indices of the corners for the requested @p side.
-const corner_t * getCornerIndices(const side_t side);
+GEOMETRYAPI const corner_t * getCornerIndices(const side_t side);
 
 //! Return the normal for the requested @p side.
-const Vec3f & getNormal(const side_t side);
+GEOMETRYAPI const Vec3f & getNormal(const side_t side);
 
 /**
  * Create new boxes by splitting up a box along x/y/z axis.
@@ -43,7 +43,7 @@ const Vec3f & getNormal(const side_t side);
  * @param partsZ number of resulting boxes along z-axis
  * @return Container with the new boxes
  */
-std::vector<Box_f> splitUpBox(const Box_f & box, unsigned int partsX, unsigned int partsY, unsigned int partsZ);
+GEOMETRYAPI std::vector<Box_f> splitUpBox(const Box_f & box, unsigned int partsX, unsigned int partsY, unsigned int partsZ);
 
 /**
  * Split up a box once along up to three axis such that the resulting boxes are
@@ -53,7 +53,7 @@ std::vector<Box_f> splitUpBox(const Box_f & box, unsigned int partsX, unsigned i
  * @param box Box that will be used for splitting
  * @return Container with the new boxes
  */
-std::vector<Box_f> splitBoxCubeLike(const Box_f & box);
+GEOMETRYAPI std::vector<Box_f> splitBoxCubeLike(const Box_f & box);
 
 /**
  * Take a box and transform it by applying a transformation matrix to the
@@ -63,7 +63,7 @@ std::vector<Box_f> splitBoxCubeLike(const Box_f & box);
  * @param matrix Transformation matrix
  * @return Axis-aligned box including the transformed corners
  */
-Box_f getTransformedBox(const Box_f & box, const Matrix4x4f & matrix);
+GEOMETRYAPI Box_f getTransformedBox(const Box_f & box, const Matrix4x4f & matrix);
 }
 }
 

BoxIntersection.h

@@ -41,7 +41,7 @@ namespace Intersection {
 \see original source code:
 	http://jgt.akpeters.com/papers/AkenineMoller01/tribox.html
 */
-bool isBoxIntersectingTriangle(const Box_f & box, const Triangle_f & triangle);
+GEOMETRYAPI bool isBoxIntersectingTriangle(const Box_f & box, const Triangle_f & triangle);
 
 /**
  * Check if two boxes intersect.

CMakeLists.txt

@@ -62,6 +62,14 @@ set_property(TARGET Geometry PROPERTY PUBLIC_HEADER
 	VecN.h
 )
 
+if(MSVC)
+	target_compile_definitions(Geometry PRIVATE "GEOMETRYAPI=__declspec(dllexport)")
+	target_compile_definitions(Geometry INTERFACE "GEOMETRYAPI=__declspec(dllimport)")
+else()
+	target_compile_definitions(Geometry PRIVATE "GEOMETRYAPI=")
+	target_compile_definitions(Geometry INTERFACE "GEOMETRYAPI=")
+endif()
+
 # Set version of library
 set_target_properties(Geometry PROPERTIES VERSION ${Geometry_VERSION}
 																					SOVERSION ${Geometry_VERSION_MAJOR}

Frustum.h

@@ -34,8 +34,8 @@ class Frustum {
 	 * @name Main
 	 */
 	//@{
-	Frustum();
-	Frustum(const Angle & angle, float ratio, float nearD, float farD);
+	GEOMETRYAPI Frustum();
+	GEOMETRYAPI Frustum(const Angle & angle, float ratio, float nearD, float farD);
 	//@}
 
 	/**
@@ -79,7 +79,7 @@ class Frustum {
 		return projectionMatrix;
 	}
 
-	intersection_t isBoxInFrustum(const Box & b) const;
+	GEOMETRYAPI intersection_t isBoxInFrustum(const Box & b) const;
 	inline bool pointInFrustum(const Vec3 & p) const;
 	inline Vec3 operator[](corner_t nr) const;
 	bool operator==(const Frustum & other) const;
@@ -93,17 +93,17 @@ class Frustum {
 	 * @name Modification
 	 */
 	//@{
-	void setPerspective(const Angle & angle, float ratio, float near, float far);
-	void setFrustum(float left, float right, float bottom, float top, float near, float far, bool orthogonal = false);
-	void setFrustumFromAngles(const Angle & fovLeft, const Angle & fovRight, const Angle & fovBottom,
+	GEOMETRYAPI void setPerspective(const Angle & angle, float ratio, float near, float far);
+	GEOMETRYAPI void setFrustum(float left, float right, float bottom, float top, float near, float far, bool orthogonal = false);
+	GEOMETRYAPI void setFrustumFromAngles(const Angle & fovLeft, const Angle & fovRight, const Angle & fovBottom,
 							  const Angle & fovTop, float near, float far);
 	void setOrthogonal(float l, float r, float b, float t, float n, float f) {
 		setFrustum(l, r, b, t, n, f, true);
 	}
-	void setPosition(const Vec3 & pos, const Vec3 & dir, const Vec3 & up);
+	GEOMETRYAPI void setPosition(const Vec3 & pos, const Vec3 & dir, const Vec3 & up);
 
 protected:
-	void recalculateCornersAndPlanes();
+	GEOMETRYAPI void recalculateCornersAndPlanes();
 	//@}
 
 	// ---- Data

RayBoxIntersection.h

@@ -86,7 +86,7 @@ class Slope {
 
 public:
 	//! Create a new instance and associate it with a ray.
-	Slope(const ray_t & ray);
+	GEOMETRYAPI Slope(const ray_t & ray);
 
 	/**
 	 * Check if the associated ray intersects a box.
@@ -98,7 +98,7 @@ class Slope {
 	 * @note This function is usually a little bit faster than
 	 * getRayBoxIntersection()
 	 */
-	bool isRayIntersectingBox(const box_t & box) const;
+	GEOMETRYAPI bool isRayIntersectingBox(const box_t & box) const;
 
 	/**
 	 * Calculate the intersection between the associated ray and a box.
@@ -113,7 +113,7 @@ class Slope {
 	 * @note This function is usually a little bit slower than
 	 * isRayIntersectingBox()
 	 */
-	bool getRayBoxIntersection(const box_t & box, value_t & intersection) const;
+	GEOMETRYAPI bool getRayBoxIntersection(const box_t & box, value_t & intersection) const;
 
 	//! Return the stored ray.
 	const ray_t & getRay() const {

Tools.h

@@ -56,8 +56,8 @@ bool rayPlaneIntersection(const Plane & plane, const Ray3f & ray, Vec3f & inters
 }
 
 /*! (intersects?, lineIntersectionValue1, lineIntersectionValue2) */
-std::tuple<bool, float, float> normLineSphereIntersections(const Line3f & normalizedLine, const Sphere_f & sphere);
-std::tuple<bool, float, float> lineSphereIntersections(const Line3f & line, const Sphere_f & sphere);
+GEOMETRYAPI std::tuple<bool, float, float> normLineSphereIntersections(const Line3f & normalizedLine, const Sphere_f & sphere);
+GEOMETRYAPI std::tuple<bool, float, float> lineSphereIntersections(const Line3f & line, const Sphere_f & sphere);
 
 /**
  * Calculate a pair of points on the given lines @a lineA and @a lineB that is closest to each other.
@@ -180,7 +180,7 @@ inline _Vec3<_T> unProject(const _Vec3<_T> & win, const _Matrix4x4<_T> & worldTo
  * @param viewport Viewport
  * @return Rect in window coordinates
  */
-Rect_f projectBox(const Box & box, const Matrix4x4f & modelView, const Matrix4x4f & projection,
+GEOMETRYAPI Rect_f projectBox(const Box & box, const Matrix4x4f & modelView, const Matrix4x4f & projection,
 				  const Rect_f & viewport);
 
 /**
@@ -195,7 +195,7 @@ Rect_f projectBox(const Box & box, const Matrix4x4f & modelView, const Matrix4x4
  * @note Example 2: @a box can be given in object coordinates,
  * and @a modelView contains the product of a camera matrix and the transformation matrix of the object.
  */
-Frustum calcEnclosingOrthoFrustum(const Box & box, const Matrix4x4f & modelView);
+GEOMETRYAPI Frustum calcEnclosingOrthoFrustum(const Box & box, const Matrix4x4f & modelView);
 }
 
 #endif /* GEOMETRY_TOOLS_H */