diff options
| author | Miles Macklin <[email protected]> | 2017-06-09 13:41:15 +1200 |
|---|---|---|
| committer | Miles Macklin <[email protected]> | 2017-06-09 13:41:15 +1200 |
| commit | 688b5f42e9bfe498d7af7075d4d8f4429867f3a3 (patch) | |
| tree | 7e0d0e7c95298f0418723abd92f61ac6e16b055e /core | |
| parent | Update README.md (diff) | |
| download | flex-1.2.0.beta.1.tar.xz flex-1.2.0.beta.1.zip | |
1.2.0.beta.11.2.0.beta.1
Diffstat (limited to 'core')
| -rw-r--r-- | core/core.h | 2 | ||||
| -rw-r--r-- | core/platform.cpp | 2 | ||||
| -rw-r--r-- | core/platform.h | 2 | ||||
| -rw-r--r-- | core/voxelize.cpp | 4 | ||||
| -rw-r--r-- | core/voxelize.h | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/core/core.h b/core/core.h index 7c7d940..48a2918 100644 --- a/core/core.h +++ b/core/core.h @@ -37,7 +37,7 @@ #define VERBOSE(a) #endif -#define Super __super +//#define Super __super // basically just a collection of macros and types #ifndef UNUSED diff --git a/core/platform.cpp b/core/platform.cpp index 8846e9b..8c451ab 100644 --- a/core/platform.cpp +++ b/core/platform.cpp @@ -39,7 +39,7 @@ using namespace std; -#ifdef WIN32 +#if defined(WIN32) || defined(WIN64) #include <windows.h> #include <commdlg.h> diff --git a/core/platform.h b/core/platform.h index 9b7a473..b58d03f 100644 --- a/core/platform.h +++ b/core/platform.h @@ -44,7 +44,7 @@ std::string GetWorkingDirectory(); #include <android/log.h> -#ifndef +#ifndef LOGE #define LOGE(...) __android_log_print(ANDROID_LOG_ERROR , "Flex", __VA_ARGS__) #endif diff --git a/core/voxelize.cpp b/core/voxelize.cpp index 8172aea..647ceb4 100644 --- a/core/voxelize.cpp +++ b/core/voxelize.cpp @@ -28,12 +28,12 @@ #include "aabbtree.h" #include "mesh.h" -void Voxelize(const float* vertices, int numVertices, const int* indices, int numTriangleIndices, uint32_t width, uint32_t height, uint32_t depth, uint32_t* volume, Vec3 minExtents, Vec3 maxExtents) +void Voxelize(const Vec3* vertices, int numVertices, const int* indices, int numTriangleIndices, uint32_t width, uint32_t height, uint32_t depth, uint32_t* volume, Vec3 minExtents, Vec3 maxExtents) { memset(volume, 0, sizeof(uint32_t)*width*height*depth); // build an aabb tree of the mesh - AABBTree tree((const Vec3*)vertices, numVertices, (const uint32_t*)indices, numTriangleIndices/3); + AABBTree tree(vertices, numVertices, (const uint32_t*)indices, numTriangleIndices/3); // parity count method, single pass const Vec3 extents(maxExtents-minExtents); diff --git a/core/voxelize.h b/core/voxelize.h index deb99b5..958dbf5 100644 --- a/core/voxelize.h +++ b/core/voxelize.h @@ -30,4 +30,4 @@ struct Mesh; // voxelizes a mesh using a single pass parity algorithm -void Voxelize(const float* vertices, int numVertices, const int* indices, int numTriangleIndices, uint32_t width, uint32_t height, uint32_t depth, uint32_t* volume, Vec3 minExtents, Vec3 maxExtents);
\ No newline at end of file +void Voxelize(const Vec3* vertices, int numVertices, const int* indices, int numTriangleIndices, uint32_t width, uint32_t height, uint32_t depth, uint32_t* volume, Vec3 minExtents, Vec3 maxExtents);
\ No newline at end of file |