[Scummvm-git-logs] scummvm master -> ea9ff836149a749520f08dcbe9b5414269b93511

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
ea9ff83614 AWE: Use RGB555 for 3DO graphics


Commit: ea9ff836149a749520f08dcbe9b5414269b93511
    https://github.com/scummvm/scummvm/commit/ea9ff836149a749520f08dcbe9b5414269b93511
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2025-06-20T00:40:17+02:00

Commit Message:
AWE: Use RGB555 for 3DO graphics

Changed paths:
    engines/awe/awe.cpp
    engines/awe/resource_3do.cpp
    engines/awe/video.cpp


diff --git a/engines/awe/awe.cpp b/engines/awe/awe.cpp
index 8682930f75d..d67ced3766b 100644
--- a/engines/awe/awe.cpp
+++ b/engines/awe/awe.cpp
@@ -144,7 +144,8 @@ Common::Error AweEngine::run() {
 
 	if (graphicsType != GRAPHICS_GL && dataType == DT_3DO) {
 		graphicsType = GRAPHICS_SOFTWARE;
-		Gfx::_format = Graphics::PixelFormat(2, 5, 5, 5, 1, 11, 6, 1, 0);
+		// TODO: Select the best pixel format at runtime
+		Gfx::_format = Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0);
 	}
 
 	Gfx *graphics = createGraphics(graphicsType);
diff --git a/engines/awe/resource_3do.cpp b/engines/awe/resource_3do.cpp
index 8692a7c1379..f0c76a3eec3 100644
--- a/engines/awe/resource_3do.cpp
+++ b/engines/awe/resource_3do.cpp
@@ -101,6 +101,7 @@ static const uint8 _ccb_bppTable[8] = {
 };
 
 static uint16 *decodeShapeCcb(Common::File *f, int dataSize, int *w, int *h) {
+	// TODO: Can this reuse code from Image::Cel3DODecoder?
 	const uint32 flags = f->readUint32BE();
 	f->seek(4, SEEK_CUR);
 	const uint32 celData = f->readUint32BE();
diff --git a/engines/awe/video.cpp b/engines/awe/video.cpp
index 7df967d68b6..a0bf7e146fd 100644
--- a/engines/awe/video.cpp
+++ b/engines/awe/video.cpp
@@ -614,7 +614,7 @@ void Video::drawBitmap3DO(const char *name, SystemStub *stub) {
 		s.setPixels(data);
 		s.w = s.pitch = w;
 		s.h = h;
-		s.format = Graphics::PixelFormat(2, 5, 5, 5, 1, 11, 6, 1, 0);
+		s.format = Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0);
 
 		_graphics->drawBitmapOverlay(s, FMT_RGB555, stub);
 		free(data);