diff --git a/assets/games/liminal/prefabs/Button.xml b/assets/games/liminal/prefabs/Button.xml new file mode 100644 index 00000000..0fdac231 --- /dev/null +++ b/assets/games/liminal/prefabs/Button.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/assets/games/liminal/prefabs/CMakeLists.txt b/assets/games/liminal/prefabs/CMakeLists.txt index f1805405..a316a27b 100644 --- a/assets/games/liminal/prefabs/CMakeLists.txt +++ b/assets/games/liminal/prefabs/CMakeLists.txt @@ -4,6 +4,7 @@ # https://opensource.org/licenses/MIT tool_prefab(${CMAKE_CURRENT_LIST_DIR}/AvePrefab.xml) +tool_prefab(${CMAKE_CURRENT_LIST_DIR}/Button.xml) tool_prefab(${CMAKE_CURRENT_LIST_DIR}/EthPrefab.xml) tool_prefab(${CMAKE_CURRENT_LIST_DIR}/CraigPrefab.xml) tool_prefab(${CMAKE_CURRENT_LIST_DIR}/RoninPrefab.xml) diff --git a/src/dawn/scene/components/ui/text/CMakeLists.txt b/src/dawn/scene/components/ui/text/CMakeLists.txt index 45c2a0b5..b9e65598 100644 --- a/src/dawn/scene/components/ui/text/CMakeLists.txt +++ b/src/dawn/scene/components/ui/text/CMakeLists.txt @@ -8,4 +8,5 @@ target_sources(${DAWN_TARGET_NAME} PRIVATE UILabel.cpp UIRichTextLabel.cpp + UISimpleLabel.cpp ) \ No newline at end of file diff --git a/src/dawn/scene/components/ui/text/UISimpleLabel.cpp b/src/dawn/scene/components/ui/text/UISimpleLabel.cpp new file mode 100644 index 00000000..ac86ee76 --- /dev/null +++ b/src/dawn/scene/components/ui/text/UISimpleLabel.cpp @@ -0,0 +1,49 @@ +// Copyright (c) 2023 Dominic Masters +// +// This software is released under the MIT License. +// https://opensource.org/licenses/MIT + +#include "UISimpleLabel.hpp" + +using namespace Dawn; + +UISimpleLabel::UISimpleLabel(SceneItem *i) : + UILabel(i), + text("Hello World"), + font(nullptr), + size(12), + style(0), + decorations(0), + color(COLOR_WHITE) +{ +} + +void UISimpleLabel::onStart() { + UILabel::onStart(); + + useEffect([&] { + if(this->font == nullptr) { + this->rebufferQuads({ }); + return; + } + + struct UILabelText text; + struct UILabelStyle style; + style.font = this->font; + style.size = this->size; + style.style = this->style; + style.decorations = this->decorations; + style.color = this->color; + + text.style = style; + text.text = this->text; + this->rebufferQuads({ text }); + }, { + &this->text, + &this->font, + &this->size, + &this->style, + &this->decorations, + &this->color + })(); +} \ No newline at end of file diff --git a/src/dawn/scene/components/ui/text/UISimpleLabel.hpp b/src/dawn/scene/components/ui/text/UISimpleLabel.hpp new file mode 100644 index 00000000..e7ea18c6 --- /dev/null +++ b/src/dawn/scene/components/ui/text/UISimpleLabel.hpp @@ -0,0 +1,29 @@ +// Copyright (c) 2023 Dominic Masters +// +// This software is released under the MIT License. +// https://opensource.org/licenses/MIT + +#pragma once +#include "UILabel.hpp" + +namespace Dawn { + class UISimpleLabel : public UILabel { + public: + // @optional + StateProperty text; + // @optional + StateProperty font; + // @optional + StateProperty size; + // @optional + StateProperty style; + // @optional + StateProperty decorations; + // @optional + StateProperty color; + + UISimpleLabel(SceneItem *item); + + void onStart() override; + }; +} \ No newline at end of file diff --git a/src/dawnshared/util/parser/TypeParsers.hpp b/src/dawnshared/util/parser/TypeParsers.hpp index b464b678..2d020875 100644 --- a/src/dawnshared/util/parser/TypeParsers.hpp +++ b/src/dawnshared/util/parser/TypeParsers.hpp @@ -142,7 +142,7 @@ namespace Dawn { parser = vec3Parser; } else if(type.find("vec4") != std::string::npos) { parser = vec4Parser; - } else if(type == "int32_t" || type == "int") { + } else if(type == "int32_t" || type == "int" || type == "uint32_t" || type == "uint") { parser = intParser; } else if(type == "bool_t") { parser = boolParser; diff --git a/src/dawntools/CMakeLists.txt b/src/dawntools/CMakeLists.txt index 106d19e3..60242593 100644 --- a/src/dawntools/CMakeLists.txt +++ b/src/dawntools/CMakeLists.txt @@ -23,6 +23,7 @@ include(util/generator/CMakeLists.txt) # Tools add_subdirectory(prefabtool) +add_subdirectory(propertytool) add_subdirectory(scenetool) add_subdirectory(texturetool) add_subdirectory(truetypetool) diff --git a/src/dawntools/util/File.cpp b/src/dawntools/util/File.cpp index 3bd4f70b..462d31ef 100644 --- a/src/dawntools/util/File.cpp +++ b/src/dawntools/util/File.cpp @@ -226,6 +226,39 @@ void File::setPosition(size_t n) { fseek(this->file, n, SEEK_CUR); } +std::string File::getFileName(bool_t withExt) { + // Remove all but last slash + std::string basename; + size_t lastSlash = this->filename.find_last_of('/'); + if(lastSlash == std::string::npos) { + basename = this->filename; + } else { + basename = this->filename.substr(lastSlash + 1); + } + + // Do we need to remove ext? + if(withExt) return basename; + size_t lastDot = basename.find_last_of('.'); + if(lastDot == std::string::npos) return basename; + return basename.substr(0, lastDot); +} + +std::string File::getExtension() { + // Remove all but last slash + std::string basename; + size_t lastSlash = this->filename.find_last_of('/'); + if(lastSlash == std::string::npos) { + basename = this->filename; + } else { + basename = this->filename.substr(lastSlash + 1); + } + + size_t lastDot = basename.find_last_of('.'); + if(lastDot == std::string::npos) return ""; + return basename.substr(lastDot + 1); +} + + File::~File() { if(this->file != nullptr) this->close(); } \ No newline at end of file diff --git a/src/dawntools/util/File.hpp b/src/dawntools/util/File.hpp index 7e63b9ca..9fd76671 100644 --- a/src/dawntools/util/File.hpp +++ b/src/dawntools/util/File.hpp @@ -160,6 +160,21 @@ namespace Dawn { */ void setPosition(size_t pos); + /** + * Get the file name of this file, optionally with the extension. + * + * @param withExtension If true, the extension will be included. + * @return The file name. + */ + std::string getFileName(bool_t withExtension = true); + + /** + * Returns the extension of this file. + * + * @return The extension of this file. + */ + std::string getExtension(); + /** * Destruct the File manager. */ diff --git a/src/dawntools/util/generator/SceneAssetGenerator.cpp b/src/dawntools/util/generator/SceneAssetGenerator.cpp index 4923338d..2c56ff61 100644 --- a/src/dawntools/util/generator/SceneAssetGenerator.cpp +++ b/src/dawntools/util/generator/SceneAssetGenerator.cpp @@ -34,8 +34,8 @@ void SceneAssetGenerator::generate( case SCENE_ASSET_TYPE_TRUETYPE_FONT: assetType = "TrueTypeAsset"; - assetMap[asset->fileName] = "&" + asset->usageName + "->font"; - assetMap[asset->usageName] = "&" + asset->usageName + "->font"; + assetMap[asset->fileName] = asset->usageName; + assetMap[asset->usageName] = asset->usageName; break; default: diff --git a/src/dawntools/util/parser/CMakeLists.txt b/src/dawntools/util/parser/CMakeLists.txt index 584fb9a9..24956fc5 100644 --- a/src/dawntools/util/parser/CMakeLists.txt +++ b/src/dawntools/util/parser/CMakeLists.txt @@ -14,6 +14,7 @@ set( ${D}/SceneCodeParser.cpp ${D}/SceneItemComponentParser.cpp ${D}/SceneItemComponentRegistry.cpp + ${D}/ScenePropertyParser.cpp CACHE INTERNAL ${DAWN_CACHE_TARGET}