Fix a few Windows errors and warnings.

src/c-ray.c

@@ -56,7 +56,7 @@ void crDestroySDL() {
 void crWriteImage() {
 	char *hash = gitHash(8);
 	char buf[64];
-	smartTime(getMs(grenderer->state.timer), buf);
+	smartTime(getMs(*grenderer->state.timer), buf);
 	if (currentImage) {
 		if (!grenderer->state.renderAborted) {
 			writeImage(currentImage, (struct renderInfo){
@@ -211,9 +211,9 @@ bool crGetAntialiasing() {
 }
 
 void crRenderSingleFrame() {
-	startTimer(&grenderer->state.timer);
+	startTimer(grenderer->state.timer);
 	currentImage = renderFrame(grenderer);
-	printDuration(getMs(grenderer->state.timer));
+	printDuration(getMs(*grenderer->state.timer));
 }
 
 //Interactive mode

src/datatypes/vector.c

@@ -78,7 +78,7 @@ struct vector vecMul(struct vector v1, struct vector v2) {
  @return Length of given vector
  */
 float vecLength(struct vector v) {
-	return sqrt(v.x*v.x + v.y*v.y + v.z*v.z);
+	return sqrtf(v.x*v.x + v.y*v.y + v.z*v.z);
 }
 
 float vecLengthSquared(struct vector v) {
@@ -229,7 +229,7 @@ struct vector getRandomVecOnPlane(struct vector center, float radius, pcg32_rand
 
 struct coord randomCoordOnUnitDisc(pcg32_random_t *rng) {
 	float r = sqrtf(rndFloat(rng));
-	float theta = rndFloatRange(0, 2*PI, rng);
+	float theta = rndFloatRange(0.0f, 2.0f * PI, rng);
 	return (struct coord){r * cosf(theta), r * sinf(theta)};
 }
 

src/includes.h

@@ -10,15 +10,15 @@
 
 //Global constants
 #define MAX_CRAY_VERTEX_COUNT 3
-#define PIOVER180 0.017453292519943295769236907684886
-#define PI        3.141592653589793238462643383279502
+#define PIOVER180 0.017453292519943295769236907684886f
+#define PI        3.141592653589793238462643383279502f
 #define CRAY_MATERIAL_NAME_SIZE 256
 #define CRAY_MESH_FILENAME_LENGTH 500
 
 //Some macros
 #define min(a,b) (((a) < (b)) ? (a) : (b))
 #define max(a,b) (((a) > (b)) ? (a) : (b))
-#define invsqrt(x) (1.0 / sqrt(x))
+#define invsqrt(x) (1.0f / sqrt(x))
 
 //Master include file
 #ifdef __linux__

src/renderer/renderer.c

@@ -316,6 +316,8 @@ struct renderer *newRenderer() {
 	r->state.avgTileTime = (time_t)1;
 	r->state.timeSampleCount = 1;
 
+	r->state.timer = calloc(1, sizeof(struct timeval));
+
 	//TODO: Do we need all these heap allocs?
 	r->scene = calloc(1, sizeof(struct world));
 	r->scene->camera = calloc(1, sizeof(struct camera));

src/renderer/renderer.h

@@ -34,6 +34,8 @@ struct threadState {
 	struct texture *output;
 };
 
+struct timeval;
+
 /// Renderer state data
 struct state {
 	struct renderTile *renderTiles; //Array of renderTiles to render
@@ -48,7 +50,7 @@ struct state {
 	float avgSampleRate; //In raw single pixel samples per second. (Used for benchmarking)
 	int timeSampleCount;//Used for render duration estimation, amount of time samples captured
 	struct threadState *threadStates; //Info about threads
-	struct timeval timer;
+	struct timeval *timer;
 #ifdef WINDOWS
 	HANDLE tileMutex; // = INVALID_HANDLE_VALUE;
 #else

src/utils/filehandler.c

@@ -201,6 +201,10 @@ char *getFileName(char *input) {
 	return fn;
 }
 
+//For Windows
+#ifndef PATH_MAX
+#define PATH_MAX 1024
+#endif
 char *getFilePath(char *input) {
 	char *dir = calloc(PATH_MAX, sizeof(char));
 #ifdef WINDOWS

src/utils/networking.c

@@ -10,7 +10,6 @@
 #include "networking.h"
 
 #include "../utils/logging.h"
-#include <netdb.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <sys/types.h>

src/utils/ui.c

@@ -15,6 +15,8 @@
 #include "../datatypes/texture.h"
 #include "../datatypes/color.h"
 
+#include <signal.h>
+
 //Signal handling
 void (*signal(int signo, void (*func )(int)))(int);
 typedef void sigfunc(int);