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

Remove the remaining bits of deprecated GL usage

Browse source 
The drawing is now completely shader based, which makes away
with all usage of the depracted matrix stack. This also allows
us to do things like simple translations and texture coordinate
translation directly instead of doing everything indirectly
through matrices.

Fixed vertex attributes ('vertexPointer()' etc) are also
replaced with user defined attribute arrays.
This commit is contained in:
Jonas Kulla 2013-09-23 07:15:01 +02:00
parent 88c1489554
commit 9e63fb6b64
29 changed files with 701 additions and 295 deletions

37
src/sprite.cpp
View file

@ -304,12 +304,24 @@ void Sprite::draw()
if (emptyFlashFlag)
return;
if (p->color->hasEffect() || p->tone->hasEffect() || p->opacity != 255 || flashing || p->bushDepth != 0)
p->bitmap->flush();
ShaderBase *base;
bool renderEffect = p->color->hasEffect() ||
p->tone->hasEffect() ||
p->opacity != 255 ||
flashing ||
p->bushDepth != 0;
if (renderEffect)
{
SpriteShader &shader = gState->spriteShader();
shader.bind();
shader.setFlash(Vec4());
shader.applyViewportProj();
shader.setSpriteMat(p->trans.getMatrix());
shader.setTone(p->tone->norm);
shader.setOpacity(p->opacity.norm);
shader.setBushDepth(p->efBushDepth);
@ -321,23 +333,26 @@ void Sprite::draw()
&flashColor : &p->color->norm;
shader.setColor(*blend);
base = &shader;
}
else
{
SimpleSpriteShader &shader = gState->simpleSpriteShader();
shader.bind();
shader.setSpriteMat(p->trans.getMatrix());
shader.applyViewportProj();
base = &shader;
}
glState.blendMode.pushSet(p->blendType);
glPushMatrix();
glLoadMatrixf(p->trans.getMatrix());
p->bitmap->flush();
p->bitmap->bindTexWithMatrix();
p->bitmap->bindTex(*base);
p->quad.draw();
glPopMatrix();
glState.blendMode.pop();
FragShader::unbind();
}
void Sprite::onGeometryChange(const Scene::Geometry &geo)