diff --git a/.gitmodules b/.gitmodules index 61e594dc..a6dc1c73 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,6 @@ [submodule "lib/glm"] path = lib/glm url = https://github.com/g-truc/glm.git -[submodule "lib/stb"] - path = lib/stb - url = https://github.com/nothings/stb [submodule "lib/SDL"] path = lib/SDL url = https://github.com/libsdl-org/SDL.git diff --git a/cmake/targets/CMakeLists.txt b/cmake/targets/CMakeLists.txt index 66ca6135..6f8807b4 100644 --- a/cmake/targets/CMakeLists.txt +++ b/cmake/targets/CMakeLists.txt @@ -3,11 +3,6 @@ # This software is released under the MIT License. # https://opensource.org/licenses/MIT -# Check for build target, or default. This is pretty much not guaranteed. -if(NOT DEFINED DAWN_BUILD_TARGET) - set(DAWN_BUILD_TARGET "target-tools") -endif() - # 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") diff --git a/cmake/targets/target-helloworld-emscripten/CMakeLists.txt b/cmake/targets/target-helloworld-emscripten/CMakeLists.txt new file mode 100644 index 00000000..f1818019 --- /dev/null +++ b/cmake/targets/target-helloworld-emscripten/CMakeLists.txt @@ -0,0 +1,15 @@ +# Copyright (c) 2023 Dominic Masters +# +# This software is released under the MIT License. +# https://opensource.org/licenses/MIT + +set(DAWN_BUILDING dawnhelloworld CACHE INTERNAL ${DAWN_CACHE_TARGET}) +set(DAWN_BUILD_HOST_LIBS "" CACHE INTERNAL ${DAWN_CACHE_TARGET}) +set(DAWN_TARGET_EMSCRIPTEN true CACHE INTERNAL ${DAWN_CACHE_TARGET}) +set(DAWN_TARGET_GLFW true CACHE INTERNAL ${DAWN_CACHE_TARGET}) +set(DAWN_TARGET_NAME "HelloWorld" CACHE INTERNAL ${DAWN_CACHE_TARGET}) + +set(DAWN_EMSCRIPTEN_FLAGS "" CACHE INTERNAL ${DAWN_CACHE_TARGET}) + +# Ensures a .HTML file is generated. +set(CMAKE_EXECUTABLE_SUFFIX ".html" CACHE INTERNAL ${DAWN_CACHE_TARGET}) \ No newline at end of file diff --git a/cmake/targets/target-helloworld-linux64-glfw/CMakeLists.txt b/cmake/targets/target-helloworld-linux64-glfw/CMakeLists.txt index fd42abe0..e640c37d 100644 --- a/cmake/targets/target-helloworld-linux64-glfw/CMakeLists.txt +++ b/cmake/targets/target-helloworld-linux64-glfw/CMakeLists.txt @@ -6,4 +6,5 @@ set(DAWN_BUILDING dawnhelloworld CACHE INTERNAL ${DAWN_CACHE_TARGET}) set(DAWN_TARGET_LINUX64 true CACHE INTERNAL ${DAWN_CACHE_TARGET}) set(DAWN_TARGET_GLFW true CACHE INTERNAL ${DAWN_CACHE_TARGET}) -set(DAWN_TARGET_NAME "HelloWorld" CACHE INTERNAL ${DAWN_CACHE_TARGET}) \ No newline at end of file +set(DAWN_TARGET_NAME "HelloWorld" CACHE INTERNAL ${DAWN_CACHE_TARGET}) +set(DAWN_TARGET_ARCHIVE true CACHE INTERNAL ${DAWN_CACHE_TARGET}) \ No newline at end of file diff --git a/index.html b/index.html new file mode 100644 index 00000000..33921223 --- /dev/null +++ b/index.html @@ -0,0 +1,30 @@ + + + + + Home + + + + +

Hello Emscripten

+ + + + + + + diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index d6e8ffaf..02bf4dfa 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -7,6 +7,7 @@ if(DAWN_TARGET_GLFW) if(${CMAKE_SYSTEM_NAME} MATCHES "Emscripten") set(DAWN_EMSCRIPTEN_FLAGS "${DAWN_EMSCRIPTEN_FLAGS} -s USE_GLFW=3" CACHE INTERNAL ${DAWN_CACHE_TARGET}) + add_subdirectory(glad) else() add_subdirectory(glad) add_subdirectory(glfw) @@ -22,10 +23,6 @@ endif() # GLM add_subdirectory(glm) -# STB -add_library(stb INTERFACE) -target_include_directories(stb INTERFACE stb) - # FreeType if(${CMAKE_SYSTEM_NAME} MATCHES "Emscripten") set(DAWN_EMSCRIPTEN_FLAGS "${DAWN_EMSCRIPTEN_FLAGS} -s USE_FREETYPE=1" CACHE INTERNAL ${DAWN_CACHE_TARGET}) @@ -34,7 +31,9 @@ else() endif() # LibArchive -add_subdirectory(libarchive) +if(DAWN_TARGET_ARCHIVE) + add_subdirectory(libarchive) +endif() # OpenAL if(DAWN_TARGET_OPENAL) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 25adbccc..c6a735b6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -57,6 +57,12 @@ if(DEFINED DAWN_TARGET_NAME) add_subdirectory(dawnopengl) endif() + if(DAWN_TARGET_ARCHIVE) + add_subdirectory(dawnarchiveasset) + else() + add_subdirectory(dawnfileasset) + endif() + if(DAWN_TARGET_VITA) add_subdirectory(dawnopengl) endif() diff --git a/src/dawn/CMakeLists.txt b/src/dawn/CMakeLists.txt index 1be141bc..2fc0ed6f 100644 --- a/src/dawn/CMakeLists.txt +++ b/src/dawn/CMakeLists.txt @@ -7,9 +7,7 @@ target_link_libraries(${DAWN_TARGET_NAME} PUBLIC glm - stb freetype - archive_static ) # Includes diff --git a/src/dawn/asset/CMakeLists.txt b/src/dawn/asset/CMakeLists.txt index 057b9c5a..466dff6e 100644 --- a/src/dawn/asset/CMakeLists.txt +++ b/src/dawn/asset/CMakeLists.txt @@ -7,7 +7,7 @@ target_sources(${DAWN_TARGET_NAME} PRIVATE Asset.cpp - AssetLoader.cpp + IAssetLoader.cpp AssetManager.cpp ) diff --git a/src/dawn/asset/IAssetLoader.cpp b/src/dawn/asset/IAssetLoader.cpp new file mode 100644 index 00000000..dad04ae4 --- /dev/null +++ b/src/dawn/asset/IAssetLoader.cpp @@ -0,0 +1,22 @@ +// Copyright (c) 2023 Dominic Masters +// +// This software is released under the MIT License. +// https://opensource.org/licenses/MIT + +#include "IAssetLoader.hpp" + +using namespace Dawn; + +IAssetLoader::IAssetLoader(std::string fileName) { + assertTrue(fileName.size() > 0, "IAssetLoader::IAssetLoader: fileName must be greater than 0"); + this->fileName = fileName; +} + +size_t IAssetLoader::setPosition(size_t position) { + assertTrue(position >= 0, "IAssetLoader::setPosition: position must be greater than or equal to 0"); + this->rewind(); + return this->skip(position); +} + +IAssetLoader::~IAssetLoader() { +} \ No newline at end of file diff --git a/src/dawn/asset/AssetLoader.hpp b/src/dawn/asset/IAssetLoader.hpp similarity index 58% rename from src/dawn/asset/AssetLoader.hpp rename to src/dawn/asset/IAssetLoader.hpp index 6cb820f5..19cab0de 100644 --- a/src/dawn/asset/AssetLoader.hpp +++ b/src/dawn/asset/IAssetLoader.hpp @@ -4,10 +4,6 @@ // https://opensource.org/licenses/MIT #pragma once -extern "C" { - #include - #include -} #include "dawnlibs.hpp" #include "assert/assert.hpp" #include "util/memory.hpp" @@ -18,87 +14,30 @@ extern "C" { #error Asset Archive Location has not been defined. #endif -/** - * Method invoked by the libarchive internals to read bytes from the archive - * file pointer. - * - * @param archive Archive requesting the read. - * @param data Data pointer passed to the archive. - * @param buffer Pointer to where the buffer pointer should be stored. - * @return Count of bytes read. - */ -ssize_t assetLoaderArchiveRead( - struct archive *archive, - void *data, - const void **buffer -); - -/** - * Method invoked by the libarchive internals to seek the archive file pointer. - * - * @param archive Archive requesting the seek. - * @param data Data pointer passed to the archive. - * @param offset Offset to seek to. - * @param whence Whence to seek from. - * @return The new offset. - */ -int64_t assetLoaderArchiveSeek( - struct archive *archive, - void *data, - int64_t offset, - int32_t whence -); - -/** - * Method invoked by the libarchive internals to open the archive file pointer. - * - * @param archive Archive requesting the open. - * @param data Data pointer passed to the archive. - * @return 0 if success, otherwise for failure. - */ -int32_t assetLoaderArchiveOpen(struct archive *a, void *data); - -/** - * Method invoked by the libarchive internals to close the archive file pointer. - * - * @param archive Archive requesting the close. - * @param data Data pointer passed to the archive. - * @return 0 if success, otherwise for failure. - */ -int32_t assetLoaderArchiveClose(struct archive *a, void *data); - namespace Dawn { - class AssetLoader { - private: + class IAssetLoader { + protected: std::string fileName; - struct archive *assetArchive = nullptr; - struct archive_entry *assetArchiveEntry = nullptr; - size_t position; public: - uint8_t buffer[ASSET_LOADER_BUFFER_SIZE]; - FILE *assetArchiveFile = nullptr; - /** * Create a new asset loader. Asset Loaders can be used to load data from * a file in a myriad of ways. * * @param fileName File name of the asset that is to be loaded. */ - AssetLoader(std::string fileName); + IAssetLoader(std::string fileName); /** * Platform-centric method to open a file buffer to an asset. - * - * @return 0 if success, otherwise for failure. */ - void open(); + virtual void open() = 0; /** * Closes the previously ppened asset. * @return 0 if successful, otherwise false. */ - int32_t close(); + virtual int32_t close() = 0; /** * Read bytes from buffer. @@ -106,13 +45,13 @@ namespace Dawn { * @param size Length of the data buffer (How many bytes to read). * @return The count of bytes read. */ - size_t read(uint8_t *buffer, size_t size); + virtual size_t read(uint8_t *buffer, size_t size) = 0; /** * Get the size of the asset. * @return The size of the asset in bytes. */ - size_t getSize(); + virtual size_t getSize() = 0; /** * Skips the read head forward to a given position. @@ -120,12 +59,12 @@ namespace Dawn { * @param n Count of bytes to progress the read head by. * @return Count of bytes progressed. */ - size_t skip(size_t n); + virtual size_t skip(size_t n) = 0; /** * Rewind the read head to the beginning of the file. */ - void rewind(); + virtual void rewind() = 0; /** * Sets the absolute position of the read head within the buffer of the @@ -140,7 +79,7 @@ namespace Dawn { * * @return The current read head position. */ - size_t getPosition(); + virtual size_t getPosition() = 0; /** * Run a callback for each byte within the asset. The callback will @@ -189,6 +128,6 @@ namespace Dawn { /** * Cleanup the asset loader. */ - virtual ~AssetLoader(); + virtual ~IAssetLoader(); }; } \ No newline at end of file diff --git a/src/dawn/asset/assets/AudioAsset.hpp b/src/dawn/asset/assets/AudioAsset.hpp index 71cb11d1..ec4bac5b 100644 --- a/src/dawn/asset/assets/AudioAsset.hpp +++ b/src/dawn/asset/assets/AudioAsset.hpp @@ -5,7 +5,7 @@ #pragma once #include "../Asset.hpp" -#include "../AssetLoader.hpp" +#include "asset/AssetLoader.hpp" namespace Dawn { class AudioSource; diff --git a/src/dawn/asset/assets/LanguageAsset.hpp b/src/dawn/asset/assets/LanguageAsset.hpp index 72aaaef5..0182bf89 100644 --- a/src/dawn/asset/assets/LanguageAsset.hpp +++ b/src/dawn/asset/assets/LanguageAsset.hpp @@ -5,7 +5,7 @@ #pragma once #include "../Asset.hpp" -#include "../AssetLoader.hpp" +#include "asset/AssetLoader.hpp" namespace Dawn { struct AssetLanguageValue { diff --git a/src/dawn/asset/assets/TextureAsset.hpp b/src/dawn/asset/assets/TextureAsset.hpp index ab5e45da..f523c321 100644 --- a/src/dawn/asset/assets/TextureAsset.hpp +++ b/src/dawn/asset/assets/TextureAsset.hpp @@ -5,7 +5,7 @@ #pragma once #include "../Asset.hpp" -#include "../AssetLoader.hpp" +#include "asset/AssetLoader.hpp" #include "display/Texture.hpp" namespace Dawn { diff --git a/src/dawn/asset/assets/TilesetAsset.hpp b/src/dawn/asset/assets/TilesetAsset.hpp index d771a8d0..0f90213f 100644 --- a/src/dawn/asset/assets/TilesetAsset.hpp +++ b/src/dawn/asset/assets/TilesetAsset.hpp @@ -5,7 +5,7 @@ #pragma once #include "../Asset.hpp" -#include "../AssetLoader.hpp" +#include "asset/AssetLoader.hpp" #include "display/Tileset.hpp" namespace Dawn { diff --git a/src/dawn/asset/assets/TrueTypeAsset.hpp b/src/dawn/asset/assets/TrueTypeAsset.hpp index eb5f4a02..985a318a 100644 --- a/src/dawn/asset/assets/TrueTypeAsset.hpp +++ b/src/dawn/asset/assets/TrueTypeAsset.hpp @@ -5,7 +5,7 @@ #pragma once #include "../Asset.hpp" -#include "../AssetLoader.hpp" +#include "asset/AssetLoader.hpp" #include "util/flag.hpp" #include "display/font/truetype/TrueTypeFaceTexture.hpp" #include "util/UsageLock.hpp" diff --git a/src/dawn/dawnlibs.hpp b/src/dawn/dawnlibs.hpp index fcac6ef1..2b6a2746 100644 --- a/src/dawn/dawnlibs.hpp +++ b/src/dawn/dawnlibs.hpp @@ -9,8 +9,6 @@ #include "dawnsharedlibs.hpp" #include "util/memory.hpp" -#include - #include #include FT_FREETYPE_H diff --git a/src/dawn/display/font/truetype/TrueTypeFaceTexture.cpp b/src/dawn/display/font/truetype/TrueTypeFaceTexture.cpp index 1ff52e5a..1c68a90d 100644 --- a/src/dawn/display/font/truetype/TrueTypeFaceTexture.cpp +++ b/src/dawn/display/font/truetype/TrueTypeFaceTexture.cpp @@ -27,7 +27,7 @@ TrueTypeFaceTexture::TrueTypeFaceTexture( // First pass, determine the textures' dimensions. for(c = TRUE_TYPE_CHAR_BEGIN; c < TRUE_TYPE_CHAR_END; c++) { // Load the character - auto ret = FT_Load_Char(face, c, FT_LOAD_BITMAP_METRICS_ONLY); + auto ret = FT_Load_Char(face, c, ~FT_LOAD_RENDER); if(ret) { assertUnreachable("TrueTypeFaceTexture::TrueTypeFaceTexture: Failed to load character (0)"); } diff --git a/src/dawn/state/StateInterfaces.hpp b/src/dawn/state/StateInterfaces.hpp index bc612eb3..a8a1c8e0 100644 --- a/src/dawn/state/StateInterfaces.hpp +++ b/src/dawn/state/StateInterfaces.hpp @@ -20,6 +20,7 @@ namespace Dawn { public: virtual void removeListener() = 0; virtual void teardown() = 0; + virtual ~IStateOwnerEventLegacy() {} }; class IStateOwner { diff --git a/src/dawnarchiveasset/CMakeLists.txt b/src/dawnarchiveasset/CMakeLists.txt new file mode 100644 index 00000000..65badf81 --- /dev/null +++ b/src/dawnarchiveasset/CMakeLists.txt @@ -0,0 +1,20 @@ +# Copyright (c) 2023 Dominic Msters +# +# This software is released under the MIT License. +# https://opensource.org/licenses/MIT + +# Libraries +target_link_libraries(${DAWN_TARGET_NAME} + PUBLIC + archive_static +) + +# Includes +target_include_directories(${DAWN_TARGET_NAME} + PUBLIC + ${DAWN_SHARED_INCLUDES} + ${CMAKE_CURRENT_LIST_DIR} +) + +# Subdirs +add_subdirectory(asset) \ No newline at end of file diff --git a/src/dawn/asset/AssetLoader.cpp b/src/dawnarchiveasset/asset/AssetLoader.cpp similarity index 90% rename from src/dawn/asset/AssetLoader.cpp rename to src/dawnarchiveasset/asset/AssetLoader.cpp index 4e90945e..380e97c0 100644 --- a/src/dawn/asset/AssetLoader.cpp +++ b/src/dawnarchiveasset/asset/AssetLoader.cpp @@ -1,180 +1,171 @@ -// Copyright (c) 2022 Dominic Masters -// -// This software is released under the MIT License. -// https://opensource.org/licenses/MIT - -#include "AssetLoader.hpp" -#include "util/mathutils.hpp" - -using namespace Dawn; - -ssize_t assetLoaderArchiveRead( - struct archive *archive, - void *d, - const void **buffer -) { - assertNotNull(archive, "assetArchiveRead: Archive is NULL!"); - assertNotNull(d, "assetArchiveRead: Data is NULL!"); - assertNotNull(buffer, "assetArchiveRead: Buffer is NULL!"); - AssetLoader *loader = (AssetLoader*)d; - - *buffer = loader->buffer; - size_t read = fread( - loader->buffer, 1, ASSET_LOADER_BUFFER_SIZE, loader->assetArchiveFile - ); - if(ferror(loader->assetArchiveFile)) return ARCHIVE_FATAL; - return read; -} - -int64_t assetLoaderArchiveSeek( - struct archive *archive, - void *d, - int64_t offset, - int32_t whence -) { - assertNotNull(archive, "assetArchiveSeek: Archive is NULL!"); - assertNotNull(d, "assetArchiveSeek: Data is NULL!"); - assertTrue(offset > 0, "assetArchiveSeek: Offset must be greater than 0!"); - AssetLoader *loader = (AssetLoader*)d; - int32_t ret = fseek(loader->assetArchiveFile, offset, whence); - assertTrue(ret == 0, "assetArchiveSeek: Failed to seek!"); - return ftell(loader->assetArchiveFile); -} - -int32_t assetLoaderArchiveOpen(struct archive *a, void *d) { - assertNotNull(a, "assetArchiveOpen: Archive is NULL!"); - assertNotNull(d, "assetArchiveOpen: Data is NULL!"); - AssetLoader *loader = (AssetLoader*)d; - - int32_t ret = fseek(loader->assetArchiveFile, 0, SEEK_SET); - assertTrue(ret == 0, "assetArchiveOpen: Failed to seek to start of file!"); - return ARCHIVE_OK; -} - -int32_t assetLoaderArchiveClose(struct archive *a, void *d) { - assertNotNull(a, "assetArchiveClose: Archive is NULL!"); - assertNotNull(d, "assetArchiveClose: Data is NULL!"); - return assetLoaderArchiveOpen(a, d); -} - -AssetLoader::AssetLoader(std::string fileName) { - assertTrue(fileName.size() > 0, "AssetLoader::AssetLoader: fileName must be greater than 0"); - this->fileName = fileName; -} - -void AssetLoader::open() { - assertNull(this->assetArchiveFile, "AssetLoader::open: File is already open"); - assertNull(this->assetArchive, "AssetLoader::open: Archive is already open"); - assertNull(this->assetArchiveEntry, "AssetLoader::open: Entry is already open"); - - this->assetArchiveFile = fopen(DAWN_ASSET_LOCATION, "rb"); - assertNotNull(this->assetArchiveFile, "AssetLoader::open: Failed to open file " + std::string(DAWN_ASSET_LOCATION)); - - // Open archive reader - assetArchive = archive_read_new(); - assertNotNull(assetArchive, "AssetLoader::open: Failed to create archive reader"); - - // Set up the reader - archive_read_support_format_tar(assetArchive); - - // Open reader - archive_read_set_open_callback(assetArchive, &assetLoaderArchiveOpen); - archive_read_set_read_callback(assetArchive, &assetLoaderArchiveRead); - archive_read_set_seek_callback(assetArchive, &assetLoaderArchiveSeek); - archive_read_set_close_callback(assetArchive, &assetLoaderArchiveClose); - archive_read_set_callback_data(assetArchive, this); - - int32_t ret = archive_read_open1(assetArchive); - assertTrue(ret == ARCHIVE_OK, "AssetLoader::open: Failed to open archive!"); - position = 0; - - // Iterate over each file to find the one for this asset loader. - while(archive_read_next_header(assetArchive, &assetArchiveEntry) == ARCHIVE_OK) { - 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, "AssetLoader::open: Failed to skip data!"); - } - - assertUnreachable("AssetLoader::open: Failed to find file!"); -} - -int32_t AssetLoader::close() { - assertNotNull(this->assetArchiveFile, "AssetLoader::close: File is NULL"); - assertNotNull(this->assetArchive, "AssetLoader::close: Archive is NULL!"); - assertNotNull(this->assetArchiveEntry, "AssetLoader::close: Entry is NULL!"); - - // Close the archive - int32_t ret = archive_read_free(this->assetArchive); - assertTrue(ret == ARCHIVE_OK, "AssetLoader::close: Failed to close archive!"); - - this->assetArchive = nullptr; - this->assetArchiveEntry = nullptr; - - // Close the file - int32_t res = fclose(this->assetArchiveFile); - this->assetArchiveFile = nullptr; - return res; -} - -size_t AssetLoader::read(uint8_t *buffer, size_t size) { - assertNotNull(buffer, "assetArchiveRead: Buffer is NULL!"); - assertTrue(size > 0, "assetArchiveRead: Size must be greater than 0!"); - assertNotNull(this->assetArchive, "assetRead: Archive is NULL!"); - assertNotNull(this->assetArchiveEntry, "assetRead: Entry is NULL!"); - - ssize_t read = archive_read_data(this->assetArchive, buffer, size); - this->position += read; - - if(read == ARCHIVE_FATAL) { - assertUnreachable(archive_error_string(this->assetArchive)); - } - - assertTrue(read != ARCHIVE_RETRY, "assetRead: Failed to read data (RETRY)!"); - assertTrue(read != ARCHIVE_WARN, "assetRead: Failed to read data (WARN)!"); - - return read; -} - -size_t AssetLoader::getSize() { - assertTrue(this->assetArchiveEntry != nullptr, "AssetLoader::getSize: Entry is NULL!"); - assertTrue(archive_entry_size_is_set(assetArchiveEntry), "assetGetSize: Entry size is not set!"); - return archive_entry_size(assetArchiveEntry); -} - -size_t AssetLoader::skip(size_t n) { - assertTrue(n >= 0, "AssetLoader::skip: Byte count must be greater than 0."); - - uint8_t dumpBuffer[ASSET_LOADER_BUFFER_SIZE]; - size_t skipped = 0; - size_t n2, n3; - while(n != 0) { - n2 = mathMin(n, ASSET_LOADER_BUFFER_SIZE); - n3 = this->read(dumpBuffer, n2); - assertTrue(n3 == n2, "AssetLoader::skip: Failed to skip bytes!"); - n -= n3; - } - - return skipped; -} - -void AssetLoader::rewind() { - // TODO: See if I can optimize this - this->close(); - this->open(); -} - -size_t AssetLoader::getPosition() { - assertNotNull(this->assetArchiveFile, "AssetLoader::getPosition: File is not open!"); - return this->position; -} - -size_t AssetLoader::setPosition(size_t position) { - assertTrue(position >= 0, "AssetLoader::setPosition: position must be greater than or equal to 0"); - this->rewind(); - return this->skip(position); -} - -AssetLoader::~AssetLoader() { - if(this->assetArchiveFile != nullptr) this->close(); +// Copyright (c) 2023 Dominic Masters +// +// This software is released under the MIT License. +// https://opensource.org/licenses/MIT + +#include "AssetLoader.hpp" +#include "util/mathutils.hpp" + +using namespace Dawn; + +ssize_t assetLoaderArchiveRead( + struct archive *archive, + void *d, + const void **buffer +) { + assertNotNull(archive, "assetArchiveRead: Archive is NULL!"); + assertNotNull(d, "assetArchiveRead: Data is NULL!"); + assertNotNull(buffer, "assetArchiveRead: Buffer is NULL!"); + AssetLoader *loader = (AssetLoader*)d; + + *buffer = loader->buffer; + size_t read = fread( + loader->buffer, 1, ASSET_LOADER_BUFFER_SIZE, loader->assetArchiveFile + ); + if(ferror(loader->assetArchiveFile)) return ARCHIVE_FATAL; + return read; +} + +int64_t assetLoaderArchiveSeek( + struct archive *archive, + void *d, + int64_t offset, + int32_t whence +) { + assertNotNull(archive, "assetArchiveSeek: Archive is NULL!"); + assertNotNull(d, "assetArchiveSeek: Data is NULL!"); + assertTrue(offset > 0, "assetArchiveSeek: Offset must be greater than 0!"); + AssetLoader *loader = (AssetLoader*)d; + int32_t ret = fseek(loader->assetArchiveFile, offset, whence); + assertTrue(ret == 0, "assetArchiveSeek: Failed to seek!"); + return ftell(loader->assetArchiveFile); +} + +int32_t assetLoaderArchiveOpen(struct archive *a, void *d) { + assertNotNull(a, "assetArchiveOpen: Archive is NULL!"); + assertNotNull(d, "assetArchiveOpen: Data is NULL!"); + AssetLoader *loader = (AssetLoader*)d; + + int32_t ret = fseek(loader->assetArchiveFile, 0, SEEK_SET); + assertTrue(ret == 0, "assetArchiveOpen: Failed to seek to start of file!"); + return ARCHIVE_OK; +} + +int32_t assetLoaderArchiveClose(struct archive *a, void *d) { + assertNotNull(a, "assetArchiveClose: Archive is NULL!"); + assertNotNull(d, "assetArchiveClose: Data is NULL!"); + return assetLoaderArchiveOpen(a, d); +} + +AssetLoader::AssetLoader(std::string fileName) : IAssetLoader(fileName) {} + +void AssetLoader::open() { + assertNull(this->assetArchiveFile, "AssetLoader::open: File is already open"); + assertNull(this->assetArchive, "AssetLoader::open: Archive is already open"); + assertNull(this->assetArchiveEntry, "AssetLoader::open: Entry is already open"); + + this->assetArchiveFile = fopen(DAWN_ASSET_LOCATION, "rb"); + assertNotNull(this->assetArchiveFile, "AssetLoader::open: Failed to open file " + std::string(DAWN_ASSET_LOCATION)); + + // Open archive reader + assetArchive = archive_read_new(); + assertNotNull(assetArchive, "AssetLoader::open: Failed to create archive reader"); + + // Set up the reader + archive_read_support_format_tar(assetArchive); + + // Open reader + archive_read_set_open_callback(assetArchive, &assetLoaderArchiveOpen); + archive_read_set_read_callback(assetArchive, &assetLoaderArchiveRead); + archive_read_set_seek_callback(assetArchive, &assetLoaderArchiveSeek); + archive_read_set_close_callback(assetArchive, &assetLoaderArchiveClose); + archive_read_set_callback_data(assetArchive, this); + + int32_t ret = archive_read_open1(assetArchive); + assertTrue(ret == ARCHIVE_OK, "AssetLoader::open: Failed to open archive!"); + position = 0; + + // Iterate over each file to find the one for this asset loader. + while(archive_read_next_header(assetArchive, &assetArchiveEntry) == ARCHIVE_OK) { + 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, "AssetLoader::open: Failed to skip data!"); + } + + assertUnreachable("AssetLoader::open: Failed to find file!"); +} + +int32_t AssetLoader::close() { + assertNotNull(this->assetArchiveFile, "AssetLoader::close: File is NULL"); + assertNotNull(this->assetArchive, "AssetLoader::close: Archive is NULL!"); + assertNotNull(this->assetArchiveEntry, "AssetLoader::close: Entry is NULL!"); + + // Close the archive + int32_t ret = archive_read_free(this->assetArchive); + assertTrue(ret == ARCHIVE_OK, "AssetLoader::close: Failed to close archive!"); + + this->assetArchive = nullptr; + this->assetArchiveEntry = nullptr; + + // Close the file + int32_t res = fclose(this->assetArchiveFile); + this->assetArchiveFile = nullptr; + return res; +} + +size_t AssetLoader::read(uint8_t *buffer, size_t size) { + assertNotNull(buffer, "assetArchiveRead: Buffer is NULL!"); + assertTrue(size > 0, "assetArchiveRead: Size must be greater than 0!"); + assertNotNull(this->assetArchive, "assetRead: Archive is NULL!"); + assertNotNull(this->assetArchiveEntry, "assetRead: Entry is NULL!"); + + ssize_t read = archive_read_data(this->assetArchive, buffer, size); + this->position += read; + + if(read == ARCHIVE_FATAL) { + assertUnreachable(archive_error_string(this->assetArchive)); + } + + assertTrue(read != ARCHIVE_RETRY, "assetRead: Failed to read data (RETRY)!"); + assertTrue(read != ARCHIVE_WARN, "assetRead: Failed to read data (WARN)!"); + + return read; +} + +size_t AssetLoader::getSize() { + assertTrue(this->assetArchiveEntry != nullptr, "AssetLoader::getSize: Entry is NULL!"); + assertTrue(archive_entry_size_is_set(assetArchiveEntry), "assetGetSize: Entry size is not set!"); + return archive_entry_size(assetArchiveEntry); +} + +size_t AssetLoader::skip(size_t n) { + assertTrue(n >= 0, "AssetLoader::skip: Byte count must be greater than 0."); + + uint8_t dumpBuffer[ASSET_LOADER_BUFFER_SIZE]; + size_t skipped = 0; + size_t n2, n3; + while(n != 0) { + n2 = mathMin(n, ASSET_LOADER_BUFFER_SIZE); + n3 = this->read(dumpBuffer, n2); + assertTrue(n3 == n2, "AssetLoader::skip: Failed to skip bytes!"); + n -= n3; + } + + return skipped; +} + +void AssetLoader::rewind() { + // TODO: See if I can optimize this + this->close(); + this->open(); +} + +size_t AssetLoader::getPosition() { + assertNotNull(this->assetArchiveFile, "AssetLoader::getPosition: File is not open!"); + return this->position; +} + +AssetLoader::~AssetLoader() { + if(this->assetArchiveFile != nullptr) this->close(); } \ No newline at end of file diff --git a/src/dawnarchiveasset/asset/AssetLoader.hpp b/src/dawnarchiveasset/asset/AssetLoader.hpp new file mode 100644 index 00000000..71d20cfa --- /dev/null +++ b/src/dawnarchiveasset/asset/AssetLoader.hpp @@ -0,0 +1,83 @@ +// Copyright (c) 2023 Dominic Masters +// +// This software is released under the MIT License. +// https://opensource.org/licenses/MIT + +#pragma once +extern "C" { + #include + #include +} +#include "asset/IAssetLoader.hpp" + +/** + * Method invoked by the libarchive internals to read bytes from the archive + * file pointer. + * + * @param archive Archive requesting the read. + * @param data Data pointer passed to the archive. + * @param buffer Pointer to where the buffer pointer should be stored. + * @return Count of bytes read. + */ +ssize_t assetLoaderArchiveRead( + struct archive *archive, + void *data, + const void **buffer +); + +/** + * Method invoked by the libarchive internals to seek the archive file pointer. + * + * @param archive Archive requesting the seek. + * @param data Data pointer passed to the archive. + * @param offset Offset to seek to. + * @param whence Whence to seek from. + * @return The new offset. + */ +int64_t assetLoaderArchiveSeek( + struct archive *archive, + void *data, + int64_t offset, + int32_t whence +); + +/** + * Method invoked by the libarchive internals to open the archive file pointer. + * + * @param archive Archive requesting the open. + * @param data Data pointer passed to the archive. + * @return 0 if success, otherwise for failure. + */ +int32_t assetLoaderArchiveOpen(struct archive *a, void *data); + +/** + * Method invoked by the libarchive internals to close the archive file pointer. + * + * @param archive Archive requesting the close. + * @param data Data pointer passed to the archive. + * @return 0 if success, otherwise for failure. + */ +int32_t assetLoaderArchiveClose(struct archive *a, void *data); + +namespace Dawn { + class AssetLoader : public IAssetLoader { + protected: + struct archive *assetArchive = nullptr; + struct archive_entry *assetArchiveEntry = nullptr; + size_t position; + + public: + uint8_t buffer[ASSET_LOADER_BUFFER_SIZE]; + FILE *assetArchiveFile = nullptr; + + AssetLoader(std::string filename); + void open() override; + int32_t close() override; + size_t read(uint8_t *buffer, size_t size) override; + size_t getSize() override; + size_t skip(size_t n) override; + void rewind() override; + size_t getPosition() override; + ~AssetLoader(); + }; +} \ No newline at end of file diff --git a/src/dawnarchiveasset/asset/CMakeLists.txt b/src/dawnarchiveasset/asset/CMakeLists.txt new file mode 100644 index 00000000..bd9f3e44 --- /dev/null +++ b/src/dawnarchiveasset/asset/CMakeLists.txt @@ -0,0 +1,10 @@ +# Copyright (c) 2023 Dominic Msters +# +# This software is released under the MIT License. +# https://opensource.org/licenses/MIT + +# Sources +target_sources(${DAWN_TARGET_NAME} + PRIVATE + AssetLoader.cpp +) \ No newline at end of file diff --git a/src/dawnemscripten/host/DawnEmscripten.cpp b/src/dawnemscripten/host/DawnEmscripten.cpp index 7b04d464..7933003b 100644 --- a/src/dawnemscripten/host/DawnEmscripten.cpp +++ b/src/dawnemscripten/host/DawnEmscripten.cpp @@ -4,8 +4,45 @@ // https://opensource.org/licenses/MIT #include "host/DawnEmscripten.hpp" +#include "host/DawnHost.hpp" +#include "game/DawnGame.hpp" + +using namespace Dawn; int main() { - printf("Hello Emscripten\n"); + int32_t result; + + memoryInit(); + auto host = new DawnHost(); + auto game = new DawnGame(host); + + result = host->init(game); + switch(result) { + case DAWN_HOST_INIT_RESULT_SUCCESS: + break; + default: + return result; + } + + // Request the main loop to start running. + result = host->start(game); + switch(result) { + case DAWN_HOST_START_RESULT_SUCCESS: + break; + case DAWN_HOST_START_RESULT_EXIT_SUCCESS: + break; + default: + return result; + } + + // Main loop finished without errors, cleanup + host->unload(game); + + delete game; + delete host; + + memoryDispose(); + + // Success return 0; } \ No newline at end of file diff --git a/src/dawnemscripten/host/DawnEmscripten.hpp b/src/dawnemscripten/host/DawnEmscripten.hpp index 94a0ba24..9501c6c9 100644 --- a/src/dawnemscripten/host/DawnEmscripten.hpp +++ b/src/dawnemscripten/host/DawnEmscripten.hpp @@ -4,6 +4,6 @@ // https://opensource.org/licenses/MIT #pragma once -#include +#include "dawnlibs.hpp" int main(); \ No newline at end of file diff --git a/src/dawnfileasset/CMakeLists.txt b/src/dawnfileasset/CMakeLists.txt new file mode 100644 index 00000000..788d08e1 --- /dev/null +++ b/src/dawnfileasset/CMakeLists.txt @@ -0,0 +1,14 @@ +# Copyright (c) 2023 Dominic Msters +# +# This software is released under the MIT License. +# https://opensource.org/licenses/MIT + +# Includes +target_include_directories(${DAWN_TARGET_NAME} + PUBLIC + ${DAWN_SHARED_INCLUDES} + ${CMAKE_CURRENT_LIST_DIR} +) + +# Subdirs +add_subdirectory(asset) \ No newline at end of file diff --git a/src/dawnfileasset/asset/AssetLoader.cpp b/src/dawnfileasset/asset/AssetLoader.cpp new file mode 100644 index 00000000..6ad8b0ba --- /dev/null +++ b/src/dawnfileasset/asset/AssetLoader.cpp @@ -0,0 +1,68 @@ +// Copyright (c) 2022 Dominic Masters +// +// This software is released under the MIT License. +// https://opensource.org/licenses/MIT + +#include "asset/AssetLoader.hpp" +#include "util/mathutils.hpp" + +using namespace Dawn; + +AssetLoader::AssetLoader(std::string fileName) : IAssetLoader(fileName) { + this->handle = nullptr; +} + +void AssetLoader::open() { + assertNull(this->handle, "AssetLoader::open: File is already open?"); + + std::string pathFull = DAWN_ASSET_LOCATION + this->fileName; + this->handle = fopen(pathFull.c_str(), "rb"); + fseek(this->handle, 0, SEEK_END); + assertNotNull(this->handle, "AssetLoader::open: Failed to open file " + pathFull); + + this->size = ftell(this->handle); + assertTrue(this->size > 0, "AssetLoader::open: File size is 0?"); + + this->rewind(); +} + +int32_t AssetLoader::close() { + assertNotNull(this->handle, "AssetLoader::close: File is not open"); + int32_t ret = fclose(this->handle); + this->handle = nullptr; + return ret; +} + +size_t AssetLoader::read(uint8_t *buffer, size_t size) { + assertNotNull(buffer, "AssetLoader::read: buffer must not be null"); + assertTrue(size > 0, "AssetLoader::read: size must be greater than 0"); + assertNotNull(this->handle, "AssetLoader::read: File is not open"); + return fread(buffer, 1, size, this->handle); +} + +size_t AssetLoader::skip(size_t n) { + assertTrue(n > 0, "AssetLoader::skip: n must be greater than 0"); + assertNotNull(this->handle, "AssetLoader::skip: File is not open"); + return fseek(this->handle, n, SEEK_CUR); +} + +void AssetLoader::rewind() { + assertNotNull(this->handle, "AssetLoader::rewind: File is not open"); + fseek(this->handle, 0, SEEK_SET); +} + +size_t AssetLoader::getPosition() { + assertNotNull(this->handle, "AssetLoader::getPosition: File is not open"); + return ftell(this->handle); +} + +size_t AssetLoader::getSize() { + return this->size; +} + +AssetLoader::~AssetLoader() { + if(this->handle != nullptr) { + this->close(); + this->handle = nullptr; + } +} \ No newline at end of file diff --git a/src/dawnfileasset/asset/AssetLoader.hpp b/src/dawnfileasset/asset/AssetLoader.hpp new file mode 100644 index 00000000..ec10d5b7 --- /dev/null +++ b/src/dawnfileasset/asset/AssetLoader.hpp @@ -0,0 +1,26 @@ +// Copyright (c) 2023 Dominic Masters +// +// This software is released under the MIT License. +// https://opensource.org/licenses/MIT + +#pragma once +#include "asset/IAssetLoader.hpp" + +namespace Dawn { + class AssetLoader : public IAssetLoader { + private: + FILE *handle; + size_t size; + + public: + AssetLoader(std::string filename); + void open() override; + int32_t close() override; + size_t read(uint8_t *buffer, size_t size) override; + size_t getSize() override; + size_t skip(size_t n) override; + void rewind() override; + size_t getPosition() override; + ~AssetLoader(); + }; +} \ No newline at end of file diff --git a/src/dawnfileasset/asset/CMakeLists.txt b/src/dawnfileasset/asset/CMakeLists.txt new file mode 100644 index 00000000..bd9f3e44 --- /dev/null +++ b/src/dawnfileasset/asset/CMakeLists.txt @@ -0,0 +1,10 @@ +# Copyright (c) 2023 Dominic Msters +# +# This software is released under the MIT License. +# https://opensource.org/licenses/MIT + +# Sources +target_sources(${DAWN_TARGET_NAME} + PRIVATE + AssetLoader.cpp +) \ No newline at end of file diff --git a/src/dawnopengl/display/RenderManager.cpp b/src/dawnopengl/display/RenderManager.cpp index bd034c99..9d034beb 100644 --- a/src/dawnopengl/display/RenderManager.cpp +++ b/src/dawnopengl/display/RenderManager.cpp @@ -21,12 +21,11 @@ void RenderManager::init() { this->lockSimpleTextured = this->shaderManager.lockShader(); this->simpleTexturedShader = this->shaderManager.getShader(this->lockSimpleTextured); - this->lockUIShaderProgram = this->shaderManager.lockShader(); - this->uiShader = this->shaderManager.getShader(this->lockUIShaderProgram); - - this->lockFontShader = this->shaderManager.lockShader(); - this->fontShader = this->shaderManager.getShader(this->lockFontShader); + // this->lockUIShaderProgram = this->shaderManager.lockShader(); + // this->uiShader = this->shaderManager.getShader(this->lockUIShaderProgram); + // this->lockFontShader = this->shaderManager.lockShader(); + // this->fontShader = this->shaderManager.getShader(this->lockFontShader); this->renderPipeline.init(); assertNoGLError(); diff --git a/src/dawnopengl/display/shader/Shader.hpp b/src/dawnopengl/display/shader/Shader.hpp index c908980b..480249d0 100644 --- a/src/dawnopengl/display/shader/Shader.hpp +++ b/src/dawnopengl/display/shader/Shader.hpp @@ -64,7 +64,7 @@ namespace Dawn { */ shaderbufferlocation_t getBufferLocationByName(std::string name); - virtual void compile() = 0; + virtual void compile() override = 0; void bind() override; void setParameterBuffer(shaderbufferlocation_t location, shaderbufferslot_t slot); void setMatrix(shaderparameter_t parameter, glm::mat4 matrix) override; diff --git a/src/dawnopengl/display/shader/shaders/SimpleTexturedShader.cpp b/src/dawnopengl/display/shader/shaders/SimpleTexturedShader.cpp index f8c3f57d..99f8a799 100644 --- a/src/dawnopengl/display/shader/shaders/SimpleTexturedShader.cpp +++ b/src/dawnopengl/display/shader/shaders/SimpleTexturedShader.cpp @@ -15,7 +15,7 @@ void SimpleTexturedShader::compile() { { "aTexCoord", 1 } }, // Vertex Shader - "#version 330 core\n" + "#version 300 es\n" "layout (location = 0) in vec3 aPos;\n" "layout (location = 1) in vec2 aTexCoord;\n" + @@ -91,6 +91,5 @@ void SimpleTexturedShader::compile() { this->paramColor = this->getParameterByName("u_Color"); this->paramTexture = this->getParameterByName("u_Text"); this->paramHasTexture = this->getParameterByName("u_HasTexture"); - this->bufferRenderPipeline = this->getBufferLocationByName(RenderPipelineShaderBuffer::getShaderUniformName()); } \ No newline at end of file diff --git a/src/dawnwin32/CMakeLists.txt b/src/dawnwin32/CMakeLists.txt index 99252d61..cc6b3c21 100644 --- a/src/dawnwin32/CMakeLists.txt +++ b/src/dawnwin32/CMakeLists.txt @@ -16,4 +16,7 @@ target_compile_definitions(${DAWN_TARGET_NAME} ) # Subdirs -add_subdirectory(host) \ No newline at end of file +add_subdirectory(host) + +# Build suffix +set(CMAKE_EXECUTABLE_SUFFIX ".exe" CACHE INTERNAL ${DAWN_CACHE_TARGET}) \ No newline at end of file