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.271 by root, Sun Jul 20 15:09:29 2008 UTC vs.
Revision 1.293 by root, Thu Dec 17 02:49:38 2009 UTC

… …
39#include <SDL_endian.h> 39#include <SDL_endian.h>
40#include <SDL_image.h> 40#include <SDL_image.h>
41#include <SDL_mixer.h> 41#include <SDL_mixer.h>
42#include <SDL_opengl.h> 42#include <SDL_opengl.h>
43 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
44#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
46 51
47#include <glib/gmacros.h> 52#include <glib/gmacros.h>
48 53
… …
76#define expect_false(expr) expect ((expr) != 0, 0) 81#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1) 82#define expect_true(expr) expect ((expr) != 0, 1)
78 83
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 85
81#define FOW_DARKNESS 32 86#define FOW_DARKNESS 64
82 87
83#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
85 90
86#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
87 92
88/* mask out modifiers we are not interested in */ 93/* mask out modifiers we are not interested in */
89#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
90 101
91static AV *texture_av; 102static AV *texture_av;
92 103
93static struct 104static struct
94{ 105{
… …
226 int w, h; 237 int w, h;
227 float s, t; 238 float s, t;
228 uint8_t r, g, b, a; 239 uint8_t r, g, b, a;
229 tileid smoothtile; 240 tileid smoothtile;
230 uint8_t smoothlevel; 241 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */
231} maptex; 243} maptex;
232 244
233typedef struct { 245typedef struct {
234 uint32_t player; 246 uint32_t player;
235 tileid tile[3]; 247 tileid tile[3];
… …
521 if (!svp || !SvTRUE (*svp)) 533 if (!svp || !SvTRUE (*svp))
522 return 0; 534 return 0;
523 535
524 return 1; 536 return 1;
525} 537}
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
553static void
554deliantra_main ()
555{
556 char *argv[] = { 0 };
557 call_argv ("::main", G_DISCARD | G_VOID, argv);
558}
559
560#ifdef __MACOSX__
561 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main()
563 * on OS X, so... we provide one and call the original main(), which,
564 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
565 * and which calls our main (== SDL_main) back.
566 */
567 extern C_LINKAGE int
568 main (int argc, char *argv[])
569 {
570 deliantra_main ();
571 }
572
573 #undef main
574
575 extern C_LINKAGE int main (int argc, char *argv[]);
576
577 static void
578 SDL_braino (void)
579 {
580 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv);
582 }
583#else
584 static void
585 SDL_braino (void)
586 {
587 deliantra_main ();
588 }
589#endif
526 590
527MODULE = Deliantra::Client PACKAGE = DC 591MODULE = Deliantra::Client PACKAGE = DC
528 592
529PROTOTYPES: ENABLE 593PROTOTYPES: ENABLE
530 594
… …
559 const_iv (SDL_USEREVENT), 623 const_iv (SDL_USEREVENT),
560 624
561 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
562 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
563 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),
564 678
565 const_iv (SDLK_FIRST), 679 const_iv (SDLK_FIRST),
566 const_iv (SDLK_LAST), 680 const_iv (SDLK_LAST),
567 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
568 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
… …
644 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
645 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
646 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
647 const_iv (KMOD_MODE), 761 const_iv (KMOD_MODE),
648 762
763 const_iv (KMOD_LRAM),
764
649 const_iv (MIX_DEFAULT_FORMAT), 765 const_iv (MIX_DEFAULT_FORMAT),
650 766
651 const_iv (SDL_INIT_TIMER), 767 const_iv (SDL_INIT_TIMER),
652 const_iv (SDL_INIT_AUDIO), 768 const_iv (SDL_INIT_AUDIO),
653 const_iv (SDL_INIT_VIDEO), 769 const_iv (SDL_INIT_VIDEO),
… …
721#endif 837#endif
722} 838}
723 839
724char *SDL_GetError () 840char *SDL_GetError ()
725 841
842void SDL_braino ()
843
726int SDL_Init (U32 flags) 844int SDL_Init (U32 flags)
727 845
728int SDL_InitSubSystem (U32 flags) 846int SDL_InitSubSystem (U32 flags)
729 847
730void SDL_QuitSubSystem (U32 flags) 848void SDL_QuitSubSystem (U32 flags)
… …
838 { 956 {
839 case SDL_KEYDOWN: 957 case SDL_KEYDOWN:
840 case SDL_KEYUP: 958 case SDL_KEYUP:
841 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 959 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
842 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 960 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
843 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);
844 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 */
845 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 963 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
846 break; 964 break;
847 965
848 case SDL_ACTIVEEVENT: 966 case SDL_ACTIVEEVENT:
849 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 967 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
867 x = ev.motion.x; 985 x = ev.motion.x;
868 y = ev.motion.y; 986 y = ev.motion.y;
869 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 987 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
870 } 988 }
871 989
872 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 990 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
873 hv_store (hv, "state", 5, newSViv (state), 0); 991 hv_store (hv, "state", 5, newSViv (state), 0);
874 hv_store (hv, "x", 1, newSViv (x), 0); 992 hv_store (hv, "x", 1, newSViv (x), 0);
875 hv_store (hv, "y", 1, newSViv (y), 0); 993 hv_store (hv, "y", 1, newSViv (y), 0);
876 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 994 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
877 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 995 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
1093#if DEBUG 1211#if DEBUG
1094 VALGRIND_DO_LEAK_CHECK; 1212 VALGRIND_DO_LEAK_CHECK;
1095#endif 1213#endif
1096} 1214}
1097 1215
1216int
1217SvREFCNT (SV *sv)
1218 CODE:
1219 RETVAL = SvREFCNT (sv);
1220 OUTPUT:
1221 RETVAL
1222
1098MODULE = Deliantra::Client PACKAGE = DC::Font 1223MODULE = Deliantra::Client PACKAGE = DC::Font
1099 1224
1100PROTOTYPES: DISABLE 1225PROTOTYPES: DISABLE
1101 1226
1102DC::Font 1227DC::Font
… …
1531 if (ix) 1656 if (ix)
1532 { 1657 {
1533 glDisable (GL_ALPHA_TEST); 1658 glDisable (GL_ALPHA_TEST);
1534 glDisable (GL_BLEND); 1659 glDisable (GL_BLEND);
1535 } 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);
1536} 1690}
1537 1691
1538IV 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)
1539 CODE: 1693 CODE:
1540{ 1694{
… …
1646 //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);
1647 // use uglier nearest interpolation because linear suffers 1801 // use uglier nearest interpolation because linear suffers
1648 // from transparent color bleeding and ugly wrapping effects. 1802 // from transparent color bleeding and ugly wrapping effects.
1649 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1803 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1650} 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 }
1651 1825
1652int 1826int
1653ox (DC::Map self) 1827ox (DC::Map self)
1654 ALIAS: 1828 ALIAS:
1655 oy = 1 1829 oy = 1
… …
1776 cell->tile [z] = self->face2tile [face]; 1950 cell->tile [z] = self->face2tile [face];
1777 1951
1778 if (cell->tile [z]) 1952 if (cell->tile [z])
1779 { 1953 {
1780 maptex *tex = self->tex + cell->tile [z]; 1954 maptex *tex = self->tex + cell->tile [z];
1955 tex->unused = 0;
1781 if (!tex->name) 1956 if (!tex->name)
1782 av_push (missing, newSViv (cell->tile [z])); 1957 av_push (missing, newSViv (cell->tile [z]));
1783 1958
1784 if (tex->smoothtile) 1959 if (tex->smoothtile)
1785 { 1960 {
1786 maptex *smooth = self->tex + tex->smoothtile; 1961 maptex *smooth = self->tex + tex->smoothtile;
1962 smooth->unused = 0;
1787 if (!smooth->name) 1963 if (!smooth->name)
1788 av_push (missing, newSViv (tex->smoothtile)); 1964 av_push (missing, newSViv (tex->smoothtile));
1789 } 1965 }
1790 } 1966 }
1791 } 1967 }
… …
1862 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
1863 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)
1864 smooth_key skey; 2040 smooth_key skey;
1865 int pl_x, pl_y; 2041 int pl_x, pl_y;
1866 maptex pl_tex; 2042 maptex pl_tex;
1867 rc_t *rc = rc_alloc (); 2043 rc_t *rc = rc_alloc ();
2044 rc_t *rc_ov = rc_alloc ();
1868 rc_key_t key; 2045 rc_key_t key;
1869 rc_array_t *arr; 2046 rc_array_t *arr, *arr_hidden;
1870 2047
1871 pl_tex.name = 0; 2048 pl_tex.name = 0;
1872 2049
1873 // thats current max. sorry. 2050 // that's current max. sorry.
1874 if (sw > 255) sw = 255; 2051 if (sw > 255) sw = 255;
1875 if (sh > 255) sh = 255; 2052 if (sh > 255) sh = 255;
1876 2053
1877 // clear key, in case of extra padding 2054 // clear key, in case of extra padding
1878 memset (&skey, 0, sizeof (skey)); 2055 memset (&skey, 0, sizeof (skey));
… …
1882 key.g = 255; 2059 key.g = 255;
1883 key.b = 255; 2060 key.b = 255;
1884 key.a = 255; 2061 key.a = 255;
1885 key.mode = GL_QUADS; 2062 key.mode = GL_QUADS;
1886 key.format = GL_T2F_V3F; 2063 key.format = GL_T2F_V3F;
1887 key.texname = -1;
1888 2064
1889 mx += self->x; 2065 mx += self->x;
1890 my += self->y; 2066 my += self->y;
1891 2067
1892 // first pass: determine smooth_max 2068 // first pass: determine smooth_max
… …
1913 2089
1914 glEnable (GL_BLEND); 2090 glEnable (GL_BLEND);
1915 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2091 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1916 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1917 2093
2094 key.texname = self->tex [TEXID_HIDDEN].name;
2095 arr_hidden = rc_array (rc_ov, &key);
2096
1918 for (z = 0; z <= 2; z++) 2097 for (z = 0; z <= 2; z++)
1919 { 2098 {
1920 memset (smooth_level, 0, sizeof (smooth_level)); 2099 memset (smooth_level, 0, sizeof (smooth_level));
2100 key.texname = -1;
1921 2101
1922 for (y = 0; y < sh; y++) 2102 for (y = 0; y < sh; y++)
1923 if (0 <= y + my && y + my < self->rows) 2103 if (0 <= y + my && y + my < self->rows)
1924 { 2104 {
1925 maprow *row = self->row + (y + my); 2105 maprow *row = self->row + (y + my);
… …
1931 tileid tile = cell->tile [z]; 2111 tileid tile = cell->tile [z];
1932 2112
1933 if (tile) 2113 if (tile)
1934 { 2114 {
1935 maptex tex = self->tex [tile]; 2115 maptex tex = self->tex [tile];
1936 int px = (x + 1) * T - tex.w; 2116 int px, py;
1937 int py = (y + 1) * T - tex.h;
1938 2117
1939 if (key.texname != tex.name) 2118 if (key.texname != tex.name)
1940 { 2119 {
2120 self->tex [tile].unused = 0;
2121
1941 if (!tex.name) 2122 if (!tex.name)
1942 tex = self->tex [2]; /* missing, replace by noface */ 2123 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1943 2124
1944 key.texname = tex.name; 2125 key.texname = tex.name;
1945 arr = rc_array (rc, &key); 2126 arr = rc_array (rc, &key);
1946 } 2127 }
2128
2129 px = (x + 1) * T - tex.w;
2130 py = (y + 1) * T - tex.h;
1947 2131
1948 if (expect_false (cell->player == player) && expect_false (z == 2)) 2132 if (expect_false (cell->player == player) && expect_false (z == 2))
1949 { 2133 {
1950 pl_x = px; 2134 pl_x = px;
1951 pl_y = py; 2135 pl_y = py;
… …
1956 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2140 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1957 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);
1958 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);
1959 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);
1960 2144
1961 if (expect_false (cell->flags) && expect_false (z == 2))
1962 {
1963 // overlays such as the speech bubble, probably more to come
1964 if (cell->flags & 1)
1965 {
1966 maptex tex = self->tex [1];
1967 int px = x * T + T * 2 / 32;
1968 int py = y * T - T * 6 / 32;
1969
1970 if (tex.name)
1971 {
1972 if (key.texname != tex.name)
1973 {
1974 key.texname = tex.name;
1975 arr = rc_array (rc, &key);
1976 }
1977
1978 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1979 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1980 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1981 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1982 }
1983 }
1984 }
1985
1986 // update smooth hash 2145 // update smooth hash
1987 if (tex.smoothtile) 2146 if (tex.smoothtile)
1988 { 2147 {
1989 skey.tile = tex.smoothtile; 2148 skey.tile = tex.smoothtile;
1990 skey.level = tex.smoothlevel; 2149 skey.level = tex.smoothlevel;
… …
2018 // corners 2177 // corners
2019 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);
2020 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);
2021 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);
2022 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 }
2023 } 2219 }
2024 } 2220 }
2025 } 2221 }
2026 } 2222 }
2027 2223
… …
2067 { 2263 {
2068 // this time avoiding texture state changes 2264 // this time avoiding texture state changes
2069 // save gobs of state changes. 2265 // save gobs of state changes.
2070 if (key.texname != tex.name) 2266 if (key.texname != tex.name)
2071 { 2267 {
2268 self->tex [skey->tile].unused = 0;
2269
2072 glEnd (); 2270 glEnd ();
2073 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2271 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2074 glBegin (GL_QUADS); 2272 glBegin (GL_QUADS);
2075 } 2273 }
2076 2274
… …
2122 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);
2123 2321
2124 rc_draw (rc); 2322 rc_draw (rc);
2125 } 2323 }
2126 2324
2325 rc_draw (rc_ov);
2326 rc_clear (rc_ov);
2327
2127 glDisable (GL_BLEND); 2328 glDisable (GL_BLEND);
2128 rc_free (rc); 2329 rc_free (rc);
2330 rc_free (rc_ov);
2129 2331
2130 // top layer: overlays such as the health bar 2332 // top layer: overlays such as the health bar
2131 for (y = 0; y < sh; y++) 2333 for (y = 0; y < sh; y++)
2132 if (0 <= y + my && y + my < self->rows) 2334 if (0 <= y + my && y + my < self->rows)
2133 { 2335 {
… …
2138 { 2340 {
2139 mapcell *cell = row->col + (x + mx - row->c0); 2341 mapcell *cell = row->col + (x + mx - row->c0);
2140 2342
2141 int px = x * T; 2343 int px = x * T;
2142 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 }
2143 2351
2144 if (cell->stat_hp) 2352 if (cell->stat_hp)
2145 { 2353 {
2146 int width = cell->stat_width * T; 2354 int width = cell->stat_width * T;
2147 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2355 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2187 }; 2395 };
2188 2396
2189 int x, y; 2397 int x, y;
2190 2398
2191 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 */
2192 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2406 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2193 glEnable (GL_BLEND); 2407 glEnable (GL_BLEND);
2194 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2408 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2195 glBegin (GL_QUADS); 2409 glBegin (GL_QUADS);
2196 2410
2197 for (y = 0; y < h; y++) 2411 for (y = 0; y < h; y++)
… …
2204 float *c = color [m & 15]; 2418 float *c = color [m & 15];
2205 2419
2206 float tx1 = m & 0x40 ? 0.5 : 0.; 2420 float tx1 = m & 0x40 ? 0.5 : 0.;
2207 float tx2 = tx1 + 0.5; 2421 float tx2 = tx1 + 0.5;
2208 2422
2209 glColor4f (c[0], c[1], c[2], 0.75); 2423 glColor4f (c[0], c[1], c[2], 1);
2210 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2424 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2211 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2425 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2212 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2426 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2213 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2427 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2214 } 2428 }
… …
2673 } *civ, const_iv[] = { 2887 } *civ, const_iv[] = {
2674# define const_iv(name) { # name, (IV)name } 2888# define const_iv(name) { # name, (IV)name }
2675 const_iv (GL_VENDOR), 2889 const_iv (GL_VENDOR),
2676 const_iv (GL_VERSION), 2890 const_iv (GL_VERSION),
2677 const_iv (GL_EXTENSIONS), 2891 const_iv (GL_EXTENSIONS),
2892 const_iv (GL_MAX_TEXTURE_UNITS),
2678 const_iv (GL_COLOR_MATERIAL), 2893 const_iv (GL_COLOR_MATERIAL),
2679 const_iv (GL_SMOOTH), 2894 const_iv (GL_SMOOTH),
2680 const_iv (GL_FLAT), 2895 const_iv (GL_FLAT),
2681 const_iv (GL_DITHER), 2896 const_iv (GL_DITHER),
2682 const_iv (GL_BLEND), 2897 const_iv (GL_BLEND),
… …
2694 const_iv (GL_ZERO), 2909 const_iv (GL_ZERO),
2695 const_iv (GL_SRC_ALPHA), 2910 const_iv (GL_SRC_ALPHA),
2696 const_iv (GL_DST_ALPHA), 2911 const_iv (GL_DST_ALPHA),
2697 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2912 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2698 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),
2699 const_iv (GL_SRC_ALPHA_SATURATE), 2918 const_iv (GL_SRC_ALPHA_SATURATE),
2700 const_iv (GL_RGB), 2919 const_iv (GL_RGB),
2701 const_iv (GL_RGBA), 2920 const_iv (GL_RGBA),
2702 const_iv (GL_RGBA4), 2921 const_iv (GL_RGBA4),
2703 const_iv (GL_RGBA8), 2922 const_iv (GL_RGBA8),
… …
2771 const_iv (GL_NICEST), 2990 const_iv (GL_NICEST),
2772 const_iv (GL_V2F), 2991 const_iv (GL_V2F),
2773 const_iv (GL_V3F), 2992 const_iv (GL_V3F),
2774 const_iv (GL_T2F_V3F), 2993 const_iv (GL_T2F_V3F),
2775 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),
2776# undef const_iv 2998# undef const_iv
2777 }; 2999 };
2778 3000
2779 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; )
2780 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3002 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2787disable_GL_EXT_blend_func_separate () 3009disable_GL_EXT_blend_func_separate ()
2788 CODE: 3010 CODE:
2789 gl.BlendFuncSeparate = 0; 3011 gl.BlendFuncSeparate = 0;
2790 gl.BlendFuncSeparateEXT = 0; 3012 gl.BlendFuncSeparateEXT = 0;
2791 3013
3014void
3015apple_nvidia_bug (int enable)
3016
2792char * 3017char *
2793gl_vendor () 3018gl_vendor ()
2794 CODE: 3019 CODE:
2795 RETVAL = (char *)glGetString (GL_VENDOR); 3020 RETVAL = (char *)glGetString (GL_VENDOR);
2796 OUTPUT: 3021 OUTPUT:
… …
2845 3070
2846void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3071void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2847 CODE: 3072 CODE:
2848 gl_BlendFuncSeparate (sa, da, saa, daa); 3073 gl_BlendFuncSeparate (sa, da, saa, daa);
2849 3074
3075# void glBlendEquation (int se)
3076
2850void glDepthMask (int flag) 3077void glDepthMask (int flag)
2851 3078
2852void glLogicOp (int opcode) 3079void glLogicOp (int opcode)
2853 3080
2854void glColorMask (int red, int green, int blue, int alpha) 3081void glColorMask (int red, int green, int blue, int alpha)
… …
2888void glRotate (float angle, float x, float y, float z) 3115void glRotate (float angle, float x, float y, float z)
2889 CODE: 3116 CODE:
2890 glRotatef (angle, x, y, z); 3117 glRotatef (angle, x, y, z);
2891 3118
2892void 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: @
2893 ALIAS: 3121 ALIAS:
2894 glColor_premultiply = 1 3122 glColor_premultiply = 1
2895 CODE: 3123 CODE:
2896 if (ix) 3124 if (ix)
2897 { 3125 {

Diff Legend

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