From 04ab0e58b4142bf58db2180a2bac6897821d069f Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 8 Aug 2011 23:56:54 +0200
Subject: SDL: Take advantage of SdlGraphicsManager.
This gets rid of the hacks, where SdlEventSource added events with custom type
numbers to pass SDL_VIDEOEXPOSE and SDL_VIDEORESIZE to the graphics manager.
Furthermore it get rids of the uninituitive and hard to trace way of assigning
the proper mouse coordinates to mouse related events. Formerly it passed the
real screen coordinates through the even dispatching api to the graphics
manager (at least hopefully ;-) and let that handle creating a new event with
the proper coordinates. Now instead SdlEventSource handles the proper
coordinate setup itself.
Since this is a behavior change and I can not test all the SDL based small
devices ports this commit might break compilation for them and more serve it
might also break mouse position behavior. If any of that occurs I am sorry
about it.
---
backends/graphics/opengl/opengl-graphics.h | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
(limited to 'backends/graphics/opengl/opengl-graphics.h')
diff --git a/backends/graphics/opengl/opengl-graphics.h b/backends/graphics/opengl/opengl-graphics.h
index 56f7d92a12..8a110b2d5f 100644
--- a/backends/graphics/opengl/opengl-graphics.h
+++ b/backends/graphics/opengl/opengl-graphics.h
@@ -26,7 +26,7 @@
#include "backends/graphics/opengl/gltexture.h"
#include "backends/graphics/graphics.h"
#include "common/array.h"
-#include "common/events.h"
+#include "common/rect.h"
#include "graphics/pixelformat.h"
// Uncomment this to enable the 'on screen display' code.
@@ -50,13 +50,11 @@ enum {
* the buffers swap, and implement loadGFXMode for handling the window/context if
* needed. If USE_RGB_COLOR is enabled, getSupportedFormats must be implemented.
*/
-class OpenGLGraphicsManager : public GraphicsManager, public Common::EventObserver {
+class OpenGLGraphicsManager : public GraphicsManager {
public:
OpenGLGraphicsManager();
virtual ~OpenGLGraphicsManager();
- virtual void initEventObserver();
-
virtual bool hasFeature(OSystem::Feature f);
virtual void setFeatureState(OSystem::Feature f, bool enable);
virtual bool getFeatureState(OSystem::Feature f);
@@ -109,10 +107,6 @@ public:
virtual void setCursorPalette(const byte *colors, uint start, uint num);
virtual void displayMessageOnOSD(const char *msg);
-
- // Override from Common::EventObserver
- bool notifyEvent(const Common::Event &event);
-
protected:
/**
* Setup OpenGL settings
--
cgit v1.2.3
From b8dcd9a25eb27ef40aa5535fc83879d20db7e10c Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Fri, 12 Aug 2011 04:06:54 +0200
Subject: OPENGL: Fix aspect ratio correction behavior.
Now only 320x200 and 640x400 will result in aspect ratio correction to be used
if the user requested it. This should fix some strechting in Myst/Riven.
---
backends/graphics/opengl/opengl-graphics.h | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
(limited to 'backends/graphics/opengl/opengl-graphics.h')
diff --git a/backends/graphics/opengl/opengl-graphics.h b/backends/graphics/opengl/opengl-graphics.h
index 8a110b2d5f..42cfbacc85 100644
--- a/backends/graphics/opengl/opengl-graphics.h
+++ b/backends/graphics/opengl/opengl-graphics.h
@@ -214,10 +214,7 @@ protected:
virtual void calculateDisplaySize(int &width, int &height);
virtual void refreshDisplaySize();
- /**
- * Returns the current target aspect ratio x 10000
- */
- virtual uint getAspectRatio();
+ uint getAspectRatio() const;
bool _formatBGR;
--
cgit v1.2.3
From 59739a7a0e3e4826ba7b27d5270a8d7a26b787ef Mon Sep 17 00:00:00 2001
From: Chris Warren-Smith
Date: Sun, 7 Aug 2011 21:33:32 +1000
Subject: BADA: Initial BADA port implementation
---
backends/graphics/opengl/opengl-graphics.h | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'backends/graphics/opengl/opengl-graphics.h')
diff --git a/backends/graphics/opengl/opengl-graphics.h b/backends/graphics/opengl/opengl-graphics.h
index 42cfbacc85..1202cf0343 100644
--- a/backends/graphics/opengl/opengl-graphics.h
+++ b/backends/graphics/opengl/opengl-graphics.h
@@ -27,6 +27,7 @@
#include "backends/graphics/graphics.h"
#include "common/array.h"
#include "common/rect.h"
+#include "graphics/font.h"
#include "graphics/pixelformat.h"
// Uncomment this to enable the 'on screen display' code.
@@ -315,6 +316,11 @@ protected:
*/
Common::Array<Common::String> _osdLines;
+ /**
+ * Returns the font used for on screen display
+ */
+ virtual const Graphics::Font* getFontOSD();
+
/**
* Update the OSD texture / surface.
*/
--
cgit v1.2.3
From 812e4498ec04231d113bdecabd506d6fa4d84c85 Mon Sep 17 00:00:00 2001
From: Chris Warren-Smith
Date: Sat, 13 Aug 2011 08:06:03 +1000
Subject: BADA: Fix formatting and non bada host compile error
---
backends/graphics/opengl/opengl-graphics.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'backends/graphics/opengl/opengl-graphics.h')
diff --git a/backends/graphics/opengl/opengl-graphics.h b/backends/graphics/opengl/opengl-graphics.h
index 1202cf0343..6ded680eae 100644
--- a/backends/graphics/opengl/opengl-graphics.h
+++ b/backends/graphics/opengl/opengl-graphics.h
@@ -319,7 +319,7 @@ protected:
/**
* Returns the font used for on screen display
*/
- virtual const Graphics::Font* getFontOSD();
+ virtual const Graphics::Font *getFontOSD();
/**
* Update the OSD texture / surface.
--
cgit v1.2.3