From: outfrost <kotlet.bahn@gmail.com>
Date: Sat, 2 May 2020 19:30:35 +0000 (+0200)
Subject: Streamline logging a little
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=731332db53da90fc58bca8f6dad879dfa9e72c97;p=shadowclad.git

Streamline logging a little
---

diff --git a/src/engine/asset.c b/src/engine/asset.c
index 1d6ddb0..6be7e27 100644
--- a/src/engine/asset.c
+++ b/src/engine/asset.c
@@ -16,6 +16,7 @@ static const char* replaceFileExtension(const AiString path, const char* ext);
 const Solid* importSolid(const char* path) {
 	const AiScene* scene = importScene(path);
 	if (scene == NULL) {
+		logError("Failed to import solid from %s", path);
 		return NULL;
 	}
 	
@@ -102,7 +103,7 @@ const Solid* importSolid(const char* path) {
 			
 			TgaImage* textureImage = readTga(texturePath);
 			if (textureImage == NULL) {
-				logError("Asset texture file not found: %s", texturePath);
+				logError("Importing solid from %s: Cannot read texture file %s", path, texturePath);
 			}
 			else {
 				glTexImage2D(GL_TEXTURE_2D,
@@ -129,10 +130,7 @@ const Solid* importSolid(const char* path) {
 
 static const AiScene* importScene(const char* path) {
 	const AiScene* scene = aiImportFile(path, aiProcess_PreTransformVertices);
-	if (scene == NULL) {
-		logError("Failed to import asset from %s", path);
-	}
-	else if (scene->mFlags & AI_SCENE_FLAGS_INCOMPLETE) {
+	if (scene != NULL && scene->mFlags & AI_SCENE_FLAGS_INCOMPLETE) {
 		logError("Incomplete scene imported from %s", path);
 		aiReleaseImport(scene);
 		scene = NULL;
diff --git a/src/engine/logger.c b/src/engine/logger.c
index 373df63..f0bb838 100644
--- a/src/engine/logger.c
+++ b/src/engine/logger.c
@@ -7,7 +7,7 @@ LogLevel logLevel = LOGLEVEL_DEBUG;
 
 
 
-void logMessage(LogLevel msgLevel, const char* file, int line, const char* message, ...) {
+void logMessage(LogLevel msgLevel, const char* func, const char* message, ...) {
 	if (msgLevel > logLevel) {
 		return;
 	}
@@ -15,26 +15,26 @@ void logMessage(LogLevel msgLevel, const char* file, int line, const char* messa
 	const char* msgLevelString;
 	switch (msgLevel) {
 		case LOGLEVEL_ERROR:
-			msgLevelString = "error: ";
+			msgLevelString = "ERROR ";
 			break;
 		case LOGLEVEL_WARNING:
-			msgLevelString = "warning: ";
+			msgLevelString = "WARNING ";
 			break;
 		case LOGLEVEL_INFO:
 			msgLevelString = "";
 			break;
 		case LOGLEVEL_DEBUG:
-			msgLevelString = "debug: ";
+			msgLevelString = "DEBUG ";
 			break;
 		default:
-			msgLevelString = "(invalid message level!) ";
+			msgLevelString = "(invalid message level) ";
 			break;
 	}
 	
 	va_list args;
 	va_start(args, message);
 	
-	fprintf(stderr, "%s:%i: %s", file, line, msgLevelString);
+	fprintf(stderr, "%s %s:: ", func, msgLevelString);
 	vfprintf(stderr, message, args);
 	fputc('\n', stderr);
 	
diff --git a/src/engine/logger.h b/src/engine/logger.h
index 4918f58..d4ee9a1 100644
--- a/src/engine/logger.h
+++ b/src/engine/logger.h
@@ -10,11 +10,11 @@ typedef enum {
 
 LogLevel logLevel;
 
-#define logError(...) logMessage(LOGLEVEL_ERROR, __FILE__, __LINE__, __VA_ARGS__)
-#define logWarning(...) logMessage(LOGLEVEL_WARNING, __FILE__, __LINE__, __VA_ARGS__)
-#define logInfo(...) logMessage(LOGLEVEL_INFO, __FILE__, __LINE__, __VA_ARGS__)
-#define logDebug(...) logMessage(LOGLEVEL_DEBUG, __FILE__, __LINE__, __VA_ARGS__)
+#define logError(...) logMessage(LOGLEVEL_ERROR, __func__, __VA_ARGS__)
+#define logWarning(...) logMessage(LOGLEVEL_WARNING, __func__, __VA_ARGS__)
+#define logInfo(...) logMessage(LOGLEVEL_INFO, __func__, __VA_ARGS__)
+#define logDebug(...) logMessage(LOGLEVEL_DEBUG, __func__, __VA_ARGS__)
 
-void logMessage(LogLevel msgLevel, const char* file, int line, const char* message, ...);
+void logMessage(LogLevel msgLevel, const char* func, const char* message, ...);
 
 #endif