diff options
Diffstat (limited to 'src/engine/engine.h')
| -rw-r--r-- | src/engine/engine.h | 35 |
1 files changed, 4 insertions, 31 deletions
diff --git a/src/engine/engine.h b/src/engine/engine.h index 9f47209..e37ac4f 100644 --- a/src/engine/engine.h +++ b/src/engine/engine.h @@ -68,7 +68,6 @@ extern int texalign(const void *data, int w, int bpp); extern void cleanuptexture(Texture *t); extern uchar *loadalphamask(Texture *t); extern void loadlayermasks(); -extern Texture *cubemapload(const char *name, bool mipit = true, bool msg = true, bool transient = false); extern void loadshaders(); extern void setuptexparameters(int tnum, void *pixels, int clamp, int filter, GLenum format = GL_RGB, GLenum target = GL_TEXTURE_2D, bool swizzle = false); extern void createtexture(int tnum, int w, int h, void *pixels, int clamp, int filter, GLenum component = GL_RGB, GLenum target = GL_TEXTURE_2D, int pw = 0, int ph = 0, int pitch = 0, bool resize = true, GLenum format = GL_FALSE, bool swizzle = false); @@ -106,7 +105,7 @@ extern void guessshadowdir(); extern bool hasVAO, hasFBO, hasAFBO, hasDS, hasTF, hasTRG, hasTSW, hasS3TC, hasFXT1, hasLATC, hasRGTC, hasAF, hasFBB, hasUBO, hasMBR; extern int glversion, glslversion, glcompat; -enum { DRAWTEX_NONE = 0, DRAWTEX_ENVMAP, DRAWTEX_MINIMAP, DRAWTEX_MODELPREVIEW }; +enum { DRAWTEX_NONE = 0, DRAWTEX_MODELPREVIEW }; extern float curfov, fovy, aspect, forceaspect; extern int drawtex; @@ -184,7 +183,7 @@ extern bool flataxisface(const cube &c, int orient); extern bool collideface(const cube &c, int orient); extern int genclipplane(const cube &c, int i, vec *v, plane *clip); extern void genclipplanes(const cube &c, const ivec &co, int size, clipplanes &p, bool collide = true); -extern bool visibleface(const cube &c, int orient, const ivec &co, int size, ushort mat = MAT_AIR, ushort nmat = MAT_AIR, ushort matmask = MATF_VOLUME); +extern bool visibleface(const cube &c, int orient, const ivec &co, int size, ushort mat = MAT_AIR, ushort nmat = MAT_AIR, ushort matmask = 0); extern int classifyface(const cube &c, int orient, const ivec &co, int size); extern int visibletris(const cube &c, int orient, const ivec &co, int size, ushort nmat = MAT_ALPHA, ushort matmask = MAT_ALPHA); extern int visibleorient(const cube &c, int orient); @@ -194,7 +193,7 @@ extern void invalidatemerges(cube &c, const ivec &co, int size, bool msg); extern void calcmerges(); extern int mergefaces(int orient, facebounds *m, int sz); -extern void mincubeface(const cube &cu, int orient, const ivec &o, int size, const facebounds &orig, facebounds &cf, ushort nmat = MAT_AIR, ushort matmask = MATF_VOLUME); +extern void mincubeface(const cube &cu, int orient, const ivec &o, int size, const facebounds &orig, facebounds &cf, ushort nmat = MAT_AIR, ushort matmask = 0); static inline cubeext &ext(cube &c) { @@ -284,12 +283,7 @@ extern void rendermatgrid(materialsurface *matbuf, int matsurfs); extern int optimizematsurfs(materialsurface *matbuf, int matsurfs); extern void setupmaterials(int start = 0, int len = 0); extern void rendermaterials(); -extern int visiblematerial(const cube &c, int orient, const ivec &co, int size, ushort matmask = MATF_VOLUME); - -// depthfx -extern bool depthfxing; - -extern void drawdepthfxtex(); +extern int visiblematerial(const cube &c, int orient, const ivec &co, int size, ushort matmask = 0); // server extern vector<const char *> gameargs; @@ -462,27 +456,6 @@ extern void checkmapsounds(); extern void updatesounds(); extern void preloadmapsounds(); -// blendmap -extern int blendpaintmode; - -struct BlendMapCache; -extern BlendMapCache *newblendmapcache(); -extern void freeblendmapcache(BlendMapCache *&cache); -extern bool setblendmaporigin(BlendMapCache *cache, const ivec &o, int size); -extern bool hasblendmap(BlendMapCache *cache); -extern uchar lookupblendmap(BlendMapCache *cache, const vec &pos); -extern void resetblendmap(); -extern void enlargeblendmap(); -extern void shrinkblendmap(int octant); -extern void optimizeblendmap(); -extern void stoppaintblendmap(); -extern void trypaintblendmap(); -extern void renderblendbrush(GLuint tex, float x, float y, float w, float h); -extern void renderblendbrush(); -extern bool loadblendmap(stream *f, int info); -extern void saveblendmap(stream *f); -extern uchar shouldsaveblendmap(); - #endif #endif |