libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 22:28:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

STARK: Fix scaling of the flashing and exploding effects

Browse Source 
Rendering was incorrect when using hi-resolution replacement graphics.
This commit is contained in:
Bastien Bouclet 2019-05-18 11:04:34 +02:00
parent 3bf417c116
commit f24c2b9f3d
5 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/stark/ui/world/button.cpp
View File

@ -109,7 +109,7 @@ void Button::startImageExplosion(VisualImageXMG *image) {
stopImageExplosion();
_explodingImageAnimation = new VisualExplodingImage(StarkGfx);
_explodingImageAnimation->initFromSurface(image->getSurface());
_explodingImageAnimation->initFromSurface(image->getSurface(), image->getWidth(), image->getHeight());
}
void Button::stopImageExplosion() {
@ -122,7 +122,7 @@ void Button::startImageFlashing(VisualImageXMG *image) {
stopImageFlashing();
_flashingImageAnimation = new VisualFlashingImage(StarkGfx);
_flashingImageAnimation->initFromSurface(image->getSurface());
_flashingImageAnimation->initFromSurface(image->getSurface(), image->getWidth(), image->getHeight());
}
void Button::stopImageFlashing() {

23
engines/stark/visual/explodingimage.cpp
View File

@ -39,7 +39,9 @@ VisualExplodingImage::VisualExplodingImage(Gfx::Driver *gfx) :
Visual(TYPE),
_gfx(gfx),
_texture(nullptr),
_surface(nullptr) {
_surface(nullptr),
_originalWidth(0),
_originalHeight(0) {
_surfaceRenderer = _gfx->createSurfaceRenderer();
}
@ -52,12 +54,13 @@ VisualExplodingImage::~VisualExplodingImage() {
delete _surfaceRenderer;
}
void VisualExplodingImage::initFromSurface(const Graphics::Surface *surface) {
void VisualExplodingImage::initFromSurface(const Graphics::Surface *surface, uint originalWidth, uint originalHeight) {
assert(!_surface && !_texture);
// Decode the XMG
_surface = new Graphics::Surface();
_surface->copyFrom(*surface);
_originalWidth = originalWidth;
_originalHeight = originalHeight;
_texture = _gfx->createTexture(_surface);
_texture->setSamplingFilter(StarkSettings->getImageSamplingFilter());
@ -67,12 +70,14 @@ void VisualExplodingImage::initFromSurface(const Graphics::Surface *surface) {
Common::Point explosionCenter(_surface->w / 2, _surface->h / 2);
Common::Point explosionAmplitude(48, 16);
explosionAmplitude.x *= _surface->w / (float)originalWidth;
explosionAmplitude.y *= _surface->h / (float)originalHeight;
uint index = 0;
for (uint y = 0; y < _surface->h; y++) {
for (uint x = 0; x < _surface->w; x++, index++) {
_units[index].setPosition(x, y);
_units[index].setExplosionSettings(explosionCenter, explosionAmplitude);
_units[index].setExplosionSettings(explosionCenter, explosionAmplitude, _surface->w / (float)originalWidth);
_units[index].setColor(*static_cast<uint32 *>(_surface->getBasePtr(x, y)), _surface->format);
}
}
@ -88,10 +93,11 @@ void VisualExplodingImage::render(const Common::Point &position) {
}
_texture->update(_surface);
_surfaceRenderer->render(_texture, position);
_surfaceRenderer->render(_texture, position, _originalWidth, _originalHeight);
}
VisualExplodingImage::ExplosionUnit::ExplosionUnit() :
_scale(1.f),
_stillImageTimeRemaining(33 * 33),
_explosionFastAccelerationTimeRemaining(25 * 33),
_mainColor(0),
@ -103,7 +109,7 @@ void VisualExplodingImage::ExplosionUnit::setPosition(int x, int y) {
_position = Math::Vector2d(x, y);
}
void VisualExplodingImage::ExplosionUnit::setExplosionSettings(const Common::Point &center, const Common::Point &amplitude) {
void VisualExplodingImage::ExplosionUnit::setExplosionSettings(const Common::Point &center, const Common::Point &amplitude, float scale) {
_center = Math::Vector2d(center.x, center.y);
_speed.setX(cos(StarkRandomSource->getRandomNumber(M_PI * 100)) * (float)amplitude.x);
@ -113,6 +119,7 @@ void VisualExplodingImage::ExplosionUnit::setExplosionSettings(const Common::Poi
float magnitude = _position.getDistanceTo(_speed);
_speed -= _position;
_speed = _speed / _speed.getMagnitude() * -magnitude;
_scale = scale;
}
void VisualExplodingImage::ExplosionUnit::setColor(uint32 color, const Graphics::PixelFormat &format) {
@ -133,12 +140,12 @@ void VisualExplodingImage::ExplosionUnit::update() {
return;
}
if (_position.getDistanceTo(_center) <= 1.f) {
if (_position.getDistanceTo(_center) <= 1.f * _scale) {
// Units near the center stay there (to make it look like they enter the chest)
return;
}
Math::Vector2d speed = _speed.getNormalized() * 0.6f;
Math::Vector2d speed = _speed.getNormalized() * 0.6f * _scale;
_position += speed;
// Update the acceleration to units move towards the center

8
engines/stark/visual/explodingimage.h
View File

@ -57,7 +57,7 @@ public:
~VisualExplodingImage() override;
/** Prepare exploding the specified image */
void initFromSurface(const Graphics::Surface *surface);
void initFromSurface(const Graphics::Surface *surface, uint originalWidth, uint originalHeight);
/** Render the image at the specified position */
void render(const Common::Point &position);
@ -67,7 +67,7 @@ private:
ExplosionUnit();
void setPosition(int x, int y);
void setExplosionSettings(const Common::Point &center, const Common::Point &amplitude);
void setExplosionSettings(const Common::Point &center, const Common::Point &amplitude, float scale);
void setColor(uint32 color, const Graphics::PixelFormat &format);
void update();
void draw(Graphics::Surface *surface);
@ -75,6 +75,7 @@ private:
Math::Vector2d _position;
Math::Vector2d _speed;
Math::Vector2d _center;
float _scale;
int _stillImageTimeRemaining;
int _explosionFastAccelerationTimeRemaining;
@ -87,6 +88,9 @@ private:
Gfx::Texture *_texture;
Graphics::Surface *_surface;
uint _originalWidth;
uint _originalHeight;
Common::Array<ExplosionUnit> _units;
};

11
engines/stark/visual/flashingimage.cpp
View File

@ -43,7 +43,9 @@ VisualFlashingImage::VisualFlashingImage(Gfx::Driver *gfx) :
_texture(nullptr),
_fadeLevelIncreasing(true),
_fadeLevel(0),
_flashingTimeRemaining(150 * 33) {
_flashingTimeRemaining(150 * 33),
_originalWidth(0),
_originalHeight(0) {
_surfaceRenderer = _gfx->createSurfaceRenderer();
}
@ -52,9 +54,12 @@ VisualFlashingImage::~VisualFlashingImage() {
delete _surfaceRenderer;
}
void VisualFlashingImage::initFromSurface(const Graphics::Surface *surface) {
void VisualFlashingImage::initFromSurface(const Graphics::Surface *surface, uint originalWidth, uint originalHeight) {
assert(!_texture);
_originalWidth = originalWidth;
_originalHeight = originalHeight;
_texture = _gfx->createTexture(surface);
_texture->setSamplingFilter(StarkSettings->getImageSamplingFilter());
}
@ -82,7 +87,7 @@ void VisualFlashingImage::render(const Common::Point &position) {
updateFadeLevel();
_surfaceRenderer->setFadeLevel(_fadeLevel);
_surfaceRenderer->render(_texture, position);
_surfaceRenderer->render(_texture, position, _originalWidth, _originalHeight);
}
} // End of namespace Stark

5
engines/stark/visual/flashingimage.h
View File

@ -57,7 +57,7 @@ public:
~VisualFlashingImage() override;
/** Prepare flashing the specified image */
void initFromSurface(const Graphics::Surface *surface);
void initFromSurface(const Graphics::Surface *surface, uint originalWidth, uint originalHeight);
/** Render the image at the specified position */
void render(const Common::Point &position);
@ -69,6 +69,9 @@ private:
Gfx::SurfaceRenderer *_surfaceRenderer;
Gfx::Texture *_texture;
uint _originalWidth;
uint _originalHeight;
int _flashingTimeRemaining;
float _fadeLevel;
bool _fadeLevelIncreasing;