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

SLUDGE: Cleanup and simplify code

Browse Source
This commit is contained in:
Eugene Sandulenko
2021-05-17 01:55:20 +02:00
parent 7d5788836d
commit df762ea3df
1 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/sludge/transition.cpp
+14 -24
View File
@@ -28,12 +28,7 @@ namespace Sludge {
extern float snapTexW, snapTexH;
void GraphicsManager::setBrightnessLevel(int brightnessLevel) {
if (brightnessLevel < 0)
_brightnessLevel = 0;
else if (brightnessLevel > 255)
_brightnessLevel = 255;
else
_brightnessLevel = brightnessLevel;
_brightnessLevel = CLIP(brightnessLevel, 0, 255);
}
//----------------------------------------------------
@@ -43,15 +38,16 @@ void GraphicsManager::setBrightnessLevel(int brightnessLevel) {
unsigned lastFrom, lastTo;
void GraphicsManager::transitionFader() {
uint br = MIN<uint>(255, _brightnessLevel);
blendColor(&_renderSurface, TS_ARGB(br, 255, 255, 255), Graphics::BLEND_MULTIPLY);
blendColor(&_renderSurface, TS_ARGB(_brightnessLevel, 255, 255, 255), Graphics::BLEND_MULTIPLY);
}
void GraphicsManager::transitionCrossFader() {
if (!_snapshotSurface.getPixels())
return;
if (_brightnessLevel == 255)
return;
Graphics::TransparentSurface tmp(_snapshotSurface, false);
tmp.blit(_renderSurface, 0, 0, Graphics::FLIP_NONE, nullptr, TS_ARGB(255 - _brightnessLevel, 0xff, 0xff, 0xff));
}
@@ -132,11 +128,9 @@ void GraphicsManager::transitionDisolve() {
} while (toScreen < end);
// The original stretched the texture, we just tile it
for (uint y = 0; y < _sceneHeight; y += _transitionTexture->h) {
for (uint x = 0; x < _sceneWidth; x += _transitionTexture->w) {
for (uint y = 0; y < _sceneHeight; y += _transitionTexture->h)
for (uint x = 0; x < _sceneWidth; x += _transitionTexture->w)
_transitionTexture->blit(_renderSurface, x, y);
}
}
}
void GraphicsManager::transitionTV() {
@@ -171,11 +165,9 @@ void GraphicsManager::transitionTV() {
} while (toScreen < end);
// The original stretched the texture, we just tile it
for (uint y = 0; y < _sceneHeight; y += _transitionTexture->h) {
for (uint x = 0; x < _sceneWidth; x += _transitionTexture->w) {
for (uint y = 0; y < _sceneHeight; y += _transitionTexture->h)
for (uint x = 0; x < _sceneWidth; x += _transitionTexture->w)
_transitionTexture->blit(_renderSurface, x, y);
}
}
}
void GraphicsManager::transitionBlinds() {
@@ -199,14 +191,12 @@ void GraphicsManager::transitionBlinds() {
}
}
}
// The original stretched the texture, we just tile it
for (uint y = 0; y < _sceneHeight; y += _transitionTexture->h) {
for (uint x = 0; x < _sceneWidth; x += _transitionTexture->w) {
_transitionTexture->blit(_renderSurface, x, y);
}
}
}
// The original stretched the texture, we just tile it
for (uint y = 0; y < _sceneHeight; y += _transitionTexture->h)
for (uint x = 0; x < _sceneWidth; x += _transitionTexture->w)
_transitionTexture->blit(_renderSurface, x, y);
}
//----------------------------------------------------