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

1 files changed, 49 insertions, 120 deletions

diff --git a/engines/sci/graphics/robot.cpp b/engines/sci/graphics/robot.cpp
index 1572a0a9ec..0792c6596e 100644
--- a/engines/sci/graphics/robot.cpp
+++ b/engines/sci/graphics/robot.cpp
@@ -37,7 +37,6 @@ GfxRobot::GfxRobot(ResourceManager *resMan, GfxScreen *screen, GuiResourceId res
 	: _resMan(resMan), _screen(screen), _resourceId(resourceId) {
 	assert(resourceId != -1);
 	initData(resourceId);
-	_resourceData = 0;
 }
 
 GfxRobot::~GfxRobot() {
@@ -57,119 +56,13 @@ void GfxRobot::initData(GuiResourceId resourceId) {
 		warning("Unable to open robot file %s", fileName);
 		return;
 	}
-	
-	byte version = _resourceData[6];
 
-	if (version != 4 && version != 5) {
-		warning("Robot version %d isn't supported yet", version);
-		return;
-	}
-
-// sample data:
-//  Header - 14 bytes
-//   DWORD:Sample Size - 2 needs to be subtracted (??!!)
-//   ???
-//  Actual samples following
-
-// version may be 3, 4 and 5
-//  version 3 has a different header (unknown to this point)
-//
-// main header (56 bytes + 2 bytes resource id)
-//  followed by sample data if hasSound == 1
-//
-
-// 90.rbt (640x390, 22050, 1 16, ADPCM) 67 frames
-// 00000000: 16 00 53 4f 4c 00 05 00-ad 08 00 00 f0 00 43 00  ..SOL.........C.
-//                 ^ signature ^ version   ^     ^     ^ frames
-//                                   ^ 2221
-// 00000010: b0 04 00 a0 00 00 00 00-01 01 00 00 0a 00 01 00
-//           ^     ^     ^     ^     ^  ^  ^     ^     ^
-//                                      hasSound
-// 00000020: 03 00 01 00 00 cf 03 00-00 00 00 00 00 00 00 00
-//           ^     ^     ^ pixel count           ^
-//                                   ^
-// 00000030: 00 00 00 00 00 00 00 00-00 00 00 00 
-//           ^           ^
-// Sample-Data (Header):
-//  compression must be 0 for now
-// 0000003c: f2 9f 00 00 00 00 d2 4d 00 00 20 52-00 00
-//           ^                       ^     ^
-//           byte count              compression
-//           40946
-// Actual Samples following
-// a5 11 04 02 85 90  ...M.. R........
-//
-// Offset 41020
-// Palette
-
-// 91.rbt (320x240, 22050, 1 16, ADPCM) 90 frames
-// 00000000: 16 00 53 4f 4c 00 05 00-ad 08 00 00 f0 00 5a 00  ..SOL.........Z.
-//                                                     ^ frames
-// 00000010: b0 04 00 a0 00 00 00 00-01 01 00 00 0a 00 01 00  ................
-// 00000020: 03 00 01 00 00 2c 01 00-00 00 00 00 00 00 00 00  .....,..........
-//                       ^ pixel count
-// 00000030: 00 00 00 00 00 00 00 00-00 00 00 00 f2 9f 00 00  ................ offset 60
-//                                               ^ data begin (sample)
-// 00000040: 00 00 d2 4d 00 00 20 52-00 00 82 01 00 01 00 01  ...M.. R........
-// ...
-// 0000a030: 8d 8d 8f 8e 8f 90 90 91-92 92 92 94 0e 00 00 00  ................ offset 41004
-//                                               ^ palette start
-// 0000a040: 00 00 00 00 00 00 01 00-00 09 01 00 00 00 00 00  ................
-// 0000a050: 00 00 00 00 00 37 00 00-00 51 00 01 01 00 00 00  .....7...Q......
-//                          ^ color start^ color count
-// 0000a060: 00 58 6b 2b 4b 69 28 50-5b 24 68 50 20 5b 53 21  .Xk+Ki(P[$hP [S!
-//              ^ start pal data
-// [...]
-// 0000a110: 24 05 41 14 04 18 25 10-64 00 00 2d 18 05 58 00  $.A...%.d..-..X.
-// 0000a120: 00 16 20 07 50 00 00 20-19 01 2d 0e 00 48 00 00  .. .P.. ..-..H..
-// 0000a130: 40 00 00 10 18 05 38 00-00 30 00 00 28 00 00 0b  @.....8..0..(...
-// 0000a140: 0e 00 20 00 00 18 00 00-00 08 00 10 00 00 08 00  .. .............
-// 0000a150: 00 00 00 00 70 70 70 70-70 70 70 70 70 70 70 70  ....pppppppppppp
-// [...]
-// 0000a4e0: 70 70 70 70 70 70 70 70-70 70 70 70 34 0a 75 0a  pppppppppppp4.u.
-// 0000a4f0: 4a 0b c5 0b f4 0b 54 0c-bd 0c 7a 0d 91 0e 1f 10  J.....T...z.....
-// 0000a500: 16 12 72 14 19 17 ef 19-9a 1c b3 1e 79 20 c1 22  ..r.........y ."
-// 0000a510: 33 22 33 23 e0 25 84 26-eb 26 1a 2d 43 2d af 2d  3"3#.%.&.&.-C-.-
-// [...]
-// 0000aff0: 20 20 20 20 20 20 20 20-20 20 20 20 20 20 20 20                  
-// 0000b000: 01 00 7f 64 40 01 f0 00-00 00 00 00 00 00 00 00  ...d@...........
-//                       ^width^height
-// 0000b010: 1c 0a 02 00 7f 7f 7f 7f-04 08 00 00 00 f0 00 00  ................
-// 0000b020: 00 00 43 e0 7f ff ff ff-ff ff ff ff ff ff ff ff  ..C.............
-// 0000b030: ff ff ff ff ff ff ff ff-ff ff ff ff ff ff ff ff  ................
-
-// 161.rbt (112x155, 22050, 1 16, ADPCM) 29 frames
-// 00000000: 16 00 53 4f 4c 00 05 00-ad 08 00 00 96 00 1d 00  ..SOL...........
-//                                                     ^ frames
-// 00000010: b0 04 00 a0 00 00 00 00-01 01 00 00 0a 00 01 00  ................
-// 00000020: 03 00 01 00 47 3e 00 00-00 00 00 00 00 00 00 00  ....G>..........
-//                       ^ pixel count
-// 00000030: 00 00 00 00 00 00 00 00-00 00 00 00 f2 9f 00 00  ................
-//                                               ^ data begin (sample)
-// 00000040: 00 00 d2 4d 00 00 20 52-00 00 00 00 00 00 00 00  ...M.. R........
-// 00000050: 00 00 00 00 00 00 00 00-00 00 00 00 00 00 00 00  ................
-
-// 213.rbt (125x248, nosound) 30 frames
-// 00000000: 16 00 53 4f 4c 00 05 00-ad 08 00 00 96 00 1e 00  ..SOL...........
-//                                                     ^ frames
-// 00000010: b0 04 00 00 00 00 00 00-01 00 00 00 0a 00 01 00  ................
-//                    ^ ?!              ^ no sound?!
-// 00000020: 03 00 01 00 82 6e 00 00-00 00 00 00 00 00 00 00  .....n..........
-//                       ^ pixel count
-// 00000030: 00 00 00 00 00 00 00 00-00 00 00 00 0e 00 00 00  ................
-//                                               ^ data begin (palette)
-// 00000040: 00 00 00 00 00 00 01 00-00 ca 00 00 00 00 00 00  ................
-// 00000050: 00 00 00 00 00 37 00 00-00 3c 00 01 01 00 00 00  .....7...<......
-// 00000060: 00 d0 d0 c0 d0 c0 a8 c8-b8 c0 d0 b0 a0 c0 a8 88
-//              ^ palette data start
-// 00000070: c0 a0 a0 c8 98 90 d0 88-60 b0 90 80 b8 88 80 a0  ........`.......
-// 00000080: 90 98 b0 88 90 c0 78 60-a0 80 80 a0 80 70 c8 70  ......x`.....p.p
-// [...]
-// 00000110: 00 00 00 00 08 70 70 70-70 70 70 70 70 70 70 70  .....ppppppppppp
-//                          ^ ??
-// 00000120: 70 70 70 70 70 70 70 70-70 70 70 70 70 70 70 70  pppppppppppppppp
+	// The RBT video starts with a SOL audio file, followed by
+	// video data which is appended after it
 
 	_frameCount = READ_LE_UINT16(_resourceData + 14);
+	_audioSize = READ_LE_UINT16(_resourceData + 15);
+
 	//_frameSize = READ_LE_UINT32(_resourceData + 34);
 	byte hasSound = _resourceData[25];
 
@@ -179,21 +72,57 @@ void GfxRobot::initData(GuiResourceId resourceId) {
 // TODO: just trying around in here...
 
 void GfxRobot::draw() {
-	byte *bitmapData = _resourceData + ROBOT_FILE_STARTOFDATA;
+	byte *bitmapData = _resourceData + _audioSize;
 	int x, y;
-	//int frame;
+	int frame;
 
 	return;
 
-	//for (frame = 0; frame < 30; frame++) {
-	for (y = 0; y < _height; y++) {
-		for (x = 0; x < _width; x++) {
-			_screen->putPixel(x, y, GFX_SCREEN_MASK_VISUAL, *bitmapData, 0, 0);
-			bitmapData++;
+	// Each frame contains these bytes:
+	// 01 00 7f 64 - always the same, perhaps resource type + extra
+	// 40 01    -    total frame width (320 in this case)
+	// f0 00    -    total frame height (240 in this case)
+	// The total video size is calculated from the maximum width, height
+	// of all the frames in the robot file
+	// 4 zeroes
+	// 4 bytes, perhaps frame x, y on screen?
+	// 2 bytes, unknown
+	// 2 bytes, a small number (e.g. 01 00 or 02 00)
+	// 7f 7f    -    127x127
+	// 7f 7f    -    127x127
+	// 2 bytes, related to frame size?
+	// 00 00
+	// 00 f0
+	// 4 zeroes
+	// 43 e0
+	// 7f ff
+
+	// The frames themselves seem to contain a size of the actual drawn data
+	// on screen. The frame data seems to be uncompressed, placed on screen
+	// at appropriate x,y coordinates, and each frame can have a different size.
+	// This is apparent from the fact that a 320x240 frame (e.g. in Phantasmagoria
+	// demo, 91.rbt) has 4833, 4898, 5111, etc bytes, whereas a full frame would
+	// be 320x240 = 76800 bytes. Thus, each frame is either somehow compressed
+	// (but the data seems uncompressed?), or only the part that changes is drawn
+	// on screen, something like the MPEG I-frames
+
+	for (frame = 0; frame < _frameCount; frame++) {
+		bitmapData += 4;	// skip header bytes
+		_width = READ_LE_UINT16(bitmapData + 4); bitmapData += 2;
+		_height = READ_LE_UINT16(bitmapData + 6); bitmapData += 2;
+
+		for (y = 0; y < _width; y++) {
+			for (x = 0; x < _height; x++) {
+				_screen->putPixel(x, y, GFX_SCREEN_MASK_VISUAL, *bitmapData, 0, 0);
+				bitmapData++;
+			}
 		}
+
+		_screen->copyToScreen();
+		// Sleep for a second
+		g_sci->sleep(1000);
 	}
-	//}
-	_screen->copyToScreen();
+
 }
 #endif