aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/gfx
diff options
context:
space:
mode:
Diffstat (limited to 'engines/sword25/gfx')
-rw-r--r--engines/sword25/gfx/animationresource.cpp6
-rw-r--r--engines/sword25/gfx/animationresource.h4
-rw-r--r--engines/sword25/gfx/fontresource.cpp4
-rw-r--r--engines/sword25/gfx/graphicengine.h2
-rw-r--r--engines/sword25/gfx/graphicengine_script.cpp60
-rw-r--r--engines/sword25/gfx/opengl/glimage.cpp2
-rw-r--r--engines/sword25/gfx/opengl/openglgfx.cpp6
-rw-r--r--engines/sword25/gfx/opengl/openglgfx.h8
-rw-r--r--engines/sword25/gfx/opengl/swimage.cpp2
9 files changed, 47 insertions, 47 deletions
diff --git a/engines/sword25/gfx/animationresource.cpp b/engines/sword25/gfx/animationresource.cpp
index c229463dfb..770c60f7ce 100644
--- a/engines/sword25/gfx/animationresource.cpp
+++ b/engines/sword25/gfx/animationresource.cpp
@@ -68,7 +68,7 @@ AnimationResource::AnimationResource(const Common::String &FileName) :
BS_Resource(FileName, BS_Resource::TYPE_ANIMATION),
m_Valid(false) {
// Pointer auf den Package-Manager bekommen
- BS_PackageManager *PackagePtr = BS_Kernel::GetInstance()->GetPackage();
+ PackageManager *PackagePtr = BS_Kernel::GetInstance()->GetPackage();
BS_ASSERT(PackagePtr);
// Animations-XML laden
@@ -198,13 +198,13 @@ bool AnimationResource::ParseAnimationTag(TiXmlElement &AnimationTag, int &FPS,
// -----------------------------------------------------------------------------
-bool AnimationResource::ParseFrameTag(TiXmlElement &FrameTag, Frame &Frame_, BS_PackageManager &PackageManager) {
+bool AnimationResource::ParseFrameTag(TiXmlElement &FrameTag, Frame &Frame_, PackageManager &packageManager) {
const char *FileString = FrameTag.Attribute("file");
if (!FileString) {
BS_LOG_ERRORLN("<frame> tag without file attribute occurred in \"%s\".", GetFileName().c_str());
return false;
}
- Frame_.FileName = PackageManager.GetAbsolutePath(FileString);
+ Frame_.FileName = packageManager.GetAbsolutePath(FileString);
if (Frame_.FileName == "") {
BS_LOG_ERRORLN("Could not create absolute path for file specified in <frame> tag in \"%s\": \"%s\".", GetFileName().c_str(), FileString);
return false;
diff --git a/engines/sword25/gfx/animationresource.h b/engines/sword25/gfx/animationresource.h
index 532aaa51ae..806861f07e 100644
--- a/engines/sword25/gfx/animationresource.h
+++ b/engines/sword25/gfx/animationresource.h
@@ -57,7 +57,7 @@ namespace Sword25 {
// -----------------------------------------------------------------------------
class BS_Kernel;
-class BS_PackageManager;
+class PackageManager;
// -----------------------------------------------------------------------------
// Class Definition
@@ -110,7 +110,7 @@ private:
/** @name Dokument-Parser Methoden */
bool ParseAnimationTag(TiXmlElement &AnimationTag, int &FPS, Animation::ANIMATION_TYPES &AnimationType);
- bool ParseFrameTag(TiXmlElement &FrameTag, Frame &Frame, BS_PackageManager &PackageManager);
+ bool ParseFrameTag(TiXmlElement &FrameTag, Frame &Frame, PackageManager &PackageManager);
//@}
diff --git a/engines/sword25/gfx/fontresource.cpp b/engines/sword25/gfx/fontresource.cpp
index 000b1619dc..6d2a7a99a5 100644
--- a/engines/sword25/gfx/fontresource.cpp
+++ b/engines/sword25/gfx/fontresource.cpp
@@ -89,7 +89,7 @@ FontResource::FontResource(BS_Kernel *pKernel, const Common::String &FileName) :
{
// Pointer auf den Package-Manager bekommen
BS_ASSERT(_pKernel);
- BS_PackageManager *pPackage = static_cast<BS_PackageManager *>(_pKernel->GetService("package"));
+ PackageManager *pPackage = static_cast<PackageManager *>(_pKernel->GetService("package"));
BS_ASSERT(pPackage);
// Absoluten, eindeutigen Pfad bestimmen
@@ -142,7 +142,7 @@ FontResource::FontResource(BS_Kernel *pKernel, const Common::String &FileName) :
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"));
+ PackageManager *pPackage = static_cast<PackageManager *>(_pKernel->GetService("package"));
BS_ASSERT(pPackage);
// Die Daten werden zunächst über den Package-Manager gelesen und dann in einen um ein Byte größeren Buffer kopiert
diff --git a/engines/sword25/gfx/graphicengine.h b/engines/sword25/gfx/graphicengine.h
index 3b00db115b..e68969e128 100644
--- a/engines/sword25/gfx/graphicengine.h
+++ b/engines/sword25/gfx/graphicengine.h
@@ -173,7 +173,7 @@ public:
* @param End The ending point of the line
* @param Color The colour of the line. The default is BS_RGB (255,255,255) (White)
*/
- virtual void DrawDebugLine(const BS_Vertex &Start, const BS_Vertex &End, unsigned int Color = BS_RGB(255, 255, 255)) = 0;
+ virtual void DrawDebugLine(const Vertex &Start, const Vertex &End, unsigned int Color = BS_RGB(255, 255, 255)) = 0;
/**
* Creates a screenshot of the current frame buffer and writes it to a graphic file in PNG format.
diff --git a/engines/sword25/gfx/graphicengine_script.cpp b/engines/sword25/gfx/graphicengine_script.cpp
index 7447e0237b..92f5750d25 100644
--- a/engines/sword25/gfx/graphicengine_script.cpp
+++ b/engines/sword25/gfx/graphicengine_script.cpp
@@ -71,9 +71,9 @@ static bool AnimationLoopPointCallback(unsigned int Data);
namespace {
// -------------------------------------------------------------------------
-class ActionCallback : public BS_LuaCallback {
+class ActionCallback : public LuaCallback {
public:
- ActionCallback(lua_State *L) : BS_LuaCallback(L) {};
+ ActionCallback(lua_State *L) : LuaCallback(L) {};
Common::String Action;
@@ -84,7 +84,7 @@ protected:
}
};
-std::auto_ptr<BS_LuaCallback> LoopPointCallbackPtr;
+std::auto_ptr<LuaCallback> LoopPointCallbackPtr;
std::auto_ptr<ActionCallback> ActionCallbackPtr;
// -------------------------------------------------------------------------
@@ -122,7 +122,7 @@ static void *my_checkudata(lua_State *L, int ud, const char *tname) {
if (p != NULL) { /* value is a userdata? */
if (lua_getmetatable(L, ud)) { /* does it have a metatable? */
// lua_getfield(L, LUA_REGISTRYINDEX, tname); /* get correct metatable */
- BS_LuaBindhelper::GetMetatable(L, tname);
+ LuaBindhelper::GetMetatable(L, tname);
if (lua_rawequal(L, -1, -2)) { /* does it have the correct mt? */
lua_settop(L, top);
return p;
@@ -166,7 +166,7 @@ static int NewAnimationTemplate(lua_State *L) {
if (AnimationTemplatePtr && AnimationTemplatePtr->IsValid()) {
NewUintUserData(L, AnimationTemplateHandle);
//luaL_getmetatable(L, ANIMATION_TEMPLATE_CLASS_NAME);
- BS_LuaBindhelper::GetMetatable(L, ANIMATION_TEMPLATE_CLASS_NAME);
+ LuaBindhelper::GetMetatable(L, ANIMATION_TEMPLATE_CLASS_NAME);
BS_ASSERT(!lua_isnil(L, -1));
lua_setmetatable(L, -2);
} else {
@@ -304,7 +304,7 @@ static int Init(lua_State *L) {
NewUintUserData(L, MainPanelPtr->GetHandle());
BS_ASSERT(!lua_isnil(L, -1));
// luaL_getmetatable(L, PANEL_CLASS_NAME);
- BS_LuaBindhelper::GetMetatable(L, PANEL_CLASS_NAME);
+ LuaBindhelper::GetMetatable(L, PANEL_CLASS_NAME);
BS_ASSERT(!lua_isnil(L, -1));
lua_setmetatable(L, -2);
@@ -349,10 +349,10 @@ static int EndFrame(lua_State *L) {
static int DrawDebugLine(lua_State *L) {
GraphicEngine *pGE = GetGE();
- BS_Vertex Start;
- BS_Vertex End;
- BS_Vertex::LuaVertexToVertex(L, 1, Start);
- BS_Vertex::LuaVertexToVertex(L, 2, End);
+ Vertex Start;
+ Vertex End;
+ Vertex::LuaVertexToVertex(L, 1, Start);
+ Vertex::LuaVertexToVertex(L, 2, End);
pGE->DrawDebugLine(Start, End, GraphicEngine::LuaColorToARGBColor(L, 3));
return 0;
@@ -541,8 +541,8 @@ static RenderObjectPtr<RenderObject> CheckRenderObject(lua_State *L, bool ErrorI
static int RO_SetPos(lua_State *L) {
RenderObjectPtr<RenderObject> ROPtr = CheckRenderObject(L);
BS_ASSERT(ROPtr.IsValid());
- BS_Vertex Pos;
- BS_Vertex::LuaVertexToVertex(L, 2, Pos);
+ Vertex Pos;
+ Vertex::LuaVertexToVertex(L, 2, Pos);
ROPtr->SetPos(Pos.X, Pos.Y);
return 0;
}
@@ -674,7 +674,7 @@ static int RO_AddPanel(lua_State *L) {
if (PanelPtr.IsValid()) {
NewUintUserData(L, PanelPtr->GetHandle());
// luaL_getmetatable(L, PANEL_CLASS_NAME);
- BS_LuaBindhelper::GetMetatable(L, PANEL_CLASS_NAME);
+ LuaBindhelper::GetMetatable(L, PANEL_CLASS_NAME);
BS_ASSERT(!lua_isnil(L, -1));
lua_setmetatable(L, -2);
} else
@@ -692,7 +692,7 @@ static int RO_AddBitmap(lua_State *L) {
if (BitmaPtr.IsValid()) {
NewUintUserData(L, BitmaPtr->GetHandle());
// luaL_getmetatable(L, BITMAP_CLASS_NAME);
- BS_LuaBindhelper::GetMetatable(L, BITMAP_CLASS_NAME);
+ LuaBindhelper::GetMetatable(L, BITMAP_CLASS_NAME);
BS_ASSERT(!lua_isnil(L, -1));
lua_setmetatable(L, -2);
} else
@@ -714,7 +714,7 @@ static int RO_AddText(lua_State *L) {
if (TextPtr.IsValid()) {
NewUintUserData(L, TextPtr->GetHandle());
// luaL_getmetatable(L, TEXT_CLASS_NAME);
- BS_LuaBindhelper::GetMetatable(L, TEXT_CLASS_NAME);
+ LuaBindhelper::GetMetatable(L, TEXT_CLASS_NAME);
BS_ASSERT(!lua_isnil(L, -1));
lua_setmetatable(L, -2);
} else
@@ -738,7 +738,7 @@ static int RO_AddAnimation(lua_State *L) {
if (AnimationPtr.IsValid()) {
NewUintUserData(L, AnimationPtr->GetHandle());
// luaL_getmetatable(L, ANIMATION_CLASS_NAME);
- BS_LuaBindhelper::GetMetatable(L, ANIMATION_CLASS_NAME);
+ LuaBindhelper::GetMetatable(L, ANIMATION_CLASS_NAME);
BS_ASSERT(!lua_isnil(L, -1));
lua_setmetatable(L, -2);
@@ -970,8 +970,8 @@ static int B_IsFlipV(lua_State *L) {
static int B_GetPixel(lua_State *L) {
RenderObjectPtr<Bitmap> BitmapPtr = CheckBitmap(L);
BS_ASSERT(BitmapPtr.IsValid());
- BS_Vertex Pos;
- BS_Vertex::LuaVertexToVertex(L, 2, Pos);
+ Vertex Pos;
+ Vertex::LuaVertexToVertex(L, 2, Pos);
GraphicEngine::ARGBColorToLuaColor(L, BitmapPtr->GetPixel(Pos.X, Pos.Y));
return 1;
}
@@ -1528,26 +1528,26 @@ static const luaL_reg TEXT_METHODS[] = {
bool GraphicEngine::RegisterScriptBindings() {
BS_Kernel *pKernel = BS_Kernel::GetInstance();
BS_ASSERT(pKernel);
- BS_ScriptEngine *pScript = static_cast<BS_ScriptEngine *>(pKernel->GetService("script"));
+ ScriptEngine *pScript = static_cast<ScriptEngine *>(pKernel->GetService("script"));
BS_ASSERT(pScript);
lua_State *L = static_cast<lua_State *>(pScript->GetScriptObject());
BS_ASSERT(L);
- if (!BS_LuaBindhelper::AddMethodsToClass(L, BITMAP_CLASS_NAME, RENDEROBJECT_METHODS)) return false;
- if (!BS_LuaBindhelper::AddMethodsToClass(L, ANIMATION_CLASS_NAME, RENDEROBJECT_METHODS)) return false;
- if (!BS_LuaBindhelper::AddMethodsToClass(L, PANEL_CLASS_NAME, RENDEROBJECT_METHODS)) return false;
- if (!BS_LuaBindhelper::AddMethodsToClass(L, TEXT_CLASS_NAME, RENDEROBJECT_METHODS)) return false;
+ if (!LuaBindhelper::AddMethodsToClass(L, BITMAP_CLASS_NAME, RENDEROBJECT_METHODS)) return false;
+ if (!LuaBindhelper::AddMethodsToClass(L, ANIMATION_CLASS_NAME, RENDEROBJECT_METHODS)) return false;
+ if (!LuaBindhelper::AddMethodsToClass(L, PANEL_CLASS_NAME, RENDEROBJECT_METHODS)) return false;
+ if (!LuaBindhelper::AddMethodsToClass(L, TEXT_CLASS_NAME, RENDEROBJECT_METHODS)) return false;
- if (!BS_LuaBindhelper::AddMethodsToClass(L, PANEL_CLASS_NAME, PANEL_METHODS)) return false;
- if (!BS_LuaBindhelper::AddMethodsToClass(L, BITMAP_CLASS_NAME, BITMAP_METHODS)) return false;
- if (!BS_LuaBindhelper::AddMethodsToClass(L, TEXT_CLASS_NAME, TEXT_METHODS)) return false;
- if (!BS_LuaBindhelper::AddMethodsToClass(L, ANIMATION_CLASS_NAME, ANIMATION_METHODS)) return false;
+ if (!LuaBindhelper::AddMethodsToClass(L, PANEL_CLASS_NAME, PANEL_METHODS)) return false;
+ if (!LuaBindhelper::AddMethodsToClass(L, BITMAP_CLASS_NAME, BITMAP_METHODS)) return false;
+ if (!LuaBindhelper::AddMethodsToClass(L, TEXT_CLASS_NAME, TEXT_METHODS)) return false;
+ if (!LuaBindhelper::AddMethodsToClass(L, ANIMATION_CLASS_NAME, ANIMATION_METHODS)) return false;
- if (!BS_LuaBindhelper::AddMethodsToClass(L, ANIMATION_TEMPLATE_CLASS_NAME, ANIMATION_TEMPLATE_METHODS)) return false;
+ if (!LuaBindhelper::AddMethodsToClass(L, ANIMATION_TEMPLATE_CLASS_NAME, ANIMATION_TEMPLATE_METHODS)) return false;
- if (!BS_LuaBindhelper::AddFunctionsToLib(L, GFX_LIBRARY_NAME, GFX_FUNCTIONS)) return false;
+ if (!LuaBindhelper::AddFunctionsToLib(L, GFX_LIBRARY_NAME, GFX_FUNCTIONS)) return false;
- LoopPointCallbackPtr.reset(new BS_LuaCallback(L));
+ LoopPointCallbackPtr.reset(new LuaCallback(L));
ActionCallbackPtr.reset(new ActionCallback(L));
return true;
diff --git a/engines/sword25/gfx/opengl/glimage.cpp b/engines/sword25/gfx/opengl/glimage.cpp
index cc8f813fe6..0d17eb1758 100644
--- a/engines/sword25/gfx/opengl/glimage.cpp
+++ b/engines/sword25/gfx/opengl/glimage.cpp
@@ -57,7 +57,7 @@ GLImage::GLImage(const Common::String &Filename, bool &Result) :
m_Height(0) {
Result = false;
- BS_PackageManager *pPackage = static_cast<BS_PackageManager *>(BS_Kernel::GetInstance()->GetService("package"));
+ PackageManager *pPackage = static_cast<PackageManager *>(BS_Kernel::GetInstance()->GetService("package"));
BS_ASSERT(pPackage);
_backSurface = (static_cast<GraphicEngine *>(BS_Kernel::GetInstance()->GetService("gfx")))->getSurface();
diff --git a/engines/sword25/gfx/opengl/openglgfx.cpp b/engines/sword25/gfx/opengl/openglgfx.cpp
index f9dda32b40..c30fc8ed0d 100644
--- a/engines/sword25/gfx/opengl/openglgfx.cpp
+++ b/engines/sword25/gfx/opengl/openglgfx.cpp
@@ -86,7 +86,7 @@ OpenGLGfx::~OpenGLGfx() {
// -----------------------------------------------------------------------------
-BS_Service *BS_OpenGLGfx_CreateObject(BS_Kernel *pKernel) {
+BS_Service *OpenGLGfx_CreateObject(BS_Kernel *pKernel) {
return new OpenGLGfx(pKernel);
}
@@ -328,7 +328,7 @@ BS_Resource *OpenGLGfx::LoadResource(const Common::String &FileName) {
// Vectorgraphik laden
if (FileName.hasSuffix(SWF_EXTENSION)) {
// Pointer auf Package-Manager holen
- BS_PackageManager *pPackage = BS_Kernel::GetInstance()->GetPackage();
+ PackageManager *pPackage = BS_Kernel::GetInstance()->GetPackage();
BS_ASSERT(pPackage);
// Datei laden
@@ -399,7 +399,7 @@ bool OpenGLGfx::CanLoadResource(const Common::String &FileName) {
// DEBUGGING
// -----------------------------------------------------------------------------
-void OpenGLGfx::DrawDebugLine(const BS_Vertex &Start, const BS_Vertex &End, unsigned int Color) {
+void OpenGLGfx::DrawDebugLine(const Vertex &Start, const Vertex &End, unsigned int Color) {
m_DebugLines.push_back(DebugLine(Start, End, Color));
}
diff --git a/engines/sword25/gfx/opengl/openglgfx.h b/engines/sword25/gfx/opengl/openglgfx.h
index 4a7994a92c..c96fa381d6 100644
--- a/engines/sword25/gfx/opengl/openglgfx.h
+++ b/engines/sword25/gfx/opengl/openglgfx.h
@@ -87,7 +87,7 @@ public:
// Debugging Methoden
// ------------------
- virtual void DrawDebugLine(const BS_Vertex &Start, const BS_Vertex &End, unsigned int Color);
+ virtual void DrawDebugLine(const Vertex &Start, const Vertex &End, unsigned int Color);
// Persistenz Methoden
// -------------------
@@ -103,14 +103,14 @@ private:
std::auto_ptr<RenderObjectManager> m_RenderObjectManagerPtr;
struct DebugLine {
- DebugLine(const BS_Vertex &_Start, const BS_Vertex &_End, unsigned int _Color) :
+ DebugLine(const Vertex &_Start, const Vertex &_End, unsigned int _Color) :
Start(_Start),
End(_End),
Color(_Color) {}
DebugLine() {}
- BS_Vertex Start;
- BS_Vertex End;
+ Vertex Start;
+ Vertex End;
unsigned int Color;
};
diff --git a/engines/sword25/gfx/opengl/swimage.cpp b/engines/sword25/gfx/opengl/swimage.cpp
index 06308bff87..1244cc3879 100644
--- a/engines/sword25/gfx/opengl/swimage.cpp
+++ b/engines/sword25/gfx/opengl/swimage.cpp
@@ -56,7 +56,7 @@ SWImage::SWImage(const Common::String &Filename, bool &Result) :
m_Height(0) {
Result = false;
- BS_PackageManager *pPackage = static_cast<BS_PackageManager *>(BS_Kernel::GetInstance()->GetService("package"));
+ PackageManager *pPackage = static_cast<PackageManager *>(BS_Kernel::GetInstance()->GetService("package"));
BS_ASSERT(pPackage);
// Datei laden
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 09:26:55 +0000