From 11a1fef1c339815ebcc8897498fd46f5260f10e5 Mon Sep 17 00:00:00 2001
From: Splendide Imaginarius
<119545140+Splendide-Imaginarius@users.noreply.github.com>
Date: Sun, 28 May 2023 22:03:28 +0000
Subject: [PATCH] Implement hi-res Bitmap replacement
---
binding/bitmap-binding.cpp | 11 +
binding/graphics-binding.cpp | 1 +
mkxp.json | 29 ++
src/config.cpp | 8 +
src/config.h | 4 +
src/display/bitmap.cpp | 401 ++++++++++++++++-
src/display/bitmap.h | 7 +-
src/display/font.cpp | 9 +-
src/display/font.h | 4 +-
src/display/gl/gl-meta.cpp | 92 +++-
src/display/gl/gl-meta.h | 2 +-
src/display/gl/gl-util.h | 7 +-
src/display/gl/glstate.cpp | 16 +-
src/display/gl/quad.h | 2 +
src/display/gl/shader.cpp | 22 +-
src/display/gl/shader.h | 4 +
src/display/gl/tileatlasvx.cpp | 32 +-
src/display/graphics.cpp | 58 ++-
src/display/graphics.h | 5 +
src/display/sprite.cpp | 5 +
src/display/tilemap.cpp | 9 +
src/display/tilemapvx.cpp | 27 +-
.../Graphics/Pictures/children-alpha-lo.jxl | Bin 0 -> 102591 bytes
.../Graphics/Pictures/children-alpha.jxl | Bin 0 -> 102591 bytes
.../Graphics/Pictures/tree_alpha_16bit-lo.jxl | Bin 0 -> 105357 bytes
.../Graphics/Pictures/tree_alpha_16bit.jxl | Bin 0 -> 105357 bytes
.../Graphics/Pictures/children-alpha.jxl | Bin 0 -> 810223 bytes
.../Graphics/Pictures/tree_alpha_16bit.jxl | Bin 0 -> 1057158 bytes
tests/hires-bitmap/hires-bitmap-test.rb | 412 ++++++++++++++++++
.../test-results/.RESULTS WILL GO HERE | 0
.../Graphics/Pictures/OST_009-Big.jxl | Bin 0 -> 3581607 bytes
.../Graphics/Pictures/OST_009-Small.jxl | Bin 0 -> 338135 bytes
.../Graphics/Pictures/OST_009.jxl | Bin 0 -> 338135 bytes
.../Hires/Graphics/Pictures/OST_009.jxl | Bin 0 -> 3581607 bytes
tests/hires-sprite/hires-sprite-test.rb | 82 ++++
.../test-results/.RESULTS WILL GO HERE | 0
36 files changed, 1205 insertions(+), 44 deletions(-)
create mode 100644 tests/hires-bitmap/Graphics/Pictures/children-alpha-lo.jxl
create mode 100644 tests/hires-bitmap/Graphics/Pictures/children-alpha.jxl
create mode 100644 tests/hires-bitmap/Graphics/Pictures/tree_alpha_16bit-lo.jxl
create mode 100644 tests/hires-bitmap/Graphics/Pictures/tree_alpha_16bit.jxl
create mode 100644 tests/hires-bitmap/Hires/Graphics/Pictures/children-alpha.jxl
create mode 100644 tests/hires-bitmap/Hires/Graphics/Pictures/tree_alpha_16bit.jxl
create mode 100755 tests/hires-bitmap/hires-bitmap-test.rb
create mode 100644 tests/hires-bitmap/test-results/.RESULTS WILL GO HERE
create mode 100644 tests/hires-sprite/Graphics/Pictures/OST_009-Big.jxl
create mode 100644 tests/hires-sprite/Graphics/Pictures/OST_009-Small.jxl
create mode 100644 tests/hires-sprite/Graphics/Pictures/OST_009.jxl
create mode 100644 tests/hires-sprite/Hires/Graphics/Pictures/OST_009.jxl
create mode 100755 tests/hires-sprite/hires-sprite-test.rb
create mode 100644 tests/hires-sprite/test-results/.RESULTS WILL GO HERE
diff --git a/binding/bitmap-binding.cpp b/binding/bitmap-binding.cpp
index ee77646c..5af6deb4 100644
--- a/binding/bitmap-binding.cpp
+++ b/binding/bitmap-binding.cpp
@@ -49,6 +49,12 @@ void bitmapInitProps(Bitmap *b, VALUE self) {
b->setInitFont(font);
rb_iv_set(self, "font", fontObj);
+
+ // Leave property as default nil if hasHires() is false.
+ if (b->hasHires()) {
+ b->assumeRubyGC();
+ wrapProperty(self, b->getHires(), "hires", BitmapType);
+ }
}
RB_METHOD(bitmapInitialize) {
@@ -94,6 +100,8 @@ RB_METHOD(bitmapHeight) {
return INT2FIX(value);
}
+DEF_GFX_PROP_OBJ_REF(Bitmap, Bitmap, Hires, "hires")
+
RB_METHOD(bitmapRect) {
RB_UNUSED_PARAM;
@@ -741,6 +749,9 @@ void bitmapBindingInit() {
_rb_define_method(klass, "width", bitmapWidth);
_rb_define_method(klass, "height", bitmapHeight);
+
+ INIT_PROP_BIND(Bitmap, Hires, "hires");
+
_rb_define_method(klass, "rect", bitmapRect);
_rb_define_method(klass, "blt", bitmapBlt);
_rb_define_method(klass, "stretch_blt", bitmapStretchBlt);
diff --git a/binding/graphics-binding.cpp b/binding/graphics-binding.cpp
index 75095c2c..6873f35e 100644
--- a/binding/graphics-binding.cpp
+++ b/binding/graphics-binding.cpp
@@ -19,6 +19,7 @@
** along with mkxp. If not, see .
*/
+#include "config.h"
#include "graphics.h"
#include "sharedstate.h"
#include "binding-util.h"
diff --git a/mkxp.json b/mkxp.json
index afa41c51..8a3649c7 100644
--- a/mkxp.json
+++ b/mkxp.json
@@ -91,6 +91,35 @@
// "lanczos3Scaling": false,
+ // Replace the game's Bitmap files with external high-res files
+ // provided in the "Hires" directory.
+ // (You'll also need to set the below Scaling Factors.)
+ // (default: disabled)
+ //
+ // "enableHires": false,
+
+
+ // Scaling factor for textures (e.g. Bitmaps)
+ // (higher values will look better if you use high-res textures)
+ // (default: 1.0)
+ //
+ // "textureScalingFactor": 4.0,
+
+
+ // Scaling factor for screen framebuffer
+ // (higher values will look better if you use high-res textures)
+ // (default: 1.0)
+ //
+ // "framebufferScalingFactor": 4.0,
+
+
+ // Scaling factor for tileset atlas
+ // (higher values will look better if you use high-res textures)
+ // (default: 1.0)
+ //
+ // "atlasScalingFactor": 4.0,
+
+
// Sync screen redraws to the monitor refresh rate
// (default: disabled)
//
diff --git a/src/config.cpp b/src/config.cpp
index 9048c6d7..58932abc 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -136,6 +136,10 @@ void Config::read(int argc, char *argv[]) {
{"fixedAspectRatio", true},
{"smoothScaling", false},
{"lanczos3Scaling", false},
+ {"enableHires", false},
+ {"textureScalingFactor", 1.},
+ {"framebufferScalingFactor", 1.},
+ {"atlasScalingFactor", 1.},
{"vsync", false},
{"defScreenW", 0},
{"defScreenH", 0},
@@ -261,6 +265,10 @@ try { exp } catch (...) {}
SET_OPT(fixedAspectRatio, boolean);
SET_OPT(smoothScaling, boolean);
SET_OPT(lanczos3Scaling, boolean);
+ SET_OPT(enableHires, boolean);
+ SET_OPT(textureScalingFactor, number);
+ SET_OPT(framebufferScalingFactor, number);
+ SET_OPT(atlasScalingFactor, number);
SET_OPT(winResizable, boolean);
SET_OPT(vsync, boolean);
SET_STRINGOPT(windowTitle, windowTitle);
diff --git a/src/config.h b/src/config.h
index ade1e64f..328df348 100644
--- a/src/config.h
+++ b/src/config.h
@@ -45,6 +45,10 @@ struct Config {
bool fixedAspectRatio;
bool smoothScaling;
bool lanczos3Scaling;
+ bool enableHires;
+ double textureScalingFactor;
+ double framebufferScalingFactor;
+ double atlasScalingFactor;
bool vsync;
int defScreenW;
diff --git a/src/display/bitmap.cpp b/src/display/bitmap.cpp
index e97252b7..847539f1 100644
--- a/src/display/bitmap.cpp
+++ b/src/display/bitmap.cpp
@@ -237,11 +237,19 @@ struct BitmapPrivate
* in the texture and blit to it directly, saving
* ourselves the expensive blending calculation */
pixman_region16_t tainted;
+
+ // For high-resolution texture replacement.
+ Bitmap *selfHires;
+ Bitmap *selfLores;
+ bool assumingRubyGC;
BitmapPrivate(Bitmap *self)
: self(self),
megaSurface(0),
- surface(0)
+ selfHires(0),
+ selfLores(0),
+ surface(0),
+ assumingRubyGC(false)
{
format = SDL_AllocFormat(SDL_PIXELFORMAT_ABGR8888);
@@ -326,16 +334,30 @@ struct BitmapPrivate
return result != PIXMAN_REGION_OUT;
}
- void bindTexture(ShaderBase &shader)
+ void bindTexture(ShaderBase &shader, bool substituteLoresSize = true)
{
+ if (selfHires) {
+ selfHires->bindTex(shader);
+ return;
+ }
+
if (animation.enabled) {
+ if (selfLores) {
+ Debug() << "BUG: High-res BitmapPrivate bindTexture for animations not implemented";
+ }
+
TEXFBO cframe = animation.currentFrame();
TEX::bind(cframe.tex);
shader.setTexSize(Vec2i(cframe.width, cframe.height));
return;
}
TEX::bind(gl.tex);
- shader.setTexSize(Vec2i(gl.width, gl.height));
+ if (selfLores && substituteLoresSize) {
+ shader.setTexSize(Vec2i(selfLores->width(), selfLores->height()));
+ }
+ else {
+ shader.setTexSize(Vec2i(gl.width, gl.height));
+ }
}
void bindFBO()
@@ -468,6 +490,24 @@ struct BitmapOpenHandler : FileSystem::OpenHandler
Bitmap::Bitmap(const char *filename)
{
+ std::string hiresPrefix = "Hires/";
+ std::string filenameStd = filename;
+ Bitmap *hiresBitmap = nullptr;
+ // TODO: once C++20 is required, switch to filenameStd.starts_with(hiresPrefix)
+ if (shState->config().enableHires && filenameStd.compare(0, hiresPrefix.size(), hiresPrefix) != 0) {
+ // Look for a high-res version of the file.
+ std::string hiresFilename = hiresPrefix + filenameStd;
+ try {
+ hiresBitmap = new Bitmap(hiresFilename.c_str());
+ hiresBitmap->setLores(this);
+ }
+ catch (const Exception &e)
+ {
+ Debug() << "No high-res Bitmap found at" << hiresFilename;
+ hiresBitmap = nullptr;
+ }
+ }
+
BitmapOpenHandler handler;
shState->fileSystem().openRead(handler, filename);
@@ -482,6 +522,8 @@ Bitmap::Bitmap(const char *filename)
if (handler.gif) {
p = new BitmapPrivate(this);
+
+ p->selfHires = hiresBitmap;
if (handler.gif->width >= (uint32_t)glState.caps.maxTexSize || handler.gif->height > (uint32_t)glState.caps.maxTexSize)
{
@@ -510,6 +552,9 @@ Bitmap::Bitmap(const char *filename)
delete handler.gif_data;
p->gl = texfbo;
+ if (p->selfHires != nullptr) {
+ p->gl.selfHires = &p->selfHires->getGLTypes();
+ }
p->addTaintedArea(rect());
return;
}
@@ -583,6 +628,7 @@ Bitmap::Bitmap(const char *filename)
{
/* Mega surface */
p = new BitmapPrivate(this);
+ p->selfHires = hiresBitmap;
p->megaSurface = imgSurf;
SDL_SetSurfaceBlendMode(p->megaSurface, SDL_BLENDMODE_NONE);
}
@@ -602,7 +648,11 @@ Bitmap::Bitmap(const char *filename)
}
p = new BitmapPrivate(this);
+ p->selfHires = hiresBitmap;
p->gl = tex;
+ if (p->selfHires != nullptr) {
+ p->gl.selfHires = &p->selfHires->getGLTypes();
+ }
TEX::bind(p->gl.tex);
TEX::uploadImage(p->gl.width, p->gl.height, imgSurf->pixels, GL_RGBA);
@@ -613,15 +663,30 @@ Bitmap::Bitmap(const char *filename)
p->addTaintedArea(rect());
}
-Bitmap::Bitmap(int width, int height)
+Bitmap::Bitmap(int width, int height, bool isHires)
{
if (width <= 0 || height <= 0)
throw Exception(Exception::RGSSError, "failed to create bitmap");
+ Bitmap *hiresBitmap = nullptr;
+
+ if (shState->config().enableHires && !isHires) {
+ // Create a high-res version as well.
+ double scalingFactor = shState->config().textureScalingFactor;
+ int hiresWidth = (int)lround(scalingFactor * width);
+ int hiresHeight = (int)lround(scalingFactor * height);
+ hiresBitmap = new Bitmap(hiresWidth, hiresHeight, true);
+ hiresBitmap->setLores(this);
+ }
+
TEXFBO tex = shState->texPool().request(width, height);
p = new BitmapPrivate(this);
p->gl = tex;
+ if (p->selfHires != nullptr) {
+ p->gl.selfHires = &p->selfHires->getGLTypes();
+ }
+ p->selfHires = hiresBitmap;
clear();
}
@@ -679,6 +744,10 @@ Bitmap::Bitmap(const Bitmap &other, int frame)
other.ensureNonMega();
if (frame > -2) other.ensureAnimated();
+ if (other.hasHires()) {
+ Debug() << "BUG: High-res Bitmap from animation not implemented";
+ }
+
p = new BitmapPrivate(this);
// TODO: Clean me up
@@ -762,6 +831,28 @@ int Bitmap::height() const
return p->gl.height;
}
+bool Bitmap::hasHires() const{
+ guardDisposed();
+
+ return p->selfHires;
+}
+
+DEF_ATTR_RD_SIMPLE(Bitmap, Hires, Bitmap*, p->selfHires)
+
+void Bitmap::setHires(Bitmap *hires) {
+ guardDisposed();
+
+ Debug() << "BUG: High-res Bitmap setHires not fully implemented, expect bugs";
+ hires->setLores(this);
+ p->selfHires = hires;
+}
+
+void Bitmap::setLores(Bitmap *lores) {
+ guardDisposed();
+
+ p->selfLores = lores;
+}
+
bool Bitmap::isMega() const{
guardDisposed();
@@ -809,13 +900,35 @@ void Bitmap::stretchBlt(const IntRect &destRect,
int opacity)
{
guardDisposed();
-
+
// Don't need this, right? This function is fine with megasurfaces it seems
//GUARD_MEGA;
-
+
if (source.isDisposed())
return;
-
+
+ if (hasHires()) {
+ int destX, destY, destWidth, destHeight;
+ destX = destRect.x * p->selfHires->width() / width();
+ destY = destRect.y * p->selfHires->height() / height();
+ destWidth = destRect.w * p->selfHires->width() / width();
+ destHeight = destRect.h * p->selfHires->height() / height();
+
+ p->selfHires->stretchBlt(IntRect(destX, destY, destWidth, destHeight), source, sourceRect, opacity);
+ return;
+ }
+
+ if (source.hasHires()) {
+ int sourceX, sourceY, sourceWidth, sourceHeight;
+ sourceX = sourceRect.x * source.getHires()->width() / source.width();
+ sourceY = sourceRect.y * source.getHires()->height() / source.height();
+ sourceWidth = sourceRect.w * source.getHires()->width() / source.width();
+ sourceHeight = sourceRect.h * source.getHires()->height() / source.height();
+
+ stretchBlt(destRect, *source.getHires(), IntRect(sourceX, sourceY, sourceWidth, sourceHeight), opacity);
+ return;
+ }
+
opacity = clamp(opacity, 0, 255);
if (opacity == 0)
@@ -936,7 +1049,7 @@ void Bitmap::stretchBlt(const IntRect &destRect,
quad.setTexPosRect(sourceRect, destRect);
quad.setColor(Vec4(1, 1, 1, normOpacity));
- source.p->bindTexture(shader);
+ source.p->bindTexture(shader, false);
p->bindFBO();
p->pushSetViewport(shader);
@@ -963,6 +1076,16 @@ void Bitmap::fillRect(const IntRect &rect, const Vec4 &color)
GUARD_MEGA;
GUARD_ANIMATED;
+ if (hasHires()) {
+ int destX, destY, destWidth, destHeight;
+ destX = rect.x * p->selfHires->width() / width();
+ destY = rect.y * p->selfHires->height() / height();
+ destWidth = rect.w * p->selfHires->width() / width();
+ destHeight = rect.h * p->selfHires->height() / height();
+
+ p->selfHires->fillRect(IntRect(destX, destY, destWidth, destHeight), color);
+ }
+
p->fillRect(rect, color);
if (color.w == 0)
@@ -992,6 +1115,16 @@ void Bitmap::gradientFillRect(const IntRect &rect,
GUARD_MEGA;
GUARD_ANIMATED;
+ if (hasHires()) {
+ int destX, destY, destWidth, destHeight;
+ destX = rect.x * p->selfHires->width() / width();
+ destY = rect.y * p->selfHires->height() / height();
+ destWidth = rect.w * p->selfHires->width() / width();
+ destHeight = rect.h * p->selfHires->height() / height();
+
+ p->selfHires->gradientFillRect(IntRect(destX, destY, destWidth, destHeight), color1, color2, vertical);
+ }
+
SimpleColorShader &shader = shState->shaders().simpleColor;
shader.bind();
shader.setTranslation(Vec2i());
@@ -1039,6 +1172,16 @@ void Bitmap::clearRect(const IntRect &rect)
GUARD_MEGA;
GUARD_ANIMATED;
+ if (hasHires()) {
+ int destX, destY, destWidth, destHeight;
+ destX = rect.x * p->selfHires->width() / width();
+ destY = rect.y * p->selfHires->height() / height();
+ destWidth = rect.w * p->selfHires->width() / width();
+ destHeight = rect.h * p->selfHires->height() / height();
+
+ p->selfHires->clearRect(IntRect(destX, destY, destWidth, destHeight));
+ }
+
p->fillRect(rect, Vec4());
p->onModified();
@@ -1051,6 +1194,12 @@ void Bitmap::blur()
GUARD_MEGA;
GUARD_ANIMATED;
+ if (hasHires()) {
+ p->selfHires->blur();
+ }
+
+ // TODO: Is there some kind of blur radius that we need to handle for high-res mode?
+
Quad &quad = shState->gpQuad();
FloatRect rect(0, 0, width(), height());
quad.setTexPosRect(rect, rect);
@@ -1097,6 +1246,11 @@ void Bitmap::radialBlur(int angle, int divisions)
GUARD_MEGA;
GUARD_ANIMATED;
+ if (hasHires()) {
+ p->selfHires->radialBlur(angle, divisions);
+ return;
+ }
+
angle = clamp(angle, 0, 359);
divisions = clamp(divisions, 2, 100);
@@ -1161,7 +1315,7 @@ void Bitmap::radialBlur(int angle, int divisions)
SimpleMatrixShader &shader = shState->shaders().simpleMatrix;
shader.bind();
- p->bindTexture(shader);
+ p->bindTexture(shader, false);
TEX::setSmooth(true);
p->pushSetViewport(shader);
@@ -1193,6 +1347,10 @@ void Bitmap::clear()
GUARD_MEGA;
GUARD_ANIMATED;
+ if (hasHires()) {
+ p->selfHires->clear();
+ }
+
p->bindFBO();
glState.clearColor.pushSet(Vec4());
@@ -1221,9 +1379,52 @@ Color Bitmap::getPixel(int x, int y) const
GUARD_MEGA;
GUARD_ANIMATED;
+ if (hasHires()) {
+ Debug() << "GAME BUG: Game is calling getPixel on low-res Bitmap; you may want to patch the game to improve graphics quality.";
+
+ int xHires = x * p->selfHires->width() / width();
+ int yHires = y * p->selfHires->height() / height();
+
+ // We take the average color from the high-res Bitmap.
+ // RGB channels skip fully transparent pixels when averaging.
+ int w = p->selfHires->width() / width();
+ int h = p->selfHires->height() / height();
+
+ if (w >= 1 && h >= 1) {
+ double rSum = 0.;
+ double gSum = 0.;
+ double bSum = 0.;
+ double aSum = 0.;
+
+ long long rgbCount = 0;
+ long long aCount = 0;
+
+ for (int thisX = xHires; thisX < xHires+w && thisX < p->selfHires->width(); thisX++) {
+ for (int thisY = yHires; thisY < yHires+h && thisY < p->selfHires->height(); thisY++) {
+ Color thisColor = p->selfHires->getPixel(thisX, thisY);
+ if (thisColor.getAlpha() >= 1.0) {
+ rSum += thisColor.getRed();
+ gSum += thisColor.getGreen();
+ bSum += thisColor.getBlue();
+ rgbCount++;
+ }
+ aSum += thisColor.getAlpha();
+ aCount++;
+ }
+ }
+
+ double rAvg = rSum / (double)rgbCount;
+ double gAvg = gSum / (double)rgbCount;
+ double bAvg = bSum / (double)rgbCount;
+ double aAvg = aSum / (double)aCount;
+
+ return Color(rAvg, gAvg, bAvg, aAvg);
+ }
+ }
+
if (x < 0 || y < 0 || x >= width() || y >= height())
return Vec4();
-
+
if (!p->surface)
{
p->allocSurface();
@@ -1252,6 +1453,24 @@ void Bitmap::setPixel(int x, int y, const Color &color)
GUARD_MEGA;
GUARD_ANIMATED;
+ if (hasHires()) {
+ Debug() << "GAME BUG: Game is calling setPixel on low-res Bitmap; you may want to patch the game to improve graphics quality.";
+
+ int xHires = x * p->selfHires->width() / width();
+ int yHires = y * p->selfHires->height() / height();
+
+ int w = p->selfHires->width() / width();
+ int h = p->selfHires->height() / height();
+
+ if (w >= 1 && h >= 1) {
+ for (int thisX = xHires; thisX < xHires+w && thisX < p->selfHires->width(); thisX++) {
+ for (int thisY = yHires; thisY < yHires+h && thisY < p->selfHires->height(); thisY++) {
+ p->selfHires->setPixel(thisX, thisY, color);
+ }
+ }
+ }
+ }
+
uint8_t pixel[] =
{
(uint8_t) clamp(color.red, 0, 255),
@@ -1283,6 +1502,10 @@ bool Bitmap::getRaw(void *output, int output_size)
guardDisposed();
+ if (hasHires()) {
+ Debug() << "GAME BUG: Game is calling getRaw on low-res Bitmap; you may want to patch the game to improve graphics quality.";
+ }
+
if (!p->animation.enabled && (p->surface || p->megaSurface)) {
void *src = (p->megaSurface) ? p->megaSurface->pixels : p->surface->pixels;
memcpy(output, src, output_size);
@@ -1300,6 +1523,10 @@ void Bitmap::replaceRaw(void *pixel_data, int size)
GUARD_MEGA;
+ if (hasHires()) {
+ Debug() << "GAME BUG: Game is calling replaceRaw on low-res Bitmap; you may want to patch the game to improve graphics quality.";
+ }
+
int w = width();
int h = height();
int requiredsize = w*h*4;
@@ -1318,6 +1545,10 @@ void Bitmap::saveToFile(const char *filename)
{
guardDisposed();
+ if (hasHires()) {
+ Debug() << "GAME BUG: Game is calling saveToFile on low-res Bitmap; you may want to patch the game to improve graphics quality.";
+ }
+
SDL_Surface *surf;
if (p->surface || p->megaSurface) {
@@ -1377,6 +1608,11 @@ void Bitmap::hueChange(int hue)
GUARD_MEGA;
GUARD_ANIMATED;
+ if (hasHires()) {
+ p->selfHires->hueChange(hue);
+ return;
+ }
+
if ((hue % 360) == 0)
return;
@@ -1395,7 +1631,7 @@ void Bitmap::hueChange(int hue)
FBO::bind(newTex.fbo);
p->pushSetViewport(shader);
- p->bindTexture(shader);
+ p->bindTexture(shader, false);
p->blitQuad(quad);
@@ -1525,6 +1761,26 @@ void Bitmap::drawText(const IntRect &rect, const char *str, int align)
GUARD_MEGA;
GUARD_ANIMATED;
+ if (hasHires()) {
+ Font &loresFont = getFont();
+ Font &hiresFont = p->selfHires->getFont();
+ // Disable the illegal font size check when creating a high-res font.
+ hiresFont.setSize(loresFont.getSize() * p->selfHires->width() / width(), false);
+ hiresFont.setBold(loresFont.getBold());
+ hiresFont.setColor(loresFont.getColor());
+ hiresFont.setItalic(loresFont.getItalic());
+ hiresFont.setShadow(loresFont.getShadow());
+ hiresFont.setOutline(loresFont.getOutline());
+ hiresFont.setOutColor(loresFont.getOutColor());
+
+ int rectX = rect.x * p->selfHires->width() / width();
+ int rectY = rect.y * p->selfHires->height() / height();
+ int rectWidth = rect.w * p->selfHires->width() / width();
+ int rectHeight = rect.h * p->selfHires->height() / height();
+
+ p->selfHires->drawText(IntRect(rectX, rectY, rectWidth, rectHeight), str, align);
+ }
+
std::string fixed = fixupString(str);
str = fixed.c_str();
@@ -1564,15 +1820,20 @@ void Bitmap::drawText(const IntRect &rect, const char *str, int align)
SDL_Color co = outColor.toSDLColor();
co.a = 255;
SDL_Surface *outline;
+ // Handle high-res for outline.
+ int scaledOutlineSize = OUTLINE_SIZE;
+ if (p->selfLores) {
+ scaledOutlineSize = scaledOutlineSize * width() / p->selfLores->width();
+ }
/* set the next font render to render the outline */
- TTF_SetFontOutline(font, OUTLINE_SIZE);
+ TTF_SetFontOutline(font, scaledOutlineSize);
if (p->font->isSolid())
outline = TTF_RenderUTF8_Solid(font, str, co);
else
outline = TTF_RenderUTF8_Blended(font, str, co);
p->ensureFormat(outline, SDL_PIXELFORMAT_ABGR8888);
- SDL_Rect outRect = {OUTLINE_SIZE, OUTLINE_SIZE, txtSurf->w, txtSurf->h};
+ SDL_Rect outRect = {scaledOutlineSize, scaledOutlineSize, txtSurf->w, txtSurf->h};
SDL_SetSurfaceBlendMode(txtSurf, SDL_BLENDMODE_BLEND);
SDL_BlitSurface(txtSurf, NULL, outline, &outRect);
@@ -1787,6 +2048,9 @@ IntRect Bitmap::textSize(const char *str)
GUARD_MEGA;
GUARD_ANIMATED;
+ // TODO: High-res Bitmap textSize not implemented, but I think it's the same as low-res?
+ // Need to double-check this.
+
TTF_Font *font = p->font->getSdlFont();
std::string fixed = fixupString(str);
@@ -1811,11 +2075,19 @@ DEF_ATTR_RD_SIMPLE(Bitmap, Font, Font&, *p->font)
void Bitmap::setFont(Font &value)
{
+ // High-res support handled in drawText, not here.
*p->font = value;
}
void Bitmap::setInitFont(Font *value)
{
+ if (hasHires()) {
+ Font *hiresFont = new Font(*value);
+ // Disable the illegal font size check when creating a high-res font.
+ hiresFont->setSize(hiresFont->getSize() * p->selfHires->width() / width(), false);
+ p->selfHires->setInitFont(hiresFont);
+ }
+
p->font = value;
}
@@ -1826,11 +2098,24 @@ TEXFBO &Bitmap::getGLTypes() const
SDL_Surface *Bitmap::surface() const
{
+ if (hasHires()) {
+ Debug() << "BUG: High-res Bitmap surface not implemented";
+ }
+
return p->surface;
}
SDL_Surface *Bitmap::megaSurface() const
{
+ if (hasHires()) {
+ if (p->megaSurface) {
+ Debug() << "BUG: High-res Bitmap megaSurface not implemented (low-res has megaSurface)";
+ }
+ if (p->selfHires->megaSurface()) {
+ Debug() << "BUG: High-res Bitmap megaSurface not implemented (high-res has megaSurface)";
+ }
+ }
+
return p->megaSurface;
}
@@ -1865,6 +2150,10 @@ void Bitmap::stop()
GUARD_UNANIMATED;
if (!p->animation.playing) return;
+ if (hasHires()) {
+ Debug() << "BUG: High-res Bitmap stop not implemented";
+ }
+
p->animation.stop();
}
@@ -1874,6 +2163,11 @@ void Bitmap::play()
GUARD_UNANIMATED;
if (p->animation.playing) return;
+
+ if (hasHires()) {
+ Debug() << "BUG: High-res Bitmap play not implemented";
+ }
+
p->animation.play();
}
@@ -1881,6 +2175,10 @@ bool Bitmap::isPlaying() const
{
guardDisposed();
+ if (hasHires()) {
+ Debug() << "BUG: High-res Bitmap isPlaying not implemented";
+ }
+
if (!p->animation.playing)
return false;
@@ -1896,6 +2194,10 @@ void Bitmap::gotoAndStop(int frame)
GUARD_UNANIMATED;
+ if (hasHires()) {
+ Debug() << "BUG: High-res Bitmap gotoAndStop not implemented";
+ }
+
p->animation.stop();
p->animation.seek(frame);
}
@@ -1905,6 +2207,10 @@ void Bitmap::gotoAndPlay(int frame)
GUARD_UNANIMATED;
+ if (hasHires()) {
+ Debug() << "BUG: High-res Bitmap gotoAndPlay not implemented";
+ }
+
p->animation.stop();
p->animation.seek(frame);
p->animation.play();
@@ -1914,6 +2220,10 @@ int Bitmap::numFrames() const
{
guardDisposed();
+ if (hasHires()) {
+ Debug() << "BUG: High-res Bitmap numFrames not implemented";
+ }
+
if (!p->animation.enabled) return 1;
return (int)p->animation.frames.size();
}
@@ -1922,6 +2232,10 @@ int Bitmap::currentFrameI() const
{
guardDisposed();
+ if (hasHires()) {
+ Debug() << "BUG: High-res Bitmap currentFrameI not implemented";
+ }
+
if (!p->animation.enabled) return 0;
return p->animation.currentFrameI();
}
@@ -1932,6 +2246,14 @@ int Bitmap::addFrame(Bitmap &source, int position)
GUARD_MEGA;
+ if (hasHires()) {
+ Debug() << "BUG: High-res Bitmap addFrame dest not implemented";
+ }
+
+ if (source.hasHires()) {
+ Debug() << "BUG: High-res Bitmap addFrame source not implemented";
+ }
+
if (source.height() != height() || source.width() != width())
throw Exception(Exception::MKXPError, "Animations with varying dimensions are not supported (%ix%i vs %ix%i)",
source.width(), source.height(), width(), height());
@@ -1989,6 +2311,10 @@ void Bitmap::removeFrame(int position) {
GUARD_UNANIMATED;
+ if (hasHires()) {
+ Debug() << "BUG: High-res Bitmap removeFrame not implemented";
+ }
+
int pos = (position < 0) ? (int)p->animation.frames.size() - 1 : clamp(position, 0, (int)(p->animation.frames.size() - 1));
shState->texPool().release(p->animation.frames[pos]);
p->animation.frames.erase(p->animation.frames.begin() + pos);
@@ -2016,6 +2342,10 @@ void Bitmap::nextFrame()
GUARD_UNANIMATED;
+ if (hasHires()) {
+ Debug() << "BUG: High-res Bitmap nextFrame not implemented";
+ }
+
stop();
if ((uint32_t)p->animation.lastFrame >= p->animation.frames.size() - 1) {
if (!p->animation.loop) return;
@@ -2032,6 +2362,10 @@ void Bitmap::previousFrame()
GUARD_UNANIMATED;
+ if (hasHires()) {
+ Debug() << "BUG: High-res Bitmap previousFrame not implemented";
+ }
+
stop();
if (p->animation.lastFrame <= 0) {
if (!p->animation.loop) {
@@ -2051,6 +2385,10 @@ void Bitmap::setAnimationFPS(float FPS)
GUARD_MEGA;
+ if (hasHires()) {
+ Debug() << "BUG: High-res Bitmap setAnimationFPS not implemented";
+ }
+
bool restart = p->animation.playing;
p->animation.stop();
p->animation.fps = (FPS < 0) ? 0 : FPS;
@@ -2059,6 +2397,10 @@ void Bitmap::setAnimationFPS(float FPS)
std::vector &Bitmap::getFrames() const
{
+ if (hasHires()) {
+ Debug() << "BUG: High-res Bitmap getFrames not implemented";
+ }
+
return p->animation.frames;
}
@@ -2068,6 +2410,10 @@ float Bitmap::getAnimationFPS() const
GUARD_MEGA;
+ if (hasHires()) {
+ Debug() << "BUG: High-res Bitmap getAnimationFPS not implemented";
+ }
+
return p->animation.fps;
}
@@ -2077,6 +2423,10 @@ void Bitmap::setLooping(bool loop)
GUARD_MEGA;
+ if (hasHires()) {
+ Debug() << "BUG: High-res Bitmap setLooping not implemented";
+ }
+
p->animation.loop = loop;
}
@@ -2086,16 +2436,32 @@ bool Bitmap::getLooping() const
GUARD_MEGA;
+ if (hasHires()) {
+ Debug() << "BUG: High-res Bitmap getLooping not implemented";
+ }
+
return p->animation.loop;
}
void Bitmap::bindTex(ShaderBase &shader)
{
+ // Hires mode is handled by p->bindTexture.
+
p->bindTexture(shader);
}
void Bitmap::taintArea(const IntRect &rect)
{
+ if (hasHires()) {
+ int destX, destY, destWidth, destHeight;
+ destX = rect.x * p->selfHires->width() / width();
+ destY = rect.y * p->selfHires->height() / height();
+ destWidth = rect.w * p->selfHires->width() / width();
+ destHeight = rect.h * p->selfHires->height() / height();
+
+ p->selfHires->taintArea(IntRect(destX, destY, destWidth, destHeight));
+ }
+
p->addTaintedArea(rect);
}
@@ -2121,8 +2487,17 @@ bool Bitmap::invalid() const {
return p == 0;
}
+void Bitmap::assumeRubyGC()
+{
+ p->assumingRubyGC = true;
+}
+
void Bitmap::releaseResources()
{
+ if (p->selfHires && !p->assumingRubyGC) {
+ delete p->selfHires;
+ }
+
if (p->megaSurface)
SDL_FreeSurface(p->megaSurface);
else if (p->animation.enabled) {
diff --git a/src/display/bitmap.h b/src/display/bitmap.h
index 6ca72c13..44760bb6 100644
--- a/src/display/bitmap.h
+++ b/src/display/bitmap.h
@@ -39,7 +39,7 @@ class Bitmap : public Disposable
{
public:
Bitmap(const char *filename);
- Bitmap(int width, int height);
+ Bitmap(int width, int height, bool isHires = false);
Bitmap(void *pixeldata, int width, int height);
/* Clone constructor */
@@ -49,6 +49,9 @@ public:
int width() const;
int height() const;
+ bool hasHires() const;
+ DECL_ATTR(Hires, Bitmap*)
+ void setLores(Bitmap *lores);
bool isMega() const;
bool isAnimated() const;
@@ -161,6 +164,8 @@ public:
bool invalid() const;
+ void assumeRubyGC();
+
private:
void releaseResources();
const char *klassName() const { return "bitmap"; }
diff --git a/src/display/font.cpp b/src/display/font.cpp
index 98d4033e..d0aa8d4b 100644
--- a/src/display/font.cpp
+++ b/src/display/font.cpp
@@ -399,14 +399,17 @@ void Font::setName(const std::vector &names)
p->sdlFont = 0;
}
-void Font::setSize(int value)
+void Font::setSize(int value, bool checkIllegal)
{
if (p->size == value)
return;
/* Catch illegal values (according to RMXP) */
- if (value < 6 || value > 96)
- throw Exception(Exception::ArgumentError, "%s", "bad value for size");
+ if (value < 6 || value > 96) {
+ if (checkIllegal) {
+ throw Exception(Exception::ArgumentError, "%s", "bad value for size");
+ }
+ }
p->size = value;
p->sdlFont = 0;
diff --git a/src/display/font.h b/src/display/font.h
index f76b8421..fe7d9751 100644
--- a/src/display/font.h
+++ b/src/display/font.h
@@ -76,7 +76,9 @@ public:
const Font &operator=(const Font &o);
- DECL_ATTR( Size, int )
+ int getSize() const;
+ void setSize(int value, bool checkIllegal=true);
+
DECL_ATTR( Bold, bool )
DECL_ATTR( Italic, bool )
DECL_ATTR( Color, Color& )
diff --git a/src/display/gl/gl-meta.cpp b/src/display/gl/gl-meta.cpp
index 1f39dc8d..f80050c1 100644
--- a/src/display/gl/gl-meta.cpp
+++ b/src/display/gl/gl-meta.cpp
@@ -26,6 +26,11 @@
#include "quad.h"
#include "config.h"
+namespace FBO
+{
+ ID boundFramebufferID;
+}
+
namespace GLMeta
{
@@ -138,6 +143,7 @@ static void _blitBegin(FBO::ID fbo, const Vec2i &size)
{
if (HAVE_NATIVE_BLIT)
{
+ FBO::boundFramebufferID = fbo;
gl.BindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo.gl);
}
else
@@ -164,18 +170,56 @@ static void _blitBegin(FBO::ID fbo, const Vec2i &size)
}
}
-void blitBegin(TEXFBO &target)
+int blitDstWidthLores = 1;
+int blitDstWidthHires = 1;
+int blitDstHeightLores = 1;
+int blitDstHeightHires = 1;
+
+int blitSrcWidthLores = 1;
+int blitSrcWidthHires = 1;
+int blitSrcHeightLores = 1;
+int blitSrcHeightHires = 1;
+
+void blitBegin(TEXFBO &target, bool preferHires)
{
- _blitBegin(target.fbo, Vec2i(target.width, target.height));
+ blitDstWidthLores = target.width;
+ blitDstHeightLores = target.height;
+
+ if (preferHires && target.selfHires != nullptr) {
+ blitDstWidthHires = target.selfHires->width;
+ blitDstHeightHires = target.selfHires->height;
+ _blitBegin(target.selfHires->fbo, Vec2i(target.selfHires->width, target.selfHires->height));
+ }
+ else {
+ blitDstWidthHires = blitDstWidthLores;
+ blitDstHeightHires = blitDstHeightLores;
+ _blitBegin(target.fbo, Vec2i(target.width, target.height));
+ }
}
void blitBeginScreen(const Vec2i &size)
{
+ blitDstWidthLores = 1;
+ blitDstWidthHires = 1;
+ blitDstHeightLores = 1;
+ blitDstHeightHires = 1;
+
_blitBegin(FBO::ID(0), size);
}
void blitSource(TEXFBO &source)
{
+ blitSrcWidthLores = source.width;
+ blitSrcHeightLores = source.height;
+ if (source.selfHires != nullptr) {
+ blitSrcWidthHires = source.selfHires->width;
+ blitSrcHeightHires = source.selfHires->height;
+ }
+ else {
+ blitSrcWidthHires = blitSrcWidthLores;
+ blitSrcHeightHires = blitSrcHeightLores;
+ }
+
if (HAVE_NATIVE_BLIT)
{
gl.BindFramebuffer(GL_READ_FRAMEBUFFER, source.fbo.gl);
@@ -186,15 +230,20 @@ void blitSource(TEXFBO &source)
{
Lanczos3Shader &shader = shState->shaders().lanczos3;
shader.bind();
- shader.setTexSize(Vec2i(source.width, source.height));
+ shader.setTexSize(Vec2i(blitSrcWidthHires, blitSrcHeightHires));
}
else
{
SimpleShader &shader = shState->shaders().simple;
shader.bind();
- shader.setTexSize(Vec2i(source.width, source.height));
+ shader.setTexSize(Vec2i(blitSrcWidthHires, blitSrcHeightHires));
+ }
+ if (source.selfHires != nullptr) {
+ TEX::bind(source.selfHires->tex);
+ }
+ else {
+ TEX::bind(source.tex);
}
- TEX::bind(source.tex);
}
}
@@ -205,10 +254,24 @@ void blitRectangle(const IntRect &src, const Vec2i &dstPos)
void blitRectangle(const IntRect &src, const IntRect &dst, bool smooth)
{
+ // Handle high-res dest
+ int scaledDstX = dst.x * blitDstWidthHires / blitDstWidthLores;
+ int scaledDstY = dst.y * blitDstHeightHires / blitDstHeightLores;
+ int scaledDstWidth = dst.w * blitDstWidthHires / blitDstWidthLores;
+ int scaledDstHeight = dst.h * blitDstHeightHires / blitDstHeightLores;
+ IntRect dstScaled(scaledDstX, scaledDstY, scaledDstWidth, scaledDstHeight);
+
+ // Handle high-res source
+ int scaledSrcX = src.x * blitSrcWidthHires / blitSrcWidthLores;
+ int scaledSrcY = src.y * blitSrcHeightHires / blitSrcHeightLores;
+ int scaledSrcWidth = src.w * blitSrcWidthHires / blitSrcWidthLores;
+ int scaledSrcHeight = src.h * blitSrcHeightHires / blitSrcHeightLores;
+ IntRect srcScaled(scaledSrcX, scaledSrcY, scaledSrcWidth, scaledSrcHeight);
+
if (HAVE_NATIVE_BLIT)
{
- gl.BlitFramebuffer(src.x, src.y, src.x+src.w, src.y+src.h,
- dst.x, dst.y, dst.x+dst.w, dst.y+dst.h,
+ gl.BlitFramebuffer(srcScaled.x, srcScaled.y, srcScaled.x+srcScaled.w, srcScaled.y+srcScaled.h,
+ dstScaled.x, dstScaled.y, dstScaled.x+dstScaled.w, dstScaled.y+dstScaled.h,
GL_COLOR_BUFFER_BIT, smooth ? GL_LINEAR : GL_NEAREST);
}
else
@@ -218,7 +281,7 @@ void blitRectangle(const IntRect &src, const IntRect &dst, bool smooth)
glState.blend.pushSet(false);
Quad &quad = shState->gpQuad();
- quad.setTexPosRect(src, dst);
+ quad.setTexPosRect(srcScaled, dstScaled);
quad.draw();
glState.blend.pop();
@@ -229,8 +292,19 @@ void blitRectangle(const IntRect &src, const IntRect &dst, bool smooth)
void blitEnd()
{
- if (!HAVE_NATIVE_BLIT)
+ blitDstWidthLores = 1;
+ blitDstWidthHires = 1;
+ blitDstHeightLores = 1;
+ blitDstHeightHires = 1;
+
+ blitSrcWidthLores = 1;
+ blitSrcWidthHires = 1;
+ blitSrcHeightLores = 1;
+ blitSrcHeightHires = 1;
+
+ if (!HAVE_NATIVE_BLIT) {
glState.viewport.pop();
+ }
}
}
diff --git a/src/display/gl/gl-meta.h b/src/display/gl/gl-meta.h
index fd8cf8ab..13ef1ffd 100644
--- a/src/display/gl/gl-meta.h
+++ b/src/display/gl/gl-meta.h
@@ -65,7 +65,7 @@ void vaoBind(VAO &vao);
void vaoUnbind(VAO &vao);
/* EXT_framebuffer_blit */
-void blitBegin(TEXFBO &target);
+void blitBegin(TEXFBO &target, bool preferHires = false);
void blitBeginScreen(const Vec2i &size);
void blitSource(TEXFBO &source);
void blitRectangle(const IntRect &src, const Vec2i &dstPos);
diff --git a/src/display/gl/gl-util.h b/src/display/gl/gl-util.h
index 945af787..212040e2 100644
--- a/src/display/gl/gl-util.h
+++ b/src/display/gl/gl-util.h
@@ -109,6 +109,8 @@ namespace FBO
{
DEF_GL_ID
+ extern ID boundFramebufferID;
+
inline ID gen()
{
ID id;
@@ -124,6 +126,7 @@ namespace FBO
static inline void bind(ID id)
{
+ boundFramebufferID = id;
gl.BindFramebuffer(GL_FRAMEBUFFER, id.gl);
}
@@ -203,8 +206,10 @@ struct TEXFBO
FBO::ID fbo;
int width, height;
+ TEXFBO *selfHires;
+
TEXFBO()
- : tex(0), fbo(0), width(0), height(0)
+ : tex(0), fbo(0), width(0), height(0), selfHires(nullptr)
{}
bool operator==(const TEXFBO &other) const
diff --git a/src/display/gl/glstate.cpp b/src/display/gl/glstate.cpp
index 6bf78d74..d021d887 100644
--- a/src/display/gl/glstate.cpp
+++ b/src/display/gl/glstate.cpp
@@ -23,7 +23,9 @@
#include "config.h"
#include "etc.h"
#include "gl-fun.h"
+#include "graphics.h"
#include "shader.h"
+#include "sharedstate.h"
#include
@@ -36,7 +38,19 @@ void GLClearColor::apply(const Vec4 &value) {
}
void GLScissorBox::apply(const IntRect &value) {
- gl.Scissor(value.x, value.y, value.w, value.h);
+ // High-res: scale the scissorbox if we're rendering to the PingPong framebuffer.
+ if (shState) {
+ const double framebufferScalingFactor = shState->config().framebufferScalingFactor;
+ if (shState->config().enableHires && shState->graphics().isPingPongFramebufferActive()) {
+ gl.Scissor((int)lround(framebufferScalingFactor * value.x), (int)lround(framebufferScalingFactor * value.y), (int)lround(framebufferScalingFactor * value.w), (int)lround(framebufferScalingFactor * value.h));
+ }
+ else {
+ gl.Scissor(value.x, value.y, value.w, value.h);
+ }
+ }
+ else {
+ gl.Scissor(value.x, value.y, value.w, value.h);
+ }
}
void GLScissorBox::setIntersect(const IntRect &value) {
diff --git a/src/display/gl/quad.h b/src/display/gl/quad.h
index d200c6b5..ecff83e4 100644
--- a/src/display/gl/quad.h
+++ b/src/display/gl/quad.h
@@ -22,6 +22,8 @@
#ifndef QUAD_H
#define QUAD_H
+#include "config.h"
+#include "graphics.h"
#include "vertex.h"
#include "gl-util.h"
#include "gl-meta.h"
diff --git a/src/display/gl/shader.cpp b/src/display/gl/shader.cpp
index 53aea311..28bb2ed0 100644
--- a/src/display/gl/shader.cpp
+++ b/src/display/gl/shader.cpp
@@ -20,6 +20,8 @@
*/
#include "shader.h"
+#include "config.h"
+#include "graphics.h"
#include "sharedstate.h"
#include "glstate.h"
#include "exception.h"
@@ -293,8 +295,19 @@ void ShaderBase::init()
void ShaderBase::applyViewportProj()
{
+ // High-res: scale the matrix if we're rendering to the PingPong framebuffer.
const IntRect &vp = glState.viewport.get();
- projMat.set(Vec2i(vp.w, vp.h));
+ if (shState->config().enableHires && shState->graphics().isPingPongFramebufferActive() && framebufferScalingAllowed()) {
+ projMat.set(Vec2i(shState->graphics().width(), shState->graphics().height()));
+ }
+ else {
+ projMat.set(Vec2i(vp.w, vp.h));
+ }
+}
+
+bool ShaderBase::framebufferScalingAllowed()
+{
+ return true;
}
void ShaderBase::setTexSize(const Vec2i &value)
@@ -593,6 +606,13 @@ GrayShader::GrayShader()
GET_U(gray);
}
+bool GrayShader::framebufferScalingAllowed()
+{
+ // This shader is used with input textures that have already had a
+ // framebuffer scale applied. So we don't want to double-apply it.
+ return false;
+}
+
void GrayShader::setGray(float value)
{
gl.Uniform1f(u_gray, value);
diff --git a/src/display/gl/shader.h b/src/display/gl/shader.h
index aeec2cfb..fd79dfbc 100644
--- a/src/display/gl/shader.h
+++ b/src/display/gl/shader.h
@@ -91,6 +91,7 @@ public:
protected:
void init();
+ virtual bool framebufferScalingAllowed();
GLint u_texSizeInv, u_translation;
};
@@ -226,6 +227,9 @@ public:
void setGray(float value);
+protected:
+ virtual bool framebufferScalingAllowed();
+
private:
GLint u_gray;
};
diff --git a/src/display/gl/tileatlasvx.cpp b/src/display/gl/tileatlasvx.cpp
index 116fc305..aa6a78f8 100644
--- a/src/display/gl/tileatlasvx.cpp
+++ b/src/display/gl/tileatlasvx.cpp
@@ -24,6 +24,7 @@
#include "tilemap-common.h"
#include "bitmap.h"
#include "table.h"
+#include "debugwriter.h"
#include "etc-internal.h"
#include "gl-util.h"
#include "gl-meta.h"
@@ -273,7 +274,7 @@ void build(TEXFBO &tf, Bitmap *bitmaps[BM_COUNT])
{
assert(tf.width == ATLASVX_W && tf.height == ATLASVX_H);
- GLMeta::blitBegin(tf);
+ GLMeta::blitBegin(tf, true);
glState.clearColor.pushSet(Vec4());
FBO::clear();
@@ -282,13 +283,36 @@ void build(TEXFBO &tf, Bitmap *bitmaps[BM_COUNT])
if (rgssVer >= 3)
{
SDL_Surface *shadow = createShadowSet();
- TEX::bind(tf.tex);
- TEX::uploadSubImage(shadowArea.x*32, shadowArea.y*32,
- shadow->w, shadow->h, shadow->pixels, GL_RGBA);
+ if (tf.selfHires != nullptr) {
+ SDL_Rect srcRect({0, 0, shadow->w, shadow->h});
+ int destX = shadowArea.x*32 * tf.selfHires->width / tf.width;
+ int destY = shadowArea.y*32 * tf.selfHires->height / tf.height;
+ int destWidth = shadow->w * tf.selfHires->width / tf.width;
+ int destHeight = shadow->h * tf.selfHires->height / tf.height;
+
+ int bpp;
+ Uint32 rMask, gMask, bMask, aMask;
+ SDL_PixelFormatEnumToMasks(SDL_PIXELFORMAT_ABGR8888,
+ &bpp, &rMask, &gMask, &bMask, &aMask);
+ SDL_Surface *blitTemp =
+ SDL_CreateRGBSurface(0, destWidth, destHeight, bpp, rMask, gMask, bMask, aMask);
+
+ SDL_BlitScaled(shadow, &srcRect, blitTemp, 0);
+
+ TEX::bind(tf.selfHires->tex);
+ TEX::uploadSubImage(destX, destY,
+ blitTemp->w, blitTemp->h, blitTemp->pixels, GL_RGBA);
+ }
+ else {
+ TEX::bind(tf.tex);
+ TEX::uploadSubImage(shadowArea.x*32, shadowArea.y*32,
+ shadow->w, shadow->h, shadow->pixels, GL_RGBA);
+ }
SDL_FreeSurface(shadow);
}
Bitmap *bm;
+
#define EXEC_BLITS(part) \
if (!nullOrDisposed(bm = bitmaps[BM_##part])) \
{ \
diff --git a/src/display/graphics.cpp b/src/display/graphics.cpp
index 366fe980..2a9fe935 100644
--- a/src/display/graphics.cpp
+++ b/src/display/graphics.cpp
@@ -772,6 +772,7 @@ struct GraphicsPrivate {
* RGSS renders at (settable with Graphics.resize_screen).
* Can only be changed from within RGSS */
Vec2i scRes;
+ Vec2i scResLores;
/* Screen size, to which the rendered frames are scaled up.
* This can be smaller than the window size when fixed aspect
@@ -828,7 +829,7 @@ struct GraphicsPrivate {
IntruList dispList;
GraphicsPrivate(RGSSThreadData *rtData)
- : scRes(DEF_SCREEN_W, DEF_SCREEN_H), scSize(scRes),
+ : scRes(DEF_SCREEN_W, DEF_SCREEN_H), scResLores(scRes), scSize(scRes),
winSize(rtData->config.defScreenW, rtData->config.defScreenH),
screen(scRes.x, scRes.y), threadData(rtData),
glCtx(SDL_GL_GetCurrentContext()), multithreadedMode(true),
@@ -999,11 +1000,15 @@ struct GraphicsPrivate {
}
void compositeToBuffer(TEXFBO &buffer) {
+ compositeToBufferScaled(buffer, scRes.x, scRes.y);
+ }
+
+ void compositeToBufferScaled(TEXFBO &buffer, int destWidth, int destHeight) {
screen.composite();
GLMeta::blitBegin(buffer);
GLMeta::blitSource(screen.getPP().frontBuffer());
- GLMeta::blitRectangle(IntRect(0, 0, scRes.x, scRes.y), Vec2i());
+ GLMeta::blitRectangle(IntRect(0, 0, scRes.x, scRes.y), IntRect(0, 0, destWidth, destHeight));
GLMeta::blitEnd();
}
@@ -1229,22 +1234,28 @@ void Graphics::transition(int duration, const char *filename, int vague) {
TransShader &transShader = shState->shaders().trans;
SimpleTransShader &simpleShader = shState->shaders().simpleTrans;
+ // Handle high-res.
+ Vec2i transSize(p->scResLores.x, p->scResLores.y);
+
if (transMap) {
TransShader &shader = transShader;
shader.bind();
shader.applyViewportProj();
shader.setFrozenScene(p->frozenScene.tex);
shader.setCurrentScene(currentScene.tex);
+ if (transMap->hasHires()) {
+ Debug() << "BUG: High-res Graphics transMap not implemented";
+ }
shader.setTransMap(transMap->getGLTypes().tex);
shader.setVague(vague / 256.0f);
- shader.setTexSize(p->scRes);
+ shader.setTexSize(transSize);
} else {
SimpleTransShader &shader = simpleShader;
shader.bind();
shader.applyViewportProj();
shader.setFrozenScene(p->frozenScene.tex);
shader.setCurrentScene(currentScene.tex);
- shader.setTexSize(p->scRes);
+ shader.setTexSize(transSize);
}
glState.blend.pushSet(false);
@@ -1391,16 +1402,36 @@ void Graphics::fadein(int duration) {
Bitmap *Graphics::snapToBitmap() {
Bitmap *bitmap = new Bitmap(width(), height());
- p->compositeToBuffer(bitmap->getGLTypes());
+ if (bitmap->hasHires()) {
+ p->compositeToBufferScaled(bitmap->getHires()->getGLTypes(), bitmap->getHires()->width(), bitmap->getHires()->height());
+ }
+
+ p->compositeToBufferScaled(bitmap->getGLTypes(), bitmap->width(), bitmap->height());
/* Taint entire bitmap */
bitmap->taintArea(IntRect(0, 0, width(), height()));
return bitmap;
}
-int Graphics::width() const { return p->scRes.x; }
+int Graphics::width() const { return p->scResLores.x; }
-int Graphics::height() const { return p->scRes.y; }
+int Graphics::height() const { return p->scResLores.y; }
+
+int Graphics::widthHires() const { return p->scRes.x; }
+
+int Graphics::heightHires() const { return p->scRes.y; }
+
+bool Graphics::isPingPongFramebufferActive() const {
+ return p->screen.getPP().frontBuffer().fbo == FBO::boundFramebufferID || p->screen.getPP().backBuffer().fbo == FBO::boundFramebufferID;
+}
+
+int Graphics::displayContentWidth() const {
+ return p->scSize.x;
+}
+
+int Graphics::displayContentHeight() const {
+ return p->scSize.y;
+}
int Graphics::displayWidth() const {
SDL_DisplayMode dm{};
@@ -1418,12 +1449,21 @@ void Graphics::resizeScreen(int width, int height) {
p->threadData->rqWindowAdjust.wait();
p->checkResize(true);
+ Vec2i sizeLores(width, height);
+
+ if (shState->config().enableHires) {
+ double framebufferScalingFactor = shState->config().framebufferScalingFactor;
+ width = (int)lround(framebufferScalingFactor * width);
+ height = (int)lround(framebufferScalingFactor * height);
+ }
+
Vec2i size(width, height);
if (p->scRes == size)
return;
p->scRes = size;
+ p->scResLores = sizeLores;
p->screen.setResolution(width, height);
@@ -1459,6 +1499,10 @@ bool Graphics::updateMovieInput(Movie *movie) {
}
void Graphics::playMovie(const char *filename, int volume_, bool skippable) {
+ if (shState->config().enableHires) {
+ Debug() << "BUG: High-res Graphics playMovie not implemented";
+ }
+
Movie *movie = new Movie(skippable);
MovieOpenHandler handler(movie->srcOps);
shState->fileSystem().openRead(handler, filename);
diff --git a/src/display/graphics.h b/src/display/graphics.h
index 90bcd74a..130478f3 100644
--- a/src/display/graphics.h
+++ b/src/display/graphics.h
@@ -58,6 +58,11 @@ public:
int width() const;
int height() const;
+ int widthHires() const;
+ int heightHires() const;
+ bool isPingPongFramebufferActive() const;
+ int displayContentWidth() const;
+ int displayContentHeight() const;
int displayWidth() const;
int displayHeight() const;
void resizeScreen(int width, int height);
diff --git a/src/display/sprite.cpp b/src/display/sprite.cpp
index 5c76297d..5b7a3766 100644
--- a/src/display/sprite.cpp
+++ b/src/display/sprite.cpp
@@ -23,6 +23,7 @@
#include "sharedstate.h"
#include "bitmap.h"
+#include "debugwriter.h"
#include "etc.h"
#include "etc-internal.h"
#include "util.h"
@@ -605,6 +606,10 @@ void Sprite::draw()
shader.setBushOpacity(p->bushOpacity.norm);
if (p->pattern && p->patternOpacity > 0) {
+ if (p->pattern->hasHires()) {
+ Debug() << "BUG: High-res Sprite pattern not implemented";
+ }
+
shader.setPattern(p->pattern->getGLTypes().tex, Vec2(p->pattern->width(), p->pattern->height()));
shader.setPatternBlendType(p->patternBlendType);
shader.setPatternTile(p->patternTile);
diff --git a/src/display/tilemap.cpp b/src/display/tilemap.cpp
index 2cd30c46..bc2da7df 100644
--- a/src/display/tilemap.cpp
+++ b/src/display/tilemap.cpp
@@ -27,6 +27,7 @@
#include "sharedstate.h"
#include "config.h"
+#include "debugwriter.h"
#include "glstate.h"
#include "gl-util.h"
#include "gl-meta.h"
@@ -550,6 +551,10 @@ struct TilemapPrivate
int blitW = std::min(atW, atAreaW);
int blitH = std::min(atH, autotileH);
+ if (autotile->hasHires()) {
+ Debug() << "BUG: High-res Tilemap blit autotiles not implemented";
+ }
+
GLMeta::blitSource(autotile->getGLTypes());
if (atW <= autotileW && tiles.animated && !atlas.smallATs[atInd])
@@ -639,6 +644,10 @@ struct TilemapPrivate
}
else
{
+ if (tileset->hasHires()) {
+ Debug() << "BUG: High-res Tilemap regular tileset not implemented";
+ }
+
/* Regular tileset */
GLMeta::blitBegin(atlas.gl);
GLMeta::blitSource(tileset->getGLTypes());
diff --git a/src/display/tilemapvx.cpp b/src/display/tilemapvx.cpp
index 6dfe2849..678f1a60 100644
--- a/src/display/tilemapvx.cpp
+++ b/src/display/tilemapvx.cpp
@@ -72,6 +72,8 @@ struct TilemapVXPrivate : public ViewportElement, TileAtlasVX::Reader
VBO::ID vbo;
GLMeta::VAO vao;
+ TEXFBO atlasHires;
+
size_t allocQuads;
size_t groundQuads;
@@ -132,6 +134,14 @@ struct TilemapVXPrivate : public ViewportElement, TileAtlasVX::Reader
shState->requestAtlasTex(ATLASVX_W, ATLASVX_H, atlas);
+ if (shState->config().enableHires) {
+ double scalingFactor = shState->config().atlasScalingFactor;
+ int hiresWidth = (int)lround(scalingFactor * ATLASVX_W);
+ int hiresHeight = (int)lround(scalingFactor * ATLASVX_H);
+ shState->requestAtlasTex(hiresWidth, hiresHeight, atlasHires);
+ atlas.selfHires = &atlasHires;
+ }
+
vbo = VBO::gen();
GLMeta::vaoFillInVertexData(vao);
@@ -151,6 +161,9 @@ struct TilemapVXPrivate : public ViewportElement, TileAtlasVX::Reader
VBO::del(vbo);
shState->releaseAtlasTex(atlas);
+ if (shState->config().enableHires) {
+ shState->releaseAtlasTex(atlasHires);
+ }
prepareCon.disconnect();
@@ -310,7 +323,12 @@ struct TilemapVXPrivate : public ViewportElement, TileAtlasVX::Reader
shader->applyViewportProj();
shader->setTranslation(dispPos);
- TEX::bind(atlas.tex);
+ if (atlas.selfHires != nullptr) {
+ TEX::bind(atlas.selfHires->tex);
+ }
+ else {
+ TEX::bind(atlas.tex);
+ }
GLMeta::vaoBind(vao);
gl.DrawElements(GL_TRIANGLES, groundQuads*6, _GL_INDEX_TYPE, 0);
@@ -329,7 +347,12 @@ struct TilemapVXPrivate : public ViewportElement, TileAtlasVX::Reader
shader.applyViewportProj();
shader.setTranslation(dispPos);
- TEX::bind(atlas.tex);
+ if (atlas.selfHires != nullptr) {
+ TEX::bind(atlas.selfHires->tex);
+ }
+ else {
+ TEX::bind(atlas.tex);
+ }
GLMeta::vaoBind(vao);
gl.DrawElements(GL_TRIANGLES, aboveQuads*6, _GL_INDEX_TYPE,
diff --git a/tests/hires-bitmap/Graphics/Pictures/children-alpha-lo.jxl b/tests/hires-bitmap/Graphics/Pictures/children-alpha-lo.jxl
new file mode 100644
index 0000000000000000000000000000000000000000..69fa96e372187a7c0af307756263a04411869992
GIT binary patch
literal 102591
zcmaf)V~j35uz=ULZQHhO+qS*$+O}<+-92j?XKmZIb-(-nCU-LFkEWSPn>Le~dHM@;
z7HtEzrlbc2BnJQj+804r$^uq61u91e#>NhE#I6(r`u(*521wDUS=hx+Z^TqB!_!>>
z4qe~#(3qqEIO_k6{W3qLg@uJqh%?3`TA0ibq+-ZUv5i4to36kd+&MBvV9(I$$6&I+
zAp3*6&NM?YO6rLH2!%js{ZY4MfW)L_ZXp(wD^XSuGny=s`2fIP96OU+2WpjoJRu^C
zPA4D?H%R6(ht4g0>bLMd>F}9L)InkoyFU*&TchYn7BPL32022UY6m>B&3Ngfv~u4f48XnU8l=iw+mu3gN+_Az*pr)O3Mp&-Oz
z5?o0djWpUaL{wTO?vcfbLqjAkr`DLcQ2FjHX+
zwkySGCiCNslnQ@#Yo7I5vLm#1HqA$?=!jk3Pj?e1^Ao!8jaxbuE>0>P9t5
zne5S^x-|6#ns@b5Cy*KmW&>3;PkDTrPMgpz!aIOGiG=)Oqq=T`cV`5*wgG<$qN-_A
z=ID59dKl}lL4#U)C&|;>lTx~Fqt*SgHI0l#l_+EZV!vNUMLLyC8g0F`^-_cUmciA<
z4=PY{N}_XfFO_D(;kxzW-U6Wt=t`&TKX1w2V=-A;9)Z7vre6unTmk`KSf*bESg{HB
zrgNqt_R1u;Ry#>%>LlD|dk5w_BfJ*LNB850+xQsmX8Q&NbmQ&?Hd1{SfNV~a`2$tD!?h@vBM4<>S>QK$244Ay8QifY?
zHe1~{HPF1Vg$kE-onOF|9DxCOh|K-KOCSx-R)gI?6Eel8CKP{r?Q)=d={w~3OuY0yF~sUJUnc{l_FR{84Llz`;2w1)NC
z+n?*Z?1H!~U&S=&nE_`b?{bLdvq&4+n%mfqi%&d@Exp4{t?eHJevYV)!s-g(cwW1h
z$!un}Ae`~aN~O1PDc>zXv`m{=rA7|j+{hlTon%DC>*DY+l+0Us$z(a{5f11mZB=1&
zos+<%630T|LlpvAR#OWpUCb=sRe=yYD1s~Y|j|uX(deS37vp(j-Qmq
zH}7+SI9Uzqn>Y=%)POaY456#~??bjORZ|tu62}gwX->$dR~KsXBva8nx$G5#5mEFT
z4H(gFNuD5CF_|%$Y56zePNs0zRh{91$XU>Y{!5`TYPDB#8ll9Rv6yyUhNmKNa{CFO
zABhctH1I1hVbPHFNp-`W&T&&Wo-f6Vgit3YdtQ}uD5b`TT8!!QPKUq}A5Bp0v8TO_
zuHFi;^UXzD`WmVtLGsd2P
zSzGp#kCbNvZow{6qhkCCnEZks-40&An{;-yXX;O&+ivrsV`jYH_-}nbT_QTc&H=a|
zeJF?bPeKp84WoX-AKGn|UuZdcIT@&C`L3)_90-NdcA3jRm&%+EOod>@WF{^ZM;-fP
z_HX|E7=HSHpVfT#Bs=bl*3$fD*;$_VcRUR>>6nt)I=5nCzJ{VA@Y^k>0@FC-z_?EM
z092nS>>f2g`O~=npm!ZD3yOe|Cn9Owxg~z7Mb}lM7Jm-~vza#?`LElgdXL+wctc{d
zl9$A{)Um$?{2tTWkOQPY_q$7WXh*wy%fcKU!k5R*eRv`zfe$lgsS3(N7}&6`ym_To
zTxcTjs6UD-eK#Hi{C6m6x@0k=G%4%UJCC+-=j*RVYMVIU|aMf9^P#a=%~p
zbsYmLSgx+_vmQx)GgI&3L2HV5-12uaZ#z%FF>Y{;iqx{%E}?OeBQQ^Y0md9yiNlW&
zyh|ptd;)FjmQl&cbSNUoBfG4v6R{6Q)c%Fopj_o{896
zRG&mqOx~J=2P}t6q4vT`al~m$FqO~FS`#Zpt&PC5Lwba4UaKAb1Z~{4xFh5`1x!mY
zY!*7TBxoF3n|=G6BgSv>PzDQ+=7Ojn#R`qh(=nfK|Gaa15SOX9<)JL{)00^GZ^aD5
zK?Zc|DnSGy3U^2SiY5!p2@9bGi{(8Rc3v!dDZ{^VX?J4G3tRf9C+M8&B(MeuN%Rfy
z+315(e)ARNX7xT+r{SPivoYY6b6i=(G|zRfst$eKQ0myl*>1MG6Ol*ai5Shxgr0P=
zRFv$^8@VzSa}YRWfAdPbURo*FwBP5Nb!=V>X+mx1Hs}O&LM#I%
z;z}qdJ^pM#1mn~HLL*lZ7Um4`1opq$h~?ULbmoP8dkZ!o8I;;`NZN?{vmk%^kc|Q#
zIv{s*vL<-R&W4<7oHqw`#(CQi?)E8p*2wxChGiZud4ARX+YBx2#4Dff{&8*9*XPiq
zJ;5WuOs6N$1w4o&nSERGrTApzs*!+HuVVC5OStKugx7o33+FcxHyV3~^mR%Z8d_Xi
zVKMSg7#GoqB_@=%HDTKxBuEcWnW%w!bN(a$bwoXyG}E&_%8J!&EUMPKz%+Xtp4eQ_
z5vUQ-MC{pFe=%P;jsA6O_-@)D{i2#4N7`GR<*uv}K$S*z_6IP1r0%l34WkBIgA8r_
zqxWK2tsXr8me#`zn(0EIsSXR{z!h!tuuCsuRE!~2ZlVEm-%%;~kGw#qZUY%>(UxVV
zJ5`UQN)}&=A{5<(Btx${K#>VpKiY^dtH9jun)2b6A586sSLsXTWyGvFE&$OW)CWz1
zgi0aeg+QX)4-RcnYXJ4VbaS1Un)SuNak)WxbmcAzBBMVZ2;?x`OY12uUA)#NI%AZjo^
zN#`7PL0MeaMI|?^WQJU~+1yz5%rl<1k|<8;Nq!!GbsP1NKtWj{*GuWoYKFa#WxNv>
z$wmH
z>s
z0Af2$U5}qJmJ+PM&I&J9HC$=p86O+vfHOc;LWxqv6CxR*n8|(S>K!)%EVhuowcjx
z%Rwa8xf9J0gCMvs6&X&k*|<3SrQ7;V)u@Qn)C%5qv~PWz&v?5>hdVwJ3K0TzHr2*>DM5MBKz}E7lxP%$`OkSQtk^}i
z7h*dKMm(Of2-oi_Z@fk{!j{LQ(w*O`P~Pw0YSch2`A$7qO`;j|RAa!Q1_hLISEyg_4f}3unitAxGLo_$-?-kz1{>6u#08vsFrnBWL9
zkqK0rN_@4)oOoG2rI>kM#X$_+L<8Mc#3i~~F_#JpEfG{RRW4Nho&5zq+u}fpkzfRl
zu}&Vo;D!sBnYmrPCTcON!s{wpi=pzI!Q$cj$(yH
zLv<$io-yR?W35~0hL0okE8zGBRpcxm+3@FDKz{jS-6nHWM$?sEmN#Qt~e5moan=T
zph$K@>+F}xP|Z*n-qN<6$PR-#{bGHAQ%<6~Z?|~JB~ac=eP&5PbT%-|T<<8$4-R`Y
zRMQ~1(e^R>PeXr?NAOGShsK%}n!`ly5pJ0w-U`RPdF*m5NV9s$e~ntQ2tRUU^JI#V
zACRhMkz9;KK)=vqYB;*+49Jv*!u;DA$u
zrX!tN!;U8;xmZoGsjk1#6u?iIT8`)YnVmXhVJuSzi?~Lh)40$^!vhE$ATo}6v{-6NX!M1`glH>`W4Bw0mg@Rw~00WO-EZb}T$$Tu6L;J*aK!W;zK?Yj{ZH#Sa
zL}9GWf@Z8S%kD82z+-n58wR-LhO3-X*uxz4#YV!(Piy12)t}2;xAo}*Q-XBEXs-!_
zJ~c-)d!kO3%}|!^=pikk_{ODi7!L~*`g4^Eu*RY+X5H~Bk8%vmy(^Ks3A@!4WMt++
z;Qt-@3^zQp{YXefcaypq;ZsK@xl=8FZKM10Pz>x)CdzzKWapGzWKNzPWU=t67O+gE
zn!Y^mP}(MaQlxgc-i>zfHNuR8S<|HmOPXQNcU<`D>-oX`GD%{I0tutB^g_F`kSXW{6fs
znYZlX-mY~wd#Slm8e7gY+G;emRb)K8&B)sZUcypvAClc=*7s#DH5U}B>*;j(BI^Dv
z8l)39MIpIm&hBjeWL!~_jt2@WeN?(02#PDWi`4hWBvW2AAaP8_npGRAW1UNRq4c6_e=&~vZo>y70%GMHbbQkLc>3x!LxH9PQ#Lm2@*DhVC|6|
z0J}Fa{%XNES6+%sAM}Z5vG>)lg{!$cWj-HniljX6Rc_JdAoHBy1b^
zsGuX(j}?t6Lw25E8p<9ie_1jC>UsyOI&9g0)PANjxJzz)t7B+un1Qmxqt
z-jKD0v=oT@I^(o7$WQdDGciLQCJbj!X~-c0jm;PAv9J7TB-GhQJ3UJMJ=2=^5ZOvX
z92VRMb=Q7Lt)J(d*!U(PYl4uiDdmbN#gbS-GAG)1Qi(&P5sebCSZlLESgbl-D5^-3
zTSUdkH(td4A!EdF(T9XfI$iCD1m$E(`FKt;RgewaltTmzm{XU6{0sY8OZKu2DJ{!m
zd#_#M8iV@(z45Q<=~EM@>i!9YM-l<(yHW`^W)1{C1Hs
zE)n8^=hi*%7E^kU;O*cIeh3A>876?ecefzJWzW^&)^$D*hxQ`9x*?y-!OSYkb?vor
zvVU{_W_~$LHF*SY>-?rJvLg&`eTX)q9vfi@^7eK^Ncatn14s#Pe9G;P%Rg6cCt!vr$pK$1*pWu8QFl7c^mSX~Q
z0Ow+K%z$jw{>)AG3tEb^&_0^`2%;bn`B*{KHPUQC5UCWUw?k`X$oclRj&0E2Q6)AKU@0KDZ~
z5x4*(S`X5C<^zjc(Rd3?i#Z32u~DOZ_U@&nEhxHECBFm1;kCZE6HQ2o1NnDR+@Un~
z6gnlbQ}iuYMKR(Nv|YgsJZkkIK?TY6*I9@HP|)tBNS#Ar@A2nC`&fr5jBC`y$q9AB
zY#Hp34PK}bovQl%3gaUAALgE05c=r%jGX*-a@Jqs5C8k-i)WOJaKu#jrY4u&@xNjt
z(PH3B+5Q5Z`q0RqM0Z9re@1tS+zX0{(Ft?KSZkl?+%7U#sV1mvJo9q!R-SClRrp1@
zpvQVGAI8iY>+LCRUzT0@J3x||Vz$<=HXk9>I@nOw9C4nV>d+?=s%x{YBlAWbR^Qu9
zK+G)GIISMzR=LBDAvNqz_vtGRfF)|!I4%uJ%Nb`%ym&V8CaLEx{vznl1jk`Nv?>TS
z1ZcV6UroR2_#4LiG5d;MM{5-(${tshuh&!@Y7k+7^X|Opw;KRG55iKZl0@jxB2PND
zeCM1Y=93H6E21XbsZ3=epso|>9m@1cwl9^l;2T?%>4U3uJ2x6M`xMPv@1MVjRjz^7
z+4D|=n!x8(P>{%1KWVV9Zn+uHPX?Jz9cj^4B+1e7W_Rp&c%4xSjDRJh<2NCrd*-YY
zhK7yXPQCWlTC@UF`;Q{*{Ky5j+305LvxhGi{DsEhR)T<7mJlV@MWVD}Djs(E
zB}(BXaw3fkSl$yO3IQ_Tt5;Rs0P8+9vA
zo))2nMUuZ?dUAsDKHf;WAkU_6^snnja(7wVLwqdwRheZyawjKmIm+!JJnoF(S3RA7V?KkhukngT6DEzx&bCM8S&umUaYCh@soX4G6=5Un&nop^ni4ab?s^($2|0_RdUMHo
z8Obj&*hQIa`~-^ekp~@x6q;dn&wz!?J>3KMN-b2Z?x2=)?87OO^O5;`8sPK~Mf
z00G+a!SMOOvwv~@vp+-YJPnDSC^m`?jmrg=>lcBy)h*j@x%9(qi#wd1-No_nbh`mH
zZ);E?RRPPxAbLl=Eto!*u0Y3tp~%8!QFUkLw$I1}MU`Vzd8P~bjS9G|%ogY&x*2CS
z>T0LGY$F=gg-tRvF^3Hpez1o^JwaMY2X^vr<>42J2M<@bc26srzeK<(r1cD!n1$mC@GgJQUd8Tw7z7%1wZ&<=YxC24?)MOds(%6OcOTcX)
z7i+7hNq33C<%&Xc8Bq&Mk5ZO}{0|!V)@5m>q~zPI@4XCp?Wp~
zHGw*c<_X4cx^fD8gV-!Do3$Qnf-*a<#!NL<3?>QZY+rqZz43Np!PIpUGH*GI`JbcV
ze?X@E7=jsYo(L<>oeK>eg$RN=V&h4ERFbZGyOHUAW76Q|>x4uA#!+
z!k||&j(FTVQ@flpKYk02z)GN&(3AmRC>}7KZ?Xe$uuqVazM1nK2{7W&Z=gvU5o~%5
zwcy0mIq%Lnfs1O*m278(q%P>H!Sb9;H__*m<{flm-J%QC4&xd~i^e$|+!uuFSjPcVEH3o)|pP3x5aJm-V#d_d^?J
zG(f>bpUe>nGZ^4D>F-&8aCf^YSU3@L(rgnsa%@rA6Hy8wEGki&gAvkoo-+nA2HZkt
z+B&-)M!F#GTSfH0I3s|G4kEld@POG=n7>E=6bfUciQ2P{sH&}6sj4Cd+Jc5)G$XQ&
zcWmOs!G*x8dS_P4i9zhOiOGu4boeY3?tvNDaof}LSVoLMvR{I_uP0_Zi^vqnPPhbv8D6oa?pupFB{nZndwOqU&sMFU|0
zvWS1}IN`@o=fQL&q+qmr7^;Wh%Z6R}^7mLUK6((pu+Q)%5t@BqNLP+LMYrKScV3q#
zrrwDIv%;z^d|C|2juaCc}ytZ
zzoc2f+XPtlLQY2M%rmS*MT!UavRgA{de*1v<((vaGmN!3S4TNsOz$fAf-uaS%%?AQ
zNDM1{yc~eyAq~v>>5XcSiJQD>n?rsP)3SwRNlsLx0|-cII5P9TGgcXXkfw7DEoCsP
z3SVqnDs`cbLYKne*@YR2bazU{;dg&WF_1Q@x>WK+j)}qS1OF#Q%F?sAJ_IaHMKYHR
z@7W?L1^9*>Dmzhg##@ak!#WDVKY2IfTEwVb5;#nu;25hkMR&txFFGafCjN$%vTz{j
z7Gdec5)#jwg)f$t(eEhQm;6xj4_eh-G~(DuMmp)MhQwgeouF<~|Jfzthuh&AV%aZ`}4Vy*IKHCw2}tjy65Nj3L6
zpF`c%k9RWyX-FVCTY|p*Fu?FDTHyTKlT_{Q@sX2H<+;1jNcn4N>;m1QZ1VGko|k^}
z>T(nzu$QeZJ})U5nCRdvWCfh*o!c!N8W$@DOl!oxnDztL-Qb80W|;(xxYf0jr$OFdXFo~G$KcaWr28rX>y*I~84f|Sp9!uuo^3k0(^kFQui??z#vCIh
zbpmr#1OmpK=s}pwRLR#tFOnI7*Lk|oAm)X-9nfC=eI|Hat?lT2g>Y!PX~-y9E_)Qr
z(hbGAJ+Wxtt=iaWrs?AKuiTQe->A{`ZHy&%E+x`yik
z=R;eh`?Ms^Uvz<~ol`c(ru+DDx+5HZ9b8<7^=Y@pnxU3>`4c38TCj0pu|$(F1oFvT
zwPHCtyS6s5VJjmV&pX0^~G(J<+%~8HV)Y#3jx|Aqb(IDLK=d{BpnZoq&oWU!sSN
zwz8HuIw7flRQg)P2E~*snl5oumC#$g1;iR1<$X(%bDyN-m9YT;4GtjNJ6Y&^?gkkd
zY7r?(`1;4w?qnZPrYSo#zzgRh>5n9a!cav`?=%^((h>>m&|GALQ1!
zO!t@)A{o&jJwA}RW+^X#R83VMlxzDwwaZM2Wb>CPf{r6G#J+(+
zI4~4QD)#NnPUD1DrkuG9OEW!kJEq>SR}P(9y*g<5x|E0L1>a%eg$+R3Ndih2OvN`A
zd|QSuEP0S2mF@!XbSg3G5aesDZI}aWN)J@3qG4fAJKfN`4VcbLccW;#|IguY
zp2X3LsWK_wV0lwkGgSOC(KB_*!4RwZ
zfZcOSn_!g?Zzme0c&fQRhdj|I<_*!(q8qvDRXy|dzDKxG&IR~cheI7+NNjOBcS@zhdpb6+lg?ez{!Jc$Kp#b3ip(}T0Pa6l0XgfT__fk}K<
ztzJQPW4tEFF>g3)jM^XAI<{Y8g}1$beMiY=KjH7F$BMxqi+sFy=~?l@Mz$Bky&C?4
z9TaGLI__;CMU?O`*UWINYqZ@~R+8Iz5`wcYfJE&_|zExBn#+
zs+5INwdZ}M<}qdC{x6t^L4}Vn*q_a?eb+@%2t7;%zD%oJYsm^qPcfPAeyMgN2kz#rWd1SUB1Dk
z3Jhm(xJ*K>@tPNSm6Ccn?-!KqQ4q1ij0-*d;g7^Zy^y9Jwz#+I)R8aptEc)<9;&~G
zHy-XflfwaKz0$N9fif!4+BXlE937qJCmXJv0!t=)&9~GHc%TA$Nev|>2Jk-$c3{w%z^Qo&?dAUAZoh6FSWOfHGk2zHs<)~(6*plC<^+&y
zArX6hgG7q+1R3M*0!scN#8ry{k1bCwJtMQdltK`A^tu$xMyx8|tL~xKjlj)ffiUlQ
z%M(K=IFVAcxYp?$IKQDOJh~@LOf6~vz8r)6lIGSSMt7~B4+%bUA5%iz$lP?b4%|ZB
z_$NhpQ`D8ZD?~70x
zq_wn=gXF~-$IFWmC2(3!drCWKrx6pGzyyF}#`{Rq8vlu1-OWI;!A
zPnWkRPqz9PtRhjDr2j;)ANwU^{%u^@Ic+<|IpDM)$k#o_TprYM4PR1tvZ=%bSVB_WlkR5ngNU
zD1@nusH(&b%pUxfucf=(Lc>EF_21eXu;5-`L|n#wRD$R6A0adOQ+g6?Fr%Zuaa!SW
z0q6D~H(~DdQJ3F^fyuHM$0vs13jp013~5Ldr6Zj~*y$v$6bCBQAB&AdX3f}d*P5ea
zH_Lt2CXNRJYr^+HS0U|wWlwe(pBoQXtfxwvlu_0^b7X>D5ScRK
zpKp`^&Z4L(HN?H9F!bZ~Q71J)h~s$JBN8iJGU1T7r-y=R!T-9#Au0ksC0(i$npm_o
z5ZG}J{eqJo8QO<|kjWd`-htB%Tp$T6dhK?ygK>7Bgwg!OW|x)?o++|XaM2==eabi!
z7x^@-d3Ru9{E43ElWLe(Y5AG@|-OW;qXu&S@LA>w10YVl8fEcKzCH_LNcIp
zhS>Xq$+T$2$J;Y$9YRqfBbEl_OV`+HRYDdfpmDc?i*q0BDd5%Fm@2e;<*_xQx20UT
zz2Yej?MzD%AnA=o*3L)0zT9>KECW%-d?Q@d{GgR*bI~kl!_7?@uv$6QIdwSwe>X2h
zF6-pwmIC-%3H7U;E$`=SaYQX|vV=0)&gFID$WL^Q9Pz6li4c
zr2JBrUgpkrv>^<&-!kv)pG0JQfI1KY!IRHzT6)b7{z!)~vSs-z
z;yr?^tqN+r*a7*uzBNJAhk|H9{*@B`za@x{#ggUp_dhiH{kK3`0|V&X;o;Xa1ex=O
z;x7u&8cJ5i-@mA@t)^u_fNL3&+j#CSoN$m8gth@IU1^t18MG|VK0?mX@8FS2ljF5k
z`>r%84R6jP8`Z&o2WGJYS*WK=AjE_IS68j}n;O+*UG6o>p6{~A#Hc97ArrvLrO`4A#D`+w6O_=ciFf<(24Gd)lgGvQ78@HpS>_AppdKcu?7(
zV!!FJDU(c-MRGhvOxrfa0{gxp1rXLR4G)aIr}zv<+-uohDxq)V4JL^)^`(?*2syQE;U
z4t`4)Waw1ptV?pvAWzp@^`B;s8Fr*?@f0y`;{f!?nt8KpRC6bGS8hgcAYjaLw9#RG
zvY*xjqLoZcHb}V&79JBqQ(vL(&nv_dlFqk
z2S*#2iwLgN2;TsvR;K?7j-^Y}VNe;H&=6LD!w3F`Aauks6#ri_$1f7YN}Y9e=+R2_bRZ;z?rQmb9=+#
zY+Jezv`JEm+H1dqy19Y%Dm;~f`C4Hk%yQ!oUUdbOcO9RrOi1h7-ze-&eGT5yA42w>
z-BjvM`hQzl2rn~9Nd&G5%QL^$_q_N6YLqzXgxK*&u#SNO$_#GbNA_9!4f;7wC_7`%
ztP2Q9q$;@Pu=3=4^3TaTMm1_8Kp{?1X{`EWFj(h~ZHz_`OeDRrm;p(H^vi+bOX)FX
z;HZZ?uN264wy-K_LIt8gqDZR$9K(TT({a8Fd_yih$<_^_Ed5
zX#j@nG)REKQ2T$-$y7RB+<`L#v3FvOImQCF>G$VWB)k6fZ8BWmAz7-dzT*e0mM$SP
zy-r!T39z+PC^)mm5Qgx(&ZF{Xzs+i?^x+GB!8@1zV;_5SpwOtPtDah}9bEq%G$A2G
zy4NJ<>?_fpGj%*l9+6)u5ac1apC?MyXi$3y70WW-I(x}LTuL3e!^NAc+s}t3#I_z?
zgkllU71mPgUsF~gf2cJI3EpL_gpH3_hm2q}LXVt4-L8-ieU|GgB>DT!HC9TtBSJ0S@3>y_u`;p+sD>2#cf!J@EkV6p#
z^2@ZEG$^nhp?I-5?C}tp{tOled#etiz#R(83(N?2n=ZoLUGfFA#DPQYk~Ua&6FnUd
zIWx~dV-c4}#msCqcBoX^ATf
zv}N$}0Z1eG4Au*$MtMo~js8vi`~yDh7*3yKjy<77osLR2{rfY?cs#6d8V-QzCX=0=
zDuZ)reS)nwL!OZyPw7+im`r3oA$Eb1O35Iq{g_CCbx}x@c>lyG0U!A(<3HL0cM0aK
z=!GXtEmPCzY3-En(j)kAH(yGm|CWqIdW7pFfKF`bmL7)AJlbGD6BT{F;BNM7BVMxi=thDed7dfKK(F_J8IGtQY73jL`w0d6FA7
zpZDr9l2V2jHT%KMB#|oBe<=`%1yvuZbyezvVYN)S$mOwN=R|r(!c!dB_f6JV
zht)}ohv=vO_><7H*vG-66(_SZ2tl;@_2n#P9|^{@;qlNOvd}SCYmewXN`Z>0C0apK
z7#nz8ztZ>oDnp_~XMwO&)Sp@U1t}BkfFyQJTt%`H+*dJ$V*MU*G%L#u;l6-s`kOoJ
znrIlX!W+3WYg3PNWQ6;3sbcmN0M-pc2zA!2;~{SrqtraRg3x_Oi4Qvr(L2t
z?L!F_dbO(vwdeGxtcYmSiVk1tuc2zQ^MMQ;qjf3ybb;z}t!qqudj)U1qlGLPiMylTuV!T>t
zrIx;vf@{7sjDjG)F#rTp(*3eb_|!|b$E-L!PBanPKr&FEk*GD9e+tGDi9;+z?zqmQ*R)@rLF2Gd}k^>w9g+Yx`O;h@>9Hbku~i=DyBEe)U7H)1#vSB
zU45*>TrgV5mHFIZYrr7p)EP=Xu~OaEk=AZ^<93rbNnraycM=-Yeo!_1uInG+w3kL}
zW*F)rdQS^UedHdrkBt}QK5SWmua^U|ZP7B+)%&9EYqy2?DX3ay{u*rK$#r_wMKLV67;l=*$fp-;{=zq%26l1ejLMxq0W$hI
ziUg0|kz_fg>g6xVJV@@Xs;+|`A~tlwo99;R)=0}DTMF&){b&t6tuD)6L0Zl)zQV+}
zAi3mg)rV0Xt&NkOcmyS{JW0mvkXhKHmcLq;tP!;WD(m@e4{eT`nEZ%f
zkt>dZ@26{Yb|DDgS)r}F=sO<~Usz>oKY6NdQ1DCJ-Kf6S+4ovFo9Hd8d7t5!^4#_cpCA-fdN_x6~}xjxR+q@l!p*7yq`r2ih9xBlq0v0r&;IY&ZnV
zSHBlcH-&+&J8k@sZvhArFWTsHU`4e9R0W
zo_m=Fxci}c&qlxII~P0K}WOMIsjeZ&TvGMQ9N%L3AXcFT<9s~XedCmMA(O@xH9MWAYzjDq{+(E
zL(>G#7+b3Vq_CE1Ak|-i1sJF;S!A-4>C9URl{PmcfXbN(X`fV++EDqMn`mKdAMHN?f>M@`=BlDd(Kiz-v`>JD=&@%fE(D=|$o;7u_J2Yp0~P
z%Cn*s{;HuS1gtV)%aHSZv%GPqaxBfF40wL>>vHSjWq#5*(3OZSrVl!hqxG%i)wayZ%HzoW-kuX3wuPThITPR;Q8)EzP
zw_Z$4eNmslGh;`53=!ZCXVm(jjEQYctRDAF1wRhLBil-k4>ryj1!(#h=k
zUlr=`FKGPR5Yim|=6pbD)g=q-;oIDky|J^AX>vlB$fy#?+*KN`QWPQKx$=cs5k;3Z
zXT=r!W%*_fT=IvO=XZeu)oiJ5lK~58EzO3JRy8UBqV1%x<(E9pv7y8Z4T^mcPEo#4kKB#?Ckgxushz6kU*9Gm`syU^$cId)2(m-
zWW$N~j+Dt#SJFD2-+3FAjI9tDEX0E~pa7R(zv1MfI)8*>%R&^ll@#y;M;px~(dp))
zK$CYl_aaXx`%15FTee_o(MT=enamPrccjN)j3!}`_?Q>uW^LTuS}#U||Ik7OqO30M
z0kvu@?UYqwVm=62#@~BFOFO%pN*?WodW{XkKM;XgTt0COwt=uZoef|~7Y{3;|1L_d
z)eewDl1k+8i^zyib0Y#C4xS#+fd!WivHv#d++{fEXW+}Mke?ToQy^fy36Wra+EF_2
zYr}|^rNYBnVQOBgRHs8G!Fsz&VnW-M&A=uA9__TdfXJgog{IwJ4S`U!qJTSRU;__?`hLDc4x14qeFeKq5MNqub;&3V7p9#AsAB%nv6o#g|f-HKZn#=;1Lj!Q$=r1D#XYuGcZydNJ
zj)H;G6{xMs@l;Y4GWB_Zwp;~6lD?`4vxXA++3?Ee(K@(THg(w6
z%F!0=NZegm>s7gSGuOw|Iwt_B6U7
zSRlS89frN7wZ7pIY1IFHGzKcs{m2>LH}BtrB>>WfU#?uRVZs)vFW(@`+My|6!B@#$pg1P7
z&`f=GtB%WVt;3inyeCQkSnC&od?qOe-CW=!4!f<=kgO40@P3=O^7hmq&p^xZ?P34y
zfh0SSIHed0q;gIA7}Vscf1e@bmccddxUjTC0$LY66`9GR{ddsj@wFgJ5MyIM{yFKa
zN8L4yxtIU!8eIk}!FL!f7)z?fe|J}E%eNMPB3#z_6&=urLsI6fto#$Z@xB8E{A}bH%Y-QP?>n6>;bo#wEP(Y#`t~5+ZaSnU=Oa+QxCG{
zgn)fo3tUWP$mL4wartW)WN>?7@~aACM#A81EXOQiMHYNc*de+_G@TeT*jJ88Gvje;
zyx(0{DB;)5*Ht05N!vkIiLxfl0FGx>ir|F9DZdWeTh8!|ugE2Idkb*&k-T2e?@ft)
z*l%~#?tY`aSUcD#!=~oWgpdjic})NTx7k?6JWeu};}_vorE0KSMCjn$;D6sLoZc`o
z#?#gMY6(iRfe;is|UQm?62ssG^k@H@is4U2&_p~CU39kA{N
z(BxsMWlF&Bhqkz9&9Gb~@VWhH6&yWsrZ8PZr$Cs}2cey*U-X5$!!ftuyYtEP41N5g
zkl!VHOSZtb3MBA*d4+1!5sRx
zS#YCmH3kH()i@F7p0JAv=2o5oFA=lUlVTn`HSI7;arNLlnirR@|$(b4?U=2gpkB^{}vv<&N?cl`TeE+R
z_;xHs9EKt)8zO^@jFJ6oTUKuxZ(NUc)~vV$zZ+eYQ2U(UqcFl_7l6V8_9p7C6c&=h
zA)$bn&7DMd-q<}uPOTx0Vhy!oritW$6%g)nneRvDW5(P(UC5loxoMJd%A7J`m6wct
z=B1mKxo4Gc!8@M&VxxN_-;<@u-5ttjK%92Q^CxDqxT4&fKsByu^i!}YVw#jBOE|13
zxDxVmLuS4DWmq_7xH+g;`0hKkTSura4#BF)9_jg49lCd=@R5i)e(IU&yV3XA8OqKo8ZNl>mb|l
ztWF+6nVNksv7!K@rjHZ52H>}Ez*i~Pr={*hRhHs?Ppz!+r(u!ncMczVaK12`6x@BX
zC;cjk5>~OTbUm?0LDUJX81O2YpA)2DKMVAl8D^4DS*ZqMWRH6&cuLqe>Q3ZH$Z4_x
z20Joe2nZ&$?vL!O`Y3;G8q9sTO7Q?RzF3gMdG~Fo`JR$NDLlQj#tBwO{(NERaELkm
zn8RWHfl3HfvlZ(uBJ9w`9G!*f+WpH16+Aajax~p1*AzYBDF?^lDbV^5XeMeDbRf%p
z(&uVJXw8x>{6QbV0Do)jG{jO#vhU5|I*wA8lz(J0y;k_>gOnxYG>)
zgp!$J@EaB8BIT43roQq6SYYG(=s8ZV^?`sO?*&MVvA`Wi&V}DyGyvBfTYYClBeiuf
z|2{f*e&ZrV9g4CSm|%rH6&-ut-m4SV{LppR$Za37vGLPZl>8pr+uc2s%%+Ip;`D1c
zuac}1Th`1xf3}%Ar}GBXR2VH<&Cyoibb^zfz=W1FyM_tEUr=s-XbT{hxE09A7I)sm
zl66!z_E&>Aa_DeCTUn(yv5*ZpHu35*1Clf&1(N*Dr=cz}1CEuWKR0h!ouJtc7fV_J
zOvD3uUiQ%m8OnuMEp>_vjcXRaK%v2)*qFK`cyq9m
z;7_(3Rry#>@7!6|V&7daWFKZEl3soQciH)4Hh$}eR1{wZVK!P>8aG>J%H&!{n$v1=
zXLT)S$;=Ir(ZEXUOpu685Pu8X~LlVNavug%xZ4iK!V
zx2@FKbp0hhPMBuxnF`8U-6F}yG8PrCm5mfW$P$KRm94o8NFGILW-0@6S?(mwXGk9Z
z{ifld2Ij7ZwCz^mMbwd~n@dDYssN7M#iQ`Qlc{7j73M{w69@o?FD1_qGrQ1U}%j7J{;5j5Y;}jqiJ{HGQ#N9M|
zIg^;BSIg2g7*_^fc-%Kd$hbL^=Ojxlyp0jOZ?{D04hnT3)IlD$sh#;U)eO$SPhzcasd@wbG@~F|jQ{duj=XVG+
zU~(IJ+p|t;=Xr|&Q>GSqvsyZaDPt16CAO@(?}Cm_yJZC&@iXmFDL3
z!i}ON_Spj?hvH0eZ|py_YZpx~qCW7t#X|eTr^*LiCdS1$X9I>VNcp$5McX6YxxxqV
zGKjN$sztMOk)%fQ9}kdcHE->=J=Qd*Uc)Ux@$$oL*^m@~
z^Zt}j9em|RgNCv4LgBy2^uW@d%WEv}$Z^^fAauyee-4iOT{2`dN0}g_Bzfg*o>V*s
zblO&JoXA8-N;G$x5pz58DHoCRps5gA1p3LG-dgwI+rEzEG6#3zjM3WvPv}vj;b$6I
ziNbO942w)#<3$_jOLt!r_H+1vMfFN*Ev`=dJzY%47VA7Q#8>u`*2lbkQRDJT1Vp4v
zU+4in*GyMim0L3*xCzL)>Uh(U`RpYQ%|z-9mAsmc7ITK`=%x5VM4LfT_bwvFf$n>&
zVCXL>LS22%O-WFA(EL>&FaE;?Ex+2#+|)Lk*ZN`{szivHqOG7YL<00UVy;Koj)Mc3KR)VOV`6dzCtZDOT-T
zQ0@e+^HNF$x0!445w=Km0;;Y7nGznH{EXYnVO3XIGCo7Wv^-Qpx-!MGd7!AkXiv>9
z7tWJqam-A{Dd?sKSR5|nk_3spYOn}$a~}Y^bN|KHgGVfx4+Stph<>LC>VNToz?0AZ
z>4%BFT{2hkycEtf(;Y#Y3Z6t$ZsdVn=rloV8F;1&us65;$ZuI1X!FBQ)%O)b?S<4)
zE2;@qkh~utCqfFKvTwZ~&(xzeX_2_G%IP|G!LC{s`a0r)XvD-h^II6GJpfZ?v3&l2urVUwgY@Q<{Z
z9)CYSUn+t1I^OGyo@wd_BsyPm>WLxsMf~((|Mu=?kK>5(*2i`TS~Kr8d;KlCwZxIP
zg5=o7flZ==BeW(Rx_}1PYTp6^rHAQhmQZ1K5V%p;KKO?PMN|<$elHYh#Ap=D1z;Ta
zaaG>CFj2Nmo4cY2SM^)U!TeuY?8(*gp0lsM#jiI|+mU*}VE1ah
z&Hd+pnuAmm3o=heoJU3^vrmo)XR>=@Lyv@W8A~gvbR2XdGN1L{KaznXfeNjHQW3(G^xki>cK>BjbSnX0HkX#r
zqatXh{g=b|>W=h#`r2HEry3nj^sg@^DJ%>1=Ff9ii+JLC4qCSY1vX6
zvG~L{kuJL@8q{Z&fMOh@yK`IxwbYLa$ARcw$}kdkw+6J>X?b8Mkyk&W3eB{6-O?rM
zT*Hs(_bo-`3NNMwxqks%F2;Xx2(2SEc}NJBYY+>8k$t9`q9|$MLfFG8G2+1*S-TPZ
z6QN*PG9=3Vd#yUFfU)0ZZ=06N0)`tnO*ea8^zj0%@$H@&Y}|ak%xD*kmF{V;H8=vs6YI)1rnvB>Y|{qwb=c-(Pf1^mqu*!p%e^_R>Ct+~p5@R*U{qP8NoJXtKgP&l*
zvNrd!wJ+4YiO;;#0#6Jw=8x%Mk)o>JC@fp@=T4~B5=yy51O3)YVl{?Ny*Yq9r!zDt
zX_2-oDm<3+o$A{Ba`MSr!h#yEmHi=d?ms{S<5=KD*j;El1~%$r_I{DGD{WCR69e^(
z^le*KR#WqMUG(eO84r7s=rCnFVjv9Vl4N_>MSjKO{G5XPvgWy3Nb>kr(D$SiMhq!D
zXHEL-SUki%a7}uY_kxudf}5Xk)*vQ8O`L-Cr`8I+rw!`x93
zDO`IJ#<*JF6Z>qlh0)&99WuT4G=a*N960BD$=fLnzW6Ifz6v7_=`;Si>XmPelsf+0
z`ZpDanA8sqgCUODtrb(^1^~QAi+aB01kOE%#^$9d+j1i8$Difz!vGC`qULm6;+N&b
zR%XCpz5?Ftzw}Y*{#xfOx+!Qp=h)>2|F>Yx0M1bBTBNI%J@M1#A`&I7J9{EyI%k0F
zByubSrxiy%?`^%VH$gNw*6QRrC=El_W?G=1U8Ho8y5*8GFm&@GZ61_)V6l%MQF;VM
z>`ya|MwgvEQxppx%I~_Mv;=N%s%N%4b6%j7{_*{JLfLA;?%h!*QtsQdZz)hgN
z7e{nxOA1Gp;@209
zrZPt!wf2~ublmiAb&|31fM_YrouIyPe$fK@A4RKWaGU=9ux2CmVZxzz;U&tFFZlt}
zEhLh{A@gw}Az)DURmGMhH;%+ej^$CeNXYY-{^F*SJ{IzueKYtmiU?;eerM)J6@
z+b5vIE=`0E0V3l)#}J2TAZqoRo{dW|NyH2DYz}nd*8f{AVS`R^YlwNG1X$5{x2n(P=PYvdF#$AQ!dFQeJQ>_wHL&@!-$vOCI|;wEg9f*I3sOb0p`CgzK6gqfamwd?{wqI$DWD}Pyv=9!
zr%;&X1@Yv(P{y@+OlZrwh|~G$Dx-JUP{NvLkuv8ALr26bG@l}h+OU0FALd!=vIR&e
zA;6s=uZ;=)*4F@(fn*7jvFxVZYWa-Vh)~Z!M2!yJIBBSJqgcV!F)TK;;7}mZ^5Lza
zdGgf}21BfKQVa)6|6I;yf2*DX!zSx;#+i04=kxYOpUAnLa?vA<1@+KPHhs~#hlbrA
zPvmyE^ZYw;YKJI8)`;8xy5nOt=->Qk2~X
z3kl3tyG^m|1lC`%mhL(==op%|3I2APxtsfsqSjnbm+0D~XU2*HL`YKF8~Y=zCAJtB
zM+srku_z|Hz&F~O|3Jlg-H2W07N!q~ab^8K+1k~cnEU38{oWNaz*HBQ{F-Yb@feOP
zFzDNo6Bi$>E>B8OOojW
z#`+|6&-v
zUTZ1fyWQy21*9%iyu~~8PKHQRK9X{)&rX!m5aOX^cdJluXj5I3xXCMB{8O?4=DLzc
ztQQkgRa^06%ya`4`1I~NE|7w~Q;Wd&(wM0^G=UaD^unewhvX5Cu*0Rzs;&oRJi`Ij
zRLBM5XPUA%SS#Ucl{q*VLz;BfvVkBoT9O$0ZVC%jiDK
zYw3)xlt)#iE3Z3K
z)q&#;R4td>f!Z)nhDYXk{a_V5es;7Wax(a+~6-o`vAe`1R6o+o}J!%IKD}aG#
zvTPxuZ765N2mQhiy!_CF?3jTC##5O4x>F2Uk{Eq=kpHJ+L1y?yZWTus^sqk~-usNl
z>jay{G(_vgZObDa4(GUuDIfSM!&#RtfpQg4^L#52ejTKf$#s9ZG|+O@qe~dpV|(a*
z2}OkOY1@e6;H|0!)h&_6^Dj-!Q6nm}dv)Qx&TvK>N#q-+0xiu(^IfcHU^uEbBUVpD
z8G;9kB7(hM^zXP7T}==YO>vTTl6Pv1H;%pc#66riIwz!D$ShYLd8R38tgADi*Ch!Q
zHsjz7laYd+H({%CKp>nV^k=h8=YBV9f=u4NU8-2oDpev=I7)r8Hw*j3ITetZmL}(-
zohzGZK!7;~Yvnes+iBws9XDmZeA8xl6-YluiCmr9$Tfu}G6n6xwXv5x6!)2+PHV0C
zbk|rBbp+`EC9rHh5T0PB|3eMGy0y9shGiSYbb=itiwgSX2s`w~u^I`EqS4BgrWxV7
z`XOfErsIbbm;p32$oCJjy1+psqOgghhRUxKN1QSfgSqp`)@nz7zqP}$Ulb+ouVi17
zGL5(0GHVlDFg8K=URnih0@EILJ|L>)>o$h1<4FGX3M%UO
zy_V=R>>v8udzW&&iYpyOcG@!geXyv30qMRn&4bYVb)KYtVrnn*pkSq9H3AqvcN8T3
zODo)*`(LZ#4`8L$02+SR^H{WGV}LNDv_}!x5I#bSf=*0N*8Gll2W6CHad57)$eC^t
zfjoR=lF|~L^6YmiG%iXN!;%n6?iK|9H@<3Ws;$$t_di%!kc^^p6b6hdjIzvYuVL`~
zz}#29?n++sqau`CM{s_80F)Gn&5C1KY`Lq_EvT|fwVUxxj3)iE)7DfsC(e~oZgXu7
zin$-$^mRy}Ncvy71A6g|F&ceH*Rzw+FElm{IirFSvTq#qlX7CZ^t*+L7TRY388a9c
zOc_*(qVRpd)|1Dapv?9y4vS5U*f_I&RPA??Z$xyzupU*EIs2-#qAtve1}eNyfMQ$M
zv*=ANtH1?2Xw{dj?exHuz1}@U*DXER<5cR(49=aJRnSyG&HzR~M@ePIuDx#xxxXBl
zAt-YQx`~7I@@Txk^`?m5WsEx90qUfdXV>Cx!c@y
zJPl?kwnCHB1{}!Bm~NE0$R@v|LQoLad91b9x@(k!y>}y(6^zGlXi+JkFAT7tXVmR$`
zzD}QhlN(HjpUY>Iq&y#Du%am1=s~jRT;W6@fbWQQs@o3`G*}T3q}JJW_4z)I_;OL>
z0Ha3&aLkC&LibjLJN+>>vLv12re
zt|RBFGpKd6{rIt8;Rc!~=HmLN`n-o1_wMaN%aT^N_4kH0&p|{V0wlcgy-$6H^Jh85
zh|lm#XYk4u}Tn96RG)$cNLv{mu8~>
zzDj`)mqU!SF0fhyfyu_fn6`d*!z|1)B5={MCQ%Y3E6>n)MFP*-mtr^U<475
zdn3VXeYalidkZ^J&W
zCzE`iEbAehHbOlvhSUf&YAZB}B;D;Q+G_zcvwfsz3ZFPmY&g87qU?7QT4YAgNv+<(
z5cI;(!vKQ+?fh!>wnDQZyuU5E2{RJ^meVKlyYuJPlQ%j)gxj%g-KZxMC+B?T{2d_^P<
z;uPplP)W7aCm?p})(eV>Q*laI+ekj~vIN$|e)OF0rI(N(}d6g{t6khs8jDBTGEA?Y*uRWI9|}
z1Trd#ztuBPsWfnVFSymrP26oAuPA4jDHwbYI^-dV}tjjasoZ_2r(hfXb!d?Bh#eMT+v-GI)qn
zH(J)IC(k5_9?Z|+!9a(=E8tEQdRE{14eu&wU;+zm-?xo?fJKO_)l>m=dNB0VG;uW;
zZD{9xo0!VSU2Ny6R)KHEh5&x`cw|;)2pZXvvwrkH;nw;8ZUpjHepm
z?zIe>Z*vz|S7j+f|17knwv09NL54=eA_wT+CHy-Naa?8wabY9Y;Fcr8n
za{*tZO=oO_D8qv6bGTEB8d1
zq5h`Dh!CvlXu;P#9Xk?A-j;O+F6i;a0a4{pC?v4nNMQu5(N20PmTZ`yxEF{(-6Ul~
zRpRcTMa1wqoo*%iN)Q18{_qN@1thNaic}&geJ419TrVoi-JYayTV30cC6w%`!FAvq
z3M?k3`5A3X-F-l^JS!sx!H}oYi}H8|=o2?uP_hdmhaYjeQ2{!?K`cR-Ca)ORX|X6O
zfX6SEF#nGtpjZ*SSw3Ip06V&lzUxJ?Mz3?x3eM7$v&Yz~BH}x^p&7F6W%OgbiuP70
zPaB4Yd!JUzaMjq^`03p0n>UGFZID-S(5k2MGM7ggOP;Cq$}gWbsgv2kN{lQBp1hh*01hCYPHXmHTyO&~Xn
z(Y&nb5#+3=t7L8NRk*NhI?S$|^KbN=8!w5ssflo6#sGIya&qr+N>{jurcyO&9{K+x
zb1386t>DbSQq^>PCq!*FhDeo!ne5Xne!D-HcYGp0PV|JrmV4(1a#aEF*8{U1WT%rORTJ%gy(|V*s)1%$`B_
zM*I})0o=|mCD_{$7HA4Vl2!oM1Z~w50eY0TDI
zMDgqIEomT9%_}|A!j*3
zJ&WzC-sO6_Fqz8moM4yqEQ$Pk<*H+u9UP^U{Vb=b^l1jheWV=)O88DUC>O_%*IbA%
zLvpo%u^Eh}_#j+8h|CW`f6TF{v`{E#4g4>LA&-QU6_tie!~e17R|6|?G1k$HHIbOL
z=V`PO9Fe$WLNvfF9z`al1gi50&y6d5RIZr~Ml6Ert)jj1;Qyi5=&$M=NRimS(VL}j
zg5i~)Cme}xY!FKL3&pI1y|O8s!n0El@^g
zhu9Jxe#Q6wE>?uEO-`elW029#fAA`-bMqk7f{=*t+Qg45-Y>QQXW=cubys7_ol{-n
zN9BvH%f*qje~ioC#Ud*(|5c}0GP|JotE3CQvbR7W!83yk^qOJKE5KRj5V9bfPkc)7
z040YU@13c+zbK41op-x5JiPzUs59>mG2hjpxsCNpXQNUaq_ZaUFQA%py@lkfoT1uF
z2f1qH2QccC;6GWWQp(7j*w!uo@V|eW37H_K>pi~WSI*6BhBJ`98Pp=;u{by>Gici@
zLQ=~%>bEuR4Q@3J&cuyR7_UugS+rI8z+YKDbfE&;#gWszb+B`ihn;bHvk{Kfqy31r
z6(&VYhQ+&N<|V59o;h7Ko3OW7A|KNBV0h%h62TS~lLHTeE}dwaUSsG$*vzD(*3{e-
zk1QwRq0){BHX*#uq*L6_6yWF3^_8P26CaHTv~D;a5l#a$=FY9L(^Q`$O9cBuaY{FMF5k5p$DIHifuWUdWLDIi#573J_949Td%PRoVDkrx8kF~ad}CxS
zn6CNQA(7pSOgTsQ;~}1I(edp)K?QrS3LH3@^WkuSMTpM0p75YGYC0RLe7~A;fFu-S
z(^>*h)C6_LR0|xm%1_tlO&(pv*Y@~$kN-YRH~S`UTf4}?rkELF*OMkiZqM`Ye>481
zm^P&2nEN2W3~-ubqn!U;!FeFf+E-5kC7sXC~!@M9sx&kd|XfI-&T*q!*Jro=`vswzI
z(me#2WB8wT+STr0?=nQXJ#antF=vsh|DGi*Ew*55YJUZVGuitf&_gY|2srA-wwb^D
zC((G4>+LW7=)Ev9z!u1*jkNIuydiI<>|dm!AfB6xnA$EGWpw~GO_Cb~>ATz13Qu18
zTV6A|cXndh&#sj(16$oM-Bl#+2e>diNHi$kLfB{VHcy1sD6C58Q`aBRZVojEJyUjPN)zs!qvuG`AdRWGq*_lC2vep&k>_^2@v
z#oh*A8V=v{UNBypD)uW#PH*Paf)+@452Bnx*&|R*hSI^c)06X3v)jQ=jtQYW>{K!G
z!AxNz-nGbdxlbnqe9X>`W=M>NAzs(_Y+-PD1(bM%nOLLVZ;G^Tz<;~O1@H~ohsguI
z+WdHH0>Y$^WpsC{!c1|wW0&a|s);bORk-IkeBc2sq=$ish#Tl-IduaS7VzZu!ZvFo
zF{|~{Vlp_njT*J*Hk}hi2F?=LSEb6Y?6f&7jQHpRnT_Fig3^A{;
z@b6L(LL+KEJ82}6n>Z;eLy3%XmV?Q%1@t=|{HRsftO!~y!B4$%0
zRJF{e_uC%djes3JHKE~0RN1UK+?3hynW)seIVP5kMl}U;S1MGmRN)82|M0ng7J29_
zb?c3D3*K`X_#3u#x~V$pitrX!lmL!#rR{a$ib{BRvOQy^cV>@ozeK6arX^7YGc(Z=
z>^EpCrY%Y-$)~PP1pL!jkrD+2om`oM_o_xov&7$W#g=7?a8&KzJ%{1fxn+D!w{#^~
z0FU6X6o{)7PIiCOTz?^`gM}fu0_A8unFR_t1o<O^Sd66#&kuJ`3@gw`n1JSIs2Td@6(I?+PJ(kQjOz*(|ELywKK1Y4*
z{D|lMNaRO<7OV2f3J_5IUG#`9t;4Z_A{FBTi>R+8wfwg<#B72Bm`vGvAb&BcAG^Cu
ze^D6XC&HPuWq7i#KjQ}sDQiZfOL4gxPCvx1Z7rGt!YJRv<}ha3WbiYEs>tCwBq5YK7R_wA&%)wyioD1#kYeX^K|bWa
z>FYoag=B0x6J8!L_KNWNZB|V5x$+GB2hnQ!bP)uo)P&NC{DW){Zhm^Y+GGzS4%=Hz
zr|HK>_eZ&LMX>;pfMTXjA~xya|HbuLedQyj9)CW5{%!sBJc|G%g*q8Ef5|hoh5Lqm
zpYaxaM?C)7jMPX=c9z+Y2vi!j{rFR!S(AJG3O`)OJ~iFD{$HP;`Y3TykOX8C5NS33
zS){cH-v4?T#zlIi9$|j4BT(;2Vnq@pw~4A)*l@Fpi1s-2)f`%@zQcH4BTBMcyE+Cm
zRB(xZDTG)A;@sXf`4t+2CQFw{gkN$qArGgM706Q;y5ywX*WHKm>f?`
z2eAo5LdDnz4erZ`Fgf0NHl7PhuSr(BM8RJCu);WJ;>kWjUGDQti9R9=-Xje5_|0#m
zM!bD{=Usf&AqE|DU5E(%Ezr?}{&htB%{%I2$bFmFR=R9SL2~bNLaF2m-|m&20i%L?E#zI7?F
z*_k^Shx%tJsTL&L+Lh5uziLa)jksZSYl&}5R&Tj5!T&o=b@nsIHl(Kea3;%~(0u`4
z?5+z3Nhff@YI`1eHtFAa3rSroT(iQBHOD4tQ$^7j(O;*jwzEwdosq3vz=G>bH+1PP
z6i~M~qBLKdpx>JT4Ba5pwGT>(Xy83_`05V%rnq98$mDnF5I|=x>&vdAJn*|Cg*tu>
z!}qUpg6E>W99-dO#}B5f_`Gj)-zWC5KDL^1qm{J?{L71kpT8xXOxSX2I`WDw;daQd+w9FojC;RByP%(DlA~&B=db)(zi!w2O@Y4QF1RA4+Azd{uectE2Iz`n@pjR
zAqZDI;7^I|Em~LTax*l15{-g+&UVw8;KvuLOO4g*f&8D7Zi1{jW9(bKcT%Fd1lH-E
z6%m!O|80d90Wn3d|21j!pfSMzg}MNI72Rn3bg48mxlt?og5JWT<}#+k^PnWT@5IhX
zzwS&QGp&DT)aWD?&0fQi5s|1n{WpCwa>>_(RgsFqdvE@0WbHE_3g1WByuMdvkBj|s
zW#B>^Y#!GID;se!b?3T1Ye;l%_>yQ-q|aLbIZ=-<1>PK?JS
ztuWja2?8QO!U>-EprePx$O)hH@+l89EC}uYU%3Ru4=KW=OYe7MH|`LgU9FAeuU4y&
zRWY1ZYDz?R6}%qzMLU-<6(oz
zlXq5QWb$vCfTKh;Iq6|^YA2yVa5V#}Gzpw+J_)9&1o^hrUfnwoF2oXb$aw}{zt_w)
zF$Jb!y^^E<;}3)T7`tQg1d%ik2gX-C%x{Vrl?q6Q+{LRGpe_z057s2W3b|mV((WCW
z|Im}Dn1h(*nlv!tDhVYpG^JpacdC)%Y%j1*j;5?eg#55f`x&`$9>Ab-8Et~+3A^%1
z3~z0>-Q>HqFrWq*QZRQ%p$nE$fD5Q{<;ki8)zyuiwimn}Zm
z7CeM#nM7XtsbV9OySt{~rt<10?99!-EzT
zIkLAT5}qW2^!tUptm3!O;TpcmM=u6|rz{1rF*?p(6F18W4Wl@8#CarQ$4|Wo*Ibs>
zxGZZv+601fyIT0I%8@p;yT;BX)MTRhY&TI
z9Ha3@@-M7NrPGOY@Z{|OeoHu2YvK3x>)Q??Uqnpf(#&#`7wp|wQWB2tN?y~*Vgi2e
zO>ZBLF2epjMqARLu#!MKRaoPLg8ALr?=moPl4s=!Q#|*pqN5=0+pla5Q6S906_og;(KF+Vl4*OjK_t*uvAnXZDlP+&rl7=)mwAgc
z0tObV6NekB9lTYO)c?nu^11HSf){h^^C+74=u?6K*>(`nk_Gdf#EbOE5s?NFwU>ra
zOQOwMYP{rg7F;X*DB@m+lp1}i#4Tb&#l@OZ>^hkRc(Xu@f_9?J{^k|eRFl_
z3Lx0`p)fL+s@c&)PpsVR*T)*qvk3L&UXt@w$4|(pmfkH?tIVz;hU`HnwNt3x?)d)w
zWw!nRSXcvltSySDh)+YP^4D*I@Cj^&Yj^GLv`>Wdgq5a%kywQvS7CK9&6=oAn;{5-
zu2@u4Jn9-o@6;~C>J6x^;+;Xhm7;vEmeEF_AE#UHHiC%q+|mvOd1;Y9OQWbq1}`ME
zIJ6eiY+>{k6oGv}C00Xf0R=Xc_(YXZyy_}Mc>P(n_2sE-<50YA8S@Xf{O`^GokKSr_nsVG#K#~u_@W7UKz+rEe?fBJ`C1&R
zZN!ZC-y-Y11{TlzdMdgfkFoLbP|KIU(e`g&!=iGGstxYdeeIKPi90^7G(En)DpS&L
z@V9(^ZdHzssl5{Msu#Sk*;S8ziEbow(o^e~9ZiE9Q#N54qXmlUU6a+9n=9=wZU$f?
zXOz9f&}h
zX}^wH7okp4alqVTDy57?k9Xc1Wa4I<5&&d6Utzf#Bve}!{wA>jz5D$cH}J5~sUTJG
zw@}IVi|xv>L)-XzsQ<%ZZwzz5v5A9S-H>!tTm1!G0^`6~u|>j})|}Z7uqRSjb%~bW
zgnVh5aV_#`-;Z`VN5RMW_7x|!xEDD0?TgK!Z*E5p?t0|k9>wH0`NNNCzC!{H5UMAV(qW#w2U01a)na_6iX%+r)SCC375(lsZ3#8&mv
zu@-Q7#oFPk{>fGEPX>aGFYXhz5#QAOmO^wDE`am`FBZbw$a9%KQpQf&seGu66uC5$
zGFOXg6y5E@>nXrhPC_Ci`O-%@Z<>Q_3X0c2Gr0&^m(zSpc*;ZgP&XlP=zt?xIp`S}
zs`F8#4?qApK*qlV0BA^<*FWR4jG+k0kjy9RF>`=#%182kzf*n;H{)i^Td2})NR~5U
z_o(Ed9pfy?RC3k8yxLK+%*X?-{cY%3t@Y3AA#D@q{cUmKx6G7_`(Di{^Ick{#gA~
zK5h-lInU96IJ}sHBCkXq`tKNU>Qyw<(+?q<5o(I~d-5SZYmpd_!PSu_8`SO?0W!4_
zc2@Ys#jmNK3$T(M*TLl%qwh00)KXWXFikqUn`}UiunoBN{Zb5jMurZn&Fe|Fgx+gw
z1-+T2snHuO8TsHU1!f|&AO=Mbs}=wVc*rf($QGPP-bBPD?&ajM^0-pdxRX8ES5Js4aXD&+FB0dV?>_?f`#uD*VC6j;n4uI~4q=cD;-c1=OD979Y0
z
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