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.273 by root, Wed Aug 20 13:30:02 2008 UTC vs.
Revision 1.282 by root, Fri Dec 5 14:50:01 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];
… …
527 return 0; 530 return 0;
528 531
529 return 1; 532 return 1;
530} 533}
531 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;
547}
548
532static void 549static void
533deliantra_main () 550deliantra_main ()
534{ 551{
535 char *argv[] = { 0 }; 552 char *argv[] = { 0 };
536 call_argv ("::main", G_DISCARD | G_VOID, argv); 553 call_argv ("::main", G_DISCARD | G_VOID, argv);
537 dSP;
538} 554}
539 555
540#ifdef __MACOSX__ 556#ifdef __MACOSX__
541 /* to due surprising braindamage on the side of SDL design, we 557 /* to due surprising braindamage on the side of SDL design, we
542 * do some mind-boggling hack here: SDL requires a custom main() 558 * do some mind-boggling hack here: SDL requires a custom main()
… …
603 const_iv (SDL_USEREVENT), 619 const_iv (SDL_USEREVENT),
604 620
605 const_iv (SDL_APPINPUTFOCUS), 621 const_iv (SDL_APPINPUTFOCUS),
606 const_iv (SDL_APPMOUSEFOCUS), 622 const_iv (SDL_APPMOUSEFOCUS),
607 const_iv (SDL_APPACTIVE), 623 const_iv (SDL_APPACTIVE),
624
625
626 const_iv (SDLK_UNKNOWN),
627 const_iv (SDLK_FIRST),
628 const_iv (SDLK_BACKSPACE),
629 const_iv (SDLK_TAB),
630 const_iv (SDLK_CLEAR),
631 const_iv (SDLK_RETURN),
632 const_iv (SDLK_PAUSE),
633 const_iv (SDLK_ESCAPE),
634 const_iv (SDLK_SPACE),
635 const_iv (SDLK_EXCLAIM),
636 const_iv (SDLK_QUOTEDBL),
637 const_iv (SDLK_HASH),
638 const_iv (SDLK_DOLLAR),
639 const_iv (SDLK_AMPERSAND),
640 const_iv (SDLK_QUOTE),
641 const_iv (SDLK_LEFTPAREN),
642 const_iv (SDLK_RIGHTPAREN),
643 const_iv (SDLK_ASTERISK),
644 const_iv (SDLK_PLUS),
645 const_iv (SDLK_COMMA),
646 const_iv (SDLK_MINUS),
647 const_iv (SDLK_PERIOD),
648 const_iv (SDLK_SLASH),
649 const_iv (SDLK_0),
650 const_iv (SDLK_1),
651 const_iv (SDLK_2),
652 const_iv (SDLK_3),
653 const_iv (SDLK_4),
654 const_iv (SDLK_5),
655 const_iv (SDLK_6),
656 const_iv (SDLK_7),
657 const_iv (SDLK_8),
658 const_iv (SDLK_9),
659 const_iv (SDLK_COLON),
660 const_iv (SDLK_SEMICOLON),
661 const_iv (SDLK_LESS),
662 const_iv (SDLK_EQUALS),
663 const_iv (SDLK_GREATER),
664 const_iv (SDLK_QUESTION),
665 const_iv (SDLK_AT),
666
667 const_iv (SDLK_LEFTBRACKET),
668 const_iv (SDLK_BACKSLASH),
669 const_iv (SDLK_RIGHTBRACKET),
670 const_iv (SDLK_CARET),
671 const_iv (SDLK_UNDERSCORE),
672 const_iv (SDLK_BACKQUOTE),
673 const_iv (SDLK_DELETE),
608 674
609 const_iv (SDLK_FIRST), 675 const_iv (SDLK_FIRST),
610 const_iv (SDLK_LAST), 676 const_iv (SDLK_LAST),
611 const_iv (SDLK_KP0), 677 const_iv (SDLK_KP0),
612 const_iv (SDLK_KP1), 678 const_iv (SDLK_KP1),
… …
688 const_iv (KMOD_RMETA), 754 const_iv (KMOD_RMETA),
689 const_iv (KMOD_NUM), 755 const_iv (KMOD_NUM),
690 const_iv (KMOD_CAPS), 756 const_iv (KMOD_CAPS),
691 const_iv (KMOD_MODE), 757 const_iv (KMOD_MODE),
692 758
759 const_iv (KMOD_LRAM),
760
693 const_iv (MIX_DEFAULT_FORMAT), 761 const_iv (MIX_DEFAULT_FORMAT),
694 762
695 const_iv (SDL_INIT_TIMER), 763 const_iv (SDL_INIT_TIMER),
696 const_iv (SDL_INIT_AUDIO), 764 const_iv (SDL_INIT_AUDIO),
697 const_iv (SDL_INIT_VIDEO), 765 const_iv (SDL_INIT_VIDEO),
… …
884 { 952 {
885 case SDL_KEYDOWN: 953 case SDL_KEYDOWN:
886 case SDL_KEYUP: 954 case SDL_KEYUP:
887 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 955 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
888 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 956 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
889 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);
890 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 */
891 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 959 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
892 break; 960 break;
893 961
894 case SDL_ACTIVEEVENT: 962 case SDL_ACTIVEEVENT:
895 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 963 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
913 x = ev.motion.x; 981 x = ev.motion.x;
914 y = ev.motion.y; 982 y = ev.motion.y;
915 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 983 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
916 } 984 }
917 985
918 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 986 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
919 hv_store (hv, "state", 5, newSViv (state), 0); 987 hv_store (hv, "state", 5, newSViv (state), 0);
920 hv_store (hv, "x", 1, newSViv (x), 0); 988 hv_store (hv, "x", 1, newSViv (x), 0);
921 hv_store (hv, "y", 1, newSViv (y), 0); 989 hv_store (hv, "y", 1, newSViv (y), 0);
922 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 990 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
923 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 991 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
1139#if DEBUG 1207#if DEBUG
1140 VALGRIND_DO_LEAK_CHECK; 1208 VALGRIND_DO_LEAK_CHECK;
1141#endif 1209#endif
1142} 1210}
1143 1211
1212int
1213SvREFCNT (SV *sv)
1214 CODE:
1215 RETVAL = SvREFCNT (sv);
1216 OUTPUT:
1217 RETVAL
1218
1144MODULE = Deliantra::Client PACKAGE = DC::Font 1219MODULE = Deliantra::Client PACKAGE = DC::Font
1145 1220
1146PROTOTYPES: DISABLE 1221PROTOTYPES: DISABLE
1147 1222
1148DC::Font 1223DC::Font
… …
1692 //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);
1693 // use uglier nearest interpolation because linear suffers 1768 // use uglier nearest interpolation because linear suffers
1694 // from transparent color bleeding and ugly wrapping effects. 1769 // from transparent color bleeding and ugly wrapping effects.
1695 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1770 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1696} 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 }
1697 1792
1698int 1793int
1699ox (DC::Map self) 1794ox (DC::Map self)
1700 ALIAS: 1795 ALIAS:
1701 oy = 1 1796 oy = 1
… …
1822 cell->tile [z] = self->face2tile [face]; 1917 cell->tile [z] = self->face2tile [face];
1823 1918
1824 if (cell->tile [z]) 1919 if (cell->tile [z])
1825 { 1920 {
1826 maptex *tex = self->tex + cell->tile [z]; 1921 maptex *tex = self->tex + cell->tile [z];
1922 tex->unused = 0;
1827 if (!tex->name) 1923 if (!tex->name)
1828 av_push (missing, newSViv (cell->tile [z])); 1924 av_push (missing, newSViv (cell->tile [z]));
1829 1925
1830 if (tex->smoothtile) 1926 if (tex->smoothtile)
1831 { 1927 {
1832 maptex *smooth = self->tex + tex->smoothtile; 1928 maptex *smooth = self->tex + tex->smoothtile;
1929 smooth->unused = 0;
1833 if (!smooth->name) 1930 if (!smooth->name)
1834 av_push (missing, newSViv (tex->smoothtile)); 1931 av_push (missing, newSViv (tex->smoothtile));
1835 } 1932 }
1836 } 1933 }
1837 } 1934 }
… …
1982 int px = (x + 1) * T - tex.w; 2079 int px = (x + 1) * T - tex.w;
1983 int py = (y + 1) * T - tex.h; 2080 int py = (y + 1) * T - tex.h;
1984 2081
1985 if (key.texname != tex.name) 2082 if (key.texname != tex.name)
1986 { 2083 {
2084 self->tex [tile].unused = 0;
2085
1987 if (!tex.name) 2086 if (!tex.name)
1988 tex = self->tex [2]; /* missing, replace by noface */ 2087 tex = self->tex [2]; /* missing, replace by noface */
1989 2088
1990 key.texname = tex.name; 2089 key.texname = tex.name;
1991 arr = rc_array (rc, &key); 2090 arr = rc_array (rc, &key);
… …
2113 { 2212 {
2114 // this time avoiding texture state changes 2213 // this time avoiding texture state changes
2115 // save gobs of state changes. 2214 // save gobs of state changes.
2116 if (key.texname != tex.name) 2215 if (key.texname != tex.name)
2117 { 2216 {
2217 self->tex [skey->tile].unused = 0;
2218
2118 glEnd (); 2219 glEnd ();
2119 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2220 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2120 glBegin (GL_QUADS); 2221 glBegin (GL_QUADS);
2121 } 2222 }
2122 2223
… …
2184 { 2285 {
2185 mapcell *cell = row->col + (x + mx - row->c0); 2286 mapcell *cell = row->col + (x + mx - row->c0);
2186 2287
2187 int px = x * T; 2288 int px = x * T;
2188 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 }
2189 2296
2190 if (cell->stat_hp) 2297 if (cell->stat_hp)
2191 { 2298 {
2192 int width = cell->stat_width * T; 2299 int width = cell->stat_width * T;
2193 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2300 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2934void glRotate (float angle, float x, float y, float z) 3041void glRotate (float angle, float x, float y, float z)
2935 CODE: 3042 CODE:
2936 glRotatef (angle, x, y, z); 3043 glRotatef (angle, x, y, z);
2937 3044
2938void 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: @
2939 ALIAS: 3047 ALIAS:
2940 glColor_premultiply = 1 3048 glColor_premultiply = 1
2941 CODE: 3049 CODE:
2942 if (ix) 3050 if (ix)
2943 { 3051 {

Diff Legend

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