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.257 by root, Mon Mar 24 01:15:21 2008 UTC vs.
Revision 1.274 by root, Wed Aug 20 17:50:47 2008 UTC

39#include <SDL_endian.h> 39#include <SDL_endian.h>
40#include <SDL_image.h> 40#include <SDL_image.h>
41#include <SDL_mixer.h> 41#include <SDL_mixer.h>
42#include <SDL_opengl.h> 42#include <SDL_opengl.h>
43 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
44#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
46 51
47#include <glib/gmacros.h> 52#include <glib/gmacros.h>
48 53
65# include <netinet/in.h> 70# include <netinet/in.h>
66# include <netinet/tcp.h> 71# include <netinet/tcp.h>
67# include <inttypes.h> 72# include <inttypes.h>
68#endif 73#endif
69 74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
70#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
71 85
72#define FOW_DARKNESS 32 86#define FOW_DARKNESS 32
73 87
74#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
76 90
77#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
78 92
79/* mask out modifiers we are not interested in */ 93/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
81
82#if 0
83# define PARACHUTE SDL_INIT_NOPARACHUTE
84#else
85# define PARACHUTE 0
86#endif
87 95
88static AV *texture_av; 96static AV *texture_av;
89 97
90static struct 98static struct
91{ 99{
185 193
186static void 194static void
187layout_update_font (DC__Layout self) 195layout_update_font (DC__Layout self)
188{ 196{
189 /* use a random scale factor to account for unknown descenders, 0.8 works 197 /* use a random scale factor to account for unknown descenders, 0.8 works
190 * reasonably well with bitstream vera 198 * reasonably well with dejavu/bistream fonts
191 */ 199 */
192 PangoFontDescription *font = self->font ? self->font : default_font; 200 PangoFontDescription *font = self->font ? self->font : default_font;
193 201
194 pango_font_description_set_absolute_size (font, 202 pango_font_description_set_absolute_size (font,
195 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 203 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
364 self->oy = 0; 372 self->oy = 0;
365 self->row = 0; 373 self->row = 0;
366 self->rows = 0; 374 self->rows = 0;
367} 375}
368 376
377#define CELL_CLEAR(cell) \
378 do { \
379 if ((cell)->player) \
380 (cell)->tile [2] = 0; \
381 (cell)->darkness = 0; \
382 (cell)->stat_hp = 0; \
383 (cell)->flags = 0; \
384 (cell)->player = 0; \
385 } while (0)
386
369static void 387static void
370map_blank (DC__Map self, int x0, int y0, int w, int h) 388map_blank (DC__Map self, int x0, int y0, int w, int h)
371{ 389{
372 int x, y; 390 int x, y;
373 maprow *row; 391 maprow *row;
387 if (x >= row->c1) 405 if (x >= row->c1)
388 break; 406 break;
389 407
390 cell = row->col + x - row->c0; 408 cell = row->col + x - row->c0;
391 409
392 cell->darkness = 0; 410 CELL_CLEAR (cell);
393 cell->stat_hp = 0;
394 cell->flags = 0;
395 cell->player = 0;
396 } 411 }
397 } 412 }
398} 413}
399 414
400typedef struct { 415typedef struct {
511 if (!svp || !SvTRUE (*svp)) 526 if (!svp || !SvTRUE (*svp))
512 return 0; 527 return 0;
513 528
514 return 1; 529 return 1;
515} 530}
531
532static void
533deliantra_main ()
534{
535 char *argv[] = { 0 };
536 call_argv ("::main", G_DISCARD | G_VOID, argv);
537}
538
539#ifdef __MACOSX__
540 /* to due surprising braindamage on the side of SDL design, we
541 * do some mind-boggling hack here: SDL requires a custom main()
542 * on OS X, so... we provide one and call the original main(), which,
543 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
544 * and which calls our main (== SDL_main) back.
545 */
546 extern C_LINKAGE int
547 main (int argc, char *argv[])
548 {
549 deliantra_main ();
550 }
551
552 #undef main
553
554 extern C_LINKAGE int main (int argc, char *argv[]);
555
556 static void
557 SDL_braino (void)
558 {
559 char *argv[] = { "deliantra client", 0 };
560 (main) (1, argv);
561 }
562#else
563 static void
564 SDL_braino (void)
565 {
566 deliantra_main ();
567 }
568#endif
516 569
517MODULE = Deliantra::Client PACKAGE = DC 570MODULE = Deliantra::Client PACKAGE = DC
518 571
519PROTOTYPES: ENABLE 572PROTOTYPES: ENABLE
520 573
635 const_iv (KMOD_NUM), 688 const_iv (KMOD_NUM),
636 const_iv (KMOD_CAPS), 689 const_iv (KMOD_CAPS),
637 const_iv (KMOD_MODE), 690 const_iv (KMOD_MODE),
638 691
639 const_iv (MIX_DEFAULT_FORMAT), 692 const_iv (MIX_DEFAULT_FORMAT),
693
694 const_iv (SDL_INIT_TIMER),
695 const_iv (SDL_INIT_AUDIO),
696 const_iv (SDL_INIT_VIDEO),
697 const_iv (SDL_INIT_CDROM),
698 const_iv (SDL_INIT_JOYSTICK),
699 const_iv (SDL_INIT_EVERYTHING),
700 const_iv (SDL_INIT_NOPARACHUTE),
701 const_iv (SDL_INIT_EVENTTHREAD),
702
703 const_iv (SDL_GL_RED_SIZE),
704 const_iv (SDL_GL_GREEN_SIZE),
705 const_iv (SDL_GL_BLUE_SIZE),
706 const_iv (SDL_GL_ALPHA_SIZE),
707 const_iv (SDL_GL_DOUBLEBUFFER),
708 const_iv (SDL_GL_BUFFER_SIZE),
709 const_iv (SDL_GL_DEPTH_SIZE),
710 const_iv (SDL_GL_STENCIL_SIZE),
711 const_iv (SDL_GL_ACCUM_RED_SIZE),
712 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
713 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
714 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
715 const_iv (SDL_GL_STEREO),
716 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
717 const_iv (SDL_GL_MULTISAMPLESAMPLES),
718 const_iv (SDL_GL_ACCELERATED_VISUAL),
719 const_iv (SDL_GL_SWAP_CONTROL),
720
721 const_iv (FOW_DARKNESS)
640# undef const_iv 722# undef const_iv
641 }; 723 };
642 724
643 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 725 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 726 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
680 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 762 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
681 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 763 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
682#endif 764#endif
683} 765}
684 766
685char *
686SDL_GetError () 767char *SDL_GetError ()
687 768
688int 769void SDL_braino ()
689SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
690 770
691void 771int SDL_Init (U32 flags)
772
773int SDL_InitSubSystem (U32 flags)
774
775void SDL_QuitSubSystem (U32 flags)
776
692SDL_Quit () 777void SDL_Quit ()
778
779int SDL_GL_SetAttribute (int attr, int value)
780
781int SDL_GL_GetAttribute (int attr)
782 CODE:
783 if (SDL_GL_GetAttribute (attr, &RETVAL))
784 XSRETURN_UNDEF;
785 OUTPUT:
786 RETVAL
693 787
694void 788void
695SDL_ListModes (int rgb, int alpha) 789SDL_ListModes (int rgb, int alpha)
696 PPCODE: 790 PPCODE:
697{ 791{
709 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 803 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
710 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 804 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
711 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 805 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
712 806
713 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 807 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
714#if SDL_VERSION_ATLEAST(1,2,10)
715 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
716 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 808 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
717#endif
718 809
719 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 810 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
720 811
721 if (m && m != (SDL_Rect **)-1) 812 if (m && m != (SDL_Rect **)-1)
722 while (*m) 813 while (*m)
723 { 814 {
724 if ((*m)->w >= 800 && (*m)->h >= 480) 815 if ((*m)->w >= 400 && (*m)->h >= 300)
725 { 816 {
726 AV *av = newAV (); 817 AV *av = newAV ();
727 av_push (av, newSViv ((*m)->w)); 818 av_push (av, newSViv ((*m)->w));
728 av_push (av, newSViv ((*m)->h)); 819 av_push (av, newSViv ((*m)->h));
729 av_push (av, newSViv (rgb)); 820 av_push (av, newSViv (rgb));
1687 uint8_t ext, cmd; 1778 uint8_t ext, cmd;
1688 1779
1689 do 1780 do
1690 { 1781 {
1691 ext = *data++; 1782 ext = *data++;
1692 cmd = ext & 0x3f; 1783 cmd = ext & 0x7f;
1693 1784
1694 if (cmd < 4) 1785 if (cmd < 4)
1695 cell->darkness = 255 - ext * 64 + 1; 1786 cell->darkness = 255 - ext * 64 + 1;
1696 else if (cmd == 5) // health 1787 else if (cmd == 5) // health
1697 { 1788 {
1700 } 1791 }
1701 else if (cmd == 6) // monster width 1792 else if (cmd == 6) // monster width
1702 cell->stat_width = *data++ + 1; 1793 cell->stat_width = *data++ + 1;
1703 else if (cmd == 0x47) 1794 else if (cmd == 0x47)
1704 { 1795 {
1705 if (*data == 4) 1796 if (*data == 1) cell->player = data [1];
1706 ; // decode player count 1797 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1798 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1799 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1707 1800
1708 data += *data + 1; 1801 data += *data + 1;
1709 } 1802 }
1710 else if (cmd == 8) // cell flags 1803 else if (cmd == 8) // cell flags
1711 cell->flags = *data++; 1804 cell->flags = *data++;
1741 } 1834 }
1742 } 1835 }
1743 } 1836 }
1744 } 1837 }
1745 else 1838 else
1746 cell->darkness = 0; 1839 CELL_CLEAR (cell);
1747 } 1840 }
1748} 1841}
1749 OUTPUT: 1842 OUTPUT:
1750 RETVAL 1843 RETVAL
1751 1844
1803} 1896}
1804 OUTPUT: 1897 OUTPUT:
1805 RETVAL 1898 RETVAL
1806 1899
1807void 1900void
1808draw (DC::Map self, int mx, int my, int sw, int sh, int T) 1901draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1809 CODE: 1902 CODE:
1810{ 1903{
1811 int x, y, z; 1904 int x, y, z;
1812 1905
1813 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1906 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1814 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1907 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1815 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 1908 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1816 smooth_key skey; 1909 smooth_key skey;
1817 1910 int pl_x, pl_y;
1911 maptex pl_tex;
1818 rc_t *rc = rc_alloc (); 1912 rc_t *rc = rc_alloc ();
1819 rc_key_t key; 1913 rc_key_t key;
1820 rc_array_t *arr; 1914 rc_array_t *arr;
1915
1916 pl_tex.name = 0;
1821 1917
1822 // thats current max. sorry. 1918 // thats current max. sorry.
1823 if (sw > 255) sw = 255; 1919 if (sw > 255) sw = 255;
1824 if (sh > 255) sh = 255; 1920 if (sh > 255) sh = 255;
1825 1921
1880 tileid tile = cell->tile [z]; 1976 tileid tile = cell->tile [z];
1881 1977
1882 if (tile) 1978 if (tile)
1883 { 1979 {
1884 maptex tex = self->tex [tile]; 1980 maptex tex = self->tex [tile];
1885 int px, py; 1981 int px = (x + 1) * T - tex.w;
1982 int py = (y + 1) * T - tex.h;
1886 1983
1887 if (key.texname != tex.name) 1984 if (key.texname != tex.name)
1888 { 1985 {
1889 if (!tex.name) 1986 if (!tex.name)
1890 tex = self->tex [2]; /* missing, replace by noface */ 1987 tex = self->tex [2]; /* missing, replace by noface */
1891 1988
1892 key.texname = tex.name; 1989 key.texname = tex.name;
1893 arr = rc_array (rc, &key); 1990 arr = rc_array (rc, &key);
1894 } 1991 }
1895 1992
1896 px = (x + 1) * T - tex.w; 1993 if (expect_false (cell->player == player) && expect_false (z == 2))
1897 py = (y + 1) * T - tex.h; 1994 {
1995 pl_x = px;
1996 pl_y = py;
1997 pl_tex = tex;
1998 continue;
1999 }
1898 2000
1899 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2001 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1900 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2002 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1901 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2003 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1902 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2004 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1903 2005
1904 if (cell->flags && z == 2) 2006 if (expect_false (cell->flags) && expect_false (z == 2))
1905 { 2007 {
1906 // overlays such as the speech bubble, probably more to come 2008 // overlays such as the speech bubble, probably more to come
1907 if (cell->flags & 1) 2009 if (cell->flags & 1)
1908 { 2010 {
1909 maptex tex = self->tex [1]; 2011 maptex tex = self->tex [1];
2048 } 2150 }
2049 2151
2050 hv_clear (smooth); 2152 hv_clear (smooth);
2051 } 2153 }
2052 2154
2155 if (pl_tex.name)
2156 {
2157 maptex tex = pl_tex;
2158 int px = pl_x + sdx;
2159 int py = pl_y + sdy;
2160
2161 key.texname = tex.name;
2162 arr = rc_array (rc, &key);
2163
2164 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2165 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2166 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2167 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2168
2169 rc_draw (rc);
2170 }
2171
2053 glDisable (GL_BLEND); 2172 glDisable (GL_BLEND);
2054 rc_free (rc); 2173 rc_free (rc);
2055 2174
2056 // top layer: overlays such as the health bar 2175 // top layer: overlays such as the health bar
2057 for (y = 0; y < sh; y++) 2176 for (y = 0; y < sh; y++)
2162 SvCUR_set (darkness3_sv, sw34 * sh3); 2281 SvCUR_set (darkness3_sv, sw34 * sh3);
2163 2282
2164 mx += self->x - 1; 2283 mx += self->x - 1;
2165 my += self->y - 1; 2284 my += self->y - 1;
2166 2285
2167 memset (darkness1, 255, sw1 * sh1); 2286 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2168 2287
2169 for (y = 0; y < sh1; y++) 2288 for (y = 0; y < sh1; y++)
2170 if (0 <= y + my && y + my < self->rows) 2289 if (0 <= y + my && y + my < self->rows)
2171 { 2290 {
2172 maprow *row = self->row + (y + my); 2291 maprow *row = self->row + (y + my);
2292 else 2411 else
2293 *data++ = 0; 2412 *data++ = 0;
2294 } 2413 }
2295 } 2414 }
2296 2415
2416 /* if size is w*h + 5 then no data has been found */
2417 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2418 {
2297 SvPOK_only (data_sv); 2419 SvPOK_only (data_sv);
2298 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2420 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2421 }
2422
2299 RETVAL = data_sv; 2423 RETVAL = data_sv;
2300} 2424}
2301 OUTPUT: 2425 OUTPUT:
2302 RETVAL 2426 RETVAL
2303 2427
2304void 2428void
2305set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2429set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2306 PPCODE: 2430 PPCODE:
2307{ 2431{
2308 int x, y, z; 2432 int x, y, z;
2309 int w, h; 2433 int w, h;
2310 int x1, y1; 2434 int x1, y1;
2435 STRLEN len;
2436 uint8_t *data, *end;
2437
2438 len = SvLEN (data_sv);
2439 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2440 data = SvPVbyte_nolen (data_sv);
2441 end = data + len + 8;
2442
2443 if (len < 5)
2444 XSRETURN_EMPTY;
2311 2445
2312 if (*data++ != 0) 2446 if (*data++ != 0)
2313 XSRETURN_EMPTY; /* version mismatch */ 2447 XSRETURN_EMPTY; /* version mismatch */
2314 2448
2315 w = *data++ << 8; w |= *data++; 2449 w = *data++ << 8; w |= *data++;
2330 { 2464 {
2331 maprow *row = map_get_row (self, y); 2465 maprow *row = map_get_row (self, y);
2332 2466
2333 for (x = x0; x < x1; x++) 2467 for (x = x0; x < x1; x++)
2334 { 2468 {
2469 uint8_t flags;
2470
2471 if (data + 7 >= end)
2472 XSRETURN_EMPTY;
2473
2335 uint8_t flags = *data++; 2474 flags = *data++;
2336 2475
2337 if (flags) 2476 if (flags)
2338 { 2477 {
2339 mapcell *cell = row_get_cell (row, x); 2478 mapcell *cell = row_get_cell (row, x);
2340 tileid tile[3] = { 0, 0, 0 }; 2479 tileid tile[3] = { 0, 0, 0 };
2343 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2482 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2344 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2483 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2345 2484
2346 if (cell->darkness == 0) 2485 if (cell->darkness == 0)
2347 { 2486 {
2348 cell->darkness = 0; 2487 /*cell->darkness = 0;*/
2488 EXTEND (SP, 3);
2349 2489
2350 for (z = 0; z <= 2; z++) 2490 for (z = 0; z <= 2; z++)
2351 { 2491 {
2352 tileid t = tile [z]; 2492 tileid t = tile [z];
2353 2493
2354 if (t >= self->texs || (t && !self->tex [t].name)) 2494 if (t >= self->texs || (t && !self->tex [t].name))
2355 { 2495 {
2356 XPUSHs (sv_2mortal (newSViv (t))); 2496 PUSHs (sv_2mortal (newSViv (t)));
2357 need_texid (self, t); 2497 need_texid (self, t);
2358 } 2498 }
2359 2499
2360 cell->tile [z] = t; 2500 cell->tile [z] = t;
2361 } 2501 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines