Enable -Wextra and fix a bunch of warnings supplied by it.

Hash out some more of the API
Clean up ui.c a bit.

C-Ray.xcodeproj/project.pbxproj

@@ -712,6 +712,10 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
+				WARNING_CFLAGS = (
+					"-Wall",
+					"-Wextra",
+				);
 			};
 			name = Debug;
 		};
@@ -767,6 +771,10 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
+				WARNING_CFLAGS = (
+					"-Wall",
+					"-Wextra",
+				);
 			};
 			name = Release;
 		};
@@ -789,13 +797,14 @@
 				);
 				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = NO;
 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+				GCC_USE_STANDARD_INCLUDE_SEARCHING = NO;
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
 				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
 				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
 				GCC_WARN_PEDANTIC = NO;
 				GCC_WARN_SHADOW = NO;
-				GCC_WARN_UNUSED_PARAMETER = NO;
+				GCC_WARN_UNUSED_PARAMETER = YES;
 				HEADER_SEARCH_PATHS = "";
 				LIBRARY_SEARCH_PATHS = "";
 				OTHER_CFLAGS = (
@@ -810,6 +819,7 @@
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				RUN_CLANG_STATIC_ANALYZER = NO;
+				WARNING_CFLAGS = "";
 			};
 			name = Debug;
 		};
@@ -829,13 +839,14 @@
 				GCC_PREPROCESSOR_DEFINITIONS = UI_ENABLED;
 				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = NO;
 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+				GCC_USE_STANDARD_INCLUDE_SEARCHING = NO;
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
 				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
 				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
 				GCC_WARN_PEDANTIC = NO;
 				GCC_WARN_SHADOW = NO;
-				GCC_WARN_UNUSED_PARAMETER = NO;
+				GCC_WARN_UNUSED_PARAMETER = YES;
 				HEADER_SEARCH_PATHS = "";
 				LIBRARY_SEARCH_PATHS = "";
 				OTHER_CFLAGS = (
@@ -850,6 +861,7 @@
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				RUN_CLANG_STATIC_ANALYZER = NO;
+				WARNING_CFLAGS = "";
 			};
 			name = Release;
 		};

CMakeLists.txt

@@ -31,7 +31,7 @@ if (MSVC)
 	set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /MANIFEST:NO /INCREMENTAL:NO /OPT:REF,ICF" CACHE STRING "" FORCE)
 else()
 	# set(CMAKE_C_FLAGS "-Wall -Wextra -pedantic -Wconversion -std=gnu99")
-	set(CMAKE_C_FLAGS "-Wall -std=gnu99")
+	set(CMAKE_C_FLAGS "-Wall -Wextra -std=gnu99")
 	set(CMAKE_C_FLAGS_RELEASE "-O3 -ftree-vectorize")
 	if (ASAN)
 		unset(UBSAN CACHE)

src/c-ray.c

@@ -121,14 +121,17 @@ void crGetRenderOrder(void) {
 }
 
 void crSetThreadCount(int threadCount, bool fromSystem) {
-	ASSERT_NOT_REACHED();
+	grenderer->prefs.threadCount = threadCount;
+	grenderer->prefs.fromSystem = fromSystem;
+	crRestartInteractive();
 }
 
 int crGetThreadCount(void) {
 	return grenderer->prefs.threadCount;
 }
 
 void crSetSampleCount(int sampleCount) {
+	(void)sampleCount;
 	ASSERT_NOT_REACHED();
 }
 
@@ -137,6 +140,7 @@ int crGetSampleCount(void) {
 }
 
 void crSetBounces(int bounces) {
+	(void)bounces;
 	ASSERT_NOT_REACHED();
 }
 
@@ -145,6 +149,7 @@ int crGetBounces(void) {
 }
 
 void crSetTileWidth(int width) {
+	(void)width;
 	ASSERT_NOT_REACHED();
 }
 
@@ -153,6 +158,7 @@ int crGetTileWidth(void) {
 }
 
 void crSetTileHeight(int height) {
+	(void)height;
 	ASSERT_NOT_REACHED();
 }
 
@@ -161,14 +167,16 @@ int crGetTileHeight(void) {
 }
 
 void crSetImageWidth(int width) {
-	ASSERT_NOT_REACHED();
+	grenderer->prefs.imageWidth = width;
+	crRestartInteractive();
 }
 
 int crGetImageWidth(void) {
 	return grenderer->prefs.imageWidth;
 }
 
 void crSetImageHeight(int height) {
+	(void)height;
 	ASSERT_NOT_REACHED();
 }
 
@@ -177,6 +185,7 @@ int crGetImageHeight() {
 }
 
 void crSetFilePath(char *filePath) {
+	(void)filePath;
 	ASSERT_NOT_REACHED();
 }
 
@@ -185,6 +194,7 @@ char *crGetFilePath() {
 }
 
 void crSetFileName(char *fileName) {
+	(void)fileName;
 	ASSERT_NOT_REACHED();
 }
 
@@ -207,9 +217,23 @@ void crRenderSingleFrame() {
 }
 
 //Interactive mode
-void crStartInteractive(void);
-void crPauseInteractive(void); //Toggle paused state
-void crGetCurrentImage(void); //Just get the current buffer
+void crStartInteractive(void) {
+	ASSERT_NOT_REACHED();
+}
+
+//Toggle paused state
+void crPauseInteractive(void) {
+	ASSERT_NOT_REACHED();
+}
+
+//Just get the current buffer
+void crGetCurrentImage(void) {
+	ASSERT_NOT_REACHED();
+}
+void crRestartInteractive() {
+	//if (grenderer->prefs.interactive) { do the thing }
+	ASSERT_NOT_REACHED();
+}
 
 void crTransformMesh(void); //Transform, recompute kd-tree, restart
 

src/c-ray.h

@@ -77,6 +77,7 @@ void crRenderSingleFrame(void);
 void crStartInteractive(void);
 void crPauseInteractive(void); //Toggle paused state
 void crGetCurrentImage(void); //Just get the current buffer
+void crRestartInteractive(void);
 
 void crTransformMesh(void); //Transform, recompute kd-tree, restart
 

src/datatypes/material.c

@@ -221,11 +221,20 @@ struct vector randomOnUnitSphere(pcg32_random_t *rng) {
 }
 
 bool emissiveBSDF(struct hitRecord *isect, struct lightRay *ray, struct color *attenuation, struct lightRay *scattered, pcg32_random_t *rng) {
+	(void)isect;
+	(void)ray;
+	(void)attenuation;
+	(void)scattered;
+	(void)rng;
 	return false;
 }
 
 bool weightedBSDF(struct hitRecord *isect, struct lightRay *ray, struct color *attenuation, struct lightRay *scattered, pcg32_random_t *rng) {
-
+	(void)isect;
+	(void)ray;
+	(void)attenuation;
+	(void)scattered;
+	(void)rng;
 	/*
 	 This will be the internal shader weighting solver that runs a random distribution and chooses from the available
 	 discrete shaders.
@@ -240,6 +249,7 @@ struct color diffuseColor(struct hitRecord *isect) {
 }
 
 bool lambertianBSDF(struct hitRecord *isect, struct lightRay *ray, struct color *attenuation, struct lightRay *scattered, pcg32_random_t *rng) {
+	(void)ray;
 	struct vector temp = vecAdd(isect->hitPoint, isect->surfaceNormal);
 	struct vector rand = randomInUnitSphere(rng);
 	struct vector scatterDir = vecSub(vecAdd(temp, rand), isect->hitPoint); //Randomized scatter direction
@@ -249,6 +259,7 @@ bool lambertianBSDF(struct hitRecord *isect, struct lightRay *ray, struct color
 }
 
 bool metallicBSDF(struct hitRecord *isect, struct lightRay *ray, struct color *attenuation, struct lightRay *scattered, pcg32_random_t *rng) {
+	(void)ray;
 	struct vector normalizedDir = vecNormalize(isect->incident.direction);
 	struct vector reflected = reflectVec(&normalizedDir, &isect->surfaceNormal);
 	//Roughness
@@ -286,6 +297,7 @@ float shlick(float cosine, float IOR) {
 
 // Only works on spheres for now. Reflections work but refractions don't
 bool dialectricBSDF(struct hitRecord *isect, struct lightRay *ray, struct color *attenuation, struct lightRay *scattered, pcg32_random_t *rng) {
+	(void)ray;
 	struct vector outwardNormal;
 	struct vector reflected = reflectVec(&isect->incident.direction, &isect->surfaceNormal);
 	float niOverNt;

src/datatypes/tile.c

@@ -45,7 +45,7 @@ struct renderTile getTile(struct renderer *r) {
  
  @param scene scene object
  */
-int quantizeImage(struct renderTile **renderTiles, int width, int height, unsigned tileWidth, unsigned tileHeight) {
+int quantizeImage(struct renderTile **renderTiles, unsigned width, unsigned height, unsigned tileWidth, unsigned tileHeight) {
 
 	logr(info, "Quantizing render plane\n");
 

src/datatypes/tile.h

@@ -27,9 +27,8 @@ struct renderTile {
 };
 
 struct texture;
-enum renderOrder;
 
-int quantizeImage(struct renderTile **renderTiles, int width, int height, unsigned tileWidth, unsigned tileHeight);
+int quantizeImage(struct renderTile **renderTiles, unsigned width, unsigned height, unsigned tileWidth, unsigned tileHeight);
 
 void reorderTiles(struct renderTile **tiles, int tileCount, enum renderOrder tileOrder);
 

src/includes.h

@@ -53,3 +53,11 @@ enum fileType {
 	hdr,
 	buffer
 };
+
+enum renderOrder {
+	renderOrderTopToBottom = 0,
+	renderOrderFromMiddle,
+	renderOrderToMiddle,
+	renderOrderNormal,
+	renderOrderRandom
+};

src/main.c

@@ -23,7 +23,6 @@ int main(int argc, char *argv[]) {
 	char *input = argc == 2 ? crLoadFile(argv[1], &bytes) : crReadStdin(&bytes);
 	logr(info, "%zi bytes of input JSON loaded from %s, parsing.\n", bytes, argc == 2 ? "file" : "stdin");
 	if (!input) return -1;
-
 	if (crLoadSceneFromBuf(input)) {
 		crDestroyRenderer();
 		return -1;

src/renderer/pathtrace.h

@@ -47,5 +47,4 @@ struct hitRecord {
 /// @param depth Current depth for recursive calls
 /// @param maxDepth Maximum depth of recursion
 /// @param rng A random number generator. One per execution thread.
-/// @param hasHitObject set to true if an object was hit in this pass
 struct color pathTrace(struct lightRay *incidentRay, struct world *scene, int depth, int maxDepth, pcg32_random_t *rng);

src/renderer/renderer.h

@@ -34,14 +34,6 @@ struct threadState {
 	struct texture *output;
 };
 
-enum renderOrder {
-	renderOrderTopToBottom = 0,
-	renderOrderFromMiddle,
-	renderOrderToMiddle,
-	renderOrderNormal,
-	renderOrderRandom
-};
-
 /// Renderer state data
 struct state {
 	struct renderTile *renderTiles; //Array of renderTiles to render
@@ -77,8 +69,8 @@ struct prefs {
 	int tileHeight;
 
 	//Output prefs
-	int imageWidth;
-	int imageHeight;
+	unsigned imageWidth;
+	unsigned imageHeight;
 	char *imgFilePath;
 	char *imgFileName;
 	int imgCount;

src/utils/filehandler.c

@@ -116,8 +116,6 @@ void encodePNGFromArray(const char *filename, unsigned char *imgData, int width,
 	lodepng_add_text(&info, "C-ray SysInfo", sysinfo);
 #endif
 
-	//TODO: Maybe platform info? arch, uname, etc.
-
 	LodePNGState state;
 	lodepng_state_init(&state);
 	state.info_raw.bitdepth = 8;

src/utils/hashtable.c

@@ -107,7 +107,7 @@ void freeTable(struct hashtable *table) {
 }
 
 void printTableUsage(struct hashtable *t) {
-	for (int i = 0; i < t->size; ++i) {
+	for (uint64_t i = 0; i < t->size; ++i) {
 		printf("[%s]", t->data[i].used ? "x" : " ");
 	}
 	printf("\n");
@@ -138,8 +138,8 @@ void testTable() {
 	*/
 	logr(debug, "Testing overfill\n");
 	char buf[5];
-	for (int i = 0; i < defaultTableSize; i++) {
-		sprintf(buf, "%i", i);
+	for (uint64_t i = 0; i < defaultTableSize; i++) {
+		sprintf(buf, "%llu", i);
 		setFloat(table, buf, (float)i);
 		printTableUsage(table);
 	}

src/utils/ui.c

@@ -136,15 +136,6 @@ void getKeyboardInput(struct renderer *r) {
 				r->state.renderAborted = true;
 			}
 			if (event.key.keysym.sym == SDLK_p) {
-
-				/*if (r->state.threadStates[0].paused) {
-					printf("\n");
-					logr(info, "Resuming render.\n");
-				} else {
-					printf("\n");
-					logr(info, "Pausing render.\n");
-				}*/
-
 				for (int i = 0; i < r->prefs.threadCount; i++) {
 					if (r->state.threadStates[i].paused) {
 						r->state.threadStates[i].paused = false;
@@ -200,12 +191,11 @@ void drawProgressBars(struct renderer *r) {
  @param tile Given renderTile
  */
 void drawFrame(struct renderer *r, struct renderTile tile) {
-	int length = 8;
+	int length = tile.width < 16 ? 4 : 8;
 	struct color c = clearColor;
 	if (tile.isRendering) {
 		c = frameColor;
 	}
-	if (tile.width < 16) length = 4;
 	for (int i = 1; i < length; i++) {
 		//top left
 		blit(r->state.uiBuffer, c, tile.begin.x+i, tile.begin.y+1);