[Scummvm-cvs-logs] SF.net SVN: scummvm:[53258] scummvm/trunk/engines/sword25
sev at users.sourceforge.net
sev at users.sourceforge.net
Wed Oct 13 00:53:50 CEST 2010
Revision: 53258
http://scummvm.svn.sourceforge.net/scummvm/?rev=53258&view=rev
Author: sev
Date: 2010-10-12 22:53:49 +0000 (Tue, 12 Oct 2010)
Log Message:
-----------
SWORD25: Mass-eliminating of BS_ prefix in fmv/ and gfx/
Modified Paths:
--------------
scummvm/trunk/engines/sword25/fmv/movieplayer.cpp
scummvm/trunk/engines/sword25/fmv/movieplayer.h
scummvm/trunk/engines/sword25/fmv/movieplayer_script.cpp
scummvm/trunk/engines/sword25/gfx/animation.cpp
scummvm/trunk/engines/sword25/gfx/animation.h
scummvm/trunk/engines/sword25/gfx/animationdescription.cpp
scummvm/trunk/engines/sword25/gfx/animationdescription.h
scummvm/trunk/engines/sword25/gfx/animationresource.cpp
scummvm/trunk/engines/sword25/gfx/animationresource.h
scummvm/trunk/engines/sword25/gfx/animationtemplate.cpp
scummvm/trunk/engines/sword25/gfx/animationtemplate.h
scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.cpp
scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.h
scummvm/trunk/engines/sword25/gfx/bitmap.cpp
scummvm/trunk/engines/sword25/gfx/bitmap.h
scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp
scummvm/trunk/engines/sword25/gfx/bitmapresource.h
scummvm/trunk/engines/sword25/gfx/dynamicbitmap.cpp
scummvm/trunk/engines/sword25/gfx/dynamicbitmap.h
scummvm/trunk/engines/sword25/gfx/fontresource.cpp
scummvm/trunk/engines/sword25/gfx/fontresource.h
scummvm/trunk/engines/sword25/gfx/framecounter.cpp
scummvm/trunk/engines/sword25/gfx/framecounter.h
scummvm/trunk/engines/sword25/gfx/graphicengine.cpp
scummvm/trunk/engines/sword25/gfx/graphicengine.h
scummvm/trunk/engines/sword25/gfx/graphicengine_script.cpp
scummvm/trunk/engines/sword25/gfx/image/b25sloader.cpp
scummvm/trunk/engines/sword25/gfx/image/b25sloader.h
scummvm/trunk/engines/sword25/gfx/image/image.h
scummvm/trunk/engines/sword25/gfx/image/imageloader.cpp
scummvm/trunk/engines/sword25/gfx/image/imageloader.h
scummvm/trunk/engines/sword25/gfx/image/imageloader_ids.h
scummvm/trunk/engines/sword25/gfx/image/pngloader.cpp
scummvm/trunk/engines/sword25/gfx/image/pngloader.h
scummvm/trunk/engines/sword25/gfx/image/vectorimage.cpp
scummvm/trunk/engines/sword25/gfx/image/vectorimage.h
scummvm/trunk/engines/sword25/gfx/image/vectorimagerenderer.cpp
scummvm/trunk/engines/sword25/gfx/image/vectorimagerenderer.h
scummvm/trunk/engines/sword25/gfx/opengl/glimage.cpp
scummvm/trunk/engines/sword25/gfx/opengl/glimage.h
scummvm/trunk/engines/sword25/gfx/opengl/glvectorimageblit.cpp
scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.cpp
scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.h
scummvm/trunk/engines/sword25/gfx/opengl/swimage.cpp
scummvm/trunk/engines/sword25/gfx/opengl/swimage.h
scummvm/trunk/engines/sword25/gfx/panel.cpp
scummvm/trunk/engines/sword25/gfx/panel.h
scummvm/trunk/engines/sword25/gfx/renderobject.cpp
scummvm/trunk/engines/sword25/gfx/renderobject.h
scummvm/trunk/engines/sword25/gfx/renderobjectmanager.cpp
scummvm/trunk/engines/sword25/gfx/renderobjectmanager.h
scummvm/trunk/engines/sword25/gfx/renderobjectptr.h
scummvm/trunk/engines/sword25/gfx/renderobjectregistry.cpp
scummvm/trunk/engines/sword25/gfx/renderobjectregistry.h
scummvm/trunk/engines/sword25/gfx/rootrenderobject.h
scummvm/trunk/engines/sword25/gfx/screenshot.cpp
scummvm/trunk/engines/sword25/gfx/screenshot.h
scummvm/trunk/engines/sword25/gfx/staticbitmap.cpp
scummvm/trunk/engines/sword25/gfx/staticbitmap.h
scummvm/trunk/engines/sword25/gfx/text.cpp
scummvm/trunk/engines/sword25/gfx/text.h
scummvm/trunk/engines/sword25/gfx/timedrenderobject.cpp
scummvm/trunk/engines/sword25/gfx/timedrenderobject.h
scummvm/trunk/engines/sword25/kernel/kernel.cpp
scummvm/trunk/engines/sword25/kernel/kernel.h
scummvm/trunk/engines/sword25/math/geometry_script.cpp
Modified: scummvm/trunk/engines/sword25/fmv/movieplayer.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/movieplayer.cpp 2010-10-12 22:51:37 UTC (rev 53257)
+++ scummvm/trunk/engines/sword25/fmv/movieplayer.cpp 2010-10-12 22:53:49 UTC (rev 53258)
@@ -39,51 +39,51 @@
#define BS_LOG_PREFIX "MOVIEPLAYER"
BS_Service *BS_OggTheora_CreateObject(BS_Kernel *pKernel) {
- return new BS_MoviePlayer(pKernel);
+ return new MoviePlayer(pKernel);
}
-BS_MoviePlayer::BS_MoviePlayer(BS_Kernel *pKernel) : BS_Service(pKernel) {
+MoviePlayer::MoviePlayer(BS_Kernel *pKernel) : BS_Service(pKernel) {
if (!_RegisterScriptBindings())
BS_LOG_ERRORLN("Script bindings could not be registered.");
else
BS_LOGLN("Script bindings registered.");
}
-bool BS_MoviePlayer::LoadMovie(const Common::String &Filename, unsigned int Z) {
+bool MoviePlayer::LoadMovie(const Common::String &Filename, unsigned int Z) {
return true;
}
-bool BS_MoviePlayer::UnloadMovie() {
+bool MoviePlayer::UnloadMovie() {
return true;
}
-bool BS_MoviePlayer::Play() {
+bool MoviePlayer::Play() {
return true;
}
-bool BS_MoviePlayer::Pause() {
+bool MoviePlayer::Pause() {
return true;
}
-void BS_MoviePlayer::Update() {
+void MoviePlayer::Update() {
}
-bool BS_MoviePlayer::IsMovieLoaded() {
+bool MoviePlayer::IsMovieLoaded() {
return true;
}
-bool BS_MoviePlayer::IsPaused() {
+bool MoviePlayer::IsPaused() {
return true;
}
-float BS_MoviePlayer::GetScaleFactor() {
+float MoviePlayer::GetScaleFactor() {
return 1.0f;
}
-void BS_MoviePlayer::SetScaleFactor(float ScaleFactor) {
+void MoviePlayer::SetScaleFactor(float ScaleFactor) {
}
-double BS_MoviePlayer::GetTime() {
+double MoviePlayer::GetTime() {
return 1.0;
}
Modified: scummvm/trunk/engines/sword25/fmv/movieplayer.h
===================================================================
--- scummvm/trunk/engines/sword25/fmv/movieplayer.h 2010-10-12 22:51:37 UTC (rev 53257)
+++ scummvm/trunk/engines/sword25/fmv/movieplayer.h 2010-10-12 22:53:49 UTC (rev 53258)
@@ -48,14 +48,14 @@
// Class definitions
// -----------------------------------------------------------------------------
-class BS_MoviePlayer : public BS_Service {
+class MoviePlayer : public BS_Service {
public:
// -----------------------------------------------------------------------------
// Constructor / Destructor
// -----------------------------------------------------------------------------
- BS_MoviePlayer(BS_Kernel *pKernel);
- ~BS_MoviePlayer() {};
+ MoviePlayer(BS_Kernel *pKernel);
+ ~MoviePlayer() {};
// -----------------------------------------------------------------------------
// Abstract interface must be implemented by each Movie Player
Modified: scummvm/trunk/engines/sword25/fmv/movieplayer_script.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/movieplayer_script.cpp 2010-10-12 22:51:37 UTC (rev 53257)
+++ scummvm/trunk/engines/sword25/fmv/movieplayer_script.cpp 2010-10-12 22:53:49 UTC (rev 53258)
@@ -46,7 +46,7 @@
namespace Sword25 {
int LoadMovie(lua_State *L) {
- BS_MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+ MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
lua_pushbooleancpp(L, FMVPtr->LoadMovie(luaL_checkstring(L, 1), lua_gettop(L) == 2 ? static_cast<unsigned int>(luaL_checknumber(L, 2)) : 10));
@@ -57,7 +57,7 @@
// -------------------------------------------------------------------------
int UnloadMovie(lua_State *L) {
- BS_MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+ MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
lua_pushbooleancpp(L, FMVPtr->UnloadMovie());
@@ -68,7 +68,7 @@
// -------------------------------------------------------------------------
int Play(lua_State *L) {
- BS_MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+ MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
lua_pushbooleancpp(L, FMVPtr->Play());
@@ -79,7 +79,7 @@
// -------------------------------------------------------------------------
int Pause(lua_State *L) {
- BS_MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+ MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
lua_pushbooleancpp(L, FMVPtr->Pause());
@@ -90,7 +90,7 @@
// -------------------------------------------------------------------------
int Update(lua_State *L) {
- BS_MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+ MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
FMVPtr->Update();
@@ -101,7 +101,7 @@
// -------------------------------------------------------------------------
int IsMovieLoaded(lua_State *L) {
- BS_MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+ MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
lua_pushbooleancpp(L, FMVPtr->IsMovieLoaded());
@@ -112,7 +112,7 @@
// -------------------------------------------------------------------------
int IsPaused(lua_State *L) {
- BS_MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+ MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
lua_pushbooleancpp(L, FMVPtr->IsPaused());
@@ -123,7 +123,7 @@
// -------------------------------------------------------------------------
int GetScaleFactor(lua_State *L) {
- BS_MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+ MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
lua_pushnumber(L, FMVPtr->GetScaleFactor());
@@ -134,7 +134,7 @@
// -------------------------------------------------------------------------
int SetScaleFactor(lua_State *L) {
- BS_MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+ MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
FMVPtr->SetScaleFactor(static_cast<float>(luaL_checknumber(L, 1)));
@@ -145,7 +145,7 @@
// -------------------------------------------------------------------------
int GetTime(lua_State *L) {
- BS_MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+ MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
lua_pushnumber(L, FMVPtr->GetTime());
@@ -171,7 +171,7 @@
{ 0, 0 }
};
-bool BS_MoviePlayer::_RegisterScriptBindings() {
+bool MoviePlayer::_RegisterScriptBindings() {
BS_Kernel *pKernel = BS_Kernel::GetInstance();
BS_ASSERT(pKernel);
BS_ScriptEngine *pScript = static_cast<BS_ScriptEngine *>(pKernel->GetService("script"));
Modified: scummvm/trunk/engines/sword25/gfx/animation.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animation.cpp 2010-10-12 22:51:37 UTC (rev 53257)
+++ scummvm/trunk/engines/sword25/gfx/animation.cpp 2010-10-12 22:53:49 UTC (rev 53258)
@@ -56,8 +56,8 @@
// Konstruktion / Destruktion
// --------------------------
-BS_Animation::BS_Animation(BS_RenderObjectPtr<BS_RenderObject> ParentPtr, const Common::String &FileName) :
- BS_TimedRenderObject(ParentPtr, BS_RenderObject::TYPE_ANIMATION) {
+Animation::Animation(RenderObjectPtr<RenderObject> ParentPtr, const Common::String &FileName) :
+ TimedRenderObject(ParentPtr, RenderObject::TYPE_ANIMATION) {
// Das BS_RenderObject konnte nicht erzeugt werden, daher muss an dieser Stelle abgebrochen werden.
if (!m_InitSuccess) return;
@@ -74,8 +74,8 @@
// -----------------------------------------------------------------------------
-BS_Animation::BS_Animation(BS_RenderObjectPtr<BS_RenderObject> ParentPtr, const BS_AnimationTemplate &Template) :
- BS_TimedRenderObject(ParentPtr, BS_RenderObject::TYPE_ANIMATION) {
+Animation::Animation(RenderObjectPtr<RenderObject> ParentPtr, const AnimationTemplate &Template) :
+ TimedRenderObject(ParentPtr, RenderObject::TYPE_ANIMATION) {
// Das BS_RenderObject konnte nicht erzeugt werden, daher muss an dieser Stelle abgebrochen werden.
if (!m_InitSuccess) return;
@@ -84,7 +84,7 @@
// Vom negativen Fall ausgehen.
m_InitSuccess = false;
- m_AnimationTemplateHandle = BS_AnimationTemplate::Create(Template);
+ m_AnimationTemplateHandle = AnimationTemplate::Create(Template);
// Erfolg signalisieren.
m_InitSuccess = true;
@@ -92,8 +92,8 @@
// -----------------------------------------------------------------------------
-BS_Animation::BS_Animation(BS_InputPersistenceBlock &Reader, BS_RenderObjectPtr<BS_RenderObject> ParentPtr, unsigned int Handle) :
- BS_TimedRenderObject(ParentPtr, BS_RenderObject::TYPE_ANIMATION, Handle) {
+Animation::Animation(BS_InputPersistenceBlock &Reader, RenderObjectPtr<RenderObject> ParentPtr, unsigned int Handle) :
+ TimedRenderObject(ParentPtr, RenderObject::TYPE_ANIMATION, Handle) {
// Das BS_RenderObject konnte nicht erzeugt werden, daher muss an dieser Stelle abgebrochen werden.
if (!m_InitSuccess) return;
@@ -105,11 +105,11 @@
// -----------------------------------------------------------------------------
-void BS_Animation::InitializeAnimationResource(const Common::String &FileName) {
+void Animation::InitializeAnimationResource(const Common::String &FileName) {
// Die Resource wird f\xFCr die gesamte Lebensdauer des Animations-Objektes gelockt.
BS_Resource *ResourcePtr = BS_Kernel::GetInstance()->GetResourceManager()->RequestResource(FileName);
if (ResourcePtr && ResourcePtr->GetType() == BS_Resource::TYPE_ANIMATION)
- m_AnimationResourcePtr = static_cast<BS_AnimationResource *>(ResourcePtr);
+ m_AnimationResourcePtr = static_cast<AnimationResource *>(ResourcePtr);
else {
BS_LOG_ERRORLN("The resource \"%s\" could not be requested. The Animation can't be created.", FileName.c_str());
return;
@@ -121,7 +121,7 @@
// -----------------------------------------------------------------------------
-void BS_Animation::InitMembers() {
+void Animation::InitMembers() {
m_CurrentFrame = 0;
m_CurrentFrameTime = 0;
m_Direction = FORWARD;
@@ -139,7 +139,7 @@
// -----------------------------------------------------------------------------
-BS_Animation::~BS_Animation() {
+Animation::~Animation() {
if (GetAnimationDescription()) {
Stop();
GetAnimationDescription()->Unlock();
@@ -155,7 +155,7 @@
// Steuermethoden
// -----------------------------------------------------------------------------
-void BS_Animation::Play() {
+void Animation::Play() {
// Wenn die Animation zuvor komplett durchgelaufen ist, wird sie wieder von Anfang abgespielt
if (m_Finished) Stop();
@@ -165,14 +165,14 @@
// -----------------------------------------------------------------------------
-void BS_Animation::Pause() {
+void Animation::Pause() {
m_Running = false;
UnlockAllFrames();
}
// -----------------------------------------------------------------------------
-void BS_Animation::Stop() {
+void Animation::Stop() {
m_CurrentFrame = 0;
m_CurrentFrameTime = 0;
m_Direction = FORWARD;
@@ -181,8 +181,8 @@
// -----------------------------------------------------------------------------
-void BS_Animation::SetFrame(unsigned int Nr) {
- BS_AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
+void Animation::SetFrame(unsigned int Nr) {
+ AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
BS_ASSERT(animationDescriptionPtr);
if (Nr >= animationDescriptionPtr->GetFrameCount()) {
@@ -201,8 +201,8 @@
// Rendern
// -----------------------------------------------------------------------------
-bool BS_Animation::DoRender() {
- BS_AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
+bool Animation::DoRender() {
+ AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
BS_ASSERT(animationDescriptionPtr);
BS_ASSERT(m_CurrentFrame < animationDescriptionPtr->GetFrameCount());
@@ -210,23 +210,23 @@
BS_Resource *pResource = BS_Kernel::GetInstance()->GetResourceManager()->RequestResource(animationDescriptionPtr->GetFrame(m_CurrentFrame).FileName);
BS_ASSERT(pResource);
BS_ASSERT(pResource->GetType() == BS_Resource::TYPE_BITMAP);
- BS_BitmapResource *pBitmapResource = static_cast<BS_BitmapResource *>(pResource);
+ BitmapResource *pBitmapResource = static_cast<BitmapResource *>(pResource);
// Framebufferobjekt holen
- BS_GraphicEngine *pGfx = static_cast<BS_GraphicEngine *>(BS_Kernel::GetInstance()->GetService("gfx"));
+ GraphicEngine *pGfx = static_cast<GraphicEngine *>(BS_Kernel::GetInstance()->GetService("gfx"));
BS_ASSERT(pGfx);
// Bitmap zeichnen
bool Result;
if (IsScalingAllowed() && (m_Width != pBitmapResource->GetWidth() || m_Height != pBitmapResource->GetHeight())) {
Result = pBitmapResource->Blit(m_AbsoluteX, m_AbsoluteY,
- (animationDescriptionPtr->GetFrame(m_CurrentFrame).FlipV ? BS_BitmapResource::FLIP_V : 0) |
- (animationDescriptionPtr->GetFrame(m_CurrentFrame).FlipH ? BS_BitmapResource::FLIP_H : 0),
+ (animationDescriptionPtr->GetFrame(m_CurrentFrame).FlipV ? BitmapResource::FLIP_V : 0) |
+ (animationDescriptionPtr->GetFrame(m_CurrentFrame).FlipH ? BitmapResource::FLIP_H : 0),
0, m_ModulationColor, m_Width, m_Height);
} else {
Result = pBitmapResource->Blit(m_AbsoluteX, m_AbsoluteY,
- (animationDescriptionPtr->GetFrame(m_CurrentFrame).FlipV ? BS_BitmapResource::FLIP_V : 0) |
- (animationDescriptionPtr->GetFrame(m_CurrentFrame).FlipH ? BS_BitmapResource::FLIP_H : 0),
+ (animationDescriptionPtr->GetFrame(m_CurrentFrame).FlipV ? BitmapResource::FLIP_V : 0) |
+ (animationDescriptionPtr->GetFrame(m_CurrentFrame).FlipH ? BitmapResource::FLIP_H : 0),
0, m_ModulationColor, -1, -1);
}
@@ -240,8 +240,8 @@
// Frame Notifikation
// -----------------------------------------------------------------------------
-void BS_Animation::FrameNotification(int TimeElapsed) {
- BS_AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
+void Animation::FrameNotification(int TimeElapsed) {
+ AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
BS_ASSERT(animationDescriptionPtr);
BS_ASSERT(TimeElapsed >= 0);
@@ -341,15 +341,15 @@
// -----------------------------------------------------------------------------
-void BS_Animation::ComputeCurrentCharacteristics() {
- BS_AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
+void Animation::ComputeCurrentCharacteristics() {
+ AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
BS_ASSERT(animationDescriptionPtr);
- const BS_AnimationResource::Frame &CurFrame = animationDescriptionPtr->GetFrame(m_CurrentFrame);
+ const AnimationResource::Frame &CurFrame = animationDescriptionPtr->GetFrame(m_CurrentFrame);
BS_Resource *pResource = BS_Kernel::GetInstance()->GetResourceManager()->RequestResource(CurFrame.FileName);
BS_ASSERT(pResource);
BS_ASSERT(pResource->GetType() == BS_Resource::TYPE_BITMAP);
- BS_BitmapResource *pBitmap = static_cast<BS_BitmapResource *>(pResource);
+ BitmapResource *pBitmap = static_cast<BitmapResource *>(pResource);
// Gr\xF6\xDFe des Bitmaps auf die Animation \xFCbertragen
m_Width = static_cast<int>(pBitmap->GetWidth() * m_ScaleFactorX);
@@ -359,16 +359,16 @@
int PosX = m_RelX + ComputeXModifier();
int PosY = m_RelY + ComputeYModifier();
- BS_RenderObject::SetPos(PosX, PosY);
+ RenderObject::SetPos(PosX, PosY);
pBitmap->Release();
}
// -----------------------------------------------------------------------------
-bool BS_Animation::LockAllFrames() {
+bool Animation::LockAllFrames() {
if (!m_FramesLocked) {
- BS_AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
+ AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
BS_ASSERT(animationDescriptionPtr);
for (unsigned int i = 0; i < animationDescriptionPtr->GetFrameCount(); ++i) {
if (!BS_Kernel::GetInstance()->GetResourceManager()->RequestResource(animationDescriptionPtr->GetFrame(i).FileName)) {
@@ -385,9 +385,9 @@
// -----------------------------------------------------------------------------
-bool BS_Animation::UnlockAllFrames() {
+bool Animation::UnlockAllFrames() {
if (m_FramesLocked) {
- BS_AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
+ AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
BS_ASSERT(animationDescriptionPtr);
for (unsigned int i = 0; i < animationDescriptionPtr->GetFrameCount(); ++i) {
BS_Resource *pResource;
@@ -411,48 +411,48 @@
// Getter
// -----------------------------------------------------------------------------
-BS_Animation::ANIMATION_TYPES BS_Animation::GetAnimationType() const {
- BS_AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
+Animation::ANIMATION_TYPES Animation::GetAnimationType() const {
+ AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
BS_ASSERT(animationDescriptionPtr);
return animationDescriptionPtr->GetAnimationType();
}
// -----------------------------------------------------------------------------
-int BS_Animation::GetFPS() const {
- BS_AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
+int Animation::GetFPS() const {
+ AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
BS_ASSERT(animationDescriptionPtr);
return animationDescriptionPtr->GetFPS();
}
// -----------------------------------------------------------------------------
-int BS_Animation::GetFrameCount() const {
- BS_AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
+int Animation::GetFrameCount() const {
+ AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
BS_ASSERT(animationDescriptionPtr);
return animationDescriptionPtr->GetFrameCount();
}
// -----------------------------------------------------------------------------
-bool BS_Animation::IsScalingAllowed() const {
- BS_AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
+bool Animation::IsScalingAllowed() const {
+ AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
BS_ASSERT(animationDescriptionPtr);
return animationDescriptionPtr->IsScalingAllowed();
}
// -----------------------------------------------------------------------------
-bool BS_Animation::IsAlphaAllowed() const {
- BS_AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
+bool Animation::IsAlphaAllowed() const {
+ AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
BS_ASSERT(animationDescriptionPtr);
return animationDescriptionPtr->IsAlphaAllowed();
}
// -----------------------------------------------------------------------------
-bool BS_Animation::IsColorModulationAllowed() const {
- BS_AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
+bool Animation::IsColorModulationAllowed() const {
+ AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
BS_ASSERT(animationDescriptionPtr);
return animationDescriptionPtr->IsColorModulationAllowed();
}
@@ -461,7 +461,7 @@
// Positionieren
// -----------------------------------------------------------------------------
-void BS_Animation::SetPos(int RelX, int RelY) {
+void Animation::SetPos(int RelX, int RelY) {
m_RelX = RelX;
m_RelY = RelY;
@@ -470,7 +470,7 @@
// -----------------------------------------------------------------------------
-void BS_Animation::SetX(int RelX) {
+void Animation::SetX(int RelX) {
m_RelX = RelX;
ComputeCurrentCharacteristics();
@@ -478,7 +478,7 @@
// -----------------------------------------------------------------------------
-void BS_Animation::SetY(int RelY) {
+void Animation::SetY(int RelY) {
m_RelY = RelY;
ComputeCurrentCharacteristics();
@@ -488,8 +488,8 @@
// Darstellungsart festlegen
// -----------------------------------------------------------------------------
-void BS_Animation::SetAlpha(int Alpha) {
- BS_AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
+void Animation::SetAlpha(int Alpha) {
+ AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
BS_ASSERT(animationDescriptionPtr);
if (!animationDescriptionPtr->IsAlphaAllowed()) {
BS_LOG_WARNINGLN("Tried to set alpha value on an animation that does not support alpha. Call was ignored.");
@@ -505,8 +505,8 @@
// -----------------------------------------------------------------------------
-void BS_Animation::SetModulationColor(unsigned int ModulationColor) {
- BS_AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
+void Animation::SetModulationColor(unsigned int ModulationColor) {
+ AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
BS_ASSERT(animationDescriptionPtr);
if (!animationDescriptionPtr->IsColorModulationAllowed()) {
BS_LOG_WARNINGLN("Tried to set modulation color on an animation that does not support color modulation. Call was ignored");
@@ -522,15 +522,15 @@
// -----------------------------------------------------------------------------
-void BS_Animation::SetScaleFactor(float ScaleFactor) {
+void Animation::SetScaleFactor(float ScaleFactor) {
SetScaleFactorX(ScaleFactor);
SetScaleFactorY(ScaleFactor);
}
// -----------------------------------------------------------------------------
-void BS_Animation::SetScaleFactorX(float ScaleFactorX) {
- BS_AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
+void Animation::SetScaleFactorX(float ScaleFactorX) {
+ AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
BS_ASSERT(animationDescriptionPtr);
if (!animationDescriptionPtr->IsScalingAllowed()) {
BS_LOG_WARNINGLN("Tried to set x scale factor on an animation that does not support scaling. Call was ignored");
@@ -547,8 +547,8 @@
// -----------------------------------------------------------------------------
-void BS_Animation::SetScaleFactorY(float ScaleFactorY) {
- BS_AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
+void Animation::SetScaleFactorY(float ScaleFactorY) {
+ AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
BS_ASSERT(animationDescriptionPtr);
if (!animationDescriptionPtr->IsScalingAllowed()) {
BS_LOG_WARNINGLN("Tried to set y scale factor on an animation that does not support scaling. Call was ignored");
@@ -565,47 +565,47 @@
// -----------------------------------------------------------------------------
-const Common::String &BS_Animation::GetCurrentAction() const {
- BS_AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
+const Common::String &Animation::GetCurrentAction() const {
+ AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
BS_ASSERT(animationDescriptionPtr);
return animationDescriptionPtr->GetFrame(m_CurrentFrame).Action;
}
// -----------------------------------------------------------------------------
-int BS_Animation::GetX() const {
+int Animation::GetX() const {
return m_RelX;
}
// -----------------------------------------------------------------------------
-int BS_Animation::GetY() const {
+int Animation::GetY() const {
return m_RelY;
}
// -----------------------------------------------------------------------------
-int BS_Animation::GetAbsoluteX() const {
+int Animation::GetAbsoluteX() const {
return m_AbsoluteX + (m_RelX - m_X);
}
// -----------------------------------------------------------------------------
-int BS_Animation::GetAbsoluteY() const {
+int Animation::GetAbsoluteY() const {
return m_AbsoluteY + (m_RelY - m_Y);
}
// -----------------------------------------------------------------------------
-int BS_Animation::ComputeXModifier() const {
- BS_AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
+int Animation::ComputeXModifier() const {
+ AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
BS_ASSERT(animationDescriptionPtr);
- const BS_AnimationResource::Frame &CurFrame = animationDescriptionPtr->GetFrame(m_CurrentFrame);
+ const AnimationResource::Frame &CurFrame = animationDescriptionPtr->GetFrame(m_CurrentFrame);
BS_Resource *pResource = BS_Kernel::GetInstance()->GetResourceManager()->RequestResource(CurFrame.FileName);
BS_ASSERT(pResource);
BS_ASSERT(pResource->GetType() == BS_Resource::TYPE_BITMAP);
- BS_BitmapResource *pBitmap = static_cast<BS_BitmapResource *>(pResource);
+ BitmapResource *pBitmap = static_cast<BitmapResource *>(pResource);
int Result = CurFrame.FlipV ? - static_cast<int>((pBitmap->GetWidth() - 1 - CurFrame.HotspotX) * m_ScaleFactorX) :
- static_cast<int>(CurFrame.HotspotX * m_ScaleFactorX);
@@ -617,15 +617,15 @@
// -----------------------------------------------------------------------------
-int BS_Animation::ComputeYModifier() const {
- BS_AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
+int Animation::ComputeYModifier() const {
+ AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
BS_ASSERT(animationDescriptionPtr);
- const BS_AnimationResource::Frame &CurFrame = animationDescriptionPtr->GetFrame(m_CurrentFrame);
+ const AnimationResource::Frame &CurFrame = animationDescriptionPtr->GetFrame(m_CurrentFrame);
BS_Resource *pResource = BS_Kernel::GetInstance()->GetResourceManager()->RequestResource(CurFrame.FileName);
BS_ASSERT(pResource);
BS_ASSERT(pResource->GetType() == BS_Resource::TYPE_BITMAP);
- BS_BitmapResource *pBitmap = static_cast<BS_BitmapResource *>(pResource);
+ BitmapResource *pBitmap = static_cast<BitmapResource *>(pResource);
int Result = CurFrame.FlipH ? - static_cast<int>((pBitmap->GetHeight() - 1 - CurFrame.HotspotY) * m_ScaleFactorY) :
- static_cast<int>(CurFrame.HotspotY * m_ScaleFactorY);
@@ -637,7 +637,7 @@
// -----------------------------------------------------------------------------
-void BS_Animation::RegisterActionCallback(ANIMATION_CALLBACK Callback, unsigned int Data) {
+void Animation::RegisterActionCallback(ANIMATION_CALLBACK Callback, unsigned int Data) {
ANIMATION_CALLBACK_DATA CD;
CD.Callback = Callback;
CD.Data = Data;
@@ -646,7 +646,7 @@
// -----------------------------------------------------------------------------
-void BS_Animation::RegisterLoopPointCallback(ANIMATION_CALLBACK Callback, unsigned int Data) {
+void Animation::RegisterLoopPointCallback(ANIMATION_CALLBACK Callback, unsigned int Data) {
ANIMATION_CALLBACK_DATA CD;
CD.Callback = Callback;
CD.Data = Data;
@@ -655,7 +655,7 @@
// -----------------------------------------------------------------------------
-void BS_Animation::RegisterDeleteCallback(ANIMATION_CALLBACK Callback, unsigned int Data) {
+void Animation::RegisterDeleteCallback(ANIMATION_CALLBACK Callback, unsigned int Data) {
ANIMATION_CALLBACK_DATA CD;
CD.Callback = Callback;
CD.Data = Data;
@@ -666,7 +666,7 @@
// Persistenz
// -----------------------------------------------------------------------------
-void BS_Animation::PersistCallbackVector(BS_OutputPersistenceBlock &Writer, const Common::Array<ANIMATION_CALLBACK_DATA> & Vector) {
+void Animation::PersistCallbackVector(BS_OutputPersistenceBlock &Writer, const Common::Array<ANIMATION_CALLBACK_DATA> & Vector) {
// Anzahl an Callbacks persistieren.
Writer.Write(Vector.size());
@@ -682,7 +682,7 @@
// -----------------------------------------------------------------------------
-void BS_Animation::UnpersistCallbackVector(BS_InputPersistenceBlock &Reader, Common::Array<ANIMATION_CALLBACK_DATA> & Vector) {
+void Animation::UnpersistCallbackVector(BS_InputPersistenceBlock &Reader, Common::Array<ANIMATION_CALLBACK_DATA> & Vector) {
// Callbackvector leeren.
Vector.resize(0);
@@ -706,10 +706,10 @@
// -----------------------------------------------------------------------------
-bool BS_Animation::Persist(BS_OutputPersistenceBlock &Writer) {
+bool Animation::Persist(BS_OutputPersistenceBlock &Writer) {
bool Result = true;
- Result &= BS_RenderObject::Persist(Writer);
+ Result &= RenderObject::Persist(Writer);
Writer.Write(m_RelX);
Writer.Write(m_RelY);
@@ -742,17 +742,17 @@
PersistCallbackVector(Writer, m_ActionCallbacks);
PersistCallbackVector(Writer, m_DeleteCallbacks);
- Result &= BS_RenderObject::PersistChildren(Writer);
+ Result &= RenderObject::PersistChildren(Writer);
return Result;
}
// -----------------------------------------------------------------------------
-bool BS_Animation::Unpersist(BS_InputPersistenceBlock &Reader) {
+bool Animation::Unpersist(BS_InputPersistenceBlock &Reader) {
bool Result = true;
- Result &= BS_RenderObject::Unpersist(Reader);
+ Result &= RenderObject::Unpersist(Reader);
Reader.Read(m_RelX);
Reader.Read(m_RelY);
@@ -787,16 +787,16 @@
UnpersistCallbackVector(Reader, m_ActionCallbacks);
UnpersistCallbackVector(Reader, m_DeleteCallbacks);
- Result &= BS_RenderObject::UnpersistChildren(Reader);
+ Result &= RenderObject::UnpersistChildren(Reader);
return Reader.IsGood() && Result;
}
// -----------------------------------------------------------------------------
-BS_AnimationDescription *BS_Animation::GetAnimationDescription() const {
+AnimationDescription *Animation::GetAnimationDescription() const {
if (m_AnimationResourcePtr) return m_AnimationResourcePtr;
- else return BS_AnimationTemplateRegistry::GetInstance().ResolveHandle(m_AnimationTemplateHandle);
+ else return AnimationTemplateRegistry::GetInstance().ResolveHandle(m_AnimationTemplateHandle);
}
} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/animation.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animation.h 2010-10-12 22:51:37 UTC (rev 53257)
+++ scummvm/trunk/engines/sword25/gfx/animation.h 2010-10-12 22:53:49 UTC (rev 53258)
@@ -48,18 +48,18 @@
// 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<BS_RenderObject> ParentPtr, const Common::String &FileName);
- BS_Animation(BS_RenderObjectPtr<BS_RenderObject> ParentPtr, const BS_AnimationTemplate &Template);
- BS_Animation(BS_InputPersistenceBlock &Reader, BS_RenderObjectPtr<BS_RenderObject> ParentPtr, unsigned int Handle);
+ Animation(RenderObjectPtr<RenderObject> ParentPtr, const Common::String &FileName);
+ Animation(RenderObjectPtr<RenderObject> ParentPtr, const AnimationTemplate &Template);
+ Animation(BS_InputPersistenceBlock &Reader, RenderObjectPtr<RenderObject> ParentPtr, unsigned int Handle);
public:
enum ANIMATION_TYPES {
@@ -68,7 +68,7 @@
AT_JOJO
};
- virtual ~BS_Animation();
+ virtual ~Animation();
void Play();
void Pause();
@@ -179,7 +179,7 @@
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 @@
void InitMembers();
void PersistCallbackVector(BS_OutputPersistenceBlock &Writer, const Common::Array<ANIMATION_CALLBACK_DATA> & Vector);
void UnpersistCallbackVector(BS_InputPersistenceBlock &Reader, Common::Array<ANIMATION_CALLBACK_DATA> & Vector);
- BS_AnimationDescription *GetAnimationDescription() const;
+ AnimationDescription *GetAnimationDescription() const;
void InitializeAnimationResource(const Common::String &FileName);
};
Modified: scummvm/trunk/engines/sword25/gfx/animationdescription.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationdescription.cpp 2010-10-12 22:51:37 UTC (rev 53257)
+++ scummvm/trunk/engines/sword25/gfx/animationdescription.cpp 2010-10-12 22:53:49 UTC (rev 53258)
@@ -46,7 +46,7 @@
// Persistenz
// -----------------------------------------------------------------------------
-bool BS_AnimationDescription::Persist(BS_OutputPersistenceBlock &Writer) {
+bool AnimationDescription::Persist(BS_OutputPersistenceBlock &Writer) {
Writer.Write(static_cast<unsigned int>(m_AnimationType));
Writer.Write(m_FPS);
Writer.Write(m_MillisPerFrame);
@@ -59,10 +59,10 @@
// -----------------------------------------------------------------------------
-bool BS_AnimationDescription::Unpersist(BS_InputPersistenceBlock &Reader) {
+bool AnimationDescription::Unpersist(BS_InputPersistenceBlock &Reader) {
unsigned int AnimationType;
Reader.Read(AnimationType);
- m_AnimationType = static_cast<BS_Animation::ANIMATION_TYPES>(AnimationType);
+ m_AnimationType = static_cast<Animation::ANIMATION_TYPES>(AnimationType);
Reader.Read(m_FPS);
Reader.Read(m_MillisPerFrame);
Reader.Read(m_ScalingAllowed);
Modified: scummvm/trunk/engines/sword25/gfx/animationdescription.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationdescription.h 2010-10-12 22:51:37 UTC (rev 53257)
+++ scummvm/trunk/engines/sword25/gfx/animationdescription.h 2010-10-12 22:53:49 UTC (rev 53258)
@@ -49,10 +49,10 @@
// Klassendefinition
// -----------------------------------------------------------------------------
-class BS_AnimationDescription : public BS_Persistable {
+class AnimationDescription : public BS_Persistable {
protected:
- BS_AnimationDescription() :
- m_AnimationType(BS_Animation::AT_LOOP),
+ AnimationDescription() :
+ m_AnimationType(Animation::AT_LOOP),
m_FPS(10),
m_MillisPerFrame(0),
m_ScalingAllowed(true),
@@ -83,7 +83,7 @@
// Getter Methoden
// -----------------------------------------------------------------------------
- BS_Animation::ANIMATION_TYPES GetAnimationType() const {
+ Animation::ANIMATION_TYPES GetAnimationType() const {
return m_AnimationType;
}
int GetFPS() const {
@@ -106,7 +106,7 @@
virtual bool Unpersist(BS_InputPersistenceBlock &Reader);
protected:
- BS_Animation::ANIMATION_TYPES m_AnimationType;
+ Animation::ANIMATION_TYPES m_AnimationType;
int m_FPS;
int m_MillisPerFrame;
bool m_ScalingAllowed;
Modified: scummvm/trunk/engines/sword25/gfx/animationresource.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationresource.cpp 2010-10-12 22:51:37 UTC (rev 53257)
+++ scummvm/trunk/engines/sword25/gfx/animationresource.cpp 2010-10-12 22:53:49 UTC (rev 53258)
@@ -64,7 +64,7 @@
// Construction / Destruction
// -----------------------------------------------------------------------------
-BS_AnimationResource::BS_AnimationResource(const Common::String &FileName) :
+AnimationResource::AnimationResource(const Common::String &FileName) :
BS_Resource(FileName, BS_Resource::TYPE_ANIMATION),
m_Valid(false) {
// Pointer auf den Package-Manager bekommen
@@ -166,7 +166,7 @@
// Dokument-Parsermethoden
// -----------------------------------------------------------------------------
-bool BS_AnimationResource::ParseAnimationTag(TiXmlElement &AnimationTag, int &FPS, BS_Animation::ANIMATION_TYPES &AnimationType) {
+bool AnimationResource::ParseAnimationTag(TiXmlElement &AnimationTag, int &FPS, Animation::ANIMATION_TYPES &AnimationType) {
// FPS einlesen
const char *FPSString;
if ((FPSString = AnimationTag.Attribute("fps"))) {
@@ -183,11 +183,11 @@
const char *LoopTypeString;
if ((LoopTypeString = AnimationTag.Attribute("type"))) {
if (strcmp(LoopTypeString, "oneshot") == 0)
- AnimationType = BS_Animation::AT_ONESHOT;
+ AnimationType = Animation::AT_ONESHOT;
else if (strcmp(LoopTypeString, "loop") == 0)
- AnimationType = BS_Animation::AT_LOOP;
+ AnimationType = Animation::AT_LOOP;
else if (strcmp(LoopTypeString, "jojo") == 0)
- AnimationType = BS_Animation::AT_JOJO;
+ AnimationType = Animation::AT_JOJO;
else
BS_LOG_WARNINGLN("Illegal type value (\"%s\") in <animation> tag in \"%s\". Assuming default (\"loop\").",
LoopTypeString, GetFileName().c_str());
@@ -198,7 +198,7 @@
// -----------------------------------------------------------------------------
-bool BS_AnimationResource::ParseFrameTag(TiXmlElement &FrameTag, Frame &Frame_, BS_PackageManager &PackageManager) {
+bool AnimationResource::ParseFrameTag(TiXmlElement &FrameTag, Frame &Frame_, BS_PackageManager &PackageManager) {
const char *FileString = FrameTag.Attribute("file");
if (!FileString) {
BS_LOG_ERRORLN("<frame> tag without file attribute occurred in \"%s\".", GetFileName().c_str());
@@ -258,12 +258,12 @@
// -----------------------------------------------------------------------------
-BS_AnimationResource::~BS_AnimationResource() {
+AnimationResource::~AnimationResource() {
}
// -----------------------------------------------------------------------------
-bool BS_AnimationResource::PrecacheAllFrames() const {
+bool AnimationResource::PrecacheAllFrames() const {
Common::Array<Frame>::const_iterator Iter = m_Frames.begin();
for (; Iter != m_Frames.end(); ++Iter) {
if (!BS_Kernel::GetInstance()->GetResourceManager()->PrecacheResource((*Iter).FileName)) {
@@ -277,7 +277,7 @@
// -----------------------------------------------------------------------------
-bool BS_AnimationResource::ComputeFeatures() {
+bool AnimationResource::ComputeFeatures() {
BS_ASSERT(m_Frames.size());
// Alle Features werden als vorhanden angenommen
@@ -288,8 +288,8 @@
// Alle Frame durchgehen und alle Features deaktivieren, die auch nur von einem Frame nicht unterst\xFCtzt werden.
Common::Array<Frame>::const_iterator Iter = m_Frames.begin();
for (; Iter != m_Frames.end(); ++Iter) {
- BS_BitmapResource *pBitmap;
- if (!(pBitmap = static_cast<BS_BitmapResource *>(BS_Kernel::GetInstance()->GetResourceManager()->RequestResource((*Iter).FileName)))) {
+ BitmapResource *pBitmap;
+ if (!(pBitmap = static_cast<BitmapResource *>(BS_Kernel::GetInstance()->GetResourceManager()->RequestResource((*Iter).FileName)))) {
BS_LOG_ERRORLN("Could not request \"%s\".", (*Iter).FileName.c_str());
return false;
}
Modified: scummvm/trunk/engines/sword25/gfx/animationresource.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationresource.h 2010-10-12 22:51:37 UTC (rev 53257)
+++ scummvm/trunk/engines/sword25/gfx/animationresource.h 2010-10-12 22:53:49 UTC (rev 53258)
@@ -63,10 +63,10 @@
// Class Definition
// -----------------------------------------------------------------------------
-class BS_AnimationResource : public BS_Resource, public BS_AnimationDescription {
+class AnimationResource : public BS_Resource, public AnimationDescription {
public:
- BS_AnimationResource(const Common::String &FileName);
- virtual ~BS_AnimationResource();
+ AnimationResource(const Common::String &FileName);
+ virtual ~AnimationResource();
virtual const Frame &GetFrame(unsigned int Index) const {
BS_ASSERT(Index < m_Frames.size());
@@ -79,7 +79,7 @@
Release();
}
- BS_Animation::ANIMATION_TYPES GetAnimationType() const {
+ Animation::ANIMATION_TYPES GetAnimationType() const {
return m_AnimationType;
}
int GetFPS() const {
@@ -109,7 +109,7 @@
//@{
/** @name Dokument-Parser Methoden */
- bool ParseAnimationTag(TiXmlElement &AnimationTag, int &FPS, BS_Animation::ANIMATION_TYPES &AnimationType);
+ bool ParseAnimationTag(TiXmlElement &AnimationTag, int &FPS, Animation::ANIMATION_TYPES &AnimationType);
bool ParseFrameTag(TiXmlElement &FrameTag, Frame &Frame, BS_PackageManager &PackageManager);
//@}
Modified: scummvm/trunk/engines/sword25/gfx/animationtemplate.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationtemplate.cpp 2010-10-12 22:51:37 UTC (rev 53257)
+++ scummvm/trunk/engines/sword25/gfx/animationtemplate.cpp 2010-10-12 22:53:49 UTC (rev 53258)
@@ -53,11 +53,11 @@
// Konstruktion / Destruktion
// -----------------------------------------------------------------------------
-unsigned int BS_AnimationTemplate::Create(const Common::String &SourceAnimation) {
- BS_AnimationTemplate *AnimationTemplatePtr = new BS_AnimationTemplate(SourceAnimation);
+unsigned int AnimationTemplate::Create(const Common::String &SourceAnimation) {
+ AnimationTemplate *AnimationTemplatePtr = new AnimationTemplate(SourceAnimation);
if (AnimationTemplatePtr->IsValid()) {
- return BS_AnimationTemplateRegistry::GetInstance().ResolvePtr(AnimationTemplatePtr);
+ return AnimationTemplateRegistry::GetInstance().ResolvePtr(AnimationTemplatePtr);
} else {
delete AnimationTemplatePtr;
return 0;
@@ -66,11 +66,11 @@
// -----------------------------------------------------------------------------
-unsigned int BS_AnimationTemplate::Create(const BS_AnimationTemplate &Other) {
- BS_AnimationTemplate *AnimationTemplatePtr = new BS_AnimationTemplate(Other);
+unsigned int AnimationTemplate::Create(const AnimationTemplate &Other) {
+ AnimationTemplate *AnimationTemplatePtr = new AnimationTemplate(Other);
if (AnimationTemplatePtr->IsValid()) {
- return BS_AnimationTemplateRegistry::GetInstance().ResolvePtr(AnimationTemplatePtr);
+ return AnimationTemplateRegistry::GetInstance().ResolvePtr(AnimationTemplatePtr);
} else {
delete AnimationTemplatePtr;
return 0;
@@ -79,11 +79,11 @@
// -----------------------------------------------------------------------------
-unsigned int BS_AnimationTemplate::Create(BS_InputPersistenceBlock &Reader, unsigned int Handle) {
- BS_AnimationTemplate *AnimationTemplatePtr = new BS_AnimationTemplate(Reader, Handle);
+unsigned int AnimationTemplate::Create(BS_InputPersistenceBlock &Reader, unsigned int Handle) {
+ AnimationTemplate *AnimationTemplatePtr = new AnimationTemplate(Reader, Handle);
if (AnimationTemplatePtr->IsValid()) {
- return BS_AnimationTemplateRegistry::GetInstance().ResolvePtr(AnimationTemplatePtr);
+ return AnimationTemplateRegistry::GetInstance().ResolvePtr(AnimationTemplatePtr);
} else {
delete AnimationTemplatePtr;
return 0;
@@ -92,9 +92,9 @@
// -----------------------------------------------------------------------------
-BS_AnimationTemplate::BS_AnimationTemplate(const Common::String &SourceAnimation) {
+AnimationTemplate::AnimationTemplate(const Common::String &SourceAnimation) {
// Objekt registrieren.
- BS_AnimationTemplateRegistry::GetInstance().RegisterObject(this);
+ AnimationTemplateRegistry::GetInstance().RegisterObject(this);
m_Valid = false;
@@ -107,9 +107,9 @@
// -----------------------------------------------------------------------------
-BS_AnimationTemplate::BS_AnimationTemplate(const BS_AnimationTemplate &Other) {
+AnimationTemplate::AnimationTemplate(const AnimationTemplate &Other) {
// Objekt registrieren.
- BS_AnimationTemplateRegistry::GetInstance().RegisterObject(this);
+ AnimationTemplateRegistry::GetInstance().RegisterObject(this);
m_Valid = false;
@@ -133,9 +133,9 @@
// -----------------------------------------------------------------------------
-BS_AnimationTemplate::BS_AnimationTemplate(BS_InputPersistenceBlock &Reader, unsigned int Handle) {
+AnimationTemplate::AnimationTemplate(BS_InputPersistenceBlock &Reader, unsigned int Handle) {
// Objekt registrieren.
- BS_AnimationTemplateRegistry::GetInstance().RegisterObject(this, Handle);
+ AnimationTemplateRegistry::GetInstance().RegisterObject(this, Handle);
// Objekt laden.
m_Valid = Unpersist(Reader);
@@ -143,31 +143,31 @@
// -----------------------------------------------------------------------------
-BS_AnimationResource *BS_AnimationTemplate::RequestSourceAnimation(const Common::String &SourceAnimation) const {
+AnimationResource *AnimationTemplate::RequestSourceAnimation(const Common::String &SourceAnimation) const {
BS_ResourceManager *RMPtr = BS_Kernel::GetInstance()->GetResourceManager();
BS_Resource *ResourcePtr;
if (NULL == (ResourcePtr = RMPtr->RequestResource(SourceAnimation)) || ResourcePtr->GetType() != BS_Resource::TYPE_ANIMATION) {
BS_LOG_ERRORLN("The resource \"%s\" could not be requested or is has an invalid type. The animation template can't be created.", SourceAnimation.c_str());
return 0;
}
- return static_cast<BS_AnimationResource *>(ResourcePtr);
+ return static_cast<AnimationResource *>(ResourcePtr);
}
// -----------------------------------------------------------------------------
-BS_AnimationTemplate::~BS_AnimationTemplate() {
+AnimationTemplate::~AnimationTemplate() {
// Animations-Resource freigeben
if (m_SourceAnimationPtr) {
m_SourceAnimationPtr->Release();
}
// Objekt deregistrieren
- BS_AnimationTemplateRegistry::GetInstance().DeregisterObject(this);
+ AnimationTemplateRegistry::GetInstance().DeregisterObject(this);
}
// -----------------------------------------------------------------------------
-void BS_AnimationTemplate::AddFrame(int Index) {
+void AnimationTemplate::AddFrame(int Index) {
if (ValidateSourceIndex(Index)) {
m_Frames.push_back(m_SourceAnimationPtr->GetFrame(Index));
}
@@ -175,7 +175,7 @@
// -----------------------------------------------------------------------------
-void BS_AnimationTemplate::SetFrame(int DestIndex, int SrcIndex) {
+void AnimationTemplate::SetFrame(int DestIndex, int SrcIndex) {
if (ValidateDestIndex(DestIndex) && ValidateSourceIndex(SrcIndex)) {
m_Frames[DestIndex] = m_SourceAnimationPtr->GetFrame(SrcIndex);
}
@@ -183,7 +183,7 @@
// -----------------------------------------------------------------------------
-bool BS_AnimationTemplate::ValidateSourceIndex(unsigned int Index) const {
+bool AnimationTemplate::ValidateSourceIndex(unsigned int Index) const {
if (Index > m_SourceAnimationPtr->GetFrameCount()) {
BS_LOG_WARNINGLN("Tried to insert a frame (\"%d\") that does not exist in the source animation (\"%s\"). Ignoring call.",
Index, m_SourceAnimationPtr->GetFileName().c_str());
@@ -194,7 +194,7 @@
// -----------------------------------------------------------------------------
-bool BS_AnimationTemplate::ValidateDestIndex(unsigned int Index) const {
+bool AnimationTemplate::ValidateDestIndex(unsigned int Index) const {
if (Index > m_Frames.size()) {
BS_LOG_WARNINGLN("Tried to change a nonexistent frame (\"%d\") in a template animation. Ignoring call.",
Index);
@@ -205,18 +205,18 @@
// -----------------------------------------------------------------------------
-void BS_AnimationTemplate::SetFPS(int FPS) {
+void AnimationTemplate::SetFPS(int FPS) {
m_FPS = FPS;
m_MillisPerFrame = 1000000 / m_FPS;
}
// -----------------------------------------------------------------------------
-bool BS_AnimationTemplate::Persist(BS_OutputPersistenceBlock &Writer) {
+bool AnimationTemplate::Persist(BS_OutputPersistenceBlock &Writer) {
bool Result = true;
// Parent persistieren.
- Result &= BS_AnimationDescription::Persist(Writer);
+ Result &= AnimationDescription::Persist(Writer);
// Frameanzahl schreiben.
Writer.Write(m_Frames.size());
@@ -242,11 +242,11 @@
// -----------------------------------------------------------------------------
-bool BS_AnimationTemplate::Unpersist(BS_InputPersistenceBlock &Reader) {
+bool AnimationTemplate::Unpersist(BS_InputPersistenceBlock &Reader) {
bool Result = true;
// Parent wieder herstellen.
- Result &= BS_AnimationDescription::Unpersist(Reader);
+ Result &= AnimationDescription::Unpersist(Reader);
// Frameanzahl lesen.
unsigned int FrameCount;
Modified: scummvm/trunk/engines/sword25/gfx/animationtemplate.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationtemplate.h 2010-10-12 22:51:37 UTC (rev 53257)
+++ scummvm/trunk/engines/sword25/gfx/animationtemplate.h 2010-10-12 22:53:49 UTC (rev 53258)
@@ -53,26 +53,26 @@
// Forward declarations
// -----------------------------------------------------------------------------
-class BS_AnimationResource;
+class AnimationResource;
// -----------------------------------------------------------------------------
// Klassendefinition
// -----------------------------------------------------------------------------
-class BS_AnimationTemplate : public BS_AnimationDescription {
+class AnimationTemplate : public AnimationDescription {
public:
static unsigned int Create(const Common::String &SourceAnimation);
- static unsigned int Create(const BS_AnimationTemplate &Other);
+ static unsigned int Create(const AnimationTemplate &Other);
static unsigned int Create(BS_InputPersistenceBlock &Reader, unsigned int Handle);
- BS_AnimationTemplate *ResolveHandle(unsigned int Handle) const;
+ AnimationTemplate *ResolveHandle(unsigned int Handle) const;
private:
- BS_AnimationTemplate(const Common::String &SourceAnimation);
- BS_AnimationTemplate(const BS_AnimationTemplate &Other);
- BS_AnimationTemplate(BS_InputPersistenceBlock &Reader, unsigned int Handle);
+ AnimationTemplate(const Common::String &SourceAnimation);
+ AnimationTemplate(const AnimationTemplate &Other);
+ AnimationTemplate(BS_InputPersistenceBlock &Reader, unsigned int Handle);
public:
- ~BS_AnimationTemplate();
+ ~AnimationTemplate();
virtual const Frame &GetFrame(unsigned int Index) const {
BS_ASSERT(Index < m_Frames.size());
@@ -109,7 +109,7 @@
@brief Setzt den Animationstyp.
@param Type der Typ der Animation. Muss aus den enum BS_Animation::ANIMATION_TYPES sein.
*/
- void SetAnimationType(BS_Animation::ANIMATION_TYPES Type) {
+ void SetAnimationType(Animation::ANIMATION_TYPES Type) {
m_AnimationType = Type;
}
@@ -124,10 +124,10 @@
private:
Common::Array<Frame> m_Frames;
- BS_AnimationResource *m_SourceAnimationPtr;
+ AnimationResource *m_SourceAnimationPtr;
bool m_Valid;
- BS_AnimationResource *RequestSourceAnimation(const Common::String &SourceAnimation) const;
+ AnimationResource *RequestSourceAnimation(const Common::String &SourceAnimation) const;
bool ValidateSourceIndex(unsigned int Index) const;
bool ValidateDestIndex(unsigned int Index) const;
};
Modified: scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.cpp 2010-10-12 22:51:37 UTC (rev 53257)
+++ scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.cpp 2010-10-12 22:53:49 UTC (rev 53258)
@@ -53,23 +53,23 @@
// Implementation
// -----------------------------------------------------------------------------
-std::auto_ptr<BS_AnimationTemplateRegistry> BS_AnimationTemplateRegistry::m_InstancePtr;
+std::auto_ptr<AnimationTemplateRegistry> AnimationTemplateRegistry::m_InstancePtr;
// -----------------------------------------------------------------------------
-void BS_AnimationTemplateRegistry::LogErrorLn(const char *Message) const {
+void AnimationTemplateRegistry::LogErrorLn(const char *Message) const {
BS_LOG_ERRORLN(Message);
}
// -----------------------------------------------------------------------------
-void BS_AnimationTemplateRegistry::LogWarningLn(const char *Message) const {
+void AnimationTemplateRegistry::LogWarningLn(const char *Message) const {
BS_LOG_WARNINGLN(Message);
}
// -----------------------------------------------------------------------------
-bool BS_AnimationTemplateRegistry::Persist(BS_OutputPersistenceBlock &Writer) {
+bool AnimationTemplateRegistry::Persist(BS_OutputPersistenceBlock &Writer) {
bool Result = true;
// Das n\xE4chste zu vergebene Handle schreiben.
@@ -95,7 +95,7 @@
// -----------------------------------------------------------------------------
-bool BS_AnimationTemplateRegistry::Unpersist(BS_InputPersistenceBlock &Reader) {
+bool AnimationTemplateRegistry::Unpersist(BS_InputPersistenceBlock &Reader) {
bool Result = true;
// Das n\xE4chste zu vergebene Handle wieder herstellen.
@@ -116,7 +116,7 @@
Reader.Read(Handle);
// BS_AnimationTemplate wieder herstellen.
- Result &= (BS_AnimationTemplate::Create(Reader, Handle) != 0);
+ Result &= (AnimationTemplate::Create(Reader, Handle) != 0);
}
return Reader.IsGood() && Result;
Modified: scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.h 2010-10-12 22:51:37 UTC (rev 53257)
+++ scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.h 2010-10-12 22:53:49 UTC (rev 53258)
@@ -53,16 +53,16 @@
// Forward Deklarationen
// -----------------------------------------------------------------------------
-class BS_AnimationTemplate;
+class AnimationTemplate;
// -----------------------------------------------------------------------------
// Klassendeklaration
// -----------------------------------------------------------------------------
-class BS_AnimationTemplateRegistry : public BS_ObjectRegistry<BS_AnimationTemplate>, public BS_Persistable {
+class AnimationTemplateRegistry : public BS_ObjectRegistry<AnimationTemplate>, public BS_Persistable {
public:
- static BS_AnimationTemplateRegistry &GetInstance() {
- if (!m_InstancePtr.get()) m_InstancePtr.reset(new BS_AnimationTemplateRegistry);
+ static AnimationTemplateRegistry &GetInstance() {
+ if (!m_InstancePtr.get()) m_InstancePtr.reset(new AnimationTemplateRegistry);
return *m_InstancePtr.get();
}
@@ -73,7 +73,7 @@
virtual void LogErrorLn(const char *Message) const;
virtual void LogWarningLn(const char *Message) const;
- static std::auto_ptr<BS_AnimationTemplateRegistry> m_InstancePtr;
+ static std::auto_ptr<AnimationTemplateRegistry> m_InstancePtr;
};
} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/bitmap.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/bitmap.cpp 2010-10-12 22:51:37 UTC (rev 53257)
+++ scummvm/trunk/engines/sword25/gfx/bitmap.cpp 2010-10-12 22:53:49 UTC (rev 53258)
@@ -52,8 +52,8 @@
// Konstruktion / Destruktion
// -----------------------------------------------------------------------------
-BS_Bitmap::BS_Bitmap(BS_RenderObjectPtr<BS_RenderObject> ParentPtr, TYPES Type, unsigned int Handle) :
- BS_RenderObject(ParentPtr, Type, Handle),
+Bitmap::Bitmap(RenderObjectPtr<RenderObject> ParentPtr, TYPES Type, unsigned int Handle) :
+ RenderObject(ParentPtr, Type, Handle),
m_ModulationColor(0xffffffff),
m_ScaleFactorX(1.0f),
m_ScaleFactorY(1.0f),
@@ -63,14 +63,14 @@
// -----------------------------------------------------------------------------
-BS_Bitmap::~BS_Bitmap() {
+Bitmap::~Bitmap() {
}
// -----------------------------------------------------------------------------
// Darstellungsart festlegen
// -----------------------------------------------------------------------------
-void BS_Bitmap::SetAlpha(int Alpha) {
+void Bitmap::SetAlpha(int Alpha) {
if (!IsAlphaAllowed()) {
BS_LOG_WARNINGLN("Tried to set alpha value on a bitmap that does not support alpha blending. Call was ignored.");
return;
@@ -94,7 +94,7 @@
// -----------------------------------------------------------------------------
-void BS_Bitmap::SetModulationColor(unsigned int ModulationColor) {
+void Bitmap::SetModulationColor(unsigned int ModulationColor) {
if (!IsColorModulationAllowed()) {
BS_LOG_WARNINGLN("Tried to set modulation color of a bitmap that does not support color modulation. Call was ignored.");
return;
@@ -109,14 +109,14 @@
// -----------------------------------------------------------------------------
-void BS_Bitmap::SetScaleFactor(float ScaleFactor) {
+void Bitmap::SetScaleFactor(float ScaleFactor) {
SetScaleFactorX(ScaleFactor);
SetScaleFactorY(ScaleFactor);
}
// -----------------------------------------------------------------------------
-void BS_Bitmap::SetScaleFactorX(float ScaleFactorX) {
+void Bitmap::SetScaleFactorX(float ScaleFactorX) {
if (!IsScalingAllowed()) {
BS_LOG_WARNINGLN("Tried to set scale factor of a bitmap that does not support scaling. Call was ignored.");
return;
@@ -137,7 +137,7 @@
// -----------------------------------------------------------------------------
-void BS_Bitmap::SetScaleFactorY(float ScaleFactorY) {
+void Bitmap::SetScaleFactorY(float ScaleFactorY) {
if (!IsScalingAllowed()) {
BS_LOG_WARNINGLN("Tried to set scale factor of a bitmap that does not support scaling. Call was ignored.");
return;
@@ -158,14 +158,14 @@
// -----------------------------------------------------------------------------
-void BS_Bitmap::SetFlipH(bool FlipH) {
+void Bitmap::SetFlipH(bool FlipH) {
m_FlipH = FlipH;
ForceRefresh();
}
// -----------------------------------------------------------------------------
-void BS_Bitmap::SetFlipV(bool FlipV) {
+void Bitmap::SetFlipV(bool FlipV) {
m_FlipV = FlipV;
ForceRefresh();
}
@@ -174,10 +174,10 @@
// Persistenz
// -----------------------------------------------------------------------------
-bool BS_Bitmap::Persist(BS_OutputPersistenceBlock &Writer) {
+bool Bitmap::Persist(BS_OutputPersistenceBlock &Writer) {
bool Result = true;
- Result &= BS_RenderObject::Persist(Writer);
+ Result &= RenderObject::Persist(Writer);
Writer.Write(m_FlipH);
Writer.Write(m_FlipV);
Writer.Write(m_ScaleFactorX);
@@ -191,10 +191,10 @@
// -----------------------------------------------------------------------------
-bool BS_Bitmap::Unpersist(BS_InputPersistenceBlock &Reader) {
+bool Bitmap::Unpersist(BS_InputPersistenceBlock &Reader) {
bool Result = true;
- Result &= BS_RenderObject::Unpersist(Reader);
+ Result &= RenderObject::Unpersist(Reader);
Reader.Read(m_FlipH);
Reader.Read(m_FlipV);
Reader.Read(m_ScaleFactorX);
Modified: scummvm/trunk/engines/sword25/gfx/bitmap.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/bitmap.h 2010-10-12 22:51:37 UTC (rev 53257)
+++ scummvm/trunk/engines/sword25/gfx/bitmap.h 2010-10-12 22:53:49 UTC (rev 53258)
@@ -48,13 +48,13 @@
// Klassendeklaration
// -----------------------------------------------------------------------------
-class BS_Bitmap : public BS_RenderObject {
+class Bitmap : public RenderObject {
protected:
- BS_Bitmap(BS_RenderObjectPtr<BS_RenderObject> ParentPtr, TYPES Type, unsigned int Handle = 0);
+ Bitmap(RenderObjectPtr<RenderObject> ParentPtr, TYPES Type, unsigned int Handle = 0);
public:
- virtual ~BS_Bitmap();
+ virtual ~Bitmap();
/**
@brief Setzt den Alphawert des Bitmaps.
Modified: scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp 2010-10-12 22:51:37 UTC (rev 53257)
+++ scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp 2010-10-12 22:53:49 UTC (rev 53258)
@@ -47,20 +47,20 @@
// Konstruktion / Destruktion
// --------------------------
-BS_BitmapResource::BS_BitmapResource(const Common::String &Filename, BS_Image *pImage) :
+BitmapResource::BitmapResource(const Common::String &Filename, Image *pImage) :
m_Valid(false),
m_pImage(pImage),
BS_Resource(Filename, BS_Resource::TYPE_BITMAP) {
m_Valid = m_pImage != 0;
}
-BS_BitmapResource::~BS_BitmapResource() {
+BitmapResource::~BitmapResource() {
delete m_pImage;
}
// -----------------------------------------------------------------------------
-unsigned int BS_BitmapResource::GetPixel(int X, int Y) const {
+unsigned int BitmapResource::GetPixel(int X, int Y) const {
BS_ASSERT(X >= 0 && X < m_pImage->GetWidth());
BS_ASSERT(Y >= 0 && Y < m_pImage->GetHeight());
Modified: scummvm/trunk/engines/sword25/gfx/bitmapresource.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/bitmapresource.h 2010-10-12 22:51:37 UTC (rev 53257)
+++ scummvm/trunk/engines/sword25/gfx/bitmapresource.h 2010-10-12 22:53:49 UTC (rev 53258)
@@ -48,7 +48,7 @@
class BS_Rect;
-class BS_BitmapResource : public BS_Resource {
+class BitmapResource : public BS_Resource {
public:
/**
@brief Die m\xF6glichen Flippingparameter f\xFCr die Blit-Methode.
@@ -66,8 +66,8 @@
FLIP_VH = FLIP_H | FLIP_V
};
- BS_BitmapResource(const Common::String &Filename, BS_Image *pImage);
- virtual ~BS_BitmapResource();
+ BitmapResource(const Common::String &Filename, Image *pImage);
+ virtual ~BitmapResource();
/**
@brief Gibt zur\xFCck, ob das Objekt einen g\xFCltigen Zustand hat.
@@ -210,7 +210,7 @@
}
private:
- BS_Image *m_pImage;
+ Image *m_pImage;
bool m_Valid;
};
Modified: scummvm/trunk/engines/sword25/gfx/dynamicbitmap.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/dynamicbitmap.cpp 2010-10-12 22:51:37 UTC (rev 53257)
+++ scummvm/trunk/engines/sword25/gfx/dynamicbitmap.cpp 2010-10-12 22:53:49 UTC (rev 53258)
@@ -55,8 +55,8 @@
// Konstruktion / Destruktion
// -----------------------------------------------------------------------------
-BS_DynamicBitmap::BS_DynamicBitmap(BS_RenderObjectPtr<BS_RenderObject> ParentPtr, unsigned int Width, unsigned int Height) :
- BS_Bitmap(ParentPtr, TYPE_DYNAMICBITMAP) {
+DynamicBitmap::DynamicBitmap(RenderObjectPtr<RenderObject> ParentPtr, unsigned int Width, unsigned int Height) :
+ Bitmap(ParentPtr, TYPE_DYNAMICBITMAP) {
// Das BS_Bitmap konnte nicht erzeugt werden, daher muss an dieser Stelle abgebrochen werden.
if (!m_InitSuccess) return;
@@ -65,17 +65,17 @@
// -----------------------------------------------------------------------------
-BS_DynamicBitmap::BS_DynamicBitmap(BS_InputPersistenceBlock &Reader, BS_RenderObjectPtr<BS_RenderObject> ParentPtr, unsigned int Handle) :
- BS_Bitmap(ParentPtr, TYPE_DYNAMICBITMAP, Handle) {
+DynamicBitmap::DynamicBitmap(BS_InputPersistenceBlock &Reader, RenderObjectPtr<RenderObject> ParentPtr, unsigned int Handle) :
+ Bitmap(ParentPtr, TYPE_DYNAMICBITMAP, Handle) {
m_InitSuccess = Unpersist(Reader);
}
// -----------------------------------------------------------------------------
-bool BS_DynamicBitmap::CreateGLImage(unsigned int Width, unsigned int Height) {
+bool DynamicBitmap::CreateGLImage(unsigned int Width, unsigned int Height) {
// GLImage mit den gew\xFCnschten Ma\xDFen erstellen
bool Result;
- m_Image.reset(new BS_GLImage(Width, Height, Result));
+ m_Image.reset(new GLImage(Width, Height, Result));
m_OriginalWidth = m_Width = Width;
m_OriginalHeight = m_Height = Height;
@@ -85,12 +85,12 @@
// -----------------------------------------------------------------------------
-BS_DynamicBitmap::~BS_DynamicBitmap() {
+DynamicBitmap::~DynamicBitmap() {
}
// -----------------------------------------------------------------------------
-unsigned int BS_DynamicBitmap::GetPixel(int X, int Y) const {
+unsigned int DynamicBitmap::GetPixel(int X, int Y) const {
BS_ASSERT(X >= 0 && X < m_Width);
BS_ASSERT(Y >= 0 && Y < m_Height);
@@ -99,22 +99,22 @@
// -----------------------------------------------------------------------------
-bool BS_DynamicBitmap::DoRender() {
+bool DynamicBitmap::DoRender() {
// Framebufferobjekt holen
- BS_GraphicEngine *pGfx = static_cast<BS_GraphicEngine *>(BS_Kernel::GetInstance()->GetService("gfx"));
+ GraphicEngine *pGfx = static_cast<GraphicEngine *>(BS_Kernel::GetInstance()->GetService("gfx"));
BS_ASSERT(pGfx);
// Bitmap zeichnen
bool Result;
if (m_ScaleFactorX == 1.0f && m_ScaleFactorY == 1.0f) {
Result = m_Image->Blit(m_AbsoluteX, m_AbsoluteY,
- (m_FlipV ? BS_BitmapResource::FLIP_V : 0) |
- (m_FlipH ? BS_BitmapResource::FLIP_H : 0),
+ (m_FlipV ? BitmapResource::FLIP_V : 0) |
+ (m_FlipH ? BitmapResource::FLIP_H : 0),
0, m_ModulationColor, -1, -1);
} else {
Result = m_Image->Blit(m_AbsoluteX, m_AbsoluteY,
- (m_FlipV ? BS_BitmapResource::FLIP_V : 0) |
- (m_FlipH ? BS_BitmapResource::FLIP_H : 0),
+ (m_FlipV ? BitmapResource::FLIP_V : 0) |
+ (m_FlipH ? BitmapResource::FLIP_H : 0),
0, m_ModulationColor, m_Width, m_Height);
}
@@ -123,7 +123,7 @@
// -----------------------------------------------------------------------------
-bool BS_DynamicBitmap::SetContent(const byte *Pixeldata, uint size, unsigned int Offset, unsigned int Stride) {
+bool DynamicBitmap::SetContent(const byte *Pixeldata, uint size, unsigned int Offset, unsigned int Stride) {
return m_Image->SetContent(Pixeldata, size, Offset, Stride);
}
@@ -131,25 +131,25 @@
// Auskunftsmethoden
// -----------------------------------------------------------------------------
-bool BS_DynamicBitmap::IsScalingAllowed() const {
+bool DynamicBitmap::IsScalingAllowed() const {
return m_Image->IsScalingAllowed();
}
// -----------------------------------------------------------------------------
-bool BS_DynamicBitmap::IsAlphaAllowed() const {
+bool DynamicBitmap::IsAlphaAllowed() const {
return m_Image->IsAlphaAllowed();
}
// -----------------------------------------------------------------------------
-bool BS_DynamicBitmap::IsColorModulationAllowed() const {
+bool DynamicBitmap::IsColorModulationAllowed() const {
return m_Image->IsColorModulationAllowed();
}
// -----------------------------------------------------------------------------
-bool BS_DynamicBitmap::IsSetContentAllowed() const {
+bool DynamicBitmap::IsSetContentAllowed() const {
return true;
}
@@ -157,24 +157,24 @@
// Persistenz
// -----------------------------------------------------------------------------
-bool BS_DynamicBitmap::Persist(BS_OutputPersistenceBlock &Writer) {
+bool DynamicBitmap::Persist(BS_OutputPersistenceBlock &Writer) {
bool Result = true;
- Result &= BS_Bitmap::Persist(Writer);
+ Result &= Bitmap::Persist(Writer);
// Bilddaten werden nicht gespeichert. Dies ist auch nicht weiter von bedeutung, da BS_DynamicBitmap nur vom Videoplayer benutzt wird.
// W\xE4hrend ein Video abl\xE4uft kann niemals gespeichert werden. BS_DynamicBitmap kann nur der Vollst\xE4ndigkeit halber persistiert werden.
BS_LOG_WARNINGLN("Persisting a BS_DynamicBitmap. Bitmap content is not persisted.");
- Result &= BS_RenderObject::PersistChildren(Writer);
+ Result &= RenderObject::PersistChildren(Writer);
return Result;
}
-bool BS_DynamicBitmap::Unpersist(BS_InputPersistenceBlock &Reader) {
+bool DynamicBitmap::Unpersist(BS_InputPersistenceBlock &Reader) {
bool Result = true;
- Result &= BS_Bitmap::Unpersist(Reader);
+ Result &= Bitmap::Unpersist(Reader);
// Ein BS_GLImage mit den gespeicherten Ma\xDFen erstellen.
Result &= CreateGLImage(m_Width, m_Height);
@@ -187,7 +187,7 @@
m_Image->SetContent(TransparentImageData, m_Width * m_Height);
free(TransparentImageData);
- Result &= BS_RenderObject::UnpersistChildren(Reader);
+ Result &= RenderObject::UnpersistChildren(Reader);
return Reader.IsGood() && Result;
}
Modified: scummvm/trunk/engines/sword25/gfx/dynamicbitmap.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/dynamicbitmap.h 2010-10-12 22:51:37 UTC (rev 53257)
+++ scummvm/trunk/engines/sword25/gfx/dynamicbitmap.h 2010-10-12 22:53:49 UTC (rev 53258)
@@ -54,11 +54,11 @@
// Klassendeklaration
// -----------------------------------------------------------------------------
-class BS_DynamicBitmap : public BS_Bitmap {
- friend class BS_RenderObject;
+class DynamicBitmap : public Bitmap {
+ friend class RenderObject;
public:
- virtual ~BS_DynamicBitmap();
+ virtual ~DynamicBitmap();
virtual unsigned int GetPixel(int X, int Y) const;
@@ -76,12 +76,12 @@
virtual bool DoRender();
private:
- BS_DynamicBitmap(BS_RenderObjectPtr<BS_RenderObject> ParentPtr, unsigned int Width, unsigned int Height);
- BS_DynamicBitmap(BS_InputPersistenceBlock &Reader, BS_RenderObjectPtr<BS_RenderObject> ParentPtr, unsigned int Handle);
+ DynamicBitmap(RenderObjectPtr<RenderObject> ParentPtr, unsigned int Width, unsigned int Height);
+ DynamicBitmap(BS_InputPersistenceBlock &Reader, RenderObjectPtr<RenderObject> ParentPtr, unsigned int Handle);
bool CreateGLImage(unsigned int Width, unsigned int Height);
- std::auto_ptr<BS_GLImage> m_Image;
+ std::auto_ptr<GLImage> m_Image;
};
} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/gfx/fontresource.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/fontresource.cpp 2010-10-12 22:51:37 UTC (rev 53257)
+++ scummvm/trunk/engines/sword25/gfx/fontresource.cpp 2010-10-12 22:53:49 UTC (rev 53258)
@@ -60,7 +60,7 @@
// Konstruktion / Destruktion
// -----------------------------------------------------------------------------
-BS_FontResource::BS_FontResource(BS_Kernel *pKernel, const Common::String &FileName) :
+FontResource::FontResource(BS_Kernel *pKernel, const Common::String &FileName) :
_pKernel(pKernel),
_Valid(false),
BS_Resource(FileName, BS_Resource::TYPE_FONT) {
@@ -139,7 +139,7 @@
// -----------------------------------------------------------------------------
-bool BS_FontResource::_ParseXMLDocument(const Common::String &FileName, TiXmlDocument &Doc) const {
+bool FontResource::_ParseXMLDocument(const Common::String &FileName, TiXmlDocument &Doc) const {
// Pointer auf den Package-Manager bekommen
BS_ASSERT(_pKernel);
BS_PackageManager *pPackage = static_cast<BS_PackageManager *>(_pKernel->GetService("package"));
@@ -171,7 +171,7 @@
// -----------------------------------------------------------------------------
-bool BS_FontResource::_ParseFontTag(TiXmlElement &Tag, Common::String &BitmapFileName, int &Lineheight, int &GapWidth) const {
+bool FontResource::_ParseFontTag(TiXmlElement &Tag, Common::String &BitmapFileName, int &Lineheight, int &GapWidth) const {
// Bitmap Attribut auslesen
const char *BitmapString = Tag.Attribute("bitmap");
if (!BitmapString) {
@@ -202,7 +202,7 @@
// -----------------------------------------------------------------------------
-bool BS_FontResource::_ParseCharacterTag(TiXmlElement &Tag, int &Code, BS_Rect &Rect) const {
+bool FontResource::_ParseCharacterTag(TiXmlElement &Tag, int &Code, BS_Rect &Rect) const {
// Code Attribut auslesen
const char *CodeString = Tag.Attribute("code");
if (!CodeString || !BS_String::ToInt(Common::String(CodeString), Code) || Code < 0 || Code >= 256) {
Modified: scummvm/trunk/engines/sword25/gfx/fontresource.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/fontresource.h 2010-10-12 22:51:37 UTC (rev 53257)
+++ scummvm/trunk/engines/sword25/gfx/fontresource.h 2010-10-12 22:53:49 UTC (rev 53258)
@@ -58,7 +58,7 @@
// Klassendefinition
// -----------------------------------------------------------------------------
-class BS_FontResource : public BS_Resource {
+class FontResource : public BS_Resource {
public:
/**
@brief Erzeugt eine neues Exemplar von BS_FontResource
@@ -66,7 +66,7 @@
@param FileName der Dateiname der zu ladenen Resource
@remark Wenn der Konstruktor erfolgreich ausgef\xFChrt werden konnte gibt die Methode IsValid true zur\xFCck.
*/
- BS_FontResource(BS_Kernel *pKernel, const Common::String &FileName);
+ FontResource(BS_Kernel *pKernel, const Common::String &FileName);
/**
@brief Gibt true zur\xFCck, wenn das Objekt korrekt initialisiert wurde.
Modified: scummvm/trunk/engines/sword25/gfx/framecounter.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/framecounter.cpp 2010-10-12 22:51:37 UTC (rev 53257)
+++ scummvm/trunk/engines/sword25/gfx/framecounter.cpp 2010-10-12 22:53:49 UTC (rev 53258)
@@ -37,14 +37,14 @@
namespace Sword25 {
-BS_Framecounter::BS_Framecounter(int UpdateFrequency) :
+Framecounter::Framecounter(int UpdateFrequency) :
m_FPS(0),
m_FPSCount(0),
m_LastUpdateTime(-1) {
SetUpdateFrequency(UpdateFrequency);
}
-void BS_Framecounter::Update() {
+void Framecounter::Update() {
// Aktuellen Systemtimerstand auslesen
uint64_t Timer = g_system->getMillis() * 1000;
Modified: scummvm/trunk/engines/sword25/gfx/framecounter.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/framecounter.h 2010-10-12 22:51:37 UTC (rev 53257)
+++ scummvm/trunk/engines/sword25/gfx/framecounter.h 2010-10-12 22:53:49 UTC (rev 53258)
@@ -44,7 +44,7 @@
/**
* A simple class that implements a frame counter
*/
-class BS_Framecounter {
+class Framecounter {
private:
enum {
DEFAULT_UPDATE_FREQUENCY = 10
@@ -56,7 +56,7 @@
* @param UpdateFrequency Specifies how often the frame counter should be updated in a sceond.
* The default value is 10.
*/
- BS_Framecounter(int UpdateFrequency = DEFAULT_UPDATE_FREQUENCY);
+ Framecounter(int UpdateFrequency = DEFAULT_UPDATE_FREQUENCY);
/**
* Determines how often the frame counter should be updated in a second.
@@ -84,7 +84,7 @@
};
// Inlines
-void BS_Framecounter::SetUpdateFrequency(int UpdateFrequency) {
+void Framecounter::SetUpdateFrequency(int UpdateFrequency) {
// Frequency in time (converted to microseconds)
m_UpdateDelay = 1000000 / UpdateFrequency;
}
Modified: scummvm/trunk/engines/sword25/gfx/graphicengine.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/graphicengine.cpp 2010-10-12 22:51:37 UTC (rev 53257)
+++ scummvm/trunk/engines/sword25/gfx/graphicengine.cpp 2010-10-12 22:53:49 UTC (rev 53258)
@@ -60,7 +60,7 @@
static const unsigned int FRAMETIME_SAMPLE_COUNT = 5; // Anzahl der Framezeiten \xFCber die, die Framezeit gemittelt wird
-BS_GraphicEngine::BS_GraphicEngine(BS_Kernel *pKernel) :
+GraphicEngine::GraphicEngine(BS_Kernel *pKernel) :
m_Width(0),
m_Height(0),
m_BitDepth(0),
@@ -81,7 +81,7 @@
// -----------------------------------------------------------------------------
-void BS_GraphicEngine::UpdateLastFrameDuration() {
+void GraphicEngine::UpdateLastFrameDuration() {
// Aktuelle Zeit holen
uint64_t CurrentTime = BS_Kernel::GetInstance()->GetMicroTicks();
@@ -104,7 +104,7 @@
// -----------------------------------------------------------------------------
namespace {
-bool DoSaveScreenshot(BS_GraphicEngine &GraphicEngine, const Common::String &Filename, bool Thumbnail) {
+bool DoSaveScreenshot(GraphicEngine &GraphicEngine, const Common::String &Filename, bool Thumbnail) {
unsigned int Width;
unsigned int Height;
byte *Data;
@@ -114,27 +114,27 @@
}
if (Thumbnail)
- return BS_Screenshot::SaveThumbnailToFile(Width, Height, Data, Filename);
+ return Screenshot::SaveThumbnailToFile(Width, Height, Data, Filename);
else
- return BS_Screenshot::SaveToFile(Width, Height, Data, Filename);
+ return Screenshot::SaveToFile(Width, Height, Data, Filename);
}
}
// -----------------------------------------------------------------------------
-bool BS_GraphicEngine::SaveScreenshot(const Common::String &Filename) {
+bool GraphicEngine::SaveScreenshot(const Common::String &Filename) {
return DoSaveScreenshot(*this, Filename, false);
}
// -----------------------------------------------------------------------------
-bool BS_GraphicEngine::SaveThumbnailScreenshot(const Common::String &Filename) {
+bool GraphicEngine::SaveThumbnailScreenshot(const Common::String &Filename) {
return DoSaveScreenshot(*this, Filename, true);
}
// -----------------------------------------------------------------------------
-void BS_GraphicEngine::ARGBColorToLuaColor(lua_State *L, unsigned int Color) {
+void GraphicEngine::ARGBColorToLuaColor(lua_State *L, unsigned int Color) {
lua_Number Components[4] = {
(Color >> 16) & 0xff, // Rot
(Color >> 8) & 0xff, // Gr\xFCn
@@ -153,7 +153,7 @@
// -----------------------------------------------------------------------------
-unsigned int BS_GraphicEngine::LuaColorToARGBColor(lua_State *L, int StackIndex) {
+unsigned int GraphicEngine::LuaColorToARGBColor(lua_State *L, int StackIndex) {
#ifdef DEBUG
int __startStackDepth = lua_gettop(L);
#endif
@@ -201,14 +201,14 @@
// -----------------------------------------------------------------------------
-bool BS_GraphicEngine::Persist(BS_OutputPersistenceBlock &Writer) {
+bool GraphicEngine::Persist(BS_OutputPersistenceBlock &Writer) {
Writer.Write(m_TimerActive);
return true;
}
// -----------------------------------------------------------------------------
-bool BS_GraphicEngine::Unpersist(BS_InputPersistenceBlock &Reader) {
+bool GraphicEngine::Unpersist(BS_InputPersistenceBlock &Reader) {
Reader.Read(m_TimerActive);
return Reader.IsGood();
}
Modified: scummvm/trunk/engines/sword25/gfx/graphicengine.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/graphicengine.h 2010-10-12 22:51:37 UTC (rev 53257)
+++ scummvm/trunk/engines/sword25/gfx/graphicengine.h 2010-10-12 22:53:49 UTC (rev 53258)
@@ -58,9 +58,9 @@
namespace Sword25 {
class BS_Kernel;
-class BS_Image;
-class BS_Panel;
-class BS_Screenshot;
+class Image;
+class Panel;
+class Screenshot;
// Typen
typedef unsigned int BS_COLOR;
@@ -77,7 +77,7 @@
Die bisher einzige Implementation ist BS_DDrawGfx.
*/
-class BS_GraphicEngine : public BS_ResourceService, public BS_Persistable {
+class GraphicEngine : public BS_ResourceService, public BS_Persistable {
public:
// Enums
// -----
@@ -203,7 +203,7 @@
virtual bool GetScreenshot(unsigned int &Width, unsigned int &Height, byte **Data) = 0;
- virtual BS_RenderObjectPtr<BS_Panel> GetMainPanel() = 0;
+ virtual RenderObjectPtr<Panel> GetMainPanel() = 0;
/**
* Specifies the time (in microseconds) since the last frame has passed
@@ -311,17 +311,17 @@
* @param ColorFormat The desired colour format. The parameter must be of type COLOR_FORMATS
* @return Returns the size of a pixel in bytes. If the colour format is unknown, -1 is returned.
*/
- static int GetPixelSize(BS_GraphicEngine::COLOR_FORMATS ColorFormat) {
+ static int GetPixelSize(GraphicEngine::COLOR_FORMATS ColorFormat) {
switch (ColorFormat) {
- case BS_GraphicEngine::CF_RGB16:
- case BS_GraphicEngine::CF_RGB15:
+ case GraphicEngine::CF_RGB16:
+ case GraphicEngine::CF_RGB15:
return 2;
- case BS_GraphicEngine::CF_RGB16_INTERLEAVED:
- case BS_GraphicEngine::CF_RGB15_INTERLEAVED:
+ case GraphicEngine::CF_RGB16_INTERLEAVED:
+ case GraphicEngine::CF_RGB15_INTERLEAVED:
return 3;
- case BS_GraphicEngine::CF_ARGB32:
+ case GraphicEngine::CF_ARGB32:
return 4;
default:
return -1;
@@ -335,18 +335,18 @@
* @return Reflects the length of the line in bytes. If the colour format is
* unknown, -1 is returned
*/
- static int CalcPitch(BS_GraphicEngine::COLOR_FORMATS ColorFormat, int Width) {
+ static int CalcPitch(GraphicEngine::COLOR_FORMATS ColorFormat, int Width) {
switch (ColorFormat) {
- case BS_GraphicEngine::CF_RGB16:
- case BS_GraphicEngine::CF_RGB15:
+ case GraphicEngine::CF_RGB16:
+ case GraphicEngine::CF_RGB15:
return Width * 2;
- case BS_GraphicEngine::CF_RGB16_INTERLEAVED:
- case BS_GraphicEngine::CF_RGB15_INTERLEAVED:
+ case GraphicEngine::CF_RGB16_INTERLEAVED:
+ case GraphicEngine::CF_RGB15_INTERLEAVED:
return (Width + 3) / 4 * 12;
- case BS_GraphicEngine::CF_ARGB32:
- case BS_GraphicEngine::CF_ABGR32:
+ case GraphicEngine::CF_ARGB32:
+ case GraphicEngine::CF_ABGR32:
return Width * 4;
default:
@@ -367,7 +367,7 @@
protected:
// Constructor
// -----------
- BS_GraphicEngine(BS_Kernel *pKernel);
+ GraphicEngine(BS_Kernel *pKernel);
// Display Variables
// -----------------
@@ -379,7 +379,7 @@
// Debugging Variables
// -------------------
- BS_Framecounter m_FPSCounter;
+ Framecounter m_FPSCounter;
unsigned int m_RepaintedPixels;
Modified: scummvm/trunk/engines/sword25/gfx/graphicengine_script.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/graphicengine_script.cpp 2010-10-12 22:51:37 UTC (rev 53257)
+++ scummvm/trunk/engines/sword25/gfx/graphicengine_script.cpp 2010-10-12 22:53:49 UTC (rev 53258)
@@ -143,11 +143,11 @@
// -----------------------------------------------------------------------------
-static BS_AnimationTemplate *CheckAnimationTemplate(lua_State *L, int idx = 1) {
+static AnimationTemplate *CheckAnimationTemplate(lua_State *L, int idx = 1) {
// Der erste Parameter muss vom Typ userdata sein und die Metatable der Klasse Gfx.AnimationTemplate
unsigned int AnimationTemplateHandle;
if ((AnimationTemplateHandle = *reinterpret_cast<unsigned int *>(my_checkudata(L, idx, ANIMATION_TEMPLATE_CLASS_NAME))) != 0) {
- BS_AnimationTemplate *AnimationTemplatePtr = BS_AnimationTemplateRegistry::GetInstance().ResolveHandle(AnimationTemplateHandle);
+ AnimationTemplate *AnimationTemplatePtr = AnimationTemplateRegistry::GetInstance().ResolveHandle(AnimationTemplateHandle);
if (!AnimationTemplatePtr)
luaL_error(L, "The animation template with the handle %d does no longer exist.", AnimationTemplateHandle);
return AnimationTemplatePtr;
@@ -161,8 +161,8 @@
// -----------------------------------------------------------------------------
static int NewAnimationTemplate(lua_State *L) {
- unsigned int AnimationTemplateHandle = BS_AnimationTemplate::Create(luaL_checkstring(L, 1));
- BS_AnimationTemplate *AnimationTemplatePtr = BS_AnimationTemplateRegistry::GetInstance().ResolveHandle(AnimationTemplateHandle);
+ unsigned int AnimationTemplateHandle = AnimationTemplate::Create(luaL_checkstring(L, 1));
+ AnimationTemplate *AnimationTemplatePtr = AnimationTemplateRegistry::GetInstance().ResolveHandle(AnimationTemplateHandle);
if (AnimationTemplatePtr && AnimationTemplatePtr->IsValid()) {
NewUintUserData(L, AnimationTemplateHandle);
//luaL_getmetatable(L, ANIMATION_TEMPLATE_CLASS_NAME);
@@ -179,7 +179,7 @@
// -----------------------------------------------------------------------------
static int AT_AddFrame(lua_State *L) {
- BS_AnimationTemplate *pAT = CheckAnimationTemplate(L);
+ AnimationTemplate *pAT = CheckAnimationTemplate(L);
pAT->AddFrame(static_cast<int>(luaL_checknumber(L, 2)));
return 0;
}
@@ -187,22 +187,22 @@
// -----------------------------------------------------------------------------
static int AT_SetFrame(lua_State *L) {
- BS_AnimationTemplate *pAT = CheckAnimationTemplate(L);
+ AnimationTemplate *pAT = CheckAnimationTemplate(L);
pAT->SetFrame(static_cast<int>(luaL_checknumber(L, 2)), static_cast<int>(luaL_checknumber(L, 3)));
return 0;
}
// -----------------------------------------------------------------------------
-static bool AnimationTypeStringToNumber(const char *TypeString, BS_Animation::ANIMATION_TYPES &Result) {
+static bool AnimationTypeStringToNumber(const char *TypeString, Animation::ANIMATION_TYPES &Result) {
if (strcmp(TypeString, "jojo") == 0) {
- Result = BS_Animation::AT_JOJO;
+ Result = Animation::AT_JOJO;
return true;
} else if (strcmp(TypeString, "loop") == 0) {
- Result = BS_Animation::AT_LOOP;
+ Result = Animation::AT_LOOP;
return true;
} else if (strcmp(TypeString, "oneshot") == 0) {
- Result = BS_Animation::AT_ONESHOT;
+ Result = Animation::AT_ONESHOT;
return true;
} else
return false;
@@ -211,8 +211,8 @@
// -----------------------------------------------------------------------------
static int AT_SetAnimationType(lua_State *L) {
- BS_AnimationTemplate *pAT = CheckAnimationTemplate(L);
- BS_Animation::ANIMATION_TYPES AnimationType;
+ AnimationTemplate *pAT = CheckAnimationTemplate(L);
+ Animation::ANIMATION_TYPES AnimationType;
if (AnimationTypeStringToNumber(luaL_checkstring(L, 2), AnimationType)) {
pAT->SetAnimationType(AnimationType);
} else {
@@ -225,7 +225,7 @@
// -----------------------------------------------------------------------------
static int AT_SetFPS(lua_State *L) {
- BS_AnimationTemplate *pAT = CheckAnimationTemplate(L);
+ AnimationTemplate *pAT = CheckAnimationTemplate(L);
pAT->SetFPS(static_cast<int>(luaL_checknumber(L, 2)));
return 0;
}
@@ -233,7 +233,7 @@
// -----------------------------------------------------------------------------
static int AT_Finalize(lua_State *L) {
- BS_AnimationTemplate *pAT = CheckAnimationTemplate(L);
+ AnimationTemplate *pAT = CheckAnimationTemplate(L);
delete pAT;
return 0;
}
@@ -251,10 +251,10 @@
// -----------------------------------------------------------------------------
-static BS_GraphicEngine *GetGE() {
+static GraphicEngine *GetGE() {
BS_Kernel *pKernel = BS_Kernel::GetInstance();
BS_ASSERT(pKernel);
- BS_GraphicEngine *pGE = static_cast<BS_GraphicEngine *>(pKernel->GetService("gfx"));
+ GraphicEngine *pGE = static_cast<GraphicEngine *>(pKernel->GetService("gfx"));
BS_ASSERT(pGE);
return pGE;
}
@@ -262,7 +262,7 @@
// -----------------------------------------------------------------------------
static int Init(lua_State *L) {
- BS_GraphicEngine *pGE = GetGE();
+ GraphicEngine *pGE = GetGE();
switch (lua_gettop(L)) {
case 0:
@@ -294,7 +294,7 @@
#endif
// Main-Panel zum Gfx-Modul hinzuf\xFCgen
- BS_RenderObjectPtr<BS_Panel> MainPanelPtr(GetGE()->GetMainPanel());
+ RenderObjectPtr<Panel> MainPanelPtr(GetGE()->GetMainPanel());
BS_ASSERT(MainPanelPtr.IsValid());
lua_pushstring(L, GFX_LIBRARY_NAME);
@@ -324,7 +324,7 @@
// -----------------------------------------------------------------------------
static int StartFrame(lua_State *L) {
- BS_GraphicEngine *pGE = GetGE();
+ GraphicEngine *pGE = GetGE();
if (lua_gettop(L) == 0)
lua_pushbooleancpp(L, pGE->StartFrame());
@@ -337,7 +337,7 @@
// -----------------------------------------------------------------------------
static int EndFrame(lua_State *L) {
- BS_GraphicEngine *pGE = GetGE();
+ GraphicEngine *pGE = GetGE();
lua_pushbooleancpp(L, pGE->EndFrame());
@@ -347,13 +347,13 @@
// -----------------------------------------------------------------------------
static int DrawDebugLine(lua_State *L) {
- BS_GraphicEngine *pGE = GetGE();
+ GraphicEngine *pGE = GetGE();
BS_Vertex Start;
BS_Vertex End;
BS_Vertex::LuaVertexToVertex(L, 1, Start);
BS_Vertex::LuaVertexToVertex(L, 2, End);
- pGE->DrawDebugLine(Start, End, BS_GraphicEngine::LuaColorToARGBColor(L, 3));
+ pGE->DrawDebugLine(Start, End, GraphicEngine::LuaColorToARGBColor(L, 3));
return 0;
}
@@ -361,7 +361,7 @@
// -----------------------------------------------------------------------------
static int GetDisplayWidth(lua_State *L) {
- BS_GraphicEngine *pGE = GetGE();
+ GraphicEngine *pGE = GetGE();
lua_pushnumber(L, pGE->GetDisplayWidth());
@@ -371,7 +371,7 @@
// -----------------------------------------------------------------------------
static int GetDisplayHeight(lua_State *L) {
- BS_GraphicEngine *pGE = GetGE();
+ GraphicEngine *pGE = GetGE();
lua_pushnumber(L, pGE->GetDisplayHeight());
@@ -381,7 +381,7 @@
// -----------------------------------------------------------------------------
static int GetBitDepth(lua_State *L) {
- BS_GraphicEngine *pGE = GetGE();
+ GraphicEngine *pGE = GetGE();
lua_pushnumber(L, pGE->GetBitDepth());
@@ -391,7 +391,7 @@
// -----------------------------------------------------------------------------
static int SetVsync(lua_State *L) {
- BS_GraphicEngine *pGE = GetGE();
+ GraphicEngine *pGE = GetGE();
pGE->SetVsync(lua_tobooleancpp(L, 1));
@@ -401,7 +401,7 @@
// -----------------------------------------------------------------------------
static int IsVsync(lua_State *L) {
- BS_GraphicEngine *pGE = GetGE();
+ GraphicEngine *pGE = GetGE();
lua_pushbooleancpp(L, pGE->GetVsync());
@@ -411,7 +411,7 @@
// -----------------------------------------------------------------------------
static int IsWindowed(lua_State *L) {
- BS_GraphicEngine *pGE = GetGE();
+ GraphicEngine *pGE = GetGE();
lua_pushbooleancpp(L, pGE->IsWindowed());
@@ -421,7 +421,7 @@
// -----------------------------------------------------------------------------
static int GetFPSCount(lua_State *L) {
- BS_GraphicEngine *pGE = GetGE();
+ GraphicEngine *pGE = GetGE();
lua_pushnumber(L, pGE->GetFPSCount());
@@ -431,7 +431,7 @@
// -----------------------------------------------------------------------------
static int GetLastFrameDuration(lua_State *L) {
- BS_GraphicEngine *pGE = GetGE();
+ GraphicEngine *pGE = GetGE();
lua_pushnumber(L, pGE->GetLastFrameDuration());
@@ -441,7 +441,7 @@
// -----------------------------------------------------------------------------
static int StopMainTimer(lua_State *L) {
- BS_GraphicEngine *pGE = GetGE();
+ GraphicEngine *pGE = GetGE();
pGE->StopMainTimer();
return 0;
}
@@ -449,7 +449,7 @@
// -----------------------------------------------------------------------------
static int ResumeMainTimer(lua_State *L) {
- BS_GraphicEngine *pGE = GetGE();
+ GraphicEngine *pGE = GetGE();
pGE->ResumeMainTimer();
return 0;
}
@@ -457,7 +457,7 @@
// -----------------------------------------------------------------------------
static int GetSecondaryFrameDuration(lua_State *L) {
- BS_GraphicEngine *pGE = GetGE();
+ GraphicEngine *pGE = GetGE();
lua_pushnumber(L, pGE->GetSecondaryFrameDuration());
@@ -467,7 +467,7 @@
// -----------------------------------------------------------------------------
static int SaveScreenshot(lua_State *L) {
- BS_GraphicEngine *pGE = GetGE();
+ GraphicEngine *pGE = GetGE();
lua_pushbooleancpp(L, pGE->SaveScreenshot(luaL_checkstring(L, 1)));
return 1;
}
@@ -475,7 +475,7 @@
// -----------------------------------------------------------------------------
static int SaveThumbnailScreenshot(lua_State *L) {
- BS_GraphicEngine *pGE = GetGE();
+ GraphicEngine *pGE = GetGE();
lua_pushbooleancpp(L, pGE->SaveThumbnailScreenshot(luaL_checkstring(L, 1)));
return 1;
}
@@ -483,7 +483,7 @@
// -----------------------------------------------------------------------------
static int GetRepaintedPixels(lua_State *L) {
- BS_GraphicEngine *pGE = GetGE();
+ GraphicEngine *pGE = GetGE();
lua_pushnumber(L, static_cast<lua_Number>(pGE->GetRepaintedPixels()));
return 1;
}
@@ -515,14 +515,14 @@
// -----------------------------------------------------------------------------
-static BS_RenderObjectPtr<BS_RenderObject> CheckRenderObject(lua_State *L, bool ErrorIfRemoved = true) {
+static RenderObjectPtr<RenderObject> CheckRenderObject(lua_State *L, bool ErrorIfRemoved = true) {
// Der erste Parameter muss vom Typ userdata sein und die Metatable einer Klasse haben, die von Gfx.RenderObject "erbt".
unsigned int *UserDataPtr;
if ((UserDataPtr = (unsigned int *) my_checkudata(L, 1, BITMAP_CLASS_NAME)) != 0 ||
(UserDataPtr = (unsigned int *) my_checkudata(L, 1, ANIMATION_CLASS_NAME)) != 0 ||
(UserDataPtr = (unsigned int *) my_checkudata(L, 1, PANEL_CLASS_NAME)) != 0 ||
(UserDataPtr = (unsigned int *) my_checkudata(L, 1, TEXT_CLASS_NAME)) != 0) {
- BS_RenderObjectPtr<BS_RenderObject> ROPtr(* UserDataPtr);
+ RenderObjectPtr<RenderObject> ROPtr(* UserDataPtr);
if (ROPtr.IsValid())
return ROPtr;
else {
@@ -533,13 +533,13 @@
luaL_argcheck(L, 0, 1, "'" RENDEROBJECT_CLASS_NAME "' expected");
}
- return BS_RenderObjectPtr<BS_RenderObject>();
+ return RenderObjectPtr<RenderObject>();
}
// -----------------------------------------------------------------------------
static int RO_SetPos(lua_State *L) {
- BS_RenderObjectPtr<BS_RenderObject> ROPtr = CheckRenderObject(L);
+ RenderObjectPtr<RenderObject> ROPtr = CheckRenderObject(L);
BS_ASSERT(ROPtr.IsValid());
BS_Vertex Pos;
BS_Vertex::LuaVertexToVertex(L, 2, Pos);
@@ -550,7 +550,7 @@
// -----------------------------------------------------------------------------
static int RO_SetX(lua_State *L) {
- BS_RenderObjectPtr<BS_RenderObject> ROPtr = CheckRenderObject(L);
+ RenderObjectPtr<RenderObject> ROPtr = CheckRenderObject(L);
BS_ASSERT(ROPtr.IsValid());
ROPtr->SetX(static_cast<int>(luaL_checknumber(L, 2)));
return 0;
@@ -559,7 +559,7 @@
// -----------------------------------------------------------------------------
static int RO_SetY(lua_State *L) {
- BS_RenderObjectPtr<BS_RenderObject> ROPtr = CheckRenderObject(L);
+ RenderObjectPtr<RenderObject> ROPtr = CheckRenderObject(L);
BS_ASSERT(ROPtr.IsValid());
ROPtr->SetY(static_cast<int>(luaL_checknumber(L, 2)));
return 0;
@@ -568,7 +568,7 @@
// -----------------------------------------------------------------------------
static int RO_SetZ(lua_State *L) {
- BS_RenderObjectPtr<BS_RenderObject> ROPtr = CheckRenderObject(L);
+ RenderObjectPtr<RenderObject> ROPtr = CheckRenderObject(L);
BS_ASSERT(ROPtr.IsValid());
ROPtr->SetZ(static_cast<int>(luaL_checknumber(L, 2)));
return 0;
@@ -577,7 +577,7 @@
// -----------------------------------------------------------------------------
static int RO_SetVisible(lua_State *L) {
- BS_RenderObjectPtr<BS_RenderObject> ROPtr = CheckRenderObject(L);
+ RenderObjectPtr<RenderObject> ROPtr = CheckRenderObject(L);
BS_ASSERT(ROPtr.IsValid());
ROPtr->SetVisible(lua_tobooleancpp(L, 2));
return 0;
@@ -586,7 +586,7 @@
// -----------------------------------------------------------------------------
static int RO_GetX(lua_State *L) {
- BS_RenderObjectPtr<BS_RenderObject> ROPtr = CheckRenderObject(L);
+ RenderObjectPtr<RenderObject> ROPtr = CheckRenderObject(L);
BS_ASSERT(ROPtr.IsValid());
lua_pushnumber(L, ROPtr->GetX());
@@ -596,7 +596,7 @@
// -----------------------------------------------------------------------------
static int RO_GetY(lua_State *L) {
- BS_RenderObjectPtr<BS_RenderObject> ROPtr = CheckRenderObject(L);
+ RenderObjectPtr<RenderObject> ROPtr = CheckRenderObject(L);
BS_ASSERT(ROPtr.IsValid());
lua_pushnumber(L, ROPtr->GetY());
@@ -606,7 +606,7 @@
// -----------------------------------------------------------------------------
static int RO_GetZ(lua_State *L) {
- BS_RenderObjectPtr<BS_RenderObject> ROPtr = CheckRenderObject(L);
+ RenderObjectPtr<RenderObject> ROPtr = CheckRenderObject(L);
BS_ASSERT(ROPtr.IsValid());
lua_pushnumber(L, ROPtr->GetZ());
@@ -616,7 +616,7 @@
// -----------------------------------------------------------------------------
static int RO_GetAbsoluteX(lua_State *L) {
- BS_RenderObjectPtr<BS_RenderObject> ROPtr = CheckRenderObject(L);
+ RenderObjectPtr<RenderObject> ROPtr = CheckRenderObject(L);
BS_ASSERT(ROPtr.IsValid());
lua_pushnumber(L, ROPtr->GetAbsoluteX());
@@ -626,7 +626,7 @@
// -----------------------------------------------------------------------------
static int RO_GetAbsoluteY(lua_State *L) {
- BS_RenderObjectPtr<BS_RenderObject> ROPtr = CheckRenderObject(L);
+ RenderObjectPtr<RenderObject> ROPtr = CheckRenderObject(L);
BS_ASSERT(ROPtr.IsValid());
lua_pushnumber(L, ROPtr->GetAbsoluteY());
@@ -636,7 +636,7 @@
// -----------------------------------------------------------------------------
static int RO_GetWidth(lua_State *L) {
- BS_RenderObjectPtr<BS_RenderObject> ROPtr = CheckRenderObject(L);
+ RenderObjectPtr<RenderObject> ROPtr = CheckRenderObject(L);
BS_ASSERT(ROPtr.IsValid());
lua_pushnumber(L, ROPtr->GetWidth());
@@ -646,7 +646,7 @@
// -----------------------------------------------------------------------------
static int RO_GetHeight(lua_State *L) {
- BS_RenderObjectPtr<BS_RenderObject> ROPtr = CheckRenderObject(L);
+ RenderObjectPtr<RenderObject> ROPtr = CheckRenderObject(L);
BS_ASSERT(ROPtr.IsValid());
lua_pushnumber(L, ROPtr->GetHeight());
@@ -656,7 +656,7 @@
// -----------------------------------------------------------------------------
static int RO_IsVisible(lua_State *L) {
- BS_RenderObjectPtr<BS_RenderObject> ROPtr = CheckRenderObject(L);
+ RenderObjectPtr<RenderObject> ROPtr = CheckRenderObject(L);
BS_ASSERT(ROPtr.IsValid());
lua_pushbooleancpp(L, ROPtr->IsVisible());
@@ -666,11 +666,11 @@
// -----------------------------------------------------------------------------
static int RO_AddPanel(lua_State *L) {
- BS_RenderObjectPtr<BS_RenderObject> ROPtr = CheckRenderObject(L);
+ RenderObjectPtr<RenderObject> ROPtr = CheckRenderObject(L);
BS_ASSERT(ROPtr.IsValid());
- BS_RenderObjectPtr<BS_Panel> PanelPtr = ROPtr->AddPanel(static_cast<int>(luaL_checknumber(L, 2)),
+ RenderObjectPtr<Panel> PanelPtr = ROPtr->AddPanel(static_cast<int>(luaL_checknumber(L, 2)),
static_cast<int>(luaL_checknumber(L, 3)),
- BS_GraphicEngine::LuaColorToARGBColor(L, 4));
+ GraphicEngine::LuaColorToARGBColor(L, 4));
if (PanelPtr.IsValid()) {
NewUintUserData(L, PanelPtr->GetHandle());
// luaL_getmetatable(L, PANEL_CLASS_NAME);
@@ -686,9 +686,9 @@
// -----------------------------------------------------------------------------
static int RO_AddBitmap(lua_State *L) {
- BS_RenderObjectPtr<BS_RenderObject> ROPtr = CheckRenderObject(L);
+ RenderObjectPtr<RenderObject> ROPtr = CheckRenderObject(L);
BS_ASSERT(ROPtr.IsValid());
- BS_RenderObjectPtr<BS_Bitmap> BitmaPtr = ROPtr->AddBitmap(luaL_checkstring(L, 2));
+ RenderObjectPtr<Bitmap> BitmaPtr = ROPtr->AddBitmap(luaL_checkstring(L, 2));
if (BitmaPtr.IsValid()) {
NewUintUserData(L, BitmaPtr->GetHandle());
// luaL_getmetatable(L, BITMAP_CLASS_NAME);
@@ -704,10 +704,10 @@
// -----------------------------------------------------------------------------
static int RO_AddText(lua_State *L) {
- BS_RenderObjectPtr<BS_RenderObject> ROPtr = CheckRenderObject(L);
+ RenderObjectPtr<RenderObject> ROPtr = CheckRenderObject(L);
BS_ASSERT(ROPtr.IsValid());
- BS_RenderObjectPtr<BS_Text> TextPtr;
+ RenderObjectPtr<Text> TextPtr;
if (lua_gettop(L) >= 3) TextPtr = ROPtr->AddText(luaL_checkstring(L, 2), luaL_checkstring(L, 3));
else TextPtr = ROPtr->AddText(luaL_checkstring(L, 2));
@@ -726,10 +726,10 @@
// -----------------------------------------------------------------------------
static int RO_AddAnimation(lua_State *L) {
- BS_RenderObjectPtr<BS_RenderObject> ROPtr = CheckRenderObject(L);
+ RenderObjectPtr<RenderObject> ROPtr = CheckRenderObject(L);
BS_ASSERT(ROPtr.IsValid());
- BS_RenderObjectPtr<BS_Animation> AnimationPtr;
+ RenderObjectPtr<Animation> AnimationPtr;
if (lua_type(L, 2) == LUA_TUSERDATA)
AnimationPtr = ROPtr->AddAnimation(*CheckAnimationTemplate(L, 2));
else
@@ -777,11 +777,11 @@
// -----------------------------------------------------------------------------
-static BS_RenderObjectPtr<BS_Panel> CheckPanel(lua_State *L) {
+static RenderObjectPtr<Panel> CheckPanel(lua_State *L) {
// Der erste Parameter muss vom Typ userdata sein und die Metatable der Klasse Gfx.Panel
unsigned int *UserDataPtr;
if ((UserDataPtr = (unsigned int *) my_checkudata(L, 1, PANEL_CLASS_NAME)) != 0) {
- BS_RenderObjectPtr<BS_RenderObject> ROPtr(*UserDataPtr);
+ RenderObjectPtr<RenderObject> ROPtr(*UserDataPtr);
if (ROPtr.IsValid()) {
return ROPtr->ToPanel();
} else
@@ -790,15 +790,15 @@
luaL_argcheck(L, 0, 1, "'" PANEL_CLASS_NAME "' expected");
}
- return BS_RenderObjectPtr<BS_Panel>();
+ return RenderObjectPtr<Panel>();
}
// -----------------------------------------------------------------------------
static int P_GetColor(lua_State *L) {
- BS_RenderObjectPtr<BS_Panel> PanelPtr = CheckPanel(L);
+ RenderObjectPtr<Panel> PanelPtr = CheckPanel(L);
BS_ASSERT(PanelPtr.IsValid());
- BS_GraphicEngine::ARGBColorToLuaColor(L, PanelPtr->GetColor());
+ GraphicEngine::ARGBColorToLuaColor(L, PanelPtr->GetColor());
return 1;
}
@@ -806,16 +806,16 @@
// -----------------------------------------------------------------------------
static int P_SetColor(lua_State *L) {
- BS_RenderObjectPtr<BS_Panel> PanelPtr = CheckPanel(L);
+ RenderObjectPtr<Panel> PanelPtr = CheckPanel(L);
BS_ASSERT(PanelPtr.IsValid());
- PanelPtr->SetColor(BS_GraphicEngine::LuaColorToARGBColor(L, 2));
+ PanelPtr->SetColor(GraphicEngine::LuaColorToARGBColor(L, 2));
return 0;
}
// -----------------------------------------------------------------------------
static int P_Remove(lua_State *L) {
- BS_RenderObjectPtr<BS_RenderObject> ROPtr = CheckRenderObject(L);
+ RenderObjectPtr<RenderObject> ROPtr = CheckRenderObject(L);
BS_ASSERT(ROPtr.IsValid());
ROPtr.Erase();
return 0;
@@ -832,11 +832,11 @@
// -----------------------------------------------------------------------------
-static BS_RenderObjectPtr<BS_Bitmap> CheckBitmap(lua_State *L) {
+static RenderObjectPtr<Bitmap> CheckBitmap(lua_State *L) {
// Der erste Parameter muss vom Typ userdata sein und die Metatable der Klasse Gfx.Bitmap
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list