From 73ff9e16b24eccbefc32773edbed83da9d13fa1f Mon Sep 17 00:00:00 2001 From: David Williams Date: Tue, 29 Jun 2010 20:58:42 +0000 Subject: [PATCH] Fixes for build errors on Linux. --- examples/OpenGL/main.cpp | 4 ++-- library/PolyVoxCore/include/ArraySizes.h | 2 +- library/PolyVoxCore/include/Filters.inl | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/examples/OpenGL/main.cpp b/examples/OpenGL/main.cpp index 22b804a9..99c1f4f1 100644 --- a/examples/OpenGL/main.cpp +++ b/examples/OpenGL/main.cpp @@ -101,8 +101,8 @@ int main(int argc, char *argv[]) createCubeInVolume(volData, Vector3DUint16(midPos-10, midPos-10 ,1), Vector3DUint16(midPos+10, midPos+10, maxPos-1), MaterialDensityPair44::getMaxDensity()); //Smooth part of the volume - smoothRegion(volData, Region(Vector3DInt16(62, 62, 62), Vector3DInt16(130, 130, 130))); - smoothRegion(volData, Region(Vector3DInt16(62, 62, 62), Vector3DInt16(130, 130, 130))); + smoothRegion(volData, PolyVox::Region(Vector3DInt16(62, 62, 62), Vector3DInt16(130, 130, 130))); + smoothRegion(volData, PolyVox::Region(Vector3DInt16(62, 62, 62), Vector3DInt16(130, 130, 130))); cout << "Tidying memory..."; volData.tidyUpMemory(0); diff --git a/library/PolyVoxCore/include/ArraySizes.h b/library/PolyVoxCore/include/ArraySizes.h index 79080354..d3dfcbf2 100644 --- a/library/PolyVoxCore/include/ArraySizes.h +++ b/library/PolyVoxCore/include/ArraySizes.h @@ -28,7 +28,7 @@ distribution. #pragma region Headers #include "PolyVoxImpl/ArraySizesImpl.h" -#include "PolyVoxImpl/Typedef.h" +#include "PolyVoxImpl/TypeDef.h" #pragma endregion namespace PolyVox diff --git a/library/PolyVoxCore/include/Filters.inl b/library/PolyVoxCore/include/Filters.inl index acd7a5ed..a3c2f958 100644 --- a/library/PolyVoxCore/include/Filters.inl +++ b/library/PolyVoxCore/include/Filters.inl @@ -1,3 +1,5 @@ +#include "MaterialDensityPair.h" + namespace PolyVox { template