Browse Source

remove engine.hh header

master
Daniel Kolesa 3 weeks ago
parent
commit
f50a18eb90
31 changed files with 30 additions and 36 deletions
  1. +1
    -1
      src/engine/aa.cc
  2. +1
    -1
      src/engine/bih.cc
  3. +1
    -1
      src/engine/blend.cc
  4. +1
    -1
      src/engine/command.cc
  5. +1
    -1
      src/engine/console.cc
  6. +1
    -1
      src/engine/dynlight.cc
  7. +0
    -6
      src/engine/engine.hh
  8. +1
    -1
      src/engine/grass.cc
  9. +1
    -1
      src/engine/light.cc
  10. +1
    -1
      src/engine/main.cc
  11. +1
    -1
      src/engine/material.cc
  12. +1
    -1
      src/engine/movie.cc
  13. +1
    -1
      src/engine/normal.cc
  14. +1
    -1
      src/engine/octa.cc
  15. +1
    -1
      src/engine/octaedit.cc
  16. +1
    -1
      src/engine/octarender.cc
  17. +1
    -1
      src/engine/physics.cc
  18. +1
    -1
      src/engine/pvs.cc
  19. +1
    -1
      src/engine/rendergl.cc
  20. +1
    -1
      src/engine/renderlights.cc
  21. +1
    -1
      src/engine/rendermodel.cc
  22. +1
    -1
      src/engine/renderparticles.cc
  23. +1
    -1
      src/engine/rendersky.cc
  24. +1
    -1
      src/engine/rendertext.cc
  25. +1
    -1
      src/engine/renderva.cc
  26. +1
    -1
      src/engine/shader.cc
  27. +1
    -1
      src/engine/stain.cc
  28. +1
    -1
      src/engine/texture.cc
  29. +1
    -1
      src/engine/water.cc
  30. +1
    -1
      src/engine/world.cc
  31. +1
    -1
      src/engine/worldio.cc

+ 1
- 1
src/engine/aa.cc View File

@@ -5,7 +5,7 @@
#include "renderlights.hh"
#include "texture.hh"

#include "engine.hh"
#include <shared/cube.hh>

extern int intel_texalpha_bug;


+ 1
- 1
src/engine/bih.cc View File

@@ -2,7 +2,7 @@
#include "stain.hh"
#include "texture.hh"

#include "engine.hh"
#include <shared/cube.hh>

extern vec hitsurface;


+ 1
- 1
src/engine/blend.cc View File

@@ -9,7 +9,7 @@
#include "texture.hh"
#include "world.hh"

#include "engine.hh"
#include <shared/cube.hh>

enum
{

+ 1
- 1
src/engine/command.cc View File

@@ -6,7 +6,7 @@
#include "console.hh"
#include "main.hh" // fatal

#include "engine.hh"
#include <shared/cube.hh>

hashnameset<ident> idents; // contains ALL vars/commands/aliases
vector<ident *> identmap;

+ 1
- 1
src/engine/console.cc View File

@@ -7,7 +7,7 @@
#include "octaedit.hh" // editmode
#include "rendertext.hh"

#include "engine.hh"
#include <shared/cube.hh>

static void resetcomplete();
static void complete(char *s, int maxlen, const char *cmdprefix);

+ 1
- 1
src/engine/dynlight.cc View File

@@ -3,7 +3,7 @@
#include "pvs.hh"
#include "renderva.hh"

#include "engine.hh"
#include <shared/cube.hh>

VARNP(dynlights, usedynlights, 0, 1, 1);
VARP(dynlightdist, 0, 1024, 10000);

+ 0
- 6
src/engine/engine.hh View File

@@ -1,6 +0,0 @@
#ifndef __ENGINE_H__
#define __ENGINE_H__

#include "cube.hh"

#endif

+ 1
- 1
src/engine/grass.cc View File

@@ -3,7 +3,7 @@
#include "renderva.hh"
#include "texture.hh"

#include "engine.hh"
#include <shared/cube.hh>

VARP(grass, 0, 1, 1);
VAR(dbggrass, 0, 0, 1);

+ 1
- 1
src/engine/light.cc View File

@@ -11,7 +11,7 @@
#include "texture.hh"
#include "world.hh"

#include "engine.hh"
#include <shared/cube.hh>

CVAR1R(ambient, 0x191919);
FVARR(ambientscale, 0, 1, 16);

+ 1
- 1
src/engine/main.cc View File

@@ -19,7 +19,7 @@
#include "texture.hh"
#include "world.hh"

#include "engine.hh"
#include <shared/cube.hh>

static SDL_Window *screen = NULL;
static int curvsync = -1;

+ 1
- 1
src/engine/material.cc View File

@@ -8,7 +8,7 @@
#include "water.hh"
#include "world.hh"

#include "engine.hh"
#include <shared/cube.hh>

vector<materialsurface> editsurfs, glasssurfs[4], watersurfs[4], waterfallsurfs[4], lavasurfs[4], lavafallsurfs[4];


+ 1
- 1
src/engine/movie.cc View File

@@ -15,7 +15,7 @@
#include "rendertext.hh"
#include "texture.hh"

#include "engine.hh"
#include <shared/cube.hh>

VAR(dbgmovie, 0, 0, 1);


+ 1
- 1
src/engine/normal.cc View File

@@ -4,7 +4,7 @@
#include "texture.hh"
#include "world.hh"

#include "engine.hh"
#include <shared/cube.hh>

struct normalkey
{

+ 1
- 1
src/engine/octa.cc View File

@@ -9,7 +9,7 @@
#include "octarender.hh"
#include "world.hh"

#include "engine.hh"
#include <shared/cube.hh>

static const uchar fv[6][4] = // indexes for cubecoords, per each vert of a face orientation
{

+ 1
- 1
src/engine/octaedit.cc View File

@@ -14,7 +14,7 @@
#include "texture.hh"
#include "world.hh"

#include "engine.hh"
#include <shared/cube.hh>

extern int outline;


+ 1
- 1
src/engine/octarender.cc View File

@@ -16,7 +16,7 @@
#include "texture.hh"
#include "world.hh"

#include "engine.hh"
#include <shared/cube.hh>

struct vboinfo
{

+ 1
- 1
src/engine/physics.cc View File

@@ -11,7 +11,7 @@
#include "octa.hh"
#include "world.hh"

#include "engine.hh"
#include <shared/cube.hh>
#include "mpr.hh"

const int MAXCLIPOFFSET = 4;

+ 1
- 1
src/engine/pvs.cc View File

@@ -6,7 +6,7 @@
#include "octarender.hh" // valist
#include "world.hh"

#include "engine.hh"
#include <shared/cube.hh>

enum
{

+ 1
- 1
src/engine/rendergl.cc View File

@@ -19,7 +19,7 @@
#include "texture.hh"
#include "water.hh"

#include "engine.hh"
#include <shared/cube.hh>

bool hasVAO = false, hasTR = false, hasTSW = false, hasPBO = false, hasFBO = false, hasAFBO = false, hasDS = false, hasTF = false, hasCBF = false, hasS3TC = false, hasFXT1 = false, hasLATC = false, hasRGTC = false, hasAF = false, hasFBB = false, hasFBMS = false, hasTMS = false, hasMSS = false, hasFBMSBS = false, hasUBO = false, hasMBR = false, hasDB2 = false, hasDBB = false, hasTG = false, hasTQ = false, hasPF = false, hasTRG = false, hasTI = false, hasHFV = false, hasHFP = false, hasDBT = false, hasDC = false, hasDBGO = false, hasEGPU4 = false, hasGPU4 = false, hasGPU5 = false, hasBFE = false, hasEAL = false, hasCR = false, hasOQ2 = false, hasES3 = false, hasCB = false, hasCI = false;
bool mesa = false, intel = false, amd = false, nvidia = false;

+ 1
- 1
src/engine/renderlights.cc View File

@@ -17,7 +17,7 @@
#include "texture.hh"
#include "world.hh"

#include "engine.hh"
#include <shared/cube.hh>

#define CHANGE_SHADERS 0


+ 1
- 1
src/engine/rendermodel.cc View File

@@ -11,7 +11,7 @@
#include "shader.hh"
#include "texture.hh"

#include "engine.hh"
#include <shared/cube.hh>

VAR(oqdynent, 0, 1, 1);
VAR(animationinterpolationtime, 0, 200, 1000);

+ 1
- 1
src/engine/renderparticles.cc View File

@@ -15,7 +15,7 @@
#include "water.hh"
#include "world.hh"

#include "engine.hh"
#include <shared/cube.hh>

#if 0
void regular_particle_flame(int type, const vec &p, float radius, float height, int color, int density = 3, float scale = 2.0f, float speed = 200.0f, float fade = 600.0f, int gravity = -15);

+ 1
- 1
src/engine/rendersky.cc View File

@@ -7,7 +7,7 @@
#include "renderva.hh"
#include "texture.hh"

#include "engine.hh"
#include <shared/cube.hh>

static Texture *sky[6] = { 0, 0, 0, 0, 0, 0 }, *clouds[6] = { 0, 0, 0, 0, 0, 0 };


+ 1
- 1
src/engine/rendertext.cc View File

@@ -4,7 +4,7 @@
#include "rendergl.hh" // xtraverts
#include "texture.hh"

#include "engine.hh"
#include <shared/cube.hh>

static hashnameset<font> fonts;
static font *fontdef = NULL;

+ 1
- 1
src/engine/renderva.cc View File

@@ -15,7 +15,7 @@
#include "texture.hh"
#include "world.hh"

#include "engine.hh"
#include <shared/cube.hh>

static inline void drawtris(GLsizei numindices, const GLvoid *indices, ushort minvert, ushort maxvert)
{

+ 1
- 1
src/engine/shader.cc View File

@@ -10,7 +10,7 @@
#include "rendermodel.hh" // cleanupmodels
#include "texture.hh"

#include "engine.hh"
#include <shared/cube.hh>

Shader *Shader::lastshader = NULL;


+ 1
- 1
src/engine/stain.cc View File

@@ -9,7 +9,7 @@
#include "texture.hh"
#include "world.hh"

#include "engine.hh"
#include <shared/cube.hh>

struct stainvert
{

+ 1
- 1
src/engine/texture.cc View File

@@ -14,7 +14,7 @@
#include "shader.hh"
#include "world.hh"

#include "engine.hh"
#include <shared/cube.hh>

#ifdef __APPLE__
#include "SDL2_image/SDL_image.h"

+ 1
- 1
src/engine/water.cc View File

@@ -6,7 +6,7 @@
#include "texture.hh"
#include "world.hh"

#include "engine.hh"
#include <shared/cube.hh>

extern const vec matnormals[6];


+ 1
- 1
src/engine/world.cc View File

@@ -19,7 +19,7 @@
#include "worldio.hh"
#include "world.hh"

#include "engine.hh"
#include <shared/cube.hh>

VARNR(mapscale, worldscale, 1, 0, 0);
VARNR(mapsize, worldsize, 1, 0, 0);

+ 1
- 1
src/engine/worldio.cc View File

@@ -13,7 +13,7 @@
#include "world.hh"
#include "worldio.hh"

#include "engine.hh"
#include <shared/cube.hh>

#define OCTAVERSION 33


Loading…
Cancel
Save