[Scummvm-cvs-logs] SF.net SVN: scummvm:[53362] scummvm/trunk/engines/sword25/gfx

[sev at users.sourceforge.net]

Revision: 53362
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53362&view=rev
Author:   sev
Date:     2010-10-12 23:54:30 +0000 (Tue, 12 Oct 2010)

Log Message:
-----------
SWORD25: Rename GLImage to RenderedImage

Modified Paths:
--------------
    scummvm/trunk/engines/sword25/gfx/dynamicbitmap.cpp
    scummvm/trunk/engines/sword25/gfx/dynamicbitmap.h
    scummvm/trunk/engines/sword25/gfx/graphicengine.cpp

Modified: scummvm/trunk/engines/sword25/gfx/dynamicbitmap.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/dynamicbitmap.cpp	2010-10-12 23:54:07 UTC (rev 53361)
+++ scummvm/trunk/engines/sword25/gfx/dynamicbitmap.cpp	2010-10-12 23:54:30 UTC (rev 53362)
@@ -58,7 +58,7 @@
 	// Das BS_Bitmap konnte nicht erzeugt werden, daher muss an dieser Stelle abgebrochen werden.
 	if (!_initSuccess) return;
 
-	_initSuccess = createGLImage(width, height);
+	_initSuccess = createRenderedImage(width, height);
 }
 
 // -----------------------------------------------------------------------------
@@ -70,10 +70,10 @@
 
 // -----------------------------------------------------------------------------
 
-bool DynamicBitmap::createGLImage(uint width, uint height) {
-	// GLImage mit den gew\xFCnschten Ma\xDFen erstellen
+bool DynamicBitmap::createRenderedImage(uint width, uint height) {
+	// RenderedImage mit den gew\xFCnschten Ma\xDFen erstellen
 	bool result = false;
-	_image.reset(new GLImage(width, height, result));
+	_image.reset(new RenderedImage(width, height, result));
 
 	_originalWidth = _width = width;
 	_originalHeight = _height = height;
@@ -174,8 +174,8 @@
 
 	result &= Bitmap::unpersist(reader);
 
-	// Ein BS_GLImage mit den gespeicherten Ma\xDFen erstellen.
-	result &= createGLImage(_width, _height);
+	// Ein RenderedImage mit den gespeicherten Ma\xDFen erstellen.
+	result &= createRenderedImage(_width, _height);
 
 	// Bilddaten werden nicht gespeichert (s.o.).
 	BS_LOG_WARNINGLN("Unpersisting a BS_DynamicBitmap. Bitmap contents are missing.");

Modified: scummvm/trunk/engines/sword25/gfx/dynamicbitmap.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/dynamicbitmap.h	2010-10-12 23:54:07 UTC (rev 53361)
+++ scummvm/trunk/engines/sword25/gfx/dynamicbitmap.h	2010-10-12 23:54:30 UTC (rev 53362)
@@ -42,7 +42,7 @@
 
 #include "sword25/kernel/common.h"
 #include "sword25/gfx/bitmap.h"
-#include "sword25/gfx/image/glimage.h"
+#include "sword25/gfx/image/renderedimage.h"
 
 #include "common/ptr.h"
 
@@ -77,9 +77,9 @@
 	DynamicBitmap(RenderObjectPtr<RenderObject> parentPtr, uint width, uint height);
 	DynamicBitmap(InputPersistenceBlock &reader, RenderObjectPtr<RenderObject> parentPtr, uint handle);
 
-	bool createGLImage(uint width, uint height);
+	bool createRenderedImage(uint width, uint height);
 
-	Common::ScopedPtr<GLImage> _image;
+	Common::ScopedPtr<RenderedImage> _image;
 };
 
 } // End of namespace Sword25

Modified: scummvm/trunk/engines/sword25/gfx/graphicengine.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/graphicengine.cpp	2010-10-12 23:54:07 UTC (rev 53361)
+++ scummvm/trunk/engines/sword25/gfx/graphicengine.cpp	2010-10-12 23:54:30 UTC (rev 53362)
@@ -42,7 +42,7 @@
 #include "sword25/gfx/panel.h"
 #include "sword25/gfx/renderobjectmanager.h"
 #include "sword25/gfx/screenshot.h"
-#include "sword25/gfx/image/glimage.h"
+#include "sword25/gfx/image/renderedimage.h"
 #include "sword25/gfx/image/swimage.h"
 #include "sword25/gfx/image/vectorimage.h"
 #include "sword25/package/packagemanager.h"
@@ -315,7 +315,7 @@
 	// Sprite-Bild laden
 	if (FileName.hasSuffix(PNG_EXTENSION) || FileName.hasSuffix(B25S_EXTENSION)) {
 		bool Result = false;
-		GLImage *pImage = new GLImage(FileName, Result);
+		RenderedImage *pImage = new RenderedImage(FileName, Result);
 		if (!Result) {
 			delete pImage;
 			return 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.