remove engine.hh header
parent
2e6e1aa3de
commit
f50a18eb90
|
@ -5,7 +5,7 @@
|
||||||
#include "renderlights.hh"
|
#include "renderlights.hh"
|
||||||
#include "texture.hh"
|
#include "texture.hh"
|
||||||
|
|
||||||
#include "engine.hh"
|
#include <shared/cube.hh>
|
||||||
|
|
||||||
extern int intel_texalpha_bug;
|
extern int intel_texalpha_bug;
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#include "stain.hh"
|
#include "stain.hh"
|
||||||
#include "texture.hh"
|
#include "texture.hh"
|
||||||
|
|
||||||
#include "engine.hh"
|
#include <shared/cube.hh>
|
||||||
|
|
||||||
extern vec hitsurface;
|
extern vec hitsurface;
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
#include "texture.hh"
|
#include "texture.hh"
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
|
|
||||||
#include "engine.hh"
|
#include <shared/cube.hh>
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#include "console.hh"
|
#include "console.hh"
|
||||||
#include "main.hh" // fatal
|
#include "main.hh" // fatal
|
||||||
|
|
||||||
#include "engine.hh"
|
#include <shared/cube.hh>
|
||||||
|
|
||||||
hashnameset<ident> idents; // contains ALL vars/commands/aliases
|
hashnameset<ident> idents; // contains ALL vars/commands/aliases
|
||||||
vector<ident *> identmap;
|
vector<ident *> identmap;
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#include "octaedit.hh" // editmode
|
#include "octaedit.hh" // editmode
|
||||||
#include "rendertext.hh"
|
#include "rendertext.hh"
|
||||||
|
|
||||||
#include "engine.hh"
|
#include <shared/cube.hh>
|
||||||
|
|
||||||
static void resetcomplete();
|
static void resetcomplete();
|
||||||
static void complete(char *s, int maxlen, const char *cmdprefix);
|
static void complete(char *s, int maxlen, const char *cmdprefix);
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#include "pvs.hh"
|
#include "pvs.hh"
|
||||||
#include "renderva.hh"
|
#include "renderva.hh"
|
||||||
|
|
||||||
#include "engine.hh"
|
#include <shared/cube.hh>
|
||||||
|
|
||||||
VARNP(dynlights, usedynlights, 0, 1, 1);
|
VARNP(dynlights, usedynlights, 0, 1, 1);
|
||||||
VARP(dynlightdist, 0, 1024, 10000);
|
VARP(dynlightdist, 0, 1024, 10000);
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __ENGINE_H__
|
|
||||||
#define __ENGINE_H__
|
|
||||||
|
|
||||||
#include "cube.hh"
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -3,7 +3,7 @@
|
||||||
#include "renderva.hh"
|
#include "renderva.hh"
|
||||||
#include "texture.hh"
|
#include "texture.hh"
|
||||||
|
|
||||||
#include "engine.hh"
|
#include <shared/cube.hh>
|
||||||
|
|
||||||
VARP(grass, 0, 1, 1);
|
VARP(grass, 0, 1, 1);
|
||||||
VAR(dbggrass, 0, 0, 1);
|
VAR(dbggrass, 0, 0, 1);
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
#include "texture.hh"
|
#include "texture.hh"
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
|
|
||||||
#include "engine.hh"
|
#include <shared/cube.hh>
|
||||||
|
|
||||||
CVAR1R(ambient, 0x191919);
|
CVAR1R(ambient, 0x191919);
|
||||||
FVARR(ambientscale, 0, 1, 16);
|
FVARR(ambientscale, 0, 1, 16);
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
#include "texture.hh"
|
#include "texture.hh"
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
|
|
||||||
#include "engine.hh"
|
#include <shared/cube.hh>
|
||||||
|
|
||||||
static SDL_Window *screen = NULL;
|
static SDL_Window *screen = NULL;
|
||||||
static int curvsync = -1;
|
static int curvsync = -1;
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#include "water.hh"
|
#include "water.hh"
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
|
|
||||||
#include "engine.hh"
|
#include <shared/cube.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];
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#include "rendertext.hh"
|
#include "rendertext.hh"
|
||||||
#include "texture.hh"
|
#include "texture.hh"
|
||||||
|
|
||||||
#include "engine.hh"
|
#include <shared/cube.hh>
|
||||||
|
|
||||||
VAR(dbgmovie, 0, 0, 1);
|
VAR(dbgmovie, 0, 0, 1);
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#include "texture.hh"
|
#include "texture.hh"
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
|
|
||||||
#include "engine.hh"
|
#include <shared/cube.hh>
|
||||||
|
|
||||||
struct normalkey
|
struct normalkey
|
||||||
{
|
{
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
#include "octarender.hh"
|
#include "octarender.hh"
|
||||||
#include "world.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
|
static const uchar fv[6][4] = // indexes for cubecoords, per each vert of a face orientation
|
||||||
{
|
{
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
#include "texture.hh"
|
#include "texture.hh"
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
|
|
||||||
#include "engine.hh"
|
#include <shared/cube.hh>
|
||||||
|
|
||||||
extern int outline;
|
extern int outline;
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
#include "texture.hh"
|
#include "texture.hh"
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
|
|
||||||
#include "engine.hh"
|
#include <shared/cube.hh>
|
||||||
|
|
||||||
struct vboinfo
|
struct vboinfo
|
||||||
{
|
{
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
#include "octa.hh"
|
#include "octa.hh"
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
|
|
||||||
#include "engine.hh"
|
#include <shared/cube.hh>
|
||||||
#include "mpr.hh"
|
#include "mpr.hh"
|
||||||
|
|
||||||
const int MAXCLIPOFFSET = 4;
|
const int MAXCLIPOFFSET = 4;
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#include "octarender.hh" // valist
|
#include "octarender.hh" // valist
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
|
|
||||||
#include "engine.hh"
|
#include <shared/cube.hh>
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
#include "texture.hh"
|
#include "texture.hh"
|
||||||
#include "water.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 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;
|
bool mesa = false, intel = false, amd = false, nvidia = false;
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
#include "texture.hh"
|
#include "texture.hh"
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
|
|
||||||
#include "engine.hh"
|
#include <shared/cube.hh>
|
||||||
|
|
||||||
#define CHANGE_SHADERS 0
|
#define CHANGE_SHADERS 0
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
#include "shader.hh"
|
#include "shader.hh"
|
||||||
#include "texture.hh"
|
#include "texture.hh"
|
||||||
|
|
||||||
#include "engine.hh"
|
#include <shared/cube.hh>
|
||||||
|
|
||||||
VAR(oqdynent, 0, 1, 1);
|
VAR(oqdynent, 0, 1, 1);
|
||||||
VAR(animationinterpolationtime, 0, 200, 1000);
|
VAR(animationinterpolationtime, 0, 200, 1000);
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#include "water.hh"
|
#include "water.hh"
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
|
|
||||||
#include "engine.hh"
|
#include <shared/cube.hh>
|
||||||
|
|
||||||
#if 0
|
#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);
|
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);
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#include "renderva.hh"
|
#include "renderva.hh"
|
||||||
#include "texture.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 };
|
static Texture *sky[6] = { 0, 0, 0, 0, 0, 0 }, *clouds[6] = { 0, 0, 0, 0, 0, 0 };
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#include "rendergl.hh" // xtraverts
|
#include "rendergl.hh" // xtraverts
|
||||||
#include "texture.hh"
|
#include "texture.hh"
|
||||||
|
|
||||||
#include "engine.hh"
|
#include <shared/cube.hh>
|
||||||
|
|
||||||
static hashnameset<font> fonts;
|
static hashnameset<font> fonts;
|
||||||
static font *fontdef = NULL;
|
static font *fontdef = NULL;
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#include "texture.hh"
|
#include "texture.hh"
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
|
|
||||||
#include "engine.hh"
|
#include <shared/cube.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)
|
||||||
{
|
{
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
#include "rendermodel.hh" // cleanupmodels
|
#include "rendermodel.hh" // cleanupmodels
|
||||||
#include "texture.hh"
|
#include "texture.hh"
|
||||||
|
|
||||||
#include "engine.hh"
|
#include <shared/cube.hh>
|
||||||
|
|
||||||
Shader *Shader::lastshader = NULL;
|
Shader *Shader::lastshader = NULL;
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
#include "texture.hh"
|
#include "texture.hh"
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
|
|
||||||
#include "engine.hh"
|
#include <shared/cube.hh>
|
||||||
|
|
||||||
struct stainvert
|
struct stainvert
|
||||||
{
|
{
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
#include "shader.hh"
|
#include "shader.hh"
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
|
|
||||||
#include "engine.hh"
|
#include <shared/cube.hh>
|
||||||
|
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
#include "SDL2_image/SDL_image.h"
|
#include "SDL2_image/SDL_image.h"
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#include "texture.hh"
|
#include "texture.hh"
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
|
|
||||||
#include "engine.hh"
|
#include <shared/cube.hh>
|
||||||
|
|
||||||
extern const vec matnormals[6];
|
extern const vec matnormals[6];
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
#include "worldio.hh"
|
#include "worldio.hh"
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
|
|
||||||
#include "engine.hh"
|
#include <shared/cube.hh>
|
||||||
|
|
||||||
VARNR(mapscale, worldscale, 1, 0, 0);
|
VARNR(mapscale, worldscale, 1, 0, 0);
|
||||||
VARNR(mapsize, worldsize, 1, 0, 0);
|
VARNR(mapsize, worldsize, 1, 0, 0);
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
#include "worldio.hh"
|
#include "worldio.hh"
|
||||||
|
|
||||||
#include "engine.hh"
|
#include <shared/cube.hh>
|
||||||
|
|
||||||
#define OCTAVERSION 33
|
#define OCTAVERSION 33
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue