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.267 by root, Sun Jul 20 02:55:36 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];
… …
369 self->rows = 0; 381 self->rows = 0;
370} 382}
371 383
372#define CELL_CLEAR(cell) \ 384#define CELL_CLEAR(cell) \
373 do { \ 385 do { \
386 if ((cell)->player) \
387 (cell)->tile [2] = 0; \
374 (cell)->darkness = 0; \ 388 (cell)->darkness = 0; \
375 (cell)->stat_hp = 0; \ 389 (cell)->stat_hp = 0; \
376 (cell)->flags = 0; \ 390 (cell)->flags = 0; \
377 (cell)->player = 0; \ 391 (cell)->player = 0; \
378 } while (0) 392 } while (0)
… …
519 if (!svp || !SvTRUE (*svp)) 533 if (!svp || !SvTRUE (*svp))
520 return 0; 534 return 0;
521 535
522 return 1; 536 return 1;
523} 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
524 590
525MODULE = Deliantra::Client PACKAGE = DC 591MODULE = Deliantra::Client PACKAGE = DC
526 592
527PROTOTYPES: ENABLE 593PROTOTYPES: ENABLE
528 594
… …
557 const_iv (SDL_USEREVENT), 623 const_iv (SDL_USEREVENT),
558 624
559 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
560 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
561 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),
562 678
563 const_iv (SDLK_FIRST), 679 const_iv (SDLK_FIRST),
564 const_iv (SDLK_LAST), 680 const_iv (SDLK_LAST),
565 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
566 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
… …
642 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
643 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
644 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
645 const_iv (KMOD_MODE), 761 const_iv (KMOD_MODE),
646 762
763 const_iv (KMOD_LRAM),
764
647 const_iv (MIX_DEFAULT_FORMAT), 765 const_iv (MIX_DEFAULT_FORMAT),
648 766
649 const_iv (SDL_INIT_TIMER), 767 const_iv (SDL_INIT_TIMER),
650 const_iv (SDL_INIT_AUDIO), 768 const_iv (SDL_INIT_AUDIO),
651 const_iv (SDL_INIT_VIDEO), 769 const_iv (SDL_INIT_VIDEO),
… …
669 const_iv (SDL_GL_ACCUM_ALPHA_SIZE), 787 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
670 const_iv (SDL_GL_STEREO), 788 const_iv (SDL_GL_STEREO),
671 const_iv (SDL_GL_MULTISAMPLEBUFFERS), 789 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
672 const_iv (SDL_GL_MULTISAMPLESAMPLES), 790 const_iv (SDL_GL_MULTISAMPLESAMPLES),
673 const_iv (SDL_GL_ACCELERATED_VISUAL), 791 const_iv (SDL_GL_ACCELERATED_VISUAL),
674 const_iv (SDL_GL_SWAP_CONTROL) 792 const_iv (SDL_GL_SWAP_CONTROL),
793
794 const_iv (FOW_DARKNESS)
675# undef const_iv 795# undef const_iv
676 }; 796 };
677 797
678 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 798 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
679 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
716 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 836 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
717#endif 837#endif
718} 838}
719 839
720char *SDL_GetError () 840char *SDL_GetError ()
841
842void SDL_braino ()
721 843
722int SDL_Init (U32 flags) 844int SDL_Init (U32 flags)
723 845
724int SDL_InitSubSystem (U32 flags) 846int SDL_InitSubSystem (U32 flags)
725 847
… …
834 { 956 {
835 case SDL_KEYDOWN: 957 case SDL_KEYDOWN:
836 case SDL_KEYUP: 958 case SDL_KEYUP:
837 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 959 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
838 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 960 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
839 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);
840 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 */
841 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 963 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
842 break; 964 break;
843 965
844 case SDL_ACTIVEEVENT: 966 case SDL_ACTIVEEVENT:
845 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 967 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
863 x = ev.motion.x; 985 x = ev.motion.x;
864 y = ev.motion.y; 986 y = ev.motion.y;
865 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 987 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
866 } 988 }
867 989
868 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 990 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
869 hv_store (hv, "state", 5, newSViv (state), 0); 991 hv_store (hv, "state", 5, newSViv (state), 0);
870 hv_store (hv, "x", 1, newSViv (x), 0); 992 hv_store (hv, "x", 1, newSViv (x), 0);
871 hv_store (hv, "y", 1, newSViv (y), 0); 993 hv_store (hv, "y", 1, newSViv (y), 0);
872 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 994 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
873 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 995 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
1089#if DEBUG 1211#if DEBUG
1090 VALGRIND_DO_LEAK_CHECK; 1212 VALGRIND_DO_LEAK_CHECK;
1091#endif 1213#endif
1092} 1214}
1093 1215
1216int
1217SvREFCNT (SV *sv)
1218 CODE:
1219 RETVAL = SvREFCNT (sv);
1220 OUTPUT:
1221 RETVAL
1222
1094MODULE = Deliantra::Client PACKAGE = DC::Font 1223MODULE = Deliantra::Client PACKAGE = DC::Font
1095 1224
1096PROTOTYPES: DISABLE 1225PROTOTYPES: DISABLE
1097 1226
1098DC::Font 1227DC::Font
… …
1527 if (ix) 1656 if (ix)
1528 { 1657 {
1529 glDisable (GL_ALPHA_TEST); 1658 glDisable (GL_ALPHA_TEST);
1530 glDisable (GL_BLEND); 1659 glDisable (GL_BLEND);
1531 } 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);
1532} 1690}
1533 1691
1534IV 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)
1535 CODE: 1693 CODE:
1536{ 1694{
… …
1642 //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);
1643 // use uglier nearest interpolation because linear suffers 1801 // use uglier nearest interpolation because linear suffers
1644 // from transparent color bleeding and ugly wrapping effects. 1802 // from transparent color bleeding and ugly wrapping effects.
1645 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1803 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1646} 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 }
1647 1825
1648int 1826int
1649ox (DC::Map self) 1827ox (DC::Map self)
1650 ALIAS: 1828 ALIAS:
1651 oy = 1 1829 oy = 1
… …
1772 cell->tile [z] = self->face2tile [face]; 1950 cell->tile [z] = self->face2tile [face];
1773 1951
1774 if (cell->tile [z]) 1952 if (cell->tile [z])
1775 { 1953 {
1776 maptex *tex = self->tex + cell->tile [z]; 1954 maptex *tex = self->tex + cell->tile [z];
1955 tex->unused = 0;
1777 if (!tex->name) 1956 if (!tex->name)
1778 av_push (missing, newSViv (cell->tile [z])); 1957 av_push (missing, newSViv (cell->tile [z]));
1779 1958
1780 if (tex->smoothtile) 1959 if (tex->smoothtile)
1781 { 1960 {
1782 maptex *smooth = self->tex + tex->smoothtile; 1961 maptex *smooth = self->tex + tex->smoothtile;
1962 smooth->unused = 0;
1783 if (!smooth->name) 1963 if (!smooth->name)
1784 av_push (missing, newSViv (tex->smoothtile)); 1964 av_push (missing, newSViv (tex->smoothtile));
1785 } 1965 }
1786 } 1966 }
1787 } 1967 }
… …
1858 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
1859 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)
1860 smooth_key skey; 2040 smooth_key skey;
1861 int pl_x, pl_y; 2041 int pl_x, pl_y;
1862 maptex pl_tex; 2042 maptex pl_tex;
1863 rc_t *rc = rc_alloc (); 2043 rc_t *rc = rc_alloc ();
2044 rc_t *rc_ov = rc_alloc ();
1864 rc_key_t key; 2045 rc_key_t key;
1865 rc_array_t *arr; 2046 rc_array_t *arr, *arr_hidden;
1866 2047
1867 pl_tex.name = 0; 2048 pl_tex.name = 0;
1868 2049
1869 // thats current max. sorry. 2050 // that's current max. sorry.
1870 if (sw > 255) sw = 255; 2051 if (sw > 255) sw = 255;
1871 if (sh > 255) sh = 255; 2052 if (sh > 255) sh = 255;
1872 2053
1873 // clear key, in case of extra padding 2054 // clear key, in case of extra padding
1874 memset (&skey, 0, sizeof (skey)); 2055 memset (&skey, 0, sizeof (skey));
… …
1878 key.g = 255; 2059 key.g = 255;
1879 key.b = 255; 2060 key.b = 255;
1880 key.a = 255; 2061 key.a = 255;
1881 key.mode = GL_QUADS; 2062 key.mode = GL_QUADS;
1882 key.format = GL_T2F_V3F; 2063 key.format = GL_T2F_V3F;
1883 key.texname = -1;
1884 2064
1885 mx += self->x; 2065 mx += self->x;
1886 my += self->y; 2066 my += self->y;
1887 2067
1888 // first pass: determine smooth_max 2068 // first pass: determine smooth_max
… …
1909 2089
1910 glEnable (GL_BLEND); 2090 glEnable (GL_BLEND);
1911 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2091 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1912 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1913 2093
2094 key.texname = self->tex [TEXID_HIDDEN].name;
2095 arr_hidden = rc_array (rc_ov, &key);
2096
1914 for (z = 0; z <= 2; z++) 2097 for (z = 0; z <= 2; z++)
1915 { 2098 {
1916 memset (smooth_level, 0, sizeof (smooth_level)); 2099 memset (smooth_level, 0, sizeof (smooth_level));
2100 key.texname = -1;
1917 2101
1918 for (y = 0; y < sh; y++) 2102 for (y = 0; y < sh; y++)
1919 if (0 <= y + my && y + my < self->rows) 2103 if (0 <= y + my && y + my < self->rows)
1920 { 2104 {
1921 maprow *row = self->row + (y + my); 2105 maprow *row = self->row + (y + my);
… …
1927 tileid tile = cell->tile [z]; 2111 tileid tile = cell->tile [z];
1928 2112
1929 if (tile) 2113 if (tile)
1930 { 2114 {
1931 maptex tex = self->tex [tile]; 2115 maptex tex = self->tex [tile];
1932 int px = (x + 1) * T - tex.w; 2116 int px, py;
1933 int py = (y + 1) * T - tex.h;
1934 2117
1935 if (key.texname != tex.name) 2118 if (key.texname != tex.name)
1936 { 2119 {
2120 self->tex [tile].unused = 0;
2121
1937 if (!tex.name) 2122 if (!tex.name)
1938 tex = self->tex [2]; /* missing, replace by noface */ 2123 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1939 2124
1940 key.texname = tex.name; 2125 key.texname = tex.name;
1941 arr = rc_array (rc, &key); 2126 arr = rc_array (rc, &key);
1942 } 2127 }
2128
2129 px = (x + 1) * T - tex.w;
2130 py = (y + 1) * T - tex.h;
1943 2131
1944 if (expect_false (cell->player == player) && expect_false (z == 2)) 2132 if (expect_false (cell->player == player) && expect_false (z == 2))
1945 { 2133 {
1946 pl_x = px; 2134 pl_x = px;
1947 pl_y = py; 2135 pl_y = py;
… …
1952 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2140 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1953 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);
1954 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);
1955 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);
1956 2144
1957 if (expect_false (cell->flags) && expect_false (z == 2))
1958 {
1959 // overlays such as the speech bubble, probably more to come
1960 if (cell->flags & 1)
1961 {
1962 maptex tex = self->tex [1];
1963 int px = x * T + T * 2 / 32;
1964 int py = y * T - T * 6 / 32;
1965
1966 if (tex.name)
1967 {
1968 if (key.texname != tex.name)
1969 {
1970 key.texname = tex.name;
1971 arr = rc_array (rc, &key);
1972 }
1973
1974 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1975 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1976 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1977 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1978 }
1979 }
1980 }
1981
1982 // update smooth hash 2145 // update smooth hash
1983 if (tex.smoothtile) 2146 if (tex.smoothtile)
1984 { 2147 {
1985 skey.tile = tex.smoothtile; 2148 skey.tile = tex.smoothtile;
1986 skey.level = tex.smoothlevel; 2149 skey.level = tex.smoothlevel;
… …
2014 // corners 2177 // corners
2015 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);
2016 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);
2017 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);
2018 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 }
2019 } 2219 }
2020 } 2220 }
2021 } 2221 }
2022 } 2222 }
2023 2223
… …
2063 { 2263 {
2064 // this time avoiding texture state changes 2264 // this time avoiding texture state changes
2065 // save gobs of state changes. 2265 // save gobs of state changes.
2066 if (key.texname != tex.name) 2266 if (key.texname != tex.name)
2067 { 2267 {
2268 self->tex [skey->tile].unused = 0;
2269
2068 glEnd (); 2270 glEnd ();
2069 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2271 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2070 glBegin (GL_QUADS); 2272 glBegin (GL_QUADS);
2071 } 2273 }
2072 2274
… …
2118 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);
2119 2321
2120 rc_draw (rc); 2322 rc_draw (rc);
2121 } 2323 }
2122 2324
2325 rc_draw (rc_ov);
2326 rc_clear (rc_ov);
2327
2123 glDisable (GL_BLEND); 2328 glDisable (GL_BLEND);
2124 rc_free (rc); 2329 rc_free (rc);
2330 rc_free (rc_ov);
2125 2331
2126 // top layer: overlays such as the health bar 2332 // top layer: overlays such as the health bar
2127 for (y = 0; y < sh; y++) 2333 for (y = 0; y < sh; y++)
2128 if (0 <= y + my && y + my < self->rows) 2334 if (0 <= y + my && y + my < self->rows)
2129 { 2335 {
… …
2134 { 2340 {
2135 mapcell *cell = row->col + (x + mx - row->c0); 2341 mapcell *cell = row->col + (x + mx - row->c0);
2136 2342
2137 int px = x * T; 2343 int px = x * T;
2138 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 }
2139 2351
2140 if (cell->stat_hp) 2352 if (cell->stat_hp)
2141 { 2353 {
2142 int width = cell->stat_width * T; 2354 int width = cell->stat_width * T;
2143 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2355 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2183 }; 2395 };
2184 2396
2185 int x, y; 2397 int x, y;
2186 2398
2187 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 */
2188 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2406 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2189 glEnable (GL_BLEND); 2407 glEnable (GL_BLEND);
2190 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2408 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2191 glBegin (GL_QUADS); 2409 glBegin (GL_QUADS);
2192 2410
2193 for (y = 0; y < h; y++) 2411 for (y = 0; y < h; y++)
… …
2200 float *c = color [m & 15]; 2418 float *c = color [m & 15];
2201 2419
2202 float tx1 = m & 0x40 ? 0.5 : 0.; 2420 float tx1 = m & 0x40 ? 0.5 : 0.;
2203 float tx2 = tx1 + 0.5; 2421 float tx2 = tx1 + 0.5;
2204 2422
2205 glColor4f (c[0], c[1], c[2], 0.75); 2423 glColor4f (c[0], c[1], c[2], 1);
2206 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2424 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2207 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2425 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2208 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2426 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2209 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2427 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2210 } 2428 }
… …
2232 SvCUR_set (darkness3_sv, sw34 * sh3); 2450 SvCUR_set (darkness3_sv, sw34 * sh3);
2233 2451
2234 mx += self->x - 1; 2452 mx += self->x - 1;
2235 my += self->y - 1; 2453 my += self->y - 1;
2236 2454
2237 memset (darkness1, 255, sw1 * sh1); 2455 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2238 2456
2239 for (y = 0; y < sh1; y++) 2457 for (y = 0; y < sh1; y++)
2240 if (0 <= y + my && y + my < self->rows) 2458 if (0 <= y + my && y + my < self->rows)
2241 { 2459 {
2242 maprow *row = self->row + (y + my); 2460 maprow *row = self->row + (y + my);
… …
2669 } *civ, const_iv[] = { 2887 } *civ, const_iv[] = {
2670# define const_iv(name) { # name, (IV)name } 2888# define const_iv(name) { # name, (IV)name }
2671 const_iv (GL_VENDOR), 2889 const_iv (GL_VENDOR),
2672 const_iv (GL_VERSION), 2890 const_iv (GL_VERSION),
2673 const_iv (GL_EXTENSIONS), 2891 const_iv (GL_EXTENSIONS),
2892 const_iv (GL_MAX_TEXTURE_UNITS),
2674 const_iv (GL_COLOR_MATERIAL), 2893 const_iv (GL_COLOR_MATERIAL),
2675 const_iv (GL_SMOOTH), 2894 const_iv (GL_SMOOTH),
2676 const_iv (GL_FLAT), 2895 const_iv (GL_FLAT),
2677 const_iv (GL_DITHER), 2896 const_iv (GL_DITHER),
2678 const_iv (GL_BLEND), 2897 const_iv (GL_BLEND),
… …
2690 const_iv (GL_ZERO), 2909 const_iv (GL_ZERO),
2691 const_iv (GL_SRC_ALPHA), 2910 const_iv (GL_SRC_ALPHA),
2692 const_iv (GL_DST_ALPHA), 2911 const_iv (GL_DST_ALPHA),
2693 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2912 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2694 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),
2695 const_iv (GL_SRC_ALPHA_SATURATE), 2918 const_iv (GL_SRC_ALPHA_SATURATE),
2696 const_iv (GL_RGB), 2919 const_iv (GL_RGB),
2697 const_iv (GL_RGBA), 2920 const_iv (GL_RGBA),
2698 const_iv (GL_RGBA4), 2921 const_iv (GL_RGBA4),
2699 const_iv (GL_RGBA8), 2922 const_iv (GL_RGBA8),
… …
2767 const_iv (GL_NICEST), 2990 const_iv (GL_NICEST),
2768 const_iv (GL_V2F), 2991 const_iv (GL_V2F),
2769 const_iv (GL_V3F), 2992 const_iv (GL_V3F),
2770 const_iv (GL_T2F_V3F), 2993 const_iv (GL_T2F_V3F),
2771 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),
2772# undef const_iv 2998# undef const_iv
2773 }; 2999 };
2774 3000
2775 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; )
2776 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3002 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2783disable_GL_EXT_blend_func_separate () 3009disable_GL_EXT_blend_func_separate ()
2784 CODE: 3010 CODE:
2785 gl.BlendFuncSeparate = 0; 3011 gl.BlendFuncSeparate = 0;
2786 gl.BlendFuncSeparateEXT = 0; 3012 gl.BlendFuncSeparateEXT = 0;
2787 3013
3014void
3015apple_nvidia_bug (int enable)
3016
2788char * 3017char *
2789gl_vendor () 3018gl_vendor ()
2790 CODE: 3019 CODE:
2791 RETVAL = (char *)glGetString (GL_VENDOR); 3020 RETVAL = (char *)glGetString (GL_VENDOR);
2792 OUTPUT: 3021 OUTPUT:
… …
2841 3070
2842void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3071void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2843 CODE: 3072 CODE:
2844 gl_BlendFuncSeparate (sa, da, saa, daa); 3073 gl_BlendFuncSeparate (sa, da, saa, daa);
2845 3074
3075# void glBlendEquation (int se)
3076
2846void glDepthMask (int flag) 3077void glDepthMask (int flag)
2847 3078
2848void glLogicOp (int opcode) 3079void glLogicOp (int opcode)
2849 3080
2850void glColorMask (int red, int green, int blue, int alpha) 3081void glColorMask (int red, int green, int blue, int alpha)
… …
2884void glRotate (float angle, float x, float y, float z) 3115void glRotate (float angle, float x, float y, float z)
2885 CODE: 3116 CODE:
2886 glRotatef (angle, x, y, z); 3117 glRotatef (angle, x, y, z);
2887 3118
2888void 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: @
2889 ALIAS: 3121 ALIAS:
2890 glColor_premultiply = 1 3122 glColor_premultiply = 1
2891 CODE: 3123 CODE:
2892 if (ix) 3124 if (ix)
2893 { 3125 {

Diff Legend

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