modernize the sample removing global C-style functions; partially fix loading of the .dat.gz file

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

samples/opengl/isosurf/isosurf.h

@@ -12,14 +12,36 @@
 #ifndef _WX_ISOSURF_H_
 #define _WX_ISOSURF_H_
 
+// we need OpenGL headers for GLfloat/GLint types used below
+#if defined(__WXMAC__) || defined(__WXCOCOA__)
+#   ifdef __DARWIN__
+#       include <OpenGL/gl.h>
+#       include <OpenGL/glu.h>
+#   else
+#       include <gl.h>
+#       include <glu.h>
+#   endif
+#else
+#   include <GL/gl.h>
+#   include <GL/glu.h>
+#endif
+
+// the maximum number of vertex in the loaded .dat file
+#define MAXVERTS     10000
+
+
 // Define a new application type
 class MyApp : public wxApp
 {
 public:
     virtual bool OnInit();
+
+    virtual void OnInitCmdLine(wxCmdLineParser& parser);
+    virtual bool OnCmdLineParsed(wxCmdLineParser& parser);
 };
 
 
+// The OpenGL-enabled canvas
 class TestGLCanvas : public wxGLCanvas
 {
 public:
@@ -38,15 +60,26 @@ public:
     void OnChar(wxKeyEvent& event);
     void OnMouseEvent(wxMouseEvent& event);
 
+    void LoadSurface(const wxString& filename);
+    void InitMaterials();
+    void InitGL();
 
 private:
     wxGLContext* m_glRC;
 
+    GLfloat m_verts[MAXVERTS][3];
+    GLfloat m_norms[MAXVERTS][3];
+    GLint m_numverts;
+
+    GLfloat m_xrot;
+    GLfloat m_yrot;
+
     DECLARE_NO_COPY_CLASS(TestGLCanvas)
     DECLARE_EVENT_TABLE()
 };
 
 
+// The frame containing the GL canvas
 class MyFrame : public wxFrame
 {
 public:
@@ -66,5 +99,6 @@ private :
     DECLARE_EVENT_TABLE()
 };
 
+
 #endif // _WX_ISOSURF_H_