X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5fa399c9e241e99132733b09673cbcb76c9f77e1..f0b1ccde63c1acd9ca18847f758603f39f22cf4b:/samples/opengl/cube/cube.cpp?ds=sidebyside diff --git a/samples/opengl/cube/cube.cpp b/samples/opengl/cube/cube.cpp index 38c9d0f48a..5dc5faffc7 100644 --- a/samples/opengl/cube/cube.cpp +++ b/samples/opengl/cube/cube.cpp @@ -6,10 +6,10 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma implementation #pragma interface #endif @@ -27,15 +27,16 @@ #include "wx/log.h" -#if !wxUSE_GLCANVAS -#error Please set wxUSE_GLCANVAS to 1 in setup.h. -#endif - #include "cube.h" -#ifndef __WXMSW__ // for wxStopWatch, see remark below -#include -#include +#ifndef __WXMSW__ // for wxStopWatch, see remark below + #if defined(__WXMAC__) && !defined(__DARWIN__) + #include + #include + #else + #include + #include + #endif #else #include #endif @@ -65,15 +66,16 @@ END_EVENT_TABLE() ScanCodeCtrl::ScanCodeCtrl( wxWindow* parent, wxWindowID id, int code, const wxPoint& pos, const wxSize& size ) - : wxTextCtrl( parent, id, "", pos, size ) + : wxTextCtrl( parent, id, wxEmptyString, pos, size ) { wxString buf; - buf.Printf( "0x%04x", code ); + buf.Printf( _T("0x%04x"), code ); SetValue( buf ); } void ScanCodeCtrl::OnKeyDown( wxKeyEvent& event ) -{ wxString buf; - buf.Printf( "0x%04x", event.KeyCode() ); +{ + wxString buf; + buf.Printf( _T("0x%04x"), event.GetKeyCode() ); SetValue( buf ); } @@ -86,28 +88,28 @@ class ScanCodeDialog : public wxDialog public: ScanCodeDialog( wxWindow* parent, wxWindowID id, const int code, const wxString &descr, const wxString& title ); - int GetValue(); + int GetValue(); private: ScanCodeCtrl *m_ScanCode; wxTextCtrl *m_Description; }; -ScanCodeDialog::ScanCodeDialog( wxWindow* parent, wxWindowID id, +ScanCodeDialog::ScanCodeDialog( wxWindow* parent, wxWindowID id, const int code, const wxString &descr, const wxString& title ) : wxDialog( parent, id, title, wxPoint(-1, -1), wxSize(96*2,76*2) ) { - new wxStaticText( this, -1, "Scancode", wxPoint(4*2,3*2), + new wxStaticText( this, -1, _T("Scancode"), wxPoint(4*2,3*2), wxSize(31*2,12*2) ); - m_ScanCode = new ScanCodeCtrl( this, -1, code, wxPoint(37*2,6*2), + m_ScanCode = new ScanCodeCtrl( this, -1, code, wxPoint(37*2,6*2), wxSize(53*2,14*2) ); - new wxStaticText( this, -1, "Description", wxPoint(4*2,24*2), + new wxStaticText( this, -1, _T("Description"), wxPoint(4*2,24*2), wxSize(32*2,12*2) ); m_Description = new wxTextCtrl( this, -1, descr, wxPoint(37*2,27*2), wxSize(53*2,14*2) ); - new wxButton( this, wxID_OK, "Ok", wxPoint(20*2,50*2), wxSize(20*2,13*2) ); - new wxButton( this, wxID_CANCEL, "Cancel", wxPoint(44*2,50*2), + new wxButton( this, wxID_OK, _T("Ok"), wxPoint(20*2,50*2), wxSize(20*2,13*2) ); + new wxButton( this, wxID_CANCEL, _T("Cancel"), wxPoint(44*2,50*2), wxSize(25*2,13*2) ); } @@ -115,38 +117,39 @@ int ScanCodeDialog::GetValue() { int code; wxString buf = m_ScanCode->GetValue(); - sscanf( buf.c_str(), "%i", &code ); + wxSscanf( buf.c_str(), _T("%i"), &code ); return( code ); } /*---------------------------------------------------------------------- Utility function to get the elapsed time (in msec) since a given point - in time (in sec) (because current version of wxGetElapsedTime doesn´t - works right with glibc-2.1 and linux, at least for me) + in time (in sec) (because current version of wxGetElapsedTime doesn´t + works right with glibc-2.1 and linux, at least for me) -----------------------------------------------------------------------*/ 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 ) *sec_base = secs; - + return( (secs-*sec_base)*1000 + msec ); } @@ -154,6 +157,8 @@ unsigned long wxStopWatch( unsigned long *sec_base ) Implementation of Test-GLCanvas -----------------------------------------------------------------*/ +#if wxUSE_GLCANVAS + BEGIN_EVENT_TABLE(TestGLCanvas, wxGLCanvas) EVT_SIZE(TestGLCanvas::OnSize) EVT_PAINT(TestGLCanvas::OnPaint) @@ -178,7 +183,7 @@ TestGLCanvas::TestGLCanvas(wxWindow *parent, wxWindowID id, m_rright = WXK_RIGHT; } -TestGLCanvas::TestGLCanvas(wxWindow *parent, const TestGLCanvas &other, +TestGLCanvas::TestGLCanvas(wxWindow *parent, const TestGLCanvas &other, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxGLCanvas(parent, other.GetContext(), id, pos, size, style, name ) @@ -208,14 +213,19 @@ void TestGLCanvas::Render() InitGL(); 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); if( m_gllist == 0 ) { m_gllist = glGenLists( 1 ); - glNewList( m_gllist, GL_COMPILE_AND_EXECUTE ); + glNewList( m_gllist, GL_COMPILE_AND_EXECUTE ); /* draw six faces of a cube */ glBegin(GL_QUADS); glNormal3f( 0.0F, 0.0F, 1.0F); @@ -246,37 +256,40 @@ void TestGLCanvas::Render() glEndList(); } else - glCallList( m_gllist ); + glCallList( m_gllist ); glFlush(); SwapBuffers(); } -void TestGLCanvas::OnEnterWindow( wxMouseEvent& event ) +void TestGLCanvas::OnEnterWindow( wxMouseEvent& WXUNUSED(event) ) { SetFocus(); } -void TestGLCanvas::OnPaint( wxPaintEvent& event ) +void TestGLCanvas::OnPaint( wxPaintEvent& WXUNUSED(event) ) { Render(); } 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); } } -void TestGLCanvas::OnEraseBackground(wxEraseEvent& event) +void TestGLCanvas::OnEraseBackground(wxEraseEvent& WXUNUSED(event)) { // Do nothing, to avoid flashing. } @@ -284,7 +297,7 @@ void TestGLCanvas::OnEraseBackground(wxEraseEvent& event) void TestGLCanvas::InitGL() { SetCurrent(); - + /* set viewing projection */ glMatrixMode(GL_PROJECTION); glFrustum(-0.5F, 0.5F, -0.5F, 0.5F, 1.0F, 3.0F); @@ -326,7 +339,7 @@ GLfloat TestGLCanvas::CalcRotateAngle( unsigned long lasttime, t = ((GLfloat)(acceltime - lasttime)) / 1000.0f; s1 = CalcRotateSpeed( lasttime ); s2 = CalcRotateSpeed( acceltime ); - + return( t * (s1 + s2) * 135.0f ); } @@ -335,15 +348,15 @@ void TestGLCanvas::Action( long code, unsigned long lasttime, { GLfloat angle = CalcRotateAngle( lasttime, acceltime ); - if (code == m_rleft) + if (code == m_rleft) Rotate( angle ); - else if (code == m_rright) + else if (code == m_rright) Rotate( -angle ); } void TestGLCanvas::OnKeyDown( wxKeyEvent& event ) { - long evkey = event.KeyCode(); + long evkey = event.GetKeyCode(); if (evkey == 0) return; if (!m_TimeInitialized) @@ -359,7 +372,7 @@ void TestGLCanvas::OnKeyDown( wxKeyEvent& event ) } unsigned long currTime = event.m_timeStamp - m_xsynct; - + if (evkey != m_Key) { m_Key = evkey; @@ -369,11 +382,15 @@ void TestGLCanvas::OnKeyDown( wxKeyEvent& event ) if (currTime >= m_LastRedraw) // Redraw: { 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; } - + event.Skip(); } @@ -383,7 +400,7 @@ void TestGLCanvas::OnKeyUp( wxKeyEvent& event ) m_StartTime = 0; m_LastTime = 0; m_LastRedraw = 0; - + event.Skip(); } @@ -397,6 +414,8 @@ void TestGLCanvas::Rotate( GLfloat deg ) } +#endif // wxUSE_GLCANVAS + /* ----------------------------------------------------------------------- Main Window -------------------------------------------------------------------------*/ @@ -410,64 +429,71 @@ END_EVENT_TABLE() // My frame constructor MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, - const wxSize& size, long style) + const wxSize& size, long style) : wxFrame(frame, -1, title, pos, size, style) { m_canvas = NULL; } // Intercept menu commands -void MyFrame::OnExit(wxCommandEvent& event) +void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event)) { Destroy(); } -void MyFrame::OnNewWindow() +void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event)) { - MyFrame *frame = new MyFrame(NULL, "Cube OpenGL Demo Clone", + MyFrame *frame = new MyFrame(NULL, _T("Cube OpenGL Demo Clone"), wxPoint(50, 50), wxSize(400, 300)); // Give it an icon -#ifdef wx_msw - frame->SetIcon(wxIcon("mondrian")); +#ifdef __WXMSW__ + frame->SetIcon(wxIcon(_T("mondrian"))); #endif // Make a menubar wxMenu *winMenu = new wxMenu; - winMenu->Append(wxID_EXIT, "&Close"); - winMenu->Append(ID_NEW_WINDOW, "&New" ); + winMenu->Append(wxID_EXIT, _T("&Close")); + winMenu->Append(ID_NEW_WINDOW, _T("&New") ); wxMenuBar *menuBar = new wxMenuBar; - menuBar->Append(winMenu, "&Window"); + menuBar->Append(winMenu, _T("&Window")); winMenu = new wxMenu; - winMenu->Append(ID_DEF_ROTATE_LEFT_KEY, "Rotate &left"); - winMenu->Append(ID_DEF_ROTATE_RIGHT_KEY, "Rotate &right"); - menuBar->Append(winMenu, "&Key"); + winMenu->Append(ID_DEF_ROTATE_LEFT_KEY, _T("Rotate &left")); + winMenu->Append(ID_DEF_ROTATE_RIGHT_KEY, _T("Rotate &right")); + menuBar->Append(winMenu, _T("&Key")); frame->SetMenuBar(menuBar); - frame->m_canvas = new TestGLCanvas( frame, *m_canvas, -1, - wxPoint(0, 0), wxSize(200, 200) ); - +#if wxUSE_GLCANVAS + frame->m_canvas = new TestGLCanvas( frame, *m_canvas, -1, + wxDefaultPosition, wxDefaultSize ); +#endif + // Show the frame frame->Show(TRUE); } -void MyFrame::OnDefRotateLeftKey() +void MyFrame::OnDefRotateLeftKey(wxCommandEvent& WXUNUSED(event)) { - ScanCodeDialog dial( this, -1, m_canvas->m_rleft, - wxString("Left"), "Define key" ); +#if wxUSE_GLCANVAS + ScanCodeDialog dial( this, -1, m_canvas->m_rleft, + wxString(_T("Left")), _T("Define key") ); int result = dial.ShowModal(); if( result == wxID_OK ) m_canvas->m_rleft = dial.GetValue(); +#endif } -void MyFrame::OnDefRotateRightKey() + +void MyFrame::OnDefRotateRightKey(wxCommandEvent& WXUNUSED(event)) { - ScanCodeDialog dial( this, -1, m_canvas->m_rright, - wxString("Right"), "Define key" ); +#if wxUSE_GLCANVAS + ScanCodeDialog dial( this, -1, m_canvas->m_rright, + wxString(_T("Right")), _T("Define key") ); int result = dial.ShowModal(); if( result == wxID_OK ) m_canvas->m_rright = dial.GetValue(); +#endif } /*------------------------------------------------------------------ @@ -481,7 +507,7 @@ bool MyApp::OnInit(void) wxLog::SetTraceMask(wxTraceMessages); // Create the main frame window - MyFrame *frame = new MyFrame(NULL, "Cube OpenGL Demo", wxPoint(50, 50), + MyFrame *frame = new MyFrame(NULL, _T("Cube OpenGL Demo"), wxPoint(50, 50), wxSize(400, 300)); // Give it an icon #ifdef wx_msw @@ -491,22 +517,33 @@ bool MyApp::OnInit(void) // Make a menubar wxMenu *winMenu = new wxMenu; - winMenu->Append(wxID_EXIT, "&Close"); - winMenu->Append(ID_NEW_WINDOW, "&New" ); + winMenu->Append(wxID_EXIT, _T("&Close")); + winMenu->Append(ID_NEW_WINDOW, _T("&New") ); wxMenuBar *menuBar = new wxMenuBar; - menuBar->Append(winMenu, "&Window"); + menuBar->Append(winMenu, _T("&Window")); winMenu = new wxMenu; - winMenu->Append(ID_DEF_ROTATE_LEFT_KEY, "Rotate &left"); - winMenu->Append(ID_DEF_ROTATE_RIGHT_KEY, "Rotate &right"); - menuBar->Append(winMenu, "&Key"); + winMenu->Append(ID_DEF_ROTATE_LEFT_KEY, _T("Rotate &left")); + winMenu->Append(ID_DEF_ROTATE_RIGHT_KEY, _T("Rotate &right")); + menuBar->Append(winMenu, _T("&Key")); frame->SetMenuBar(menuBar); - frame->m_canvas = new TestGLCanvas(frame, -1, wxPoint(0, 0), wxSize(200, 200)); +#if wxUSE_GLCANVAS + + frame->m_canvas = new TestGLCanvas(frame, -1, wxDefaultPosition, wxDefaultSize); // Show the frame frame->Show(TRUE); - + return TRUE; + +#else + + wxMessageBox( _T("This sample has to be compiled with wxUSE_GLCANVAS"), _T("Building error"), wxOK); + + return FALSE; + +#endif + }