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.293 by root, Thu Dec 17 02:49:38 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 87
88#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
90 90
91#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
92 92
93/* mask out modifiers we are not interested in */ 93/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
95
96#define KMOD_LRAM 0x10000 // our extension
97
98#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3
95 101
96static AV *texture_av; 102static AV *texture_av;
97 103
98static struct 104static struct
99{ 105{
… …
231 int w, h; 237 int w, h;
232 float s, t; 238 float s, t;
233 uint8_t r, g, b, a; 239 uint8_t r, g, b, a;
234 tileid smoothtile; 240 tileid smoothtile;
235 uint8_t smoothlevel; 241 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */
236} maptex; 243} maptex;
237 244
238typedef struct { 245typedef struct {
239 uint32_t player; 246 uint32_t player;
240 tileid tile[3]; 247 tileid tile[3];
… …
527 return 0; 534 return 0;
528 535
529 return 1; 536 return 1;
530} 537}
531 538
539/******************************************************************************/
540
541/* process keyboard modifiers */
542static int
543mod_munge (int mod)
544{
545 mod &= MOD_MASK;
546
547 if (mod & (KMOD_META | KMOD_ALT))
548 mod |= KMOD_LRAM;
549
550 return mod;
551}
552
532static void 553static void
533deliantra_main () 554deliantra_main ()
534{ 555{
535 char *argv[] = { 0 }; 556 char *argv[] = { 0 };
536 call_argv ("::main", G_DISCARD | G_VOID, argv); 557 call_argv ("::main", G_DISCARD | G_VOID, argv);
537 dSP;
538} 558}
539 559
540#ifdef __MACOSX__ 560#ifdef __MACOSX__
541 /* to due surprising braindamage on the side of SDL design, we 561 /* to due surprising braindamage on the side of SDL design, we
542 * do some mind-boggling hack here: SDL requires a custom main() 562 * do some mind-boggling hack here: SDL requires a custom main()
… …
603 const_iv (SDL_USEREVENT), 623 const_iv (SDL_USEREVENT),
604 624
605 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
606 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
607 const_iv (SDL_APPACTIVE), 627 const_iv (SDL_APPACTIVE),
628
629
630 const_iv (SDLK_UNKNOWN),
631 const_iv (SDLK_FIRST),
632 const_iv (SDLK_BACKSPACE),
633 const_iv (SDLK_TAB),
634 const_iv (SDLK_CLEAR),
635 const_iv (SDLK_RETURN),
636 const_iv (SDLK_PAUSE),
637 const_iv (SDLK_ESCAPE),
638 const_iv (SDLK_SPACE),
639 const_iv (SDLK_EXCLAIM),
640 const_iv (SDLK_QUOTEDBL),
641 const_iv (SDLK_HASH),
642 const_iv (SDLK_DOLLAR),
643 const_iv (SDLK_AMPERSAND),
644 const_iv (SDLK_QUOTE),
645 const_iv (SDLK_LEFTPAREN),
646 const_iv (SDLK_RIGHTPAREN),
647 const_iv (SDLK_ASTERISK),
648 const_iv (SDLK_PLUS),
649 const_iv (SDLK_COMMA),
650 const_iv (SDLK_MINUS),
651 const_iv (SDLK_PERIOD),
652 const_iv (SDLK_SLASH),
653 const_iv (SDLK_0),
654 const_iv (SDLK_1),
655 const_iv (SDLK_2),
656 const_iv (SDLK_3),
657 const_iv (SDLK_4),
658 const_iv (SDLK_5),
659 const_iv (SDLK_6),
660 const_iv (SDLK_7),
661 const_iv (SDLK_8),
662 const_iv (SDLK_9),
663 const_iv (SDLK_COLON),
664 const_iv (SDLK_SEMICOLON),
665 const_iv (SDLK_LESS),
666 const_iv (SDLK_EQUALS),
667 const_iv (SDLK_GREATER),
668 const_iv (SDLK_QUESTION),
669 const_iv (SDLK_AT),
670
671 const_iv (SDLK_LEFTBRACKET),
672 const_iv (SDLK_BACKSLASH),
673 const_iv (SDLK_RIGHTBRACKET),
674 const_iv (SDLK_CARET),
675 const_iv (SDLK_UNDERSCORE),
676 const_iv (SDLK_BACKQUOTE),
677 const_iv (SDLK_DELETE),
608 678
609 const_iv (SDLK_FIRST), 679 const_iv (SDLK_FIRST),
610 const_iv (SDLK_LAST), 680 const_iv (SDLK_LAST),
611 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
612 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
… …
688 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
689 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
690 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
691 const_iv (KMOD_MODE), 761 const_iv (KMOD_MODE),
692 762
763 const_iv (KMOD_LRAM),
764
693 const_iv (MIX_DEFAULT_FORMAT), 765 const_iv (MIX_DEFAULT_FORMAT),
694 766
695 const_iv (SDL_INIT_TIMER), 767 const_iv (SDL_INIT_TIMER),
696 const_iv (SDL_INIT_AUDIO), 768 const_iv (SDL_INIT_AUDIO),
697 const_iv (SDL_INIT_VIDEO), 769 const_iv (SDL_INIT_VIDEO),
… …
884 { 956 {
885 case SDL_KEYDOWN: 957 case SDL_KEYDOWN:
886 case SDL_KEYUP: 958 case SDL_KEYUP:
887 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 959 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
888 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 960 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); 961 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 */ 962 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); 963 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
892 break; 964 break;
893 965
894 case SDL_ACTIVEEVENT: 966 case SDL_ACTIVEEVENT:
895 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 967 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
913 x = ev.motion.x; 985 x = ev.motion.x;
914 y = ev.motion.y; 986 y = ev.motion.y;
915 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 987 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
916 } 988 }
917 989
918 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 990 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
919 hv_store (hv, "state", 5, newSViv (state), 0); 991 hv_store (hv, "state", 5, newSViv (state), 0);
920 hv_store (hv, "x", 1, newSViv (x), 0); 992 hv_store (hv, "x", 1, newSViv (x), 0);
921 hv_store (hv, "y", 1, newSViv (y), 0); 993 hv_store (hv, "y", 1, newSViv (y), 0);
922 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 994 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
923 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 995 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
1139#if DEBUG 1211#if DEBUG
1140 VALGRIND_DO_LEAK_CHECK; 1212 VALGRIND_DO_LEAK_CHECK;
1141#endif 1213#endif
1142} 1214}
1143 1215
1216int
1217SvREFCNT (SV *sv)
1218 CODE:
1219 RETVAL = SvREFCNT (sv);
1220 OUTPUT:
1221 RETVAL
1222
1144MODULE = Deliantra::Client PACKAGE = DC::Font 1223MODULE = Deliantra::Client PACKAGE = DC::Font
1145 1224
1146PROTOTYPES: DISABLE 1225PROTOTYPES: DISABLE
1147 1226
1148DC::Font 1227DC::Font
… …
1577 if (ix) 1656 if (ix)
1578 { 1657 {
1579 glDisable (GL_ALPHA_TEST); 1658 glDisable (GL_ALPHA_TEST);
1580 glDisable (GL_BLEND); 1659 glDisable (GL_BLEND);
1581 } 1660 }
1661}
1662
1663void
1664draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1)
1665 PROTOTYPE: @
1666 CODE:
1667{
1668 glEnable (GL_TEXTURE_2D);
1669 glEnable (GL_BLEND);
1670 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1671 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672
1673 glColor4f (intensity, intensity, intensity, 0.9);
1674 glPushMatrix ();
1675 glScalef (1./3, 1./3, 1.);
1676
1677 glBindTexture (GL_TEXTURE_2D, name1);
1678
1679 glBegin (GL_QUADS);
1680 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);
1681 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);
1682 glTexCoord2f (s1, t1); glVertex2f (w1, h1);
1683 glTexCoord2f (s1, 0); glVertex2f (w1, 0);
1684 glEnd ();
1685
1686 glPopMatrix ();
1687
1688 glDisable (GL_TEXTURE_2D);
1689 glDisable (GL_BLEND);
1582} 1690}
1583 1691
1584IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1692IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1585 CODE: 1693 CODE:
1586{ 1694{
… …
1692 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1800 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1693 // use uglier nearest interpolation because linear suffers 1801 // use uglier nearest interpolation because linear suffers
1694 // from transparent color bleeding and ugly wrapping effects. 1802 // from transparent color bleeding and ugly wrapping effects.
1695 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1803 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1696} 1804}
1805
1806void
1807expire_textures (DC::Map self, int texid, int count)
1808 PPCODE:
1809 for (; texid < self->texs && count; ++texid, --count)
1810 {
1811 maptex *tex = self->tex + texid;
1812
1813 if (tex->name)
1814 {
1815 if (tex->unused)
1816 {
1817 tex->name = 0;
1818 tex->unused = 0;
1819 XPUSHs (sv_2mortal (newSViv (texid)));
1820 }
1821 else
1822 tex->unused = 1;
1823 }
1824 }
1697 1825
1698int 1826int
1699ox (DC::Map self) 1827ox (DC::Map self)
1700 ALIAS: 1828 ALIAS:
1701 oy = 1 1829 oy = 1
… …
1822 cell->tile [z] = self->face2tile [face]; 1950 cell->tile [z] = self->face2tile [face];
1823 1951
1824 if (cell->tile [z]) 1952 if (cell->tile [z])
1825 { 1953 {
1826 maptex *tex = self->tex + cell->tile [z]; 1954 maptex *tex = self->tex + cell->tile [z];
1955 tex->unused = 0;
1827 if (!tex->name) 1956 if (!tex->name)
1828 av_push (missing, newSViv (cell->tile [z])); 1957 av_push (missing, newSViv (cell->tile [z]));
1829 1958
1830 if (tex->smoothtile) 1959 if (tex->smoothtile)
1831 { 1960 {
1832 maptex *smooth = self->tex + tex->smoothtile; 1961 maptex *smooth = self->tex + tex->smoothtile;
1962 smooth->unused = 0;
1833 if (!smooth->name) 1963 if (!smooth->name)
1834 av_push (missing, newSViv (tex->smoothtile)); 1964 av_push (missing, newSViv (tex->smoothtile));
1835 } 1965 }
1836 } 1966 }
1837 } 1967 }
… …
1908 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2038 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) 2039 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1910 smooth_key skey; 2040 smooth_key skey;
1911 int pl_x, pl_y; 2041 int pl_x, pl_y;
1912 maptex pl_tex; 2042 maptex pl_tex;
1913 rc_t *rc = rc_alloc (); 2043 rc_t *rc = rc_alloc ();
2044 rc_t *rc_ov = rc_alloc ();
1914 rc_key_t key; 2045 rc_key_t key;
1915 rc_array_t *arr; 2046 rc_array_t *arr, *arr_hidden;
1916 2047
1917 pl_tex.name = 0; 2048 pl_tex.name = 0;
1918 2049
1919 // thats current max. sorry. 2050 // that's current max. sorry.
1920 if (sw > 255) sw = 255; 2051 if (sw > 255) sw = 255;
1921 if (sh > 255) sh = 255; 2052 if (sh > 255) sh = 255;
1922 2053
1923 // clear key, in case of extra padding 2054 // clear key, in case of extra padding
1924 memset (&skey, 0, sizeof (skey)); 2055 memset (&skey, 0, sizeof (skey));
… …
1928 key.g = 255; 2059 key.g = 255;
1929 key.b = 255; 2060 key.b = 255;
1930 key.a = 255; 2061 key.a = 255;
1931 key.mode = GL_QUADS; 2062 key.mode = GL_QUADS;
1932 key.format = GL_T2F_V3F; 2063 key.format = GL_T2F_V3F;
1933 key.texname = -1;
1934 2064
1935 mx += self->x; 2065 mx += self->x;
1936 my += self->y; 2066 my += self->y;
1937 2067
1938 // first pass: determine smooth_max 2068 // first pass: determine smooth_max
… …
1959 2089
1960 glEnable (GL_BLEND); 2090 glEnable (GL_BLEND);
1961 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2091 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1962 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1963 2093
2094 key.texname = self->tex [TEXID_HIDDEN].name;
2095 arr_hidden = rc_array (rc_ov, &key);
2096
1964 for (z = 0; z <= 2; z++) 2097 for (z = 0; z <= 2; z++)
1965 { 2098 {
1966 memset (smooth_level, 0, sizeof (smooth_level)); 2099 memset (smooth_level, 0, sizeof (smooth_level));
2100 key.texname = -1;
1967 2101
1968 for (y = 0; y < sh; y++) 2102 for (y = 0; y < sh; y++)
1969 if (0 <= y + my && y + my < self->rows) 2103 if (0 <= y + my && y + my < self->rows)
1970 { 2104 {
1971 maprow *row = self->row + (y + my); 2105 maprow *row = self->row + (y + my);
… …
1977 tileid tile = cell->tile [z]; 2111 tileid tile = cell->tile [z];
1978 2112
1979 if (tile) 2113 if (tile)
1980 { 2114 {
1981 maptex tex = self->tex [tile]; 2115 maptex tex = self->tex [tile];
1982 int px = (x + 1) * T - tex.w; 2116 int px, py;
1983 int py = (y + 1) * T - tex.h;
1984 2117
1985 if (key.texname != tex.name) 2118 if (key.texname != tex.name)
1986 { 2119 {
2120 self->tex [tile].unused = 0;
2121
1987 if (!tex.name) 2122 if (!tex.name)
1988 tex = self->tex [2]; /* missing, replace by noface */ 2123 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1989 2124
1990 key.texname = tex.name; 2125 key.texname = tex.name;
1991 arr = rc_array (rc, &key); 2126 arr = rc_array (rc, &key);
1992 } 2127 }
2128
2129 px = (x + 1) * T - tex.w;
2130 py = (y + 1) * T - tex.h;
1993 2131
1994 if (expect_false (cell->player == player) && expect_false (z == 2)) 2132 if (expect_false (cell->player == player) && expect_false (z == 2))
1995 { 2133 {
1996 pl_x = px; 2134 pl_x = px;
1997 pl_y = py; 2135 pl_y = py;
… …
2002 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2140 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2003 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2141 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); 2142 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); 2143 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2006 2144
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 2145 // update smooth hash
2033 if (tex.smoothtile) 2146 if (tex.smoothtile)
2034 { 2147 {
2035 skey.tile = tex.smoothtile; 2148 skey.tile = tex.smoothtile;
2036 skey.level = tex.smoothlevel; 2149 skey.level = tex.smoothlevel;
… …
2064 // corners 2177 // corners
2065 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2178 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); 2179 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); 2180 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); 2181 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2182 }
2183 }
2184
2185 if (expect_false (z == 2))
2186 {
2187 /* draw question marks on top of hidden spaces */
2188 if (!cell->darkness)
2189 {
2190 maptex tex = self->tex [TEXID_HIDDEN];
2191 int px = (x + 1) * T - tex.w;
2192 int py = (y + 1) * T - tex.h;
2193
2194 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2195 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2196 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2197 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2198 }
2199
2200 if (expect_false (cell->flags))
2201 {
2202 // overlays such as the speech bubble, probably more to come
2203 if (cell->flags & 1)
2204 {
2205 rc_key_t key_ov = key;
2206 maptex tex = self->tex [TEXID_SPEECH];
2207 rc_array_t *arr;
2208 int px = x * T + T * 2 / 32;
2209 int py = y * T - T * 6 / 32;
2210
2211 key_ov.texname = tex.name;
2212 arr = rc_array (rc_ov, &key_ov);
2213
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2216 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2217 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2218 }
2069 } 2219 }
2070 } 2220 }
2071 } 2221 }
2072 } 2222 }
2073 2223
… …
2113 { 2263 {
2114 // this time avoiding texture state changes 2264 // this time avoiding texture state changes
2115 // save gobs of state changes. 2265 // save gobs of state changes.
2116 if (key.texname != tex.name) 2266 if (key.texname != tex.name)
2117 { 2267 {
2268 self->tex [skey->tile].unused = 0;
2269
2118 glEnd (); 2270 glEnd ();
2119 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2271 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2120 glBegin (GL_QUADS); 2272 glBegin (GL_QUADS);
2121 } 2273 }
2122 2274
… …
2168 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2320 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2169 2321
2170 rc_draw (rc); 2322 rc_draw (rc);
2171 } 2323 }
2172 2324
2325 rc_draw (rc_ov);
2326 rc_clear (rc_ov);
2327
2173 glDisable (GL_BLEND); 2328 glDisable (GL_BLEND);
2174 rc_free (rc); 2329 rc_free (rc);
2330 rc_free (rc_ov);
2175 2331
2176 // top layer: overlays such as the health bar 2332 // top layer: overlays such as the health bar
2177 for (y = 0; y < sh; y++) 2333 for (y = 0; y < sh; y++)
2178 if (0 <= y + my && y + my < self->rows) 2334 if (0 <= y + my && y + my < self->rows)
2179 { 2335 {
… …
2184 { 2340 {
2185 mapcell *cell = row->col + (x + mx - row->c0); 2341 mapcell *cell = row->col + (x + mx - row->c0);
2186 2342
2187 int px = x * T; 2343 int px = x * T;
2188 int py = y * T; 2344 int py = y * T;
2345
2346 if (expect_false (cell->player == player))
2347 {
2348 px += sdx;
2349 py += sdy;
2350 }
2189 2351
2190 if (cell->stat_hp) 2352 if (cell->stat_hp)
2191 { 2353 {
2192 int width = cell->stat_width * T; 2354 int width = cell->stat_width * T;
2193 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2355 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2233 }; 2395 };
2234 2396
2235 int x, y; 2397 int x, y;
2236 2398
2237 glEnable (GL_TEXTURE_2D); 2399 glEnable (GL_TEXTURE_2D);
2400 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2401 * but the nvidia driver (185.18.14) mishandles alpha textures
2402 * ansd takes the colour from god knows where instead of using
2403 * Cp. MODULATE results in the same colour, but slightly different
2404 * alpha, but atcually gives us the correct colour with nvidia.
2405 */
2238 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2406 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2239 glEnable (GL_BLEND); 2407 glEnable (GL_BLEND);
2240 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2408 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2241 glBegin (GL_QUADS); 2409 glBegin (GL_QUADS);
2242 2410
2243 for (y = 0; y < h; y++) 2411 for (y = 0; y < h; y++)
… …
2250 float *c = color [m & 15]; 2418 float *c = color [m & 15];
2251 2419
2252 float tx1 = m & 0x40 ? 0.5 : 0.; 2420 float tx1 = m & 0x40 ? 0.5 : 0.;
2253 float tx2 = tx1 + 0.5; 2421 float tx2 = tx1 + 0.5;
2254 2422
2255 glColor4f (c[0], c[1], c[2], 0.75); 2423 glColor4f (c[0], c[1], c[2], 1);
2256 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2424 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2257 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2425 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2258 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2426 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2259 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2427 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2260 } 2428 }
… …
2719 } *civ, const_iv[] = { 2887 } *civ, const_iv[] = {
2720# define const_iv(name) { # name, (IV)name } 2888# define const_iv(name) { # name, (IV)name }
2721 const_iv (GL_VENDOR), 2889 const_iv (GL_VENDOR),
2722 const_iv (GL_VERSION), 2890 const_iv (GL_VERSION),
2723 const_iv (GL_EXTENSIONS), 2891 const_iv (GL_EXTENSIONS),
2892 const_iv (GL_MAX_TEXTURE_UNITS),
2724 const_iv (GL_COLOR_MATERIAL), 2893 const_iv (GL_COLOR_MATERIAL),
2725 const_iv (GL_SMOOTH), 2894 const_iv (GL_SMOOTH),
2726 const_iv (GL_FLAT), 2895 const_iv (GL_FLAT),
2727 const_iv (GL_DITHER), 2896 const_iv (GL_DITHER),
2728 const_iv (GL_BLEND), 2897 const_iv (GL_BLEND),
… …
2740 const_iv (GL_ZERO), 2909 const_iv (GL_ZERO),
2741 const_iv (GL_SRC_ALPHA), 2910 const_iv (GL_SRC_ALPHA),
2742 const_iv (GL_DST_ALPHA), 2911 const_iv (GL_DST_ALPHA),
2743 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2912 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2744 const_iv (GL_ONE_MINUS_DST_ALPHA), 2913 const_iv (GL_ONE_MINUS_DST_ALPHA),
2914 const_iv (GL_SRC_COLOR),
2915 const_iv (GL_DST_COLOR),
2916 const_iv (GL_ONE_MINUS_SRC_COLOR),
2917 const_iv (GL_ONE_MINUS_DST_COLOR),
2745 const_iv (GL_SRC_ALPHA_SATURATE), 2918 const_iv (GL_SRC_ALPHA_SATURATE),
2746 const_iv (GL_RGB), 2919 const_iv (GL_RGB),
2747 const_iv (GL_RGBA), 2920 const_iv (GL_RGBA),
2748 const_iv (GL_RGBA4), 2921 const_iv (GL_RGBA4),
2749 const_iv (GL_RGBA8), 2922 const_iv (GL_RGBA8),
… …
2817 const_iv (GL_NICEST), 2990 const_iv (GL_NICEST),
2818 const_iv (GL_V2F), 2991 const_iv (GL_V2F),
2819 const_iv (GL_V3F), 2992 const_iv (GL_V3F),
2820 const_iv (GL_T2F_V3F), 2993 const_iv (GL_T2F_V3F),
2821 const_iv (GL_T2F_N3F_V3F), 2994 const_iv (GL_T2F_N3F_V3F),
2995 const_iv (GL_FUNC_ADD),
2996 const_iv (GL_FUNC_SUBTRACT),
2997 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2822# undef const_iv 2998# undef const_iv
2823 }; 2999 };
2824 3000
2825 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3001 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2826 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3002 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2833disable_GL_EXT_blend_func_separate () 3009disable_GL_EXT_blend_func_separate ()
2834 CODE: 3010 CODE:
2835 gl.BlendFuncSeparate = 0; 3011 gl.BlendFuncSeparate = 0;
2836 gl.BlendFuncSeparateEXT = 0; 3012 gl.BlendFuncSeparateEXT = 0;
2837 3013
3014void
3015apple_nvidia_bug (int enable)
3016
2838char * 3017char *
2839gl_vendor () 3018gl_vendor ()
2840 CODE: 3019 CODE:
2841 RETVAL = (char *)glGetString (GL_VENDOR); 3020 RETVAL = (char *)glGetString (GL_VENDOR);
2842 OUTPUT: 3021 OUTPUT:
… …
2891 3070
2892void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3071void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2893 CODE: 3072 CODE:
2894 gl_BlendFuncSeparate (sa, da, saa, daa); 3073 gl_BlendFuncSeparate (sa, da, saa, daa);
2895 3074
3075# void glBlendEquation (int se)
3076
2896void glDepthMask (int flag) 3077void glDepthMask (int flag)
2897 3078
2898void glLogicOp (int opcode) 3079void glLogicOp (int opcode)
2899 3080
2900void glColorMask (int red, int green, int blue, int alpha) 3081void glColorMask (int red, int green, int blue, int alpha)
… …
2934void glRotate (float angle, float x, float y, float z) 3115void glRotate (float angle, float x, float y, float z)
2935 CODE: 3116 CODE:
2936 glRotatef (angle, x, y, z); 3117 glRotatef (angle, x, y, z);
2937 3118
2938void glColor (float r, float g, float b, float a = 1.0) 3119void glColor (float r, float g, float b, float a = 1.0)
3120 PROTOTYPE: @
2939 ALIAS: 3121 ALIAS:
2940 glColor_premultiply = 1 3122 glColor_premultiply = 1
2941 CODE: 3123 CODE:
2942 if (ix) 3124 if (ix)
2943 { 3125 {

Diff Legend

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