Commit Graph
43 Commits
Author SHA1 Message Date
Johannes Schickel 8fc7d60feb SCI: Make GPL headers consistent in themselves. 2014-02-18 02:39:37 +01:00
Johannes Schickel dbda889e63 SCI: Take advantage of Surface::getPixels. 2013-08-03 04:02:52 +02:00
Johannes Schickel dd67e9f099 SCI: Prefer getBasePtr over direct Surface::pixels access. 2013-08-03 02:52:33 +02: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
Matthew Hoops 18823198ad VIDEO: Merge AdvancedVideoDecoder into VideoDecoder 2012-08-16 14:00:14 -04:00
Matthew Hoops 7294a1cbcf VIDEO: Remove the Coktel video code from using the VideoDecoder API
After discussing with DrMcCoy, we felt this the best way to proceed. A wrapper class that implements AdvancedVideoDecoder is still around for use in SCI.
2012-08-16 12:17:23 -04:00
Matthew Hoops 991710d0a1 VIDEO: Adapt QuickTimeDecoder to the AdvancedVideoDecoder API 2012-07-27 11:32:51 -04:00
Matthew Hoops d4231fda1c SCI: Rewrite RobotDecoder to use the AdvancedVideoDecoder API 2012-07-22 23:17:36 -04:00
Matthew Hoops 0f0c6f9354 VIDEO: Rewrite the AVI code to use AdvancedVideoDecoder
In addition to using the new API, it should theoretically support multiple audio and video tracks now but that has not been tested.
2012-07-22 14:13:20 -04:00
Matthew Hoops a12b3ea2dd SCI: Move the SEQ code to the new VideoDecoder API 2012-07-20 20:52:58 -04:00
Filippos Karapetis b2fb2730d6 SCI: Also set the filename of the videoState struct when playing AVIs 2012-07-08 22:01:15 +03:00
Willem Jan Palenstijn b091c0bd09 SCI: Remove unnecessary const-cast 2012-07-03 00:00:48 +02:00
Filippos Karapetis f06eb05e8c SCI: Implement kPlayVMD subop 23 (set palette range)
Fixes the wrong palette during video sequences in GK2 and the demo of RAMA
2012-06-23 21:45:18 +03:00
Johannes Schickel 4fb9bceabc Merge pull request #246 from lordhoto/osystem-void-buffers
OSYSTEM: Use void buffers for screen/overlay/mouse buffers and proper pitch values for overlay code
2012-06-20 08:02:26 -07:00
Filippos Karapetis 2b50824133 SCI: Add setter/getter methods to reg_t's
No functionality change has been made with this commit. This avoids
setting and getting the reg_t members directly, and is the basis of any
future work on large SCI3 scripts (larger than 64KB)
2012-06-18 05:24:06 +03:00
Filippos Karapetis 3c04d333f2 SCI: Add a check for empty VMD file names 2012-06-18 05:24:04 +03:00
Johannes Schickel 084c1259fc SCI: Get rid of casts on OSystem::copyRectToScreen calls. 2012-06-16 02:39:00 +02:00
Filippos Karapetis f76c71d968 SCI: Add debug code to automatically skip robot videos 2012-06-13 12:26:48 +03:00
Filippos Karapetis 289e4e6cfb SCI: Duck videos are 16bpp, so we need to change the active pixel format 2011-10-18 03:24:46 +03:00
Filippos Karapetis 021b09d35c SCI: Initial implementation of kPlayDuck for Phantasmagoria 2 2011-10-18 02:38:26 +03:00
Johannes Schickel 13a89385dd SCI: Fix formatting in kRobot. 2011-10-09 18:31:44 +02:00
Filippos Karapetis 69d08a7192 SCI21: Moved kRobot() together with the other video functions 2011-10-09 19:16:02 +03: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
strangerke 69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +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
Matthew Hoops 257bae431a SCI: Fix KQ6 Mac video positioning 2011-02-20 12:44:59 -05:00
Lars Skovlund a5b198b233 Remove erroneous comment. It reflected a false belief resulting from
a missing parameter check, which has also been added.
2011-02-13 22:34:29 +01:00
Matthew Hoops b4ca2da72e SCI: Switch to true color mode for the GK2 demo Indeo3 video 2011-02-13 16:14:06 -05:00
Matthew Hoops 0be58b2694 SCI: Fix VMD coordinates
The suffix check for "vmd" failed for uppercase files.
2011-02-13 16:14:06 -05:00
Filippos Karapetis 72a9706950 SCI: Some work on robot videos
- The size of the videos is now calculated when they are loaded (this helps remove some
nasty hacks and constant memory reallocations and simplifies the code)
- Some work on frame placement (e.g. in robot 1305, Phantasmagoria)

svn-id: r55830
2011-02-08 19:50:45 +00:00
Filippos Karapetis 6f9ac84f77 SCI: Converted the robot decoder into a regular video decoder, and decoupled it from the
SciEngine class

- Robot videos are now shown in frameOut(), like they should, and kRobot(sync) is only
used for syncing with the game scripts
- Hooked video playing into the "play_video" console command

svn-id: r55801
2011-02-07 12:24:09 +00:00
Eugene Sandulenko caa6684752 VIDEO: Move video classes to Video:: namespace
svn-id: r55479
2011-01-23 19:08:09 +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
Filippos Karapetis 49f965a547 SCI2.1: Added a sanity check for VMD video positioning, for the demo of Lighthouse
svn-id: r55137
2011-01-07 00:07:33 +00:00
Filippos Karapetis 430dc10c49 SCI: VMD video related changes
- VMD videos are now properly started from the associated play subop of the 
kPlayVMD kernel call, and are now properly positioned on screen, and doubled
only if the games require them to be
- Added an enum for VMD video flags

svn-id: r55003
2010-12-22 13:51:35 +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
Filippos Karapetis 8b14137c07 SCI: Some video related changes
- Now playVideo() is used when playing videos from the console (reducing
code duplication)
- Added support for 16bpp scaling in scale2x, so that the 16-bit color
Duck videos are scaled correctly

svn-id: r54210
2010-11-11 19:22:56 +00:00
Lars Skovlund 3a9d935023 SCI: Fix error message in ShowMovie(), perhaps avoiding some confusion later
svn-id: r54156
2010-11-09 15:15:13 +00:00
Max Horn e27b05ef35 COMMON: Rename String::printf() to String::format()
This is a first step towards getting rid of all uses of regular printf,
fprintf, vprintf, vfprintf, puts, fputs, etc. in our codebase.

The name format() reflects the purpose of the function, and parallels
String.format() in Java, boost::format, and others.

svn-id: r54004
2010-11-01 16:02:28 +00:00
Torbjörn Andersson c91a07229a JANITORIAL: Removed most punctuation at end of warning() and error()
Our warning() and error() functions always add an exclamation mark
to the end of the message anyway.

svn-id: r52791
2010-09-18 10:55:16 +00:00
Sven Hesse 96e079a9f7 SCI: Directly use the new Graphics::VMDDecoder class
svn-id: r51922
2010-08-08 01:08:48 +00:00
Matthew Hoops a5056cde98 SCI: Add 'movie' subdirectory for VMD's
The Torin's intro movie now plays. Minor kPlayVMD cleanup.

svn-id: r51739
2010-08-04 15:17:09 +00:00
Filippos Karapetis a1dab5f923 SCI: Moved all the video related functions in a separate file
svn-id: r51110
2010-07-21 21:37:30 +00:00