From a683a420a9e43705c972b5e74d55e319729e1a81 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Thu, 29 Jul 2010 19:53:02 +0000 Subject: SWORD25: Importing original sources svn-id: r53171 --- engines/sword25/gfx/animation.h | 209 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 209 insertions(+) create mode 100755 engines/sword25/gfx/animation.h (limited to 'engines/sword25/gfx/animation.h') diff --git a/engines/sword25/gfx/animation.h b/engines/sword25/gfx/animation.h new file mode 100755 index 0000000000..37380f27a9 --- /dev/null +++ b/engines/sword25/gfx/animation.h @@ -0,0 +1,209 @@ +// ----------------------------------------------------------------------------- +// This file is part of Broken Sword 2.5 +// Copyright (c) Malte Thiesen, Daniel Queteschiner and Michael Elsdörfer +// +// Broken Sword 2.5 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 +// (at your option) any later version. +// +// Broken Sword 2.5 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 Broken Sword 2.5; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// ----------------------------------------------------------------------------- + +#ifndef BS_ANIMATION_H +#define BS_ANIMATION_H + +// Includes +#include "kernel/common.h" +#include "timedrenderobject.h" + +#include "kernel/memlog_off.h" +#include +#include "kernel/memlog_on.h" + +// Forward declarations +class BS_Kernel; +class BS_PackageManager; +class BS_AnimationResource; +class BS_AnimationTemplate; +class BS_AnimationDescription; +class BS_InputPersistenceBlock; + +class BS_Animation : public BS_TimedRenderObject +{ +friend BS_RenderObject; + +private: + BS_Animation(BS_RenderObjectPtr ParentPtr, const std::string & FileName); + BS_Animation(BS_RenderObjectPtr ParentPtr, const BS_AnimationTemplate & Template); + BS_Animation(BS_InputPersistenceBlock & Reader, BS_RenderObjectPtr ParentPtr, unsigned int Handle); + +public: + enum ANIMATION_TYPES + { + AT_ONESHOT, + AT_LOOP, + AT_JOJO, + }; + + virtual ~BS_Animation(); + + void Play(); + void Pause(); + void Stop(); + void SetFrame(unsigned int Nr); + + virtual void SetPos(int X, int Y); + virtual void SetX(int X); + virtual void SetY(int Y); + + virtual int GetX() const; + virtual int GetY() const; + virtual int GetAbsoluteX() const; + virtual int GetAbsoluteY() const; + + /** + @brief Setzt den Alphawert der Animation. + @param Alpha der neue Alphawert der Animation (0 = keine Deckung, 255 = volle Deckung). + @remark Diese Methode darf nur aufgerufen werden, wenn die Methode IsAlphaAllowed() true zurückgibt. + */ + void SetAlpha(int Alpha); + + /** + @brief Setzt die Modulationfarbe der Animation. + @param Color eine 24-Bit Farbe, die die Modulationsfarbe der Animation festlegt. + @remark Diese Methode darf nur aufgerufen werden, wenn die Methode IsColorModulationAllowed() true zurückgibt. + */ + void SetModulationColor(unsigned int ModulationColor); + + /** + @brief Setzt den Skalierungsfaktor der Animation. + @param ScaleFactor der Faktor um den die Animation in beide Richtungen gestreckt werden soll. + @remark Diese Methode darf nur aufgerufen werden, wenn die Methode IsScalingAllowed() true zurückgibt. + */ + void SetScaleFactor(float ScaleFactor); + + /** + @brief Setzt den Skalierungsfaktor der Animation auf der X-Achse. + @param ScaleFactor der Faktor um den die Animation in Richtungen der X-Achse gestreckt werden soll. + @remark Diese Methode darf nur aufgerufen werden, wenn die Methode IsScalingAllowed() true zurückgibt. + */ + void SetScaleFactorX(float ScaleFactorX); + + /** + @brief Setzt den Skalierungsfaktor der Animation auf der Y-Achse. + @param ScaleFactor der Faktor um den die Animation in Richtungen der Y-Achse gestreckt werden soll. + @remark Diese Methode darf nur aufgerufen werden, wenn die Methode IsScalingAllowed() true zurückgibt. + */ + void SetScaleFactorY(float ScaleFactorY); + + /** + @brief Gibt den Skalierungsfakter der Animation auf der X-Achse zurück. + @remark Diese Methode darf nur aufgerufen werden, wenn die Methode IsScalingAllowed() true zurückgibt. + */ + float GetScaleFactorX() const { return m_ScaleFactorX; } + + /** + @brief Gibt den Skalierungsfakter der Animation auf der Y-Achse zurück. + @remark Diese Methode darf nur aufgerufen werden, wenn die Methode IsScalingAllowed() true zurückgibt. + */ + float GetScaleFactorY() const { return m_ScaleFactorY; } + + virtual bool Persist(BS_OutputPersistenceBlock & Writer); + virtual bool Unpersist(BS_InputPersistenceBlock & Reader); + + virtual void FrameNotification(int TimeElapsed); + + ANIMATION_TYPES GetAnimationType() const; + int GetFPS() const; + int GetFrameCount() const; + bool IsScalingAllowed() const; + bool IsAlphaAllowed() const; + bool IsColorModulationAllowed() const; + unsigned int GetCurrentFrame() const { return m_CurrentFrame; } + const std::string & GetCurrentAction() const ; + bool IsRunning() const { return m_Running; } + + typedef bool (*ANIMATION_CALLBACK)(unsigned int); + + void RegisterLoopPointCallback(ANIMATION_CALLBACK Callback, unsigned int Data = 0); + void RegisterActionCallback(ANIMATION_CALLBACK Callback, unsigned int Data = 0); + void RegisterDeleteCallback(ANIMATION_CALLBACK Callback, unsigned int Data = 0); + +protected: + virtual bool DoRender(); + +private: + enum DIRECTION + { + FORWARD, + BACKWARD + }; + + int m_RelX; + int m_RelY; + float m_ScaleFactorX; + float m_ScaleFactorY; + unsigned int m_ModulationColor; + unsigned int m_CurrentFrame; + int m_CurrentFrameTime; + bool m_Running; + bool m_Finished; + DIRECTION m_Direction; + BS_AnimationResource * m_AnimationResourcePtr; + unsigned int m_AnimationTemplateHandle; + bool m_FramesLocked; + + struct ANIMATION_CALLBACK_DATA + { + ANIMATION_CALLBACK Callback; + unsigned int Data; + }; + std::vector m_LoopPointCallbacks; + std::vector m_ActionCallbacks; + std::vector m_DeleteCallbacks; + + /** + @brief Lockt alle Frames. + @return Gibt false zurück, falls nicht alle Frames gelockt werden konnten. + */ + bool LockAllFrames(); + + /** + @brief Unlockt alle Frames. + @return Gibt false zurück, falls nicht alles Frames freigegeben werden konnten. + */ + bool UnlockAllFrames(); + + /** + @brief Diese Methode aktualisiert die Parameter (Größe, Position) der Animation anhand des aktuellen Frames. + + Diese Methode muss bei jedem Framewechsel aufgerufen werden damit der RenderObject-Manager immer aktuelle Daten hat. + */ + void ComputeCurrentCharacteristics(); + + /** + @brief Berechnet den Abstand zwischen dem linken Rand und dem Hotspot auf X-Achse in der aktuellen Darstellung. + */ + int ComputeXModifier() const; + + /** + @brief Berechnet den Abstand zwischen dem linken Rand und dem Hotspot auf X-Achse in der aktuellen Darstellung. + */ + int ComputeYModifier() const; + + void InitMembers(); + void PersistCallbackVector(BS_OutputPersistenceBlock & Writer, const std::vector & Vector); + void UnpersistCallbackVector(BS_InputPersistenceBlock & Reader, std::vector & Vector); + BS_AnimationDescription * GetAnimationDescription() const; + void InitializeAnimationResource(const std::string &FileName); +}; + +#endif -- cgit v1.2.3 From e8bca8b8fe0f80e0d5053b190840b034f50ae163 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 30 Jul 2010 09:02:39 +0000 Subject: SWORD25: Fixed rest of the include paths svn-id: r53181 --- engines/sword25/gfx/animation.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'engines/sword25/gfx/animation.h') diff --git a/engines/sword25/gfx/animation.h b/engines/sword25/gfx/animation.h index 37380f27a9..8be252e0a0 100755 --- a/engines/sword25/gfx/animation.h +++ b/engines/sword25/gfx/animation.h @@ -17,16 +17,16 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // ----------------------------------------------------------------------------- -#ifndef BS_ANIMATION_H -#define BS_ANIMATION_H +#ifndef SWORD25_ANIMATION_H +#define SWORD25_ANIMATION_H // Includes -#include "kernel/common.h" -#include "timedrenderobject.h" +#include "sword25/kernel/common.h" +#include "sword25/gfx/timedrenderobject.h" -#include "kernel/memlog_off.h" +#include "sword25/kernel/memlog_off.h" #include -#include "kernel/memlog_on.h" +#include "sword25/kernel/memlog_on.h" // Forward declarations class BS_Kernel; -- cgit v1.2.3 From 69b618a8f5517c609a5e94d9609dc27aea2ad573 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 30 Jul 2010 12:19:13 +0000 Subject: SWORD25: Compilation fixes Majority of files now compile under Windoze. svn-id: r53182 --- engines/sword25/gfx/animation.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/sword25/gfx/animation.h') diff --git a/engines/sword25/gfx/animation.h b/engines/sword25/gfx/animation.h index 8be252e0a0..40ec2597f6 100755 --- a/engines/sword25/gfx/animation.h +++ b/engines/sword25/gfx/animation.h @@ -38,7 +38,7 @@ class BS_InputPersistenceBlock; class BS_Animation : public BS_TimedRenderObject { -friend BS_RenderObject; +friend class BS_RenderObject; private: BS_Animation(BS_RenderObjectPtr ParentPtr, const std::string & FileName); @@ -50,7 +50,7 @@ public: { AT_ONESHOT, AT_LOOP, - AT_JOJO, + AT_JOJO }; virtual ~BS_Animation(); -- cgit v1.2.3 From 293bf95c01f76c8d812a300eb038854f1246ab3d Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sat, 31 Jul 2010 09:53:02 +0000 Subject: SWORD25: Replacing headers with ScummVM ones plus original (C) svn-id: r53188 --- engines/sword25/gfx/animation.h | 51 ++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 18 deletions(-) mode change 100755 => 100644 engines/sword25/gfx/animation.h (limited to 'engines/sword25/gfx/animation.h') diff --git a/engines/sword25/gfx/animation.h b/engines/sword25/gfx/animation.h old mode 100755 new mode 100644 index 40ec2597f6..7181f0061d --- a/engines/sword25/gfx/animation.h +++ b/engines/sword25/gfx/animation.h @@ -1,21 +1,36 @@ -// ----------------------------------------------------------------------------- -// This file is part of Broken Sword 2.5 -// Copyright (c) Malte Thiesen, Daniel Queteschiner and Michael Elsdörfer -// -// Broken Sword 2.5 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 -// (at your option) any later version. -// -// Broken Sword 2.5 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 Broken Sword 2.5; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -// ----------------------------------------------------------------------------- +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * 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 (at your option) 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $URL$ + * $Id$ + * + */ + +/* + * This code is based on Broken Sword 2.5 engine + * + * Copyright (c) Malte Thiesen, Daniel Queteschiner and Michael Elsdoerfer + * + * Licensed under GNU GPL v2 + * + */ #ifndef SWORD25_ANIMATION_H #define SWORD25_ANIMATION_H -- cgit v1.2.3 From de0fe1db4939bbb787de60231dd30a7b5391f269 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Thu, 5 Aug 2010 12:48:19 +0000 Subject: SWORD25: Mass-putting of all files in gfx/ into Sword25 namespace svn-id: r53214 --- engines/sword25/gfx/animation.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'engines/sword25/gfx/animation.h') diff --git a/engines/sword25/gfx/animation.h b/engines/sword25/gfx/animation.h index 7181f0061d..2221501bfa 100644 --- a/engines/sword25/gfx/animation.h +++ b/engines/sword25/gfx/animation.h @@ -43,6 +43,8 @@ #include #include "sword25/kernel/memlog_on.h" +namespace Sword25 { + // Forward declarations class BS_Kernel; class BS_PackageManager; @@ -221,4 +223,6 @@ private: void InitializeAnimationResource(const std::string &FileName); }; +} // End of namespace Sword25 + #endif -- cgit v1.2.3 From 6dcf9f0ee557e692df3c70a263ca35068ff45380 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 6 Aug 2010 10:59:35 +0000 Subject: SWORD25: std::string -> Common::String in gfx/ svn-id: r53218 --- engines/sword25/gfx/animation.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engines/sword25/gfx/animation.h') diff --git a/engines/sword25/gfx/animation.h b/engines/sword25/gfx/animation.h index 2221501bfa..606cd9485e 100644 --- a/engines/sword25/gfx/animation.h +++ b/engines/sword25/gfx/animation.h @@ -58,7 +58,7 @@ class BS_Animation : public BS_TimedRenderObject friend class BS_RenderObject; private: - BS_Animation(BS_RenderObjectPtr ParentPtr, const std::string & FileName); + BS_Animation(BS_RenderObjectPtr ParentPtr, const Common::String & FileName); BS_Animation(BS_RenderObjectPtr ParentPtr, const BS_AnimationTemplate & Template); BS_Animation(BS_InputPersistenceBlock & Reader, BS_RenderObjectPtr ParentPtr, unsigned int Handle); @@ -145,7 +145,7 @@ public: bool IsAlphaAllowed() const; bool IsColorModulationAllowed() const; unsigned int GetCurrentFrame() const { return m_CurrentFrame; } - const std::string & GetCurrentAction() const ; + const Common::String & GetCurrentAction() const ; bool IsRunning() const { return m_Running; } typedef bool (*ANIMATION_CALLBACK)(unsigned int); @@ -220,7 +220,7 @@ private: void PersistCallbackVector(BS_OutputPersistenceBlock & Writer, const std::vector & Vector); void UnpersistCallbackVector(BS_InputPersistenceBlock & Reader, std::vector & Vector); BS_AnimationDescription * GetAnimationDescription() const; - void InitializeAnimationResource(const std::string &FileName); + void InitializeAnimationResource(const Common::String &FileName); }; } // End of namespace Sword25 -- cgit v1.2.3 From a17ec87b7dd09e7b251a3f578d1f788917550451 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 6 Aug 2010 10:59:50 +0000 Subject: SWORD25: Number of compilation and warning fixes svn-id: r53219 --- engines/sword25/gfx/animation.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'engines/sword25/gfx/animation.h') diff --git a/engines/sword25/gfx/animation.h b/engines/sword25/gfx/animation.h index 606cd9485e..9faf17d7a3 100644 --- a/engines/sword25/gfx/animation.h +++ b/engines/sword25/gfx/animation.h @@ -183,9 +183,9 @@ private: ANIMATION_CALLBACK Callback; unsigned int Data; }; - std::vector m_LoopPointCallbacks; - std::vector m_ActionCallbacks; - std::vector m_DeleteCallbacks; + Common::Array m_LoopPointCallbacks; + Common::Array m_ActionCallbacks; + Common::Array m_DeleteCallbacks; /** @brief Lockt alle Frames. @@ -217,8 +217,8 @@ private: int ComputeYModifier() const; void InitMembers(); - void PersistCallbackVector(BS_OutputPersistenceBlock & Writer, const std::vector & Vector); - void UnpersistCallbackVector(BS_InputPersistenceBlock & Reader, std::vector & Vector); + void PersistCallbackVector(BS_OutputPersistenceBlock & Writer, const Common::Array & Vector); + void UnpersistCallbackVector(BS_InputPersistenceBlock & Reader, Common::Array & Vector); BS_AnimationDescription * GetAnimationDescription() const; void InitializeAnimationResource(const Common::String &FileName); }; -- cgit v1.2.3 From 47904bc7b2992189bb554833f00a79ff0fea9fb8 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 6 Aug 2010 13:13:25 +0000 Subject: SWORD25: Mass-astyle. svn-id: r53222 --- engines/sword25/gfx/animation.h | 148 +++++++++++++++++++++------------------- 1 file changed, 76 insertions(+), 72 deletions(-) (limited to 'engines/sword25/gfx/animation.h') diff --git a/engines/sword25/gfx/animation.h b/engines/sword25/gfx/animation.h index 9faf17d7a3..93f450dce0 100644 --- a/engines/sword25/gfx/animation.h +++ b/engines/sword25/gfx/animation.h @@ -23,7 +23,7 @@ * */ -/* +/* * This code is based on Broken Sword 2.5 engine * * Copyright (c) Malte Thiesen, Daniel Queteschiner and Michael Elsdoerfer @@ -53,23 +53,21 @@ class BS_AnimationTemplate; class BS_AnimationDescription; class BS_InputPersistenceBlock; -class BS_Animation : public BS_TimedRenderObject -{ -friend class BS_RenderObject; +class BS_Animation : public BS_TimedRenderObject { + friend class BS_RenderObject; private: - BS_Animation(BS_RenderObjectPtr ParentPtr, const Common::String & FileName); - BS_Animation(BS_RenderObjectPtr ParentPtr, const BS_AnimationTemplate & Template); - BS_Animation(BS_InputPersistenceBlock & Reader, BS_RenderObjectPtr ParentPtr, unsigned int Handle); + BS_Animation(BS_RenderObjectPtr ParentPtr, const Common::String &FileName); + BS_Animation(BS_RenderObjectPtr ParentPtr, const BS_AnimationTemplate &Template); + BS_Animation(BS_InputPersistenceBlock &Reader, BS_RenderObjectPtr ParentPtr, unsigned int Handle); public: - enum ANIMATION_TYPES - { + enum ANIMATION_TYPES { AT_ONESHOT, AT_LOOP, AT_JOJO }; - + virtual ~BS_Animation(); void Play(); @@ -80,44 +78,44 @@ public: virtual void SetPos(int X, int Y); virtual void SetX(int X); virtual void SetY(int Y); - + virtual int GetX() const; virtual int GetY() const; virtual int GetAbsoluteX() const; virtual int GetAbsoluteY() const; /** - @brief Setzt den Alphawert der Animation. - @param Alpha der neue Alphawert der Animation (0 = keine Deckung, 255 = volle Deckung). - @remark Diese Methode darf nur aufgerufen werden, wenn die Methode IsAlphaAllowed() true zurückgibt. + @brief Setzt den Alphawert der Animation. + @param Alpha der neue Alphawert der Animation (0 = keine Deckung, 255 = volle Deckung). + @remark Diese Methode darf nur aufgerufen werden, wenn die Methode IsAlphaAllowed() true zurückgibt. */ void SetAlpha(int Alpha); /** - @brief Setzt die Modulationfarbe der Animation. - @param Color eine 24-Bit Farbe, die die Modulationsfarbe der Animation festlegt. - @remark Diese Methode darf nur aufgerufen werden, wenn die Methode IsColorModulationAllowed() true zurückgibt. + @brief Setzt die Modulationfarbe der Animation. + @param Color eine 24-Bit Farbe, die die Modulationsfarbe der Animation festlegt. + @remark Diese Methode darf nur aufgerufen werden, wenn die Methode IsColorModulationAllowed() true zurückgibt. */ void SetModulationColor(unsigned int ModulationColor); /** - @brief Setzt den Skalierungsfaktor der Animation. - @param ScaleFactor der Faktor um den die Animation in beide Richtungen gestreckt werden soll. - @remark Diese Methode darf nur aufgerufen werden, wenn die Methode IsScalingAllowed() true zurückgibt. + @brief Setzt den Skalierungsfaktor der Animation. + @param ScaleFactor der Faktor um den die Animation in beide Richtungen gestreckt werden soll. + @remark Diese Methode darf nur aufgerufen werden, wenn die Methode IsScalingAllowed() true zurückgibt. */ void SetScaleFactor(float ScaleFactor); /** - @brief Setzt den Skalierungsfaktor der Animation auf der X-Achse. - @param ScaleFactor der Faktor um den die Animation in Richtungen der X-Achse gestreckt werden soll. - @remark Diese Methode darf nur aufgerufen werden, wenn die Methode IsScalingAllowed() true zurückgibt. + @brief Setzt den Skalierungsfaktor der Animation auf der X-Achse. + @param ScaleFactor der Faktor um den die Animation in Richtungen der X-Achse gestreckt werden soll. + @remark Diese Methode darf nur aufgerufen werden, wenn die Methode IsScalingAllowed() true zurückgibt. */ void SetScaleFactorX(float ScaleFactorX); /** - @brief Setzt den Skalierungsfaktor der Animation auf der Y-Achse. - @param ScaleFactor der Faktor um den die Animation in Richtungen der Y-Achse gestreckt werden soll. - @remark Diese Methode darf nur aufgerufen werden, wenn die Methode IsScalingAllowed() true zurückgibt. + @brief Setzt den Skalierungsfaktor der Animation auf der Y-Achse. + @param ScaleFactor der Faktor um den die Animation in Richtungen der Y-Achse gestreckt werden soll. + @remark Diese Methode darf nur aufgerufen werden, wenn die Methode IsScalingAllowed() true zurückgibt. */ void SetScaleFactorY(float ScaleFactorY); @@ -125,28 +123,36 @@ public: @brief Gibt den Skalierungsfakter der Animation auf der X-Achse zurück. @remark Diese Methode darf nur aufgerufen werden, wenn die Methode IsScalingAllowed() true zurückgibt. */ - float GetScaleFactorX() const { return m_ScaleFactorX; } + float GetScaleFactorX() const { + return m_ScaleFactorX; + } /** @brief Gibt den Skalierungsfakter der Animation auf der Y-Achse zurück. @remark Diese Methode darf nur aufgerufen werden, wenn die Methode IsScalingAllowed() true zurückgibt. */ - float GetScaleFactorY() const { return m_ScaleFactorY; } - - virtual bool Persist(BS_OutputPersistenceBlock & Writer); - virtual bool Unpersist(BS_InputPersistenceBlock & Reader); + float GetScaleFactorY() const { + return m_ScaleFactorY; + } + + virtual bool Persist(BS_OutputPersistenceBlock &Writer); + virtual bool Unpersist(BS_InputPersistenceBlock &Reader); virtual void FrameNotification(int TimeElapsed); - - ANIMATION_TYPES GetAnimationType() const; - int GetFPS() const; - int GetFrameCount() const; - bool IsScalingAllowed() const; - bool IsAlphaAllowed() const; - bool IsColorModulationAllowed() const; - unsigned int GetCurrentFrame() const { return m_CurrentFrame; } - const Common::String & GetCurrentAction() const ; - bool IsRunning() const { return m_Running; } + + ANIMATION_TYPES GetAnimationType() const; + int GetFPS() const; + int GetFrameCount() const; + bool IsScalingAllowed() const; + bool IsAlphaAllowed() const; + bool IsColorModulationAllowed() const; + unsigned int GetCurrentFrame() const { + return m_CurrentFrame; + } + const Common::String &GetCurrentAction() const ; + bool IsRunning() const { + return m_Running; + } typedef bool (*ANIMATION_CALLBACK)(unsigned int); @@ -158,68 +164,66 @@ protected: virtual bool DoRender(); private: - enum DIRECTION - { + enum DIRECTION { FORWARD, BACKWARD }; - int m_RelX; - int m_RelY; - float m_ScaleFactorX; - float m_ScaleFactorY; - unsigned int m_ModulationColor; - unsigned int m_CurrentFrame; - int m_CurrentFrameTime; - bool m_Running; - bool m_Finished; - DIRECTION m_Direction; - BS_AnimationResource * m_AnimationResourcePtr; - unsigned int m_AnimationTemplateHandle; - bool m_FramesLocked; - - struct ANIMATION_CALLBACK_DATA - { - ANIMATION_CALLBACK Callback; - unsigned int Data; + int m_RelX; + int m_RelY; + float m_ScaleFactorX; + float m_ScaleFactorY; + unsigned int m_ModulationColor; + unsigned int m_CurrentFrame; + int m_CurrentFrameTime; + bool m_Running; + bool m_Finished; + DIRECTION m_Direction; + BS_AnimationResource *m_AnimationResourcePtr; + unsigned int m_AnimationTemplateHandle; + bool m_FramesLocked; + + struct ANIMATION_CALLBACK_DATA { + ANIMATION_CALLBACK Callback; + unsigned int Data; }; Common::Array m_LoopPointCallbacks; Common::Array m_ActionCallbacks; Common::Array m_DeleteCallbacks; /** - @brief Lockt alle Frames. - @return Gibt false zurück, falls nicht alle Frames gelockt werden konnten. + @brief Lockt alle Frames. + @return Gibt false zurück, falls nicht alle Frames gelockt werden konnten. */ bool LockAllFrames(); /** - @brief Unlockt alle Frames. - @return Gibt false zurück, falls nicht alles Frames freigegeben werden konnten. + @brief Unlockt alle Frames. + @return Gibt false zurück, falls nicht alles Frames freigegeben werden konnten. */ bool UnlockAllFrames(); /** - @brief Diese Methode aktualisiert die Parameter (Größe, Position) der Animation anhand des aktuellen Frames. + @brief Diese Methode aktualisiert die Parameter (Größe, Position) der Animation anhand des aktuellen Frames. - Diese Methode muss bei jedem Framewechsel aufgerufen werden damit der RenderObject-Manager immer aktuelle Daten hat. + Diese Methode muss bei jedem Framewechsel aufgerufen werden damit der RenderObject-Manager immer aktuelle Daten hat. */ void ComputeCurrentCharacteristics(); /** - @brief Berechnet den Abstand zwischen dem linken Rand und dem Hotspot auf X-Achse in der aktuellen Darstellung. + @brief Berechnet den Abstand zwischen dem linken Rand und dem Hotspot auf X-Achse in der aktuellen Darstellung. */ int ComputeXModifier() const; /** - @brief Berechnet den Abstand zwischen dem linken Rand und dem Hotspot auf X-Achse in der aktuellen Darstellung. + @brief Berechnet den Abstand zwischen dem linken Rand und dem Hotspot auf X-Achse in der aktuellen Darstellung. */ int ComputeYModifier() const; void InitMembers(); - void PersistCallbackVector(BS_OutputPersistenceBlock & Writer, const Common::Array & Vector); - void UnpersistCallbackVector(BS_InputPersistenceBlock & Reader, Common::Array & Vector); - BS_AnimationDescription * GetAnimationDescription() const; + void PersistCallbackVector(BS_OutputPersistenceBlock &Writer, const Common::Array & Vector); + void UnpersistCallbackVector(BS_InputPersistenceBlock &Reader, Common::Array & Vector); + BS_AnimationDescription *GetAnimationDescription() const; void InitializeAnimationResource(const Common::String &FileName); }; -- cgit v1.2.3 From 485ff15d23b3ae9545f5c9df794f1326185eae7a Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Wed, 18 Aug 2010 10:52:24 +0000 Subject: SWORD25: Mass-eliminating of BS_ prefix in fmv/ and gfx/ svn-id: r53258 --- engines/sword25/gfx/animation.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'engines/sword25/gfx/animation.h') diff --git a/engines/sword25/gfx/animation.h b/engines/sword25/gfx/animation.h index 93f450dce0..978b1ae151 100644 --- a/engines/sword25/gfx/animation.h +++ b/engines/sword25/gfx/animation.h @@ -48,18 +48,18 @@ namespace Sword25 { // Forward declarations class BS_Kernel; class BS_PackageManager; -class BS_AnimationResource; -class BS_AnimationTemplate; -class BS_AnimationDescription; +class AnimationResource; +class AnimationTemplate; +class AnimationDescription; class BS_InputPersistenceBlock; -class BS_Animation : public BS_TimedRenderObject { - friend class BS_RenderObject; +class Animation : public TimedRenderObject { + friend class RenderObject; private: - BS_Animation(BS_RenderObjectPtr ParentPtr, const Common::String &FileName); - BS_Animation(BS_RenderObjectPtr ParentPtr, const BS_AnimationTemplate &Template); - BS_Animation(BS_InputPersistenceBlock &Reader, BS_RenderObjectPtr ParentPtr, unsigned int Handle); + Animation(RenderObjectPtr ParentPtr, const Common::String &FileName); + Animation(RenderObjectPtr ParentPtr, const AnimationTemplate &Template); + Animation(BS_InputPersistenceBlock &Reader, RenderObjectPtr ParentPtr, unsigned int Handle); public: enum ANIMATION_TYPES { @@ -68,7 +68,7 @@ public: AT_JOJO }; - virtual ~BS_Animation(); + virtual ~Animation(); void Play(); void Pause(); @@ -179,7 +179,7 @@ private: bool m_Running; bool m_Finished; DIRECTION m_Direction; - BS_AnimationResource *m_AnimationResourcePtr; + AnimationResource *m_AnimationResourcePtr; unsigned int m_AnimationTemplateHandle; bool m_FramesLocked; @@ -223,7 +223,7 @@ private: void InitMembers(); void PersistCallbackVector(BS_OutputPersistenceBlock &Writer, const Common::Array & Vector); void UnpersistCallbackVector(BS_InputPersistenceBlock &Reader, Common::Array & Vector); - BS_AnimationDescription *GetAnimationDescription() const; + AnimationDescription *GetAnimationDescription() const; void InitializeAnimationResource(const Common::String &FileName); }; -- cgit v1.2.3 From b01994a53bbc96da907a4c28934e644184291017 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Wed, 18 Aug 2010 12:58:22 +0000 Subject: SWORD25: removed BS_ prefix from rest of the classes. The things which are intentionally left with the prefix: BS_LOG, BS_ASSERT, BS_Rect, BS_String. svn-id: r53261 --- engines/sword25/gfx/animation.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'engines/sword25/gfx/animation.h') diff --git a/engines/sword25/gfx/animation.h b/engines/sword25/gfx/animation.h index 978b1ae151..cc09246f96 100644 --- a/engines/sword25/gfx/animation.h +++ b/engines/sword25/gfx/animation.h @@ -46,12 +46,12 @@ namespace Sword25 { // Forward declarations -class BS_Kernel; +class Kernel; class BS_PackageManager; class AnimationResource; class AnimationTemplate; class AnimationDescription; -class BS_InputPersistenceBlock; +class InputPersistenceBlock; class Animation : public TimedRenderObject { friend class RenderObject; @@ -59,7 +59,7 @@ class Animation : public TimedRenderObject { private: Animation(RenderObjectPtr ParentPtr, const Common::String &FileName); Animation(RenderObjectPtr ParentPtr, const AnimationTemplate &Template); - Animation(BS_InputPersistenceBlock &Reader, RenderObjectPtr ParentPtr, unsigned int Handle); + Animation(InputPersistenceBlock &Reader, RenderObjectPtr ParentPtr, unsigned int Handle); public: enum ANIMATION_TYPES { @@ -135,8 +135,8 @@ public: return m_ScaleFactorY; } - virtual bool Persist(BS_OutputPersistenceBlock &Writer); - virtual bool Unpersist(BS_InputPersistenceBlock &Reader); + virtual bool Persist(OutputPersistenceBlock &Writer); + virtual bool Unpersist(InputPersistenceBlock &Reader); virtual void FrameNotification(int TimeElapsed); @@ -221,8 +221,8 @@ private: int ComputeYModifier() const; void InitMembers(); - void PersistCallbackVector(BS_OutputPersistenceBlock &Writer, const Common::Array & Vector); - void UnpersistCallbackVector(BS_InputPersistenceBlock &Reader, Common::Array & Vector); + void PersistCallbackVector(OutputPersistenceBlock &Writer, const Common::Array & Vector); + void UnpersistCallbackVector(InputPersistenceBlock &Reader, Common::Array & Vector); AnimationDescription *GetAnimationDescription() const; void InitializeAnimationResource(const Common::String &FileName); }; -- cgit v1.2.3 From 3fb0e9383b7da395d2d715c6f1abeb0252cac229 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Wed, 18 Aug 2010 12:58:45 +0000 Subject: SWORD25: Removed last traces of STL svn-id: r53262 --- engines/sword25/gfx/animation.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'engines/sword25/gfx/animation.h') diff --git a/engines/sword25/gfx/animation.h b/engines/sword25/gfx/animation.h index cc09246f96..d9d97605fd 100644 --- a/engines/sword25/gfx/animation.h +++ b/engines/sword25/gfx/animation.h @@ -39,10 +39,6 @@ #include "sword25/kernel/common.h" #include "sword25/gfx/timedrenderobject.h" -#include "sword25/kernel/memlog_off.h" -#include -#include "sword25/kernel/memlog_on.h" - namespace Sword25 { // Forward declarations -- cgit v1.2.3 From 086f5961b6575c50bb386750b6e9a3ed1efdd8cd Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Thu, 2 Sep 2010 12:14:04 +0000 Subject: SWORD25: unsigned int -> uint svn-id: r53309 --- engines/sword25/gfx/animation.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'engines/sword25/gfx/animation.h') diff --git a/engines/sword25/gfx/animation.h b/engines/sword25/gfx/animation.h index d9d97605fd..2d6c9c95fd 100644 --- a/engines/sword25/gfx/animation.h +++ b/engines/sword25/gfx/animation.h @@ -55,7 +55,7 @@ class Animation : public TimedRenderObject { private: Animation(RenderObjectPtr ParentPtr, const Common::String &FileName); Animation(RenderObjectPtr ParentPtr, const AnimationTemplate &Template); - Animation(InputPersistenceBlock &Reader, RenderObjectPtr ParentPtr, unsigned int Handle); + Animation(InputPersistenceBlock &Reader, RenderObjectPtr ParentPtr, uint Handle); public: enum ANIMATION_TYPES { @@ -69,7 +69,7 @@ public: void Play(); void Pause(); void Stop(); - void SetFrame(unsigned int Nr); + void SetFrame(uint Nr); virtual void SetPos(int X, int Y); virtual void SetX(int X); @@ -92,7 +92,7 @@ public: @param Color eine 24-Bit Farbe, die die Modulationsfarbe der Animation festlegt. @remark Diese Methode darf nur aufgerufen werden, wenn die Methode IsColorModulationAllowed() true zurückgibt. */ - void SetModulationColor(unsigned int ModulationColor); + void SetModulationColor(uint ModulationColor); /** @brief Setzt den Skalierungsfaktor der Animation. @@ -142,7 +142,7 @@ public: bool IsScalingAllowed() const; bool IsAlphaAllowed() const; bool IsColorModulationAllowed() const; - unsigned int GetCurrentFrame() const { + uint GetCurrentFrame() const { return m_CurrentFrame; } const Common::String &GetCurrentAction() const ; @@ -150,11 +150,11 @@ public: return m_Running; } - typedef bool (*ANIMATION_CALLBACK)(unsigned int); + typedef bool (*ANIMATION_CALLBACK)(uint); - void RegisterLoopPointCallback(ANIMATION_CALLBACK Callback, unsigned int Data = 0); - void RegisterActionCallback(ANIMATION_CALLBACK Callback, unsigned int Data = 0); - void RegisterDeleteCallback(ANIMATION_CALLBACK Callback, unsigned int Data = 0); + void RegisterLoopPointCallback(ANIMATION_CALLBACK Callback, uint Data = 0); + void RegisterActionCallback(ANIMATION_CALLBACK Callback, uint Data = 0); + void RegisterDeleteCallback(ANIMATION_CALLBACK Callback, uint Data = 0); protected: virtual bool DoRender(); @@ -169,19 +169,19 @@ private: int m_RelY; float m_ScaleFactorX; float m_ScaleFactorY; - unsigned int m_ModulationColor; - unsigned int m_CurrentFrame; + uint m_ModulationColor; + uint m_CurrentFrame; int m_CurrentFrameTime; bool m_Running; bool m_Finished; DIRECTION m_Direction; AnimationResource *m_AnimationResourcePtr; - unsigned int m_AnimationTemplateHandle; + uint m_AnimationTemplateHandle; bool m_FramesLocked; struct ANIMATION_CALLBACK_DATA { ANIMATION_CALLBACK Callback; - unsigned int Data; + uint Data; }; Common::Array m_LoopPointCallbacks; Common::Array m_ActionCallbacks; -- cgit v1.2.3 From 06bce68860696f67f0a0ac1e9682635081918801 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Thu, 2 Sep 2010 17:11:45 +0000 Subject: SWORD25: Comply to the code conventions for several classes svn-id: r53310 --- engines/sword25/gfx/animation.h | 69 ++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 35 deletions(-) (limited to 'engines/sword25/gfx/animation.h') diff --git a/engines/sword25/gfx/animation.h b/engines/sword25/gfx/animation.h index 2d6c9c95fd..de684ce395 100644 --- a/engines/sword25/gfx/animation.h +++ b/engines/sword25/gfx/animation.h @@ -43,7 +43,6 @@ namespace Sword25 { // Forward declarations class Kernel; -class BS_PackageManager; class AnimationResource; class AnimationTemplate; class AnimationDescription; @@ -53,9 +52,9 @@ class Animation : public TimedRenderObject { friend class RenderObject; private: - Animation(RenderObjectPtr ParentPtr, const Common::String &FileName); - Animation(RenderObjectPtr ParentPtr, const AnimationTemplate &Template); - Animation(InputPersistenceBlock &Reader, RenderObjectPtr ParentPtr, uint Handle); + Animation(RenderObjectPtr parentPtr, const Common::String &fileName); + Animation(RenderObjectPtr parentPtr, const AnimationTemplate &template_); + Animation(InputPersistenceBlock &reader, RenderObjectPtr parentPtr, uint handle); public: enum ANIMATION_TYPES { @@ -71,77 +70,77 @@ public: void Stop(); void SetFrame(uint Nr); - virtual void SetPos(int X, int Y); - virtual void SetX(int X); - virtual void SetY(int Y); + virtual void setPos(int x, int y); + virtual void setX(int x); + virtual void setY(int y); - virtual int GetX() const; - virtual int GetY() const; - virtual int GetAbsoluteX() const; - virtual int GetAbsoluteY() const; + virtual int getX() const; + virtual int getY() const; + virtual int getAbsoluteX() const; + virtual int getAbsoluteY() const; /** @brief Setzt den Alphawert der Animation. @param Alpha der neue Alphawert der Animation (0 = keine Deckung, 255 = volle Deckung). @remark Diese Methode darf nur aufgerufen werden, wenn die Methode IsAlphaAllowed() true zurückgibt. */ - void SetAlpha(int Alpha); + void setAlpha(int alpha); /** @brief Setzt die Modulationfarbe der Animation. @param Color eine 24-Bit Farbe, die die Modulationsfarbe der Animation festlegt. @remark Diese Methode darf nur aufgerufen werden, wenn die Methode IsColorModulationAllowed() true zurückgibt. */ - void SetModulationColor(uint ModulationColor); + void setModulationColor(uint modulationColor); /** @brief Setzt den Skalierungsfaktor der Animation. @param ScaleFactor der Faktor um den die Animation in beide Richtungen gestreckt werden soll. @remark Diese Methode darf nur aufgerufen werden, wenn die Methode IsScalingAllowed() true zurückgibt. */ - void SetScaleFactor(float ScaleFactor); + void setScaleFactor(float scaleFactor); /** @brief Setzt den Skalierungsfaktor der Animation auf der X-Achse. @param ScaleFactor der Faktor um den die Animation in Richtungen der X-Achse gestreckt werden soll. @remark Diese Methode darf nur aufgerufen werden, wenn die Methode IsScalingAllowed() true zurückgibt. */ - void SetScaleFactorX(float ScaleFactorX); + void setScaleFactorX(float scaleFactorX); /** @brief Setzt den Skalierungsfaktor der Animation auf der Y-Achse. @param ScaleFactor der Faktor um den die Animation in Richtungen der Y-Achse gestreckt werden soll. @remark Diese Methode darf nur aufgerufen werden, wenn die Methode IsScalingAllowed() true zurückgibt. */ - void SetScaleFactorY(float ScaleFactorY); + void setScaleFactorY(float scaleFactorY); /** @brief Gibt den Skalierungsfakter der Animation auf der X-Achse zurück. @remark Diese Methode darf nur aufgerufen werden, wenn die Methode IsScalingAllowed() true zurückgibt. */ - float GetScaleFactorX() const { - return m_ScaleFactorX; + float getScaleFactorX() const { + return _scaleFactorX; } /** @brief Gibt den Skalierungsfakter der Animation auf der Y-Achse zurück. @remark Diese Methode darf nur aufgerufen werden, wenn die Methode IsScalingAllowed() true zurückgibt. */ - float GetScaleFactorY() const { - return m_ScaleFactorY; + float getScaleFactorY() const { + return _scaleFactorY; } - virtual bool Persist(OutputPersistenceBlock &Writer); - virtual bool Unpersist(InputPersistenceBlock &Reader); + virtual bool persist(OutputPersistenceBlock &writer); + virtual bool unpersist(InputPersistenceBlock &reader); - virtual void FrameNotification(int TimeElapsed); + virtual void frameNotification(int timeElapsed); - ANIMATION_TYPES GetAnimationType() const; - int GetFPS() const; - int GetFrameCount() const; - bool IsScalingAllowed() const; - bool IsAlphaAllowed() const; - bool IsColorModulationAllowed() const; + ANIMATION_TYPES getAnimationType() const; + int getFPS() const; + int getFrameCount() const; + bool isScalingAllowed() const; + bool isAlphaAllowed() const; + bool isColorModulationAllowed() const; uint GetCurrentFrame() const { return m_CurrentFrame; } @@ -157,7 +156,7 @@ public: void RegisterDeleteCallback(ANIMATION_CALLBACK Callback, uint Data = 0); protected: - virtual bool DoRender(); + virtual bool doRender(); private: enum DIRECTION { @@ -165,11 +164,11 @@ private: BACKWARD }; - int m_RelX; - int m_RelY; - float m_ScaleFactorX; - float m_ScaleFactorY; - uint m_ModulationColor; + int _relX; + int _relY; + float _scaleFactorX; + float _scaleFactorY; + uint _modulationColor; uint m_CurrentFrame; int m_CurrentFrameTime; bool m_Running; -- cgit v1.2.3 From eb66750137c1f32276ed4d66512deca2ee6aae93 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Tue, 12 Oct 2010 19:38:40 +0000 Subject: SWORD25: Enforce code naming conventions in gfx/animation* svn-id: r53393 --- engines/sword25/gfx/animation.h | 78 ++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 39 deletions(-) (limited to 'engines/sword25/gfx/animation.h') diff --git a/engines/sword25/gfx/animation.h b/engines/sword25/gfx/animation.h index de684ce395..0676c0c116 100644 --- a/engines/sword25/gfx/animation.h +++ b/engines/sword25/gfx/animation.h @@ -65,10 +65,10 @@ public: virtual ~Animation(); - void Play(); - void Pause(); - void Stop(); - void SetFrame(uint Nr); + void play(); + void pause(); + void stop(); + void setFrame(uint nr); virtual void setPos(int x, int y); virtual void setX(int x); @@ -141,85 +141,85 @@ public: bool isScalingAllowed() const; bool isAlphaAllowed() const; bool isColorModulationAllowed() const; - uint GetCurrentFrame() const { - return m_CurrentFrame; + uint getCurrentFrame() const { + return _currentFrame; } - const Common::String &GetCurrentAction() const ; - bool IsRunning() const { - return m_Running; + const Common::String &getCurrentAction() const; + bool isRunning() const { + return _running; } typedef bool (*ANIMATION_CALLBACK)(uint); - void RegisterLoopPointCallback(ANIMATION_CALLBACK Callback, uint Data = 0); - void RegisterActionCallback(ANIMATION_CALLBACK Callback, uint Data = 0); - void RegisterDeleteCallback(ANIMATION_CALLBACK Callback, uint Data = 0); + void registerLoopPointCallback(ANIMATION_CALLBACK callback, uint data = 0); + void registerActionCallback(ANIMATION_CALLBACK callback, uint data = 0); + void registerDeleteCallback(ANIMATION_CALLBACK Callback, uint Data = 0); protected: virtual bool doRender(); private: - enum DIRECTION { + enum Direction { FORWARD, BACKWARD }; - int _relX; - int _relY; - float _scaleFactorX; - float _scaleFactorY; - uint _modulationColor; - uint m_CurrentFrame; - int m_CurrentFrameTime; - bool m_Running; - bool m_Finished; - DIRECTION m_Direction; - AnimationResource *m_AnimationResourcePtr; - uint m_AnimationTemplateHandle; - bool m_FramesLocked; + int _relX; + int _relY; + float _scaleFactorX; + float _scaleFactorY; + uint _modulationColor; + uint _currentFrame; + int _currentFrameTime; + bool _running; + bool _finished; + Direction _direction; + AnimationResource *_animationResourcePtr; + uint _animationTemplateHandle; + bool _framesLocked; struct ANIMATION_CALLBACK_DATA { ANIMATION_CALLBACK Callback; uint Data; }; - Common::Array m_LoopPointCallbacks; - Common::Array m_ActionCallbacks; - Common::Array m_DeleteCallbacks; + Common::Array _loopPointCallbacks; + Common::Array _actionCallbacks; + Common::Array _deleteCallbacks; /** @brief Lockt alle Frames. @return Gibt false zurück, falls nicht alle Frames gelockt werden konnten. */ - bool LockAllFrames(); + bool lockAllFrames(); /** @brief Unlockt alle Frames. @return Gibt false zurück, falls nicht alles Frames freigegeben werden konnten. */ - bool UnlockAllFrames(); + bool unlockAllFrames(); /** @brief Diese Methode aktualisiert die Parameter (Größe, Position) der Animation anhand des aktuellen Frames. Diese Methode muss bei jedem Framewechsel aufgerufen werden damit der RenderObject-Manager immer aktuelle Daten hat. */ - void ComputeCurrentCharacteristics(); + void computeCurrentCharacteristics(); /** @brief Berechnet den Abstand zwischen dem linken Rand und dem Hotspot auf X-Achse in der aktuellen Darstellung. */ - int ComputeXModifier() const; + int computeXModifier() const; /** @brief Berechnet den Abstand zwischen dem linken Rand und dem Hotspot auf X-Achse in der aktuellen Darstellung. */ - int ComputeYModifier() const; + int computeYModifier() const; - void InitMembers(); - void PersistCallbackVector(OutputPersistenceBlock &Writer, const Common::Array & Vector); - void UnpersistCallbackVector(InputPersistenceBlock &Reader, Common::Array & Vector); - AnimationDescription *GetAnimationDescription() const; - void InitializeAnimationResource(const Common::String &FileName); + void initMembers(); + void persistCallbackVector(OutputPersistenceBlock &writer, const Common::Array &vector); + void unpersistCallbackVector(InputPersistenceBlock &reader, Common::Array &vector); + AnimationDescription *getAnimationDescription() const; + void initializeAnimationResource(const Common::String &fileName); }; } // End of namespace Sword25 -- cgit v1.2.3