The windows portion of Window is properly abstract now.
~g2k
This commit is contained in:
@@ -21,27 +21,6 @@ namespace OpenArena
|
|||||||
|
|
||||||
class Window: public SCREEN
|
class Window: public SCREEN
|
||||||
{
|
{
|
||||||
public:
|
|
||||||
#ifdef __linux
|
|
||||||
Display* display;
|
|
||||||
int screen;
|
|
||||||
::Window window;
|
|
||||||
GLXContext hRC;
|
|
||||||
XSetWindowAttributes attributes;
|
|
||||||
bool doubleBuffered;
|
|
||||||
XF86VidModeModeInfo vidMode;
|
|
||||||
int x, y;
|
|
||||||
private:
|
|
||||||
#endif
|
|
||||||
#ifdef WIN32
|
|
||||||
HGLRC glContext;
|
|
||||||
HWND window;
|
|
||||||
private:
|
|
||||||
HDC deviceContext;
|
|
||||||
HINSTANCE instance;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
Window();
|
Window();
|
||||||
~Window();
|
~Window();
|
||||||
@@ -52,9 +31,25 @@ namespace OpenArena
|
|||||||
void SetOnResize(ResizeFunc function);
|
void SetOnResize(ResizeFunc function);
|
||||||
void SwapBuffers();
|
void SwapBuffers();
|
||||||
|
|
||||||
|
#ifdef __linux
|
||||||
|
Display* display;
|
||||||
|
int screen;
|
||||||
|
::Window window;
|
||||||
|
GLXContext hRC;
|
||||||
|
XSetWindowAttributes attributes;
|
||||||
|
bool doubleBuffered;
|
||||||
|
XF86VidModeModeInfo vidMode;
|
||||||
|
int x, y;
|
||||||
|
#endif
|
||||||
private:
|
private:
|
||||||
ResizeFunc OnResize;
|
ResizeFunc OnResize;
|
||||||
InitFunc OnInit;
|
InitFunc OnInit;
|
||||||
|
#ifdef WIN32
|
||||||
|
HGLRC glContext;
|
||||||
|
HWND window;
|
||||||
|
HDC deviceContext;
|
||||||
|
HINSTANCE instance;
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
void DefaultResize(GLsizei width, GLsizei height);
|
void DefaultResize(GLsizei width, GLsizei height);
|
||||||
|
|||||||
Reference in New Issue
Block a user