ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.279 by root, Thu Oct 2 15:59:40 2008 UTC vs.
Revision 1.294 by root, Sat Dec 19 05:06:56 2009 UTC

… …
81#define expect_false(expr) expect ((expr) != 0, 0) 81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1) 82#define expect_true(expr) expect ((expr) != 0, 1)
83 83
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 85
86#define FOW_DARKNESS 32 86#define FOW_DARKNESS 64
87#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */
87 88
88#define MAP_EXTEND_X 32 89#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 90#define MAP_EXTEND_Y 512
90 91
91#define MIN_FONT_HEIGHT 10 92#define MIN_FONT_HEIGHT 10
92 93
93/* mask out modifiers we are not interested in */ 94/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 95#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
95 96
96#define KMOD_LRAM 0x10000 // our extension 97#define KMOD_LRAM 0x10000 // our extension
98
99#define TEXID_SPEECH 1
100#define TEXID_NOFACE 2
101#define TEXID_HIDDEN 3
97 102
98static AV *texture_av; 103static AV *texture_av;
99 104
100static struct 105static struct
101{ 106{
… …
233 int w, h; 238 int w, h;
234 float s, t; 239 float s, t;
235 uint8_t r, g, b, a; 240 uint8_t r, g, b, a;
236 tileid smoothtile; 241 tileid smoothtile;
237 uint8_t smoothlevel; 242 uint8_t smoothlevel;
243 uint8_t unused; /* set to zero on use */
238} maptex; 244} maptex;
239 245
240typedef struct { 246typedef struct {
241 uint32_t player; 247 uint32_t player;
242 tileid tile[3]; 248 tileid tile[3];
… …
1206#if DEBUG 1212#if DEBUG
1207 VALGRIND_DO_LEAK_CHECK; 1213 VALGRIND_DO_LEAK_CHECK;
1208#endif 1214#endif
1209} 1215}
1210 1216
1217int
1218SvREFCNT (SV *sv)
1219 CODE:
1220 RETVAL = SvREFCNT (sv);
1221 OUTPUT:
1222 RETVAL
1223
1211MODULE = Deliantra::Client PACKAGE = DC::Font 1224MODULE = Deliantra::Client PACKAGE = DC::Font
1212 1225
1213PROTOTYPES: DISABLE 1226PROTOTYPES: DISABLE
1214 1227
1215DC::Font 1228DC::Font
… …
1644 if (ix) 1657 if (ix)
1645 { 1658 {
1646 glDisable (GL_ALPHA_TEST); 1659 glDisable (GL_ALPHA_TEST);
1647 glDisable (GL_BLEND); 1660 glDisable (GL_BLEND);
1648 } 1661 }
1662}
1663
1664void
1665draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f)
1666 PROTOTYPE: @
1667 CODE:
1668{
1669 glEnable (GL_TEXTURE_2D);
1670 glEnable (GL_BLEND);
1671 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672 glBindTexture (GL_TEXTURE_2D, name1);
1673
1674 glColor3f (intensity, intensity, intensity);
1675 glPushMatrix ();
1676 glScalef (1./3, 1./3, 1.);
1677
1678 if (blend > 0.f)
1679 {
1680 float S2, T2; /* 0. 0. for texture 2 */
1681 float w = w1 > w2 ? w1 : w2;
1682 float h = h1 > h2 ? h1 : h2;
1683 GLfloat env_color[4] = { 0., 0., 0., blend };
1684
1685 /* interpolate the two shadow textures */
1686 /* stage 0 == rgb(glcolor) + alpha(t0) */
1687 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1688
1689 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1690 gl.ActiveTexture (GL_TEXTURE1);
1691 glEnable (GL_TEXTURE_2D);
1692 glBindTexture (GL_TEXTURE_2D, name2);
1693 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1694
1695 /* rgb == rgb(glcolor) */
1696 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1697 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1699
1700 /* alpha = interpolate t0, t1 by env_alpha */
1701 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1702
1703 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1704 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1705 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1706
1707 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1708 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1709
1710 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1711 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1712
1713 s1 *= w / w1;
1714 t1 *= h / h1;
1715
1716 dx *= -3.f / w2;
1717 dy *= -3.f / h2;
1718 dx *= w / w2;
1719 dy *= h / h2;
1720
1721 s2 *= w / w2;
1722 t2 *= h / h2;
1723
1724 glBegin (GL_QUADS);
1725 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0);
1726 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1);
1727 gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1);
1728 gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0);
1729 glEnd ();
1730
1731 glDisable (GL_TEXTURE_2D);
1732 gl.ActiveTexture (GL_TEXTURE0);
1733 }
1734 else
1735 {
1736 /* simple blending of one texture, also opengl <1.3 path */
1737 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1738
1739 glBegin (GL_QUADS);
1740 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);
1741 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);
1742 glTexCoord2f (s1, t1); glVertex2f (w1, h1);
1743 glTexCoord2f (s1, 0); glVertex2f (w1, 0);
1744 glEnd ();
1745 }
1746
1747 glPopMatrix ();
1748
1749 glDisable (GL_TEXTURE_2D);
1750 glDisable (GL_BLEND);
1649} 1751}
1650 1752
1651IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1753IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1652 CODE: 1754 CODE:
1653{ 1755{
… …
1759 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1861 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1760 // use uglier nearest interpolation because linear suffers 1862 // use uglier nearest interpolation because linear suffers
1761 // from transparent color bleeding and ugly wrapping effects. 1863 // from transparent color bleeding and ugly wrapping effects.
1762 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1864 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1763} 1865}
1866
1867void
1868expire_textures (DC::Map self, int texid, int count)
1869 PPCODE:
1870 for (; texid < self->texs && count; ++texid, --count)
1871 {
1872 maptex *tex = self->tex + texid;
1873
1874 if (tex->name)
1875 {
1876 if (tex->unused)
1877 {
1878 tex->name = 0;
1879 tex->unused = 0;
1880 XPUSHs (sv_2mortal (newSViv (texid)));
1881 }
1882 else
1883 tex->unused = 1;
1884 }
1885 }
1764 1886
1765int 1887int
1766ox (DC::Map self) 1888ox (DC::Map self)
1767 ALIAS: 1889 ALIAS:
1768 oy = 1 1890 oy = 1
… …
1889 cell->tile [z] = self->face2tile [face]; 2011 cell->tile [z] = self->face2tile [face];
1890 2012
1891 if (cell->tile [z]) 2013 if (cell->tile [z])
1892 { 2014 {
1893 maptex *tex = self->tex + cell->tile [z]; 2015 maptex *tex = self->tex + cell->tile [z];
2016 tex->unused = 0;
1894 if (!tex->name) 2017 if (!tex->name)
1895 av_push (missing, newSViv (cell->tile [z])); 2018 av_push (missing, newSViv (cell->tile [z]));
1896 2019
1897 if (tex->smoothtile) 2020 if (tex->smoothtile)
1898 { 2021 {
1899 maptex *smooth = self->tex + tex->smoothtile; 2022 maptex *smooth = self->tex + tex->smoothtile;
2023 smooth->unused = 0;
1900 if (!smooth->name) 2024 if (!smooth->name)
1901 av_push (missing, newSViv (tex->smoothtile)); 2025 av_push (missing, newSViv (tex->smoothtile));
1902 } 2026 }
1903 } 2027 }
1904 } 2028 }
… …
1975 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2099 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1976 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2100 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1977 smooth_key skey; 2101 smooth_key skey;
1978 int pl_x, pl_y; 2102 int pl_x, pl_y;
1979 maptex pl_tex; 2103 maptex pl_tex;
1980 rc_t *rc = rc_alloc (); 2104 rc_t *rc = rc_alloc ();
2105 rc_t *rc_ov = rc_alloc ();
1981 rc_key_t key; 2106 rc_key_t key;
1982 rc_array_t *arr; 2107 rc_array_t *arr, *arr_hidden;
1983 2108
1984 pl_tex.name = 0; 2109 pl_tex.name = 0;
1985 2110
1986 // thats current max. sorry. 2111 // that's current max. sorry.
1987 if (sw > 255) sw = 255; 2112 if (sw > 255) sw = 255;
1988 if (sh > 255) sh = 255; 2113 if (sh > 255) sh = 255;
1989 2114
1990 // clear key, in case of extra padding 2115 // clear key, in case of extra padding
1991 memset (&skey, 0, sizeof (skey)); 2116 memset (&skey, 0, sizeof (skey));
… …
1995 key.g = 255; 2120 key.g = 255;
1996 key.b = 255; 2121 key.b = 255;
1997 key.a = 255; 2122 key.a = 255;
1998 key.mode = GL_QUADS; 2123 key.mode = GL_QUADS;
1999 key.format = GL_T2F_V3F; 2124 key.format = GL_T2F_V3F;
2000 key.texname = -1;
2001 2125
2002 mx += self->x; 2126 mx += self->x;
2003 my += self->y; 2127 my += self->y;
2004 2128
2005 // first pass: determine smooth_max 2129 // first pass: determine smooth_max
… …
2026 2150
2027 glEnable (GL_BLEND); 2151 glEnable (GL_BLEND);
2028 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2152 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2029 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2153 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2030 2154
2155 key.texname = self->tex [TEXID_HIDDEN].name;
2156 arr_hidden = rc_array (rc_ov, &key);
2157
2031 for (z = 0; z <= 2; z++) 2158 for (z = 0; z <= 2; z++)
2032 { 2159 {
2033 memset (smooth_level, 0, sizeof (smooth_level)); 2160 memset (smooth_level, 0, sizeof (smooth_level));
2161 key.texname = -1;
2034 2162
2035 for (y = 0; y < sh; y++) 2163 for (y = 0; y < sh; y++)
2036 if (0 <= y + my && y + my < self->rows) 2164 if (0 <= y + my && y + my < self->rows)
2037 { 2165 {
2038 maprow *row = self->row + (y + my); 2166 maprow *row = self->row + (y + my);
… …
2044 tileid tile = cell->tile [z]; 2172 tileid tile = cell->tile [z];
2045 2173
2046 if (tile) 2174 if (tile)
2047 { 2175 {
2048 maptex tex = self->tex [tile]; 2176 maptex tex = self->tex [tile];
2049 int px = (x + 1) * T - tex.w; 2177 int px, py;
2050 int py = (y + 1) * T - tex.h;
2051 2178
2052 if (key.texname != tex.name) 2179 if (key.texname != tex.name)
2053 { 2180 {
2181 self->tex [tile].unused = 0;
2182
2054 if (!tex.name) 2183 if (!tex.name)
2055 tex = self->tex [2]; /* missing, replace by noface */ 2184 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2056 2185
2057 key.texname = tex.name; 2186 key.texname = tex.name;
2058 arr = rc_array (rc, &key); 2187 arr = rc_array (rc, &key);
2059 } 2188 }
2189
2190 px = (x + 1) * T - tex.w;
2191 py = (y + 1) * T - tex.h;
2060 2192
2061 if (expect_false (cell->player == player) && expect_false (z == 2)) 2193 if (expect_false (cell->player == player) && expect_false (z == 2))
2062 { 2194 {
2063 pl_x = px; 2195 pl_x = px;
2064 pl_y = py; 2196 pl_y = py;
… …
2069 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2201 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2070 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2202 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2071 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2203 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2072 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2204 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2073 2205
2074 if (expect_false (cell->flags) && expect_false (z == 2))
2075 {
2076 // overlays such as the speech bubble, probably more to come
2077 if (cell->flags & 1)
2078 {
2079 maptex tex = self->tex [1];
2080 int px = x * T + T * 2 / 32;
2081 int py = y * T - T * 6 / 32;
2082
2083 if (tex.name)
2084 {
2085 if (key.texname != tex.name)
2086 {
2087 key.texname = tex.name;
2088 arr = rc_array (rc, &key);
2089 }
2090
2091 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2092 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2093 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2094 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2095 }
2096 }
2097 }
2098
2099 // update smooth hash 2206 // update smooth hash
2100 if (tex.smoothtile) 2207 if (tex.smoothtile)
2101 { 2208 {
2102 skey.tile = tex.smoothtile; 2209 skey.tile = tex.smoothtile;
2103 skey.level = tex.smoothlevel; 2210 skey.level = tex.smoothlevel;
… …
2131 // corners 2238 // corners
2132 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2239 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2133 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2240 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2134 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2241 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2135 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2242 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2243 }
2244 }
2245
2246 if (expect_false (z == 2))
2247 {
2248 /* draw question marks on top of hidden spaces */
2249 if (!cell->darkness)
2250 {
2251 maptex tex = self->tex [TEXID_HIDDEN];
2252 int px = (x + 1) * T - tex.w;
2253 int py = (y + 1) * T - tex.h;
2254
2255 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2256 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2257 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2258 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2259 }
2260
2261 if (expect_false (cell->flags))
2262 {
2263 // overlays such as the speech bubble, probably more to come
2264 if (cell->flags & 1)
2265 {
2266 rc_key_t key_ov = key;
2267 maptex tex = self->tex [TEXID_SPEECH];
2268 rc_array_t *arr;
2269 int px = x * T + T * 2 / 32;
2270 int py = y * T - T * 6 / 32;
2271
2272 key_ov.texname = tex.name;
2273 arr = rc_array (rc_ov, &key_ov);
2274
2275 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2276 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2277 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2278 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2279 }
2136 } 2280 }
2137 } 2281 }
2138 } 2282 }
2139 } 2283 }
2140 2284
… …
2180 { 2324 {
2181 // this time avoiding texture state changes 2325 // this time avoiding texture state changes
2182 // save gobs of state changes. 2326 // save gobs of state changes.
2183 if (key.texname != tex.name) 2327 if (key.texname != tex.name)
2184 { 2328 {
2329 self->tex [skey->tile].unused = 0;
2330
2185 glEnd (); 2331 glEnd ();
2186 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2332 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2187 glBegin (GL_QUADS); 2333 glBegin (GL_QUADS);
2188 } 2334 }
2189 2335
… …
2235 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2381 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2236 2382
2237 rc_draw (rc); 2383 rc_draw (rc);
2238 } 2384 }
2239 2385
2386 rc_draw (rc_ov);
2387 rc_clear (rc_ov);
2388
2240 glDisable (GL_BLEND); 2389 glDisable (GL_BLEND);
2241 rc_free (rc); 2390 rc_free (rc);
2391 rc_free (rc_ov);
2242 2392
2243 // top layer: overlays such as the health bar 2393 // top layer: overlays such as the health bar
2244 for (y = 0; y < sh; y++) 2394 for (y = 0; y < sh; y++)
2245 if (0 <= y + my && y + my < self->rows) 2395 if (0 <= y + my && y + my < self->rows)
2246 { 2396 {
… …
2306 }; 2456 };
2307 2457
2308 int x, y; 2458 int x, y;
2309 2459
2310 glEnable (GL_TEXTURE_2D); 2460 glEnable (GL_TEXTURE_2D);
2461 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2462 * but the nvidia driver (185.18.14) mishandles alpha textures
2463 * ansd takes the colour from god knows where instead of using
2464 * Cp. MODULATE results in the same colour, but slightly different
2465 * alpha, but atcually gives us the correct colour with nvidia.
2466 */
2311 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2467 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2312 glEnable (GL_BLEND); 2468 glEnable (GL_BLEND);
2313 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2469 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2314 glBegin (GL_QUADS); 2470 glBegin (GL_QUADS);
2315 2471
2316 for (y = 0; y < h; y++) 2472 for (y = 0; y < h; y++)
… …
2323 float *c = color [m & 15]; 2479 float *c = color [m & 15];
2324 2480
2325 float tx1 = m & 0x40 ? 0.5 : 0.; 2481 float tx1 = m & 0x40 ? 0.5 : 0.;
2326 float tx2 = tx1 + 0.5; 2482 float tx2 = tx1 + 0.5;
2327 2483
2328 glColor4f (c[0], c[1], c[2], 0.75); 2484 glColor4f (c[0], c[1], c[2], 1);
2329 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2485 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2330 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2486 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2331 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2487 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2332 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2488 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2333 } 2489 }
… …
2355 SvCUR_set (darkness3_sv, sw34 * sh3); 2511 SvCUR_set (darkness3_sv, sw34 * sh3);
2356 2512
2357 mx += self->x - 1; 2513 mx += self->x - 1;
2358 my += self->y - 1; 2514 my += self->y - 1;
2359 2515
2360 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1); 2516 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2361 2517
2362 for (y = 0; y < sh1; y++) 2518 for (y = 0; y < sh1; y++)
2363 if (0 <= y + my && y + my < self->rows) 2519 if (0 <= y + my && y + my < self->rows)
2364 { 2520 {
2365 maprow *row = self->row + (y + my); 2521 maprow *row = self->row + (y + my);
… …
2368 if (row->c0 <= x + mx && x + mx < row->c1) 2524 if (row->c0 <= x + mx && x + mx < row->c1)
2369 { 2525 {
2370 mapcell *cell = row->col + (x + mx - row->c0); 2526 mapcell *cell = row->col + (x + mx - row->c0);
2371 2527
2372 darkness1 [y * sw1 + x] = cell->darkness 2528 darkness1 [y * sw1 + x] = cell->darkness
2373 ? 255 - (cell->darkness - 1) 2529 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2374 : 255 - FOW_DARKNESS; 2530 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2375 } 2531 }
2376 } 2532 }
2377 2533
2378 for (y = 0; y < sh; ++y) 2534 for (y = 0; y < sh; ++y)
2379 for (x = 0; x < sw; ++x) 2535 for (x = 0; x < sw; ++x)
… …
2792 } *civ, const_iv[] = { 2948 } *civ, const_iv[] = {
2793# define const_iv(name) { # name, (IV)name } 2949# define const_iv(name) { # name, (IV)name }
2794 const_iv (GL_VENDOR), 2950 const_iv (GL_VENDOR),
2795 const_iv (GL_VERSION), 2951 const_iv (GL_VERSION),
2796 const_iv (GL_EXTENSIONS), 2952 const_iv (GL_EXTENSIONS),
2953 const_iv (GL_MAX_TEXTURE_UNITS),
2797 const_iv (GL_COLOR_MATERIAL), 2954 const_iv (GL_COLOR_MATERIAL),
2798 const_iv (GL_SMOOTH), 2955 const_iv (GL_SMOOTH),
2799 const_iv (GL_FLAT), 2956 const_iv (GL_FLAT),
2800 const_iv (GL_DITHER), 2957 const_iv (GL_DITHER),
2801 const_iv (GL_BLEND), 2958 const_iv (GL_BLEND),
… …
2813 const_iv (GL_ZERO), 2970 const_iv (GL_ZERO),
2814 const_iv (GL_SRC_ALPHA), 2971 const_iv (GL_SRC_ALPHA),
2815 const_iv (GL_DST_ALPHA), 2972 const_iv (GL_DST_ALPHA),
2816 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2973 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2817 const_iv (GL_ONE_MINUS_DST_ALPHA), 2974 const_iv (GL_ONE_MINUS_DST_ALPHA),
2975 const_iv (GL_SRC_COLOR),
2976 const_iv (GL_DST_COLOR),
2977 const_iv (GL_ONE_MINUS_SRC_COLOR),
2978 const_iv (GL_ONE_MINUS_DST_COLOR),
2818 const_iv (GL_SRC_ALPHA_SATURATE), 2979 const_iv (GL_SRC_ALPHA_SATURATE),
2819 const_iv (GL_RGB), 2980 const_iv (GL_RGB),
2820 const_iv (GL_RGBA), 2981 const_iv (GL_RGBA),
2821 const_iv (GL_RGBA4), 2982 const_iv (GL_RGBA4),
2822 const_iv (GL_RGBA8), 2983 const_iv (GL_RGBA8),
… …
2890 const_iv (GL_NICEST), 3051 const_iv (GL_NICEST),
2891 const_iv (GL_V2F), 3052 const_iv (GL_V2F),
2892 const_iv (GL_V3F), 3053 const_iv (GL_V3F),
2893 const_iv (GL_T2F_V3F), 3054 const_iv (GL_T2F_V3F),
2894 const_iv (GL_T2F_N3F_V3F), 3055 const_iv (GL_T2F_N3F_V3F),
3056 const_iv (GL_FUNC_ADD),
3057 const_iv (GL_FUNC_SUBTRACT),
3058 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2895# undef const_iv 3059# undef const_iv
2896 }; 3060 };
2897 3061
2898 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3062 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2899 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3063 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2906disable_GL_EXT_blend_func_separate () 3070disable_GL_EXT_blend_func_separate ()
2907 CODE: 3071 CODE:
2908 gl.BlendFuncSeparate = 0; 3072 gl.BlendFuncSeparate = 0;
2909 gl.BlendFuncSeparateEXT = 0; 3073 gl.BlendFuncSeparateEXT = 0;
2910 3074
3075void
3076apple_nvidia_bug (int enable)
3077
2911char * 3078char *
2912gl_vendor () 3079gl_vendor ()
2913 CODE: 3080 CODE:
2914 RETVAL = (char *)glGetString (GL_VENDOR); 3081 RETVAL = (char *)glGetString (GL_VENDOR);
2915 OUTPUT: 3082 OUTPUT:
… …
2963void glBlendFunc (int sfactor, int dfactor) 3130void glBlendFunc (int sfactor, int dfactor)
2964 3131
2965void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3132void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2966 CODE: 3133 CODE:
2967 gl_BlendFuncSeparate (sa, da, saa, daa); 3134 gl_BlendFuncSeparate (sa, da, saa, daa);
3135
3136# void glBlendEquation (int se)
2968 3137
2969void glDepthMask (int flag) 3138void glDepthMask (int flag)
2970 3139
2971void glLogicOp (int opcode) 3140void glLogicOp (int opcode)
2972 3141

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines