ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

SUPERNOVA: Reduce memory usage to store sections and simplify code

Browse Source 
Each section was store dusing the full image size. Now it only uses the
section size, which should reduce considerably the amout of memory used
for each image.

Also when a section has one or more next section, they were all drawn on
the surface for this section, but then they were drawn again on their own
surface. And while this should not cause any issue, this was really
unnecessary (and prevented optimizing the surface size for each section).
So now this is no longer the case and the surface for a section only
contains this section.
This commit is contained in:
Thierry Crozat
2017-11-05 02:59:22 +00:00
parent 953169a92c
commit e0f6da0ca0
2 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/supernova/graphics.cpp
+11 -22
View File
@@ -203,12 +203,10 @@ bool MSNImageDecoder::loadSections() {
for (int section = 0; section < _numSections; ++section) {
Graphics::Surface *surface = new Graphics::Surface;
_sectionSurfaces.push_back(surface);
surface->create(imageWidth,
imageHeight,
g_system->getScreenFormat());
byte *surfacePixels = static_cast<byte *>(surface->getPixels());
if (isNewspaper) {
surface->create(imageWidth, imageHeight, g_system->getScreenFormat());
byte *surfacePixels = static_cast<byte *>(surface->getPixels());
for (int i = 0; i < imageWidth * imageHeight / 8; ++i) {
*surfacePixels++ = (_encodedImage[i] & 0x80) ? kColorWhite63 : kColorBlack;
*surfacePixels++ = (_encodedImage[i] & 0x40) ? kColorWhite63 : kColorBlack;
@@ -220,24 +218,15 @@ bool MSNImageDecoder::loadSections() {
*surfacePixels++ = (_encodedImage[i] & 0x01) ? kColorWhite63 : kColorBlack;
}
} else {
uint image = section;
do {
uint32 offset = (_section[image].addressHigh << 16) + _section[image].addressLow;
if (offset == kInvalidAddress || _section[image].x2 == 0) {
return false;
}
int width = _section[image].x2 - _section[image].x1 + 1;
int height = _section[image].y2 - _section[image].y1 + 1;
uint32 destAddress = imageWidth * _section[image].y1 + _section[image].x1;
while (height) {
Common::copy(_encodedImage + offset, _encodedImage + offset + width, surfacePixels + destAddress);
offset += width;
destAddress += imageWidth;
--height;
}
image = _section[image].next;
} while (image != 0);
uint32 offset = (_section[section].addressHigh << 16) + _section[section].addressLow;
if (offset == kInvalidAddress || _section[section].x2 == 0) {
return false;
}
int width = _section[section].x2 - _section[section].x1 + 1;
int height = _section[section].y2 - _section[section].y1 + 1;
surface->create(width, height, g_system->getScreenFormat());
byte *surfacePixels = static_cast<byte *>(surface->getPixels());
Common::copy(_encodedImage + offset, _encodedImage + offset + width * height, surfacePixels);
}
}
engines/supernova/supernova.cpp
+5 -3
View File
@@ -425,12 +425,14 @@ void SupernovaEngine::renderImage(MSNImageDecoder &image, int section) {
}
}
uint offset = image._section[section].y1 * image._pitch + image._section[section].x1;
if (invert)
uint offset = 0;
if (invert) {
offset = image._section[section].y1 * image._pitch + image._section[section].x1;
section = 0;
}
_system->copyRectToScreen(static_cast<const byte *>(image._sectionSurfaces[section]->getPixels()) + offset,
image._pitch,
sectionRect.width(),
sectionRect.left, sectionRect.top,
sectionRect.width(), sectionRect.height());
}