Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Open Watcom compilation of OpenGL samples; Code cleanup.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2003-11-15 04:21:10 +00:00
parent 9c157f38e3
commit 5cf036d017
7 changed files with 601 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
samples/opengl/penguin/penguin.h
View File

@@ -20,16 +20,17 @@
#include "wx/glcanvas.h"
extern "C" {
extern "C"
{
#include "lw.h"
#include "trackball.h"
}
/* information needed to display lightwave mesh */
typedef struct
typedef struct
{
// gint do_init; /* true if initgl not yet called */
int do_init;
bool do_init;
lwObject *lwobject; /* lightwave object mesh */
float beginx,beginy; /* position of mouse */
float quat[4]; /* orientation of object */
@@ -41,7 +42,7 @@ typedef struct
class MyApp: public wxApp
{
public:
bool OnInit(void);
bool OnInit();
};
/* Define a new frame type */
@@ -50,17 +51,17 @@ class TestGLCanvas;
class MyFrame: public wxFrame
{
public:
MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size,
long style = wxDEFAULT_FRAME_STYLE);
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; }
void SetCanvas( TestGLCanvas *canvas ) { m_canvas = canvas; }
TestGLCanvas *GetCanvas() { return m_canvas; }
private:
TestGLCanvas* m_canvas;
TestGLCanvas *m_canvas;
#endif
DECLARE_EVENT_TABLE()
@@ -71,17 +72,20 @@ private:
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"));
~TestGLCanvas();
void OnPaint(wxPaintEvent& event);
void OnSize(wxSizeEvent& event);
void OnEraseBackground(wxEraseEvent& event);
void LoadLWO( const wxString &filename);
void OnMouse( wxMouseEvent& event );
void InitGL(void);
void InitGL();
mesh_info info;
bool block;
@@ -89,7 +93,7 @@ private:
DECLARE_EVENT_TABLE()
};
#endif
#endif // #if wxUSE_GLCANVAS
#endif
#endif // #ifndef _WX_PENGUIN_H_