mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-01 23:18:44 +00:00
de2bbe3b97
This patch refactors the OpenGL and SDL graphics backends, primarily to unify window scaling and mouse handling, and to fix coordinate mapping between the ScummVM window and the virtual game screen when they have different aspect ratios. Unified code for these two backends has been moved to a new header-only WindowedGraphicsManager class, so named because it contains code for managing graphics managers that interact with a windowing system and render virtual screens within a larger physical content window. The biggest behavioral change here is with the coordinate system mapping: Previously, mouse offsets were converted by mapping the whole space within the window as input to the virtual game screen without maintaining aspect ratio. This was done to prevent 'stickiness' when the mouse cursor was within the window but outside of the virtual game screen, but it caused noticeable distortion of mouse movement speed on the axis with blank space. Instead of introducing mouse speed distortion to prevent stickiness, this patch changes coordinate transformation to show the system cursor when the mouse moves outside of the virtual game screen when mouse grab is off, or by holding the mouse inside the virtual game screen (instead of the entire window) when mouse grab is on. This patch also improves some other properties of the GraphicsManager/PaletteManager interfaces: * Nullipotent operations (getWidth, getHeight, etc.) of the PaletteManager/GraphicsManager interfaces are now const * Methods marked `virtual` but not inherited by any subclass have been de-virtualized * Extra unnecessary calculations of hardware height in SurfaceSdlGraphicsManager have been removed * Methods have been renamed where appropriate for clarity (setWindowSize -> handleResize, etc.) * C++11 support improved with `override` specifier added on overridden virtual methods in subclasses (primarily to avoid myself accidentally creating new methods in the subclasses by changing types/names during refactoring) Additional refactoring can and should be done at some point to continue to deduplicate code between the OpenGL and SDL backends. Since the primary goal here was to improve the coordinate mapping, full refactoring of these backends was not completed here. |
||
|---|---|---|
| .. | ||
| fonts | ||
| macgui | ||
| scaler | ||
| colormasks.h | ||
| conversion.cpp | ||
| conversion.h | ||
| cursor.h | ||
| cursorman.cpp | ||
| cursorman.h | ||
| font.cpp | ||
| font.h | ||
| fontman.cpp | ||
| fontman.h | ||
| maccursor.cpp | ||
| maccursor.h | ||
| managed_surface.cpp | ||
| managed_surface.h | ||
| mode.h | ||
| module.mk | ||
| nine_patch.cpp | ||
| nine_patch.h | ||
| palette.h | ||
| pixelformat.cpp | ||
| pixelformat.h | ||
| primitives.cpp | ||
| primitives.h | ||
| scaler.cpp | ||
| scaler.h | ||
| screen.cpp | ||
| screen.h | ||
| sjis.cpp | ||
| sjis.h | ||
| surface.cpp | ||
| surface.h | ||
| thumbnail.cpp | ||
| thumbnail.h | ||
| transform_struct.cpp | ||
| transform_struct.h | ||
| transform_tools.cpp | ||
| transform_tools.h | ||
| transparent_surface.cpp | ||
| transparent_surface.h | ||
| VectorRenderer.cpp | ||
| VectorRenderer.h | ||
| VectorRendererSpec.cpp | ||
| VectorRendererSpec.h | ||
| wincursor.cpp | ||
| wincursor.h | ||
| yuv_to_rgb.cpp | ||
| yuv_to_rgb.h | ||