Commit Graph

1003 Commits

Author SHA1 Message Date
Matthew Hoops
550cff84f8 GRAPHICS: Add support for PE FON files
This hopefully will work out of the box, but requires testing
2011-02-23 14:43:18 -05:00
Matthew Hoops
a2a0b13de2 COMMON: Begin to merge some NE/PE code
The ID classes are now common to both. The files have been renamed to better illustrate their purpose.
2011-02-22 20:03:18 -05:00
Johannes Schickel
9afc89e67c GRAPHICS: Let PNG::getPalette take an uint16 for the palette entry count.
This is in analogy to r55742 / 2f08dcb.

I also took the freedom to clarify that the PNG loader uses a RGBA palette
format.
2011-02-20 21:43:24 +01:00
Johannes Schickel
75ee5af7c9 GRAPHICS: Remove leftover RGBA reference in PaletteManager documentation. 2011-02-20 21:38:40 +01:00
Matthew Hoops
5091f846a7 GRAPHICS: Switch PICT's palette from RGBA to RGB 2011-02-20 00:45:59 -05:00
Matthew Hoops
098581b3b5 GRAPHICS: Use the DirectBits size instead of the overall PICT dimensions
Fixes some Myst ME images
2011-02-20 00:43:18 -05:00
Johannes Schickel
e6c7544fe2 GRAPHICS: Fix cursor palette buffering after RGBA->RGB change.
Thanks to clone2727 for noticing this.
2011-02-20 05:43:04 +01:00
Johannes Schickel
292f197142 GRAPHICS: Remove note about alpha channel removal in PaletteManager. 2011-02-19 23:45:03 +01:00
Johannes Schickel
05f0855efc GRAPHICS: Update CursorManager documentation for RGBA->RGB change. 2011-02-14 17:08:32 +01:00
Johannes Schickel
f53f1af062 GRAPHICS: Adapt thumbnail code to grabPalette RGBA->RGB change. 2011-02-14 17:08:32 +01:00
Johannes Schickel
18ff02a2fa GRAPHICS: Update PaletteManager documentation for RGBA->RGB change. 2011-02-14 17:08:31 +01:00
Max Horn
ab039812e7 COMMON: OSystem now has a PaletteManager
svn-id: r55806
2011-02-07 17:52:38 +00:00
Bastien Bouclet
e7a57de38b GRAPHICS: Improved JPEG decoder performance
Replaced the 2D IDCT by two 1D IDCT (rows, then columns).
JPEG images now decode about twice as fast as they used to.

svn-id: r55794
2011-02-06 13:43:40 +00:00
Filippos Karapetis
2f08dcb667 GRAPHICS: Fixed a bug with indexed PNGs in the PNG decoder (a byte can't hold 256 entries)
svn-id: r55742
2011-02-02 21:18:10 +00:00
Filippos Karapetis
e6f2f7e615 GRAPHICS: Updated the copyright information regarding LodePNG. Removed the obsolete reference to ysflight, as no code is actually used from or based on that project
svn-id: r55726
2011-02-02 16:40:39 +00:00
Filippos Karapetis
a86cb87b98 GRAPHICS: Implemented a PNG decoder, and set it as default for the sword25 engine
libpng is still needed for PNG encoding (for thumbnails in saved games of sword25), but
since we'll probably drop support for the original saved games anyway, the PNG encoding
code will ultimately be removed

svn-id: r55723
2011-02-02 15:43:45 +00:00
Filippos Karapetis
c0ce8a839e Silenced some MSVC warnings
svn-id: r55699
2011-01-31 23:19:00 +00:00
Max Horn
c44f9bdb1d GRAPHICS: Make JPEG::getComponent error out if component was not found
svn-id: r55587
2011-01-28 09:50:05 +00:00
Max Horn
96d91ec182 GRAPHICS: Turn sqrt(2) and cosine values into constants ;)
svn-id: r55586
2011-01-28 09:46:39 +00:00
Max Horn
baf6af4fa6 GRAPHICS: Rename JPEG::_str to _stream
We use _str to denote strings almost everywhere, so this
was a bit confusing. Another alternative would be to use _s.

svn-id: r55585
2011-01-28 09:37:11 +00:00
Torbjörn Andersson
7bf8dda27f JANITORIAL: Remove unnecessary backslash
svn-id: r55483
2011-01-23 21:59:26 +00:00
Eugene Sandulenko
806ccf5d25 GRAPHICS: Move graphics/video/ to video/. Step 1/2
svn-id: r55473
2011-01-23 17:14:43 +00:00
Sven Hesse
c039b06c3c VIDEO: Fix createSurface() for the case that there's no video
Fixes clicking on the Piano in the Apartment in Urban Runner.

svn-id: r55456
2011-01-23 03:46:38 +00:00
Matthew Hoops
57521f7574 VIDEO: Update documentation on which decoder is used by what engine
svn-id: r55455
2011-01-23 01:27:40 +00:00
Matthew Hoops
257a6b2e6d VIDEO: Fix QuickTime audio buffering on the last frame
svn-id: r55450
2011-01-22 23:31:21 +00:00
Sven Hesse
95e557c564 VIDEO: Seek a video seek glitch
Observable when ESCing a 16bit or 24bit video, for example
the fuses in Urban Runner's Labyrinth screen.

svn-id: r55410
2011-01-22 08:00:57 +00:00
Sven Hesse
e1e299d0b8 VIDEO: Correctly correct the _blitMode 1/2 coordinate differences
This fixes the figure lights position in the Secret Room, while
still leaving the flow rate gauge position in the Labyrinth correct

svn-id: r55409
2011-01-22 07:20:16 +00:00
Sven Hesse
bb6c230587 GOB: Implement looping live videos
Needed for the buttons in the Playtoons series

svn-id: r55359
2011-01-20 18:17:39 +00:00
Sven Hesse
33ed3fa8a0 VIDEO: Don't delete, just finish the audiostream on video end
svn-id: r55356
2011-01-20 17:07:17 +00:00
Sven Hesse
75c840b527 VIDEO: Add hasVideo()
svn-id: r55348
2011-01-20 12:28:22 +00:00
Sven Hesse
8c80f80697 VIDEO: The getTimeToNextFrame override is useless now
svn-id: r55341
2011-01-20 03:27:09 +00:00
Sven Hesse
d77899e158 GOB: Make Urban Runner's "3D view" work again
svn-id: r55340
2011-01-20 03:22:43 +00:00
Sven Hesse
679a8d6ad6 VIDEO: Recreate the audiostream if necessary
svn-id: r55324
2011-01-19 09:03:09 +00:00
Sven Hesse
2e30eca6d0 VIDEO: Don't segfault when no audiostream is present
svn-id: r55322
2011-01-19 09:02:07 +00:00
Sven Hesse
22c3e7b1de VIDEO: Don't assert() when a needed codec isn't compiled in
svn-id: r55317
2011-01-19 00:16:13 +00:00
Matthew Hoops
503fdb6147 GRAPHICS: Add a getSurface() function to JPEG to automatically convert to RGB
svn-id: r55301
2011-01-18 16:18:10 +00:00
Sven Hesse
94f5bec0f6 GOB: Fix Woodruff video offsets
svn-id: r55288
2011-01-18 07:03:12 +00:00
Sven Hesse
d509941eca VIDEO: Clip render rect to the surface's dimension
...And not to the video's. Oops :P

svn-id: r55285
2011-01-18 05:09:43 +00:00
Sven Hesse
da65a3cbf3 GOB: Fix the flow rate gauge in Urban Runner
svn-id: r55275
2011-01-17 09:48:42 +00:00
Sven Hesse
84cda62d1f VIDEO: Implement internal-codec 24bpp VMDs
svn-id: r55265
2011-01-16 16:41:27 +00:00
Sven Hesse
32b94cc236 VIDEO: Implement internal-codec 16bit VMDs
svn-id: r55263
2011-01-16 16:29:43 +00:00
Sven Hesse
faa66fc01a VIDEO: Add color mode methods
To query the video's color mode and notifying the decoder that
the system's color mode changed.

svn-id: r55259
2011-01-16 16:27:52 +00:00
Sven Hesse
afd101c526 VIDEO: Add range checks to deLZ77()
svn-id: r55258
2011-01-16 16:27:22 +00:00
Sven Hesse
23c1184d80 VIDEO: Simplying the video buffers
svn-id: r55257
2011-01-16 16:26:52 +00:00
Matthew Hoops
8ce55fbcde VIDEO: Reset the pause start time when seeking while paused
svn-id: r55239
2011-01-14 13:01:57 +00:00
Matthew Hoops
4e56df4dbd GRAPHICS: Begin to parse Win1 fonts based on our sole Hugo1 sample (still WIP)
svn-id: r55227
2011-01-13 16:06:35 +00:00
Matthew Hoops
095384b90f GRAPHICS: Use the pixel height instead of the ascent as the WinFont height
svn-id: r55224
2011-01-13 14:45:14 +00:00
Matthew Hoops
0f04b4609c VIDEO: Fix QuickTime timing when seeking without audio (thanks bgK)
svn-id: r55211
2011-01-11 21:33:23 +00:00
Matthew Hoops
3cb7224c10 VIDEO: Add seeking capability to QuickTimeDecoder
svn-id: r55203
2011-01-11 17:27:37 +00:00
Matthew Hoops
3bb5a9fe71 VIDEO: Add a SeekableVideoDecoder class
svn-id: r55202
2011-01-11 17:27:31 +00:00
Sven Hesse
3ac598624d BUILD: Include scummsys.h to force rebuild after reconfigure
svn-id: r55157
2011-01-08 03:36:21 +00:00
Willem Jan Palenstijn
6a28d05676 BUILD: Include scummsys.h to force rebuild after reconfigure (thanks LordHoto)
svn-id: r55156
2011-01-08 03:27:13 +00:00
Johannes Schickel
f9ebeb330b GRAPHICS: Some basic documentation for Font.
svn-id: r55143
2011-01-07 12:43:00 +00:00
Johannes Schickel
2817f80db8 GRAPHICS: Add some doxygen comments to Surface.
svn-id: r55142
2011-01-07 12:26:01 +00:00
Matthew Hoops
4e05e450c3 VIDEO: Mirror QuickTime's mishandling of its own mdat atoms
While the specs say that the 'mdat' ("media data") atom is required in all QuickTime files, QuickTime makes no check if the atom is actually present. This allows for some videos with typos in the atom tag in them to play in QuickTime anyway. The offsets in the 'stco' atom are only used instead.

This will fix a video in DS2 Mac and a music file in IHNM Mac (although this is not needed for either just yet).

svn-id: r55125
2011-01-05 18:06:46 +00:00
Matthew Hoops
bee912ff54 GRAPHICS: Add support for Windows FON/FNT fonts
As required by Hugo and Mohawk.

svn-id: r55120
2011-01-04 20:39:27 +00:00
Alyssa Milburn
7e0744aa4a VIDEO: Stop leaking surface data in several codecs.
svn-id: r55095
2011-01-02 14:57:49 +00:00
Filippos Karapetis
cc0b2b210f GRAPHICS: Fixed code analysis warnings (bug #3087917)
svn-id: r54964
2010-12-19 16:16:25 +00:00
Alyssa Milburn
eac4a64143 VIDEO: Add CDToons decoder
svn-id: r54936
2010-12-16 17:01:09 +00:00
Matthew Hoops
ebf2dd8d38 VIDEO: Extend Codec to support internal palettes
svn-id: r54932
2010-12-16 13:25:29 +00:00
Matthew Hoops
9285986e62 VIDEO: Make Codec::decodeImage() return a const Surface pointer
svn-id: r54930
2010-12-16 02:02:53 +00:00
Matthew Hoops
98a2bc8a9a VIDEO: Remove the need to call updateAudioBuffer() externally for QuickTime
svn-id: r54929
2010-12-16 01:49:29 +00:00
Matthew Hoops
1ead0d8436 VIDEO: Make VideoDecoder::getPalette() return a const byte pointer
svn-id: r54928
2010-12-16 01:41:11 +00:00
Matthew Hoops
375f32fbe9 VIDEO: Make VideoDecoder::decodeNextFrame() return a const Surface pointer
svn-id: r54927
2010-12-16 01:35:13 +00:00
Matthew Hoops
cf65709c45 VIDEO: Fix QuickTimeDecoder::hasDirtyPalette() by allocating the palette only for 8bpp videos
svn-id: r54849
2010-12-10 02:09:48 +00:00
Matthew Hoops
09abe6f151 VIDEO: Allow for 8bpp Cinepak videos
svn-id: r54841
2010-12-09 20:48:08 +00:00
Matthew Hoops
680b0d3172 VIDEO: Implement multiple video codec support for QuickTime
svn-id: r54840
2010-12-09 19:59:26 +00:00
Matthew Hoops
cf86141ca3 VIDEO: Fix a truncation in the SMC decoder (thanks, fuzzie)
svn-id: r54839
2010-12-09 13:36:23 +00:00
Max Horn
2180b2d6b5 COMMON: Split common/stream.h into several headers
svn-id: r54385
2010-11-19 17:03:07 +00:00
Max Horn
a0df86955f ALL: Push down deps on stream.h from .h to .cpp files
svn-id: r54358
2010-11-19 01:37:04 +00:00
Max Horn
dbddd758d1 GRAPHICS: colour -> color
svn-id: r54287
2010-11-17 12:21:37 +00:00
Max Horn
abe1959d36 COMMON: Simplify DECLARE_SINGLETON macro
This makes it possible to write
  DECLARE_SINGLETON(foo);
instead of
  DECLARE_SINGLETON(foo)
without causing a warning about an extra semicolon.
The extra semicolon helps some editors at parsing the C++ code.

svn-id: r54258
2010-11-16 08:23:13 +00:00
Matthew Hoops
f4af4d2366 VIDEO: Switch Truemotion 1 to RGB565 for potential use with SCI CLUT tables
svn-id: r54231
2010-11-13 19:15:31 +00:00
Matthew Hoops
8e274749ed VIDEO: Add support for DK3 in videos; fix sample rate location
svn-id: r54205
2010-11-11 17:05:33 +00:00
Matthew Hoops
7207d920bc VIDEO: Cleanup AVI audio in preparation for DK3
svn-id: r54200
2010-11-11 13:23:26 +00:00
Matthew Hoops
5e8e77a814 VIDEO: Add the TrueMotion 1 codec for Phantasmagoria 2
Based on the FFmpeg decoder. Only the 16bpp version has been implemented (and all that should be needed). The videos I have tried work fine with the codec. The audio does not yet play in these videos, but I hope to work on DK3 IMA ADPCM soon.

svn-id: r54194
2010-11-11 04:53:52 +00:00
Matthew Hoops
d1bd2497a5 GRAPHICS: Enforce alphabetical order on the codec objects
svn-id: r54191
2010-11-10 19:18:39 +00:00
Sven Hesse
9c349cf78b VIDEO: PreIMD: End frame when stream depleted
As happens for the last frames in the Fascination videos.

svn-id: r54144
2010-11-08 17:03:27 +00:00
Max Horn
7e7ad149c2 GRAPHICS: Cleanup advmame scaler code; don't include assert.h
svn-id: r54104
2010-11-07 00:37:04 +00:00
Florian Kagerer
e4da5e3af4 GRAPHICS/SJIS: cleanup
svn-id: r54099
2010-11-05 20:36:13 +00:00
Florian Kagerer
4457d10f84 GRAPHICS/SJIS: fix out of bounds shadow mode text drawing
svn-id: r54080
2010-11-05 01:11:05 +00:00
Florian Kagerer
206971d16b SCUMM/FM-TOWNS JAPANESE: fix out of bounds text drawing
(could cause invalid memory access in MI1)

svn-id: r54079
2010-11-05 00:36:23 +00:00
Sven Hesse
016f24d16c VIDEO: PreIMD: End frame when frameSize == 0
As happens for the last frame in the first video of the Fascination
intro.

svn-id: r54072
2010-11-04 20:36:28 +00:00
Florian Kagerer
ab1c54a9ee TOON: fix some evaluation order bugs in smacker decoder
These bugs would cause crashs in MSVC 2008/2010 release builds.

svn-id: r53893
2010-10-27 22:41:08 +00:00
Max Horn
c975ed11a1 ALL: Fix various typos (patch #3093266)
svn-id: r53762
2010-10-24 13:04:33 +00:00
Florian Kagerer
1d87f434a2 SCUMM/FM-TOWNS JAPANESE: implement flipped text
(used in the MI1 circus scene after Guybrush gets shot out of the cannon)

svn-id: r53616
2010-10-19 16:58:27 +00:00
Florian Kagerer
365cb758fb GRAPHICS: enable sjis code for scumm engine
svn-id: r53555
2010-10-17 14:11:06 +00:00
Florian Kagerer
c841c3fb7c SCUMM/FM-TOWNS: more improvements to japanese font drawing
- made use of LordHotos graphics/sjis code to reduce code duplication
- japanese mode for version 3 and 5 works fine now with few exceptions (some line spacing glitches in MI1 intro etc.)

svn-id: r53554
2010-10-17 13:08:00 +00:00
Sven Hesse
ccb3506719 GRAPHICS: Fix code analysis warnings
See bug report #3087917

svn-id: r53493
2010-10-15 13:56:14 +00:00
David Turner
04973e85be VIDEO : Corrections to QDM2 codec for bug #3087917 "Code Analysis Warnings"
The first correction was to use a temporary variable to remove the possibility of a memory leak when using realloc.
The second correction was to remove the gain variable from QDM2Stream::qdm2_calculate_fft() which has always evaluated to 1.0f and so has no effect.

svn-id: r53489
2010-10-15 13:11:34 +00:00
Torbjörn Andersson
54b2a8c98d JANITORIAL: Cleanup (mostly whitespace)
svn-id: r53161
2010-10-12 04:19:58 +00:00
Jordi Vilalta Prat
8388e0dfea JANITORAL: Clean trailing whitespaces.
svn-id: r53160
2010-10-12 02:18:11 +00:00
Max Horn
3dda3c073a GRAPHICS: Turn static AviDecoder methods into local funcs
svn-id: r53141
2010-10-10 22:25:52 +00:00
Sylvain Dupont
0fc6572b65 VIDEO: Remove useless references in handleAudioTrack function
svn-id: r53091
2010-10-09 00:17:55 +00:00
Eugene Sandulenko
741e7c7f5e VIDEO: Factor out handleAudioTrack() to be used by Toons engine
svn-id: r53086
2010-10-08 22:17:03 +00: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
Torbjörn Andersson
02e759aad3 GOB: Make GCC happier.
svn-id: r52956
2010-09-30 15:22:52 +00:00
Sven Hesse
6bbfac77af VIDEO: Interpolate U and V values
svn-id: r52955
2010-09-30 15:03:51 +00:00