AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adding glFrustum to compat API, supporting SetColour on OpenGL ES

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2009-09-14 08:37:23 +00:00
parent ba9574c310
commit e203dbfe15
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/glcanvas.h
View File

@ -118,11 +118,9 @@ public:
// miscellaneous helper functions // miscellaneous helper functions
// ------------------------------ // ------------------------------
#ifndef wxHAS_OPENGL_ES
// call glcolor() for the colour with the given name, return false if // call glcolor() for the colour with the given name, return false if
// colour not found // colour not found
bool SetColour(const wxString& colour); bool SetColour(const wxString& colour);
#endif
// return true if the extension with given name is supported // return true if the extension with given name is supported
// //
@ -231,6 +229,8 @@ public:
wxGLAPI(); wxGLAPI();
~wxGLAPI(); ~wxGLAPI();
static void glFrustum(GLfloat left, GLfloat right, GLfloat bottom,
GLfloat top, GLfloat zNear, GLfloat zFar);
static void glBegin(GLenum mode); static void glBegin(GLenum mode);
static void glTexCoord2f(GLfloat s, GLfloat t); static void glTexCoord2f(GLfloat s, GLfloat t);
static void glVertex3f(GLfloat x, GLfloat y, GLfloat z); static void glVertex3f(GLfloat x, GLfloat y, GLfloat z);

18
src/common/glcmn.cpp
View File

@ -63,13 +63,15 @@ bool wxGLCanvasBase::SetCurrent(const wxGLContext& context) const
return context.SetCurrent(*static_cast<const wxGLCanvas *>(this)); return context.SetCurrent(*static_cast<const wxGLCanvas *>(this));
} }
#ifndef wxHAS_OPENGL_ES
bool wxGLCanvasBase::SetColour(const wxString& colour) bool wxGLCanvasBase::SetColour(const wxString& colour)
{ {
wxColour col = wxTheColourDatabase->Find(colour); wxColour col = wxTheColourDatabase->Find(colour);
if ( !col.Ok() ) if ( !col.Ok() )
return false; return false;
#ifdef wxHAS_OPENGL_ES
wxGLAPI::glColor3f(col.Red() / 256., col.Green() / 256., col.Blue() / 256.);
#else
GLboolean isRGBA; GLboolean isRGBA;
glGetBooleanv(GL_RGBA_MODE, &isRGBA); glGetBooleanv(GL_RGBA_MODE, &isRGBA);
if ( isRGBA ) if ( isRGBA )
@ -87,10 +89,9 @@ bool wxGLCanvasBase::SetColour(const wxString& colour)
glIndexi(pix); glIndexi(pix);
} }
#endif
return true; return true;
} }
#endif
wxGLCanvasBase::~wxGLCanvasBase() wxGLCanvasBase::~wxGLCanvasBase()
{ {
@ -206,6 +207,17 @@ wxGLAPI::~wxGLAPI()
{ {
} }
void wxGLAPI::glFrustum(GLfloat left, GLfloat right, GLfloat bottom,
GLfloat top, GLfloat zNear, GLfloat zFar)
{
#if wxUSE_OPENGL_EMULATION
::glFrustumf(left, right, bottom, top, zNear, zFar);
#else
::glFrustum(left, right, bottom, top, zNear, zFar);
#endif
}
void wxGLAPI::glBegin(GLenum mode) void wxGLAPI::glBegin(GLenum mode)
{ {
#if wxUSE_OPENGL_EMULATION #if wxUSE_OPENGL_EMULATION