Replace dawnlibs with dawn.hpp

src/dawn/assert/assert.hpp

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "dawnlibs.hpp"
+#include "dawn.hpp"
 
 /**
  * Asserts that a given statement must evaluate to true or the assertion fails

src/dawn/asset/AssetDataLoader.cpp

@@ -97,16 +97,16 @@ bool_t AssetDataLoader::isOpen() {
 }
 
 void AssetDataLoader::open() {
-  assertNull(this->assetArchiveFile, "AssetDataLoader::open: File is already open");
+  assertNull(this->assetArchiveFile, "File is already open");
-  assertNull(this->assetArchive, "AssetDataLoader::open: Archive is already open");
+  assertNull(this->assetArchive, "Archive is already open");
-  assertNull(this->assetArchiveEntry, "AssetDataLoader::open: Entry is already open");
+  assertNull(this->assetArchiveEntry, "Entry is already open");
 
   this->assetArchiveFile = this->openAssetArchiveFile();
-  assertNotNull(this->assetArchiveFile, "AssetDataLoader::open: Failed to open archive file!");
+  assertNotNull(this->assetArchiveFile, "Failed to open archive file!");
 
   // Open archive reader
   assetArchive = archive_read_new();
-  assertNotNull(assetArchive, "AssetDataLoader::open: Failed to create archive reader");
+  assertNotNull(assetArchive, "Failed to create archive reader");
 
   // Set up the reader
   archive_read_support_format_tar(assetArchive);
@@ -119,7 +119,7 @@ void AssetDataLoader::open() {
   archive_read_set_callback_data(assetArchive, this);
 
   int32_t ret =  archive_read_open1(assetArchive);
-  assertTrue(ret == ARCHIVE_OK, "AssetDataLoader::open: Failed to open archive!");
+  assertTrue(ret == ARCHIVE_OK, "Failed to open archive!");
   position = 0;
 
   // Iterate over each file to find the one for this asset loader.
@@ -127,20 +127,20 @@ void AssetDataLoader::open() {
     const char_t *headerFile = (char_t*)archive_entry_pathname(assetArchiveEntry);
     if(std::string(headerFile) == this->fileName) return;
     int32_t ret = archive_read_data_skip(assetArchive);
-    assertTrue(ret == ARCHIVE_OK, "AssetDataLoader::open: Failed to skip data!");
+    assertTrue(ret == ARCHIVE_OK, "Failed to skip data!");
   }
 
-  assertUnreachable("AssetDataLoader::open: Failed to find file!");
+  assertUnreachable("Failed to find file!");
 }
 
 int32_t AssetDataLoader::close() {
-  assertNotNull(this->assetArchiveFile, "AssetDataLoader::close: File is NULL");
+  assertNotNull(this->assetArchiveFile, "File is NULL");
-  assertNotNull(this->assetArchive, "AssetDataLoader::close: Archive is NULL!");
+  assertNotNull(this->assetArchive, "Archive is NULL!");
-  assertNotNull(this->assetArchiveEntry, "AssetDataLoader::close: Entry is NULL!");
+  assertNotNull(this->assetArchiveEntry, "Entry is NULL!");
   
   // Close the archive
   int32_t ret = archive_read_free(this->assetArchive);
-  assertTrue(ret == ARCHIVE_OK, "AssetDataLoader::close: Failed to close archive!");
+  assertTrue(ret == ARCHIVE_OK, "Failed to close archive!");
 
   this->assetArchive = nullptr;
   this->assetArchiveEntry = nullptr;

src/dawn/asset/AssetDataLoader.hpp

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnlibs.hpp"
+#include "dawn.hpp"
 
 extern "C" {
   #include <archive.h>

src/dawn/asset/AssetLoader.hpp

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnlibs.hpp"
+#include "dawn.hpp"
 
 namespace Dawn {
   class AssetLoader {

src/dawn/asset/AssetManager.hpp

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnlibs.hpp"
+#include "dawn.hpp"
 #include "asset/AssetLoader.hpp"
 
 namespace Dawn {

src/dawn/audio/IAudioManager.hpp

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnlibs.hpp"
+#include "dawn.hpp"
 
 namespace Dawn {
   class IAudioManager {

src/dawn/component/Registry.cpp

@@ -0,0 +1,12 @@
+// Copyright (c) 2024 Dominic Masters
+// 
+// This software is released under the MIT License.
+// https://opensource.org/licenses/MIT
+
+#include "Registry.hpp"
+
+using namespace Dawn;
+
+void Dawn::someFunction(const char_t *someParam) {
+  printf("Hello, %s!\n", someParam);
+}

src/dawn/component/Registry.hpp

@@ -0,0 +1,11 @@
+// Copyright (c) 2024 Dominic Masters
+// 
+// This software is released under the MIT License.
+// https://opensource.org/licenses/MIT
+
+#pragma once
+#include "dawn.hpp"
+
+namespace Dawn {
+  static void someFunction(const char_t *someParam);
+}

src/dawn/display/Color.hpp

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnlibs.hpp"
+#include "dawn.hpp"
 
 namespace Dawn {
   struct ColorU8 {

src/dawn/display/IRenderHost.hpp

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnlibs.hpp"
+#include "dawn.hpp"
 #include "display/RenderTarget.hpp"
 #include "display/RenderPipeline.hpp"
 #include "display/shader/ShaderManager.hpp"

src/dawn/display/RenderPipeline.hpp

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnlibs.hpp"
+#include "dawn.hpp"
 
 namespace Dawn {
   class Game;

src/dawn/display/font/TrueTypeCharacter.hpp

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnlibs.hpp"
+#include "dawn.hpp"
 
 namespace Dawn {
   struct TrueTypeCharacter {

src/dawn/display/mesh/IMesh.hpp

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnlibs.hpp"
+#include "dawn.hpp"
 
 namespace Dawn {
   enum MeshDrawMode {

src/dawn/display/shader/IShader.hpp

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnlibs.hpp"
+#include "dawn.hpp"
 
 namespace Dawn {
   enum class ShaderParameterType {

src/dawn/display/shader/IShaderStage.hpp

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnlibs.hpp"
+#include "dawn.hpp"
 
 namespace Dawn {
   enum class ShaderStageType {

src/dawn/environment/Environment.hpp

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnlibs.hpp"
+#include "dawn.hpp"
 
 namespace Dawn {
   class Environment {

src/dawn/event/CustomEvent.hpp

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnlibs.hpp"
+#include "dawn.hpp"
 
 namespace Dawn {
   enum class CustomEventResult {

src/dawn/event/Event.hpp

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnlibs.hpp"
+#include "dawn.hpp"
 
 namespace Dawn {
   template<typename ...A>

src/dawn/game/Game.hpp

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnlibs.hpp"
+#include "dawn.hpp"
 #include "display/RenderHost.hpp"
 #include "input/InputManager.hpp"
 #include "time/TimeManager.hpp"

src/dawn/locale/LocaleManager.cpp

@@ -25,6 +25,10 @@ std::string LocaleManager::getString(
   const std::unordered_map<std::string, std::string> replacements
 ) {
   assertNotNull(languageAsset, "Language asset cannot be null.");
+  assertTrue(
+    languageAsset->loaded,
+    "Language asset must be loaded before attempting to get a string."
+  );
 
   // Key comes in like "main_menu.new_game", which would be;
   // data["main_menu"]["new_game"], so we need to split by dot and iterate.

src/dawn/save/SaveFile.hpp

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnlibs.hpp"
+#include "dawn.hpp"
 
 namespace Dawn {
   class SaveManager;

src/dawn/scene/SceneComponent.hpp

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnlibs.hpp"
+#include "dawn.hpp"
 
 #define SCENE_COMPONENT_STATE_INIT 0x01
 #define SCENE_COMPONENT_STATE_DISPOSED 0x02

src/dawn/scene/item/SceneItemTransform.hpp

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnlibs.hpp"
+#include "dawn.hpp"
 
 namespace Dawn {
   class SceneItem;

src/dawn/time/ITimeManager.hpp

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnlibs.hpp"
+#include "dawn.hpp"
 
 namespace Dawn {
   class ITimeManager {

src/dawn/util/Flag.hpp

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnlibs.hpp"
+#include "dawn.hpp"
 
 namespace Dawn {
   class Flag final {

src/dawn/util/Math.hpp

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "dawnlibs.hpp"
+#include "dawn.hpp"
 
 #define MATH_PI 3.1415926535897f
 

src/dawn/util/String.hpp

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnlibs.hpp"
+#include "dawn.hpp"
 
 namespace Dawn {
   class String {

src/dawnlinux/CMakeLists.txt

@@ -15,12 +15,6 @@ target_include_directories(${DAWN_TARGET_NAME}
     ${CMAKE_CURRENT_LIST_DIR}
 )
 
-# Platform variables
-# target_compile_definitions(${DAWN_TARGET_NAME}
-#   PUBLIC
-#     DAWN_ASSET_LOCATION="../../assets.tar"
-# )
-
 # Sources
 target_sources(${DAWN_TARGET_NAME}
   PRIVATE

src/dawnlinux/main.cpp

@@ -27,6 +27,8 @@ FILE * AssetDataLoader::openAssetArchiveFile() {
 int32_t main(int32_t argc, const char **argv) {
   //Set the path
   assertTrue(argc > 0, "No executable path provided.");
+  assertNotNull(argv, "No executable path provided.");
+  assertNotNull(argv[0], "No executable path provided.");
   environment.setVariable("executablePath", argv[0]);
 
   auto execPath = fs::path(environment.getVariable("executablePath"));
@@ -36,20 +38,24 @@ int32_t main(int32_t argc, const char **argv) {
 
   // Find the assets
   std::vector<fs::path> pathsToTryAndFindAssets = {
-    execDir / "assets.tar",
+    execDir / "dawn.tar",
-    execDir / "assets.zip",
+    execDir / "dawn.zip",
-    execDir / "data" / "assets.tar",
+    execDir / "data" / "dawn.tar",
-    execDir / "data" / "assets.zip",
+    execDir / "data" / "dawn.zip",
-    execDir.parent_path() / "assets.tar",
+    execDir.parent_path() / "dawn.tar",
-    execDir.parent_path() / "assets.zip",
+    execDir.parent_path() / "dawn.zip",
-    execDir.parent_path() / "data" / "assets.tar",
+    execDir.parent_path() / "data" / "dawn.tar",
-    execDir.parent_path() / "data" / "assets.zip",
+    execDir.parent_path() / "data" / "dawn.zip",
-    execDir.parent_path().parent_path() / "assets.tar",
+    execDir.parent_path().parent_path() / "dawn.tar",
-    execDir.parent_path().parent_path() / "assets.zip",
+    execDir.parent_path().parent_path() / "dawn.zip",
-    execDir.parent_path().parent_path() / "data" / "assets.tar",
+    execDir.parent_path().parent_path() / "data" / "dawn.tar",
-    execDir.parent_path().parent_path() / "data" / "assets.zip"
+    execDir.parent_path().parent_path() / "data" / "dawn.zip"
   };
-  auto matchingPathIfAny = std::find_if(pathsToTryAndFindAssets.begin(), pathsToTryAndFindAssets.end(), [](const fs::path &p) {
+  auto matchingPathIfAny = std::find_if(
+    pathsToTryAndFindAssets.begin(),
+    pathsToTryAndFindAssets.end(),
+    [](const fs::path &p
+  ) {
     return fs::exists(p);
   });
 

src/dawnlinux/main.hpp

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnlibs.hpp"
+#include "dawn.hpp"
 
 /**
  * The main entry point for the program.

src/dawnopengl/assert/assertgl.hpp

@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnlibs.hpp"
+#include "dawn.hpp"
 
 /**
  * Asserts that there are no OpenGL errors.

src/dawnrpg/scene/HelloWorldScene.cpp

@@ -14,9 +14,9 @@
 using namespace Dawn;
 
 void Dawn::helloWorldScene(Scene &s) {
-  // while(!s.getGame()->assetManager.isLoaded(font)) {
+  while(!s.getGame()->assetManager.isEverythingLoaded()) {
-  //   s.getGame()->assetManager.update();
+    s.getGame()->assetManager.update();
-  // }
+  }
 
   auto cameraItem = s.createSceneItem();
   auto camera = cameraItem->addComponent<Camera>();