Rewrite ConvertToGreyscale() and ConvertToDisabled()

[wxWidgets.git] / samples / opengl / cube / cube.cpp

diff --git a/samples/opengl/cube/cube.cpp b/samples/opengl/cube/cube.cpp
index c4a60b515a32edfae2802131090abc6ac1ddd373..f65ca2accbc8c264111580ded0da4370be69f53c 100644 (file)
--- a/samples/opengl/cube/cube.cpp
+++ b/samples/opengl/cube/cube.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin to use new wxGLCanvas API (2007-04-09)
 // Created:     04/01/98
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin to use new wxGLCanvas API (2007-04-09)
 // Created:     04/01/98

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -34,7 +33,7 @@
 
 #include "cube.h"
 
 
 #include "cube.h"
 

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../../sample.xpm"
 #endif
 
     #include "../../sample.xpm"
 #endif
 


@@ -138,6 +137,7 @@ TestGLContext::TestGLContext(wxGLCanvas *canvas)
     SetCurrent(*canvas);
 
     // set up the parameters we want to use
     SetCurrent(*canvas);
 
     // set up the parameters we want to use

+    glEnable(GL_CULL_FACE);

     glEnable(GL_DEPTH_TEST);
     glEnable(GL_LIGHTING);
     glEnable(GL_LIGHT0);
     glEnable(GL_DEPTH_TEST);
     glEnable(GL_LIGHTING);
     glEnable(GL_LIGHT0);


@@ -323,10 +323,11 @@ void TestGLCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
     // is wrong when next another canvas is repainted.
     const wxSize ClientSize = GetClientSize();
 
     // is wrong when next another canvas is repainted.
     const wxSize ClientSize = GetClientSize();
 

+    TestGLContext& canvas = wxGetApp().GetContext(this);

     glViewport(0, 0, ClientSize.x, ClientSize.y);
 
     // Render the graphics and swap the buffers.
     glViewport(0, 0, ClientSize.x, ClientSize.y);
 
     // Render the graphics and swap the buffers.

-    wxGetApp().GetContext(this).DrawRotatedCube(m_xangle, m_yangle);
+    canvas.DrawRotatedCube(m_xangle, m_yangle);

     SwapBuffers();
 }
 
     SwapBuffers();
 }