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.242 by root, Wed Dec 26 21:03:21 2007 UTC vs.
Revision 1.273 by root, Wed Aug 20 13:30:02 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
49#include <pango/pango.h> 54#include <pango/pango.h>
55
56#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0
58#endif
59
60#if !PANGO_VERSION_CHECK (1, 15, 2)
61# define pango_layout_get_line_readonly pango_layout_get_line
62# define pango_layout_get_lines_readonly pango_layout_get_lines
63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
65#endif
50 66
51#ifndef _WIN32 67#ifndef _WIN32
52# include <sys/types.h> 68# include <sys/types.h>
53# include <sys/socket.h> 69# include <sys/socket.h>
54# include <netinet/in.h> 70# include <netinet/in.h>
55# include <netinet/tcp.h> 71# include <netinet/tcp.h>
56# include <inttypes.h> 72# include <inttypes.h>
57#endif 73#endif
58 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
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 85
61#define FOW_DARKNESS 32 86#define FOW_DARKNESS 32
62 87
63#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
65 90
66#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
67 92
68#if 0 93/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else
71# define PARACHUTE 0
72#endif
73 95
74static AV *texture_av; 96static AV *texture_av;
75 97
76static struct 98static struct
77{ 99{
… …
171 193
172static void 194static void
173layout_update_font (DC__Layout self) 195layout_update_font (DC__Layout self)
174{ 196{
175 /* 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
176 * reasonably well with bitstream vera 198 * reasonably well with dejavu/bistream fonts
177 */ 199 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 200 PangoFontDescription *font = self->font ? self->font : default_font;
179 201
180 pango_font_description_set_absolute_size (font, 202 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 203 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
350 self->oy = 0; 372 self->oy = 0;
351 self->row = 0; 373 self->row = 0;
352 self->rows = 0; 374 self->rows = 0;
353} 375}
354 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
355static void 387static void
356map_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)
357{ 389{
358 int x, y; 390 int x, y;
359 maprow *row; 391 maprow *row;
… …
373 if (x >= row->c1) 405 if (x >= row->c1)
374 break; 406 break;
375 407
376 cell = row->col + x - row->c0; 408 cell = row->col + x - row->c0;
377 409
378 cell->darkness = 0; 410 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 411 }
383 } 412 }
384} 413}
385 414
386typedef struct { 415typedef struct {
… …
497 if (!svp || !SvTRUE (*svp)) 526 if (!svp || !SvTRUE (*svp))
498 return 0; 527 return 0;
499 528
500 return 1; 529 return 1;
501} 530}
531
532static void
533deliantra_main ()
534{
535 char *argv[] = { 0 };
536 call_argv ("::main", G_DISCARD | G_VOID, argv);
537 dSP;
538}
539
540#ifdef __MACOSX__
541 /* to due surprising braindamage on the side of SDL design, we
542 * do some mind-boggling hack here: SDL requires a custom main()
543 * on OS X, so... we provide one and call the original main(), which,
544 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
545 * and which calls our main (== SDL_main) back.
546 */
547 extern C_LINKAGE int
548 main (int argc, char *argv[])
549 {
550 deliantra_main ();
551 }
552
553 #undef main
554
555 extern C_LINKAGE int main (int argc, char *argv[]);
556
557 static void
558 SDL_braino (void)
559 {
560 char *argv[] = { "deliantra client", 0 };
561 (main) (1, argv);
562 }
563#else
564 static void
565 SDL_braino (void)
566 {
567 deliantra_main ();
568 }
569#endif
502 570
503MODULE = Deliantra::Client PACKAGE = DC 571MODULE = Deliantra::Client PACKAGE = DC
504 572
505PROTOTYPES: ENABLE 573PROTOTYPES: ENABLE
506 574
… …
621 const_iv (KMOD_NUM), 689 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 690 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 691 const_iv (KMOD_MODE),
624 692
625 const_iv (MIX_DEFAULT_FORMAT), 693 const_iv (MIX_DEFAULT_FORMAT),
694
695 const_iv (SDL_INIT_TIMER),
696 const_iv (SDL_INIT_AUDIO),
697 const_iv (SDL_INIT_VIDEO),
698 const_iv (SDL_INIT_CDROM),
699 const_iv (SDL_INIT_JOYSTICK),
700 const_iv (SDL_INIT_EVERYTHING),
701 const_iv (SDL_INIT_NOPARACHUTE),
702 const_iv (SDL_INIT_EVENTTHREAD),
703
704 const_iv (SDL_GL_RED_SIZE),
705 const_iv (SDL_GL_GREEN_SIZE),
706 const_iv (SDL_GL_BLUE_SIZE),
707 const_iv (SDL_GL_ALPHA_SIZE),
708 const_iv (SDL_GL_DOUBLEBUFFER),
709 const_iv (SDL_GL_BUFFER_SIZE),
710 const_iv (SDL_GL_DEPTH_SIZE),
711 const_iv (SDL_GL_STENCIL_SIZE),
712 const_iv (SDL_GL_ACCUM_RED_SIZE),
713 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
714 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
715 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
716 const_iv (SDL_GL_STEREO),
717 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
718 const_iv (SDL_GL_MULTISAMPLESAMPLES),
719 const_iv (SDL_GL_ACCELERATED_VISUAL),
720 const_iv (SDL_GL_SWAP_CONTROL),
721
722 const_iv (FOW_DARKNESS)
626# undef const_iv 723# undef const_iv
627 }; 724 };
628 725
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 726 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 727 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
659 CODE: 756 CODE:
660{ 757{
661 opengl_fontmap = pango_opengl_font_map_new (); 758 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 759 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
663 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 760 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
761 /*pango_context_set_font_description (opengl_context, default_font);*/
762#if PANGO_VERSION_CHECK (1, 15, 2)
763 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
764 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
765#endif
664} 766}
665 767
666char *
667SDL_GetError () 768char *SDL_GetError ()
668 769
669int 770void SDL_braino ()
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 771
672void 772int SDL_Init (U32 flags)
773
774int SDL_InitSubSystem (U32 flags)
775
776void SDL_QuitSubSystem (U32 flags)
777
673SDL_Quit () 778void SDL_Quit ()
779
780int SDL_GL_SetAttribute (int attr, int value)
781
782int SDL_GL_GetAttribute (int attr)
783 CODE:
784 if (SDL_GL_GetAttribute (attr, &RETVAL))
785 XSRETURN_UNDEF;
786 OUTPUT:
787 RETVAL
674 788
675void 789void
676SDL_ListModes (int rgb, int alpha) 790SDL_ListModes (int rgb, int alpha)
677 PPCODE: 791 PPCODE:
678{ 792{
… …
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 804 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 805 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 806 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 807
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 808 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695#if SDL_VERSION_ATLEAST(1,2,10)
696 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 809 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 810
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 811 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 812
702 if (m && m != (SDL_Rect **)-1) 813 if (m && m != (SDL_Rect **)-1)
703 while (*m) 814 while (*m)
704 { 815 {
705 if ((*m)->w >= 800 && (*m)->h >= 600) 816 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 817 {
707 AV *av = newAV (); 818 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 819 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 820 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 821 av_push (av, newSViv (rgb));
… …
752SDL_GetKeyName (int sym) 863SDL_GetKeyName (int sym)
753 864
754int 865int
755SDL_GetAppState () 866SDL_GetAppState ()
756 867
868int
869SDL_GetModState ()
870
757void 871void
758poll_events () 872poll_events ()
759 PPCODE: 873 PPCODE:
760{ 874{
761 SDL_Event ev; 875 SDL_Event ev;
… …
770 { 884 {
771 case SDL_KEYDOWN: 885 case SDL_KEYDOWN:
772 case SDL_KEYUP: 886 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 887 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 888 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 889 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
776 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 890 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 891 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 892 break;
779 893
780 case SDL_ACTIVEEVENT: 894 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 895 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
799 x = ev.motion.x; 913 x = ev.motion.x;
800 y = ev.motion.y; 914 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 915 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 916 }
803 917
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 918 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 919 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 920 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 921 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 922 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 923 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 924 }
811 break; 925 break;
812 926
813 case SDL_MOUSEBUTTONDOWN: 927 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 928 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 929 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 930
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 931 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 932 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 933 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 934 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
894 } 1008 }
895 } 1009 }
896#endif 1010#endif
897} 1011}
898 1012
899void 1013int
900add_font (char *file) 1014add_font (char *file)
901 CODE: 1015 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1016 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1017 OUTPUT:
1018 RETVAL
903 1019
904void 1020void
905load_image_inline (SV *image_) 1021load_image_inline (SV *image_)
906 ALIAS: 1022 ALIAS:
907 load_image_file = 1 1023 load_image_file = 1
… …
1165{ 1281{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1282 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1283
1168 do 1284 do
1169 { 1285 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1286 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1287
1172 if (run && shape_attr_p (run)) 1288 if (run && shape_attr_p (run))
1173 { 1289 {
1174 PangoRectangle extents; 1290 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1291 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1279int 1395int
1280descent (DC::Layout self) 1396descent (DC::Layout self)
1281 CODE: 1397 CODE:
1282{ 1398{
1283 PangoRectangle rect; 1399 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1400 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1401 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1402 RETVAL = PANGO_DESCENT (rect);
1287} 1403}
1288 OUTPUT: 1404 OUTPUT:
1289 RETVAL 1405 RETVAL
… …
1301 1417
1302void 1418void
1303cursor_pos (DC::Layout self, int index) 1419cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1420 PPCODE:
1305{ 1421{
1306 PangoRectangle strong_pos; 1422 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1423 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1424
1309 EXTEND (SP, 3); 1425 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1426 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1427 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1428 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1429}
1314 1430
1315void 1431void
1316index_to_line_x (DC::Layout self, int index, int trailing = 0) 1432index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1433 PPCODE:
1318{ 1434{
1319 int line, x; 1435 int line, x;
1320 1436
1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1437 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1438#if !PANGO_VERSION_CHECK (1, 17, 3)
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1439 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323 1440 --line;
1441#endif
1324 EXTEND (SP, 2); 1442 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1443 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1444 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1445}
1328 1446
1329void 1447void
1330line_x_to_index (DC::Layout self, int line, int x) 1448line_x_to_index (DC::Layout self, int line, int x)
… …
1334 int index, trailing; 1452 int index, trailing;
1335 1453
1336 if (line < 0) 1454 if (line < 0)
1337 XSRETURN_EMPTY; 1455 XSRETURN_EMPTY;
1338 1456
1339 if (!(lp = pango_layout_get_line (self->pl, line))) 1457 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340 XSRETURN_EMPTY; /* do better */ 1458 XSRETURN_EMPTY; /* do better */
1341 1459
1342 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1460 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1343 1461
1344 EXTEND (SP, 2); 1462 EXTEND (SP, 2);
… …
1661 uint8_t ext, cmd; 1779 uint8_t ext, cmd;
1662 1780
1663 do 1781 do
1664 { 1782 {
1665 ext = *data++; 1783 ext = *data++;
1666 cmd = ext & 0x3f; 1784 cmd = ext & 0x7f;
1667 1785
1668 if (cmd < 4) 1786 if (cmd < 4)
1669 cell->darkness = 255 - ext * 64 + 1; 1787 cell->darkness = 255 - ext * 64 + 1;
1670 else if (cmd == 5) // health 1788 else if (cmd == 5) // health
1671 { 1789 {
… …
1674 } 1792 }
1675 else if (cmd == 6) // monster width 1793 else if (cmd == 6) // monster width
1676 cell->stat_width = *data++ + 1; 1794 cell->stat_width = *data++ + 1;
1677 else if (cmd == 0x47) 1795 else if (cmd == 0x47)
1678 { 1796 {
1679 if (*data == 4) 1797 if (*data == 1) cell->player = data [1];
1680 ; // decode player count 1798 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1799 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1800 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1681 1801
1682 data += *data + 1; 1802 data += *data + 1;
1683 } 1803 }
1684 else if (cmd == 8) // cell flags 1804 else if (cmd == 8) // cell flags
1685 cell->flags = *data++; 1805 cell->flags = *data++;
… …
1715 } 1835 }
1716 } 1836 }
1717 } 1837 }
1718 } 1838 }
1719 else 1839 else
1720 cell->darkness = 0; 1840 CELL_CLEAR (cell);
1721 } 1841 }
1722} 1842}
1723 OUTPUT: 1843 OUTPUT:
1724 RETVAL 1844 RETVAL
1725 1845
… …
1777} 1897}
1778 OUTPUT: 1898 OUTPUT:
1779 RETVAL 1899 RETVAL
1780 1900
1781void 1901void
1782draw (DC::Map self, int mx, int my, int sw, int sh, int T) 1902draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1783 CODE: 1903 CODE:
1784{ 1904{
1785 int x, y, z; 1905 int x, y, z;
1786 1906
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1907 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1788 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1908 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1789 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 1909 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1790 smooth_key skey; 1910 smooth_key skey;
1791 1911 int pl_x, pl_y;
1912 maptex pl_tex;
1792 rc_t *rc = rc_alloc (); 1913 rc_t *rc = rc_alloc ();
1793 rc_key_t key; 1914 rc_key_t key;
1794 rc_array_t *arr; 1915 rc_array_t *arr;
1916
1917 pl_tex.name = 0;
1795 1918
1796 // thats current max. sorry. 1919 // thats current max. sorry.
1797 if (sw > 255) sw = 255; 1920 if (sw > 255) sw = 255;
1798 if (sh > 255) sh = 255; 1921 if (sh > 255) sh = 255;
1799 1922
… …
1854 tileid tile = cell->tile [z]; 1977 tileid tile = cell->tile [z];
1855 1978
1856 if (tile) 1979 if (tile)
1857 { 1980 {
1858 maptex tex = self->tex [tile]; 1981 maptex tex = self->tex [tile];
1859 int px, py; 1982 int px = (x + 1) * T - tex.w;
1983 int py = (y + 1) * T - tex.h;
1860 1984
1861 if (key.texname != tex.name) 1985 if (key.texname != tex.name)
1862 { 1986 {
1863 if (!tex.name) 1987 if (!tex.name)
1864 tex = self->tex [2]; /* missing, replace by noface */ 1988 tex = self->tex [2]; /* missing, replace by noface */
1865 1989
1866 key.texname = tex.name; 1990 key.texname = tex.name;
1867 arr = rc_array (rc, &key); 1991 arr = rc_array (rc, &key);
1868 } 1992 }
1869 1993
1870 px = (x + 1) * T - tex.w; 1994 if (expect_false (cell->player == player) && expect_false (z == 2))
1871 py = (y + 1) * T - tex.h; 1995 {
1996 pl_x = px;
1997 pl_y = py;
1998 pl_tex = tex;
1999 continue;
2000 }
1872 2001
1873 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2002 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2003 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1875 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2004 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1876 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2005 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1877 2006
1878 if (cell->flags && z == 2) 2007 if (expect_false (cell->flags) && expect_false (z == 2))
1879 { 2008 {
1880 // overlays such as the speech bubble, probably more to come 2009 // overlays such as the speech bubble, probably more to come
1881 if (cell->flags & 1) 2010 if (cell->flags & 1)
1882 { 2011 {
1883 maptex tex = self->tex [1]; 2012 maptex tex = self->tex [1];
… …
2022 } 2151 }
2023 2152
2024 hv_clear (smooth); 2153 hv_clear (smooth);
2025 } 2154 }
2026 2155
2156 if (pl_tex.name)
2157 {
2158 maptex tex = pl_tex;
2159 int px = pl_x + sdx;
2160 int py = pl_y + sdy;
2161
2162 key.texname = tex.name;
2163 arr = rc_array (rc, &key);
2164
2165 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2166 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2167 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2168 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2169
2170 rc_draw (rc);
2171 }
2172
2027 glDisable (GL_BLEND); 2173 glDisable (GL_BLEND);
2028 rc_free (rc); 2174 rc_free (rc);
2029 2175
2030 // top layer: overlays such as the health bar 2176 // top layer: overlays such as the health bar
2031 for (y = 0; y < sh; y++) 2177 for (y = 0; y < sh; y++)
… …
2136 SvCUR_set (darkness3_sv, sw34 * sh3); 2282 SvCUR_set (darkness3_sv, sw34 * sh3);
2137 2283
2138 mx += self->x - 1; 2284 mx += self->x - 1;
2139 my += self->y - 1; 2285 my += self->y - 1;
2140 2286
2141 memset (darkness1, 255, sw1 * sh1); 2287 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2142 2288
2143 for (y = 0; y < sh1; y++) 2289 for (y = 0; y < sh1; y++)
2144 if (0 <= y + my && y + my < self->rows) 2290 if (0 <= y + my && y + my < self->rows)
2145 { 2291 {
2146 maprow *row = self->row + (y + my); 2292 maprow *row = self->row + (y + my);
… …
2266 else 2412 else
2267 *data++ = 0; 2413 *data++ = 0;
2268 } 2414 }
2269 } 2415 }
2270 2416
2417 /* if size is w*h + 5 then no data has been found */
2418 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2419 {
2271 SvPOK_only (data_sv); 2420 SvPOK_only (data_sv);
2272 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2421 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2422 }
2423
2273 RETVAL = data_sv; 2424 RETVAL = data_sv;
2274} 2425}
2275 OUTPUT: 2426 OUTPUT:
2276 RETVAL 2427 RETVAL
2277 2428
2278void 2429void
2279set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2430set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280 PPCODE: 2431 PPCODE:
2281{ 2432{
2282 int x, y, z; 2433 int x, y, z;
2283 int w, h; 2434 int w, h;
2284 int x1, y1; 2435 int x1, y1;
2436 STRLEN len;
2437 uint8_t *data, *end;
2438
2439 len = SvLEN (data_sv);
2440 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2441 data = SvPVbyte_nolen (data_sv);
2442 end = data + len + 8;
2443
2444 if (len < 5)
2445 XSRETURN_EMPTY;
2285 2446
2286 if (*data++ != 0) 2447 if (*data++ != 0)
2287 XSRETURN_EMPTY; /* version mismatch */ 2448 XSRETURN_EMPTY; /* version mismatch */
2288 2449
2289 w = *data++ << 8; w |= *data++; 2450 w = *data++ << 8; w |= *data++;
… …
2304 { 2465 {
2305 maprow *row = map_get_row (self, y); 2466 maprow *row = map_get_row (self, y);
2306 2467
2307 for (x = x0; x < x1; x++) 2468 for (x = x0; x < x1; x++)
2308 { 2469 {
2470 uint8_t flags;
2471
2472 if (data + 7 >= end)
2473 XSRETURN_EMPTY;
2474
2309 uint8_t flags = *data++; 2475 flags = *data++;
2310 2476
2311 if (flags) 2477 if (flags)
2312 { 2478 {
2313 mapcell *cell = row_get_cell (row, x); 2479 mapcell *cell = row_get_cell (row, x);
2314 tileid tile[3] = { 0, 0, 0 }; 2480 tileid tile[3] = { 0, 0, 0 };
… …
2317 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2483 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2318 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2484 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2319 2485
2320 if (cell->darkness == 0) 2486 if (cell->darkness == 0)
2321 { 2487 {
2322 cell->darkness = 0; 2488 /*cell->darkness = 0;*/
2489 EXTEND (SP, 3);
2323 2490
2324 for (z = 0; z <= 2; z++) 2491 for (z = 0; z <= 2; z++)
2325 { 2492 {
2326 tileid t = tile [z]; 2493 tileid t = tile [z];
2327 2494
2328 if (t >= self->texs || (t && !self->tex [t].name)) 2495 if (t >= self->texs || (t && !self->tex [t].name))
2329 { 2496 {
2330 XPUSHs (sv_2mortal (newSViv (t))); 2497 PUSHs (sv_2mortal (newSViv (t)));
2331 need_texid (self, t); 2498 need_texid (self, t);
2332 } 2499 }
2333 2500
2334 cell->tile [z] = t; 2501 cell->tile [z] = t;
2335 } 2502 }
… …
2846void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3013void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2847 CODE: 3014 CODE:
2848 if (gl.SeparableFilter2D) 3015 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3016 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 3017
2851void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3018void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852 3019
2853void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3020void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854 3021
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 3022void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 3023

Diff Legend

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