diff options
Diffstat (limited to 'lib/glshape.cc')
| -rw-r--r-- | lib/glshape.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/glshape.cc b/lib/glshape.cc index 7b93dfb..831be32 100644 --- a/lib/glshape.cc +++ b/lib/glshape.cc @@ -3,6 +3,7 @@ #include "glshape.h" #include "gltexture.h" #include "glfont.h" +#include "engine.h" #define ENTER bool was2d = Enter(true) #define ENTERT bool was2d = Enter(false) @@ -35,7 +36,7 @@ void mogltk::glshape::box(int x1, int y1, int x2, int y2, glColorP c1, glColorP LEAVE; } -void mogltk::glshape::tbox(mogltk::texture * t, int x1, int y1, int x2, int y2, int tx1, int ty1, int tx2, int ty2, glColorP c) { +void mogltk::glshape::tbox(mogltk::gltexture * t, int x1, int y1, int x2, int y2, int tx1, int ty1, int tx2, int ty2, glColorP c) { ENTERT; c.Bind(); @@ -50,7 +51,7 @@ void mogltk::glshape::tbox(mogltk::texture * t, int x1, int y1, int x2, int y2, LEAVE; } -void mogltk::glshape::tbox(mogltk::texture * t, int x1, int y1, int x2, int y2, glColorP c1, glColorP c2, glColorP c3, glColorP c4, int tx1, int ty1, int tx2, int ty2) { +void mogltk::glshape::tbox(mogltk::gltexture * t, int x1, int y1, int x2, int y2, glColorP c1, glColorP c2, glColorP c3, glColorP c4, int tx1, int ty1, int tx2, int ty2) { ENTERT; t->Bind(); @@ -105,12 +106,12 @@ void mogltk::glshape::box3d(int x1, int y1, int x2, int y2, glColorP face, glCol } bool mogltk::glshape::Enter(bool unbind) { - bool was2D = mogltk::glbase::is2D(); + bool was2D = mogltk::engine::glbase_o->is2D(); if (!was2D) - mogltk::glbase::Enter2DMode(); + mogltk::engine::glbase_o->Enter2DMode(); - if (unbind) mogltk::texture::Unbind(); + if (unbind) mogltk::gltexture::Unbind(); return was2D; } @@ -121,5 +122,5 @@ bool mogltk::glshape::Enter() { void mogltk::glshape::Leave(bool was2D) { if (!was2D) - mogltk::glbase::Leave2DMode(); + mogltk::engine::glbase_o->Leave2DMode(); } |