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.274 by root, Wed Aug 20 17:50:47 2008 UTC vs.
Revision 1.291 by root, Thu Nov 26 07:19:11 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];
… …
525 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0); 532 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
526 if (!svp || !SvTRUE (*svp)) 533 if (!svp || !SvTRUE (*svp))
527 return 0; 534 return 0;
528 535
529 return 1; 536 return 1;
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;
530} 551}
531 552
532static void 553static void
533deliantra_main () 554deliantra_main ()
534{ 555{
… …
602 const_iv (SDL_USEREVENT), 623 const_iv (SDL_USEREVENT),
603 624
604 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
605 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
606 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),
607 678
608 const_iv (SDLK_FIRST), 679 const_iv (SDLK_FIRST),
609 const_iv (SDLK_LAST), 680 const_iv (SDLK_LAST),
610 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
611 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
… …
687 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
688 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
689 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
690 const_iv (KMOD_MODE), 761 const_iv (KMOD_MODE),
691 762
763 const_iv (KMOD_LRAM),
764
692 const_iv (MIX_DEFAULT_FORMAT), 765 const_iv (MIX_DEFAULT_FORMAT),
693 766
694 const_iv (SDL_INIT_TIMER), 767 const_iv (SDL_INIT_TIMER),
695 const_iv (SDL_INIT_AUDIO), 768 const_iv (SDL_INIT_AUDIO),
696 const_iv (SDL_INIT_VIDEO), 769 const_iv (SDL_INIT_VIDEO),
… …
883 { 956 {
884 case SDL_KEYDOWN: 957 case SDL_KEYDOWN:
885 case SDL_KEYUP: 958 case SDL_KEYUP:
886 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 959 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
887 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 960 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
888 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);
889 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 */
890 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 963 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
891 break; 964 break;
892 965
893 case SDL_ACTIVEEVENT: 966 case SDL_ACTIVEEVENT:
894 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 967 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
912 x = ev.motion.x; 985 x = ev.motion.x;
913 y = ev.motion.y; 986 y = ev.motion.y;
914 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 987 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
915 } 988 }
916 989
917 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 990 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
918 hv_store (hv, "state", 5, newSViv (state), 0); 991 hv_store (hv, "state", 5, newSViv (state), 0);
919 hv_store (hv, "x", 1, newSViv (x), 0); 992 hv_store (hv, "x", 1, newSViv (x), 0);
920 hv_store (hv, "y", 1, newSViv (y), 0); 993 hv_store (hv, "y", 1, newSViv (y), 0);
921 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 994 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
922 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 995 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
1138#if DEBUG 1211#if DEBUG
1139 VALGRIND_DO_LEAK_CHECK; 1212 VALGRIND_DO_LEAK_CHECK;
1140#endif 1213#endif
1141} 1214}
1142 1215
1216int
1217SvREFCNT (SV *sv)
1218 CODE:
1219 RETVAL = SvREFCNT (sv);
1220 OUTPUT:
1221 RETVAL
1222
1143MODULE = Deliantra::Client PACKAGE = DC::Font 1223MODULE = Deliantra::Client PACKAGE = DC::Font
1144 1224
1145PROTOTYPES: DISABLE 1225PROTOTYPES: DISABLE
1146 1226
1147DC::Font 1227DC::Font
… …
1691 //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);
1692 // use uglier nearest interpolation because linear suffers 1772 // use uglier nearest interpolation because linear suffers
1693 // from transparent color bleeding and ugly wrapping effects. 1773 // from transparent color bleeding and ugly wrapping effects.
1694 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1774 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1695} 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 }
1696 1796
1697int 1797int
1698ox (DC::Map self) 1798ox (DC::Map self)
1699 ALIAS: 1799 ALIAS:
1700 oy = 1 1800 oy = 1
… …
1821 cell->tile [z] = self->face2tile [face]; 1921 cell->tile [z] = self->face2tile [face];
1822 1922
1823 if (cell->tile [z]) 1923 if (cell->tile [z])
1824 { 1924 {
1825 maptex *tex = self->tex + cell->tile [z]; 1925 maptex *tex = self->tex + cell->tile [z];
1926 tex->unused = 0;
1826 if (!tex->name) 1927 if (!tex->name)
1827 av_push (missing, newSViv (cell->tile [z])); 1928 av_push (missing, newSViv (cell->tile [z]));
1828 1929
1829 if (tex->smoothtile) 1930 if (tex->smoothtile)
1830 { 1931 {
1831 maptex *smooth = self->tex + tex->smoothtile; 1932 maptex *smooth = self->tex + tex->smoothtile;
1933 smooth->unused = 0;
1832 if (!smooth->name) 1934 if (!smooth->name)
1833 av_push (missing, newSViv (tex->smoothtile)); 1935 av_push (missing, newSViv (tex->smoothtile));
1834 } 1936 }
1835 } 1937 }
1836 } 1938 }
… …
1907 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
1908 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)
1909 smooth_key skey; 2011 smooth_key skey;
1910 int pl_x, pl_y; 2012 int pl_x, pl_y;
1911 maptex pl_tex; 2013 maptex pl_tex;
1912 rc_t *rc = rc_alloc (); 2014 rc_t *rc = rc_alloc ();
2015 rc_t *rc_ov = rc_alloc ();
1913 rc_key_t key; 2016 rc_key_t key;
1914 rc_array_t *arr; 2017 rc_array_t *arr, *arr_hidden;
1915 2018
1916 pl_tex.name = 0; 2019 pl_tex.name = 0;
1917 2020
1918 // thats current max. sorry. 2021 // that's current max. sorry.
1919 if (sw > 255) sw = 255; 2022 if (sw > 255) sw = 255;
1920 if (sh > 255) sh = 255; 2023 if (sh > 255) sh = 255;
1921 2024
1922 // clear key, in case of extra padding 2025 // clear key, in case of extra padding
1923 memset (&skey, 0, sizeof (skey)); 2026 memset (&skey, 0, sizeof (skey));
… …
1927 key.g = 255; 2030 key.g = 255;
1928 key.b = 255; 2031 key.b = 255;
1929 key.a = 255; 2032 key.a = 255;
1930 key.mode = GL_QUADS; 2033 key.mode = GL_QUADS;
1931 key.format = GL_T2F_V3F; 2034 key.format = GL_T2F_V3F;
1932 key.texname = -1;
1933 2035
1934 mx += self->x; 2036 mx += self->x;
1935 my += self->y; 2037 my += self->y;
1936 2038
1937 // first pass: determine smooth_max 2039 // first pass: determine smooth_max
… …
1958 2060
1959 glEnable (GL_BLEND); 2061 glEnable (GL_BLEND);
1960 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2062 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1961 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2063 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1962 2064
2065 key.texname = self->tex [TEXID_HIDDEN].name;
2066 arr_hidden = rc_array (rc_ov, &key);
2067
1963 for (z = 0; z <= 2; z++) 2068 for (z = 0; z <= 2; z++)
1964 { 2069 {
1965 memset (smooth_level, 0, sizeof (smooth_level)); 2070 memset (smooth_level, 0, sizeof (smooth_level));
2071 key.texname = -1;
1966 2072
1967 for (y = 0; y < sh; y++) 2073 for (y = 0; y < sh; y++)
1968 if (0 <= y + my && y + my < self->rows) 2074 if (0 <= y + my && y + my < self->rows)
1969 { 2075 {
1970 maprow *row = self->row + (y + my); 2076 maprow *row = self->row + (y + my);
… …
1976 tileid tile = cell->tile [z]; 2082 tileid tile = cell->tile [z];
1977 2083
1978 if (tile) 2084 if (tile)
1979 { 2085 {
1980 maptex tex = self->tex [tile]; 2086 maptex tex = self->tex [tile];
1981 int px = (x + 1) * T - tex.w; 2087 int px, py;
1982 int py = (y + 1) * T - tex.h;
1983 2088
1984 if (key.texname != tex.name) 2089 if (key.texname != tex.name)
1985 { 2090 {
2091 self->tex [tile].unused = 0;
2092
1986 if (!tex.name) 2093 if (!tex.name)
1987 tex = self->tex [2]; /* missing, replace by noface */ 2094 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1988 2095
1989 key.texname = tex.name; 2096 key.texname = tex.name;
1990 arr = rc_array (rc, &key); 2097 arr = rc_array (rc, &key);
1991 } 2098 }
2099
2100 px = (x + 1) * T - tex.w;
2101 py = (y + 1) * T - tex.h;
1992 2102
1993 if (expect_false (cell->player == player) && expect_false (z == 2)) 2103 if (expect_false (cell->player == player) && expect_false (z == 2))
1994 { 2104 {
1995 pl_x = px; 2105 pl_x = px;
1996 pl_y = py; 2106 pl_y = py;
… …
2001 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2111 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2002 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);
2003 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);
2004 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);
2005 2115
2006 if (expect_false (cell->flags) && expect_false (z == 2))
2007 {
2008 // overlays such as the speech bubble, probably more to come
2009 if (cell->flags & 1)
2010 {
2011 maptex tex = self->tex [1];
2012 int px = x * T + T * 2 / 32;
2013 int py = y * T - T * 6 / 32;
2014
2015 if (tex.name)
2016 {
2017 if (key.texname != tex.name)
2018 {
2019 key.texname = tex.name;
2020 arr = rc_array (rc, &key);
2021 }
2022
2023 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2024 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2025 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2026 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2027 }
2028 }
2029 }
2030
2031 // update smooth hash 2116 // update smooth hash
2032 if (tex.smoothtile) 2117 if (tex.smoothtile)
2033 { 2118 {
2034 skey.tile = tex.smoothtile; 2119 skey.tile = tex.smoothtile;
2035 skey.level = tex.smoothlevel; 2120 skey.level = tex.smoothlevel;
… …
2063 // corners 2148 // corners
2064 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);
2065 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);
2066 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);
2067 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 }
2068 } 2190 }
2069 } 2191 }
2070 } 2192 }
2071 } 2193 }
2072 2194
… …
2112 { 2234 {
2113 // this time avoiding texture state changes 2235 // this time avoiding texture state changes
2114 // save gobs of state changes. 2236 // save gobs of state changes.
2115 if (key.texname != tex.name) 2237 if (key.texname != tex.name)
2116 { 2238 {
2239 self->tex [skey->tile].unused = 0;
2240
2117 glEnd (); 2241 glEnd ();
2118 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2242 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2119 glBegin (GL_QUADS); 2243 glBegin (GL_QUADS);
2120 } 2244 }
2121 2245
… …
2167 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);
2168 2292
2169 rc_draw (rc); 2293 rc_draw (rc);
2170 } 2294 }
2171 2295
2296 rc_draw (rc_ov);
2297 rc_clear (rc_ov);
2298
2172 glDisable (GL_BLEND); 2299 glDisable (GL_BLEND);
2173 rc_free (rc); 2300 rc_free (rc);
2301 rc_free (rc_ov);
2174 2302
2175 // top layer: overlays such as the health bar 2303 // top layer: overlays such as the health bar
2176 for (y = 0; y < sh; y++) 2304 for (y = 0; y < sh; y++)
2177 if (0 <= y + my && y + my < self->rows) 2305 if (0 <= y + my && y + my < self->rows)
2178 { 2306 {
… …
2183 { 2311 {
2184 mapcell *cell = row->col + (x + mx - row->c0); 2312 mapcell *cell = row->col + (x + mx - row->c0);
2185 2313
2186 int px = x * T; 2314 int px = x * T;
2187 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 }
2188 2322
2189 if (cell->stat_hp) 2323 if (cell->stat_hp)
2190 { 2324 {
2191 int width = cell->stat_width * T; 2325 int width = cell->stat_width * T;
2192 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2326 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2232 }; 2366 };
2233 2367
2234 int x, y; 2368 int x, y;
2235 2369
2236 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 */
2237 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2377 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2238 glEnable (GL_BLEND); 2378 glEnable (GL_BLEND);
2239 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2379 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2240 glBegin (GL_QUADS); 2380 glBegin (GL_QUADS);
2241 2381
2242 for (y = 0; y < h; y++) 2382 for (y = 0; y < h; y++)
… …
2249 float *c = color [m & 15]; 2389 float *c = color [m & 15];
2250 2390
2251 float tx1 = m & 0x40 ? 0.5 : 0.; 2391 float tx1 = m & 0x40 ? 0.5 : 0.;
2252 float tx2 = tx1 + 0.5; 2392 float tx2 = tx1 + 0.5;
2253 2393
2254 glColor4f (c[0], c[1], c[2], 0.75); 2394 glColor4f (c[0], c[1], c[2], 1);
2255 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2395 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2256 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2396 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2257 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2397 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2258 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2398 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2259 } 2399 }
… …
2816 const_iv (GL_NICEST), 2956 const_iv (GL_NICEST),
2817 const_iv (GL_V2F), 2957 const_iv (GL_V2F),
2818 const_iv (GL_V3F), 2958 const_iv (GL_V3F),
2819 const_iv (GL_T2F_V3F), 2959 const_iv (GL_T2F_V3F),
2820 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),
2821# undef const_iv 2964# undef const_iv
2822 }; 2965 };
2823 2966
2824 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; )
2825 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2968 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2832disable_GL_EXT_blend_func_separate () 2975disable_GL_EXT_blend_func_separate ()
2833 CODE: 2976 CODE:
2834 gl.BlendFuncSeparate = 0; 2977 gl.BlendFuncSeparate = 0;
2835 gl.BlendFuncSeparateEXT = 0; 2978 gl.BlendFuncSeparateEXT = 0;
2836 2979
2980void
2981apple_nvidia_bug (int enable)
2982
2837char * 2983char *
2838gl_vendor () 2984gl_vendor ()
2839 CODE: 2985 CODE:
2840 RETVAL = (char *)glGetString (GL_VENDOR); 2986 RETVAL = (char *)glGetString (GL_VENDOR);
2841 OUTPUT: 2987 OUTPUT:
… …
2890 3036
2891void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3037void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2892 CODE: 3038 CODE:
2893 gl_BlendFuncSeparate (sa, da, saa, daa); 3039 gl_BlendFuncSeparate (sa, da, saa, daa);
2894 3040
3041void glBlendEquation (int se)
3042
2895void glDepthMask (int flag) 3043void glDepthMask (int flag)
2896 3044
2897void glLogicOp (int opcode) 3045void glLogicOp (int opcode)
2898 3046
2899void glColorMask (int red, int green, int blue, int alpha) 3047void glColorMask (int red, int green, int blue, int alpha)
… …
2933void glRotate (float angle, float x, float y, float z) 3081void glRotate (float angle, float x, float y, float z)
2934 CODE: 3082 CODE:
2935 glRotatef (angle, x, y, z); 3083 glRotatef (angle, x, y, z);
2936 3084
2937void 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: @
2938 ALIAS: 3087 ALIAS:
2939 glColor_premultiply = 1 3088 glColor_premultiply = 1
2940 CODE: 3089 CODE:
2941 if (ix) 3090 if (ix)
2942 { 3091 {

Diff Legend

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