diff options
| author | xolatile | 2025-08-04 22:53:42 +0200 |
|---|---|---|
| committer | xolatile | 2025-08-04 22:53:42 +0200 |
| commit | d309df4ce4d8ad0ed995a8e1c4267412a7782021 (patch) | |
| tree | 999ca8d785ecc1681e5eb7538ce2e6a18d244fa5 /src/engine/lightmap.h | |
| parent | 29d613d9cb65a0faa7e3f80e75bea0b6d910cb9a (diff) | |
| download | xolatile-badassbug-d309df4ce4d8ad0ed995a8e1c4267412a7782021.tar.xz xolatile-badassbug-d309df4ce4d8ad0ed995a8e1c4267412a7782021.tar.zst | |
Bunch of small changes...
Diffstat (limited to 'src/engine/lightmap.h')
| -rw-r--r-- | src/engine/lightmap.h | 146 |
1 files changed, 73 insertions, 73 deletions
diff --git a/src/engine/lightmap.h b/src/engine/lightmap.h index 005f1fe..2c09d0d 100644 --- a/src/engine/lightmap.h +++ b/src/engine/lightmap.h @@ -7,79 +7,79 @@ struct PackNode { - PackNode *child1, *child2; - ushort x, y, w, h; - int available; + PackNode *child1, *child2; + ushort x, y, w, h; + int available; - PackNode() : child1(0), child2(0), x(0), y(0), w(LM_PACKW), h(LM_PACKH), available(min(LM_PACKW, LM_PACKH)) {} - PackNode(ushort x, ushort y, ushort w, ushort h) : child1(0), child2(0), x(x), y(y), w(w), h(h), available(min(w, h)) {} + PackNode() : child1(0), child2(0), x(0), y(0), w(LM_PACKW), h(LM_PACKH), available(min(LM_PACKW, LM_PACKH)) {} + PackNode(ushort x, ushort y, ushort w, ushort h) : child1(0), child2(0), x(x), y(y), w(w), h(h), available(min(w, h)) {} - void clear() - { - DELETEP(child1); - DELETEP(child2); - } + void clear() + { + DELETEP(child1); + DELETEP(child2); + } - ~PackNode() - { - clear(); - } + ~PackNode() + { + clear(); + } - bool insert(ushort &tx, ushort &ty, ushort tw, ushort th); + bool insert(ushort &tx, ushort &ty, ushort tw, ushort th); }; enum { - LM_DIFFUSE = 0, - LM_BUMPMAP0, - LM_BUMPMAP1, - LM_TYPE = 0x0F, + LM_DIFFUSE = 0, + LM_BUMPMAP0, + LM_BUMPMAP1, + LM_TYPE = 0x0F, - LM_ALPHA = 1<<4, - LM_FLAGS = 0xF0 + LM_ALPHA = 1<<4, + LM_FLAGS = 0xF0 }; struct LightMap { - int type, bpp, tex, offsetx, offsety; - PackNode packroot; - uint lightmaps, lumels; - int unlitx, unlity; - uchar *data; - - LightMap() - : type(LM_DIFFUSE), bpp(3), tex(-1), offsetx(-1), offsety(-1), - lightmaps(0), lumels(0), unlitx(-1), unlity(-1), - data(NULL) - { - } - - ~LightMap() - { - if(data) delete[] data; - } - - void finalize() - { - packroot.clear(); - packroot.available = 0; - } - - void copy(ushort tx, ushort ty, uchar *src, ushort tw, ushort th); - bool insert(ushort &tx, ushort &ty, uchar *src, ushort tw, ushort th); + int type, bpp, tex, offsetx, offsety; + PackNode packroot; + uint lightmaps, lumels; + int unlitx, unlity; + uchar *data; + + LightMap() + : type(LM_DIFFUSE), bpp(3), tex(-1), offsetx(-1), offsety(-1), + lightmaps(0), lumels(0), unlitx(-1), unlity(-1), + data(NULL) + { + } + + ~LightMap() + { + if(data) delete[] data; + } + + void finalize() + { + packroot.clear(); + packroot.available = 0; + } + + void copy(ushort tx, ushort ty, uchar *src, ushort tw, ushort th); + bool insert(ushort &tx, ushort &ty, uchar *src, ushort tw, ushort th); }; extern vector<LightMap> lightmaps; struct LightMapTexture { - int w, h, type; - GLuint id; - int unlitx, unlity; + int w, h, type; + GLuint id; + int unlitx, unlity; - LightMapTexture() - : w(0), h(0), type(LM_DIFFUSE), id(0), unlitx(-1), unlity(-1) - {} + LightMapTexture() + : w(0), h(0), type(LM_DIFFUSE), id(0), unlitx(-1), unlity(-1) + {} }; extern vector<LightMapTexture> lightmaptexs; @@ -100,20 +100,20 @@ extern void previewblends(const ivec &bo, const ivec &bs); struct lerpvert { - vec normal; - vec2 tc; + vec normal; + vec2 tc; - bool operator==(const lerpvert &l) const { return tc == l.tc;; } - bool operator!=(const lerpvert &l) const { return tc != l.tc; } + bool operator==(const lerpvert &l) const { return tc == l.tc;; } + bool operator!=(const lerpvert &l) const { return tc != l.tc; } }; struct lerpbounds { - const lerpvert *min; - const lerpvert *max; - float u, ustep; - vec normal, nstep; - int winding; + const lerpvert *min; + const lerpvert *max; + float u, ustep; + vec normal, nstep; + int winding; }; extern void calcnormals(bool lerptjoints = false); @@ -124,17 +124,17 @@ extern void initlerpbounds(float u, float v, const lerpvert *lv, int numv, lerpb extern void lerpnormal(float u, float v, const lerpvert *lv, int numv, lerpbounds &start, lerpbounds &end, vec &normal, vec &nstep); #define CHECK_CALCLIGHT_PROGRESS_LOCKED(exit, show_calclight_progress, before, after) \ - if(check_calclight_progress) \ - { \ - if(!calclight_canceled) \ - { \ - before; \ - show_calclight_progress(); \ - check_calclight_canceled(); \ - after; \ - } \ - if(calclight_canceled) { exit; } \ - } + if(check_calclight_progress) \ + { \ + if(!calclight_canceled) \ + { \ + before; \ + show_calclight_progress(); \ + check_calclight_canceled(); \ + after; \ + } \ + if(calclight_canceled) { exit; } \ + } #define CHECK_CALCLIGHT_PROGRESS(exit, show_calclight_progress) CHECK_CALCLIGHT_PROGRESS_LOCKED(exit, show_calclight_progress, , ) extern bool calclight_canceled; |
