summaryrefslogtreecommitdiff
path: root/src/gui/guiFormSpecMenu.cpp
diff options
context:
space:
mode:
authorHugues Ross <hugues.ross@gmail.com>2020-02-15 10:33:18 -0500
committerGitHub <noreply@github.com>2020-02-15 15:33:18 +0000
commit7ce21788f86d489d6dc08d9b2d3f6e3f8495b64e (patch)
treeb3388dad101a3b6b4edee239a21bdc662071faca /src/gui/guiFormSpecMenu.cpp
parentee7d35760242824fd6b00a6ab1d9a2e6e5873d2c (diff)
downloadminetest-7ce21788f86d489d6dc08d9b2d3f6e3f8495b64e.tar.gz
minetest-7ce21788f86d489d6dc08d9b2d3f6e3f8495b64e.tar.bz2
minetest-7ce21788f86d489d6dc08d9b2d3f6e3f8495b64e.zip
Add animated_image[] formspec element (#9258)
Diffstat (limited to 'src/gui/guiFormSpecMenu.cpp')
-rw-r--r--src/gui/guiFormSpecMenu.cpp58
1 files changed, 58 insertions, 0 deletions
diff --git a/src/gui/guiFormSpecMenu.cpp b/src/gui/guiFormSpecMenu.cpp
index 98f4368f4..3d473550c 100644
--- a/src/gui/guiFormSpecMenu.cpp
+++ b/src/gui/guiFormSpecMenu.cpp
@@ -55,6 +55,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "util/string.h" // for parseColorString()
#include "irrlicht_changes/static_text.h"
#include "client/guiscalingfilter.h"
+#include "guiAnimatedImage.h"
#include "guiBackgroundImage.h"
#include "guiBox.h"
#include "guiButton.h"
@@ -779,6 +780,58 @@ void GUIFormSpecMenu::parseImage(parserData* data, const std::string &element)
errorstream<< "Invalid image element(" << parts.size() << "): '" << element << "'" << std::endl;
}
+void GUIFormSpecMenu::parseAnimatedImage(parserData *data, const std::string &element)
+{
+ std::vector<std::string> parts = split(element, ';');
+
+ if (parts.size() != 3 &&
+ !(parts.size() > 3 && m_formspec_version > FORMSPEC_API_VERSION)) {
+ errorstream << "Invalid animated image element(" << parts.size()
+ << "): '" << element << "'" << std::endl;
+ return;
+ }
+
+ std::vector<std::string> v_pos = split(parts[0], ',');
+ std::vector<std::string> v_geom = split(parts[1], ',');
+ std::string name = unescape_string(parts[2]);
+
+ MY_CHECKPOS("animated_image", 0);
+ MY_CHECKGEOM("animated_image", 1);
+
+ v2s32 pos;
+ v2s32 geom;
+
+ if (data->real_coordinates) {
+ pos = getRealCoordinateBasePos(v_pos);
+ geom = getRealCoordinateGeometry(v_geom);
+ } else {
+ pos = getElementBasePos(&v_pos);
+ geom.X = stof(v_geom[0]) * (float)imgsize.X;
+ geom.Y = stof(v_geom[1]) * (float)imgsize.Y;
+ }
+
+ if (!data->explicit_size)
+ warningstream << "invalid use of animated_image without a size[] element" << std::endl;
+
+ FieldSpec spec(
+ "",
+ L"",
+ L"",
+ 258 + m_fields.size()
+ );
+
+ core::rect<s32> rect = core::rect<s32>(pos, pos + geom);
+
+ gui::IGUIElement *e = new GUIAnimatedImage(Environment, this, spec.fid,
+ rect, name, m_tsrc);
+
+ auto style = getStyleForElement("animated_image", spec.fname);
+ e->setNotClipped(style.getBool(StyleSpec::NOCLIP, false));
+ e->drop();
+
+ m_fields.push_back(spec);
+}
+
void GUIFormSpecMenu::parseItemImage(parserData* data, const std::string &element)
{
std::vector<std::string> parts = split(element,';');
@@ -2500,6 +2553,11 @@ void GUIFormSpecMenu::parseElement(parserData* data, const std::string &element)
return;
}
+ if (type == "animated_image") {
+ parseAnimatedImage(data, description);
+ return;
+ }
+
if (type == "item_image") {
parseItemImage(data, description);
return;