From 21e19ba99574f6230274da039a9ffa60666ed440 Mon Sep 17 00:00:00 2001
From: Dominic Masters <dominic@domsplace.com>
Date: Thu, 4 Nov 2021 11:31:57 -0700
Subject: [PATCH] Example code cleanup

---
 tools/display/CMakeLists.txt       |  5 +++
 tools/display/texture_generation.c | 43 +-----------------------
 tools/utils/common.h               | 13 ++++++++
 tools/utils/file.c                 | 50 ++++++++++++++++++++++++++++
 tools/utils/file.h                 | 52 ++----------------------------
 5 files changed, 72 insertions(+), 91 deletions(-)
 create mode 100644 tools/utils/common.h
 create mode 100644 tools/utils/file.c

diff --git a/tools/display/CMakeLists.txt b/tools/display/CMakeLists.txt
index 2b561cdf..7c117ec7 100644
--- a/tools/display/CMakeLists.txt
+++ b/tools/display/CMakeLists.txt
@@ -16,6 +16,11 @@ add_executable(${TOOL_NAME})
 target_sources(${TOOL_NAME}
   PRIVATE
     texture_generation.c
+    ../utils/file.c
+)
+target_include_directories(${PROJECT_NAME}
+  PUBLIC
+    ${CMAKE_CURRENT_LIST_DIR}/../
 )
 target_link_libraries(${TOOL_NAME} 
   PUBLIC
diff --git a/tools/display/texture_generation.c b/tools/display/texture_generation.c
index 6a0736c0..64691b1a 100644
--- a/tools/display/texture_generation.c
+++ b/tools/display/texture_generation.c
@@ -6,53 +6,13 @@
  */
 
 #pragma once
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdbool.h>
-
-#if defined(_MSC_VER)
-  #include <direct.h>
-  #define getcwd _getcwd
-  #define FILE_PATH_SEP '\\'
-#elif defined(__GNUC__)
-  #include <unistd.h>
-  #define FILE_PATH_SEP '/'
-#endif
+#include "../utils/file.h"
 
 #ifndef  STB_IMAGE_IMPLEMENTATION
   #define STB_IMAGE_IMPLEMENTATION
   #include <stb_image.h>
 #endif
 
-
-
-// void mkdirp(const char *dir) {
-//   char tmp[FILENAME_MAX + 1];
-//   char *p = NULL;
-//   size_t len;
-
-//   // Copy the input to the output
-//   snprintf(tmp, sizeof(tmp), "%s", dir);
-//   len = strlen(tmp);// Determine string length
-
-//   // Does the string end with a directory terminator?
-//   if(tmp[len - 1] == '/' || tmp[len - 1] == '\\') {
-//     tmp[len - 1] = 0;
-//   }
-
-//   // Foreach character, take the value from TMP as I go.
-//   for(p = tmp + 1; *p; p++) {
-//     if(*p == '/' || *p == '\\') {
-//       *p = 0;
-//       _mkdir(tmp);
-//       *p = '/';
-//     }
-//   }
-
-//   _mkdir(tmp);
-// }
-
 int main(int argc, char *argv[]) {
   FILE *file;
   char path[FILENAME_MAX + 1];
@@ -110,7 +70,6 @@ int main(int argc, char *argv[]) {
   }
 
   // Write texture
-  printf("Size %i x %i @ %i\n", x, y, channels);
   fwrite(data, sizeof(unsigned char), x*y*channels, file);
 
   // Cleanup
diff --git a/tools/utils/common.h b/tools/utils/common.h
new file mode 100644
index 00000000..695e59d9
--- /dev/null
+++ b/tools/utils/common.h
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) 2021 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdbool.h>
\ No newline at end of file
diff --git a/tools/utils/file.c b/tools/utils/file.c
new file mode 100644
index 00000000..6cfb3bae
--- /dev/null
+++ b/tools/utils/file.c
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2021 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#include "file.h"
+
+void fileNormalizeSlashes(char *string) {
+  char c;
+  int i = 0;
+
+  while(c = string[i++]) {
+    if(c != '\\' && c != '/') continue;
+    string[i-1] = FILE_PATH_SEP;
+  }
+}
+
+void fileMkdirp(char *path) {
+  char buffer[FILENAME_MAX];
+  char c;
+  int i = 0;
+  bool inFile;
+  bool hasMore;
+
+  inFile = false;
+  hasMore = false;
+  while(c = path[i]) {
+    if((c == '\\' || c == '/') && i > 0) {
+      buffer[i] = '\0';
+      _mkdir(buffer);
+      inFile = false;
+      hasMore = false;
+      buffer[i] = FILE_PATH_SEP;
+      i++;
+      continue;
+    }
+
+    if(c == '.') inFile = true;
+    hasMore = true;
+    buffer[i] = c;
+    i++;
+  }
+
+  if(!inFile && hasMore) {
+    buffer[i] = '\0';
+    _mkdir(buffer);
+  }
+}
\ No newline at end of file
diff --git a/tools/utils/file.h b/tools/utils/file.h
index f79ef68d..f15951ef 100644
--- a/tools/utils/file.h
+++ b/tools/utils/file.h
@@ -6,10 +6,7 @@
  */
 
 #pragma once
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdbool.h>
+#include "common.h"
 
 #if defined(_MSC_VER)
   #include <direct.h>
@@ -20,49 +17,6 @@
   #define FILE_PATH_SEP '/'
 #endif
 
-#ifndef  STB_IMAGE_IMPLEMENTATION
-  #define STB_IMAGE_IMPLEMENTATION
-  #include <stb_image.h>
-#endif
+void fileNormalizeSlashes(char *string);
 
-void fileNormalizeSlashes(char *string) {
-  char c;
-  int i = 0;
-
-  while(c = string[i++]) {
-    if(c != '\\' && c != '/') continue;
-    string[i-1] = FILE_PATH_SEP;
-  }
-}
-
-void fileMkdirp(char *path) {
-  char buffer[FILENAME_MAX];
-  char c;
-  int i = 0;
-  bool inFile;
-  bool hasMore;
-
-  inFile = false;
-  hasMore = false;
-  while(c = path[i]) {
-    if((c == '\\' || c == '/') && i > 0) {
-      buffer[i] = '\0';
-      _mkdir(buffer);
-      inFile = false;
-      hasMore = false;
-      buffer[i] = FILE_PATH_SEP;
-      i++;
-      continue;
-    }
-
-    if(c == '.') inFile = true;
-    hasMore = true;
-    buffer[i] = c;
-    i++;
-  }
-
-  if(!inFile && hasMore) {
-    buffer[i] = '\0';
-    _mkdir(buffer);
-  }
-}
\ No newline at end of file
+void fileMkdirp(char *path);
\ No newline at end of file