Update codebase

.gitmodules

@@ -19,6 +19,3 @@
 [submodule "lib/libarchive"]
 	path = lib/libarchive
 	url = https://github.com/libarchive/libarchive
-[submodule "lib/Catch2"]
-	path = lib/Catch2
-	url = https://github.com/catchorg/Catch2.git

CMakeLists.txt

@@ -34,14 +34,6 @@ project(Dawn
   LANGUAGES C CXX
 )
 
-# Setup tests
-add_executable(dawntests)
-target_link_libraries(dawntests PRIVATE Catch2::Catch2WithMain)
-target_compile_definitions(dawntests
-  PUBLIC
-    DAWN_ASSET_LOCATION="${DAWN_ROOT_DIR}/test/data"
-)
-
 # Add tools
 add_subdirectory(tools)
 
@@ -49,10 +41,4 @@ add_subdirectory(tools)
 add_subdirectory(lib)
 
 # Add Project Files
-add_subdirectory(src)
+add_subdirectory(src)
-
-# Run tests
-list(APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/extras)
-include(CTest)
-include(Catch)
-catch_discover_tests(dawntests)

cmake/targets/CMakeLists.txt

@@ -5,7 +5,7 @@
 
 # Now validate we have a build target for real
 if(NOT DEFINED DAWN_BUILD_TARGET)
-  message(FATAL_ERROR "You need to define a DAWN_BUILD_TARGET")
+  set(DAWN_BUILD_TARGET "target-rpg-linux-glfw" CACHE INTERNAL ${DAWN_CACHE_TARGET})
 endif()
 
 message("Building target ${DAWN_BUILD_TARGET}")

cmake/targets/target-rpg-linux-glfw/CMakeLists.txt

@@ -0,0 +1,11 @@
+# Copyright (c) 2023 Dominic Masters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+set(DAWN_BUILDING dawnrpg CACHE INTERNAL ${DAWN_CACHE_TARGET})
+set(DAWN_TARGET_LINUX true CACHE INTERNAL ${DAWN_CACHE_TARGET})
+set(DAWN_TARGET_GLFW true CACHE INTERNAL ${DAWN_CACHE_TARGET})
+set(DAWN_TARGET_NAME "DawnRPG" CACHE INTERNAL ${DAWN_CACHE_TARGET})
+set(DAWN_TARGET_ARCHIVE true CACHE INTERNAL ${DAWN_CACHE_TARGET})
+set(DAWN_TARGET_TRUETYPE false CACHE INTERNAL ${DAWN_CACHE_TARGET})

lib/CMakeLists.txt

@@ -45,10 +45,6 @@ if(DAWN_TARGET_OPENAL)
   add_subdirectory(AudioFile)
 endif()
 
-# Catch2 Testing Framework
-set(catch2_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Catch2 CACHE INTERNAL ${DAWN_CACHE_TARGET})
-add_subdirectory(Catch2)
-
 # Emscripten (TESTING ONLY)
 if(DEFINED DAWN_EMSCRIPTEN_FLAGS)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DAWN_EMSCRIPTEN_FLAGS}" CACHE INTERNAL ${DAWN_CACHE_TARGET})

src/CMakeLists.txt

@@ -49,17 +49,15 @@ if(DEFINED DAWN_TARGET_NAME)
     add_subdirectory(dawnopengl)
   endif()
 
+  if(DAWN_TARGET_TRUETYPE)
+    add_subdirectory(dawntruetype)
+  endif()
+
   if(DAWN_TARGET_SDL2)
     add_subdirectory(dawnsdl2)
     add_subdirectory(dawnopengl)
   endif()
 
-  if(DAWN_TARGET_ARCHIVE)
-    # add_subdirectory(dawnarchiveasset)
-  else()
-    add_subdirectory(dawnfileasset)
-  endif()
-
   if(DAWN_TARGET_VITA)
     add_subdirectory(dawnopengl)
   endif()

src/dawn/CMakeLists.txt

@@ -7,7 +7,6 @@
 target_link_libraries(${DAWN_TARGET_NAME}
   PUBLIC
     glm
-    freetype
     archive_static
 )
 
@@ -35,22 +34,4 @@ add_subdirectory(scene)
 # add_subdirectory(state)
 add_subdirectory(time)
 add_subdirectory(util)
-add_subdirectory(ui)
+add_subdirectory(ui)
-
-# Definitions
-# target_compile_definitions(${DAWN_TARGET_NAME}
-#   PUBLIC
-#     DAWN_DEBUG_BUILD=${DAWN_DEBUG_BUILD}
-# )
-
-# Tests
-target_link_libraries(dawntests
-  PUBLIC
-    glm
-    freetype
-)
-
-target_include_directories(dawntests
-  PUBLIC
-    ${CMAKE_CURRENT_LIST_DIR}
-)

src/dawn/assert/CMakeLists.txt

@@ -6,10 +6,4 @@
 target_sources(${DAWN_TARGET_NAME}
   PRIVATE
     assert.cpp
-)
-
-target_sources(dawntests
-  PRIVATE
-    assert.cpp
-    _test_.assert.cpp
 )

src/dawn/assert/_test_.assert.cpp

@@ -1,77 +0,0 @@
-// Copyright (c) 2023 Dominic Masters
-// 
-// This software is released under the MIT License.
-// https://opensource.org/licenses/MIT
-
-#include <catch2/catch_test_macros.hpp>
-#include "assert.hpp"
-
-TEST_CASE("assertTrue", "[assert]") {
-  SECTION("true") {
-    assertTrue(true, "This should not fail");
-  }
-
-  SECTION("false") {
-    REQUIRE_THROWS(assertTrue(false, "This should fail"));
-  }
-}
-
-TEST_CASE("assertFalse", "[assert]") {
-  SECTION("true") {
-    REQUIRE_THROWS(assertFalse(true, "This should fail"));
-  }
-
-  SECTION("false") {
-    assertFalse(false, "This should not fail");
-  }
-}
-
-TEST_CASE("assertUnreachable", "[assert]") {
-  REQUIRE_THROWS(assertUnreachable("This should fail all the time."));
-}
-
-TEST_CASE("assertNotNull", "[assert]") {
-  SECTION("nullptr") {
-    REQUIRE_THROWS(assertNotNull(nullptr, "This should fail"));
-  }
-
-  SECTION("NULL") {
-    REQUIRE_THROWS(assertNotNull(NULL, "This should fail"));
-  }
-
-  SECTION("not nullptr or NULL") {
-    assertNotNull((void*)0x1, "This should not fail");
-  }
-}
-
-TEST_CASE("assertNull", "[assert]") {
-  SECTION("nullptr") {
-    assertNull(nullptr, "This should not fail");
-  }
-
-  SECTION("NULL") {
-    assertNull(NULL, "This should not fail");
-  }
-
-  SECTION("not nullptr or NULL") {
-    REQUIRE_THROWS(assertNull((void*)0x1, "This should fail"));
-  }
-}
-
-TEST_CASE("assertMapHasKey", "[assert]") {
-  SECTION("has key") {
-    std::map<std::string, std::string> map;
-    map["key"] = "value";
-    assertMapHasKey(map, "key", "This should not fail");
-  }
-
-  SECTION("does not have key") {
-    std::map<std::string, std::string> map;
-    map["different_key"] = "Some other value";
-    REQUIRE_THROWS(assertMapHasKey(map, "key", "This should fail"));
-  }
-}
-
-TEST_CASE("assertDeprecated", "[assert]") {
-  REQUIRE_THROWS(assertDeprecated("This should fail"));
-}

src/dawn/asset/AssetManager.cpp

@@ -5,7 +5,6 @@
 
 #include "AssetManager.hpp"
 #include "loaders/TextureLoader.hpp"
-#include "loaders/TrueTypeLoader.hpp"
 
 using namespace Dawn;
 
@@ -60,45 +59,6 @@ bool_t AssetManager::isLoaded(const std::string filename) {
   return false;
 }
 
-template<>
-std::shared_ptr<Texture> AssetManager::get<Texture>(
-  const std::string filename
-) {
-  auto existing = this->getExisting<TextureLoader>(filename);
-  if(existing) {
-    // Check pointer hasn't gone stale, if it has remove it and create new.
-    auto texture = existing->weakTexture.lock();
-    if(texture) return texture;
-    this->removeExisting(filename);
-  }
-
-  std::shared_ptr<TextureLoader> loader = std::make_shared<TextureLoader>(
-    filename
-  );
-  pendingAssetLoaders.push_back(std::static_pointer_cast<AssetLoader>(loader));
-  return loader->sharedTexture;
-}
-
-template<>
-std::shared_ptr<TrueTypeTexture> AssetManager::get<TrueTypeTexture>(
-  const std::string filename,
-  const uint32_t fontSize
-) {
-  auto existing = this->getExisting<TrueTypeLoader>(filename);
-  if(existing) {
-    // Check pointer hasn't gone stale, if it has remove it and create new.
-    auto texture = existing->getTexture(fontSize);
-    if(texture) return texture;
-    this->removeExisting(filename);
-  }
-
-  std::shared_ptr<TrueTypeLoader> loader = std::make_shared<TrueTypeLoader>(
-    filename
-  );
-  pendingAssetLoaders.push_back(std::static_pointer_cast<AssetLoader>(loader));
-  return loader->getTexture(fontSize);
-} 
-
 AssetManager::~AssetManager() {
   
 }

src/dawn/asset/loaders/CMakeLists.txt

@@ -7,5 +7,4 @@
 target_sources(${DAWN_TARGET_NAME}
   PRIVATE
     TextureLoader.cpp
-    TrueTypeLoader.cpp
 )

src/dawn/dawnlibs.hpp

@@ -39,11 +39,12 @@ extern "C" {
 #include <glm/vec3.hpp>
 #include <glm/vec4.hpp>
 #include <glm/mat4x4.hpp>
-#include <glm/gtx/component_wise.hpp>
+// #include <glm/gtx/component_wise.hpp>
 #include <glm/gtc/quaternion.hpp>
 #include <glm/ext/matrix_transform.hpp>
 #include <glm/ext/matrix_clip_space.hpp>
 #include <glm/ext/scalar_constants.hpp>
-#include <glm/gtx/intersect.hpp>
+// #include <glm/gtx/intersect.hpp>
 #include <glm/gtc/type_ptr.hpp>
+#define GLM_ENABLE_EXPERIMENTAL 1
 #include <glm/gtx/matrix_decompose.hpp>

src/dawn/display/CMakeLists.txt

@@ -12,6 +12,5 @@ target_sources(${DAWN_TARGET_NAME}
 )
 
 # Subdirs
-add_subdirectory(font)
 add_subdirectory(mesh)
 add_subdirectory(shader)

src/dawn/game/Game.cpp

@@ -47,5 +47,4 @@ std::shared_ptr<Scene> Game::getCurrentScene() {
 }
 
 Game::~Game() {
-  std::cout << "Game successfully destructed" << std::endl;
 }

src/dawn/ui/elements/CMakeLists.txt

@@ -6,5 +6,4 @@
 target_sources(${DAWN_TARGET_NAME}
   PRIVATE
     UIRectangle.cpp
-    UILabel.cpp
 )

src/dawnrpg/CMakeLists.txt

@@ -0,0 +1,17 @@
+# Copyright (c) 2023 Dominic Masters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Includes
+target_include_directories(${DAWN_TARGET_NAME}
+  PUBLIC
+    ${CMAKE_CURRENT_LIST_DIR}
+)
+
+# Subdirs
+add_subdirectory(game)
+add_subdirectory(scene)
+
+# Assets
+# include("${DAWN_ASSETS_SOURCE_DIR}/games/helloworld/CMakeLists.txt")

src/dawnrpg/game/CMakeLists.txt

@@ -0,0 +1,9 @@
+# Copyright (c) 2023 Dominic Masters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DAWN_TARGET_NAME}
+  PRIVATE
+    GameInit.cpp
+)

src/dawnrpg/game/GameInit.cpp

@@ -0,0 +1,13 @@
+// Copyright (c) 2023 Dominic Masters
+// 
+// This software is released under the MIT License.
+// https://opensource.org/licenses/MIT
+
+#include "game/GameInit.hpp"
+#include "scene/SceneList.hpp"
+
+using namespace Dawn;
+
+std::function<void(Scene&)> GameInit::getInitialScene() {
+  return helloWorldScene;
+}

src/dawnrpg/scene/CMakeLists.txt

@@ -0,0 +1,9 @@
+# Copyright (c) 2023 Dominic Masters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DAWN_TARGET_NAME}
+  PRIVATE
+    HelloWorldScene.cpp
+)

src/dawnrpg/scene/HelloWorldScene.cpp

@@ -0,0 +1,46 @@
+
+// Copyright (c) 2023 Dominic Masters
+// 
+// This software is released under the MIT License.
+// https://opensource.org/licenses/MIT
+
+#include "scene/SceneList.hpp"
+#include "component/display/Camera.hpp"
+#include "prefab/SimpleSpinningCube.hpp"
+#include "component/display/material/SimpleTexturedMaterial.hpp"
+#include "display/mesh/QuadMesh.hpp"
+#include "component/ui/UICanvas.hpp"
+
+using namespace Dawn;
+
+void Dawn::helloWorldScene(Scene &s) {
+  // while(!s.getGame()->assetManager.isLoaded(font)) {
+  //   s.getGame()->assetManager.update();
+  // }
+
+  auto cameraItem = s.createSceneItem();
+  auto camera = cameraItem->addComponent<Camera>();
+  cameraItem->lookAt({ 3, 3, 3 }, { 0, 0, 0 }, { 0, 1, 0 });
+  camera->clipFar = 99999.99f;
+
+  glm::vec2 position = { 0, 0 };
+  glm::vec2 size = { 1, 1 };
+  auto quad = s.createSceneItem();
+  auto quadMesh = std::make_shared<Mesh>();
+  quadMesh->createBuffers(QUAD_VERTICE_COUNT, QUAD_INDICE_COUNT);
+  QuadMesh::buffer(
+    quadMesh,
+    glm::vec4(position.x, position.y, size.x, size.y),
+    glm::vec4(0, 0, 1, 1),
+    0, 0, 0
+  );
+
+  auto quadRenderer = quad->addComponent<MeshRenderer>();
+  quadRenderer->mesh = quadMesh;
+
+  auto quadMaterial = quad->addComponent<SimpleTexturedMaterial>();
+  quadMaterial->setColor(COLOR_WHITE);
+
+  auto uiCanvasItem = s.createSceneItem();
+  auto uiCanvas = uiCanvasItem->addComponent<UICanvas>();
+}

src/dawnrpg/scene/SceneList.hpp

@@ -0,0 +1,11 @@
+// Copyright (c) 2023 Dominic Masters
+// 
+// This software is released under the MIT License.
+// https://opensource.org/licenses/MIT
+
+#pragma once
+#include "scene/Scene.hpp"
+
+namespace Dawn {
+  void helloWorldScene(Scene &s);
+}

src/dawntruetype/CMakeLists.txt

@@ -0,0 +1,20 @@
+# Copyright (c) 2022 Dominic Masters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Includes
+target_include_directories(${DAWN_TARGET_NAME}
+  PUBLIC
+    ${CMAKE_CURRENT_LIST_DIR}
+)
+
+target_link_libraries(${DAWN_TARGET_NAME}
+  PUBLIC
+    freetype
+)
+
+# Subdirs
+add_subdirectory(asset)
+add_subdirectory(display)
+add_subdirectory(ui)

src/dawntruetype/asset/AssetManagerTrueType.cpp

@@ -0,0 +1,27 @@
+// Copyright (c) 2024 Dominic Masters
+// 
+// This software is released under the MIT License.
+// https://opensource.org/licenses/MIT
+
+#include "AssetManager.hpp"
+#include "loaders/TrueTypeLoader.hpp"
+
+template<>
+std::shared_ptr<TrueTypeTexture> AssetManager::get<TrueTypeTexture>(
+  const std::string filename,
+  const uint32_t fontSize
+) {
+  auto existing = this->getExisting<TrueTypeLoader>(filename);
+  if(existing) {
+    // Check pointer hasn't gone stale, if it has remove it and create new.
+    auto texture = existing->getTexture(fontSize);
+    if(texture) return texture;
+    this->removeExisting(filename);
+  }
+
+  std::shared_ptr<TrueTypeLoader> loader = std::make_shared<TrueTypeLoader>(
+    filename
+  );
+  pendingAssetLoaders.push_back(std::static_pointer_cast<AssetLoader>(loader));
+  return loader->getTexture(fontSize);
+}

src/dawntruetype/asset/CMakeLists.txt

@@ -0,0 +1,11 @@
+# Copyright (c) 2024 Dominic Masters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DAWN_TARGET_NAME}
+  PRIVATE
+  AssetManagerTrueType.cpp
+)
+
+add_subdirectory(loaders)

src/dawntruetype/asset/loaders/CMakeLists.txt

@@ -0,0 +1,10 @@
+# Copyright (c) 2024 Dominic Msters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+target_sources(${DAWN_TARGET_NAME}
+  PRIVATE
+    TrueTypeLoader.cpp
+)

src/dawntruetype/display/CMakeLists.txt

@@ -0,0 +1,6 @@
+# Copyright (c) 2024 Dominic Masters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+add_subdirectory(font)

src/dawntruetype/ui/CMakeLists.txt

@@ -0,0 +1,6 @@
+# Copyright (c) 2024 Dominic Masters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+add_subdirectory(elements)

src/dawntruetype/ui/elements/CMakeLists.txt

@@ -0,0 +1,9 @@
+# Copyright (c) 2023 Dominic Masters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DAWN_TARGET_NAME}
+  PRIVATE
+    UILabel.cpp
+)