Compile fixes for Linux with GCC

Author: szellmann

Array.h

@@ -26,6 +26,7 @@
 */
 
 #pragma once
+#include <cmath>
 #include "linear_math.h"
 #include <string.h>
 #include "Util.h"
@@ -161,7 +162,7 @@ template <class T> void Array<T>::removeSwap(int start, int end)
 	int oldSize = m_size;
 	m_size += start - end;
 
-	int copyStart = max(m_size, end);
+	int copyStart = std::max(m_size, end);
 	copy(m_ptr + start, m_ptr + copyStart, oldSize - copyStart);
 }
 

BVH.cpp

@@ -25,6 +25,8 @@
 *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#include <cstdio>
+
 #include "BVH.h"
 #include "SplitBVHBuilder.h"
 
@@ -59,4 +61,4 @@ BVH::BVH(Scene* scene, const Platform& platform, const BuildParams& params)
 		params.stats->numTris = m_root->getSubtreeSize(BVH_STAT_TRIANGLE_COUNT);
 		params.stats->numChildNodes = m_root->getSubtreeSize(BVH_STAT_CHILDNODE_COUNT);
 	}
-}
+}

BVH.h

@@ -28,6 +28,7 @@
 #pragma once
 #include "Scene.h"
 #include "BVHNode.h"
+#include <cstdio>
 #include <string>
 
 typedef float F32;

CMakeLists.txt

@@ -21,7 +21,7 @@ set(HEADERS
     CudaBVH.h
     CudaRenderKernel.h
     Geometry.h
-    HDRLoader.h
+    HDRloader.h
     MouseKeyboardInput.h
     Scene.h
     SceneLoader.h
@@ -37,7 +37,7 @@ set(SOURCES
     BVHNode.cpp
     Camera.cpp
     CudaBVH.cpp
-    HDRLoader.cpp
+    HDRloader.cpp
     main.cpp
     renderkernel.cu
     SceneLoader.cpp

Camera.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "geometry.h"
+#include "Geometry.h"
 #include "linear_math.h"
 
 #define M_PI 3.14156265

CudaBVH.cpp

@@ -102,15 +102,21 @@ CudaBVH& CudaBVH::operator=(CudaBVH& other)
 	}
 	return *this;
 }
-void CudaBVH::createCompact(const BVH& bvh, int nodeOffsetSizeDiv)
+
+namespace detail
 {
-	struct StackEntry
-	{
-		const BVHNode*  node;
-		S32             idx;
+struct StackEntry
+{
+    const BVHNode*  node;
+    S32             idx;
 
-		StackEntry(const BVHNode* n = NULL, int i = 0) : node(n), idx(i) {}
-	};
+    StackEntry(const BVHNode* n = NULL, int i = 0) : node(n), idx(i) {}
+};
+}
+
+void CudaBVH::createCompact(const BVH& bvh, int nodeOffsetSizeDiv)
+{
+    using namespace detail; // for StackEntry
 
 	int leafcount = 0; // counts leafnodes
 

CudaRenderKernel.h

@@ -29,7 +29,7 @@
 #include "linear_math.h"
 #include <cuda.h>
 #include "stdio.h"
-#include "camera.h"
+#include "Camera.h"
 
 #define scrwidth 1280
 #define scrheight 720

HDRloader.cpp

@@ -7,7 +7,7 @@ Info:		Load HDR image and convert to a set of float32 RGB triplet.
 from http://www.flipcode.com/archives/HDR_Image_Reader.shtml
 ************************************************************************************/
 
-#include "hdrloader.h"
+#include "HDRloader.h"
 
 #include <math.h>
 #include <memory.h>
@@ -188,4 +188,4 @@ bool oldDecrunch(RGBE *scanline, int len, FILE *file)
 		}
 	}
 	return true;
-}
+}

MouseKeyboardInput.h

@@ -1,7 +1,7 @@
 // code for depth-of-field, mouse + keyboard user interaction based on https://github.com/peterkutz/GPUPathTracer
 
 #pragma once
-#include "camera.h"
+#include "Camera.h"
 
 InteractiveCamera* interactiveCamera = NULL;
 
@@ -91,4 +91,4 @@ void mouse(int button, int state, int x, int y)
 	lastX = x;
 	lastY = y;
 	motion(x, y);
-}
+}

SceneLoader.h

@@ -1,7 +1,7 @@
 #ifndef __LOADER_H_
 #define __LOADER_H_
 
-#include "geometry.h"
+#include "Geometry.h"
 
 extern unsigned verticesNo;
 extern Vertex* vertices;
@@ -12,4 +12,4 @@ void panic(const char *fmt, ...);
 void load_object(const char *filename);
 float processgeo();
 
-#endif
+#endif