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

16
src/window.cpp
View file

@ -22,7 +22,7 @@
#include "window.h"
#include "viewport.h"
#include "globalstate.h"
#include "sharedstate.h"
#include "bitmap.h"
#include "etc.h"
#include "etc-internal.h"
@ -271,13 +271,13 @@ struct WindowPrivate
cursorVert.count = 9;
pauseAniVert.count = 1;
prepareCon = gState->prepareDraw.connect
prepareCon = shState->prepareDraw.connect
(sigc::mem_fun(this, &WindowPrivate::prepare));
}
~WindowPrivate()
{
gState->texPool().release(baseTex);
shState->texPool().release(baseTex);
cursorRectCon.disconnect();
prepareCon.disconnect();
}
@ -405,8 +405,8 @@ struct WindowPrivate
if (!resizeNeeded)
return;
gState->texPool().release(baseTex);
baseTex = gState->texPool().request(newW, newH);
shState->texPool().release(baseTex);
baseTex = shState->texPool().request(newW, newH);
baseTexDirty = true;
}
@ -422,7 +422,7 @@ struct WindowPrivate
glState.viewport.pushSet(IntRect(0, 0, baseTex.width, baseTex.height));
glState.clearColor.pushSet(Vec4());
SimpleAlphaShader &shader = gState->simpleAlphaShader();
SimpleAlphaShader &shader = shState->simpleAlphaShader();
shader.bind();
shader.applyViewportProj();
shader.setTranslation(Vec2i());
@ -560,7 +560,7 @@ struct WindowPrivate
Vec2i trans(position.x + sceneOffset.x,
position.y + sceneOffset.y);
SimpleAlphaShader &shader = gState->simpleAlphaShader();
SimpleAlphaShader &shader = shState->simpleAlphaShader();
shader.bind();
shader.applyViewportProj();
shader.setTranslation(trans);
@ -609,7 +609,7 @@ struct WindowPrivate
glState.scissorBox.push();
glState.scissorBox.setIntersect(windowRect);
SimpleAlphaShader &shader = gState->simpleAlphaShader();
SimpleAlphaShader &shader = shState->simpleAlphaShader();
shader.bind();
shader.applyViewportProj();
shader.setTranslation(Vec2i(effectX, effectY));