From 45e08ccde95c84932557701235558e72cdc95f1b Mon Sep 17 00:00:00 2001 From: pixel Date: Sat, 28 Oct 2006 16:50:46 +0000 Subject: Fixing caps in class names. --- lib/glshape.cc | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'lib/glshape.cc') diff --git a/lib/glshape.cc b/lib/glshape.cc index 8fa718e..6c0b2d9 100644 --- a/lib/glshape.cc +++ b/lib/glshape.cc @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: glshape.cc,v 1.16 2004-11-27 21:48:03 pixel Exp $ */ +/* $Id: glshape.cc,v 1.17 2006-10-28 16:50:46 pixel Exp $ */ #include #include "glbase.h" -#include "glshape.h" -#include "texture.h" +#include "glShape.h" +#include "Texture.h" #include "glfont.h" #include "engine.h" @@ -30,7 +30,7 @@ #define ENTERT bool was2d = Enter(false) #define LEAVE Leave(was2d) -void mogltk::glshape::box(int x1, int y1, int x2, int y2, ColorP c) { +void mogltk::glShape::box(int x1, int y1, int x2, int y2, ColorP c) { ENTER; c.Bind(); @@ -44,7 +44,7 @@ void mogltk::glshape::box(int x1, int y1, int x2, int y2, ColorP c) { LEAVE; } -void mogltk::glshape::box(int x1, int y1, int x2, int y2, ColorP c1, ColorP c2, ColorP c3, ColorP c4) { +void mogltk::glShape::box(int x1, int y1, int x2, int y2, ColorP c1, ColorP c2, ColorP c3, ColorP c4) { ENTER; glBegin(GL_TRIANGLE_STRIP); @@ -57,33 +57,33 @@ void mogltk::glshape::box(int x1, int y1, int x2, int y2, ColorP c1, ColorP c2, LEAVE; } -void mogltk::glshape::hline(int x1, int x2, int y, ColorP c1, ColorP c2) { +void mogltk::glShape::hline(int x1, int x2, int y, ColorP c1, ColorP c2) { box(x1, y, x2, y, c1, c2, c1, c2); } -void mogltk::glshape::hline(int x1, int x2, int y, ColorP c) { +void mogltk::glShape::hline(int x1, int x2, int y, ColorP c) { box(x1, y, x2, y, c, c, c, c); } -void mogltk::glshape::vline(int x, int y1, int y2, ColorP c1, ColorP c2) { +void mogltk::glShape::vline(int x, int y1, int y2, ColorP c1, ColorP c2) { box(x, y1, x, y2, c1, c1, c2, c2); } -void mogltk::glshape::vline(int x, int y1, int y2, ColorP c) { +void mogltk::glShape::vline(int x, int y1, int y2, ColorP c) { box(x, y1, x, y2, c, c, c, c); } -void mogltk::glshape::pixel(int x, int y, ColorP c) { +void mogltk::glShape::pixel(int x, int y, ColorP c) { box(x, y, x, y, c); } -void mogltk::glshape::obox(int x1, int y1, int x2, int y2, ColorP c) { +void mogltk::glShape::obox(int x1, int y1, int x2, int y2, ColorP c) { ENTER; - shape::obox(x1, y1, x2, y2, c); + Shape::obox(x1, y1, x2, y2, c); LEAVE; } -void mogltk::glshape::obox(int x1, int y1, int x2, int y2, ColorP c1, ColorP c2, ColorP c3, ColorP c4) { +void mogltk::glShape::obox(int x1, int y1, int x2, int y2, ColorP c1, ColorP c2, ColorP c3, ColorP c4) { ENTER; hline(x1, x2, y1, c1, c2); @@ -94,10 +94,10 @@ void mogltk::glshape::obox(int x1, int y1, int x2, int y2, ColorP c1, ColorP c2, LEAVE; } -void mogltk::glshape::tbox(mogltk::texture * t, int x1, int y1, int x2, int y2, int tx, int ty, double f, ColorP c) { +void mogltk::glShape::tbox(mogltk::Texture * t, int x1, int y1, int x2, int y2, int tx, int ty, double f, ColorP c) { tbox(t, x1, y1, x2, y2, tx, ty, tx + (int) ((x2 - x1) * f), ty + (int) ((y2 - y1) * f), c); } -void mogltk::glshape::tbox(mogltk::texture * t, int x1, int y1, int x2, int y2, int tx1, int ty1, int tx2, int ty2, ColorP c) { +void mogltk::glShape::tbox(mogltk::Texture * t, int x1, int y1, int x2, int y2, int tx1, int ty1, int tx2, int ty2, ColorP c) { ENTERT; c.Bind(); @@ -112,11 +112,11 @@ 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, ColorP c1, ColorP c2, ColorP c3, ColorP c4, int tx, int ty, double f) { +void mogltk::glShape::tbox(mogltk::Texture * t, int x1, int y1, int x2, int y2, ColorP c1, ColorP c2, ColorP c3, ColorP c4, int tx, int ty, double f) { tbox(t, x1, y1, x2, y2, c1, c2, c3, c4, tx, ty, tx + (int) ((x2 - x1) * f), ty + (int) ((y2 - y1) * f)); } -void mogltk::glshape::tbox(mogltk::texture * t, int x1, int y1, int x2, int y2, ColorP c1, ColorP c2, ColorP c3, ColorP c4, int tx1, int ty1, int tx2, int ty2) { +void mogltk::glShape::tbox(mogltk::Texture * t, int x1, int y1, int x2, int y2, ColorP c1, ColorP c2, ColorP c3, ColorP c4, int tx1, int ty1, int tx2, int ty2) { ENTERT; t->Bind(); @@ -130,7 +130,7 @@ void mogltk::glshape::tbox(mogltk::texture * t, int x1, int y1, int x2, int y2, LEAVE; } -void mogltk::glshape::box3d(int x1, int y1, int x2, int y2, ColorP face, ColorP shade1, ColorP shade2, int depth, bool bevel) { +void mogltk::glShape::box3d(int x1, int y1, int x2, int y2, ColorP face, ColorP shade1, ColorP shade2, int depth, bool bevel) { ENTER; if (!bevel) { @@ -170,33 +170,33 @@ void mogltk::glshape::box3d(int x1, int y1, int x2, int y2, ColorP face, ColorP LEAVE; } -bool mogltk::glshape::Enter(bool unbind) { +bool mogltk::glShape::Enter(bool unbind) { bool was2D = mogltk::engine::glbase_o->is2D(); if (!was2D) mogltk::engine::glbase_o->Enter2DMode(); - if (unbind) mogltk::texture::Unbind(); + if (unbind) mogltk::Texture::Unbind(); return was2D; } -bool mogltk::glshape::Enter() { +bool mogltk::glShape::Enter() { return Enter(true); } -void mogltk::glshape::Leave(bool was2D) { +void mogltk::glShape::Leave(bool was2D) { if (!was2D) mogltk::engine::glbase_o->Leave2DMode(); } -void mogltk::glshape::fdraw(fill * f, ColorP c, int sx, int sy) { +void mogltk::glShape::fdraw(Fill * f, ColorP c, int sx, int sy) { ENTERT; if (!f) return; - texture * t = f->GetTexture(); + Texture * t = f->GetTexture(); if (!t) { filldrawer * w = new filldrawer(f, t = f->Talloc(), WHITE); @@ -221,13 +221,13 @@ void mogltk::glshape::fdraw(fill * f, ColorP c, int sx, int sy) { LEAVE; } -void mogltk::glshape::sdraw(fill * f, ColorP c, int sx, int sy) { +void mogltk::glShape::sdraw(Fill * f, ColorP c, int sx, int sy) { ENTERT; if (!f) return; - texture * t = f->GetSTexture(); + Texture * t = f->GetSTexture(); if (!t) { segdrawer * w = new segdrawer(f, t = f->STalloc(), WHITE); -- cgit v1.2.3