kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

BGE cleanup: removing some unused code from GPC_Canvas.

Browse Source
This commit is contained in:
Mitchell Stokes 2013-07-09 01:34:23 +00:00
parent 60812e0260
commit b73793f636
2 changed files with 1 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
source/gameengine/GamePlayer/common/GPC_Canvas.cpp
View File

@ -79,24 +79,6 @@ GPC_Canvas::~GPC_Canvas()
}
// void GPC_Canvas::InitPostRenderingContext(void)
// {
// glViewport(0, 0, m_width, m_height);
// glMatrixMode(GL_PROJECTION);
// glLoadIdentity();
// glOrtho(-2.0, 2.0, -2.0, 2.0, -20.0, 20.0);
// glMatrixMode(GL_MODELVIEW);
// glLoadIdentity();
// glEnable(GL_DEPTH_TEST);
// glDepthFunc(GL_LESS);
// glShadeModel(GL_SMOOTH);
// }
void GPC_Canvas::Resize(int width, int height)
{
m_width = width;
@ -109,10 +91,6 @@ void GPC_Canvas::Resize(int width, int height)
m_displayarea.m_y2 = height;
}
void GPC_Canvas::EndFrame()
{
}
void GPC_Canvas::ClearColor(float r, float g, float b, float a)
{
@ -181,82 +159,6 @@ void GPC_Canvas::ClearBuffer(
void
GPC_Canvas::
PushRenderState(
CanvasRenderState & render_state
) {
#if 0
::glMatrixMode(GL_PROJECTION);
::glPushMatrix();
::glMatrixMode(GL_MODELVIEW);
::glPushMatrix();
::glMatrixMode(GL_TEXTURE);
::glPushMatrix();
// Save old OpenGL settings
::glGetIntegerv(GL_LIGHTING, (GLint*)&(render_state.oldLighting));
::glGetIntegerv(GL_DEPTH_TEST, (GLint*)&(render_state.oldDepthTest));
::glGetIntegerv(GL_FOG, (GLint*)&(render_state.oldFog));
::glGetIntegerv(GL_TEXTURE_2D, (GLint*)&(render_state.oldTexture2D));
::glGetIntegerv(GL_BLEND, (GLint*)&(render_state.oldBlend));
::glGetIntegerv(GL_BLEND_SRC, (GLint*)&(render_state.oldBlendSrc));
::glGetIntegerv(GL_BLEND_DST, (GLint*)&(render_state.oldBlendDst));
::glGetFloatv(GL_CURRENT_COLOR, render_state.oldColor);
::glGetIntegerv(GL_DEPTH_WRITEMASK,(GLint*)&(render_state.oldWriteMask));
#else
glPushAttrib(GL_ALL_ATTRIB_BITS);
#endif
}
void
GPC_Canvas::
PopRenderState(
const CanvasRenderState & render_state
) {
#if 0
// Restore OpenGL settings
render_state.oldLighting ? ::glEnable(GL_LIGHTING) : glDisable(GL_LIGHTING);
render_state.oldDepthTest ? ::glEnable(GL_DEPTH_TEST) : glDisable(GL_DEPTH_TEST);
render_state.oldFog ? ::glEnable(GL_FOG) : ::glDisable(GL_FOG);
render_state.oldTexture2D ? ::glEnable(GL_TEXTURE_2D) : glDisable(GL_TEXTURE_2D);
render_state.oldBlend ? glEnable(GL_BLEND) : ::glDisable(GL_BLEND);
::glBlendFunc((GLenum)render_state.oldBlendSrc, (GLenum)render_state.oldBlendDst);
render_state.oldWriteMask ? ::glEnable(GL_DEPTH_WRITEMASK) : glDisable(GL_DEPTH_WRITEMASK);
::glColor4fv(render_state.oldColor);
// Restore OpenGL matrices
::glMatrixMode(GL_TEXTURE);
::glPopMatrix();
::glMatrixMode(GL_PROJECTION);
::glPopMatrix();
::glMatrixMode(GL_MODELVIEW);
::glPopMatrix();
#else
glPopAttrib();
#endif
}
void
GPC_Canvas::
SetOrthoProjection(
) {
// Set up OpenGL matrices
::glViewport(0, 0, m_width, m_height);
::glScissor(0, 0, m_width, m_height);
::glMatrixMode(GL_PROJECTION);
::glLoadIdentity();
::glOrtho(0, m_width, 0, m_height, -1, 1);
::glMatrixMode(GL_MODELVIEW);
::glLoadIdentity();
::glMatrixMode(GL_TEXTURE);
::glLoadIdentity();
}
void
GPC_Canvas::
MakeScreenShot(
const char* filename
) {

33
source/gameengine/GamePlayer/common/GPC_Canvas.h
View File

@ -114,7 +114,7 @@ public:
*/
void
EndFrame(
);
) {};
void SetViewPort(int x1, int y1, int x2, int y2);
void UpdateViewPort(int x1, int y1, int x2, int y2);
@ -140,37 +140,6 @@ public:
virtual void MakeScreenShot(const char* filename);
void ClearBuffer(int type);
protected:
struct CanvasRenderState {
int oldLighting;
int oldDepthTest;
int oldFog;
int oldTexture2D;
int oldBlend;
int oldBlendSrc;
int oldBlendDst;
float oldColor[4];
int oldWriteMask;
};
void
PushRenderState(
CanvasRenderState & render_state
);
void
PopRenderState(
const CanvasRenderState & render_state
);
/**
* Set up an orthogonal viewing,model and texture matrix
* for banners and progress bars.
*/
void
SetOrthoProjection(
);
};
#endif /* __GPC_CANVAS_H__ */