From 274faebccc54e3c30c2c16a4bd0e441c6aaa0191 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 13 May 2020 00:52:56 +0200 Subject: [PATCH] add header for stain --- src/engine/bih.cc | 1 + src/engine/engine.hh | 11 ----------- src/engine/main.cc | 1 + src/engine/renderlights.cc | 1 + src/engine/stain.cc | 3 ++- src/engine/stain.hh | 16 ++++++++++++++++ src/engine/world.cc | 1 + 7 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 src/engine/stain.hh diff --git a/src/engine/bih.cc b/src/engine/bih.cc index f1f225b..74ed6b4 100644 --- a/src/engine/bih.cc +++ b/src/engine/bih.cc @@ -1,3 +1,4 @@ +#include "stain.hh" #include "texture.hh" #include "engine.hh" diff --git a/src/engine/engine.hh b/src/engine/engine.hh index e5b7886..f455fa6 100644 --- a/src/engine/engine.hh +++ b/src/engine/engine.hh @@ -320,17 +320,6 @@ extern void renderparticles(int layer = PL_ALL); extern bool printparticles(extentity &e, char *buf, int len); extern void cleanupparticles(); -// stain -enum { STAINBUF_OPAQUE = 0, STAINBUF_TRANSPARENT, STAINBUF_MAPMODEL, NUMSTAINBUFS }; - -struct stainrenderer; - -extern void initstains(); -extern void clearstains(); -extern bool renderstains(int sbuf, bool gbuf, int layer = 0); -extern void cleanupstains(); -extern void genstainmmtri(stainrenderer *s, const vec v[3]); - #endif #endif diff --git a/src/engine/main.cc b/src/engine/main.cc index d20a3d5..036313a 100644 --- a/src/engine/main.cc +++ b/src/engine/main.cc @@ -7,6 +7,7 @@ #include "rendertext.hh" #include "renderva.hh" #include "shader.hh" +#include "stain.hh" #include "texture.hh" #include "world.hh" diff --git a/src/engine/renderlights.cc b/src/engine/renderlights.cc index a531b83..a0c5788 100644 --- a/src/engine/renderlights.cc +++ b/src/engine/renderlights.cc @@ -5,6 +5,7 @@ #include "rendergl.hh" #include "rendersky.hh" #include "renderva.hh" +#include "stain.hh" #include "texture.hh" #include "world.hh" diff --git a/src/engine/stain.cc b/src/engine/stain.cc index 41e904d..375d4c6 100644 --- a/src/engine/stain.cc +++ b/src/engine/stain.cc @@ -1,5 +1,6 @@ #include "material.hh" #include "rendergl.hh" +#include "stain.hh" #include "texture.hh" #include "engine.hh" @@ -748,7 +749,7 @@ struct stainrenderer } }; -stainrenderer stains[] = +static stainrenderer stains[] = { stainrenderer("media/particle/blood.png", SF_RND4|SF_ROTATE|SF_INVMOD), stainrenderer("media/particle/pulse_scorch.png", SF_ROTATE, 500), diff --git a/src/engine/stain.hh b/src/engine/stain.hh new file mode 100644 index 0000000..88afbfc --- /dev/null +++ b/src/engine/stain.hh @@ -0,0 +1,16 @@ +#ifndef ENGINE_STAIN_HH +#define ENGINE_STAIN_HH + +#include + +enum { STAINBUF_OPAQUE = 0, STAINBUF_TRANSPARENT, STAINBUF_MAPMODEL, NUMSTAINBUFS }; + +struct stainrenderer; + +void initstains(); +void clearstains(); +bool renderstains(int sbuf, bool gbuf, int layer = 0); +void cleanupstains(); +void genstainmmtri(stainrenderer *s, const vec v[3]); + +#endif diff --git a/src/engine/world.cc b/src/engine/world.cc index 2432ffb..89c9f0e 100644 --- a/src/engine/world.cc +++ b/src/engine/world.cc @@ -4,6 +4,7 @@ #include "octa.hh" #include "rendergl.hh" /* fovy */ #include "renderlights.hh" +#include "stain.hh" #include "texture.hh" #include "worldio.hh" #include "world.hh"