Commit Graph

48 Commits

Author SHA1 Message Date
Johannes Schickel
c2971374cd Merge pull request #257 from lordhoto/graphics-conversion
Extend crossBlit for abitrary (in-place) conversions and add a in-place conversion to Surface
2012-10-08 14:18:33 -07:00
Johannes Schickel
eeb3959259 GRAPHICS: Add an in-place Surface PixelFormat conversion. 2012-08-28 02:27:48 +02:00
Matthew Hoops
9971e74c4c Merge remote branch 'upstream/master' into pegasus
Conflicts:
	base/plugins.cpp
	configure
2012-04-19 08:16:24 -04:00
Joel Teichroeb
ab16233318 GRAPHICS: Fix casting away const 2012-04-03 16:54:05 -07:00
Matthew Hoops
71756bdf4e Merge remote branch 'upstream/master' into pegasus 2012-03-20 14:49:16 -04:00
Matthew Hoops
a7740fb6de GRAPHICS: Add support for converting surfaces from 24bpp 2012-03-20 01:06:48 +01:00
Matthew Hoops
a004897252 GRAPHICS: Add a convertTo() function to Surface 2012-03-20 01:06:47 +01:00
Matthew Hoops
00279659b2 Merge remote branch 'upstream/master' into pegasus
Conflicts:
	video/qt_decoder.cpp
2011-12-12 15:25:28 -05:00
Johannes Schickel
61795739f8 COMMON: Rename Common::set_to to Common::fill.
This makes the name match with the name of the STL function with the same
behavior.
2011-11-16 18:06:30 +01:00
Matthew Hoops
c2af197edb GRAPHICS: Add a Surface wrapper for drawThickLine 2011-10-27 19:20:28 -04:00
Chris Warren-Smith
3019b283f9 BADA: Prevent assertion failure when allocating zero bytes 2011-08-21 16:38:52 +10:00
Max Horn
88913c0139 ALL: Remove trailing whitespaces
This tries to make our code a bit more compliant with our code formatting
conventions. For future use, this is the command I used:
  git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
2011-06-20 00:59:48 +02:00
Matthew Hoops
5fdf2796d6 GRAPHICS: Cleanup formatting 2011-05-19 18:38:09 -04:00
Matthew Hoops
1ee5ef9c6f GRAPHICS: Allow auxiliary surface functions to be used for 32bpp surfaces 2011-05-19 18:38:09 -04:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Johannes Schickel
71bdb86e02 Merge pull request #16 "Add a PixelFormat to Graphics::Surface.".
For further discussion check here:
https://github.com/scummvm/scummvm/pull/16

Conflicts:
	graphics/png.cpp
2011-05-01 16:54:45 +02:00
Ori Avtalion
9414d7a6e2 JANITORIAL: Reduce header dependencies in shared code
Some backends may break as I only compiled SDL
2011-04-28 15:08:58 +03:00
Johannes Schickel
da734a4af0 ALL/GRAPHICS: Remove Surface::bytesPerPixel. 2011-04-17 21:27:34 +02:00
Johannes Schickel
3fd919060c GRPAHICS: Do not access Surface::bytesPerPixel anymore. 2011-04-17 20:58:08 +02:00
Johannes Schickel
4fd3e3d6fe GRAPHICS: Add a PixelFormat member to Surface. 2011-04-17 15:17:42 +02:00
Johannes Schickel
5541af78b1 GRAPHICS: Add BPP check to Surface::move.
svn-id: r52968
2010-10-01 20:44:58 +00:00
Johannes Schickel
288d09389e GRAPHICS: Cleanup.
svn-id: r52967
2010-10-01 20:44:41 +00:00
Florian Kagerer
0d8f4a22ae SCUMM/FM-TOWNS: fix palette and other graphics issues
This commit should fix at least the following bugs/feature requests: #1032859, #1252088, #1055391, #1315968, #1315938, #1742106, #812891.
The FM-Towns version of Scumm games use a mixed graphics mode with 2 layers (one with 32767 colors and one with 16 colors). Among other things I have added a screen output class which emulates this  dual layer approach which allows specific hardware effects like enabling and disabling layers (e.g. in the voodoo priestess scene in MI1).

Old savegames (saved before this update) will load, but you’ll encounter palette glitches in the verb/inventory screen, since the 16 color palette for layer 2 is not contained in your savegame. This will be true at least for version 5 games. Certain scene change actions (which require the verb/inventory part to be redrawn) might correct this (e.g. try looking at the treasure map in MI1 and closing it). Version 3 games should be okay, since they use a static text palette which is never changed and which will be reset after loading a savegame.

This update requires a USE_RGB_COLORS setting for proper operation. 8 bit users will get a warning that they’ll have to expect palette glitches . Apart from that the engine in 8 bit mode should not only still work okay, but also benefit from some of the other (non palette related) improvements (e.g. bug #1032859 should be fixed even in 8 bit mode).

Japanese font drawing hasn’t been improved much yet. This will be a separate task.

svn-id: r52966
2010-10-01 19:24:52 +00:00
Eugene Sandulenko
c8a9eb9c32 GRAPHICS: Extend Surface::fill() method to support 32bits. Looks ugly
svn-id: r52268
2010-08-21 20:14:46 +00:00
Andre Heider
74c0db4548 Use the faster memset() in Surface::fillRect() for 16bit modes when possible.
svn-id: r48756
2010-04-20 20:22:33 +00:00
Max Horn
c210b71876 Moved Surface::blit to backends/vkeybd/virtual-keyboard-gui.cpp
svn-id: r35965
2009-01-20 22:52:29 +00:00
Andre Heider
311b267863 merge SurfaceKeyColored into Surface
svn-id: r35951
2009-01-20 15:21:47 +00:00
Johannes Schickel
259d87a8a6 Added "querySaveMetaInfos" to MetaEngine.
-> Allows easy addition of save state specific infos like playtime, save date atc.
 -> Removed MetaEngine::loadThumbnailFromSlot, superseded by meta infos
 -> Changed SCUMM / KYRA to implement the newly added functionallity
 -> Removed hack in KYRAs listSavefiles, which is now handled via meta infos

svn-id: r34581
2008-09-16 14:10:55 +00:00
Jordi Vilalta Prat
d6c34bdc4b Fixed the spaces before tabs.
svn-id: r30667
2008-01-28 00:14:17 +00:00
Johannes Schickel
31180e7981 Added assert for bit depth in Surface::move.
svn-id: r29522
2007-11-16 23:39:14 +00:00
Sven Hesse
b198e11f8a Muting the compiler :P
svn-id: r29443
2007-11-06 23:31:00 +00:00
Johannes Schickel
616c8357b4 - little bit more cleanup
- added fixme about Surface::move

svn-id: r29442
2007-11-06 23:03:19 +00:00
Johannes Schickel
3592690b78 Cleanup.
svn-id: r29441
2007-11-06 22:40:29 +00:00
Nicola Mettifogo
258901bab9 Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
2007-09-19 08:40:12 +00:00
Max Horn
218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots
svn-id: r27024
2007-05-30 21:56:52 +00:00
Travis Howell
3c11d2fa18 Move moveScreen to common surface functions for graphics
svn-id: r23218
2006-06-21 11:33:04 +00:00
Max Horn
13d6a56867 Change CVS keywords to SVN keywords
svn-id: r20519
2006-02-11 10:10:44 +00:00
Eugene Sandulenko
ea42bad781 Update copyright notice
svn-id: r20088
2006-01-18 17:39:49 +00:00
Eugene Sandulenko
b36677af71 Update FSF address. Eek. Actually that took place on May 1, 2005
svn-id: r19142
2005-10-18 01:30:26 +00:00
Eugene Sandulenko
6b4484472b Remove trailing whitespaces.
svn-id: r18604
2005-07-30 21:11:48 +00:00
Torbjörn Andersson
bfbbf48585 Added clipping to drawLine(). This fixes a regression that caused the
debug console to crash ScummVM. (I'm not sure, but I think it was trying to
draw the scrollbar arrows outside the screen when the console was sliding
into view.)

svn-id: r18138
2005-05-17 12:17:30 +00:00
Max Horn
315943f19a Added convenience methods create/free to Graphics::Surface (part of patch #1163026)
svn-id: r17973
2005-05-08 21:24:33 +00:00
Max Horn
5d5b997864 Patch #1193795 (Adding drawLine() to Surface)
svn-id: r17959
2005-05-08 12:33:55 +00:00
Max Horn
2b71af3de9 Const correctness
svn-id: r17898
2005-05-02 18:00:05 +00:00
Max Horn
47280d9433 Updated copyright
svn-id: r16398
2005-01-01 16:09:25 +00:00
Eugene Sandulenko
e92054b468 Fix typo. Actually asserts there would be more convenient for debugging
purposes.

svn-id: r15892
2004-11-26 00:56:42 +00:00
Max Horn
b3e5b875da Small optimization
svn-id: r15889
2004-11-25 23:51:58 +00:00
Max Horn
f5da05f80d Added some graphic primitives
svn-id: r15885
2004-11-25 23:33:21 +00:00