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.281 by root, Thu Dec 4 23:58:20 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 16
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
95 97
96static AV *texture_av; 98static AV *texture_av;
97 99
98static struct 100static struct
99{ 101{
… …
231 int w, h; 233 int w, h;
232 float s, t; 234 float s, t;
233 uint8_t r, g, b, a; 235 uint8_t r, g, b, a;
234 tileid smoothtile; 236 tileid smoothtile;
235 uint8_t smoothlevel; 237 uint8_t smoothlevel;
238 uint8_t unused; /* set to zero on use */
236} maptex; 239} maptex;
237 240
238typedef struct { 241typedef struct {
239 uint32_t player; 242 uint32_t player;
240 tileid tile[3]; 243 tileid tile[3];
… …
525 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0); 528 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
526 if (!svp || !SvTRUE (*svp)) 529 if (!svp || !SvTRUE (*svp))
527 return 0; 530 return 0;
528 531
529 return 1; 532 return 1;
533}
534
535/******************************************************************************/
536
537/* process keyboard modifiers */
538static int
539mod_munge (int mod)
540{
541 mod &= MOD_MASK;
542
543 if (mod & (KMOD_META | KMOD_ALT))
544 mod |= KMOD_LRAM;
545
546 return mod;
530} 547}
531 548
532static void 549static void
533deliantra_main () 550deliantra_main ()
534{ 551{
… …
737 const_iv (KMOD_RMETA), 754 const_iv (KMOD_RMETA),
738 const_iv (KMOD_NUM), 755 const_iv (KMOD_NUM),
739 const_iv (KMOD_CAPS), 756 const_iv (KMOD_CAPS),
740 const_iv (KMOD_MODE), 757 const_iv (KMOD_MODE),
741 758
759 const_iv (KMOD_LRAM),
760
742 const_iv (MIX_DEFAULT_FORMAT), 761 const_iv (MIX_DEFAULT_FORMAT),
743 762
744 const_iv (SDL_INIT_TIMER), 763 const_iv (SDL_INIT_TIMER),
745 const_iv (SDL_INIT_AUDIO), 764 const_iv (SDL_INIT_AUDIO),
746 const_iv (SDL_INIT_VIDEO), 765 const_iv (SDL_INIT_VIDEO),
… …
933 { 952 {
934 case SDL_KEYDOWN: 953 case SDL_KEYDOWN:
935 case SDL_KEYUP: 954 case SDL_KEYUP:
936 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 955 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
937 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 956 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); 957 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 */ 958 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); 959 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
941 break; 960 break;
942 961
943 case SDL_ACTIVEEVENT: 962 case SDL_ACTIVEEVENT:
944 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 963 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
962 x = ev.motion.x; 981 x = ev.motion.x;
963 y = ev.motion.y; 982 y = ev.motion.y;
964 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 983 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
965 } 984 }
966 985
967 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 986 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
968 hv_store (hv, "state", 5, newSViv (state), 0); 987 hv_store (hv, "state", 5, newSViv (state), 0);
969 hv_store (hv, "x", 1, newSViv (x), 0); 988 hv_store (hv, "x", 1, newSViv (x), 0);
970 hv_store (hv, "y", 1, newSViv (y), 0); 989 hv_store (hv, "y", 1, newSViv (y), 0);
971 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 990 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
972 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 991 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
1188#if DEBUG 1207#if DEBUG
1189 VALGRIND_DO_LEAK_CHECK; 1208 VALGRIND_DO_LEAK_CHECK;
1190#endif 1209#endif
1191} 1210}
1192 1211
1212int
1213SvREFCNT (SV *sv)
1214 CODE:
1215 RETVAL = SvREFCNT (sv);
1216 OUTPUT:
1217 RETVAL
1218
1193MODULE = Deliantra::Client PACKAGE = DC::Font 1219MODULE = Deliantra::Client PACKAGE = DC::Font
1194 1220
1195PROTOTYPES: DISABLE 1221PROTOTYPES: DISABLE
1196 1222
1197DC::Font 1223DC::Font
… …
1741 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1767 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1742 // use uglier nearest interpolation because linear suffers 1768 // use uglier nearest interpolation because linear suffers
1743 // from transparent color bleeding and ugly wrapping effects. 1769 // from transparent color bleeding and ugly wrapping effects.
1744 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1770 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1745} 1771}
1772
1773void
1774expire_textures (DC::Map self, int texid, int count)
1775 PPCODE:
1776 for (; texid < self->texs && count; ++texid, --count)
1777 {
1778 maptex *tex = self->tex + texid;
1779
1780 if (tex->name)
1781 {
1782 if (tex->unused)
1783 {
1784 tex->name = 0;
1785 tex->unused = 0,
1786 XPUSHs (sv_2mortal (newSViv (texid)));
1787 }
1788 else
1789 tex->unused = 1;
1790 }
1791 }
1746 1792
1747int 1793int
1748ox (DC::Map self) 1794ox (DC::Map self)
1749 ALIAS: 1795 ALIAS:
1750 oy = 1 1796 oy = 1
… …
1871 cell->tile [z] = self->face2tile [face]; 1917 cell->tile [z] = self->face2tile [face];
1872 1918
1873 if (cell->tile [z]) 1919 if (cell->tile [z])
1874 { 1920 {
1875 maptex *tex = self->tex + cell->tile [z]; 1921 maptex *tex = self->tex + cell->tile [z];
1922 tex->unused = 0;
1876 if (!tex->name) 1923 if (!tex->name)
1877 av_push (missing, newSViv (cell->tile [z])); 1924 av_push (missing, newSViv (cell->tile [z]));
1878 1925
1879 if (tex->smoothtile) 1926 if (tex->smoothtile)
1880 { 1927 {
1881 maptex *smooth = self->tex + tex->smoothtile; 1928 maptex *smooth = self->tex + tex->smoothtile;
1929 smooth->unused = 0;
1882 if (!smooth->name) 1930 if (!smooth->name)
1883 av_push (missing, newSViv (tex->smoothtile)); 1931 av_push (missing, newSViv (tex->smoothtile));
1884 } 1932 }
1885 } 1933 }
1886 } 1934 }
… …
2031 int px = (x + 1) * T - tex.w; 2079 int px = (x + 1) * T - tex.w;
2032 int py = (y + 1) * T - tex.h; 2080 int py = (y + 1) * T - tex.h;
2033 2081
2034 if (key.texname != tex.name) 2082 if (key.texname != tex.name)
2035 { 2083 {
2084 self->tex [tile].unused = 0;
2085
2036 if (!tex.name) 2086 if (!tex.name)
2037 tex = self->tex [2]; /* missing, replace by noface */ 2087 tex = self->tex [2]; /* missing, replace by noface */
2038 2088
2039 key.texname = tex.name; 2089 key.texname = tex.name;
2040 arr = rc_array (rc, &key); 2090 arr = rc_array (rc, &key);
… …
2162 { 2212 {
2163 // this time avoiding texture state changes 2213 // this time avoiding texture state changes
2164 // save gobs of state changes. 2214 // save gobs of state changes.
2165 if (key.texname != tex.name) 2215 if (key.texname != tex.name)
2166 { 2216 {
2217 self->tex [skey->tile].unused = 0;
2218
2167 glEnd (); 2219 glEnd ();
2168 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2220 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2169 glBegin (GL_QUADS); 2221 glBegin (GL_QUADS);
2170 } 2222 }
2171 2223
… …
2233 { 2285 {
2234 mapcell *cell = row->col + (x + mx - row->c0); 2286 mapcell *cell = row->col + (x + mx - row->c0);
2235 2287
2236 int px = x * T; 2288 int px = x * T;
2237 int py = y * T; 2289 int py = y * T;
2290
2291 if (expect_false (cell->player == player))
2292 {
2293 px += sdx;
2294 py += sdy;
2295 }
2238 2296
2239 if (cell->stat_hp) 2297 if (cell->stat_hp)
2240 { 2298 {
2241 int width = cell->stat_width * T; 2299 int width = cell->stat_width * T;
2242 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2300 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2983void glRotate (float angle, float x, float y, float z) 3041void glRotate (float angle, float x, float y, float z)
2984 CODE: 3042 CODE:
2985 glRotatef (angle, x, y, z); 3043 glRotatef (angle, x, y, z);
2986 3044
2987void glColor (float r, float g, float b, float a = 1.0) 3045void glColor (float r, float g, float b, float a = 1.0)
3046 PROTOTYPE: @
2988 ALIAS: 3047 ALIAS:
2989 glColor_premultiply = 1 3048 glColor_premultiply = 1
2990 CODE: 3049 CODE:
2991 if (ix) 3050 if (ix)
2992 { 3051 {

Diff Legend

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