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.287 by root, Sun Dec 21 21:54:27 2008 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
… …
1741 //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);
1742 // use uglier nearest interpolation because linear suffers 1772 // use uglier nearest interpolation because linear suffers
1743 // from transparent color bleeding and ugly wrapping effects. 1773 // from transparent color bleeding and ugly wrapping effects.
1744 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1774 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1745} 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 }
1746 1796
1747int 1797int
1748ox (DC::Map self) 1798ox (DC::Map self)
1749 ALIAS: 1799 ALIAS:
1750 oy = 1 1800 oy = 1
… …
1871 cell->tile [z] = self->face2tile [face]; 1921 cell->tile [z] = self->face2tile [face];
1872 1922
1873 if (cell->tile [z]) 1923 if (cell->tile [z])
1874 { 1924 {
1875 maptex *tex = self->tex + cell->tile [z]; 1925 maptex *tex = self->tex + cell->tile [z];
1926 tex->unused = 0;
1876 if (!tex->name) 1927 if (!tex->name)
1877 av_push (missing, newSViv (cell->tile [z])); 1928 av_push (missing, newSViv (cell->tile [z]));
1878 1929
1879 if (tex->smoothtile) 1930 if (tex->smoothtile)
1880 { 1931 {
1881 maptex *smooth = self->tex + tex->smoothtile; 1932 maptex *smooth = self->tex + tex->smoothtile;
1933 smooth->unused = 0;
1882 if (!smooth->name) 1934 if (!smooth->name)
1883 av_push (missing, newSViv (tex->smoothtile)); 1935 av_push (missing, newSViv (tex->smoothtile));
1884 } 1936 }
1885 } 1937 }
1886 } 1938 }
… …
1957 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
1958 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)
1959 smooth_key skey; 2011 smooth_key skey;
1960 int pl_x, pl_y; 2012 int pl_x, pl_y;
1961 maptex pl_tex; 2013 maptex pl_tex;
1962 rc_t *rc = rc_alloc (); 2014 rc_t *rc = rc_alloc ();
2015 rc_t *rc_ov = rc_alloc ();
1963 rc_key_t key; 2016 rc_key_t key;
1964 rc_array_t *arr; 2017 rc_array_t *arr, *arr_hidden;
1965 2018
1966 pl_tex.name = 0; 2019 pl_tex.name = 0;
1967 2020
1968 // thats current max. sorry. 2021 // thats current max. sorry.
1969 if (sw > 255) sw = 255; 2022 if (sw > 255) sw = 255;
… …
1977 key.g = 255; 2030 key.g = 255;
1978 key.b = 255; 2031 key.b = 255;
1979 key.a = 255; 2032 key.a = 255;
1980 key.mode = GL_QUADS; 2033 key.mode = GL_QUADS;
1981 key.format = GL_T2F_V3F; 2034 key.format = GL_T2F_V3F;
1982 key.texname = -1;
1983 2035
1984 mx += self->x; 2036 mx += self->x;
1985 my += self->y; 2037 my += self->y;
1986 2038
1987 // first pass: determine smooth_max 2039 // first pass: determine smooth_max
… …
2008 2060
2009 glEnable (GL_BLEND); 2061 glEnable (GL_BLEND);
2010 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2062 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2011 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2063 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2012 2064
2065 key.texname = self->tex [TEXID_HIDDEN].name;
2066 arr_hidden = rc_array (rc_ov, &key);
2067
2013 for (z = 0; z <= 2; z++) 2068 for (z = 0; z <= 2; z++)
2014 { 2069 {
2015 memset (smooth_level, 0, sizeof (smooth_level)); 2070 memset (smooth_level, 0, sizeof (smooth_level));
2071 key.texname = -1;
2016 2072
2017 for (y = 0; y < sh; y++) 2073 for (y = 0; y < sh; y++)
2018 if (0 <= y + my && y + my < self->rows) 2074 if (0 <= y + my && y + my < self->rows)
2019 { 2075 {
2020 maprow *row = self->row + (y + my); 2076 maprow *row = self->row + (y + my);
… …
2026 tileid tile = cell->tile [z]; 2082 tileid tile = cell->tile [z];
2027 2083
2028 if (tile) 2084 if (tile)
2029 { 2085 {
2030 maptex tex = self->tex [tile]; 2086 maptex tex = self->tex [tile];
2031 int px = (x + 1) * T - tex.w; 2087 int px, py;
2032 int py = (y + 1) * T - tex.h;
2033 2088
2034 if (key.texname != tex.name) 2089 if (key.texname != tex.name)
2035 { 2090 {
2091 self->tex [tile].unused = 0;
2092
2036 if (!tex.name) 2093 if (!tex.name)
2037 tex = self->tex [2]; /* missing, replace by noface */ 2094 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2038 2095
2039 key.texname = tex.name; 2096 key.texname = tex.name;
2040 arr = rc_array (rc, &key); 2097 arr = rc_array (rc, &key);
2041 } 2098 }
2099
2100 px = (x + 1) * T - tex.w;
2101 py = (y + 1) * T - tex.h;
2042 2102
2043 if (expect_false (cell->player == player) && expect_false (z == 2)) 2103 if (expect_false (cell->player == player) && expect_false (z == 2))
2044 { 2104 {
2045 pl_x = px; 2105 pl_x = px;
2046 pl_y = py; 2106 pl_y = py;
… …
2051 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2111 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2052 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);
2053 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);
2054 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);
2055 2115
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 2116 // update smooth hash
2082 if (tex.smoothtile) 2117 if (tex.smoothtile)
2083 { 2118 {
2084 skey.tile = tex.smoothtile; 2119 skey.tile = tex.smoothtile;
2085 skey.level = tex.smoothlevel; 2120 skey.level = tex.smoothlevel;
… …
2113 // corners 2148 // corners
2114 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);
2115 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);
2116 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);
2117 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
2180 key_ov.texname = tex.name;
2181 arr = rc_array (rc_ov, &key_ov);
2182
2183 int px = x * T + T * 2 / 32;
2184 int py = y * T - T * 6 / 32;
2185
2186 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2187 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2188 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2189 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2190 }
2118 } 2191 }
2119 } 2192 }
2120 } 2193 }
2121 } 2194 }
2122 2195
… …
2162 { 2235 {
2163 // this time avoiding texture state changes 2236 // this time avoiding texture state changes
2164 // save gobs of state changes. 2237 // save gobs of state changes.
2165 if (key.texname != tex.name) 2238 if (key.texname != tex.name)
2166 { 2239 {
2240 self->tex [skey->tile].unused = 0;
2241
2167 glEnd (); 2242 glEnd ();
2168 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2243 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2169 glBegin (GL_QUADS); 2244 glBegin (GL_QUADS);
2170 } 2245 }
2171 2246
… …
2217 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2292 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2218 2293
2219 rc_draw (rc); 2294 rc_draw (rc);
2220 } 2295 }
2221 2296
2297 rc_draw (rc_ov);
2298 rc_clear (rc_ov);
2299
2222 glDisable (GL_BLEND); 2300 glDisable (GL_BLEND);
2223 rc_free (rc); 2301 rc_free (rc);
2302 rc_free (rc_ov);
2224 2303
2225 // top layer: overlays such as the health bar 2304 // top layer: overlays such as the health bar
2226 for (y = 0; y < sh; y++) 2305 for (y = 0; y < sh; y++)
2227 if (0 <= y + my && y + my < self->rows) 2306 if (0 <= y + my && y + my < self->rows)
2228 { 2307 {
… …
2233 { 2312 {
2234 mapcell *cell = row->col + (x + mx - row->c0); 2313 mapcell *cell = row->col + (x + mx - row->c0);
2235 2314
2236 int px = x * T; 2315 int px = x * T;
2237 int py = y * T; 2316 int py = y * T;
2317
2318 if (expect_false (cell->player == player))
2319 {
2320 px += sdx;
2321 py += sdy;
2322 }
2238 2323
2239 if (cell->stat_hp) 2324 if (cell->stat_hp)
2240 { 2325 {
2241 int width = cell->stat_width * T; 2326 int width = cell->stat_width * T;
2242 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2327 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2983void glRotate (float angle, float x, float y, float z) 3068void glRotate (float angle, float x, float y, float z)
2984 CODE: 3069 CODE:
2985 glRotatef (angle, x, y, z); 3070 glRotatef (angle, x, y, z);
2986 3071
2987void glColor (float r, float g, float b, float a = 1.0) 3072void glColor (float r, float g, float b, float a = 1.0)
3073 PROTOTYPE: @
2988 ALIAS: 3074 ALIAS:
2989 glColor_premultiply = 1 3075 glColor_premultiply = 1
2990 CODE: 3076 CODE:
2991 if (ix) 3077 if (ix)
2992 { 3078 {

Diff Legend

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