ref: f26532262b2b4be02666cd015fd13ec1d661abe3
parent: e7c5e21800899bc725cf85d5c1e766ddc3efc187
author: Sigrid Solveig Haflínudóttir <sigrid@ftrv.se>
date: Mon Jul 22 16:07:38 EDT 2024
add v_brightness, v_saturation and v_lightness, even though they do not update dynamically
--- a/common.c
+++ b/common.c
@@ -9,8 +9,11 @@
void
pal3torgbx(byte *in, pixel_t *out, int n, byte *pal, int palsz)
{- int x;
+ int x, n0;
+ pixel_t *out0;
+ out0 = out;
+ n0 = n;
palsz *= 3;
if(in < (byte*)out || in > (byte*)(out+n) || in+n < (byte*)out){ while(n-- > 0){@@ -27,11 +30,17 @@
out[n] = 0xff<<24 | pal[x+0]<<16 | pal[x+1]<<8 | pal[x+2];
}
}
+ PixTransform(out0, n0);
}
void
paltorgbx(byte *in, pixel_t *out, int n, pixel_t *pal)
{+ pixel_t *out0;
+ int n0;
+
+ out0 = out;
+ n0 = n;
if(in < (byte*)out || in > (byte*)(out+n) || in+n < (byte*)out){while(n-- > 0)
*out++ = pal[*in++];
@@ -39,6 +48,7 @@
while(n-- > 0)
out[n] = pal[in[n]];
}
+ PixTransform(out0, n0);
}
void
--- /dev/null
+++ b/hsluv.c
@@ -1,0 +1,461 @@
+/*
+ * HSLuv-C: Human-friendly HSL
+ * <http://github.com/hsluv/hsluv-c>
+ * <http://www.hsluv.org/>
+ *
+ * Copyright (c) 2015 Alexei Boronine (original idea, JavaScript implementation)
+ * Copyright (c) 2015 Roger Tallada (Obj-C implementation)
+ * Copyright (c) 2017 Martin Mitas (C implementation, based on Obj-C implementation)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "quakedef.h"
+#include "hsluv.h"
+#ifdef __plan9__
+#define DBL_MAX 1.797693134862315708145e+308
+#define cbrt(x) pow((x), 1.0/3.0)
+#else
+#include <float.h>
+#endif
+
+typedef struct Triplet_tag Triplet;
+struct Triplet_tag {+ double a;
+ double b;
+ double c;
+};
+
+/* for RGB */
+static const Triplet m[3] = {+ { 3.24096994190452134377, -1.53738317757009345794, -0.49861076029300328366 },+ { -0.96924363628087982613, 1.87596750150772066772, 0.04155505740717561247 },+ { 0.05563007969699360846, -0.20397695888897656435, 1.05697151424287856072 }+};
+
+/* for XYZ */
+static const Triplet m_inv[3] = {+ { 0.41239079926595948129, 0.35758433938387796373, 0.18048078840183428751 },+ { 0.21263900587151035754, 0.71516867876775592746, 0.07219231536073371500 },+ { 0.01933081871559185069, 0.11919477979462598791, 0.95053215224966058086 }+};
+
+static const double ref_u = 0.19783000664283680764;
+static const double ref_v = 0.46831999493879100370;
+
+static const double kappa = 903.29629629629629629630;
+static const double epsilon = 0.00885645167903563082;
+
+
+typedef struct Bounds_tag Bounds;
+struct Bounds_tag {+ double a;
+ double b;
+};
+
+
+static void
+get_bounds(double l, Bounds bounds[6])
+{+ double tl = l + 16.0;
+ double sub1 = (tl * tl * tl) / 1560896.0;
+ double sub2 = (sub1 > epsilon ? sub1 : (l / kappa));
+ int channel;
+ int t;
+
+ for(channel = 0; channel < 3; channel++) {+ double m1 = m[channel].a;
+ double m2 = m[channel].b;
+ double m3 = m[channel].c;
+
+ for (t = 0; t < 2; t++) {+ double top1 = (284517.0 * m1 - 94839.0 * m3) * sub2;
+ double top2 = (838422.0 * m3 + 769860.0 * m2 + 731718.0 * m1) * l * sub2 - 769860.0 * t * l;
+ double bottom = (632260.0 * m3 - 126452.0 * m2) * sub2 + 126452.0 * t;
+
+ bounds[channel * 2 + t].a = top1 / bottom;
+ bounds[channel * 2 + t].b = top2 / bottom;
+ }
+ }
+}
+
+static double
+intersect_line_line(const Bounds* line1, const Bounds* line2)
+{+ return (line1->b - line2->b) / (line2->a - line1->a);
+}
+
+static double
+dist_from_pole_squared(double x, double y)
+{+ return x * x + y * y;
+}
+
+static double
+ray_length_until_intersect(double theta, const Bounds* line)
+{+ return line->b / (sin(theta) - line->a * cos(theta));
+}
+
+static double
+max_safe_chroma_for_l(double l)
+{+ double min_len_squared = DBL_MAX;
+ Bounds bounds[6];
+ int i;
+
+ get_bounds(l, bounds);
+ for(i = 0; i < 6; i++) {+ double m1 = bounds[i].a;
+ double b1 = bounds[i].b;
+ /* x where line intersects with perpendicular running though (0, 0) */
+ Bounds line2 = { -1.0 / m1, 0.0 };+ double x = intersect_line_line(&bounds[i], &line2);
+ double distance = dist_from_pole_squared(x, b1 + x * m1);
+
+ if(distance < min_len_squared)
+ min_len_squared = distance;
+ }
+
+ return sqrt(min_len_squared);
+}
+
+static double
+max_chroma_for_lh(double l, double h)
+{+ double min_len = DBL_MAX;
+ double hrad = h * 0.01745329251994329577; /* (2 * pi / 360) */
+ Bounds bounds[6];
+ int i;
+
+ get_bounds(l, bounds);
+ for(i = 0; i < 6; i++) {+ double len = ray_length_until_intersect(hrad, &bounds[i]);
+
+ if(len >= 0 && len < min_len)
+ min_len = len;
+ }
+ return min_len;
+}
+
+static double
+dot_product(const Triplet* t1, const Triplet* t2)
+{+ return (t1->a * t2->a + t1->b * t2->b + t1->c * t2->c);
+}
+
+/* Used for rgb conversions */
+static double
+from_linear(double c)
+{+ if(c <= 0.0031308)
+ return 12.92 * c;
+ else
+ return 1.055 * pow(c, 1.0 / 2.4) - 0.055;
+}
+
+static double
+to_linear(double c)
+{+ if (c > 0.04045)
+ return pow((c + 0.055) / 1.055, 2.4);
+ else
+ return c / 12.92;
+}
+
+static void
+xyz2rgb(Triplet* in_out)
+{+ double r = from_linear(dot_product(&m[0], in_out));
+ double g = from_linear(dot_product(&m[1], in_out));
+ double b = from_linear(dot_product(&m[2], in_out));
+ in_out->a = r;
+ in_out->b = g;
+ in_out->c = b;
+}
+
+static void
+rgb2xyz(Triplet* in_out)
+{+ Triplet rgbl = { to_linear(in_out->a), to_linear(in_out->b), to_linear(in_out->c) };+ double x = dot_product(&m_inv[0], &rgbl);
+ double y = dot_product(&m_inv[1], &rgbl);
+ double z = dot_product(&m_inv[2], &rgbl);
+ in_out->a = x;
+ in_out->b = y;
+ in_out->c = z;
+}
+
+/* http://en.wikipedia.org/wiki/CIELUV
+ * In these formulas, Yn refers to the reference white point. We are using
+ * illuminant D65, so Yn (see refY in Maxima file) equals 1. The formula is
+ * simplified accordingly.
+ */
+static double
+y2l(double y)
+{+ if(y <= epsilon)
+ return y * kappa;
+ else
+ return 116.0 * cbrt(y) - 16.0;
+}
+
+static double
+l2y(double l)
+{+ if(l <= 8.0) {+ return l / kappa;
+ } else {+ double x = (l + 16.0) / 116.0;
+ return (x * x * x);
+ }
+}
+
+static void
+xyz2luv(Triplet* in_out)
+{+ double l = y2l(in_out->b);
+ double var_u = 4.0 * in_out->a;
+ double var_v = 9.0 * in_out->b;
+ double div = (in_out->a + (15.0 * in_out->b) + (3.0 * in_out->c));
+ if (div > 0.00000001) {+ var_u /= div;
+ var_v /= div;
+ }
+ double u = 13.0 * l * (var_u - ref_u);
+ double v = 13.0 * l * (var_v - ref_v);
+
+ in_out->a = l;
+ if(l < 0.00000001) {+ in_out->b = 0.0;
+ in_out->c = 0.0;
+ } else {+ in_out->b = u;
+ in_out->c = v;
+ }
+}
+
+static void
+luv2xyz(Triplet* in_out)
+{+ if(in_out->a <= 0.00000001) {+ /* Black will create a divide-by-zero error. */
+ in_out->a = 0.0;
+ in_out->b = 0.0;
+ in_out->c = 0.0;
+ return;
+ }
+
+ double var_u = in_out->b / (13.0 * in_out->a) + ref_u;
+ double var_v = in_out->c / (13.0 * in_out->a) + ref_v;
+ double y = l2y(in_out->a);
+ double x = -(9.0 * y * var_u) / ((var_u - 4.0) * var_v - var_u * var_v);
+ double z = (9.0 * y - (15.0 * var_v * y) - (var_v * x)) / (3.0 * var_v);
+ in_out->a = x;
+ in_out->b = y;
+ in_out->c = z;
+}
+
+static void
+luv2lch(Triplet* in_out)
+{+ double l = in_out->a;
+ double u = in_out->b;
+ double v = in_out->c;
+ double h;
+ double c = sqrt(u * u + v * v);
+
+ /* Grays: disambiguate hue */
+ if(c < 0.00000001) {+ h = 0;
+ } else {+ h = atan2(v, u) * 57.29577951308232087680; /* (180 / pi) */
+ if(h < 0.0)
+ h += 360.0;
+ }
+
+ in_out->a = l;
+ in_out->b = c;
+ in_out->c = h;
+}
+
+static void
+lch2luv(Triplet* in_out)
+{+ double hrad = in_out->c * 0.01745329251994329577; /* (pi / 180.0) */
+ double u = cos(hrad) * in_out->b;
+ double v = sin(hrad) * in_out->b;
+
+ in_out->b = u;
+ in_out->c = v;
+}
+
+static void
+hsluv2lch(Triplet* in_out)
+{+ double h = in_out->a;
+ double s = in_out->b;
+ double l = in_out->c;
+ double c;
+
+ /* White and black: disambiguate chroma */
+ if(l > 99.9999999 || l < 0.00000001)
+ c = 0.0;
+ else
+ c = max_chroma_for_lh(l, h) / 100.0 * s;
+
+ /* Grays: disambiguate hue */
+ if (s < 0.00000001)
+ h = 0.0;
+
+ in_out->a = l;
+ in_out->b = c;
+ in_out->c = h;
+}
+
+static void
+lch2hsluv(Triplet* in_out)
+{+ double l = in_out->a;
+ double c = in_out->b;
+ double h = in_out->c;
+ double s;
+
+ /* White and black: disambiguate saturation */
+ if(l > 99.9999999 || l < 0.00000001)
+ s = 0.0;
+ else
+ s = c / max_chroma_for_lh(l, h) * 100.0;
+
+ /* Grays: disambiguate hue */
+ if (c < 0.00000001)
+ h = 0.0;
+
+ in_out->a = h;
+ in_out->b = s;
+ in_out->c = l;
+}
+
+static void
+hpluv2lch(Triplet* in_out)
+{+ double h = in_out->a;
+ double s = in_out->b;
+ double l = in_out->c;
+ double c;
+
+ /* White and black: disambiguate chroma */
+ if(l > 99.9999999 || l < 0.00000001)
+ c = 0.0;
+ else
+ c = max_safe_chroma_for_l(l) / 100.0 * s;
+
+ /* Grays: disambiguate hue */
+ if (s < 0.00000001)
+ h = 0.0;
+
+ in_out->a = l;
+ in_out->b = c;
+ in_out->c = h;
+}
+
+static void
+lch2hpluv(Triplet* in_out)
+{+ double l = in_out->a;
+ double c = in_out->b;
+ double h = in_out->c;
+ double s;
+
+ /* White and black: disambiguate saturation */
+ if (l > 99.9999999 || l < 0.00000001)
+ s = 0.0;
+ else
+ s = c / max_safe_chroma_for_l(l) * 100.0;
+
+ /* Grays: disambiguate hue */
+ if (c < 0.00000001)
+ h = 0.0;
+
+ in_out->a = h;
+ in_out->b = s;
+ in_out->c = l;
+}
+
+
+
+void
+hsluv2rgb(double h, double s, double l, double* pr, double* pg, double* pb)
+{+ Triplet tmp = { h, s, l };+
+ hsluv2lch(&tmp);
+ lch2luv(&tmp);
+ luv2xyz(&tmp);
+ xyz2rgb(&tmp);
+
+ *pr = tmp.a;
+ *pg = tmp.b;
+ *pb = tmp.c;
+}
+
+void
+hpluv2rgb(double h, double s, double l, double* pr, double* pg, double* pb)
+{+ Triplet tmp = { h, s, l };+
+ hpluv2lch(&tmp);
+ lch2luv(&tmp);
+ luv2xyz(&tmp);
+ xyz2rgb(&tmp);
+
+ *pr = tmp.a;
+ *pg = tmp.b;
+ *pb = tmp.c;
+}
+
+void
+rgb2hsluv(double r, double g, double b, double* ph, double* ps, double* pl)
+{+ Triplet tmp = { r, g, b };+
+ rgb2xyz(&tmp);
+ xyz2luv(&tmp);
+ luv2lch(&tmp);
+ lch2hsluv(&tmp);
+
+ *ph = tmp.a;
+ *ps = tmp.b;
+ *pl = tmp.c;
+}
+
+void
+rgb2hpluv(double r, double g, double b, double* ph, double* ps, double* pl)
+{+ Triplet tmp = { r, g, b };+
+ rgb2xyz(&tmp);
+ xyz2luv(&tmp);
+ luv2lch(&tmp);
+ lch2hpluv(&tmp);
+
+ *ph = tmp.a;
+ *ps = tmp.b;
+ *pl = tmp.c;
+}
--- /dev/null
+++ b/hsluv.h
@@ -1,0 +1,90 @@
+/*
+ * HSLuv-C: Human-friendly HSL
+ * <http://github.com/hsluv/hsluv-c>
+ * <http://www.hsluv.org/>
+ *
+ * Copyright (c) 2015 Alexei Boronine (original idea, JavaScript implementation)
+ * Copyright (c) 2015 Roger Tallada (Obj-C implementation)
+ * Copyright (c) 2017 Martin Mitas (C implementation, based on Obj-C implementation)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#ifndef HSLUV_H
+#define HSLUV_H
+
+#ifdef __cplusplus
+extern "C" {+#endif
+
+
+/**
+ * Convert HSLuv to RGB.
+ *
+ * @param h Hue. Between 0.0 and 360.0.
+ * @param s Saturation. Between 0.0 and 100.0.
+ * @param l Lightness. Between 0.0 and 100.0.
+ * @param[out] pr Red component. Between 0.0 and 1.0.
+ * @param[out] pg Green component. Between 0.0 and 1.0.
+ * @param[out] pb Blue component. Between 0.0 and 1.0.
+ */
+void hsluv2rgb(double h, double s, double l, double* pr, double* pg, double* pb);
+
+/**
+ * Convert RGB to HSLuv.
+ *
+ * @param r Red component. Between 0.0 and 1.0.
+ * @param g Green component. Between 0.0 and 1.0.
+ * @param b Blue component. Between 0.0 and 1.0.
+ * @param[out] ph Hue. Between 0.0 and 360.0.
+ * @param[out] ps Saturation. Between 0.0 and 100.0.
+ * @param[out] pl Lightness. Between 0.0 and 100.0.
+ */
+void rgb2hsluv(double r, double g, double b, double* ph, double* ps, double* pl);
+
+/**
+ * Convert HPLuv to RGB.
+ *
+ * @param h Hue. Between 0.0 and 360.0.
+ * @param s Saturation. Between 0.0 and 100.0.
+ * @param l Lightness. Between 0.0 and 100.0.
+ * @param[out] pr Red component. Between 0.0 and 1.0.
+ * @param[out] pg Green component. Between 0.0 and 1.0.
+ * @param[out] pb Blue component. Between 0.0 and 1.0.
+ */
+void hpluv2rgb(double h, double s, double l, double* pr, double* pg, double* pb);
+
+/**
+ * Convert RGB to HPLuv.
+ *
+ * @param r Red component. Between 0.0 and 1.0.
+ * @param g Green component. Between 0.0 and 1.0.
+ * @param b Blue component. Between 0.0 and 1.0.
+ * @param[out] ph Hue. Between 0.0 and 360.0.
+ * @param[out] ps Saturation. Between 0.0 and 100.0.
+ * @param[out] pl Lightness. Between 0.0 and 100.0.
+ */
+void rgb2hpluv(double r, double g, double b, double* ph, double* ps, double* pl);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* HSLUV_H */
--- a/i_external.c
+++ b/i_external.c
@@ -33,6 +33,7 @@
return nil;
}
n = q->width * q->height;
+ PixTransform(q->pixels, n);
tx = Hunk_Alloc(sizeof(*tx) + n*85/64*sizeof(pixel_t));
strncpy(tx->name, name, sizeof(tx->name)-1);
tx->name[sizeof(tx->name)-1] = 0;
--- a/i_tga.c
+++ b/i_tga.c
@@ -155,8 +155,9 @@
*p++ = h & 0xff; *p++ = h>>8; /* h */
*p++ = 24; /* bpp */
*p++ = FlagOriginTop; /* flags */
- if(id != nil)
+ if(id != nil){memmove(p, id, n); p += n; /* id */
+ }
n = w * h;
for(i = 0; i < n; i++){*p++ = pix[i] >> 0;
--- /dev/null
+++ b/i_transform.c
@@ -1,0 +1,84 @@
+#include "quakedef.h"
+#include "hsluv.h"
+
+#define transform() \
+ do { \+ if(sa != 1.0 || li != 1.0){ \+ rgb2hsluv(r, g, b, &h, &s, &l); \
+ s *= sa; \
+ if(s > 100.0) \
+ s = 100.0; \
+ l *= li; \
+ if(l > 100.0) \
+ l = 100.0; \
+ hsluv2rgb(h, s, l, &r, &g, &b); \
+ } \
+ if(br != 0){ \+ r *= br; \
+ g *= br; \
+ b *= br; \
+ } \
+ if(r > 1) r = 1; else if(r < 0) r = 0; \
+ if(g > 1) g = 1; else if(g < 0) g = 0; \
+ if(b > 1) b = 1; else if(b < 0) b = 0; \
+ }while(0)
+
+void
+LightTransform(u8int *p, int n)
+{+ double h, s, l, r, g, b, sa, li, br;
+ int i;
+
+ sa = v_saturation.value;
+ li = v_lightness.value;
+ br = v_brightness.value;
+ if(sa == 1.0 && li == 1.0 && br == 1.0)
+ return;
+
+ for(i = 0; i < n; i++, p += 3){+ r = (double)p[0]/255.0;
+ g = (double)p[1]/255.0;
+ b = (double)p[2]/255.0;
+ transform();
+ p[0] = r*255;
+ p[1] = g*255;
+ p[2] = b*255;
+ }
+}
+
+void
+PixTransform(pixel_t *pixels, int n)
+{+ double h, s, l, r, g, b, sa, li, br;
+ pixel_t p, in, out;
+ int i;
+
+ sa = v_saturation.value;
+ li = v_lightness.value;
+ br = v_brightness.value;
+ if(sa == 1.0 && li == 1.0 && br == 1.0)
+ return;
+
+ in = 0;
+ for(i = 0; i < n; i++){+ p = pixels[i];
+ if(p == 0)
+ continue;
+ if(p == in && i > 0){+ pixels[i] = out;
+ continue;
+ }
+
+ in = p;
+ r = (double)((p>>16) & 0xff)/255.0;
+ g = (double)((p>> 8) & 0xff)/255.0;
+ b = (double)((p>> 0) & 0xff)/255.0;
+ transform();
+ out =
+ (in & (0xff<<24)) |
+ (pixel_t)(r * 255)<<16 |
+ (pixel_t)(g * 255)<< 8 |
+ (pixel_t)(b * 255)<< 0;
+ pixels[i] = out;
+ }
+}
--- /dev/null
+++ b/i_transform.h
@@ -1,0 +1,2 @@
+void LightTransform(u8int *p, int n);
+void PixTransform(pixel_t *pixels, int n);
--- a/i_wad.c
+++ b/i_wad.c
@@ -160,8 +160,10 @@
W_ReadPixelsAt(Wad *wad, char *name, int off, int sz, pixel_t *out, int num)
{int n, palsz, x, fb;
+ pixel_t *out0;
byte *t, *pal;
+ out0 = out;
num = min(num, sz);
num = min(num, wad->sz-off);
t = wad->in + off;
@@ -190,6 +192,7 @@
*out = ((fb && x >= palsz-32*3) ? 0 : 0xff)<<24 | pal[x+0]<<16 | pal[x+1]<<8 | pal[x+2];
}
}
+ PixTransform(out0, num);
return num;
err:
return -1;
--- a/meson.build
+++ b/meson.build
@@ -49,9 +49,11 @@
'fs.c',
'host.c',
'host_cmd.c',
+ 'hsluv.c',
'i_external.c',
'i_resize.c',
'i_tga.c',
+ 'i_transform.c',
'i_wad.c',
'keys.c',
'm_random.c',
--- a/model_bsp.c
+++ b/model_bsp.c
@@ -266,6 +266,7 @@
if((lit = loadhunklmp(s, &litsz)) != nil && litsz >= 4+4+sz*3){ if(memcmp(lit, "QLIT", 4) == 0 && lit[4] == 1 && lit[5] == 0 && lit[6] == 0 && lit[7] == 0){mod->lightdata = lit + 8;
+ LightTransform(mod->lightdata, sz);
return 0;
}else{ Con_Printf("%s: invalid/unsupported LIT file\n", s);@@ -280,6 +281,7 @@
mod->lightdata[i*3+1] = in[i];
mod->lightdata[i*3+2] = in[i];
}
+ LightTransform(mod->lightdata, sz);
return 0;
}
--- a/model_bsp30.c
+++ b/model_bsp30.c
@@ -48,6 +48,7 @@
}
memcpy(mod->lightdata = Hunk_Alloc(sz), in, sz);
+ LightTransform(mod->lightdata, sz);
return 0;
}
--- a/model_sprite.c
+++ b/model_sprite.c
@@ -36,6 +36,7 @@
}else if(mod->ver == SPRITE32_VERSION){for(i = 0; i < size; i++, in += sizeof(pixel_t))
pspriteframe->pixels[i] = in[3] == 0 ? 0 : (in[3]<<24 | in[0]<<16 | in[1]<<8 | in[2]);
+ PixTransform(pspriteframe->pixels, size);
mod->blend = true;
}
--- a/quakedef.h
+++ b/quakedef.h
@@ -141,6 +141,7 @@
#include "i_tga.h"
#include "i_wad.h"
+#include "i_transform.h"
#include "draw.h"
#include "screen.h"
#include "net.h"
--- a/view.c
+++ b/view.c
@@ -12,6 +12,9 @@
cvar_t lcd_x = {"lcd_x","0"}; cvar_t v_scale = {"v_scale", "1", true};+cvar_t v_saturation = {"v_saturation", "1", true};+cvar_t v_lightness = {"v_lightness", "1", true};+cvar_t v_brightness = {"v_brightness", "1", true}; static cvar_t lcd_yaw = {"lcd_yaw","0"};@@ -969,6 +972,9 @@
Cvar_RegisterVariable(&v_scale);
v_scale.cb = v_scale_cb;
+ Cvar_RegisterVariable(&v_saturation);
+ Cvar_RegisterVariable(&v_lightness);
+ Cvar_RegisterVariable(&v_brightness);
Cvar_RegisterVariable (&lcd_x);
Cvar_RegisterVariable (&lcd_yaw);
--- a/view.h
+++ b/view.h
@@ -5,6 +5,9 @@
extern cvar_t lcd_x;
extern cvar_t v_scale;
+extern cvar_t v_saturation;
+extern cvar_t v_lightness;
+extern cvar_t v_brightness;
void V_Init (void);
void V_RenderView (void);
--
⑨