X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2FABM2.git;a=blobdiff_plain;f=ABM2%2FAmaltheia%2FSprite.cpp;h=0f9309fec69d452a6a02bca91e0684a4aaa1004c;hp=a8c10a869d2c171150f070118ec695f499d43064;hb=a905c9a782ae0b618e787461e98dafae87185b80;hpb=c6874d14c21c74d8a40905e3358b49bc3f2520e2 diff --git a/ABM2/Amaltheia/Sprite.cpp b/ABM2/Amaltheia/Sprite.cpp index a8c10a8..0f9309f 100644 --- a/ABM2/Amaltheia/Sprite.cpp +++ b/ABM2/Amaltheia/Sprite.cpp @@ -22,7 +22,6 @@ #include -Graphics *gr; float z_order = 1.0; @@ -42,14 +41,14 @@ void Sprite::glEnter2DMode() glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // glBlendFunc(GL_SRC_ALPHA, GL_ONE); - glViewport(0, 0, gr->getWidth(), gr->getHeight()); + glViewport(0, 0, this->g->getWidth(), this->g->getHeight()); glMatrixMode(GL_PROJECTION); glPushMatrix(); glLoadIdentity(); - glOrtho(0.0, (GLdouble)gr->getWidth(), (GLdouble)gr->getHeight(), 0.0, 0.0, -2.0); -// gluOrtho2D(0.0, (GLdouble)gr->getWidth(), (GLdouble)gr->getHeight(), 0.0); + glOrtho(0.0, (GLdouble)this->g->getWidth(), (GLdouble)this->g->getHeight(), 0.0, 0.0, -2.0); +// gluOrtho2D(0.0, (GLdouble)this->g->getWidth(), (GLdouble)this->g->getHeight(), 0.0); glMatrixMode(GL_MODELVIEW); glPushMatrix();