Commit graph

35 commits

Author SHA1 Message Date
Johannes Schickel
f199761756 SDL: Slight formatting fix.
svn-id: r54583
2010-11-29 18:33:46 +00:00
David Turner
0e90a2a808 BACKENDS: Close Memory Leak of Mouse Surfaces in SDL Graphics Backend
svn-id: r54579
2010-11-29 18:16:11 +00:00
Max Horn
df05ed1a46 BACKENDS: Include scummsys.h at top of all .cpp files, *before* any #ifdefs
svn-id: r54573
2010-11-29 16:18:43 +00:00
Max Horn
4e0e406181 SDL: Move #include <SDL.h> into a special wrapper file
svn-id: r54572
2010-11-29 16:16:50 +00:00
Willem Jan Palenstijn
66cb595f22 SDL: re-enable unicode after graphics init
svn-id: r54531
2010-11-28 17:12:43 +00:00
Max Horn
7760077cf5 Merging the gsoc2010-opengl branch
svn-id: r54518
2010-11-28 14:56:31 +00:00
Fabio Battaglia
74a53df11b DINGUX: fix compilation for the opengl branch
Moved events related code to backends/events/dinguxsdl/*
and move graphics related code to backends/graphics/dinguxsdl/*
Subclass OSystem_POSIX instead of OSystem_SDL

svn-id: r53730
2010-10-23 09:30:26 +00:00
Johannes Schickel
34302765ca OPENGL: Get rid of one ugly cast.
svn-id: r53435
2010-10-13 15:42:53 +00:00
Johannes Schickel
a2b96a2516 OPENGL: Replace SdlEventManager by SdlEventSource.
Formerly SdlEventManager was a subclass of DefaultEventManager but did not
really have anything in common with the idea of our EventManager interface.
Now I made a new object SdlEventSource which only subclasses EventSource
and which is responsible for obtaining events from SDL (and processing them).

svn-id: r53433
2010-10-13 15:42:16 +00:00
Johannes Schickel
75e8452b6e OPENGL: Merged from trunk, from rev 52105 to 53396.
This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.

Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.

svn-id: r53399
2010-10-13 03:57:44 +00:00
Alejandro Marzini
9136724110 SDL/OPENGL: Fix backend initialization when building with ENABLE_VKEYBD.
svn-id: r52503
2010-09-03 04:23:01 +00:00
Alejandro Marzini
58d256c15e SDL: Make use of SDL_BACKEND instead of platform specific defines.
svn-id: r52029
2010-08-12 06:30:26 +00:00
Alejandro Marzini
f97809a9a6 OPENGL: Improve aspect ratio correction mode selection.
svn-id: r51752
2010-08-05 06:20:44 +00:00
Lars Persson
2e55bcf383 SYMBIAN platform. Correct building of SDL refacturing for Symbian.
svn-id: r51587
2010-08-01 19:40:46 +00:00
Alejandro Marzini
fb4086cadb Merged from trunk, from Rev 50841 to HEAD
svn-id: r51495
2010-07-30 05:28:09 +00:00
Alejandro Marzini
7b070bbef8 SDL/OPENGL: Add ability to switch between SDL and OpenGL graphics managers.
OSystem_SDL will create a merged list of all graphics modes from SDL and OpenGL. When the user changes the graphics mode in options and restarts ScummVM should switch to that graphics mode in the corresponding graphics manager.

svn-id: r51493
2010-07-30 03:31:05 +00:00
Alejandro Marzini
9daa1c7f93 OSYSTEM: Add resetGraphicsScale() method.
This fixes a hack for resetting the graphics scale to x1 when starting games that have a large screen size. The SDL graphics manager should now scale back to x1 without changing the current scaler in use, as well as the OpenGL graphics manager.

svn-id: r51492
2010-07-30 03:06:57 +00:00
Alejandro Marzini
2636ac4f36 OPENGL: Implement aspect ratio support and toggling. Improve fullscreen switching. Fix cursor scaling bug.
Now the hotkey Ctrl-Alt-Enter will switch between all available fullscreen modes. Alt-Enter will only switch to the best mode available, and exit fullscreen mode if already on it.
The different aspect ratios can be switched with Ctrl-Alt-A. The normal mode will stretch the contents to the screen, while other modes will stretch only one dimension to the screen size, and maintain the aspect ratio for the other dimension.

svn-id: r51346
2010-07-27 07:30:56 +00:00
Alejandro Marzini
141e101841 Formatted spaces.
svn-id: r51300
2010-07-26 06:58:33 +00:00
Alejandro Marzini
38b4098f67 SDL: Hack to handle special SDL events.
svn-id: r51015
2010-07-19 05:33:58 +00:00
Alejandro Marzini
0e748c5a97 Added basic cursor drawing.
svn-id: r50954
2010-07-16 23:50:46 +00:00
Alejandro Marzini
9ef2fc4744 Fixed doing OpenGL calls before a graphical context was created.
svn-id: r50905
2010-07-15 04:01:41 +00:00
Matthew Hoops
69bf70d693 Silence gcc warnings.
svn-id: r50902
2010-07-15 01:48:28 +00:00
Alejandro Marzini
f53028d4a2 Replaced the extra SDL functions added to GraphicsManager with an EventObserver in SdlGraphicsManager.
svn-id: r50900
2010-07-15 01:21:20 +00:00
Alejandro Marzini
609e08d5db Merged from trunk, from Rev 49499 to HEAD
svn-id: r50840
2010-07-13 04:31:15 +00:00
Matthew Hoops
a1161feed2 Fix compile on Mac OS X.
svn-id: r50801
2010-07-11 16:11:28 +00:00
Alejandro Marzini
4dca7c7e02 Moved getGraphicsManager() from OSystem_SDL to ModularBackend. Moved public SDL graphics manager functions to graphics manager (Allowing OpenGLSdlGraphicsMaanger to be used with other SDL managers easily). Removed BaseSdlGraphicsManager. Implemented in the opengl manager basic screen functions.
svn-id: r50796
2010-07-11 04:32:24 +00:00
Alejandro Marzini
3c607ef289 Cleanup and documentation.
svn-id: r50667
2010-07-05 01:10:29 +00:00
Alejandro Marzini
99c0f82608 Fixed some disabled code that was with problems after modularization.
svn-id: r49899
2010-06-16 04:34:44 +00:00
Alejandro Marzini
e81fb60d34 Add Common::EventSource inheritance for ModularBackend. OSystem_SDL now subclass from ModularBackend insteand of BaseBackend. Added forceFullRedraw() to SdlGraphicsManager and removed _modeChanged.
svn-id: r49590
2010-06-11 02:50:25 +00:00
Alejandro Marzini
7840aa1966 Added directives for avoiding compilation of sdl managers on platforms that don't use them (Other platforms may also need to be added later)
svn-id: r49531
2010-06-09 05:29:14 +00:00
Alejandro Marzini
4fe0b4e1ad Renamed and moved DefaultGraphicsManager to NullGraphicsManager. Added pure virtual class GraphicsManager.
svn-id: r49528
2010-06-08 23:44:05 +00:00
Alejandro Marzini
7ea78b1036 Merged from trunk.
svn-id: r49499
2010-06-08 03:31:27 +00:00
Alejandro Marzini
280c18f96e Added constructor, destructor. Made some variables and methods public. Removed toggleMouseGrab (now in events). Added feature methods. Fixed missing code for displayMessageOnOSD.
svn-id: r49472
2010-06-07 03:14:42 +00:00
Alejandro Marzini
ada0e211f6 Created SdlGraphicsManager.
svn-id: r49444
2010-06-05 22:45:36 +00:00