MapleShrine
/
mkxp
1
0
Fork 0
Code Issues 32 Pull Requests 11 Projects Releases Wiki Activity

Graphics: Improve transition "vague" parameter accuracy

This commit is contained in:
Jonas Kulla 2015-01-15 08:26:33 +01:00
parent f6604a88b8
commit 7cbe1eef94
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/graphics.cpp
View File

@ -715,7 +715,7 @@ void Graphics::transition(int duration,
if (!p->frozen) if (!p->frozen)
return; return;
vague = clamp(vague, 0, 512); vague = clamp(vague, 1, 256);
Bitmap *transMap = filename ? new Bitmap(filename) : 0; Bitmap *transMap = filename ? new Bitmap(filename) : 0;
setBrightness(255); setBrightness(255);
@ -736,7 +736,7 @@ void Graphics::transition(int duration,
shader.setFrozenScene(p->frozenScene.tex); shader.setFrozenScene(p->frozenScene.tex);
shader.setCurrentScene(p->currentScene.tex); shader.setCurrentScene(p->currentScene.tex);
shader.setTransMap(transMap->getGLTypes().tex); shader.setTransMap(transMap->getGLTypes().tex);
shader.setVague(vague / 512.0f); shader.setVague(vague / 256.0);
shader.setTexSize(p->scRes); shader.setTexSize(p->scRes);
} }
else else