remove glemu/glexts from cube.hh
parent
cf85ca8695
commit
2deb5d2e4d
|
@ -6,6 +6,7 @@
|
||||||
#include "texture.hh"
|
#include "texture.hh"
|
||||||
|
|
||||||
#include <shared/cube.hh>
|
#include <shared/cube.hh>
|
||||||
|
#include <shared/glemu.hh>
|
||||||
|
|
||||||
extern int intel_texalpha_bug;
|
extern int intel_texalpha_bug;
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
#include "texture.hh"
|
#include "texture.hh"
|
||||||
|
|
||||||
#include <shared/cube.hh>
|
#include <shared/cube.hh>
|
||||||
|
#include <shared/glemu.hh>
|
||||||
|
|
||||||
VARP(grass, 0, 1, 1);
|
VARP(grass, 0, 1, 1);
|
||||||
VAR(dbggrass, 0, 0, 1);
|
VAR(dbggrass, 0, 0, 1);
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
|
|
||||||
#include <shared/cube.hh>
|
#include <shared/cube.hh>
|
||||||
|
#include <shared/glemu.hh>
|
||||||
#include <shared/igame.hh>
|
#include <shared/igame.hh>
|
||||||
|
|
||||||
static SDL_Window *screen = NULL;
|
static SDL_Window *screen = NULL;
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
|
|
||||||
#include <shared/cube.hh>
|
#include <shared/cube.hh>
|
||||||
|
#include <shared/glemu.hh>
|
||||||
|
|
||||||
vector<materialsurface> editsurfs, glasssurfs[4], watersurfs[4], waterfallsurfs[4], lavasurfs[4], lavafallsurfs[4];
|
vector<materialsurface> editsurfs, glasssurfs[4], watersurfs[4], waterfallsurfs[4], lavasurfs[4], lavafallsurfs[4];
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
|
|
||||||
#include <shared/cube.hh>
|
#include <shared/cube.hh>
|
||||||
|
#include <shared/glemu.hh>
|
||||||
#include <shared/igame.hh>
|
#include <shared/igame.hh>
|
||||||
|
|
||||||
extern int outline;
|
extern int outline;
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
|
|
||||||
#include <shared/cube.hh>
|
#include <shared/cube.hh>
|
||||||
|
#include <shared/glemu.hh>
|
||||||
#include <shared/igame.hh>
|
#include <shared/igame.hh>
|
||||||
|
|
||||||
struct vboinfo
|
struct vboinfo
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include "water.hh"
|
#include "water.hh"
|
||||||
|
|
||||||
#include <shared/cube.hh>
|
#include <shared/cube.hh>
|
||||||
|
#include <shared/glemu.hh>
|
||||||
#include <shared/igame.hh>
|
#include <shared/igame.hh>
|
||||||
|
|
||||||
static vec minimapcenter(0, 0, 0), minimapradius(0, 0, 0), minimapscale(0, 0, 0);
|
static vec minimapcenter(0, 0, 0), minimapradius(0, 0, 0), minimapscale(0, 0, 0);
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
|
|
||||||
#include <shared/cube.hh>
|
#include <shared/cube.hh>
|
||||||
|
#include <shared/glemu.hh>
|
||||||
#include <shared/igame.hh>
|
#include <shared/igame.hh>
|
||||||
|
|
||||||
#define CHANGE_SHADERS 0
|
#define CHANGE_SHADERS 0
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
#include "texture.hh"
|
#include "texture.hh"
|
||||||
|
|
||||||
#include <shared/cube.hh>
|
#include <shared/cube.hh>
|
||||||
|
#include <shared/glemu.hh>
|
||||||
#include <shared/igame.hh>
|
#include <shared/igame.hh>
|
||||||
|
|
||||||
VAR(oqdynent, 0, 1, 1);
|
VAR(oqdynent, 0, 1, 1);
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
|
|
||||||
#include <shared/cube.hh>
|
#include <shared/cube.hh>
|
||||||
|
#include <shared/glemu.hh>
|
||||||
#include <shared/igame.hh>
|
#include <shared/igame.hh>
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
#include "texture.hh"
|
#include "texture.hh"
|
||||||
|
|
||||||
#include <shared/cube.hh>
|
#include <shared/cube.hh>
|
||||||
|
#include <shared/glemu.hh>
|
||||||
|
|
||||||
static Texture *sky[6] = { 0, 0, 0, 0, 0, 0 }, *clouds[6] = { 0, 0, 0, 0, 0, 0 };
|
static Texture *sky[6] = { 0, 0, 0, 0, 0, 0 }, *clouds[6] = { 0, 0, 0, 0, 0, 0 };
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
#include "texture.hh"
|
#include "texture.hh"
|
||||||
|
|
||||||
#include <shared/cube.hh>
|
#include <shared/cube.hh>
|
||||||
|
#include <shared/glemu.hh>
|
||||||
|
|
||||||
static hashnameset<font> fonts;
|
static hashnameset<font> fonts;
|
||||||
static font *fontdef = NULL;
|
static font *fontdef = NULL;
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
|
|
||||||
#include <shared/cube.hh>
|
#include <shared/cube.hh>
|
||||||
|
#include <shared/glemu.hh>
|
||||||
#include <shared/igame.hh>
|
#include <shared/igame.hh>
|
||||||
|
|
||||||
static inline void drawtris(GLsizei numindices, const GLvoid *indices, ushort minvert, ushort maxvert)
|
static inline void drawtris(GLsizei numindices, const GLvoid *indices, ushort minvert, ushort maxvert)
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
#include "texture.hh"
|
#include "texture.hh"
|
||||||
|
|
||||||
#include <shared/cube.hh>
|
#include <shared/cube.hh>
|
||||||
|
#include <shared/glemu.hh>
|
||||||
|
|
||||||
Shader *Shader::lastshader = NULL;
|
Shader *Shader::lastshader = NULL;
|
||||||
|
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
|
|
||||||
#include <shared/cube.hh>
|
#include <shared/cube.hh>
|
||||||
|
#include <shared/glemu.hh>
|
||||||
#include <shared/igame.hh>
|
#include <shared/igame.hh>
|
||||||
|
|
||||||
struct stainvert
|
struct stainvert
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
|
|
||||||
#include <shared/cube.hh>
|
#include <shared/cube.hh>
|
||||||
|
#include <shared/glemu.hh>
|
||||||
|
|
||||||
extern const vec matnormals[6];
|
extern const vec matnormals[6];
|
||||||
|
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
|
|
||||||
#include <shared/cube.hh>
|
#include <shared/cube.hh>
|
||||||
|
#include <shared/glemu.hh>
|
||||||
#include <shared/igame.hh>
|
#include <shared/igame.hh>
|
||||||
|
|
||||||
VARNR(mapscale, worldscale, 1, 0, 0);
|
VARNR(mapscale, worldscale, 1, 0, 0);
|
||||||
|
|
|
@ -45,10 +45,5 @@
|
||||||
#include "ents.hh"
|
#include "ents.hh"
|
||||||
#include "command.hh"
|
#include "command.hh"
|
||||||
|
|
||||||
#ifndef STANDALONE
|
|
||||||
#include "glexts.hh"
|
|
||||||
#include "glemu.hh"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "cube.hh"
|
#include "glemu.hh"
|
||||||
|
|
||||||
#include <engine/rendergl.hh>
|
#include <engine/rendergl.hh>
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
#define SHARED_GLEMU_HH
|
#define SHARED_GLEMU_HH
|
||||||
|
|
||||||
#include "glexts.hh"
|
#include "glexts.hh"
|
||||||
|
#include "geom.hh"
|
||||||
|
|
||||||
namespace gle
|
namespace gle
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue