PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

xml 2d, 3d, 4d vectors shortcuts

Browse Source
This commit is contained in:
MihailRis 2024-03-20 10:09:29 +03:00
parent b3ca4b8efc
commit a0d3fd9afd
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/coders/xml.cpp
View File

@ -36,7 +36,7 @@ bool Attribute::asBool() const {
glm::vec2 Attribute::asVec2() const {
size_t pos = text.find(',');
if (pos == std::string::npos) {
throw std::runtime_error("invalid vec2 value "+escape_string(text));
return glm::vec2(util::parse_double(text, 0, text.length()));
}
return glm::vec2(
util::parse_double(text, 0, pos),
@ -48,7 +48,7 @@ glm::vec2 Attribute::asVec2() const {
glm::vec3 Attribute::asVec3() const {
size_t pos1 = text.find(',');
if (pos1 == std::string::npos) {
throw std::runtime_error("invalid vec3 value "+escape_string(text));
return glm::vec3(util::parse_double(text, 0, text.length()));
}
size_t pos2 = text.find(',', pos1+1);
if (pos2 == std::string::npos) {
@ -65,7 +65,7 @@ glm::vec3 Attribute::asVec3() const {
glm::vec4 Attribute::asVec4() const {
size_t pos1 = text.find(',');
if (pos1 == std::string::npos) {
throw std::runtime_error("invalid vec4 value "+escape_string(text));
return glm::vec4(util::parse_double(text, 0, text.length()));
}
size_t pos2 = text.find(',', pos1+1);
if (pos2 == std::string::npos) {
@ -99,7 +99,7 @@ glm::vec4 Attribute::asColor() const {
}
return glm::vec4(r / 255.f, g / 255.f, b / 255.f, a / 255.f);
} else {
throw std::runtime_error("hex colors are only supported");
return asVec4() / 255.f;
}
}

2
src/graphics/ui/gui_util.cpp
View File

@ -27,7 +27,7 @@ std::shared_ptr<Button> guiutil::gotoButton(
) {
text = langs::get(text, L"menu");
return std::dynamic_pointer_cast<Button>(create(
"<button onclick='menu.page=\""+page+"\"' padding='10,10,10,10'>"+
"<button onclick='menu.page=\""+page+"\"' padding='10'>"+
util::wstr2str_utf8(text)+
"</button>"
));