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.275 by root, Thu Aug 28 00:53:53 2008 UTC vs.
Revision 1.293 by root, Thu Dec 17 02:49:38 2009 UTC

… …
81#define expect_false(expr) expect ((expr) != 0, 0) 81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1) 82#define expect_true(expr) expect ((expr) != 0, 1)
83 83
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 85
86#define FOW_DARKNESS 32 86#define FOW_DARKNESS 64
87 87
88#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
90 90
91#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
92 92
93/* mask out modifiers we are not interested in */ 93/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
95
96#define KMOD_LRAM 0x10000 // our extension
97
98#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3
95 101
96static AV *texture_av; 102static AV *texture_av;
97 103
98static struct 104static struct
99{ 105{
… …
231 int w, h; 237 int w, h;
232 float s, t; 238 float s, t;
233 uint8_t r, g, b, a; 239 uint8_t r, g, b, a;
234 tileid smoothtile; 240 tileid smoothtile;
235 uint8_t smoothlevel; 241 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */
236} maptex; 243} maptex;
237 244
238typedef struct { 245typedef struct {
239 uint32_t player; 246 uint32_t player;
240 tileid tile[3]; 247 tileid tile[3];
… …
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{
… …
737 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
738 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
739 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
740 const_iv (KMOD_MODE), 761 const_iv (KMOD_MODE),
741 762
763 const_iv (KMOD_LRAM),
764
742 const_iv (MIX_DEFAULT_FORMAT), 765 const_iv (MIX_DEFAULT_FORMAT),
743 766
744 const_iv (SDL_INIT_TIMER), 767 const_iv (SDL_INIT_TIMER),
745 const_iv (SDL_INIT_AUDIO), 768 const_iv (SDL_INIT_AUDIO),
746 const_iv (SDL_INIT_VIDEO), 769 const_iv (SDL_INIT_VIDEO),
… …
933 { 956 {
934 case SDL_KEYDOWN: 957 case SDL_KEYDOWN:
935 case SDL_KEYUP: 958 case SDL_KEYUP:
936 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 959 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
937 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 960 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
938 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);
939 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 */
940 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 963 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
941 break; 964 break;
942 965
943 case SDL_ACTIVEEVENT: 966 case SDL_ACTIVEEVENT:
944 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 967 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
962 x = ev.motion.x; 985 x = ev.motion.x;
963 y = ev.motion.y; 986 y = ev.motion.y;
964 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 987 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
965 } 988 }
966 989
967 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 990 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
968 hv_store (hv, "state", 5, newSViv (state), 0); 991 hv_store (hv, "state", 5, newSViv (state), 0);
969 hv_store (hv, "x", 1, newSViv (x), 0); 992 hv_store (hv, "x", 1, newSViv (x), 0);
970 hv_store (hv, "y", 1, newSViv (y), 0); 993 hv_store (hv, "y", 1, newSViv (y), 0);
971 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 994 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
972 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 995 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
1188#if DEBUG 1211#if DEBUG
1189 VALGRIND_DO_LEAK_CHECK; 1212 VALGRIND_DO_LEAK_CHECK;
1190#endif 1213#endif
1191} 1214}
1192 1215
1216int
1217SvREFCNT (SV *sv)
1218 CODE:
1219 RETVAL = SvREFCNT (sv);
1220 OUTPUT:
1221 RETVAL
1222
1193MODULE = Deliantra::Client PACKAGE = DC::Font 1223MODULE = Deliantra::Client PACKAGE = DC::Font
1194 1224
1195PROTOTYPES: DISABLE 1225PROTOTYPES: DISABLE
1196 1226
1197DC::Font 1227DC::Font
… …
1626 if (ix) 1656 if (ix)
1627 { 1657 {
1628 glDisable (GL_ALPHA_TEST); 1658 glDisable (GL_ALPHA_TEST);
1629 glDisable (GL_BLEND); 1659 glDisable (GL_BLEND);
1630 } 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);
1631} 1690}
1632 1691
1633IV 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)
1634 CODE: 1693 CODE:
1635{ 1694{
… …
1741 //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);
1742 // use uglier nearest interpolation because linear suffers 1801 // use uglier nearest interpolation because linear suffers
1743 // from transparent color bleeding and ugly wrapping effects. 1802 // from transparent color bleeding and ugly wrapping effects.
1744 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1803 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1745} 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 }
1746 1825
1747int 1826int
1748ox (DC::Map self) 1827ox (DC::Map self)
1749 ALIAS: 1828 ALIAS:
1750 oy = 1 1829 oy = 1
… …
1871 cell->tile [z] = self->face2tile [face]; 1950 cell->tile [z] = self->face2tile [face];
1872 1951
1873 if (cell->tile [z]) 1952 if (cell->tile [z])
1874 { 1953 {
1875 maptex *tex = self->tex + cell->tile [z]; 1954 maptex *tex = self->tex + cell->tile [z];
1955 tex->unused = 0;
1876 if (!tex->name) 1956 if (!tex->name)
1877 av_push (missing, newSViv (cell->tile [z])); 1957 av_push (missing, newSViv (cell->tile [z]));
1878 1958
1879 if (tex->smoothtile) 1959 if (tex->smoothtile)
1880 { 1960 {
1881 maptex *smooth = self->tex + tex->smoothtile; 1961 maptex *smooth = self->tex + tex->smoothtile;
1962 smooth->unused = 0;
1882 if (!smooth->name) 1963 if (!smooth->name)
1883 av_push (missing, newSViv (tex->smoothtile)); 1964 av_push (missing, newSViv (tex->smoothtile));
1884 } 1965 }
1885 } 1966 }
1886 } 1967 }
… …
1957 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
1958 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)
1959 smooth_key skey; 2040 smooth_key skey;
1960 int pl_x, pl_y; 2041 int pl_x, pl_y;
1961 maptex pl_tex; 2042 maptex pl_tex;
1962 rc_t *rc = rc_alloc (); 2043 rc_t *rc = rc_alloc ();
2044 rc_t *rc_ov = rc_alloc ();
1963 rc_key_t key; 2045 rc_key_t key;
1964 rc_array_t *arr; 2046 rc_array_t *arr, *arr_hidden;
1965 2047
1966 pl_tex.name = 0; 2048 pl_tex.name = 0;
1967 2049
1968 // thats current max. sorry. 2050 // that's current max. sorry.
1969 if (sw > 255) sw = 255; 2051 if (sw > 255) sw = 255;
1970 if (sh > 255) sh = 255; 2052 if (sh > 255) sh = 255;
1971 2053
1972 // clear key, in case of extra padding 2054 // clear key, in case of extra padding
1973 memset (&skey, 0, sizeof (skey)); 2055 memset (&skey, 0, sizeof (skey));
… …
1977 key.g = 255; 2059 key.g = 255;
1978 key.b = 255; 2060 key.b = 255;
1979 key.a = 255; 2061 key.a = 255;
1980 key.mode = GL_QUADS; 2062 key.mode = GL_QUADS;
1981 key.format = GL_T2F_V3F; 2063 key.format = GL_T2F_V3F;
1982 key.texname = -1;
1983 2064
1984 mx += self->x; 2065 mx += self->x;
1985 my += self->y; 2066 my += self->y;
1986 2067
1987 // first pass: determine smooth_max 2068 // first pass: determine smooth_max
… …
2008 2089
2009 glEnable (GL_BLEND); 2090 glEnable (GL_BLEND);
2010 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2091 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2011 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2012 2093
2094 key.texname = self->tex [TEXID_HIDDEN].name;
2095 arr_hidden = rc_array (rc_ov, &key);
2096
2013 for (z = 0; z <= 2; z++) 2097 for (z = 0; z <= 2; z++)
2014 { 2098 {
2015 memset (smooth_level, 0, sizeof (smooth_level)); 2099 memset (smooth_level, 0, sizeof (smooth_level));
2100 key.texname = -1;
2016 2101
2017 for (y = 0; y < sh; y++) 2102 for (y = 0; y < sh; y++)
2018 if (0 <= y + my && y + my < self->rows) 2103 if (0 <= y + my && y + my < self->rows)
2019 { 2104 {
2020 maprow *row = self->row + (y + my); 2105 maprow *row = self->row + (y + my);
… …
2026 tileid tile = cell->tile [z]; 2111 tileid tile = cell->tile [z];
2027 2112
2028 if (tile) 2113 if (tile)
2029 { 2114 {
2030 maptex tex = self->tex [tile]; 2115 maptex tex = self->tex [tile];
2031 int px = (x + 1) * T - tex.w; 2116 int px, py;
2032 int py = (y + 1) * T - tex.h;
2033 2117
2034 if (key.texname != tex.name) 2118 if (key.texname != tex.name)
2035 { 2119 {
2120 self->tex [tile].unused = 0;
2121
2036 if (!tex.name) 2122 if (!tex.name)
2037 tex = self->tex [2]; /* missing, replace by noface */ 2123 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2038 2124
2039 key.texname = tex.name; 2125 key.texname = tex.name;
2040 arr = rc_array (rc, &key); 2126 arr = rc_array (rc, &key);
2041 } 2127 }
2128
2129 px = (x + 1) * T - tex.w;
2130 py = (y + 1) * T - tex.h;
2042 2131
2043 if (expect_false (cell->player == player) && expect_false (z == 2)) 2132 if (expect_false (cell->player == player) && expect_false (z == 2))
2044 { 2133 {
2045 pl_x = px; 2134 pl_x = px;
2046 pl_y = py; 2135 pl_y = py;
… …
2051 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2140 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2052 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);
2053 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);
2054 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);
2055 2144
2056 if (expect_false (cell->flags) && expect_false (z == 2))
2057 {
2058 // overlays such as the speech bubble, probably more to come
2059 if (cell->flags & 1)
2060 {
2061 maptex tex = self->tex [1];
2062 int px = x * T + T * 2 / 32;
2063 int py = y * T - T * 6 / 32;
2064
2065 if (tex.name)
2066 {
2067 if (key.texname != tex.name)
2068 {
2069 key.texname = tex.name;
2070 arr = rc_array (rc, &key);
2071 }
2072
2073 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2074 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2075 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2076 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2077 }
2078 }
2079 }
2080
2081 // update smooth hash 2145 // update smooth hash
2082 if (tex.smoothtile) 2146 if (tex.smoothtile)
2083 { 2147 {
2084 skey.tile = tex.smoothtile; 2148 skey.tile = tex.smoothtile;
2085 skey.level = tex.smoothlevel; 2149 skey.level = tex.smoothlevel;
… …
2113 // corners 2177 // corners
2114 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);
2115 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);
2116 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);
2117 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 }
2118 } 2219 }
2119 } 2220 }
2120 } 2221 }
2121 } 2222 }
2122 2223
… …
2162 { 2263 {
2163 // this time avoiding texture state changes 2264 // this time avoiding texture state changes
2164 // save gobs of state changes. 2265 // save gobs of state changes.
2165 if (key.texname != tex.name) 2266 if (key.texname != tex.name)
2166 { 2267 {
2268 self->tex [skey->tile].unused = 0;
2269
2167 glEnd (); 2270 glEnd ();
2168 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2271 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2169 glBegin (GL_QUADS); 2272 glBegin (GL_QUADS);
2170 } 2273 }
2171 2274
… …
2217 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);
2218 2321
2219 rc_draw (rc); 2322 rc_draw (rc);
2220 } 2323 }
2221 2324
2325 rc_draw (rc_ov);
2326 rc_clear (rc_ov);
2327
2222 glDisable (GL_BLEND); 2328 glDisable (GL_BLEND);
2223 rc_free (rc); 2329 rc_free (rc);
2330 rc_free (rc_ov);
2224 2331
2225 // top layer: overlays such as the health bar 2332 // top layer: overlays such as the health bar
2226 for (y = 0; y < sh; y++) 2333 for (y = 0; y < sh; y++)
2227 if (0 <= y + my && y + my < self->rows) 2334 if (0 <= y + my && y + my < self->rows)
2228 { 2335 {
… …
2233 { 2340 {
2234 mapcell *cell = row->col + (x + mx - row->c0); 2341 mapcell *cell = row->col + (x + mx - row->c0);
2235 2342
2236 int px = x * T; 2343 int px = x * T;
2237 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 }
2238 2351
2239 if (cell->stat_hp) 2352 if (cell->stat_hp)
2240 { 2353 {
2241 int width = cell->stat_width * T; 2354 int width = cell->stat_width * T;
2242 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2355 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2282 }; 2395 };
2283 2396
2284 int x, y; 2397 int x, y;
2285 2398
2286 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 */
2287 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2406 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2288 glEnable (GL_BLEND); 2407 glEnable (GL_BLEND);
2289 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2408 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2290 glBegin (GL_QUADS); 2409 glBegin (GL_QUADS);
2291 2410
2292 for (y = 0; y < h; y++) 2411 for (y = 0; y < h; y++)
… …
2299 float *c = color [m & 15]; 2418 float *c = color [m & 15];
2300 2419
2301 float tx1 = m & 0x40 ? 0.5 : 0.; 2420 float tx1 = m & 0x40 ? 0.5 : 0.;
2302 float tx2 = tx1 + 0.5; 2421 float tx2 = tx1 + 0.5;
2303 2422
2304 glColor4f (c[0], c[1], c[2], 0.75); 2423 glColor4f (c[0], c[1], c[2], 1);
2305 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2424 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2306 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2425 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2307 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2426 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2308 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2427 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2309 } 2428 }
… …
2768 } *civ, const_iv[] = { 2887 } *civ, const_iv[] = {
2769# define const_iv(name) { # name, (IV)name } 2888# define const_iv(name) { # name, (IV)name }
2770 const_iv (GL_VENDOR), 2889 const_iv (GL_VENDOR),
2771 const_iv (GL_VERSION), 2890 const_iv (GL_VERSION),
2772 const_iv (GL_EXTENSIONS), 2891 const_iv (GL_EXTENSIONS),
2892 const_iv (GL_MAX_TEXTURE_UNITS),
2773 const_iv (GL_COLOR_MATERIAL), 2893 const_iv (GL_COLOR_MATERIAL),
2774 const_iv (GL_SMOOTH), 2894 const_iv (GL_SMOOTH),
2775 const_iv (GL_FLAT), 2895 const_iv (GL_FLAT),
2776 const_iv (GL_DITHER), 2896 const_iv (GL_DITHER),
2777 const_iv (GL_BLEND), 2897 const_iv (GL_BLEND),
… …
2789 const_iv (GL_ZERO), 2909 const_iv (GL_ZERO),
2790 const_iv (GL_SRC_ALPHA), 2910 const_iv (GL_SRC_ALPHA),
2791 const_iv (GL_DST_ALPHA), 2911 const_iv (GL_DST_ALPHA),
2792 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2912 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2793 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),
2794 const_iv (GL_SRC_ALPHA_SATURATE), 2918 const_iv (GL_SRC_ALPHA_SATURATE),
2795 const_iv (GL_RGB), 2919 const_iv (GL_RGB),
2796 const_iv (GL_RGBA), 2920 const_iv (GL_RGBA),
2797 const_iv (GL_RGBA4), 2921 const_iv (GL_RGBA4),
2798 const_iv (GL_RGBA8), 2922 const_iv (GL_RGBA8),
… …
2866 const_iv (GL_NICEST), 2990 const_iv (GL_NICEST),
2867 const_iv (GL_V2F), 2991 const_iv (GL_V2F),
2868 const_iv (GL_V3F), 2992 const_iv (GL_V3F),
2869 const_iv (GL_T2F_V3F), 2993 const_iv (GL_T2F_V3F),
2870 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),
2871# undef const_iv 2998# undef const_iv
2872 }; 2999 };
2873 3000
2874 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; )
2875 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3002 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2882disable_GL_EXT_blend_func_separate () 3009disable_GL_EXT_blend_func_separate ()
2883 CODE: 3010 CODE:
2884 gl.BlendFuncSeparate = 0; 3011 gl.BlendFuncSeparate = 0;
2885 gl.BlendFuncSeparateEXT = 0; 3012 gl.BlendFuncSeparateEXT = 0;
2886 3013
3014void
3015apple_nvidia_bug (int enable)
3016
2887char * 3017char *
2888gl_vendor () 3018gl_vendor ()
2889 CODE: 3019 CODE:
2890 RETVAL = (char *)glGetString (GL_VENDOR); 3020 RETVAL = (char *)glGetString (GL_VENDOR);
2891 OUTPUT: 3021 OUTPUT:
… …
2940 3070
2941void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3071void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2942 CODE: 3072 CODE:
2943 gl_BlendFuncSeparate (sa, da, saa, daa); 3073 gl_BlendFuncSeparate (sa, da, saa, daa);
2944 3074
3075# void glBlendEquation (int se)
3076
2945void glDepthMask (int flag) 3077void glDepthMask (int flag)
2946 3078
2947void glLogicOp (int opcode) 3079void glLogicOp (int opcode)
2948 3080
2949void glColorMask (int red, int green, int blue, int alpha) 3081void glColorMask (int red, int green, int blue, int alpha)
… …
2983void glRotate (float angle, float x, float y, float z) 3115void glRotate (float angle, float x, float y, float z)
2984 CODE: 3116 CODE:
2985 glRotatef (angle, x, y, z); 3117 glRotatef (angle, x, y, z);
2986 3118
2987void 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: @
2988 ALIAS: 3121 ALIAS:
2989 glColor_premultiply = 1 3122 glColor_premultiply = 1
2990 CODE: 3123 CODE:
2991 if (ix) 3124 if (ix)
2992 { 3125 {

Diff Legend

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