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.273 by root, Wed Aug 20 13:30:02 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)
96
97#define KMOD_LRAM 0x10000 // our extension
98
99#define TEXID_SPEECH 1
100#define TEXID_NOFACE 2
101#define TEXID_HIDDEN 3
95 102
96static AV *texture_av; 103static AV *texture_av;
97 104
98static struct 105static struct
99{ 106{
… …
231 int w, h; 238 int w, h;
232 float s, t; 239 float s, t;
233 uint8_t r, g, b, a; 240 uint8_t r, g, b, a;
234 tileid smoothtile; 241 tileid smoothtile;
235 uint8_t smoothlevel; 242 uint8_t smoothlevel;
243 uint8_t unused; /* set to zero on use */
236} maptex; 244} maptex;
237 245
238typedef struct { 246typedef struct {
239 uint32_t player; 247 uint32_t player;
240 tileid tile[3]; 248 tileid tile[3];
… …
527 return 0; 535 return 0;
528 536
529 return 1; 537 return 1;
530} 538}
531 539
540/******************************************************************************/
541
542/* process keyboard modifiers */
543static int
544mod_munge (int mod)
545{
546 mod &= MOD_MASK;
547
548 if (mod & (KMOD_META | KMOD_ALT))
549 mod |= KMOD_LRAM;
550
551 return mod;
552}
553
532static void 554static void
533deliantra_main () 555deliantra_main ()
534{ 556{
535 char *argv[] = { 0 }; 557 char *argv[] = { 0 };
536 call_argv ("::main", G_DISCARD | G_VOID, argv); 558 call_argv ("::main", G_DISCARD | G_VOID, argv);
537 dSP;
538} 559}
539 560
540#ifdef __MACOSX__ 561#ifdef __MACOSX__
541 /* to due surprising braindamage on the side of SDL design, we 562 /* to due surprising braindamage on the side of SDL design, we
542 * do some mind-boggling hack here: SDL requires a custom main() 563 * do some mind-boggling hack here: SDL requires a custom main()
… …
603 const_iv (SDL_USEREVENT), 624 const_iv (SDL_USEREVENT),
604 625
605 const_iv (SDL_APPINPUTFOCUS), 626 const_iv (SDL_APPINPUTFOCUS),
606 const_iv (SDL_APPMOUSEFOCUS), 627 const_iv (SDL_APPMOUSEFOCUS),
607 const_iv (SDL_APPACTIVE), 628 const_iv (SDL_APPACTIVE),
629
630
631 const_iv (SDLK_UNKNOWN),
632 const_iv (SDLK_FIRST),
633 const_iv (SDLK_BACKSPACE),
634 const_iv (SDLK_TAB),
635 const_iv (SDLK_CLEAR),
636 const_iv (SDLK_RETURN),
637 const_iv (SDLK_PAUSE),
638 const_iv (SDLK_ESCAPE),
639 const_iv (SDLK_SPACE),
640 const_iv (SDLK_EXCLAIM),
641 const_iv (SDLK_QUOTEDBL),
642 const_iv (SDLK_HASH),
643 const_iv (SDLK_DOLLAR),
644 const_iv (SDLK_AMPERSAND),
645 const_iv (SDLK_QUOTE),
646 const_iv (SDLK_LEFTPAREN),
647 const_iv (SDLK_RIGHTPAREN),
648 const_iv (SDLK_ASTERISK),
649 const_iv (SDLK_PLUS),
650 const_iv (SDLK_COMMA),
651 const_iv (SDLK_MINUS),
652 const_iv (SDLK_PERIOD),
653 const_iv (SDLK_SLASH),
654 const_iv (SDLK_0),
655 const_iv (SDLK_1),
656 const_iv (SDLK_2),
657 const_iv (SDLK_3),
658 const_iv (SDLK_4),
659 const_iv (SDLK_5),
660 const_iv (SDLK_6),
661 const_iv (SDLK_7),
662 const_iv (SDLK_8),
663 const_iv (SDLK_9),
664 const_iv (SDLK_COLON),
665 const_iv (SDLK_SEMICOLON),
666 const_iv (SDLK_LESS),
667 const_iv (SDLK_EQUALS),
668 const_iv (SDLK_GREATER),
669 const_iv (SDLK_QUESTION),
670 const_iv (SDLK_AT),
671
672 const_iv (SDLK_LEFTBRACKET),
673 const_iv (SDLK_BACKSLASH),
674 const_iv (SDLK_RIGHTBRACKET),
675 const_iv (SDLK_CARET),
676 const_iv (SDLK_UNDERSCORE),
677 const_iv (SDLK_BACKQUOTE),
678 const_iv (SDLK_DELETE),
608 679
609 const_iv (SDLK_FIRST), 680 const_iv (SDLK_FIRST),
610 const_iv (SDLK_LAST), 681 const_iv (SDLK_LAST),
611 const_iv (SDLK_KP0), 682 const_iv (SDLK_KP0),
612 const_iv (SDLK_KP1), 683 const_iv (SDLK_KP1),
… …
688 const_iv (KMOD_RMETA), 759 const_iv (KMOD_RMETA),
689 const_iv (KMOD_NUM), 760 const_iv (KMOD_NUM),
690 const_iv (KMOD_CAPS), 761 const_iv (KMOD_CAPS),
691 const_iv (KMOD_MODE), 762 const_iv (KMOD_MODE),
692 763
764 const_iv (KMOD_LRAM),
765
693 const_iv (MIX_DEFAULT_FORMAT), 766 const_iv (MIX_DEFAULT_FORMAT),
694 767
695 const_iv (SDL_INIT_TIMER), 768 const_iv (SDL_INIT_TIMER),
696 const_iv (SDL_INIT_AUDIO), 769 const_iv (SDL_INIT_AUDIO),
697 const_iv (SDL_INIT_VIDEO), 770 const_iv (SDL_INIT_VIDEO),
… …
884 { 957 {
885 case SDL_KEYDOWN: 958 case SDL_KEYDOWN:
886 case SDL_KEYUP: 959 case SDL_KEYUP:
887 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 960 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
888 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 961 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
889 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 962 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
890 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 963 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
891 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 964 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
892 break; 965 break;
893 966
894 case SDL_ACTIVEEVENT: 967 case SDL_ACTIVEEVENT:
895 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 968 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
913 x = ev.motion.x; 986 x = ev.motion.x;
914 y = ev.motion.y; 987 y = ev.motion.y;
915 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 988 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
916 } 989 }
917 990
918 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 991 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
919 hv_store (hv, "state", 5, newSViv (state), 0); 992 hv_store (hv, "state", 5, newSViv (state), 0);
920 hv_store (hv, "x", 1, newSViv (x), 0); 993 hv_store (hv, "x", 1, newSViv (x), 0);
921 hv_store (hv, "y", 1, newSViv (y), 0); 994 hv_store (hv, "y", 1, newSViv (y), 0);
922 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 995 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
923 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 996 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
1139#if DEBUG 1212#if DEBUG
1140 VALGRIND_DO_LEAK_CHECK; 1213 VALGRIND_DO_LEAK_CHECK;
1141#endif 1214#endif
1142} 1215}
1143 1216
1217int
1218SvREFCNT (SV *sv)
1219 CODE:
1220 RETVAL = SvREFCNT (sv);
1221 OUTPUT:
1222 RETVAL
1223
1144MODULE = Deliantra::Client PACKAGE = DC::Font 1224MODULE = Deliantra::Client PACKAGE = DC::Font
1145 1225
1146PROTOTYPES: DISABLE 1226PROTOTYPES: DISABLE
1147 1227
1148DC::Font 1228DC::Font
… …
1577 if (ix) 1657 if (ix)
1578 { 1658 {
1579 glDisable (GL_ALPHA_TEST); 1659 glDisable (GL_ALPHA_TEST);
1580 glDisable (GL_BLEND); 1660 glDisable (GL_BLEND);
1581 } 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);
1582} 1751}
1583 1752
1584IV 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)
1585 CODE: 1754 CODE:
1586{ 1755{
… …
1692 //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);
1693 // use uglier nearest interpolation because linear suffers 1862 // use uglier nearest interpolation because linear suffers
1694 // from transparent color bleeding and ugly wrapping effects. 1863 // from transparent color bleeding and ugly wrapping effects.
1695 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1864 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1696} 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 }
1697 1886
1698int 1887int
1699ox (DC::Map self) 1888ox (DC::Map self)
1700 ALIAS: 1889 ALIAS:
1701 oy = 1 1890 oy = 1
… …
1822 cell->tile [z] = self->face2tile [face]; 2011 cell->tile [z] = self->face2tile [face];
1823 2012
1824 if (cell->tile [z]) 2013 if (cell->tile [z])
1825 { 2014 {
1826 maptex *tex = self->tex + cell->tile [z]; 2015 maptex *tex = self->tex + cell->tile [z];
2016 tex->unused = 0;
1827 if (!tex->name) 2017 if (!tex->name)
1828 av_push (missing, newSViv (cell->tile [z])); 2018 av_push (missing, newSViv (cell->tile [z]));
1829 2019
1830 if (tex->smoothtile) 2020 if (tex->smoothtile)
1831 { 2021 {
1832 maptex *smooth = self->tex + tex->smoothtile; 2022 maptex *smooth = self->tex + tex->smoothtile;
2023 smooth->unused = 0;
1833 if (!smooth->name) 2024 if (!smooth->name)
1834 av_push (missing, newSViv (tex->smoothtile)); 2025 av_push (missing, newSViv (tex->smoothtile));
1835 } 2026 }
1836 } 2027 }
1837 } 2028 }
… …
1908 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
1909 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)
1910 smooth_key skey; 2101 smooth_key skey;
1911 int pl_x, pl_y; 2102 int pl_x, pl_y;
1912 maptex pl_tex; 2103 maptex pl_tex;
1913 rc_t *rc = rc_alloc (); 2104 rc_t *rc = rc_alloc ();
2105 rc_t *rc_ov = rc_alloc ();
1914 rc_key_t key; 2106 rc_key_t key;
1915 rc_array_t *arr; 2107 rc_array_t *arr, *arr_hidden;
1916 2108
1917 pl_tex.name = 0; 2109 pl_tex.name = 0;
1918 2110
1919 // thats current max. sorry. 2111 // that's current max. sorry.
1920 if (sw > 255) sw = 255; 2112 if (sw > 255) sw = 255;
1921 if (sh > 255) sh = 255; 2113 if (sh > 255) sh = 255;
1922 2114
1923 // clear key, in case of extra padding 2115 // clear key, in case of extra padding
1924 memset (&skey, 0, sizeof (skey)); 2116 memset (&skey, 0, sizeof (skey));
… …
1928 key.g = 255; 2120 key.g = 255;
1929 key.b = 255; 2121 key.b = 255;
1930 key.a = 255; 2122 key.a = 255;
1931 key.mode = GL_QUADS; 2123 key.mode = GL_QUADS;
1932 key.format = GL_T2F_V3F; 2124 key.format = GL_T2F_V3F;
1933 key.texname = -1;
1934 2125
1935 mx += self->x; 2126 mx += self->x;
1936 my += self->y; 2127 my += self->y;
1937 2128
1938 // first pass: determine smooth_max 2129 // first pass: determine smooth_max
… …
1959 2150
1960 glEnable (GL_BLEND); 2151 glEnable (GL_BLEND);
1961 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2152 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1962 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2153 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1963 2154
2155 key.texname = self->tex [TEXID_HIDDEN].name;
2156 arr_hidden = rc_array (rc_ov, &key);
2157
1964 for (z = 0; z <= 2; z++) 2158 for (z = 0; z <= 2; z++)
1965 { 2159 {
1966 memset (smooth_level, 0, sizeof (smooth_level)); 2160 memset (smooth_level, 0, sizeof (smooth_level));
2161 key.texname = -1;
1967 2162
1968 for (y = 0; y < sh; y++) 2163 for (y = 0; y < sh; y++)
1969 if (0 <= y + my && y + my < self->rows) 2164 if (0 <= y + my && y + my < self->rows)
1970 { 2165 {
1971 maprow *row = self->row + (y + my); 2166 maprow *row = self->row + (y + my);
… …
1977 tileid tile = cell->tile [z]; 2172 tileid tile = cell->tile [z];
1978 2173
1979 if (tile) 2174 if (tile)
1980 { 2175 {
1981 maptex tex = self->tex [tile]; 2176 maptex tex = self->tex [tile];
1982 int px = (x + 1) * T - tex.w; 2177 int px, py;
1983 int py = (y + 1) * T - tex.h;
1984 2178
1985 if (key.texname != tex.name) 2179 if (key.texname != tex.name)
1986 { 2180 {
2181 self->tex [tile].unused = 0;
2182
1987 if (!tex.name) 2183 if (!tex.name)
1988 tex = self->tex [2]; /* missing, replace by noface */ 2184 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1989 2185
1990 key.texname = tex.name; 2186 key.texname = tex.name;
1991 arr = rc_array (rc, &key); 2187 arr = rc_array (rc, &key);
1992 } 2188 }
2189
2190 px = (x + 1) * T - tex.w;
2191 py = (y + 1) * T - tex.h;
1993 2192
1994 if (expect_false (cell->player == player) && expect_false (z == 2)) 2193 if (expect_false (cell->player == player) && expect_false (z == 2))
1995 { 2194 {
1996 pl_x = px; 2195 pl_x = px;
1997 pl_y = py; 2196 pl_y = py;
… …
2002 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2201 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2003 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);
2004 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);
2005 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);
2006 2205
2007 if (expect_false (cell->flags) && expect_false (z == 2))
2008 {
2009 // overlays such as the speech bubble, probably more to come
2010 if (cell->flags & 1)
2011 {
2012 maptex tex = self->tex [1];
2013 int px = x * T + T * 2 / 32;
2014 int py = y * T - T * 6 / 32;
2015
2016 if (tex.name)
2017 {
2018 if (key.texname != tex.name)
2019 {
2020 key.texname = tex.name;
2021 arr = rc_array (rc, &key);
2022 }
2023
2024 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2025 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2026 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2027 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2028 }
2029 }
2030 }
2031
2032 // update smooth hash 2206 // update smooth hash
2033 if (tex.smoothtile) 2207 if (tex.smoothtile)
2034 { 2208 {
2035 skey.tile = tex.smoothtile; 2209 skey.tile = tex.smoothtile;
2036 skey.level = tex.smoothlevel; 2210 skey.level = tex.smoothlevel;
… …
2064 // corners 2238 // corners
2065 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);
2066 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);
2067 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);
2068 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 }
2069 } 2280 }
2070 } 2281 }
2071 } 2282 }
2072 } 2283 }
2073 2284
… …
2113 { 2324 {
2114 // this time avoiding texture state changes 2325 // this time avoiding texture state changes
2115 // save gobs of state changes. 2326 // save gobs of state changes.
2116 if (key.texname != tex.name) 2327 if (key.texname != tex.name)
2117 { 2328 {
2329 self->tex [skey->tile].unused = 0;
2330
2118 glEnd (); 2331 glEnd ();
2119 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2332 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2120 glBegin (GL_QUADS); 2333 glBegin (GL_QUADS);
2121 } 2334 }
2122 2335
… …
2168 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);
2169 2382
2170 rc_draw (rc); 2383 rc_draw (rc);
2171 } 2384 }
2172 2385
2386 rc_draw (rc_ov);
2387 rc_clear (rc_ov);
2388
2173 glDisable (GL_BLEND); 2389 glDisable (GL_BLEND);
2174 rc_free (rc); 2390 rc_free (rc);
2391 rc_free (rc_ov);
2175 2392
2176 // top layer: overlays such as the health bar 2393 // top layer: overlays such as the health bar
2177 for (y = 0; y < sh; y++) 2394 for (y = 0; y < sh; y++)
2178 if (0 <= y + my && y + my < self->rows) 2395 if (0 <= y + my && y + my < self->rows)
2179 { 2396 {
… …
2184 { 2401 {
2185 mapcell *cell = row->col + (x + mx - row->c0); 2402 mapcell *cell = row->col + (x + mx - row->c0);
2186 2403
2187 int px = x * T; 2404 int px = x * T;
2188 int py = y * T; 2405 int py = y * T;
2406
2407 if (expect_false (cell->player == player))
2408 {
2409 px += sdx;
2410 py += sdy;
2411 }
2189 2412
2190 if (cell->stat_hp) 2413 if (cell->stat_hp)
2191 { 2414 {
2192 int width = cell->stat_width * T; 2415 int width = cell->stat_width * T;
2193 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2416 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2233 }; 2456 };
2234 2457
2235 int x, y; 2458 int x, y;
2236 2459
2237 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 */
2238 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2467 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2239 glEnable (GL_BLEND); 2468 glEnable (GL_BLEND);
2240 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2469 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2241 glBegin (GL_QUADS); 2470 glBegin (GL_QUADS);
2242 2471
2243 for (y = 0; y < h; y++) 2472 for (y = 0; y < h; y++)
… …
2250 float *c = color [m & 15]; 2479 float *c = color [m & 15];
2251 2480
2252 float tx1 = m & 0x40 ? 0.5 : 0.; 2481 float tx1 = m & 0x40 ? 0.5 : 0.;
2253 float tx2 = tx1 + 0.5; 2482 float tx2 = tx1 + 0.5;
2254 2483
2255 glColor4f (c[0], c[1], c[2], 0.75); 2484 glColor4f (c[0], c[1], c[2], 1);
2256 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2485 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2257 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2486 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2258 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2487 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2259 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2488 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2260 } 2489 }
… …
2282 SvCUR_set (darkness3_sv, sw34 * sh3); 2511 SvCUR_set (darkness3_sv, sw34 * sh3);
2283 2512
2284 mx += self->x - 1; 2513 mx += self->x - 1;
2285 my += self->y - 1; 2514 my += self->y - 1;
2286 2515
2287 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1); 2516 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2288 2517
2289 for (y = 0; y < sh1; y++) 2518 for (y = 0; y < sh1; y++)
2290 if (0 <= y + my && y + my < self->rows) 2519 if (0 <= y + my && y + my < self->rows)
2291 { 2520 {
2292 maprow *row = self->row + (y + my); 2521 maprow *row = self->row + (y + my);
… …
2295 if (row->c0 <= x + mx && x + mx < row->c1) 2524 if (row->c0 <= x + mx && x + mx < row->c1)
2296 { 2525 {
2297 mapcell *cell = row->col + (x + mx - row->c0); 2526 mapcell *cell = row->col + (x + mx - row->c0);
2298 2527
2299 darkness1 [y * sw1 + x] = cell->darkness 2528 darkness1 [y * sw1 + x] = cell->darkness
2300 ? 255 - (cell->darkness - 1) 2529 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2301 : 255 - FOW_DARKNESS; 2530 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2302 } 2531 }
2303 } 2532 }
2304 2533
2305 for (y = 0; y < sh; ++y) 2534 for (y = 0; y < sh; ++y)
2306 for (x = 0; x < sw; ++x) 2535 for (x = 0; x < sw; ++x)
… …
2719 } *civ, const_iv[] = { 2948 } *civ, const_iv[] = {
2720# define const_iv(name) { # name, (IV)name } 2949# define const_iv(name) { # name, (IV)name }
2721 const_iv (GL_VENDOR), 2950 const_iv (GL_VENDOR),
2722 const_iv (GL_VERSION), 2951 const_iv (GL_VERSION),
2723 const_iv (GL_EXTENSIONS), 2952 const_iv (GL_EXTENSIONS),
2953 const_iv (GL_MAX_TEXTURE_UNITS),
2724 const_iv (GL_COLOR_MATERIAL), 2954 const_iv (GL_COLOR_MATERIAL),
2725 const_iv (GL_SMOOTH), 2955 const_iv (GL_SMOOTH),
2726 const_iv (GL_FLAT), 2956 const_iv (GL_FLAT),
2727 const_iv (GL_DITHER), 2957 const_iv (GL_DITHER),
2728 const_iv (GL_BLEND), 2958 const_iv (GL_BLEND),
… …
2740 const_iv (GL_ZERO), 2970 const_iv (GL_ZERO),
2741 const_iv (GL_SRC_ALPHA), 2971 const_iv (GL_SRC_ALPHA),
2742 const_iv (GL_DST_ALPHA), 2972 const_iv (GL_DST_ALPHA),
2743 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2973 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2744 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),
2745 const_iv (GL_SRC_ALPHA_SATURATE), 2979 const_iv (GL_SRC_ALPHA_SATURATE),
2746 const_iv (GL_RGB), 2980 const_iv (GL_RGB),
2747 const_iv (GL_RGBA), 2981 const_iv (GL_RGBA),
2748 const_iv (GL_RGBA4), 2982 const_iv (GL_RGBA4),
2749 const_iv (GL_RGBA8), 2983 const_iv (GL_RGBA8),
… …
2817 const_iv (GL_NICEST), 3051 const_iv (GL_NICEST),
2818 const_iv (GL_V2F), 3052 const_iv (GL_V2F),
2819 const_iv (GL_V3F), 3053 const_iv (GL_V3F),
2820 const_iv (GL_T2F_V3F), 3054 const_iv (GL_T2F_V3F),
2821 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),
2822# undef const_iv 3059# undef const_iv
2823 }; 3060 };
2824 3061
2825 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; )
2826 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3063 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2833disable_GL_EXT_blend_func_separate () 3070disable_GL_EXT_blend_func_separate ()
2834 CODE: 3071 CODE:
2835 gl.BlendFuncSeparate = 0; 3072 gl.BlendFuncSeparate = 0;
2836 gl.BlendFuncSeparateEXT = 0; 3073 gl.BlendFuncSeparateEXT = 0;
2837 3074
3075void
3076apple_nvidia_bug (int enable)
3077
2838char * 3078char *
2839gl_vendor () 3079gl_vendor ()
2840 CODE: 3080 CODE:
2841 RETVAL = (char *)glGetString (GL_VENDOR); 3081 RETVAL = (char *)glGetString (GL_VENDOR);
2842 OUTPUT: 3082 OUTPUT:
… …
2891 3131
2892void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3132void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2893 CODE: 3133 CODE:
2894 gl_BlendFuncSeparate (sa, da, saa, daa); 3134 gl_BlendFuncSeparate (sa, da, saa, daa);
2895 3135
3136# void glBlendEquation (int se)
3137
2896void glDepthMask (int flag) 3138void glDepthMask (int flag)
2897 3139
2898void glLogicOp (int opcode) 3140void glLogicOp (int opcode)
2899 3141
2900void glColorMask (int red, int green, int blue, int alpha) 3142void glColorMask (int red, int green, int blue, int alpha)
… …
2934void glRotate (float angle, float x, float y, float z) 3176void glRotate (float angle, float x, float y, float z)
2935 CODE: 3177 CODE:
2936 glRotatef (angle, x, y, z); 3178 glRotatef (angle, x, y, z);
2937 3179
2938void glColor (float r, float g, float b, float a = 1.0) 3180void glColor (float r, float g, float b, float a = 1.0)
3181 PROTOTYPE: @
2939 ALIAS: 3182 ALIAS:
2940 glColor_premultiply = 1 3183 glColor_premultiply = 1
2941 CODE: 3184 CODE:
2942 if (ix) 3185 if (ix)
2943 { 3186 {

Diff Legend

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