Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
with
200 additions
and 4 deletions.
- +1 −0 build/android/jni/Android.mk
- +11 −0 doc/lua_api.txt
- +16 −4 games/minimal/mods/test/formspec.lua
- BIN games/minimal/mods/test/textures/test_animation.jpg
- BIN games/minimal/mods/test/textures/test_animation.png
- +1 −0 src/gui/CMakeLists.txt
- +83 −0 src/gui/guiAnimatedImage.cpp
- +26 −0 src/gui/guiAnimatedImage.h
- +58 −0 src/gui/guiFormSpecMenu.cpp
- +2 −0 src/gui/guiFormSpecMenu.h
- +2 −0 util/travis/clang-format-whitelist.txt
Binary file not shown.
Binary file not shown.
| @@ -0,0 +1,83 @@ | ||
| #include "guiAnimatedImage.h" | ||
|
|
||
| #include "client/guiscalingfilter.h" | ||
| #include "client/tile.h" // ITextureSource | ||
| #include "log.h" | ||
| #include "porting.h" | ||
| #include <string> | ||
|
|
||
| GUIAnimatedImage::GUIAnimatedImage(gui::IGUIEnvironment *env, gui::IGUIElement *parent, | ||
| s32 id, const core::rect<s32> &rectangle, const std::string &name, | ||
| ISimpleTextureSource *tsrc) : | ||
| gui::IGUIElement(gui::EGUIET_ELEMENT, env, parent, id, rectangle), | ||
| m_name(name), m_tsrc(tsrc), m_texture(nullptr), m_global_time(0), | ||
| m_frame_idx(0), m_frame_count(1), m_frame_duration(1), m_frame_time(0) | ||
| { | ||
| // Expected format: "texture_name:frame_count,frame_duration" | ||
| // If this format is not met, the string will be loaded as a normal texture | ||
|
|
||
| std::string::size_type colon_position = name.find(':', 0); | ||
| std::string::size_type comma_position = name.find(',', 0); | ||
|
|
||
| if (comma_position != std::string::npos && | ||
| colon_position != std::string::npos && | ||
| comma_position < name.size()) { | ||
| m_texture = m_tsrc->getTexture(name.substr(0, colon_position)); | ||
|
|
||
| m_frame_count = std::max(stoi(name.substr( | ||
| colon_position + 1, comma_position - colon_position - 1)), 1); | ||
|
|
||
| m_frame_duration = std::max(stoi(name.substr(comma_position + 1)), 1); | ||
| } else { | ||
| // Leave the count/duration and display a static image | ||
| m_texture = m_tsrc->getTexture(name); | ||
| errorstream << "animated_image[]: Invalid texture format " << name << | ||
| ". Expected format: texture_name:frame_count,frame_duration" << std::endl; | ||
| } | ||
|
|
||
| if (m_texture != nullptr) { | ||
| core::dimension2d<u32> size = m_texture->getOriginalSize(); | ||
| if (size.Height < (u64)m_frame_count) { | ||
| m_frame_count = size.Height; | ||
| } | ||
| } else { | ||
| // No need to step an animation if we have nothing to draw | ||
| m_frame_count = 1; | ||
| } | ||
| } | ||
|
|
||
| void GUIAnimatedImage::draw() | ||
| { | ||
| // Render the current frame | ||
| if (m_texture != nullptr) { | ||
| video::IVideoDriver *driver = Environment->getVideoDriver(); | ||
|
|
||
| const video::SColor color(255, 255, 255, 255); | ||
| const video::SColor colors[] = {color, color, color, color}; | ||
|
|
||
| core::dimension2d<u32> size = m_texture->getOriginalSize(); | ||
| size.Height /= m_frame_count; | ||
|
|
||
| draw2DImageFilterScaled( driver, m_texture, AbsoluteRect, | ||
| core::rect<s32>(core::position2d<s32>(0, size.Height * m_frame_idx), size), | ||
| NoClip ? nullptr : &AbsoluteClippingRect, colors, true); | ||
| } | ||
|
|
||
| // Step the animation | ||
| if (m_frame_count > 1) { | ||
| // Determine the delta time to step | ||
| u64 new_global_time = porting::getTimeMs(); | ||
| if (m_global_time > 0) | ||
| m_frame_time += new_global_time - m_global_time; | ||
|
|
||
| m_global_time = new_global_time; | ||
|
|
||
| // Advance by the number of elapsed frames, looping if necessary | ||
| m_frame_idx += u32(m_frame_time / m_frame_duration); | ||
| m_frame_idx %= m_frame_count; | ||
|
|
||
| // If 1 or more frames have elapsed, reset the frame time counter with | ||
| // the remainder | ||
| m_frame_time %= m_frame_duration; | ||
| } | ||
| } |
| @@ -0,0 +1,26 @@ | ||
| #pragma once | ||
|
|
||
| #include "irrlichttypes_extrabloated.h" | ||
| #include "util/string.h" | ||
|
|
||
| class ISimpleTextureSource; | ||
|
|
||
| class GUIAnimatedImage : public gui::IGUIElement { | ||
| public: | ||
| GUIAnimatedImage(gui::IGUIEnvironment *env, gui::IGUIElement *parent, s32 id, | ||
| const core::rect<s32> &rectangle, const std::string &name, | ||
| ISimpleTextureSource *tsrc); | ||
|
|
||
| virtual void draw() override; | ||
|
|
||
| private: | ||
| std::string m_name; | ||
| ISimpleTextureSource *m_tsrc; | ||
|
|
||
| video::ITexture *m_texture; | ||
| u64 m_global_time; | ||
| s32 m_frame_idx; | ||
| s32 m_frame_count; | ||
| u64 m_frame_duration; | ||
| u64 m_frame_time; | ||
| }; |