ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,975 Commits 45 Branches 139 Tags
cfe42b15b1bc1ab74cdad90b7dcafe6f0859ff83
Commit Graph
283 Commits
Author SHA1 Message Date
Johannes Schickel 59dde54519 Merge pull request #301 from lordhoto/c++11-playground 
RFC: Allow use of override and nullptr. Also allow C++11 compilation.
 2013-01-26 05:25:14 -08:00
Matthew Hoops fa9dd0f6c0 OPENGL: Fix linear filtering when the texture size doesn't match the real size 2013-01-24 12:49:21 -05:00
Johannes Schickel 9f22d60adf SDL: Silence C++ narrowing warnings. 2013-01-09 07:24:37 +01:00
Johannes Schickel 0a495f7faa OPENGL: Silence C++11 narrowing warning. 2013-01-09 07:24:37 +01:00
Johannes Schickel d2a536ff89 Revert "OPENGLSDL: Remove HACK in fullscreen toggle mode." 
This reverts commit b6f7d69709. This actually
breaks fullscreen mode cycling.
 2012-12-10 19:26:13 +01:00
Johannes Schickel 89abab97e3 JANITORIAL: Remove trailing whitespaces. 
Powered by:
git ls-files "*.cpp" "*.h" "*.m" "*.mm" | xargs sed -i -e 's/[ \t]*$//'
 2012-09-26 04:17:55 +02:00
Johannes Schickel 8aa8cb4dd6 DINGUX: Fix "if" formatting. 2012-08-09 03:25:55 +02:00
Johannes Schickel 5521261fde OPENGL: Fix RGBA8888 mode setup. 2012-08-09 03:09:01 +02:00
David-John Willis 4cd34733a3 OPENGL: GL_BGRA does not exist in every GLES implementation. 
* It definately does not exist in the GLES implementations I can test with.
* Don't configure if USE_GLES is set.
 2012-08-08 13:37:32 +01:00
David-John Willis 4b4ce9dc6b GPH: Add extra call to SDL_ShowCursor(SDL_DISABLE). 
* This is needed on the hacked SDL on the GP2X after any
  call to  SDL_SetVideoMode. It does not impact other GPH devices.
 2012-07-31 18:59:36 +01:00
David-John Willis d83764f055 GPH: Fix accidental commit. 
* I did not mean to commit any of the GPH backend with the OP stuff. Cleanup of this backend will follow later.
 2012-07-24 10:12:54 +01:00
David-John Willis 6f978ee78b OPENPANDORA: Free hiddenCursor on unloadGFXMode and cleanup screen setup. 
* Also remove some old cruft in the form of commented code.
 2012-07-24 10:08:58 +01:00
David-John Willis 45354676eb OPENPANDORA: Move SDL_CreateCursor hacklet from init to loadGFXMode. 
* Fixes a bug that can occur on load.
 2012-07-24 10:08:58 +01:00
Johannes Schickel aec9b9e22a ALL: Let overlay related methods in OSystem take a void * and use a proper pitch values. 
This is a first step to get rid of OverlayColor, which is a requirement for
proper 4Bpp overlay support.
 2012-06-16 04:17:14 +02:00
Johannes Schickel d27d951d0b BACKENDS: Make OSystem::setMouseCursor take a "const void *" buffer. 
This is mainly for consistency with OSystem::copyRectToScreen.
 2012-06-16 03:28:42 +02:00
Johannes Schickel 31880186e1 BACKENDS: Let copyRectToScreen take a "const void *" instead of "const byte *" as buffer. 
This removes the need to convert the parameter to copyRectToScreen to
"const byte *", which is commonly used in games, which use Graphics::Surface
to store their graphics data.
 2012-06-16 02:18:01 +02:00
Johannes Schickel a401f0a19e ALL: Replace cursorTargetScale in OSystem API with a simple "do not scale" logic. 
All uses of the old target scale API actually wanted to disallow scaling of
the mouse cursor. This commit adapts our API to this and thus simplifies
backend implementations.

Some backends, most notable the Wii and Android, did some implementation of
the cursor target scale, which I didn't adapt yet. I added a TODO for the
porters there.
 2012-06-03 02:02:57 +02:00
Max Horn 5de3f9c765 ALL: Correct spelling of "Mac OS X" in various places 2012-05-31 10:30:29 +02:00
Alyssa Milburn 29e05ec05e OPENGL: Don't leak surfaces. 2012-03-28 19:18:25 +02:00
Johannes Schickel 223794fb38 ALL: Make use of defined() for the preprocessor consistent. 
This does not change the use of defined for some NDS source files, since they
seem to be (based on?) third party code.
 2012-03-17 22:02:44 +01:00
Willem Jan Palenstijn 297d15e122 OPENGL: Don't force alpha to 1 
This was likely a hack to work around an alpha blending bug in the
gui vector renderer.
 2012-02-20 22:17:33 +01:00
Thierry Crozat 7a3df4681b NULL: Fix compiler errors when using the NullGraphicsManager 
The errors fixed are inaccessible base class when trying to set the
_graphicsManager and a pure virtual function when trying to create
the NullGraphicsManager instance.
 2012-02-19 18:41:49 +00:00
Johannes Schickel 37e5b209a7 OPENGL: More formatting fixes. 2012-02-15 02:23:54 +01:00
Johannes Schickel b6f7d69709 OPENGLSDL: Remove HACK in fullscreen toggle mode. 
Altering the fullscreen state will automatically force a refresh now.
 2012-02-15 02:23:47 +01:00
Johannes Schickel 5b3ebdf43d OPENGL: Prevent access to a few more members in the SDL OpenGL code. 2012-02-15 02:23:37 +01:00
Johannes Schickel 05af37c08e OPENGL: Use tabs instead of spaces for indentation. 2012-02-15 02:23:22 +01:00
Johannes Schickel 97760ff101 OPENGLSDL: Don't cast EventType into int for switch. 2012-02-15 02:23:14 +01:00
Johannes Schickel 1f01fb330c OPENGL: Use C-style casts. 2012-02-15 02:23:08 +01:00
Johannes Schickel e5d48797d9 OPENGL: Let getGlErrStr return a Common::String. 
This also makes getGlErrStr use Common::String::format instead of snprintf.
 2012-02-15 02:23:01 +01:00
Johannes Schickel beab93e746 OPENGL: Slight formatting fixes. 2012-02-15 02:22:54 +01:00
Johannes Schickel 864eec8cd2 OPENGL: Make all GLTexture members private. 2012-02-15 02:22:45 +01:00
Johannes Schickel 93435b2e3f OPENGL: Unvirtualize all GLTexture methods. 2012-02-15 02:22:37 +01:00
Johannes Schickel 56971f11d1 OPENGL: Remove redundant check in adjustMousePosition. 2012-02-15 02:22:30 +01:00
Johannes Schickel 90178d9b87 OPENGL: Fix mouse cursor scaling. 2012-01-03 04:19:08 +01:00
Johannes Schickel 772aecf5f8 OPENGLSDL: Simplify the code a bit. 2011-12-15 21:53:09 +01:00
Johannes Schickel c91b6d7d35 OPENGLSDL: Fix video mode initialization for 640x400 games with AR enabled. 
Formerly they always used a height of 240 * scaleFactor, which would for
exmaple make the games requesting a 1x scaler use a height of 240 if AR
is enabled.

This was a regression from b8dcd9a25e.
 2011-12-15 21:48:14 +01:00
Tarek Soliman fda6e1534b MAEMO: Fix zoom key capture on N900 (fixes bug#3443037) 
This was semi-intentionally skipped in the intial port revival
because the focus was on N810 at the time.

This is mostly copied from the old 1.2.1 port and then cleaned up.
 2011-11-29 14:39:15 -06:00
Tarek Soliman 29c0386f2c MAEMO: Add basic graphics manager 2011-11-29 13:38:17 -06:00
Johannes Schickel 949b30dc36 OPENGL: Always set the unpack alignment when refreshing the textures. 
This should hopefully make sure we are always having the correct alignment set
up. This might fix bug #3435655 "OpenGL display corruption with various Sierra
games Daily B.".
 2011-11-09 18:57:13 +01:00
David-John Willis a27c2b401c OPENPANDORA: Cleanup the format of code a little to match our Code Formatting Conventions. 
* No functional changes.
* Automated astyle pass.
 2011-10-10 21:18:07 +01:00
David-John Willis 6269dcdd3c GPH: Cleanup the format of code to match our Code Formatting Conventions. 
* No functional changes.
 2011-10-03 13:43:42 +01:00
David-John Willis fc551cf1ad GPH: Cleanup loadGFXMode(). 2011-10-03 12:37:46 +01:00
David-John Willis 69683b8ee0 SURFACESDL: Stop forceful resetting of _videoMode.hardware* when calling SurfaceSdlGraphicsManager::loadGFXMode() for the GPH backend. 
* Note: This really should be cleaned up and all backends that have a custom loadGFXMode() really should setup their own _videoMode.hardware* settings. Assuming the overlay will always match the hardware is flawed logic on devices with fixed hardware screens.
* Just done for the GPH backend for now to cut down on the regresion risk to other backends near the 1.4.0 release cycle.
 2011-10-03 12:24:25 +01:00
Johannes Schickel 325addff0c OPENGLSDL: Make fullscreen mode switching work again. 2011-09-23 19:45:44 +02:00
Chris Warren-Smith c39b7491e6 BADA: Remove incorrect BADA defined check 2011-08-21 11:46:37 +02:00
Chris Warren-Smith 812e4498ec BADA: Fix formatting and non bada host compile error 2011-08-21 16:38:53 +10:00
Chris Warren-Smith 59739a7a0e BADA: Initial BADA port implementation 2011-08-21 16:37:06 +10:00
Johannes Schickel dd0ad3cba4 SDL: Fix typo. 2011-08-18 23:18:20 +02:00
Johannes Schickel b8dcd9a25e 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.
 2011-08-12 04:06:54 +02:00
Johannes Schickel a77c29327e OPENGLSDL: Do not change requested window size on resize. 
This should help fix a lock up on window managers, which will try to force the
ScummVM window to a certain size, by just requesting the same size over and
over again.

Now we get black borders even in windowed mode when the aspect of the window
does not match the aspect of the game screen (and we are not in "normal" mode),
but that is usually the same in video players too, so shouldn't be too bad.
 2011-08-12 03:46:32 +02:00