MapleShrine/mkxp
1
0
Fork 0
Code Issues32 Pull requests11 Projects Releases Wiki Activity

Rename 'GlobalState' to 'SharedState' to avoid confusion with GLState

Browse source 
This was particularly nasty with the shorthand macros
'gState' and 'glState'. The former is now 'shState'.
This commit is contained in:
Jonas Kulla 2013-10-09 12:30:33 +02:00
parent 807bee5748
commit cb6f73f7df
32 changed files with 222 additions and 222 deletions

6
src/sprite.cpp
View file

@ -21,7 +21,7 @@
#include "sprite.h"
#include "globalstate.h"
#include "sharedstate.h"
#include "bitmap.h"
#include "etc.h"
#include "etc-internal.h"
@ -325,7 +325,7 @@ void Sprite::draw()
if (renderEffect)
{
SpriteShader &shader = gState->spriteShader();
SpriteShader &shader = shState->spriteShader();
shader.bind();
shader.applyViewportProj();
@ -347,7 +347,7 @@ void Sprite::draw()
}
else
{
SimpleSpriteShader &shader = gState->simpleSpriteShader();
SimpleSpriteShader &shader = shState->simpleSpriteShader();
shader.bind();
shader.setSpriteMat(p->trans.getMatrix());