petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r23315) -Codechange: Only encode sprites for zoom levels that will be used.

Browse Source
This commit is contained in:
peter1138
2011-11-24 12:26:44 +00:00
parent 4e97261315
commit 15d0a22aac
7 changed files with 59 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/blitter/8bpp_optimized.cpp
View File

@@ -11,6 +11,7 @@
#include "../stdafx.h"
#include "../zoom_func.h"
#include "../settings_type.h"
#include "../core/math_func.hpp"
#include "8bpp_optimized.hpp"
@@ -116,7 +117,19 @@ Sprite *Blitter_8bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPro
/* Make memory for all zoom-levels */
uint memory = sizeof(SpriteData);
for (ZoomLevel i = ZOOM_LVL_BEGIN; i < ZOOM_LVL_END; i++) {
ZoomLevel zoom_min;
ZoomLevel zoom_max;
if (sprite->type == ST_FONT) {
zoom_min = ZOOM_LVL_NORMAL;
zoom_max = ZOOM_LVL_NORMAL;
} else {
zoom_min = _settings_client.gui.zoom_min;
zoom_max = _settings_client.gui.zoom_max;
if (zoom_max == zoom_min) zoom_max = ZOOM_LVL_MAX;
}
for (ZoomLevel i = zoom_min; i <= zoom_max; i++) {
memory += UnScaleByZoom(sprite->height, i) * UnScaleByZoom(sprite->width, i);
}
@@ -131,7 +144,7 @@ Sprite *Blitter_8bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPro
byte *dst = temp_dst->data;
/* Make the sprites per zoom-level */
for (ZoomLevel i = ZOOM_LVL_BEGIN; i < ZOOM_LVL_END; i++) {
for (ZoomLevel i = zoom_min; i <= zoom_max; i++) {
/* Store the index table */
uint offset = dst - temp_dst->data;
temp_dst->offset[i] = offset;