OpenGL in prerequesites
This commit is contained in:
parent
1ac08aa692
commit
ca38f53e15
|
@ -23,8 +23,6 @@
|
||||||
|
|
||||||
|
|
||||||
#include <graphics/animatedtexture.h>
|
#include <graphics/animatedtexture.h>
|
||||||
|
|
||||||
#include <GL/gl.h>
|
|
||||||
#include <core/engine.h>
|
#include <core/engine.h>
|
||||||
#include <core/dispatcher.h>
|
#include <core/dispatcher.h>
|
||||||
|
|
||||||
|
|
|
@ -26,10 +26,6 @@
|
||||||
#include <graphics/framebuffer.h>
|
#include <graphics/framebuffer.h>
|
||||||
#include <graphics/graphics.h>
|
#include <graphics/graphics.h>
|
||||||
|
|
||||||
#include <GL/gl.h>
|
|
||||||
#include <GL/glu.h>
|
|
||||||
#include <GL/glext.h>
|
|
||||||
|
|
||||||
PFNGLGENFRAMEBUFFERSPROC oglGenFramebuffers = 0;
|
PFNGLGENFRAMEBUFFERSPROC oglGenFramebuffers = 0;
|
||||||
PFNGLBINDFRAMEBUFFERPROC oglBindFramebuffer = 0;
|
PFNGLBINDFRAMEBUFFERPROC oglBindFramebuffer = 0;
|
||||||
PFNGLFRAMEBUFFERTEXTURE2DPROC oglFramebufferTexture2D = 0;
|
PFNGLFRAMEBUFFERTEXTURE2DPROC oglFramebufferTexture2D = 0;
|
||||||
|
|
|
@ -25,10 +25,6 @@
|
||||||
#include <prerequisites.h>
|
#include <prerequisites.h>
|
||||||
#include <graphics/graphics.h>
|
#include <graphics/graphics.h>
|
||||||
|
|
||||||
#include <GL/gl.h>
|
|
||||||
#include <GL/glu.h>
|
|
||||||
#include <GL/glext.h>
|
|
||||||
|
|
||||||
Graphics g_graphics;
|
Graphics g_graphics;
|
||||||
|
|
||||||
void Graphics::init()
|
void Graphics::init()
|
||||||
|
|
|
@ -25,8 +25,6 @@
|
||||||
#include <prerequisites.h>
|
#include <prerequisites.h>
|
||||||
#include <graphics/texture.h>
|
#include <graphics/texture.h>
|
||||||
|
|
||||||
#include <GL/gl.h>
|
|
||||||
|
|
||||||
Texture::Texture(int width, int height, int components, uchar *pixels)
|
Texture::Texture(int width, int height, int components, uchar *pixels)
|
||||||
{
|
{
|
||||||
m_size.setSize(width, height);
|
m_size.setSize(width, height);
|
||||||
|
|
|
@ -31,9 +31,6 @@
|
||||||
|
|
||||||
#include <physfs.h>
|
#include <physfs.h>
|
||||||
|
|
||||||
#include <GL/gl.h>
|
|
||||||
#include <GL/glext.h>
|
|
||||||
|
|
||||||
LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
||||||
|
|
||||||
struct Win32PlatformPrivate {
|
struct Win32PlatformPrivate {
|
||||||
|
@ -246,7 +243,7 @@ int Platform::getTicks()
|
||||||
static ulong firstTick = 0;
|
static ulong firstTick = 0;
|
||||||
if(!firstTick)
|
if(!firstTick)
|
||||||
firstTick = GetTickCount();
|
firstTick = GetTickCount();
|
||||||
|
|
||||||
return (uint32_t)(GetTickCount() - firstTick);
|
return (uint32_t)(GetTickCount() - firstTick);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -61,6 +61,11 @@ typedef int8_t int8;
|
||||||
#include <queue>
|
#include <queue>
|
||||||
#include <iterator>
|
#include <iterator>
|
||||||
|
|
||||||
|
// OpenGL
|
||||||
|
#include <GL/gl.h>
|
||||||
|
#include <GL/glu.h>
|
||||||
|
#include <GL/glext.h>
|
||||||
|
|
||||||
// boost utilities
|
// boost utilities
|
||||||
#include <boost/algorithm/string.hpp>
|
#include <boost/algorithm/string.hpp>
|
||||||
#include <boost/foreach.hpp>
|
#include <boost/foreach.hpp>
|
||||||
|
|
Loading…
Reference in New Issue