X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2db98bf520c835c29a9002dcf93adc11b15a76df..2613d67b9f1d2ec5d185cb741e4a62989e039700:/samples/opengl/penguin/penguin.h?ds=sidebyside

diff --git a/samples/opengl/penguin/penguin.h b/samples/opengl/penguin/penguin.h
index 0020b657af..3f25590907 100644
--- a/samples/opengl/penguin/penguin.h
+++ b/samples/opengl/penguin/penguin.h
@@ -17,79 +17,91 @@
 #include "wx/app.h"
 #include "wx/menu.h"
 #include "wx/dcclient.h"
+#include "wx/wfstream.h"
+#if wxUSE_ZLIB
+#include "wx/zstream.h"
+#endif
 
 #include "wx/glcanvas.h"
 
-extern "C" {
-#include "lw.h"
+extern "C"
+{
 #include "trackball.h"
 }
 
-/* information needed to display lightwave mesh */
-typedef struct 
+#include "dxfrenderer.h"
+
+
+// OpenGL view data
+struct GLData
 {
-//  gint do_init;         /* true if initgl not yet called */
-    int do_init;
-    lwObject *lwobject;   /* lightwave object mesh */
-    float beginx,beginy;  /* position of mouse */
-    float quat[4];        /* orientation of object */
-    float zoom;           /* field of view in degrees */
-} mesh_info;
+    bool initialized;           // have OpenGL been initialized?
+    float beginx, beginy;       // position of mouse
+    float quat[4];              // orientation of object
+    float zoom;                 // field of view in degrees
+};
 
 
-/* Define a new application type */
-class MyApp: public wxApp
+// Define a new application type
+class MyApp : public wxApp
 {
 public:
-    bool OnInit(void);
+    virtual bool OnInit();
 };
 
-/* Define a new frame type */
+
+// Define a new frame type
 class TestGLCanvas;
 
-class MyFrame: public wxFrame
+
+class MyFrame : public wxFrame
 {
 public:
-    MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size,
-        long style = wxDEFAULT_FRAME_STYLE);
-
-    void OnExit(wxCommandEvent& event);
-    
-#if wxUSE_GLCANVAS
-    void SetCanvas( TestGLCanvas *canvas )    { m_canvas = canvas; }
-    TestGLCanvas *GetCanvas()                 { return m_canvas; }
-    
+    MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos,
+            const wxSize& size, long style = wxDEFAULT_FRAME_STYLE);
+
+    void OnMenuFileOpen(wxCommandEvent& event);
+    void OnMenuFileExit(wxCommandEvent& event);
+    void OnMenuHelpAbout(wxCommandEvent& event);
+
+    void SetCanvas(TestGLCanvas *canvas) { m_canvas = canvas; }
+    TestGLCanvas *GetCanvas() { return m_canvas; }
+
 private:
-    TestGLCanvas*    m_canvas;
-#endif
+    TestGLCanvas *m_canvas;
 
     DECLARE_EVENT_TABLE()
 };
 
-#if wxUSE_GLCANVAS
 
-class TestGLCanvas: public wxGLCanvas
+class TestGLCanvas : public wxGLCanvas
 {
 public:
-    TestGLCanvas(wxWindow *parent, const wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxT("TestGLCanvas"));
-    ~TestGLCanvas(void);
+    TestGLCanvas(wxWindow *parent, wxWindowID id = wxID_ANY,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize, long style = 0,
+        const wxString& name = wxT("TestGLCanvas"));
+
+    virtual ~TestGLCanvas();
+
+    void LoadDXF(const wxString& filename);
 
+protected:
     void OnPaint(wxPaintEvent& event);
     void OnSize(wxSizeEvent& event);
     void OnEraseBackground(wxEraseEvent& event);
-    void LoadLWO( const wxString &filename);
-    void OnMouse( wxMouseEvent& event );
-    void InitGL(void);
-   
-    mesh_info  info;
-    bool       block;
+    void OnMouse(wxMouseEvent& event);
 
 private:
-    DECLARE_EVENT_TABLE()
-};
+    void InitGL();
+    void ResetProjectionMode();
 
-#endif
+    wxGLContext* m_glRC;
+    GLData       m_gldata;
+    DXFRenderer  m_renderer;
 
-#endif
+    wxDECLARE_NO_COPY_CLASS(TestGLCanvas);
+    DECLARE_EVENT_TABLE()
+};
 
+#endif // #ifndef _WX_PENGUIN_H_