From: Gilles Depeyrot Date: Fri, 16 Nov 2001 07:17:37 +0000 (+0000) Subject: applied SourceForge patch #479670 (fixes for OpenGL samples) by Paul Thiessen X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9d705dfa81cd65de8fe900a45b80494fa201ef0a applied SourceForge patch #479670 (fixes for OpenGL samples) by Paul Thiessen git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/samples/opengl/cube/cube.cpp b/samples/opengl/cube/cube.cpp index 886bbe12fa..a617a4c756 100644 --- a/samples/opengl/cube/cube.cpp +++ b/samples/opengl/cube/cube.cpp @@ -133,20 +133,21 @@ unsigned long wxStopWatch( unsigned long *sec_base ) { unsigned long secs,msec; -#ifndef __WXMSW__ // think every unice has gettimeofday - struct timeval tv; - gettimeofday( &tv, (struct timezone *)NULL ); - secs = tv.tv_sec; - msec = tv.tv_usec/1000; -#else +#if defined(__WXMSW__) struct timeb tb; - ftime( &tb ); - secs = tb.time; - msec = tb.millitm; - +#elif defined(__WXMAC__) && !defined(__DARWIN__) + wxLongLong tl = wxGetLocalTimeMillis(); + secs = (unsigned long) (tl.GetValue() / 1000); + msec = (unsigned long) (tl.GetValue() - secs*1000); +#else + // think every unice has gettimeofday + struct timeval tv; + gettimeofday( &tv, (struct timezone *)NULL ); + secs = tv.tv_sec; + msec = tv.tv_usec/1000; #endif if( *sec_base == 0 ) @@ -214,6 +215,11 @@ void TestGLCanvas::Render() m_init = TRUE; } + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + glFrustum(-0.5F, 0.5F, -0.5F, 0.5F, 1.0F, 3.0F); + glMatrixMode(GL_MODELVIEW); + /* clear color and depth buffers */ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); @@ -269,15 +275,18 @@ void TestGLCanvas::OnPaint( wxPaintEvent& event ) void TestGLCanvas::OnSize(wxSizeEvent& event) { - int width, height; - GetClientSize(& width, & height); + // this is also necessary to update the context on some platforms + wxGLCanvas::OnSize(event); + // set GL viewport (not called by wxGLCanvas::OnSize on all platforms...) + int w, h; + GetClientSize(&w, &h); #ifndef __WXMOTIF__ if (GetContext()) #endif { SetCurrent(); - glViewport(0, 0, width, height); + glViewport(0, 0, (GLint) w, (GLint) h); } } @@ -375,7 +384,11 @@ void TestGLCanvas::OnKeyDown( wxKeyEvent& event ) { Action( m_Key, m_LastTime-m_StartTime, currTime-m_StartTime ); +#if defined(__WXMAC__) && !defined(__DARWIN__) + m_LastRedraw = currTime; // wxStopWatch() doesn't work on Mac... +#else m_LastRedraw = wxStopWatch(&m_secbase) - m_gsynct; +#endif m_LastTime = currTime; } @@ -452,7 +465,7 @@ void MyFrame::OnNewWindow(wxCommandEvent& event) frame->SetMenuBar(menuBar); frame->m_canvas = new TestGLCanvas( frame, *m_canvas, -1, - wxPoint(0, 0), wxSize(200, 200) ); + wxDefaultPosition, wxDefaultSize ); // Show the frame frame->Show(TRUE); @@ -508,7 +521,7 @@ bool MyApp::OnInit(void) frame->SetMenuBar(menuBar); - frame->m_canvas = new TestGLCanvas(frame, -1, wxPoint(0, 0), wxSize(200, 200)); + frame->m_canvas = new TestGLCanvas(frame, -1, wxDefaultPosition, wxDefaultSize); // Show the frame frame->Show(TRUE); diff --git a/samples/opengl/cube/cube.h b/samples/opengl/cube/cube.h index b7af99ee0e..be348b5427 100644 --- a/samples/opengl/cube/cube.h +++ b/samples/opengl/cube/cube.h @@ -12,7 +12,7 @@ #ifndef _WX_CUBE_H_ #define _WX_CUBE_H_ -#include +#include "wx/glcanvas.h" // Define a new application type class MyApp: public wxApp diff --git a/samples/opengl/isosurf/isosurf.cpp b/samples/opengl/isosurf/isosurf.cpp index 3d3bda3dc9..fbb0a5e752 100644 --- a/samples/opengl/isosurf/isosurf.cpp +++ b/samples/opengl/isosurf/isosurf.cpp @@ -45,6 +45,12 @@ # include #endif +// disabled because this has apparently changed in OpenGL 1.2, so doesn't link +// correctly if this is on... +#ifdef GL_EXT_vertex_array +#undef GL_EXT_vertex_array +#endif + #include "isosurf.h" // The following part is taken largely unchanged from the original C Version @@ -197,13 +203,6 @@ static void Init(void) #endif } - -static void Reshape(int width, int height) -{ - glViewport(0, 0, (GLint)width, (GLint)height); -} - - static GLenum Args(int argc, char **argv) { GLint i; @@ -282,7 +281,7 @@ bool MyApp::OnInit(void) doubleBuffer = GL_FALSE; } - frame->m_canvas = new TestGLCanvas(frame, -1, wxPoint(0, 0), wxSize(200, 200), + frame->m_canvas = new TestGLCanvas(frame, -1, wxDefaultPosition, wxDefaultSize, 0, "TestGLCanvas", gl_attrib ); // Show the frame @@ -363,14 +362,19 @@ void TestGLCanvas::OnPaint( wxPaintEvent& event ) void TestGLCanvas::OnSize(wxSizeEvent& event) { + // this is also necessary to update the context on some platforms + wxGLCanvas::OnSize(event); + + // set GL viewport (not called by wxGLCanvas::OnSize on all platforms...) + int w, h; + GetClientSize(&w, &h); #ifndef __WXMOTIF__ - if (!GetContext()) return; + if (GetContext()) #endif - + { SetCurrent(); - int width, height; - GetClientSize(& width, & height); - Reshape(width, height); + glViewport(0, 0, (GLint) w, (GLint) h); + } } void TestGLCanvas::OnChar(wxKeyEvent& event) diff --git a/samples/opengl/penguin/penguin.cpp b/samples/opengl/penguin/penguin.cpp index 7e2e82a16d..1b09d9530c 100644 --- a/samples/opengl/penguin/penguin.cpp +++ b/samples/opengl/penguin/penguin.cpp @@ -57,7 +57,7 @@ bool MyApp::OnInit(void) menuBar->Append(fileMenu, "&File"); frame->SetMenuBar(menuBar); - frame->m_canvas = new TestGLCanvas(frame, -1, wxPoint(0, 0), wxSize(200, 200)); + frame->m_canvas = new TestGLCanvas(frame, -1, wxPoint(0, 0), wxSize(200, 200), wxSUNKEN_BORDER); /* Load file wiht mesh data */ frame->m_canvas->LoadLWO( "penguin.lwo" ); @@ -155,9 +155,19 @@ void TestGLCanvas::OnPaint( wxPaintEvent& event ) void TestGLCanvas::OnSize(wxSizeEvent& event) { - // the viewport must be initialized this way, not glViewport // this is also necessary to update the context on some platforms wxGLCanvas::OnSize(event); + + // set GL viewport (not called by wxGLCanvas::OnSize on all platforms...) + int w, h; + GetClientSize(&w, &h); +#ifndef __WXMOTIF__ + if (GetContext()) +#endif + { + SetCurrent(); + glViewport(0, 0, (GLint) w, (GLint) h); + } } void TestGLCanvas::OnEraseBackground(wxEraseEvent& event)