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.243 by root, Thu Dec 27 06:54:36 2007 UTC vs.
Revision 1.272 by root, Tue Aug 19 17:38:29 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 call_argv ("::main", G_DISCARD | G_VOID, 0);
536 dSP;
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
502 569
503MODULE = Deliantra::Client PACKAGE = DC 570MODULE = Deliantra::Client PACKAGE = DC
504 571
505PROTOTYPES: ENABLE 572PROTOTYPES: ENABLE
506 573
… …
621 const_iv (KMOD_NUM), 688 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 689 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 690 const_iv (KMOD_MODE),
624 691
625 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)
626# undef const_iv 722# undef const_iv
627 }; 723 };
628 724
629 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; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 726 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
659 CODE: 755 CODE:
660{ 756{
661 opengl_fontmap = pango_opengl_font_map_new (); 757 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 758 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); 759 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
760 /*pango_context_set_font_description (opengl_context, default_font);*/
761#if PANGO_VERSION_CHECK (1, 15, 2)
762 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
763 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
764#endif
664} 765}
665 766
666char *
667SDL_GetError () 767char *SDL_GetError ()
668 768
669int 769void SDL_braino ()
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 770
672void 771int SDL_Init (U32 flags)
772
773int SDL_InitSubSystem (U32 flags)
774
775void SDL_QuitSubSystem (U32 flags)
776
673SDL_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
674 787
675void 788void
676SDL_ListModes (int rgb, int alpha) 789SDL_ListModes (int rgb, int alpha)
677 PPCODE: 790 PPCODE:
678{ 791{
… …
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 803 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 804 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 805 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 806
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 807 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); 808 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 809
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 810 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 811
702 if (m && m != (SDL_Rect **)-1) 812 if (m && m != (SDL_Rect **)-1)
703 while (*m) 813 while (*m)
704 { 814 {
705 if ((*m)->w >= 800 && (*m)->h >= 480) 815 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 816 {
707 AV *av = newAV (); 817 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 818 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 819 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 820 av_push (av, newSViv (rgb));
… …
752SDL_GetKeyName (int sym) 862SDL_GetKeyName (int sym)
753 863
754int 864int
755SDL_GetAppState () 865SDL_GetAppState ()
756 866
867int
868SDL_GetModState ()
869
757void 870void
758poll_events () 871poll_events ()
759 PPCODE: 872 PPCODE:
760{ 873{
761 SDL_Event ev; 874 SDL_Event ev;
… …
770 { 883 {
771 case SDL_KEYDOWN: 884 case SDL_KEYDOWN:
772 case SDL_KEYUP: 885 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 886 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 887 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 888 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 */ 889 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); 890 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 891 break;
779 892
780 case SDL_ACTIVEEVENT: 893 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 894 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
799 x = ev.motion.x; 912 x = ev.motion.x;
800 y = ev.motion.y; 913 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 914 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 915 }
803 916
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 917 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 918 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 919 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 920 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 921 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 922 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 923 }
811 break; 924 break;
812 925
813 case SDL_MOUSEBUTTONDOWN: 926 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 927 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 928 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 929
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 930 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 931 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 932 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 933 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
894 } 1007 }
895 } 1008 }
896#endif 1009#endif
897} 1010}
898 1011
899void 1012int
900add_font (char *file) 1013add_font (char *file)
901 CODE: 1014 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1015 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1016 OUTPUT:
1017 RETVAL
903 1018
904void 1019void
905load_image_inline (SV *image_) 1020load_image_inline (SV *image_)
906 ALIAS: 1021 ALIAS:
907 load_image_file = 1 1022 load_image_file = 1
… …
1165{ 1280{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1281 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1282
1168 do 1283 do
1169 { 1284 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1285 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1286
1172 if (run && shape_attr_p (run)) 1287 if (run && shape_attr_p (run))
1173 { 1288 {
1174 PangoRectangle extents; 1289 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1290 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1279int 1394int
1280descent (DC::Layout self) 1395descent (DC::Layout self)
1281 CODE: 1396 CODE:
1282{ 1397{
1283 PangoRectangle rect; 1398 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1399 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1400 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1401 RETVAL = PANGO_DESCENT (rect);
1287} 1402}
1288 OUTPUT: 1403 OUTPUT:
1289 RETVAL 1404 RETVAL
… …
1301 1416
1302void 1417void
1303cursor_pos (DC::Layout self, int index) 1418cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1419 PPCODE:
1305{ 1420{
1306 PangoRectangle strong_pos; 1421 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1422 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1423
1309 EXTEND (SP, 3); 1424 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1425 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1426 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1427 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1428}
1314 1429
1315void 1430void
1316index_to_line_x (DC::Layout self, int index, int trailing = 0) 1431index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1432 PPCODE:
1318{ 1433{
1319 int line, x; 1434 int line, x;
1320 1435
1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1436 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1437#if !PANGO_VERSION_CHECK (1, 17, 3)
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1438 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323 1439 --line;
1440#endif
1324 EXTEND (SP, 2); 1441 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1442 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1443 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1444}
1328 1445
1329void 1446void
1330line_x_to_index (DC::Layout self, int line, int x) 1447line_x_to_index (DC::Layout self, int line, int x)
… …
1334 int index, trailing; 1451 int index, trailing;
1335 1452
1336 if (line < 0) 1453 if (line < 0)
1337 XSRETURN_EMPTY; 1454 XSRETURN_EMPTY;
1338 1455
1339 if (!(lp = pango_layout_get_line (self->pl, line))) 1456 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340 XSRETURN_EMPTY; /* do better */ 1457 XSRETURN_EMPTY; /* do better */
1341 1458
1342 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1459 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1343 1460
1344 EXTEND (SP, 2); 1461 EXTEND (SP, 2);
… …
1661 uint8_t ext, cmd; 1778 uint8_t ext, cmd;
1662 1779
1663 do 1780 do
1664 { 1781 {
1665 ext = *data++; 1782 ext = *data++;
1666 cmd = ext & 0x3f; 1783 cmd = ext & 0x7f;
1667 1784
1668 if (cmd < 4) 1785 if (cmd < 4)
1669 cell->darkness = 255 - ext * 64 + 1; 1786 cell->darkness = 255 - ext * 64 + 1;
1670 else if (cmd == 5) // health 1787 else if (cmd == 5) // health
1671 { 1788 {
… …
1674 } 1791 }
1675 else if (cmd == 6) // monster width 1792 else if (cmd == 6) // monster width
1676 cell->stat_width = *data++ + 1; 1793 cell->stat_width = *data++ + 1;
1677 else if (cmd == 0x47) 1794 else if (cmd == 0x47)
1678 { 1795 {
1679 if (*data == 4) 1796 if (*data == 1) cell->player = data [1];
1680 ; // 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);
1681 1800
1682 data += *data + 1; 1801 data += *data + 1;
1683 } 1802 }
1684 else if (cmd == 8) // cell flags 1803 else if (cmd == 8) // cell flags
1685 cell->flags = *data++; 1804 cell->flags = *data++;
… …
1715 } 1834 }
1716 } 1835 }
1717 } 1836 }
1718 } 1837 }
1719 else 1838 else
1720 cell->darkness = 0; 1839 CELL_CLEAR (cell);
1721 } 1840 }
1722} 1841}
1723 OUTPUT: 1842 OUTPUT:
1724 RETVAL 1843 RETVAL
1725 1844
… …
1777} 1896}
1778 OUTPUT: 1897 OUTPUT:
1779 RETVAL 1898 RETVAL
1780 1899
1781void 1900void
1782draw (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)
1783 CODE: 1902 CODE:
1784{ 1903{
1785 int x, y, z; 1904 int x, y, z;
1786 1905
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1906 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1788 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
1789 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)
1790 smooth_key skey; 1909 smooth_key skey;
1791 1910 int pl_x, pl_y;
1911 maptex pl_tex;
1792 rc_t *rc = rc_alloc (); 1912 rc_t *rc = rc_alloc ();
1793 rc_key_t key; 1913 rc_key_t key;
1794 rc_array_t *arr; 1914 rc_array_t *arr;
1915
1916 pl_tex.name = 0;
1795 1917
1796 // thats current max. sorry. 1918 // thats current max. sorry.
1797 if (sw > 255) sw = 255; 1919 if (sw > 255) sw = 255;
1798 if (sh > 255) sh = 255; 1920 if (sh > 255) sh = 255;
1799 1921
… …
1854 tileid tile = cell->tile [z]; 1976 tileid tile = cell->tile [z];
1855 1977
1856 if (tile) 1978 if (tile)
1857 { 1979 {
1858 maptex tex = self->tex [tile]; 1980 maptex tex = self->tex [tile];
1859 int px, py; 1981 int px = (x + 1) * T - tex.w;
1982 int py = (y + 1) * T - tex.h;
1860 1983
1861 if (key.texname != tex.name) 1984 if (key.texname != tex.name)
1862 { 1985 {
1863 if (!tex.name) 1986 if (!tex.name)
1864 tex = self->tex [2]; /* missing, replace by noface */ 1987 tex = self->tex [2]; /* missing, replace by noface */
1865 1988
1866 key.texname = tex.name; 1989 key.texname = tex.name;
1867 arr = rc_array (rc, &key); 1990 arr = rc_array (rc, &key);
1868 } 1991 }
1869 1992
1870 px = (x + 1) * T - tex.w; 1993 if (expect_false (cell->player == player) && expect_false (z == 2))
1871 py = (y + 1) * T - tex.h; 1994 {
1995 pl_x = px;
1996 pl_y = py;
1997 pl_tex = tex;
1998 continue;
1999 }
1872 2000
1873 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2001 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874 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);
1875 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);
1876 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);
1877 2005
1878 if (cell->flags && z == 2) 2006 if (expect_false (cell->flags) && expect_false (z == 2))
1879 { 2007 {
1880 // overlays such as the speech bubble, probably more to come 2008 // overlays such as the speech bubble, probably more to come
1881 if (cell->flags & 1) 2009 if (cell->flags & 1)
1882 { 2010 {
1883 maptex tex = self->tex [1]; 2011 maptex tex = self->tex [1];
… …
2022 } 2150 }
2023 2151
2024 hv_clear (smooth); 2152 hv_clear (smooth);
2025 } 2153 }
2026 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
2027 glDisable (GL_BLEND); 2172 glDisable (GL_BLEND);
2028 rc_free (rc); 2173 rc_free (rc);
2029 2174
2030 // top layer: overlays such as the health bar 2175 // top layer: overlays such as the health bar
2031 for (y = 0; y < sh; y++) 2176 for (y = 0; y < sh; y++)
… …
2136 SvCUR_set (darkness3_sv, sw34 * sh3); 2281 SvCUR_set (darkness3_sv, sw34 * sh3);
2137 2282
2138 mx += self->x - 1; 2283 mx += self->x - 1;
2139 my += self->y - 1; 2284 my += self->y - 1;
2140 2285
2141 memset (darkness1, 255, sw1 * sh1); 2286 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2142 2287
2143 for (y = 0; y < sh1; y++) 2288 for (y = 0; y < sh1; y++)
2144 if (0 <= y + my && y + my < self->rows) 2289 if (0 <= y + my && y + my < self->rows)
2145 { 2290 {
2146 maprow *row = self->row + (y + my); 2291 maprow *row = self->row + (y + my);
… …
2266 else 2411 else
2267 *data++ = 0; 2412 *data++ = 0;
2268 } 2413 }
2269 } 2414 }
2270 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 {
2271 SvPOK_only (data_sv); 2419 SvPOK_only (data_sv);
2272 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2420 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2421 }
2422
2273 RETVAL = data_sv; 2423 RETVAL = data_sv;
2274} 2424}
2275 OUTPUT: 2425 OUTPUT:
2276 RETVAL 2426 RETVAL
2277 2427
2278void 2428void
2279set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2429set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280 PPCODE: 2430 PPCODE:
2281{ 2431{
2282 int x, y, z; 2432 int x, y, z;
2283 int w, h; 2433 int w, h;
2284 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;
2285 2445
2286 if (*data++ != 0) 2446 if (*data++ != 0)
2287 XSRETURN_EMPTY; /* version mismatch */ 2447 XSRETURN_EMPTY; /* version mismatch */
2288 2448
2289 w = *data++ << 8; w |= *data++; 2449 w = *data++ << 8; w |= *data++;
… …
2304 { 2464 {
2305 maprow *row = map_get_row (self, y); 2465 maprow *row = map_get_row (self, y);
2306 2466
2307 for (x = x0; x < x1; x++) 2467 for (x = x0; x < x1; x++)
2308 { 2468 {
2469 uint8_t flags;
2470
2471 if (data + 7 >= end)
2472 XSRETURN_EMPTY;
2473
2309 uint8_t flags = *data++; 2474 flags = *data++;
2310 2475
2311 if (flags) 2476 if (flags)
2312 { 2477 {
2313 mapcell *cell = row_get_cell (row, x); 2478 mapcell *cell = row_get_cell (row, x);
2314 tileid tile[3] = { 0, 0, 0 }; 2479 tileid tile[3] = { 0, 0, 0 };
… …
2317 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2482 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2318 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2483 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2319 2484
2320 if (cell->darkness == 0) 2485 if (cell->darkness == 0)
2321 { 2486 {
2322 cell->darkness = 0; 2487 /*cell->darkness = 0;*/
2488 EXTEND (SP, 3);
2323 2489
2324 for (z = 0; z <= 2; z++) 2490 for (z = 0; z <= 2; z++)
2325 { 2491 {
2326 tileid t = tile [z]; 2492 tileid t = tile [z];
2327 2493
2328 if (t >= self->texs || (t && !self->tex [t].name)) 2494 if (t >= self->texs || (t && !self->tex [t].name))
2329 { 2495 {
2330 XPUSHs (sv_2mortal (newSViv (t))); 2496 PUSHs (sv_2mortal (newSViv (t)));
2331 need_texid (self, t); 2497 need_texid (self, t);
2332 } 2498 }
2333 2499
2334 cell->tile [z] = t; 2500 cell->tile [z] = t;
2335 } 2501 }
… …
2846void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3012void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2847 CODE: 3013 CODE:
2848 if (gl.SeparableFilter2D) 3014 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3015 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 3016
2851void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3017void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852 3018
2853void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3019void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854 3020
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 3021void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 3022

Diff Legend

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