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.269 by root, Sun Jul 20 03:46:02 2008 UTC vs.
Revision 1.292 by root, Fri Dec 4 15:04:56 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
… …
1646 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1771 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1647 // use uglier nearest interpolation because linear suffers 1772 // use uglier nearest interpolation because linear suffers
1648 // from transparent color bleeding and ugly wrapping effects. 1773 // from transparent color bleeding and ugly wrapping effects.
1649 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1774 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1650} 1775}
1776
1777void
1778expire_textures (DC::Map self, int texid, int count)
1779 PPCODE:
1780 for (; texid < self->texs && count; ++texid, --count)
1781 {
1782 maptex *tex = self->tex + texid;
1783
1784 if (tex->name)
1785 {
1786 if (tex->unused)
1787 {
1788 tex->name = 0;
1789 tex->unused = 0;
1790 XPUSHs (sv_2mortal (newSViv (texid)));
1791 }
1792 else
1793 tex->unused = 1;
1794 }
1795 }
1651 1796
1652int 1797int
1653ox (DC::Map self) 1798ox (DC::Map self)
1654 ALIAS: 1799 ALIAS:
1655 oy = 1 1800 oy = 1
… …
1776 cell->tile [z] = self->face2tile [face]; 1921 cell->tile [z] = self->face2tile [face];
1777 1922
1778 if (cell->tile [z]) 1923 if (cell->tile [z])
1779 { 1924 {
1780 maptex *tex = self->tex + cell->tile [z]; 1925 maptex *tex = self->tex + cell->tile [z];
1926 tex->unused = 0;
1781 if (!tex->name) 1927 if (!tex->name)
1782 av_push (missing, newSViv (cell->tile [z])); 1928 av_push (missing, newSViv (cell->tile [z]));
1783 1929
1784 if (tex->smoothtile) 1930 if (tex->smoothtile)
1785 { 1931 {
1786 maptex *smooth = self->tex + tex->smoothtile; 1932 maptex *smooth = self->tex + tex->smoothtile;
1933 smooth->unused = 0;
1787 if (!smooth->name) 1934 if (!smooth->name)
1788 av_push (missing, newSViv (tex->smoothtile)); 1935 av_push (missing, newSViv (tex->smoothtile));
1789 } 1936 }
1790 } 1937 }
1791 } 1938 }
… …
1862 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2009 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) 2010 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1864 smooth_key skey; 2011 smooth_key skey;
1865 int pl_x, pl_y; 2012 int pl_x, pl_y;
1866 maptex pl_tex; 2013 maptex pl_tex;
1867 rc_t *rc = rc_alloc (); 2014 rc_t *rc = rc_alloc ();
2015 rc_t *rc_ov = rc_alloc ();
1868 rc_key_t key; 2016 rc_key_t key;
1869 rc_array_t *arr; 2017 rc_array_t *arr, *arr_hidden;
1870 2018
1871 pl_tex.name = 0; 2019 pl_tex.name = 0;
1872 2020
1873 // thats current max. sorry. 2021 // that's current max. sorry.
1874 if (sw > 255) sw = 255; 2022 if (sw > 255) sw = 255;
1875 if (sh > 255) sh = 255; 2023 if (sh > 255) sh = 255;
1876 2024
1877 // clear key, in case of extra padding 2025 // clear key, in case of extra padding
1878 memset (&skey, 0, sizeof (skey)); 2026 memset (&skey, 0, sizeof (skey));
… …
1882 key.g = 255; 2030 key.g = 255;
1883 key.b = 255; 2031 key.b = 255;
1884 key.a = 255; 2032 key.a = 255;
1885 key.mode = GL_QUADS; 2033 key.mode = GL_QUADS;
1886 key.format = GL_T2F_V3F; 2034 key.format = GL_T2F_V3F;
1887 key.texname = -1;
1888 2035
1889 mx += self->x; 2036 mx += self->x;
1890 my += self->y; 2037 my += self->y;
1891 2038
1892 // first pass: determine smooth_max 2039 // first pass: determine smooth_max
… …
1913 2060
1914 glEnable (GL_BLEND); 2061 glEnable (GL_BLEND);
1915 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2062 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1916 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2063 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1917 2064
2065 key.texname = self->tex [TEXID_HIDDEN].name;
2066 arr_hidden = rc_array (rc_ov, &key);
2067
1918 for (z = 0; z <= 2; z++) 2068 for (z = 0; z <= 2; z++)
1919 { 2069 {
1920 memset (smooth_level, 0, sizeof (smooth_level)); 2070 memset (smooth_level, 0, sizeof (smooth_level));
2071 key.texname = -1;
1921 2072
1922 for (y = 0; y < sh; y++) 2073 for (y = 0; y < sh; y++)
1923 if (0 <= y + my && y + my < self->rows) 2074 if (0 <= y + my && y + my < self->rows)
1924 { 2075 {
1925 maprow *row = self->row + (y + my); 2076 maprow *row = self->row + (y + my);
… …
1931 tileid tile = cell->tile [z]; 2082 tileid tile = cell->tile [z];
1932 2083
1933 if (tile) 2084 if (tile)
1934 { 2085 {
1935 maptex tex = self->tex [tile]; 2086 maptex tex = self->tex [tile];
1936 int px = (x + 1) * T - tex.w; 2087 int px, py;
1937 int py = (y + 1) * T - tex.h;
1938 2088
1939 if (key.texname != tex.name) 2089 if (key.texname != tex.name)
1940 { 2090 {
2091 self->tex [tile].unused = 0;
2092
1941 if (!tex.name) 2093 if (!tex.name)
1942 tex = self->tex [2]; /* missing, replace by noface */ 2094 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1943 2095
1944 key.texname = tex.name; 2096 key.texname = tex.name;
1945 arr = rc_array (rc, &key); 2097 arr = rc_array (rc, &key);
1946 } 2098 }
2099
2100 px = (x + 1) * T - tex.w;
2101 py = (y + 1) * T - tex.h;
1947 2102
1948 if (expect_false (cell->player == player) && expect_false (z == 2)) 2103 if (expect_false (cell->player == player) && expect_false (z == 2))
1949 { 2104 {
1950 pl_x = px; 2105 pl_x = px;
1951 pl_y = py; 2106 pl_y = py;
… …
1956 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2111 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1957 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2112 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); 2113 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); 2114 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1960 2115
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 2116 // update smooth hash
1987 if (tex.smoothtile) 2117 if (tex.smoothtile)
1988 { 2118 {
1989 skey.tile = tex.smoothtile; 2119 skey.tile = tex.smoothtile;
1990 skey.level = tex.smoothlevel; 2120 skey.level = tex.smoothlevel;
… …
2018 // corners 2148 // corners
2019 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2149 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); 2150 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); 2151 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); 2152 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2153 }
2154 }
2155
2156 if (expect_false (z == 2))
2157 {
2158 /* draw question marks on top of hidden spaces */
2159 if (!cell->darkness)
2160 {
2161 maptex tex = self->tex [TEXID_HIDDEN];
2162 int px = (x + 1) * T - tex.w;
2163 int py = (y + 1) * T - tex.h;
2164
2165 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2166 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2167 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2168 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2169 }
2170
2171 if (expect_false (cell->flags))
2172 {
2173 // overlays such as the speech bubble, probably more to come
2174 if (cell->flags & 1)
2175 {
2176 rc_key_t key_ov = key;
2177 maptex tex = self->tex [TEXID_SPEECH];
2178 rc_array_t *arr;
2179 int px = x * T + T * 2 / 32;
2180 int py = y * T - T * 6 / 32;
2181
2182 key_ov.texname = tex.name;
2183 arr = rc_array (rc_ov, &key_ov);
2184
2185 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2186 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2187 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2188 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2189 }
2023 } 2190 }
2024 } 2191 }
2025 } 2192 }
2026 } 2193 }
2027 2194
… …
2067 { 2234 {
2068 // this time avoiding texture state changes 2235 // this time avoiding texture state changes
2069 // save gobs of state changes. 2236 // save gobs of state changes.
2070 if (key.texname != tex.name) 2237 if (key.texname != tex.name)
2071 { 2238 {
2239 self->tex [skey->tile].unused = 0;
2240
2072 glEnd (); 2241 glEnd ();
2073 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2242 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2074 glBegin (GL_QUADS); 2243 glBegin (GL_QUADS);
2075 } 2244 }
2076 2245
… …
2122 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2291 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2123 2292
2124 rc_draw (rc); 2293 rc_draw (rc);
2125 } 2294 }
2126 2295
2296 rc_draw (rc_ov);
2297 rc_clear (rc_ov);
2298
2127 glDisable (GL_BLEND); 2299 glDisable (GL_BLEND);
2128 rc_free (rc); 2300 rc_free (rc);
2301 rc_free (rc_ov);
2129 2302
2130 // top layer: overlays such as the health bar 2303 // top layer: overlays such as the health bar
2131 for (y = 0; y < sh; y++) 2304 for (y = 0; y < sh; y++)
2132 if (0 <= y + my && y + my < self->rows) 2305 if (0 <= y + my && y + my < self->rows)
2133 { 2306 {
… …
2138 { 2311 {
2139 mapcell *cell = row->col + (x + mx - row->c0); 2312 mapcell *cell = row->col + (x + mx - row->c0);
2140 2313
2141 int px = x * T; 2314 int px = x * T;
2142 int py = y * T; 2315 int py = y * T;
2316
2317 if (expect_false (cell->player == player))
2318 {
2319 px += sdx;
2320 py += sdy;
2321 }
2143 2322
2144 if (cell->stat_hp) 2323 if (cell->stat_hp)
2145 { 2324 {
2146 int width = cell->stat_width * T; 2325 int width = cell->stat_width * T;
2147 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2326 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2187 }; 2366 };
2188 2367
2189 int x, y; 2368 int x, y;
2190 2369
2191 glEnable (GL_TEXTURE_2D); 2370 glEnable (GL_TEXTURE_2D);
2371 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2372 * but the nvidia driver (185.18.14) mishandles alpha textures
2373 * ansd takes the colour from god knows where instead of using
2374 * Cp. MODULATE results in the same colour, but slightly different
2375 * alpha, but atcually gives us the correct colour with nvidia.
2376 */
2192 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2377 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2193 glEnable (GL_BLEND); 2378 glEnable (GL_BLEND);
2194 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2379 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2195 glBegin (GL_QUADS); 2380 glBegin (GL_QUADS);
2196 2381
2197 for (y = 0; y < h; y++) 2382 for (y = 0; y < h; y++)
… …
2204 float *c = color [m & 15]; 2389 float *c = color [m & 15];
2205 2390
2206 float tx1 = m & 0x40 ? 0.5 : 0.; 2391 float tx1 = m & 0x40 ? 0.5 : 0.;
2207 float tx2 = tx1 + 0.5; 2392 float tx2 = tx1 + 0.5;
2208 2393
2209 glColor4f (c[0], c[1], c[2], 0.75); 2394 glColor4f (c[0], c[1], c[2], 1);
2210 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2395 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2211 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2396 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2212 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2397 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2213 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2398 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2214 } 2399 }
… …
2771 const_iv (GL_NICEST), 2956 const_iv (GL_NICEST),
2772 const_iv (GL_V2F), 2957 const_iv (GL_V2F),
2773 const_iv (GL_V3F), 2958 const_iv (GL_V3F),
2774 const_iv (GL_T2F_V3F), 2959 const_iv (GL_T2F_V3F),
2775 const_iv (GL_T2F_N3F_V3F), 2960 const_iv (GL_T2F_N3F_V3F),
2961 const_iv (GL_FUNC_ADD),
2962 const_iv (GL_FUNC_SUBTRACT),
2963 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2776# undef const_iv 2964# undef const_iv
2777 }; 2965 };
2778 2966
2779 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2967 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2780 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2968 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2787disable_GL_EXT_blend_func_separate () 2975disable_GL_EXT_blend_func_separate ()
2788 CODE: 2976 CODE:
2789 gl.BlendFuncSeparate = 0; 2977 gl.BlendFuncSeparate = 0;
2790 gl.BlendFuncSeparateEXT = 0; 2978 gl.BlendFuncSeparateEXT = 0;
2791 2979
2980void
2981apple_nvidia_bug (int enable)
2982
2792char * 2983char *
2793gl_vendor () 2984gl_vendor ()
2794 CODE: 2985 CODE:
2795 RETVAL = (char *)glGetString (GL_VENDOR); 2986 RETVAL = (char *)glGetString (GL_VENDOR);
2796 OUTPUT: 2987 OUTPUT:
… …
2845 3036
2846void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3037void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2847 CODE: 3038 CODE:
2848 gl_BlendFuncSeparate (sa, da, saa, daa); 3039 gl_BlendFuncSeparate (sa, da, saa, daa);
2849 3040
3041# void glBlendEquation (int se)
3042
2850void glDepthMask (int flag) 3043void glDepthMask (int flag)
2851 3044
2852void glLogicOp (int opcode) 3045void glLogicOp (int opcode)
2853 3046
2854void glColorMask (int red, int green, int blue, int alpha) 3047void glColorMask (int red, int green, int blue, int alpha)
… …
2888void glRotate (float angle, float x, float y, float z) 3081void glRotate (float angle, float x, float y, float z)
2889 CODE: 3082 CODE:
2890 glRotatef (angle, x, y, z); 3083 glRotatef (angle, x, y, z);
2891 3084
2892void glColor (float r, float g, float b, float a = 1.0) 3085void glColor (float r, float g, float b, float a = 1.0)
3086 PROTOTYPE: @
2893 ALIAS: 3087 ALIAS:
2894 glColor_premultiply = 1 3088 glColor_premultiply = 1
2895 CODE: 3089 CODE:
2896 if (ix) 3090 if (ix)
2897 { 3091 {

Diff Legend

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