summaryrefslogtreecommitdiff
path: root/src/resources/animation
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources/animation')
-rw-r--r--src/resources/animation/animation.cpp107
-rw-r--r--src/resources/animation/animation.h103
-rw-r--r--src/resources/animation/simpleanimation.cpp237
-rw-r--r--src/resources/animation/simpleanimation.h99
4 files changed, 0 insertions, 546 deletions
diff --git a/src/resources/animation/animation.cpp b/src/resources/animation/animation.cpp
deleted file mode 100644
index 3b9619009..000000000
--- a/src/resources/animation/animation.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 2004-2009 The Mana World Development Team
- * Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2017 The ManaPlus Developers
- *
- * This file is part of The ManaPlus Client.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "resources/animation/animation.h"
-
-#include "utils/foreach.h"
-
-#include "debug.h"
-
-Animation::Animation() noexcept2 :
- MemoryCounter(),
- mFrames(),
- mName("animation"),
- mDuration(0)
-{
-}
-
-Animation::Animation(const std::string &name) noexcept2 :
- MemoryCounter(),
- mFrames(),
- mName(name),
- mDuration(0)
-{
-}
-
-void Animation::addFrame(Image *const image, const int delay,
- const int offsetX, const int offsetY,
- const int rand) noexcept2
-{
- Frame frame
- = { image, delay, offsetX, offsetY, rand, FrameType::ANIMATION, "" };
- mFrames.push_back(frame);
- mDuration += delay;
-}
-
-void Animation::addTerminator(const int rand) noexcept2
-{
- addFrame(nullptr, 0, 0, 0, rand);
-}
-
-void Animation::addJump(const std::string &name, const int rand) noexcept2
-{
- const Frame frame = { nullptr, 0, 0, 0, rand, FrameType::JUMP, name };
- mFrames.push_back(frame);
-}
-
-void Animation::addLabel(const std::string &name) noexcept2
-{
- const Frame frame = { nullptr, 0, 0, 0, 100, FrameType::LABEL, name };
- mFrames.push_back(frame);
-}
-
-void Animation::addGoto(const std::string &name, const int rand) noexcept2
-{
- const Frame frame = { nullptr, 0, 0, 0, rand, FrameType::GOTO, name };
- mFrames.push_back(frame);
-}
-
-void Animation::addPause(const int delay, const int rand) noexcept2
-{
- const Frame frame = { nullptr, delay, 0, 0, rand, FrameType::PAUSE, "" };
- mFrames.push_back(frame);
-}
-
-void Animation::setLastFrameDelay(const int delay) noexcept2
-{
- for (FramesRevIter it = mFrames.rbegin(), it_end = mFrames.rend();
- it != it_end; ++ it)
- {
- if ((*it).type == FrameType::ANIMATION && ((*it).image != nullptr))
- {
- (*it).delay = delay;
- break;
- }
- }
-}
-
-int Animation::calcMemoryLocal() const
-{
- int sz = sizeof(Animation);
- FOR_EACH (FramesCIter, it, mFrames)
- {
- const Frame &frame = *it;
- sz += static_cast<int>(sizeof(Frame) +
- frame.nextAction.capacity());
- }
- return sz;
-}
diff --git a/src/resources/animation/animation.h b/src/resources/animation/animation.h
deleted file mode 100644
index a922f989b..000000000
--- a/src/resources/animation/animation.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 2004-2009 The Mana World Development Team
- * Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2017 The ManaPlus Developers
- *
- * This file is part of The ManaPlus Client.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef RESOURCES_ANIMATION_ANIMATION_H
-#define RESOURCES_ANIMATION_ANIMATION_H
-
-#include "resources/memorycounter.h"
-
-#include "utils/vector.h"
-
-#include "resources/frame.h"
-
-#include "localconsts.h"
-
-class Image;
-
-/**
- * An animation consists of several frames, each with their own delay and
- * offset.
- */
-class Animation final : public MemoryCounter
-{
- friend class AnimatedSprite;
- friend class ParticleEmitter;
- friend class SimpleAnimation;
-
- public:
- Animation() noexcept2;
-
- explicit Animation(const std::string &name) noexcept2;
-
- A_DEFAULT_COPY(Animation)
-
- /**
- * Appends a new animation at the end of the sequence.
- */
- void addFrame(Image *const image, const int delay,
- const int offsetX, const int offsetY,
- const int rand) noexcept2;
-
- /**
- * Appends an animation terminator that states that the animation
- * should not loop.
- */
- void addTerminator(const int rand) noexcept2;
-
- /**
- * Returns the length of this animation in frames.
- */
- size_t getLength() const noexcept2 A_WARN_UNUSED
- { return mFrames.size(); }
-
- void addJump(const std::string &name, const int rand) noexcept2;
-
- void addLabel(const std::string &name) noexcept2;
-
- void addGoto(const std::string &name, const int rand) noexcept2;
-
- void addPause(const int delay, const int rand) noexcept2;
-
- void setLastFrameDelay(const int delay) noexcept2;
-
- typedef STD_VECTOR<Frame> Frames;
- typedef Frames::iterator FramesIter;
- typedef Frames::const_iterator FramesCIter;
- typedef Frames::reverse_iterator FramesRevIter;
-
-#ifdef UNITTESTS
- Frames &getFrames() noexcept2
- { return mFrames; }
-#endif // UNITTESTS
-
- int calcMemoryLocal() const override final;
-
- std::string getCounterName() const override
- { return mName; }
-
- protected:
- Frames mFrames;
- std::string mName;
- int mDuration;
-};
-
-#endif // RESOURCES_ANIMATION_ANIMATION_H
diff --git a/src/resources/animation/simpleanimation.cpp b/src/resources/animation/simpleanimation.cpp
deleted file mode 100644
index 3ee18830d..000000000
--- a/src/resources/animation/simpleanimation.cpp
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 2004-2009 The Mana World Development Team
- * Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2017 The ManaPlus Developers
- *
- * This file is part of The ManaPlus Client.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "resources/animation/simpleanimation.h"
-
-#include "const/resources/map/map.h"
-
-#include "render/graphics.h"
-
-#include "resources/imageset.h"
-
-#include "resources/animation/animation.h"
-
-#include "resources/dye/dye.h"
-
-#include "resources/loaders/imagesetloader.h"
-
-#include "utils/checkutils.h"
-#include "utils/delete2.h"
-
-#include "debug.h"
-
-SimpleAnimation::SimpleAnimation(Animation *const animation) :
- mAnimation(animation),
- mAnimationTime(0),
- mAnimationPhase(0),
- mCurrentFrame(mAnimation != nullptr ? &mAnimation->mFrames[0] : nullptr),
- mInitialized(true),
- mImageSet(nullptr)
-{
-}
-
-SimpleAnimation::SimpleAnimation(XmlNodeConstPtr animationNode,
- const std::string& dyePalettes) :
- mAnimation(new Animation("simple animation")),
- mAnimationTime(0),
- mAnimationPhase(0),
- mCurrentFrame(nullptr),
- mInitialized(false),
- mImageSet(nullptr)
-{
- initializeAnimation(animationNode, dyePalettes);
- if (mAnimation != nullptr)
- mCurrentFrame = &mAnimation->mFrames[0];
- else
- mCurrentFrame = nullptr;
-}
-
-SimpleAnimation::~SimpleAnimation()
-{
- delete2(mAnimation);
- if (mImageSet != nullptr)
- {
- mImageSet->decRef();
- mImageSet = nullptr;
- }
-}
-
-void SimpleAnimation::draw(Graphics *const graphics,
- const int posX, const int posY) const
-{
- FUNC_BLOCK("SimpleAnimation::draw", 1)
- if ((mCurrentFrame == nullptr) || (mCurrentFrame->image == nullptr))
- return;
-
- graphics->drawImage(mCurrentFrame->image,
- posX + mCurrentFrame->offsetX,
- posY + mCurrentFrame->offsetY);
-}
-
-void SimpleAnimation::reset()
-{
- mAnimationTime = 0;
- mAnimationPhase = 0;
-}
-
-void SimpleAnimation::setFrame(int frame)
-{
- if (mAnimation == nullptr)
- return;
-
- if (frame < 0)
- frame = 0;
- const unsigned int len = CAST_U32(mAnimation->getLength());
- if (CAST_U32(frame) >= len)
- frame = len - 1;
- mAnimationPhase = frame;
- mCurrentFrame = &mAnimation->mFrames[frame];
-}
-
-bool SimpleAnimation::update(const int timePassed)
-{
- if ((mCurrentFrame == nullptr) || (mAnimation == nullptr) || !mInitialized)
- return false;
-
- bool updated(false);
- mAnimationTime += timePassed;
-
- while (mAnimationTime > mCurrentFrame->delay && mCurrentFrame->delay > 0)
- {
- updated = true;
- mAnimationTime -= mCurrentFrame->delay;
- mAnimationPhase++;
-
- if (CAST_SIZE(mAnimationPhase) >= mAnimation->getLength())
- mAnimationPhase = 0;
-
- mCurrentFrame = &mAnimation->mFrames[mAnimationPhase];
- }
- return updated;
-}
-
-int SimpleAnimation::getLength() const
-{
- if (mAnimation == nullptr)
- return 0;
-
- return CAST_S32(mAnimation->getLength());
-}
-
-Image *SimpleAnimation::getCurrentImage() const
-{
- if (mCurrentFrame != nullptr)
- return mCurrentFrame->image;
- return nullptr;
-}
-
-void SimpleAnimation::initializeAnimation(XmlNodeConstPtr animationNode,
- const std::string &dyePalettes)
-{
- mInitialized = false;
-
- if (animationNode == nullptr)
- return;
-
- std::string imagePath = XML::getProperty(
- animationNode, "imageset", "");
-
- // Instanciate the dye coloration.
- if (!imagePath.empty() && !dyePalettes.empty())
- Dye::instantiate(imagePath, dyePalettes);
-
- const ImageSet *const imageset = Loader::getImageSet(
- XML::getProperty(animationNode, "imageset", ""),
- XML::getProperty(animationNode, "width", 0),
- XML::getProperty(animationNode, "height", 0));
-
- if (imageset == nullptr)
- return;
-
- const int x1 = imageset->getWidth() / 2 - mapTileSize / 2;
- const int y1 = imageset->getHeight() - mapTileSize;
-
- // Get animation frames
- for_each_xml_child_node (frameNode, animationNode)
- {
- const int delay = XML::getIntProperty(
- frameNode, "delay", 0, 0, 100000);
- const int offsetX = XML::getProperty(frameNode, "offsetX", 0) - x1;
- const int offsetY = XML::getProperty(frameNode, "offsetY", 0) - y1;
- const int rand = XML::getIntProperty(frameNode, "rand", 100, 0, 100);
-
- if (xmlNameEqual(frameNode, "frame"))
- {
- const int index = XML::getProperty(frameNode, "index", -1);
-
- if (index < 0)
- {
- reportAlways("No valid value for 'index'");
- continue;
- }
-
- Image *const img = imageset->get(index);
-
- if (img == nullptr)
- {
- reportAlways("No image at index %d", index);
- continue;
- }
-
- if (mAnimation != nullptr)
- mAnimation->addFrame(img, delay, offsetX, offsetY, rand);
- }
- else if (xmlNameEqual(frameNode, "sequence"))
- {
- int start = XML::getProperty(frameNode, "start", -1);
- const int end = XML::getProperty(frameNode, "end", -1);
-
- if (start < 0 || end < 0)
- {
- reportAlways("No valid value for 'start' or 'end'");
- continue;
- }
-
- while (end >= start)
- {
- Image *const img = imageset->get(start);
-
- if (img == nullptr)
- {
- reportAlways("No image at index %d", start);
- continue;
- }
-
- if (mAnimation != nullptr)
- mAnimation->addFrame(img, delay, offsetX, offsetY, rand);
- start++;
- }
- }
- else if (xmlNameEqual(frameNode, "end"))
- {
- if (mAnimation != nullptr)
- mAnimation->addTerminator(rand);
- }
- }
-
- mInitialized = true;
-}
diff --git a/src/resources/animation/simpleanimation.h b/src/resources/animation/simpleanimation.h
deleted file mode 100644
index 2c068acff..000000000
--- a/src/resources/animation/simpleanimation.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 2004-2009 The Mana World Development Team
- * Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2017 The ManaPlus Developers
- *
- * This file is part of The ManaPlus Client.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef RESOURCES_ANIMATION_SIMPLEANIMATION_H
-#define RESOURCES_ANIMATION_SIMPLEANIMATION_H
-
-#include "utils/xml.h"
-
-#include "localconsts.h"
-
-class Animation;
-class Graphics;
-class Image;
-class ImageSet;
-
-struct Frame;
-
-/**
- * This class is a leightweight alternative to the AnimatedSprite class.
- * It hosts a looping animation without actions and directions.
- */
-class SimpleAnimation final
-{
- public:
- /**
- * Creates a simple animation with an already created \a animation.
- * Takes ownership over the given animation.
- */
- explicit SimpleAnimation(Animation *const animation);
-
- /**
- * Creates a simple animation that creates its animation from XML Data.
- */
- SimpleAnimation(XmlNodeConstPtr animationNode,
- const std::string& dyePalettes);
-
- A_DELETE_COPY(SimpleAnimation)
-
- ~SimpleAnimation();
-
- void setFrame(int frame);
-
- int getLength() const A_WARN_UNUSED;
-
- bool update(const int timePassed);
-
- void draw(Graphics *const graphics,
- const int posX, const int posY) const A_NONNULL(2);
-
- /**
- * Resets the animation.
- */
- void reset();
-
- Image *getCurrentImage() const A_WARN_UNUSED;
-
- private:
- void initializeAnimation(XmlNodeConstPtr animationNode,
- const std::string&
- dyePalettes = std::string());
-
- /** The hosted animation. */
- Animation *mAnimation;
-
- /** Time in game ticks the current frame is shown. */
- int mAnimationTime;
-
- /** Index of current animation phase. */
- int mAnimationPhase;
-
- /** Current animation phase. */
- const Frame *mCurrentFrame;
-
- /** Tell whether the animation is ready */
- bool mInitialized;
-
- ImageSet *mImageSet;
-};
-
-#endif // RESOURCES_ANIMATION_SIMPLEANIMATION_H
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-27 19:38:51 +0000