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.284 by elmex, Thu Dec 11 00:17:47 2008 UTC vs.
Revision 1.301 by root, Thu Feb 4 20:01:08 2010 UTC

… …
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
… …
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 42
44/* work around os x broken headers */ 43/* work around os x broken headers */
45#ifdef __MACOSX__ 44#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
47#endif 48#endif
48 49
49#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
51 52
… …
81#define expect_false(expr) expect ((expr) != 0, 0) 82#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1) 83#define expect_true(expr) expect ((expr) != 0, 1)
83 84
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 16 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
87 91
88#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
90 94
91#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
92 96
93/* mask out modifiers we are not interested in */ 97/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
95 99
96#define KMOD_LRAM 0x10000 // our extension 100#define KMOD_LRAM 0x10000 // our extension
101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
97 104
98static AV *texture_av; 105static AV *texture_av;
99 106
100static struct 107static struct
101{ 108{
… …
817 824
818IV minpot (UV n) 825IV minpot (UV n)
819 826
820IV popcount (UV n) 827IV popcount (UV n)
821 828
829NV distance (NV dx, NV dy)
830 CODE:
831 RETVAL = pow (dx * dx + dy * dy, 0.5);
832 OUTPUT:
833 RETVAL
834
822void 835void
823pango_init () 836pango_init ()
824 CODE: 837 CODE:
825{ 838{
826 opengl_fontmap = pango_opengl_font_map_new (); 839 opengl_fontmap = pango_opengl_font_map_new ();
… …
917 930
918 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra"); 931 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
919#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 932#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
920#include "glfunc.h" 933#include "glfunc.h"
921#undef GL_FUNC 934#undef GL_FUNC
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
922 } 938 }
923} 939}
924 OUTPUT: 940 OUTPUT:
925 RETVAL 941 RETVAL
926 942
… …
1654 glDisable (GL_ALPHA_TEST); 1670 glDisable (GL_ALPHA_TEST);
1655 glDisable (GL_BLEND); 1671 glDisable (GL_BLEND);
1656 } 1672 }
1657} 1673}
1658 1674
1675void
1676draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1677 PROTOTYPE: @
1678 CODE:
1679{
1680 glEnable (GL_BLEND);
1681 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1682 glEnable (GL_TEXTURE_2D);
1683 glBindTexture (GL_TEXTURE_2D, name1);
1684
1685 glColor3f (intensity, intensity, intensity);
1686 glPushMatrix ();
1687 glScalef (1./3, 1./3, 1.);
1688
1689 if (blend > 0.f)
1690 {
1691 float dx3 = dx * -3.f / w;
1692 float dy3 = dy * -3.f / h;
1693 GLfloat env_color[4] = { 0., 0., 0., blend };
1694
1695 /* interpolate the two shadow textures */
1696 /* stage 0 == rgb(glcolor) + alpha(t0) */
1697 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1698
1699 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1700 gl.ActiveTexture (GL_TEXTURE1);
1701 glEnable (GL_TEXTURE_2D);
1702 glBindTexture (GL_TEXTURE_2D, name2);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1704
1705 /* rgb == rgb(glcolor) */
1706 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1707 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1708 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1709
1710 /* alpha = interpolate t0, t1 by env_alpha */
1711 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1712
1713 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1714 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1715 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1716
1717 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1718 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1719
1720 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1721 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1722
1723 glBegin (GL_QUADS);
1724 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1725 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1726 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1727 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1728 glEnd ();
1729
1730 glDisable (GL_TEXTURE_2D);
1731 gl.ActiveTexture (GL_TEXTURE0);
1732 }
1733 else
1734 {
1735 /* simple blending of one texture, also opengl <1.3 path */
1736 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1737
1738 glBegin (GL_QUADS);
1739 glTexCoord2f (0, 0); glVertex2f (0, 0);
1740 glTexCoord2f (0, t); glVertex2f (0, h);
1741 glTexCoord2f (s, t); glVertex2f (w, h);
1742 glTexCoord2f (s, 0); glVertex2f (w, 0);
1743 glEnd ();
1744 }
1745
1746 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1747 {
1748 int x, y;
1749 int dx3 = dx * 3;
1750 int dy3 = dy * 3;
1751
1752 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1753 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1754 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1755 glTranslatef (-1., -1., 0);
1756 glBegin (GL_QUADS);
1757
1758 for (y = 1; y < h; y += 3)
1759 {
1760 int y1 = y - dy3;
1761 int y1valid = y1 >= 0 && y1 < h;
1762
1763 for (x = 1; x < w; x += 3)
1764 {
1765 int x1 = x - dx3;
1766 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1767 uint8_t h2;
1768
1769 if (y1valid && x1 >= 0 && x1 < w)
1770 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1771 else
1772 h2 = 1; /* out of range == invisible */
1773
1774 if (h1 || h2)
1775 {
1776 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1777 glColor4f (1., 1., 1., alpha);
1778
1779 glTexCoord2f (0, 0.); glVertex2i (x , y );
1780 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1781 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1782 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1783 }
1784 }
1785 }
1786 }
1787
1788 glEnd ();
1789
1790 glPopMatrix ();
1791
1792 glDisable (GL_TEXTURE_2D);
1793 glDisable (GL_BLEND);
1794}
1795
1659IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1796IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1660 CODE: 1797 CODE:
1661{ 1798{
1662 GLint width; 1799 GLint width;
1663 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1800 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
… …
1877 { 2014 {
1878 ext = *data++; 2015 ext = *data++;
1879 cmd = ext & 0x7f; 2016 cmd = ext & 0x7f;
1880 2017
1881 if (cmd < 4) 2018 if (cmd < 4)
1882 cell->darkness = 255 - ext * 64 + 1; 2019 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1883 else if (cmd == 5) // health 2020 else if (cmd == 5) // health
1884 { 2021 {
1885 cell->stat_width = 1; 2022 cell->stat_width = 1;
1886 cell->stat_hp = *data++; 2023 cell->stat_hp = *data++;
1887 } 2024 }
… …
2005 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2142 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2006 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2143 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
2007 smooth_key skey; 2144 smooth_key skey;
2008 int pl_x, pl_y; 2145 int pl_x, pl_y;
2009 maptex pl_tex; 2146 maptex pl_tex;
2010 rc_t *rc = rc_alloc (); 2147 rc_t *rc = rc_alloc ();
2148 rc_t *rc_ov = rc_alloc ();
2011 rc_key_t key; 2149 rc_key_t key;
2012 rc_array_t *arr; 2150 rc_array_t *arr;
2013 2151
2014 pl_tex.name = 0; 2152 pl_tex.name = 0;
2015 2153
2016 // thats current max. sorry. 2154 // that's current max. sorry.
2017 if (sw > 255) sw = 255; 2155 if (sw > 255) sw = 255;
2018 if (sh > 255) sh = 255; 2156 if (sh > 255) sh = 255;
2019 2157
2020 // clear key, in case of extra padding 2158 // clear key, in case of extra padding
2021 memset (&skey, 0, sizeof (skey)); 2159 memset (&skey, 0, sizeof (skey));
… …
2074 tileid tile = cell->tile [z]; 2212 tileid tile = cell->tile [z];
2075 2213
2076 if (tile) 2214 if (tile)
2077 { 2215 {
2078 maptex tex = self->tex [tile]; 2216 maptex tex = self->tex [tile];
2079 int px = (x + 1) * T - tex.w; 2217 int px, py;
2080 int py = (y + 1) * T - tex.h;
2081 2218
2082 if (key.texname != tex.name) 2219 if (key.texname != tex.name)
2083 { 2220 {
2084 self->tex [tile].unused = 0; 2221 self->tex [tile].unused = 0;
2085 2222
2086 if (!tex.name) 2223 if (!tex.name)
2087 tex = self->tex [2]; /* missing, replace by noface */ 2224 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2088 2225
2089 key.texname = tex.name; 2226 key.texname = tex.name;
2090 arr = rc_array (rc, &key); 2227 arr = rc_array (rc, &key);
2091 } 2228 }
2229
2230 px = (x + 1) * T - tex.w;
2231 py = (y + 1) * T - tex.h;
2092 2232
2093 if (expect_false (cell->player == player) && expect_false (z == 2)) 2233 if (expect_false (cell->player == player) && expect_false (z == 2))
2094 { 2234 {
2095 pl_x = px; 2235 pl_x = px;
2096 pl_y = py; 2236 pl_y = py;
… …
2101 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2241 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2102 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2242 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2103 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2243 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2104 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2244 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2105 2245
2106 if (expect_false (cell->flags) && expect_false (z == 2))
2107 {
2108 /* this is a workaround to make speech bubbles drawn
2109 * for example above walls, work. */
2110 rc_draw (rc);
2111 rc_clear (rc);
2112 key.texname = -1;
2113
2114 // overlays such as the speech bubble, probably more to come
2115 if (cell->flags & 1)
2116 {
2117 maptex tex = self->tex [1];
2118 int px = x * T + T * 2 / 32;
2119 int py = y * T - T * 6 / 32;
2120
2121 if (tex.name)
2122 {
2123 if (key.texname != tex.name)
2124 {
2125 key.texname = tex.name;
2126 arr = rc_array (rc, &key);
2127 }
2128
2129 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2130 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2131 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2132 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2133 }
2134 }
2135 }
2136
2137 // update smooth hash 2246 // update smooth hash
2138 if (tex.smoothtile) 2247 if (tex.smoothtile)
2139 { 2248 {
2140 skey.tile = tex.smoothtile; 2249 skey.tile = tex.smoothtile;
2141 skey.level = tex.smoothlevel; 2250 skey.level = tex.smoothlevel;
… …
2169 // corners 2278 // corners
2170 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2279 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2171 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2280 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2172 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2281 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2173 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2282 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2283 }
2284 }
2285
2286 if (expect_false (z == 2) && expect_false (cell->flags))
2287 {
2288 // overlays such as the speech bubble, probably more to come
2289 if (cell->flags & 1)
2290 {
2291 rc_key_t key_ov = key;
2292 maptex tex = self->tex [TEXID_SPEECH];
2293 rc_array_t *arr;
2294 int px = x * T + T * 2 / 32;
2295 int py = y * T - T * 6 / 32;
2296
2297 key_ov.texname = tex.name;
2298 arr = rc_array (rc_ov, &key_ov);
2299
2300 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2301 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2302 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2303 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2174 } 2304 }
2175 } 2305 }
2176 } 2306 }
2177 } 2307 }
2178 2308
… …
2275 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2405 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2276 2406
2277 rc_draw (rc); 2407 rc_draw (rc);
2278 } 2408 }
2279 2409
2410 rc_draw (rc_ov);
2411 rc_clear (rc_ov);
2412
2280 glDisable (GL_BLEND); 2413 glDisable (GL_BLEND);
2281 rc_free (rc); 2414 rc_free (rc);
2415 rc_free (rc_ov);
2282 2416
2283 // top layer: overlays such as the health bar 2417 // top layer: overlays such as the health bar
2284 for (y = 0; y < sh; y++) 2418 for (y = 0; y < sh; y++)
2285 if (0 <= y + my && y + my < self->rows) 2419 if (0 <= y + my && y + my < self->rows)
2286 { 2420 {
… …
2317 } 2451 }
2318 } 2452 }
2319} 2453}
2320 2454
2321void 2455void
2322draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2456draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2323 CODE: 2457 CODE:
2324{ 2458{
2325 static float color[16][3] = { 2459 static float color[16][3] = {
2326 { 0.00F, 0.00F, 0.00F }, 2460 { 0.00f, 0.00f, 0.00f },
2327 { 1.00F, 1.00F, 1.00F }, 2461 { 1.00f, 1.00f, 1.00f },
2328 { 0.00F, 0.00F, 0.55F }, 2462 { 0.00f, 0.00f, 0.55f },
2329 { 1.00F, 0.00F, 0.00F }, 2463 { 1.00f, 0.00f, 0.00f },
2330 2464
2331 { 1.00F, 0.54F, 0.00F }, 2465 { 1.00f, 0.54f, 0.00f },
2332 { 0.11F, 0.56F, 1.00F }, 2466 { 0.11f, 0.56f, 1.00f },
2333 { 0.93F, 0.46F, 0.00F }, 2467 { 0.93f, 0.46f, 0.00f },
2334 { 0.18F, 0.54F, 0.34F }, 2468 { 0.18f, 0.54f, 0.34f },
2335 2469
2336 { 0.56F, 0.73F, 0.56F }, 2470 { 0.56f, 0.73f, 0.56f },
2337 { 0.80F, 0.80F, 0.80F }, 2471 { 0.80f, 0.80f, 0.80f },
2338 { 0.55F, 0.41F, 0.13F }, 2472 { 0.55f, 0.41f, 0.13f },
2339 { 0.99F, 0.77F, 0.26F }, 2473 { 0.99f, 0.77f, 0.26f },
2340 2474
2341 { 0.74F, 0.65F, 0.41F }, 2475 { 0.74f, 0.65f, 0.41f },
2342 2476
2343 { 0.00F, 1.00F, 1.00F }, 2477 { 0.00f, 1.00f, 1.00f },
2344 { 1.00F, 0.00F, 1.00F }, 2478 { 1.00f, 0.00f, 1.00f },
2345 { 1.00F, 1.00F, 0.00F }, 2479 { 1.00f, 1.00f, 0.00f },
2346 }; 2480 };
2347 2481
2348 int x, y; 2482 int x, y;
2349 2483
2350 glEnable (GL_TEXTURE_2D); 2484 glEnable (GL_TEXTURE_2D);
2485 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2486 * but the nvidia driver (185.18.14) mishandles alpha textures
2487 * and takes the colour from god knows where instead of using
2488 * Cp. MODULATE results in the same colour, but slightly different
2489 * alpha, but atcually gives us the correct colour with nvidia.
2490 */
2351 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2491 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2352 glEnable (GL_BLEND); 2492 glEnable (GL_BLEND);
2353 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2493 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2354 glBegin (GL_QUADS); 2494 glBegin (GL_QUADS);
2355 2495
2356 for (y = 0; y < h; y++) 2496 for (y = 0; y < h; y++)
… …
2360 2500
2361 if (m) 2501 if (m)
2362 { 2502 {
2363 float *c = color [m & 15]; 2503 float *c = color [m & 15];
2364 2504
2365 float tx1 = m & 0x40 ? 0.5 : 0.; 2505 float tx1 = m & 0x40 ? 0.5f : 0.f;
2366 float tx2 = tx1 + 0.5; 2506 float tx2 = tx1 + 0.5f;
2367 2507
2368 glColor4f (c[0], c[1], c[2], 0.75); 2508 glColor4f (c[0], c[1], c[2], 1);
2369 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2509 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2370 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2510 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2371 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2511 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2372 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2512 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2373 } 2513 }
… …
2381void 2521void
2382fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2522fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2383 PPCODE: 2523 PPCODE:
2384{ 2524{
2385 int x, y; 2525 int x, y;
2386 int sw1 = sw + 2; 2526 int sw1 = sw + 2;
2387 int sh1 = sh + 2; 2527 int sh1 = sh + 2;
2388 int sh3 = sh * 3; 2528 int sh3 = sh * 3;
2389 int sw34 = (sw * 3 + 3) & ~3; 2529 int sw3 = sw * 3;
2390 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2530 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2391 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2531 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2392 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2532 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2393 2533
2394 SvPOK_only (darkness3_sv); 2534 SvPOK_only (darkness3_sv);
2395 SvCUR_set (darkness3_sv, sw34 * sh3); 2535 SvCUR_set (darkness3_sv, sw3 * sh3);
2396 2536
2397 mx += self->x - 1; 2537 mx += self->x - 1;
2398 my += self->y - 1; 2538 my += self->y - 1;
2399
2400 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2401 2539
2402 for (y = 0; y < sh1; y++) 2540 for (y = 0; y < sh1; y++)
2403 if (0 <= y + my && y + my < self->rows) 2541 if (0 <= y + my && y + my < self->rows)
2404 { 2542 {
2405 maprow *row = self->row + (y + my); 2543 maprow *row = self->row + (y + my);
… …
2408 if (row->c0 <= x + mx && x + mx < row->c1) 2546 if (row->c0 <= x + mx && x + mx < row->c1)
2409 { 2547 {
2410 mapcell *cell = row->col + (x + mx - row->c0); 2548 mapcell *cell = row->col + (x + mx - row->c0);
2411 2549
2412 darkness1 [y * sw1 + x] = cell->darkness 2550 darkness1 [y * sw1 + x] = cell->darkness
2413 ? 255 - (cell->darkness - 1) 2551 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2414 : 255 - FOW_DARKNESS; 2552 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2415 } 2553 }
2416 } 2554 }
2417 2555
2418 for (y = 0; y < sh; ++y) 2556 for (y = 0; y < sh; ++y)
2419 for (x = 0; x < sw; ++x) 2557 for (x = 0; x < sw; ++x)
… …
2438 2576
2439 uint8_t r13 = (d13 + d23 + d12) / 3; 2577 uint8_t r13 = (d13 + d23 + d12) / 3;
2440 uint8_t r23 = d23; 2578 uint8_t r23 = d23;
2441 uint8_t r33 = (d23 + d33 + d32) / 3; 2579 uint8_t r33 = (d23 + d33 + d32) / 3;
2442 2580
2443 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2581 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2444 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2582 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2445 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2583 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2446 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2584 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2447 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2585 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2448 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2586 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2449 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2587 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2450 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2588 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2451 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2589 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2452 } 2590 }
2453 2591
2454 free (darkness1); 2592 free (darkness1);
2455 2593
2456 EXTEND (SP, 3); 2594 EXTEND (SP, 3);
2457 PUSHs (sv_2mortal (newSViv (sw34))); 2595 PUSHs (sv_2mortal (newSViv (sw3)));
2458 PUSHs (sv_2mortal (newSViv (sh3))); 2596 PUSHs (sv_2mortal (newSViv (sh3)));
2459 PUSHs (darkness3_sv); 2597 PUSHs (darkness3_sv);
2460} 2598}
2461 2599
2462SV * 2600SV *
… …
2719void 2857void
2720set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2858set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2721 CODE: 2859 CODE:
2722{ 2860{
2723 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2861 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2724 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2862 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2725 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2863 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2726} 2864}
2727 2865
2728void 2866void
2729set_reverse_stereo (DC::Channel self, int flip) 2867set_reverse_stereo (DC::Channel self, int flip)
… …
2731 Mix_SetReverseStereo (self, flip); 2869 Mix_SetReverseStereo (self, flip);
2732 2870
2733MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2871MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2734 2872
2735PROTOTYPES: DISABLE 2873PROTOTYPES: DISABLE
2874
2875void
2876decoders ()
2877 PPCODE:
2878#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2879 int i, num = Mix_GetNumChunkDecoders ();
2880 EXTEND (SP, num);
2881 for (i = 0; i < num; ++i)
2882 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2883#else
2884 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2885#endif
2736 2886
2737DC::MixChunk 2887DC::MixChunk
2738new (SV *class, DC::RW rwops) 2888new (SV *class, DC::RW rwops)
2739 CODE: 2889 CODE:
2740 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2890 RETVAL = Mix_LoadWAV_RW (rwops, 1);
… …
2773 OUTPUT: 2923 OUTPUT:
2774 RETVAL 2924 RETVAL
2775 2925
2776MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2926MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2777 2927
2928void
2929decoders ()
2930 PPCODE:
2931#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2932 int i, num = Mix_GetNumMusicDecoders ();
2933 EXTEND (SP, num);
2934 for (i = 0; i < num; ++i)
2935 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2936#else
2937 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2938#endif
2939
2778int 2940int
2779volume (int volume = -1) 2941volume (int volume = -1)
2780 PROTOTYPE: ;$ 2942 PROTOTYPE: ;$
2781 CODE: 2943 CODE:
2782 if (items > 0) 2944 if (items > 0)
… …
2792 2954
2793void 2955void
2794halt () 2956halt ()
2795 CODE: 2957 CODE:
2796 Mix_HaltMusic (); 2958 Mix_HaltMusic ();
2959
2960int
2961playing ()
2962 CODE:
2963 RETVAL = Mix_PlayingMusic ();
2964 OUTPUT:
2965 RETVAL
2797 2966
2798DC::MixMusic 2967DC::MixMusic
2799new (SV *class, DC::RW rwops) 2968new (SV *class, DC::RW rwops)
2800 CODE: 2969 CODE:
2801 RETVAL = Mix_LoadMUS_RW (rwops); 2970 RETVAL = Mix_LoadMUS_RW (rwops);
… …
2832 } *civ, const_iv[] = { 3001 } *civ, const_iv[] = {
2833# define const_iv(name) { # name, (IV)name } 3002# define const_iv(name) { # name, (IV)name }
2834 const_iv (GL_VENDOR), 3003 const_iv (GL_VENDOR),
2835 const_iv (GL_VERSION), 3004 const_iv (GL_VERSION),
2836 const_iv (GL_EXTENSIONS), 3005 const_iv (GL_EXTENSIONS),
3006 const_iv (GL_MAX_TEXTURE_UNITS),
2837 const_iv (GL_COLOR_MATERIAL), 3007 const_iv (GL_COLOR_MATERIAL),
2838 const_iv (GL_SMOOTH), 3008 const_iv (GL_SMOOTH),
2839 const_iv (GL_FLAT), 3009 const_iv (GL_FLAT),
2840 const_iv (GL_DITHER), 3010 const_iv (GL_DITHER),
2841 const_iv (GL_BLEND), 3011 const_iv (GL_BLEND),
… …
2853 const_iv (GL_ZERO), 3023 const_iv (GL_ZERO),
2854 const_iv (GL_SRC_ALPHA), 3024 const_iv (GL_SRC_ALPHA),
2855 const_iv (GL_DST_ALPHA), 3025 const_iv (GL_DST_ALPHA),
2856 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3026 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2857 const_iv (GL_ONE_MINUS_DST_ALPHA), 3027 const_iv (GL_ONE_MINUS_DST_ALPHA),
3028 const_iv (GL_SRC_COLOR),
3029 const_iv (GL_DST_COLOR),
3030 const_iv (GL_ONE_MINUS_SRC_COLOR),
3031 const_iv (GL_ONE_MINUS_DST_COLOR),
2858 const_iv (GL_SRC_ALPHA_SATURATE), 3032 const_iv (GL_SRC_ALPHA_SATURATE),
2859 const_iv (GL_RGB), 3033 const_iv (GL_RGB),
2860 const_iv (GL_RGBA), 3034 const_iv (GL_RGBA),
2861 const_iv (GL_RGBA4), 3035 const_iv (GL_RGBA4),
2862 const_iv (GL_RGBA8), 3036 const_iv (GL_RGBA8),
… …
2930 const_iv (GL_NICEST), 3104 const_iv (GL_NICEST),
2931 const_iv (GL_V2F), 3105 const_iv (GL_V2F),
2932 const_iv (GL_V3F), 3106 const_iv (GL_V3F),
2933 const_iv (GL_T2F_V3F), 3107 const_iv (GL_T2F_V3F),
2934 const_iv (GL_T2F_N3F_V3F), 3108 const_iv (GL_T2F_N3F_V3F),
3109 const_iv (GL_FUNC_ADD),
3110 const_iv (GL_FUNC_SUBTRACT),
3111 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2935# undef const_iv 3112# undef const_iv
2936 }; 3113 };
2937 3114
2938 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3115 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2939 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3116 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2946disable_GL_EXT_blend_func_separate () 3123disable_GL_EXT_blend_func_separate ()
2947 CODE: 3124 CODE:
2948 gl.BlendFuncSeparate = 0; 3125 gl.BlendFuncSeparate = 0;
2949 gl.BlendFuncSeparateEXT = 0; 3126 gl.BlendFuncSeparateEXT = 0;
2950 3127
3128void
3129apple_nvidia_bug (int enable)
3130
2951char * 3131char *
2952gl_vendor () 3132gl_vendor ()
2953 CODE: 3133 CODE:
2954 RETVAL = (char *)glGetString (GL_VENDOR); 3134 RETVAL = (char *)glGetString (GL_VENDOR);
2955 OUTPUT: 3135 OUTPUT:
… …
3003void glBlendFunc (int sfactor, int dfactor) 3183void glBlendFunc (int sfactor, int dfactor)
3004 3184
3005void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3185void glBlendFuncSeparate (int sa, int da, int saa, int daa)
3006 CODE: 3186 CODE:
3007 gl_BlendFuncSeparate (sa, da, saa, daa); 3187 gl_BlendFuncSeparate (sa, da, saa, daa);
3188
3189# void glBlendEquation (int se)
3008 3190
3009void glDepthMask (int flag) 3191void glDepthMask (int flag)
3010 3192
3011void glLogicOp (int opcode) 3193void glLogicOp (int opcode)
3012 3194
… …
3162void glNewList (int list, int mode = GL_COMPILE) 3344void glNewList (int list, int mode = GL_COMPILE)
3163 3345
3164void glEndList () 3346void glEndList ()
3165 3347
3166void glCallList (int list) 3348void glCallList (int list)
3349
3350void c_init ()
3351 CODE:
3352 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3353 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3167 3354
3168MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3355MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3169 3356
3170PROTOTYPES: DISABLE 3357PROTOTYPES: DISABLE
3171 3358

Diff Legend

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