AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Now that PolyVox is header only we have no further use for the POLYVOX_API/LOCAL/SHARED macros which wrap API import/export.

Browse Source
This commit is contained in:
David Williams 2015-05-08 15:04:17 +02:00
parent b36548ff20
commit d8a422955d
6 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/PolyVox/CubicSurfaceExtractor.h
View File

@ -40,7 +40,7 @@ namespace PolyVox
struct CubicVertex struct CubicVertex
#else #else
template<typename _DataType> template<typename _DataType>
struct POLYVOX_API CubicVertex struct CubicVertex
#endif #endif
{ {
typedef _DataType DataType; typedef _DataType DataType;

4
include/PolyVox/GradientEstimators.h
View File

@ -55,8 +55,8 @@ namespace PolyVox
template<typename VolumeType> template<typename VolumeType>
Vector3DFloat computeSmoothSobelGradient(typename VolumeType::Sampler& volIter); Vector3DFloat computeSmoothSobelGradient(typename VolumeType::Sampler& volIter);
//POLYVOX_API void computeNormalsForVertices(VolumeType<uint8_t>* volumeData, Mesh<PositionMaterialNormal>& mesh, NormalGenerationMethod normalGenerationMethod); // void computeNormalsForVertices(VolumeType<uint8_t>* volumeData, Mesh<PositionMaterialNormal>& mesh, NormalGenerationMethod normalGenerationMethod);
//POLYVOX_API Vector3DFloat computeNormal(VolumeType<uint8_t>* volumeData, const Vector3DFloat& v3dPos, NormalGenerationMethod normalGenerationMethod); // Vector3DFloat computeNormal(VolumeType<uint8_t>* volumeData, const Vector3DFloat& v3dPos, NormalGenerationMethod normalGenerationMethod);
} }
#include "PolyVox/GradientEstimators.inl" #include "PolyVox/GradientEstimators.inl"

16
include/PolyVox/Impl/PlatformDefinitions.h
View File

@ -59,22 +59,6 @@ freely, subject to the following restrictions:
#define POLYVOX_DEPRECATED //Define it to nothing to avoid warnings #define POLYVOX_DEPRECATED //Define it to nothing to avoid warnings
#endif #endif
// Now we use the generic helper definitions above to define POLYVOX_API and POLYVOX_LOCAL.
// POLYVOX_API is used for the public API symbols. It either imports or exports (or does nothing for static build)
// POLYVOX_LOCAL is used for non-api symbols.
#ifdef POLYVOX_SHARED // defined if PolyVox is compiled as a shared library
#ifdef POLYVOX_SHARED_EXPORTS // defined if we are building the PolyVox shared library (instead of using it)
#define POLYVOX_API POLYVOX_HELPER_EXPORT
#else
#define POLYVOX_API POLYVOX_HELPER_IMPORT
#endif // POLYVOX_SHARED_EXPORTS
#define POLYVOX_LOCAL POLYVOX_HELPER_LOCAL
#else // POLYVOX_SHARED is not defined: this means PolyVox is a static library.
#define POLYVOX_API
#define POLYVOX_LOCAL
#endif // POLYVOX_SHARED
#if defined(_MSC_VER) #if defined(_MSC_VER)
// In Visual Studio we can use this function to go into the debugger. // In Visual Studio we can use this function to go into the debugger.
#define POLYVOX_HALT() __debugbreak() #define POLYVOX_HALT() __debugbreak()

2
include/PolyVox/MarchingCubesSurfaceExtractor.h
View File

@ -39,7 +39,7 @@ namespace PolyVox
struct MarchingCubesVertex struct MarchingCubesVertex
#else #else
template<typename _DataType> template<typename _DataType>
struct POLYVOX_API MarchingCubesVertex struct MarchingCubesVertex
#endif #endif
{ {
typedef _DataType DataType; typedef _DataType DataType;

2
include/PolyVox/Region.h
View File

@ -52,7 +52,7 @@ namespace PolyVox
#ifdef SWIG #ifdef SWIG
class Region class Region
#else #else
class POLYVOX_API Region class Region
#endif #endif
{ {
public: public:

2
include/PolyVox/Vertex.h
View File

@ -37,7 +37,7 @@ namespace PolyVox
struct Vertex struct Vertex
#else #else
template<typename _DataType> template<typename _DataType>
struct POLYVOX_API Vertex struct Vertex
#endif #endif
{ {
typedef _DataType DataType; typedef _DataType DataType;