From 2deb5d2e4d63d28ba8acfdd78d283e93a71a8db3 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 29 Jul 2020 04:46:00 +0200 Subject: [PATCH] remove glemu/glexts from cube.hh --- src/engine/aa.cc | 1 + src/engine/grass.cc | 1 + src/engine/main.cc | 1 + src/engine/material.cc | 1 + src/engine/octaedit.cc | 1 + src/engine/octarender.cc | 1 + src/engine/rendergl.cc | 1 + src/engine/renderlights.cc | 1 + src/engine/rendermodel.cc | 1 + src/engine/renderparticles.cc | 1 + src/engine/rendersky.cc | 1 + src/engine/rendertext.cc | 1 + src/engine/renderva.cc | 1 + src/engine/shader.cc | 1 + src/engine/stain.cc | 1 + src/engine/water.cc | 1 + src/engine/world.cc | 1 + src/shared/cube.hh | 5 ----- src/shared/glemu.cc | 2 +- src/shared/glemu.hh | 1 + 20 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/engine/aa.cc b/src/engine/aa.cc index 6d3b9f5..204997e 100644 --- a/src/engine/aa.cc +++ b/src/engine/aa.cc @@ -6,6 +6,7 @@ #include "texture.hh" #include +#include extern int intel_texalpha_bug; diff --git a/src/engine/grass.cc b/src/engine/grass.cc index 76862be..bfb08de 100644 --- a/src/engine/grass.cc +++ b/src/engine/grass.cc @@ -5,6 +5,7 @@ #include "texture.hh" #include +#include VARP(grass, 0, 1, 1); VAR(dbggrass, 0, 0, 1); diff --git a/src/engine/main.cc b/src/engine/main.cc index f336ace..edb0079 100644 --- a/src/engine/main.cc +++ b/src/engine/main.cc @@ -20,6 +20,7 @@ #include "world.hh" #include +#include #include static SDL_Window *screen = NULL; diff --git a/src/engine/material.cc b/src/engine/material.cc index c161da0..af529ed 100644 --- a/src/engine/material.cc +++ b/src/engine/material.cc @@ -9,6 +9,7 @@ #include "world.hh" #include +#include vector editsurfs, glasssurfs[4], watersurfs[4], waterfallsurfs[4], lavasurfs[4], lavafallsurfs[4]; diff --git a/src/engine/octaedit.cc b/src/engine/octaedit.cc index 799475e..049712d 100644 --- a/src/engine/octaedit.cc +++ b/src/engine/octaedit.cc @@ -17,6 +17,7 @@ #include "world.hh" #include +#include #include extern int outline; diff --git a/src/engine/octarender.cc b/src/engine/octarender.cc index 209a3cd..1593396 100644 --- a/src/engine/octarender.cc +++ b/src/engine/octarender.cc @@ -17,6 +17,7 @@ #include "world.hh" #include +#include #include struct vboinfo diff --git a/src/engine/rendergl.cc b/src/engine/rendergl.cc index d876643..9b9af93 100644 --- a/src/engine/rendergl.cc +++ b/src/engine/rendergl.cc @@ -21,6 +21,7 @@ #include "water.hh" #include +#include #include static vec minimapcenter(0, 0, 0), minimapradius(0, 0, 0), minimapscale(0, 0, 0); diff --git a/src/engine/renderlights.cc b/src/engine/renderlights.cc index cd6648a..1590150 100644 --- a/src/engine/renderlights.cc +++ b/src/engine/renderlights.cc @@ -18,6 +18,7 @@ #include "world.hh" #include +#include #include #define CHANGE_SHADERS 0 diff --git a/src/engine/rendermodel.cc b/src/engine/rendermodel.cc index f9063dc..782bcfc 100644 --- a/src/engine/rendermodel.cc +++ b/src/engine/rendermodel.cc @@ -13,6 +13,7 @@ #include "texture.hh" #include +#include #include VAR(oqdynent, 0, 1, 1); diff --git a/src/engine/renderparticles.cc b/src/engine/renderparticles.cc index 0c91db1..a272add 100644 --- a/src/engine/renderparticles.cc +++ b/src/engine/renderparticles.cc @@ -17,6 +17,7 @@ #include "world.hh" #include +#include #include #if 0 diff --git a/src/engine/rendersky.cc b/src/engine/rendersky.cc index 32237ab..cbdf8d9 100644 --- a/src/engine/rendersky.cc +++ b/src/engine/rendersky.cc @@ -9,6 +9,7 @@ #include "texture.hh" #include +#include static Texture *sky[6] = { 0, 0, 0, 0, 0, 0 }, *clouds[6] = { 0, 0, 0, 0, 0, 0 }; diff --git a/src/engine/rendertext.cc b/src/engine/rendertext.cc index 093c86e..e8ffa85 100644 --- a/src/engine/rendertext.cc +++ b/src/engine/rendertext.cc @@ -5,6 +5,7 @@ #include "texture.hh" #include +#include static hashnameset fonts; static font *fontdef = NULL; diff --git a/src/engine/renderva.cc b/src/engine/renderva.cc index 5365491..f351008 100644 --- a/src/engine/renderva.cc +++ b/src/engine/renderva.cc @@ -16,6 +16,7 @@ #include "world.hh" #include +#include #include static inline void drawtris(GLsizei numindices, const GLvoid *indices, ushort minvert, ushort maxvert) diff --git a/src/engine/shader.cc b/src/engine/shader.cc index 88462d4..119da01 100644 --- a/src/engine/shader.cc +++ b/src/engine/shader.cc @@ -11,6 +11,7 @@ #include "texture.hh" #include +#include Shader *Shader::lastshader = NULL; diff --git a/src/engine/stain.cc b/src/engine/stain.cc index 6a03276..9757c2b 100644 --- a/src/engine/stain.cc +++ b/src/engine/stain.cc @@ -10,6 +10,7 @@ #include "world.hh" #include +#include #include struct stainvert diff --git a/src/engine/water.cc b/src/engine/water.cc index 38e478c..57efe82 100644 --- a/src/engine/water.cc +++ b/src/engine/water.cc @@ -8,6 +8,7 @@ #include "world.hh" #include +#include extern const vec matnormals[6]; diff --git a/src/engine/world.cc b/src/engine/world.cc index 8abd0ca..ab706c1 100644 --- a/src/engine/world.cc +++ b/src/engine/world.cc @@ -20,6 +20,7 @@ #include "world.hh" #include +#include #include VARNR(mapscale, worldscale, 1, 0, 0); diff --git a/src/shared/cube.hh b/src/shared/cube.hh index 30a7e6a..299b2eb 100644 --- a/src/shared/cube.hh +++ b/src/shared/cube.hh @@ -45,10 +45,5 @@ #include "ents.hh" #include "command.hh" -#ifndef STANDALONE -#include "glexts.hh" -#include "glemu.hh" -#endif - #endif diff --git a/src/shared/glemu.cc b/src/shared/glemu.cc index fe57a44..ed99833 100644 --- a/src/shared/glemu.cc +++ b/src/shared/glemu.cc @@ -1,4 +1,4 @@ -#include "cube.hh" +#include "glemu.hh" #include diff --git a/src/shared/glemu.hh b/src/shared/glemu.hh index 7442697..77f9956 100644 --- a/src/shared/glemu.hh +++ b/src/shared/glemu.hh @@ -2,6 +2,7 @@ #define SHARED_GLEMU_HH #include "glexts.hh" +#include "geom.hh" namespace gle {