ilusha/Modules
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

RIP tp::Strings

Browse source
This commit is contained in:
IlyaShurupov 2024-03-22 14:44:26 +03:00 • committed by Ilya Shurupov
parent fa2d0aaa92
commit 1756ca026d
90 changed files with 419 additions and 1475 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Widgets/CMakeLists.txt
View file

@ -6,7 +6,7 @@ file(GLOB HEADERS "./public/*.hpp")
add_library(${PROJECT_NAME} STATIC ${SOURCES} ${HEADERS})
target_include_directories(${PROJECT_NAME} PUBLIC ./public/)
target_link_libraries(${PROJECT_NAME} PUBLIC Math Graphics Imgui Strings)
target_link_libraries(${PROJECT_NAME} PUBLIC Math Graphics Imgui)
### -------------------------- Tests -------------------------- ###
enable_testing()

12
Widgets/examples/ExampleGUI.hpp
View file

@ -35,11 +35,11 @@ namespace tp {
const auto size = this->getValue("Size");
const auto colUser = this->getColor("ColUser");
canvas.text(mUser.read(), this->mArea, size, Canvas::CC, padding, colUser);
canvas.text(mUser.c_str(), this->mArea, size, Canvas::CC, padding, colUser);
}
public:
String mUser = "UserName";
std::string mUser = "UserName";
bool mIsHover = false;
};
@ -83,13 +83,13 @@ namespace tp {
content.y = userName.y + userName.w;
content.w = this->mArea.w - userName.w;
canvas.text(mContent.read(), content, size, Canvas::LC, padding, col);
canvas.text(mUser.read(), userName, sizeUser, Canvas::LC, padding, colUser);
canvas.text(mContent.c_str(), content, size, Canvas::LC, padding, col);
canvas.text(mUser.c_str(), userName, sizeUser, Canvas::LC, padding, colUser);
}
public:
String mContent = "Message Content";
String mUser = "UserName";
std::string mContent = "Message Content";
std::string mUser = "UserName";
bool mIsHover = false;
};

2
Widgets/public/ButtonWidget.hpp
View file

@ -16,7 +16,7 @@ namespace tp {
this->addValue("Rounding", "Rounding");
}
ButtonWidget(const String& label, const tp::RectF& aArea) {
ButtonWidget(const std::string& label, const tp::RectF& aArea) {
this->mArea = aArea;
this->mLabel.mLabel = label;

4
Widgets/public/LabelWidget.hpp
View file

@ -23,7 +23,7 @@ namespace tp {
if (!this->mVisible) return;
canvas.text(
mLabel.read(),
mLabel.c_str(),
this->mArea,
this->getValue("Size"),
Canvas::CC,
@ -33,6 +33,6 @@ namespace tp {
}
public:
String mLabel = "Label";
std::string mLabel = "Label";
};
}

1
Widgets/public/ScrollableWidget.hpp
View file

@ -1,6 +1,7 @@
#pragma once
#include "WidgetBase.hpp"
#include "Buffer.hpp"
namespace tp {

8
Widgets/public/TextInputWidget.hpp
View file

@ -43,7 +43,7 @@ namespace tp {
// ImGui::PushID((int) alni(this));
ImGui::Begin(
mId.read(),
mId.c_str(),
0,
ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoBackground |
ImGuiWindowFlags_NoResize
@ -55,7 +55,7 @@ namespace tp {
nChanged = true;
}
} else {
if (ImGui::InputTextEx("input", mId.read(), mBuff, mMaxBufferSize, { this->mArea.z, this->mArea.w }, 0)) {
if (ImGui::InputTextEx("input", mId.c_str(), mBuff, mMaxBufferSize, { this->mArea.z, this->mArea.w }, 0)) {
mValue = mBuff;
nChanged = true;
}
@ -68,8 +68,8 @@ namespace tp {
enum { mMaxBufferSize = 512 };
char mBuff[mMaxBufferSize] = "";
bool nChanged = false;
String mValue;
String mId = "id";
std::string mValue;
std::string mId = "id";
bool mMultiline = false;
};
}

14
Widgets/public/WidgetBase.hpp
View file

@ -11,7 +11,7 @@ namespace tp {
this->mArea = { 0, 0, 100, 100 };
}
[[nodiscard]] const RGBA& getColor(const String& name) const {
[[nodiscard]] const RGBA& getColor(const std::string& name) const {
const auto& node = cfg->values.get(name);
if (node.type == WidgetConfig::Node::REF) {
return globalCfg->configs.get(node.refGroup).values.get(node.refName).color;
@ -19,7 +19,7 @@ namespace tp {
return cfg->values.get(name).color;
}
[[nodiscard]] halnf getValue(const String& name) const {
[[nodiscard]] halnf getValue(const std::string& name) const {
const auto& node = cfg->values.get(name);
if (node.type == WidgetConfig::Node::REF) {
return globalCfg->configs.get(node.refGroup).values.get(node.refName).value;
@ -27,17 +27,17 @@ namespace tp {
return cfg->values.get(name).value;
}
void addColor(const String& name, const RGBA& val) { cfg->values.put(name, WidgetConfig::Node(val)); }
void addValue(const String& name, halnf val) { cfg->values.put(name, WidgetConfig::Node(val)); }
void addColor(const std::string& name, const RGBA& val) { cfg->values.put(name, WidgetConfig::Node(val)); }
void addValue(const std::string& name, halnf val) { cfg->values.put(name, WidgetConfig::Node(val)); }
void addColor(const String& name, const String& presetName) {
void addColor(const std::string& name, const std::string& presetName) {
cfg->values.put(name, WidgetConfig::Node(presetName));
}
void addValue(const String& name, const String& presetName) {
void addValue(const std::string& name, const std::string& presetName) {
cfg->values.put(name, WidgetConfig::Node(presetName));
}
void createConfig(const String& name) {
void createConfig(const std::string& name) {
globalCfg->configs.put(name, {});
cfg = &globalCfg->configs.get(name);
}

25
Widgets/public/WidgetConfig.hpp
View file

@ -3,7 +3,6 @@
#include "Animations.hpp"
#include "Map.hpp"
#include "Rect.hpp"
#include "Strings.hpp"
#include "InputCodes.hpp"
@ -18,8 +17,8 @@ namespace tp {
Type type = NONE;
String refGroup;
String refName;
std::string refGroup;
std::string refName;
Node() = default;
@ -33,14 +32,14 @@ namespace tp {
color = val;
}
explicit Node(const String& val) {
explicit Node(const std::string& val) {
refGroup = "Presets";
refName = val;
type = REF;
}
};
Map<String, Node> values;
Map<std::string, Node> values;
};
struct GlobalGUIConfig {
@ -54,16 +53,16 @@ namespace tp {
presets.values.put("Padding", WidgetConfig::Node(5.f));
presets.values.put("HandleSize", WidgetConfig::Node(5.f));
presets.values.put("Background", WidgetConfig::Node({ 0.03f, 0.03f, 0.03f, 1.f }));
presets.values.put("Base", WidgetConfig::Node({ 0.07f, 0.07f, 0.07f, 1.f }));
presets.values.put("Accent", WidgetConfig::Node({ 0.13f, 0.13f, 0.13f, 1.f }));
presets.values.put("Interaction", WidgetConfig::Node({ 0.33f, 0.33f, 0.3f, 1.f }));
presets.values.put("Action", WidgetConfig::Node({ 0.44f, 0.44f, 0.4f, 1.f }));
presets.values.put("Front", WidgetConfig::Node({ 1.f, 1.f, 1.f, 1.f }));
presets.values.put("FrontDim", WidgetConfig::Node({ 0.7f, 0.7f, 0.7f, 1.f }));
presets.values.put("Background", WidgetConfig::Node(RGBA{ 0.03f, 0.03f, 0.03f, 1.f }));
presets.values.put("Base", WidgetConfig::Node(RGBA{ 0.07f, 0.07f, 0.07f, 1.f }));
presets.values.put("Accent", WidgetConfig::Node(RGBA{ 0.13f, 0.13f, 0.13f, 1.f }));
presets.values.put("Interaction", WidgetConfig::Node(RGBA{ 0.33f, 0.33f, 0.3f, 1.f }));
presets.values.put("Action", WidgetConfig::Node(RGBA{ 0.44f, 0.44f, 0.4f, 1.f }));
presets.values.put("Front", WidgetConfig::Node(RGBA{ 1.f, 1.f, 1.f, 1.f }));
presets.values.put("FrontDim", WidgetConfig::Node(RGBA{ 0.7f, 0.7f, 0.7f, 1.f }));
}
Map<String, WidgetConfig> configs;
Map<std::string, WidgetConfig> configs;
~GlobalGUIConfig() {
configs.removeAll();