From 00c33191a8192bd4bbc3f2c1ec952115db46f535 Mon Sep 17 00:00:00 2001 From: Nick Gasson Date: Sat, 7 Jun 2008 21:29:02 +0100 Subject: [PATCH] Remove some doof functions from OpenGL class --- src/ElectricGate.cpp | 8 +--- src/Emitter.cpp | 5 +-- src/Game.cpp | 2 +- src/OpenGL.cpp | 89 ++++++++------------------------------------ src/OpenGL.hpp | 12 +----- 5 files changed, 22 insertions(+), 94 deletions(-) diff --git a/src/ElectricGate.cpp b/src/ElectricGate.cpp index 6128e25..776da40 100644 --- a/src/ElectricGate.cpp +++ b/src/ElectricGate.cpp @@ -17,13 +17,11 @@ #include "ElectricGate.hpp" #include "LoadOnce.hpp" -#include "OpenGL.hpp" Image *ElectricGate::gateImage = NULL; ElectricGate::ElectricGate(Viewport *v, int length, bool vertical, int x, int y) - : length(length), vertical(vertical), viewport(v), - StaticObject(x, y) + : StaticObject(x, y), length(length), vertical(vertical), viewport(v) { LOAD_ONCE { gateImage = new Image("images/gateway.png"); @@ -62,8 +60,6 @@ bool ElectricGate::CheckCollision(Ship &ship) void ElectricGate::Draw() { - OpenGL &opengl = OpenGL::GetInstance(); - // Draw first sphere int draw_x = xpos*OBJ_GRID_SIZE - viewport->GetXAdjust(); int draw_y = ypos*OBJ_GRID_SIZE + OBJ_GRID_TOP - viewport->GetYAdjust(); @@ -84,7 +80,7 @@ void ElectricGate::Draw() if (--timer < GATEWAY_ACTIVE) { int x, y, deviation; - opengl.DisableTexture(); + glDisable(GL_TEXTURE_2D); for (int j = 0; j < 10; j++) { deviation = 0; diff --git a/src/Emitter.cpp b/src/Emitter.cpp index a382bcd..0390acb 100644 --- a/src/Emitter.cpp +++ b/src/Emitter.cpp @@ -102,10 +102,9 @@ void Emitter::NewCluster(int x, int y) void Emitter::Draw(float adjust_x, float adjust_y, bool createnew, bool evolve) { int i, created = 0; - OpenGL &opengl = OpenGL::GetInstance(); - opengl.EnableTexture(); - opengl.EnableBlending(); + glEnable(GL_TEXTURE_2D); + glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA,GL_ONE); glLoadIdentity(); diff --git a/src/Game.cpp b/src/Game.cpp index 67b8bfc..7898675 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -740,7 +740,7 @@ void FuelMeter::Display() glEnable(GL_BLEND); glDisable(GL_DEPTH_TEST); glColor3f(1.0f, 1.0f, 1.0f); - opengl.SelectTexture(fuelBarTexture->GetGLTexture()); + glBindTexture(GL_TEXTURE_2D, fuelBarTexture->GetGLTexture()); glLoadIdentity(); glBegin(GL_QUADS); glTexCoord2f(1.0f-texsize, 1.0f); diff --git a/src/OpenGL.cpp b/src/OpenGL.cpp index d3b6e50..3713b26 100644 --- a/src/OpenGL.cpp +++ b/src/OpenGL.cpp @@ -24,7 +24,7 @@ OpenGL::OpenGL() : screen_width(0), screen_height(0), screen_depth(0), fullscreen(false), running(false), active(true), - dodisplay(true), textureon(false), blendon(false), depthon(false), + dodisplay(true), fps_lastcheck(0), fps_framesdrawn(0), fps_rate(0) { // Start random number generator @@ -160,7 +160,7 @@ void OpenGL::Viewport(int x, int y, int width, int height) void OpenGL::Draw(Renderable *r) { - DisableBlending(); + glDisable(GL_BLEND); glLoadIdentity(); r->TranslateTo(); r->ApplyColour(); @@ -169,8 +169,8 @@ void OpenGL::Draw(Renderable *r) void OpenGL::Draw(Poly *cp) { - DisableBlending(); - EnableTexture(); + glDisable(GL_BLEND); + glEnable(GL_TEXTURE_2D); glBindTexture(GL_TEXTURE_2D, cp->uTexture); glLoadIdentity(); glTranslatef((float)cp->xpos, (float)cp->ypos, 0.0f); @@ -189,8 +189,8 @@ void OpenGL::Draw(Poly *cp) void OpenGL::DrawRotate(Renderable *r, float angle) { - DisableBlending(); - DisableTexture(); + glDisable(GL_BLEND); + glDisable(GL_TEXTURE_2D); glLoadIdentity(); r->TranslateTo(); glRotatef(angle, 0.0f, 0.0f, 1.0f); @@ -200,8 +200,8 @@ void OpenGL::DrawRotate(Renderable *r, float angle) void OpenGL::DrawBlend(Renderable *r, float alpha) { - DisableDepthBuffer(); - EnableBlending(); + glDisable(GL_DEPTH_TEST); + glEnable(GL_BLEND); glLoadIdentity(); r->TranslateTo(); r->ApplyColour(alpha); @@ -210,8 +210,8 @@ void OpenGL::DrawBlend(Renderable *r, float alpha) void OpenGL::DrawRotateBlend(Renderable *r, float angle, float alpha) { - DisableDepthBuffer(); - EnableBlending(); + glDisable(GL_DEPTH_TEST); + glEnable(GL_BLEND); glLoadIdentity(); r->TranslateTo(); glRotatef(angle, 0.0f, 0.0f, 1.0f); @@ -221,7 +221,7 @@ void OpenGL::DrawRotateBlend(Renderable *r, float angle, float alpha) void OpenGL::DrawScale(Renderable *r, float factor) { - DisableBlending(); + glDisable(GL_BLEND); glLoadIdentity(); r->TranslateTo(); glScalef(factor, factor, 0); @@ -231,7 +231,7 @@ void OpenGL::DrawScale(Renderable *r, float factor) void OpenGL::DrawRotateScale(Renderable *r, float angle, float factor) { - DisableBlending(); + glDisable(GL_BLEND); glLoadIdentity(); r->TranslateTo(); glScalef(factor, factor, 0); @@ -242,8 +242,8 @@ void OpenGL::DrawRotateScale(Renderable *r, float angle, float factor) void OpenGL::DrawBlendScale(Renderable *r, float alpha, float factor) { - DisableDepthBuffer(); - EnableBlending(); + glDisable(GL_DEPTH_TEST); + glEnable(GL_BLEND); glLoadIdentity(); r->TranslateTo(); glScalef(factor, factor, 0); @@ -253,8 +253,8 @@ void OpenGL::DrawBlendScale(Renderable *r, float alpha, float factor) void OpenGL::DrawRotateBlendScale(Renderable *r, float angle, float alpha, float factor) { - DisableDepthBuffer(); - EnableBlending(); + glDisable(GL_DEPTH_TEST); + glEnable(GL_BLEND); glLoadIdentity(); r->TranslateTo(); glScalef(factor, factor, 0); @@ -359,63 +359,6 @@ void OpenGL::SkipDisplay() dodisplay = false; } -void OpenGL::SelectTexture(GLuint uTexture) -{ - glBindTexture(GL_TEXTURE_2D, uTexture); -} - -void OpenGL::ClearColour(float r, float g, float b) -{ - glClearColor(r, g, b, 0.0f); -} - -void OpenGL::EnableTexture() -{ - if (!textureon) { - glEnable(GL_TEXTURE_2D); - textureon = true; - } -} - -void OpenGL::DisableTexture() -{ - if (textureon) { - glDisable(GL_TEXTURE_2D); - textureon = false; - } -} - -void OpenGL::EnableBlending() -{ - if (!blendon) { - glEnable(GL_BLEND); - blendon = true; - } -} - -void OpenGL::DisableBlending() -{ - if (blendon) { - glDisable(GL_BLEND); - blendon = false; - } -} - -void OpenGL::EnableDepthBuffer() -{ - if (!depthon) { - glEnable(GL_DEPTH_TEST); - depthon = true; - } -} - -void OpenGL::DisableDepthBuffer() -{ - if (depthon) { - glDisable(GL_DEPTH_TEST); - depthon = false; - } -} Renderable::Renderable(int x, int y, int width, int height, float r, float g, float b) diff --git a/src/OpenGL.hpp b/src/OpenGL.hpp index f69a0af..43e193e 100644 --- a/src/OpenGL.hpp +++ b/src/OpenGL.hpp @@ -111,14 +111,7 @@ public: void SelectTexture(GLuint uTexture); void ClearColour(float r, float g, float b); - - void EnableTexture(); - void DisableTexture(); - void EnableBlending(); - void DisableBlending(); - void EnableDepthBuffer(); - void DisableDepthBuffer(); - + bool IsTextureSizeSupported(int width, int height, int ncols=4, GLenum format=GL_RGBA); @@ -141,9 +134,6 @@ private: bool fullscreen; bool running, active, dodisplay; - // State variables - bool textureon, blendon, depthon; - // Frame rate variables int fps_lastcheck, fps_framesdrawn, fps_rate; }; -- 2.39.2