Merge wxQT branch into the trunk.
This merges in the latest sources from GSoC 2014 wxQt project with just a few minor corrections, mostly undoing wrong changes to common files in that branch (results of a previous bad merge?) and getting rid of whitespace-only changes. Also remove debug logging from wxGrid. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
253
src/qt/glcanvas.cpp
Normal file
253
src/qt/glcanvas.cpp
Normal file
@@ -0,0 +1,253 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: src/qt/glcanvas.cpp
|
||||
// Author: Sean D'Epagnier
|
||||
// Copyright: (c) Sean D'Epagnier 2014
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#if wxUSE_GLCANVAS
|
||||
|
||||
#include "wx/qt/private/winevent.h"
|
||||
#include "wx/glcanvas.h"
|
||||
|
||||
class wxQtGLWidget : public wxQtEventSignalHandler< QGLWidget, wxGLCanvas >
|
||||
{
|
||||
public:
|
||||
wxQtGLWidget(wxWindow *parent, wxGLCanvas *handler, QGLFormat format)
|
||||
: wxQtEventSignalHandler(parent, handler)
|
||||
{
|
||||
setFormat(format);
|
||||
setAutoBufferSwap( false );
|
||||
}
|
||||
|
||||
protected:
|
||||
virtual void showEvent ( QShowEvent * event );
|
||||
virtual void hideEvent ( QHideEvent * event );
|
||||
virtual void resizeEvent ( QResizeEvent * event );
|
||||
virtual void paintEvent ( QPaintEvent * event );
|
||||
|
||||
virtual void resizeGL(int w, int h);
|
||||
virtual void paintGL();
|
||||
};
|
||||
|
||||
void wxQtGLWidget::showEvent ( QShowEvent * event )
|
||||
{
|
||||
QGLWidget::showEvent( event );
|
||||
}
|
||||
|
||||
void wxQtGLWidget::hideEvent ( QHideEvent * event )
|
||||
{
|
||||
QGLWidget::hideEvent( event );
|
||||
}
|
||||
|
||||
void wxQtGLWidget::resizeEvent ( QResizeEvent * event )
|
||||
{
|
||||
QGLWidget::resizeEvent(event);
|
||||
}
|
||||
|
||||
void wxQtGLWidget::paintEvent ( QPaintEvent * event )
|
||||
{
|
||||
QGLWidget::paintEvent(event);
|
||||
}
|
||||
|
||||
void wxQtGLWidget::resizeGL(int w, int h)
|
||||
{
|
||||
wxSizeEvent event( wxSize(w, h) );
|
||||
EmitEvent(event);
|
||||
}
|
||||
|
||||
void wxQtGLWidget::paintGL()
|
||||
{
|
||||
wxPaintEvent event( GetHandler()->GetId() );
|
||||
EmitEvent(event);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
// wxGlContext
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_CLASS(wxGLContext, wxWindow)
|
||||
|
||||
wxGLContext::wxGLContext(wxGLCanvas *WXUNUSED(win), const wxGLContext* WXUNUSED(other))
|
||||
{
|
||||
// m_glContext = win->GetHandle()->context();
|
||||
}
|
||||
|
||||
bool wxGLContext::SetCurrent(const wxGLCanvas&) const
|
||||
{
|
||||
// I think I must destroy and recreate the QGLWidget to change the context?
|
||||
// win->GetHandle()->makeCurrent();
|
||||
return false;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
// wxGlCanvas
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_CLASS(wxGLCanvas, wxWindow)
|
||||
|
||||
wxGLCanvas::wxGLCanvas(wxWindow *parent,
|
||||
wxWindowID id,
|
||||
const int *attribList,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size,
|
||||
long style,
|
||||
const wxString& name,
|
||||
const wxPalette& palette)
|
||||
{
|
||||
Create(parent, id, pos, size, style, name, attribList, palette);
|
||||
}
|
||||
|
||||
bool wxGLCanvas::Create(wxWindow *parent,
|
||||
wxWindowID id,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size,
|
||||
long style,
|
||||
const wxString& name,
|
||||
const int *attribList,
|
||||
const wxPalette& palette)
|
||||
{
|
||||
#if wxUSE_PALETTE
|
||||
wxASSERT_MSG( !palette.IsOk(), wxT("palettes not supported") );
|
||||
#endif // wxUSE_PALETTE
|
||||
wxUnusedVar(palette); // Unused when wxDEBUG_LEVEL==0
|
||||
|
||||
QGLFormat format;
|
||||
if (!wxGLCanvas::ConvertWXAttrsToQtGL(attribList, format))
|
||||
return false;
|
||||
|
||||
m_qtWindow = new wxQtGLWidget(parent, this, format);
|
||||
|
||||
return wxWindow::Create( parent, id, pos, size, style, name );
|
||||
}
|
||||
|
||||
bool wxGLCanvas::SwapBuffers()
|
||||
{
|
||||
GetHandle()->swapBuffers();
|
||||
return true;
|
||||
}
|
||||
|
||||
/* static */
|
||||
bool wxGLCanvas::ConvertWXAttrsToQtGL(const int *wxattrs, QGLFormat &format)
|
||||
{
|
||||
if (!wxattrs)
|
||||
return true;
|
||||
return true;
|
||||
|
||||
// set default parameters to false
|
||||
format.setDoubleBuffer(false);
|
||||
format.setDepth(false);
|
||||
format.setAlpha(false);
|
||||
format.setStencil(false);
|
||||
|
||||
for ( int arg = 0; wxattrs[arg] != 0; arg++ )
|
||||
{
|
||||
// indicates whether we have a boolean attribute
|
||||
bool isBoolAttr = false;
|
||||
|
||||
int v = wxattrs[arg+1];
|
||||
switch ( wxattrs[arg] )
|
||||
{
|
||||
case WX_GL_BUFFER_SIZE:
|
||||
format.setRgba(false);
|
||||
// I do not know how to set the buffer size, so fail
|
||||
return false;
|
||||
|
||||
case WX_GL_LEVEL:
|
||||
format.setPlane(v);
|
||||
break;
|
||||
|
||||
case WX_GL_RGBA:
|
||||
format.setRgba(true);
|
||||
isBoolAttr = true;
|
||||
break;
|
||||
|
||||
case WX_GL_DOUBLEBUFFER:
|
||||
format.setDoubleBuffer(true);
|
||||
isBoolAttr = true;
|
||||
break;
|
||||
|
||||
case WX_GL_STEREO:
|
||||
format.setStereo(true);
|
||||
isBoolAttr = true;
|
||||
break;
|
||||
|
||||
case WX_GL_AUX_BUFFERS:
|
||||
// don't know how to implement
|
||||
return false;
|
||||
|
||||
case WX_GL_MIN_RED:
|
||||
format.setRedBufferSize(v*8);
|
||||
break;
|
||||
|
||||
case WX_GL_MIN_GREEN:
|
||||
format.setGreenBufferSize(v);
|
||||
break;
|
||||
|
||||
case WX_GL_MIN_BLUE:
|
||||
format.setBlueBufferSize(v);
|
||||
break;
|
||||
|
||||
case WX_GL_MIN_ALPHA:
|
||||
format.setAlpha(true);
|
||||
format.setAlphaBufferSize(v);
|
||||
break;
|
||||
|
||||
case WX_GL_DEPTH_SIZE:
|
||||
format.setDepth(true);
|
||||
format.setDepthBufferSize(v);
|
||||
break;
|
||||
|
||||
case WX_GL_STENCIL_SIZE:
|
||||
format.setStencil(true);
|
||||
format.setStencilBufferSize(v);
|
||||
break;
|
||||
|
||||
case WX_GL_MIN_ACCUM_RED:
|
||||
case WX_GL_MIN_ACCUM_GREEN:
|
||||
case WX_GL_MIN_ACCUM_BLUE:
|
||||
case WX_GL_MIN_ACCUM_ALPHA:
|
||||
format.setAccumBufferSize(v);
|
||||
break;
|
||||
|
||||
case WX_GL_SAMPLE_BUFFERS:
|
||||
format.setSampleBuffers(v);
|
||||
// can we somehow indicate if it's not supported?
|
||||
break;
|
||||
|
||||
case WX_GL_SAMPLES:
|
||||
format.setSamples(v);
|
||||
// can we somehow indicate if it's not supported?
|
||||
break;
|
||||
|
||||
default:
|
||||
wxLogDebug(wxT("Unsupported OpenGL attribute %d"),
|
||||
wxattrs[arg]);
|
||||
continue;
|
||||
}
|
||||
|
||||
if ( !isBoolAttr ) {
|
||||
if(!v)
|
||||
return false; // zero parameter
|
||||
arg++;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/* static */
|
||||
bool
|
||||
wxGLCanvasBase::IsDisplaySupported(const int *attribList)
|
||||
{
|
||||
QGLFormat format;
|
||||
|
||||
if (!wxGLCanvas::ConvertWXAttrsToQtGL(attribList, format))
|
||||
return false;
|
||||
|
||||
return QGLWidget(format).isValid();
|
||||
}
|
||||
|
||||
#endif // wxUSE_GLCANVAS
|
||||
Reference in New Issue
Block a user