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.253 by root, Fri Dec 28 20:59:14 2007 UTC vs.
Revision 1.283 by root, Thu Dec 11 00:11:58 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>
50 55
51#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)) 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)
52# define pango_layout_get_line_readonly pango_layout_get_line_readonly 61# define pango_layout_get_line_readonly pango_layout_get_line
53# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly 62# define pango_layout_get_lines_readonly pango_layout_get_lines
54# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly 63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
55# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run_readonly 64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
56#endif 65#endif
57 66
58#ifndef _WIN32 67#ifndef _WIN32
59# include <sys/types.h> 68# include <sys/types.h>
60# include <sys/socket.h> 69# include <sys/socket.h>
61# include <netinet/in.h> 70# include <netinet/in.h>
62# include <netinet/tcp.h> 71# include <netinet/tcp.h>
63# include <inttypes.h> 72# include <inttypes.h>
64#endif 73#endif
65 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
66#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
67 85
68#define FOW_DARKNESS 32 86#define FOW_DARKNESS 16
69 87
70#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
71#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
72 90
73#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
74 92
75/* mask out modifiers we are not interested in */ 93/* mask out modifiers we are not interested in */
76#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
77 95
78#if 0 96#define KMOD_LRAM 0x10000 // our extension
79# define PARACHUTE SDL_INIT_NOPARACHUTE
80#else
81# define PARACHUTE 0
82#endif
83 97
84static AV *texture_av; 98static AV *texture_av;
85 99
86static struct 100static struct
87{ 101{
… …
181 195
182static void 196static void
183layout_update_font (DC__Layout self) 197layout_update_font (DC__Layout self)
184{ 198{
185 /* use a random scale factor to account for unknown descenders, 0.8 works 199 /* use a random scale factor to account for unknown descenders, 0.8 works
186 * reasonably well with bitstream vera 200 * reasonably well with dejavu/bistream fonts
187 */ 201 */
188 PangoFontDescription *font = self->font ? self->font : default_font; 202 PangoFontDescription *font = self->font ? self->font : default_font;
189 203
190 pango_font_description_set_absolute_size (font, 204 pango_font_description_set_absolute_size (font,
191 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 205 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
219 int w, h; 233 int w, h;
220 float s, t; 234 float s, t;
221 uint8_t r, g, b, a; 235 uint8_t r, g, b, a;
222 tileid smoothtile; 236 tileid smoothtile;
223 uint8_t smoothlevel; 237 uint8_t smoothlevel;
238 uint8_t unused; /* set to zero on use */
224} maptex; 239} maptex;
225 240
226typedef struct { 241typedef struct {
227 uint32_t player; 242 uint32_t player;
228 tileid tile[3]; 243 tileid tile[3];
… …
360 self->oy = 0; 375 self->oy = 0;
361 self->row = 0; 376 self->row = 0;
362 self->rows = 0; 377 self->rows = 0;
363} 378}
364 379
380#define CELL_CLEAR(cell) \
381 do { \
382 if ((cell)->player) \
383 (cell)->tile [2] = 0; \
384 (cell)->darkness = 0; \
385 (cell)->stat_hp = 0; \
386 (cell)->flags = 0; \
387 (cell)->player = 0; \
388 } while (0)
389
365static void 390static void
366map_blank (DC__Map self, int x0, int y0, int w, int h) 391map_blank (DC__Map self, int x0, int y0, int w, int h)
367{ 392{
368 int x, y; 393 int x, y;
369 maprow *row; 394 maprow *row;
… …
383 if (x >= row->c1) 408 if (x >= row->c1)
384 break; 409 break;
385 410
386 cell = row->col + x - row->c0; 411 cell = row->col + x - row->c0;
387 412
388 cell->darkness = 0; 413 CELL_CLEAR (cell);
389 cell->stat_hp = 0;
390 cell->flags = 0;
391 cell->player = 0;
392 } 414 }
393 } 415 }
394} 416}
395 417
396typedef struct { 418typedef struct {
… …
507 if (!svp || !SvTRUE (*svp)) 529 if (!svp || !SvTRUE (*svp))
508 return 0; 530 return 0;
509 531
510 return 1; 532 return 1;
511} 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;
547}
548
549static void
550deliantra_main ()
551{
552 char *argv[] = { 0 };
553 call_argv ("::main", G_DISCARD | G_VOID, argv);
554}
555
556#ifdef __MACOSX__
557 /* to due surprising braindamage on the side of SDL design, we
558 * do some mind-boggling hack here: SDL requires a custom main()
559 * on OS X, so... we provide one and call the original main(), which,
560 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
561 * and which calls our main (== SDL_main) back.
562 */
563 extern C_LINKAGE int
564 main (int argc, char *argv[])
565 {
566 deliantra_main ();
567 }
568
569 #undef main
570
571 extern C_LINKAGE int main (int argc, char *argv[]);
572
573 static void
574 SDL_braino (void)
575 {
576 char *argv[] = { "deliantra client", 0 };
577 (main) (1, argv);
578 }
579#else
580 static void
581 SDL_braino (void)
582 {
583 deliantra_main ();
584 }
585#endif
512 586
513MODULE = Deliantra::Client PACKAGE = DC 587MODULE = Deliantra::Client PACKAGE = DC
514 588
515PROTOTYPES: ENABLE 589PROTOTYPES: ENABLE
516 590
… …
545 const_iv (SDL_USEREVENT), 619 const_iv (SDL_USEREVENT),
546 620
547 const_iv (SDL_APPINPUTFOCUS), 621 const_iv (SDL_APPINPUTFOCUS),
548 const_iv (SDL_APPMOUSEFOCUS), 622 const_iv (SDL_APPMOUSEFOCUS),
549 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),
550 674
551 const_iv (SDLK_FIRST), 675 const_iv (SDLK_FIRST),
552 const_iv (SDLK_LAST), 676 const_iv (SDLK_LAST),
553 const_iv (SDLK_KP0), 677 const_iv (SDLK_KP0),
554 const_iv (SDLK_KP1), 678 const_iv (SDLK_KP1),
… …
630 const_iv (KMOD_RMETA), 754 const_iv (KMOD_RMETA),
631 const_iv (KMOD_NUM), 755 const_iv (KMOD_NUM),
632 const_iv (KMOD_CAPS), 756 const_iv (KMOD_CAPS),
633 const_iv (KMOD_MODE), 757 const_iv (KMOD_MODE),
634 758
759 const_iv (KMOD_LRAM),
760
635 const_iv (MIX_DEFAULT_FORMAT), 761 const_iv (MIX_DEFAULT_FORMAT),
762
763 const_iv (SDL_INIT_TIMER),
764 const_iv (SDL_INIT_AUDIO),
765 const_iv (SDL_INIT_VIDEO),
766 const_iv (SDL_INIT_CDROM),
767 const_iv (SDL_INIT_JOYSTICK),
768 const_iv (SDL_INIT_EVERYTHING),
769 const_iv (SDL_INIT_NOPARACHUTE),
770 const_iv (SDL_INIT_EVENTTHREAD),
771
772 const_iv (SDL_GL_RED_SIZE),
773 const_iv (SDL_GL_GREEN_SIZE),
774 const_iv (SDL_GL_BLUE_SIZE),
775 const_iv (SDL_GL_ALPHA_SIZE),
776 const_iv (SDL_GL_DOUBLEBUFFER),
777 const_iv (SDL_GL_BUFFER_SIZE),
778 const_iv (SDL_GL_DEPTH_SIZE),
779 const_iv (SDL_GL_STENCIL_SIZE),
780 const_iv (SDL_GL_ACCUM_RED_SIZE),
781 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
782 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
783 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
784 const_iv (SDL_GL_STEREO),
785 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
786 const_iv (SDL_GL_MULTISAMPLESAMPLES),
787 const_iv (SDL_GL_ACCELERATED_VISUAL),
788 const_iv (SDL_GL_SWAP_CONTROL),
789
790 const_iv (FOW_DARKNESS)
636# undef const_iv 791# undef const_iv
637 }; 792 };
638 793
639 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 794 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
640 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 795 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
669 CODE: 824 CODE:
670{ 825{
671 opengl_fontmap = pango_opengl_font_map_new (); 826 opengl_fontmap = pango_opengl_font_map_new ();
672 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 827 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
673 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 828 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
674#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2) 829 /*pango_context_set_font_description (opengl_context, default_font);*/
830#if PANGO_VERSION_CHECK (1, 15, 2)
675 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 831 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
676 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 832 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
677#endif 833#endif
678} 834}
679 835
680char *
681SDL_GetError () 836char *SDL_GetError ()
682 837
683int 838void SDL_braino ()
684SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
685 839
686void 840int SDL_Init (U32 flags)
841
842int SDL_InitSubSystem (U32 flags)
843
844void SDL_QuitSubSystem (U32 flags)
845
687SDL_Quit () 846void SDL_Quit ()
847
848int SDL_GL_SetAttribute (int attr, int value)
849
850int SDL_GL_GetAttribute (int attr)
851 CODE:
852 if (SDL_GL_GetAttribute (attr, &RETVAL))
853 XSRETURN_UNDEF;
854 OUTPUT:
855 RETVAL
688 856
689void 857void
690SDL_ListModes (int rgb, int alpha) 858SDL_ListModes (int rgb, int alpha)
691 PPCODE: 859 PPCODE:
692{ 860{
… …
704 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 872 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
705 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 873 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
706 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 874 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
707 875
708 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 876 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
709#if SDL_VERSION_ATLEAST(1,2,10)
710 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
711 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 877 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
712#endif
713 878
714 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 879 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
715 880
716 if (m && m != (SDL_Rect **)-1) 881 if (m && m != (SDL_Rect **)-1)
717 while (*m) 882 while (*m)
718 { 883 {
719 if ((*m)->w >= 800 && (*m)->h >= 480) 884 if ((*m)->w >= 400 && (*m)->h >= 300)
720 { 885 {
721 AV *av = newAV (); 886 AV *av = newAV ();
722 av_push (av, newSViv ((*m)->w)); 887 av_push (av, newSViv ((*m)->w));
723 av_push (av, newSViv ((*m)->h)); 888 av_push (av, newSViv ((*m)->h));
724 av_push (av, newSViv (rgb)); 889 av_push (av, newSViv (rgb));
… …
766SDL_GetKeyName (int sym) 931SDL_GetKeyName (int sym)
767 932
768int 933int
769SDL_GetAppState () 934SDL_GetAppState ()
770 935
936int
937SDL_GetModState ()
938
771void 939void
772poll_events () 940poll_events ()
773 PPCODE: 941 PPCODE:
774{ 942{
775 SDL_Event ev; 943 SDL_Event ev;
… …
784 { 952 {
785 case SDL_KEYDOWN: 953 case SDL_KEYDOWN:
786 case SDL_KEYUP: 954 case SDL_KEYUP:
787 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 955 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
788 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 956 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
789 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);
790 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 */
791 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 959 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
792 break; 960 break;
793 961
794 case SDL_ACTIVEEVENT: 962 case SDL_ACTIVEEVENT:
795 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 963 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
813 x = ev.motion.x; 981 x = ev.motion.x;
814 y = ev.motion.y; 982 y = ev.motion.y;
815 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 983 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
816 } 984 }
817 985
818 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 986 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
819 hv_store (hv, "state", 5, newSViv (state), 0); 987 hv_store (hv, "state", 5, newSViv (state), 0);
820 hv_store (hv, "x", 1, newSViv (x), 0); 988 hv_store (hv, "x", 1, newSViv (x), 0);
821 hv_store (hv, "y", 1, newSViv (y), 0); 989 hv_store (hv, "y", 1, newSViv (y), 0);
822 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 990 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
823 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 991 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
908 } 1076 }
909 } 1077 }
910#endif 1078#endif
911} 1079}
912 1080
913void 1081int
914add_font (char *file) 1082add_font (char *file)
915 CODE: 1083 CODE:
916 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1084 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1085 OUTPUT:
1086 RETVAL
917 1087
918void 1088void
919load_image_inline (SV *image_) 1089load_image_inline (SV *image_)
920 ALIAS: 1090 ALIAS:
921 load_image_file = 1 1091 load_image_file = 1
… …
1037#if DEBUG 1207#if DEBUG
1038 VALGRIND_DO_LEAK_CHECK; 1208 VALGRIND_DO_LEAK_CHECK;
1039#endif 1209#endif
1040} 1210}
1041 1211
1212int
1213SvREFCNT (SV *sv)
1214 CODE:
1215 RETVAL = SvREFCNT (sv);
1216 OUTPUT:
1217 RETVAL
1218
1042MODULE = Deliantra::Client PACKAGE = DC::Font 1219MODULE = Deliantra::Client PACKAGE = DC::Font
1043 1220
1044PROTOTYPES: DISABLE 1221PROTOTYPES: DISABLE
1045 1222
1046DC::Font 1223DC::Font
… …
1331 PPCODE: 1508 PPCODE:
1332{ 1509{
1333 int line, x; 1510 int line, x;
1334 1511
1335 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1512 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1336#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3)) 1513#if !PANGO_VERSION_CHECK (1, 17, 3)
1337 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1514 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1338 --line; 1515 --line;
1339#endif 1516#endif
1340 EXTEND (SP, 2); 1517 EXTEND (SP, 2);
1341 PUSHs (sv_2mortal (newSViv (line))); 1518 PUSHs (sv_2mortal (newSViv (line)));
… …
1590 //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);
1591 // use uglier nearest interpolation because linear suffers 1768 // use uglier nearest interpolation because linear suffers
1592 // from transparent color bleeding and ugly wrapping effects. 1769 // from transparent color bleeding and ugly wrapping effects.
1593 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1770 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1594} 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 }
1595 1792
1596int 1793int
1597ox (DC::Map self) 1794ox (DC::Map self)
1598 ALIAS: 1795 ALIAS:
1599 oy = 1 1796 oy = 1
… …
1677 uint8_t ext, cmd; 1874 uint8_t ext, cmd;
1678 1875
1679 do 1876 do
1680 { 1877 {
1681 ext = *data++; 1878 ext = *data++;
1682 cmd = ext & 0x3f; 1879 cmd = ext & 0x7f;
1683 1880
1684 if (cmd < 4) 1881 if (cmd < 4)
1685 cell->darkness = 255 - ext * 64 + 1; 1882 cell->darkness = 255 - ext * 64 + 1;
1686 else if (cmd == 5) // health 1883 else if (cmd == 5) // health
1687 { 1884 {
… …
1690 } 1887 }
1691 else if (cmd == 6) // monster width 1888 else if (cmd == 6) // monster width
1692 cell->stat_width = *data++ + 1; 1889 cell->stat_width = *data++ + 1;
1693 else if (cmd == 0x47) 1890 else if (cmd == 0x47)
1694 { 1891 {
1695 if (*data == 4) 1892 if (*data == 1) cell->player = data [1];
1696 ; // decode player count 1893 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1894 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1895 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1697 1896
1698 data += *data + 1; 1897 data += *data + 1;
1699 } 1898 }
1700 else if (cmd == 8) // cell flags 1899 else if (cmd == 8) // cell flags
1701 cell->flags = *data++; 1900 cell->flags = *data++;
… …
1718 cell->tile [z] = self->face2tile [face]; 1917 cell->tile [z] = self->face2tile [face];
1719 1918
1720 if (cell->tile [z]) 1919 if (cell->tile [z])
1721 { 1920 {
1722 maptex *tex = self->tex + cell->tile [z]; 1921 maptex *tex = self->tex + cell->tile [z];
1922 tex->unused = 0;
1723 if (!tex->name) 1923 if (!tex->name)
1724 av_push (missing, newSViv (cell->tile [z])); 1924 av_push (missing, newSViv (cell->tile [z]));
1725 1925
1726 if (tex->smoothtile) 1926 if (tex->smoothtile)
1727 { 1927 {
1728 maptex *smooth = self->tex + tex->smoothtile; 1928 maptex *smooth = self->tex + tex->smoothtile;
1929 smooth->unused = 0;
1729 if (!smooth->name) 1930 if (!smooth->name)
1730 av_push (missing, newSViv (tex->smoothtile)); 1931 av_push (missing, newSViv (tex->smoothtile));
1731 } 1932 }
1732 } 1933 }
1733 } 1934 }
1734 } 1935 }
1735 else 1936 else
1736 cell->darkness = 0; 1937 CELL_CLEAR (cell);
1737 } 1938 }
1738} 1939}
1739 OUTPUT: 1940 OUTPUT:
1740 RETVAL 1941 RETVAL
1741 1942
… …
1793} 1994}
1794 OUTPUT: 1995 OUTPUT:
1795 RETVAL 1996 RETVAL
1796 1997
1797void 1998void
1798draw (DC::Map self, int mx, int my, int sw, int sh, int T) 1999draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1799 CODE: 2000 CODE:
1800{ 2001{
1801 int x, y, z; 2002 int x, y, z;
1802 2003
1803 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2004 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1804 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2005 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1805 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2006 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1806 smooth_key skey; 2007 smooth_key skey;
1807 2008 int pl_x, pl_y;
2009 maptex pl_tex;
1808 rc_t *rc = rc_alloc (); 2010 rc_t *rc = rc_alloc ();
1809 rc_key_t key; 2011 rc_key_t key;
1810 rc_array_t *arr; 2012 rc_array_t *arr;
2013
2014 pl_tex.name = 0;
1811 2015
1812 // thats current max. sorry. 2016 // thats current max. sorry.
1813 if (sw > 255) sw = 255; 2017 if (sw > 255) sw = 255;
1814 if (sh > 255) sh = 255; 2018 if (sh > 255) sh = 255;
1815 2019
… …
1821 key.g = 255; 2025 key.g = 255;
1822 key.b = 255; 2026 key.b = 255;
1823 key.a = 255; 2027 key.a = 255;
1824 key.mode = GL_QUADS; 2028 key.mode = GL_QUADS;
1825 key.format = GL_T2F_V3F; 2029 key.format = GL_T2F_V3F;
1826 key.texname = -1;
1827 2030
1828 mx += self->x; 2031 mx += self->x;
1829 my += self->y; 2032 my += self->y;
1830 2033
1831 // first pass: determine smooth_max 2034 // first pass: determine smooth_max
… …
1855 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2058 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1856 2059
1857 for (z = 0; z <= 2; z++) 2060 for (z = 0; z <= 2; z++)
1858 { 2061 {
1859 memset (smooth_level, 0, sizeof (smooth_level)); 2062 memset (smooth_level, 0, sizeof (smooth_level));
2063 key.texname = -1;
1860 2064
1861 for (y = 0; y < sh; y++) 2065 for (y = 0; y < sh; y++)
1862 if (0 <= y + my && y + my < self->rows) 2066 if (0 <= y + my && y + my < self->rows)
1863 { 2067 {
1864 maprow *row = self->row + (y + my); 2068 maprow *row = self->row + (y + my);
… …
1870 tileid tile = cell->tile [z]; 2074 tileid tile = cell->tile [z];
1871 2075
1872 if (tile) 2076 if (tile)
1873 { 2077 {
1874 maptex tex = self->tex [tile]; 2078 maptex tex = self->tex [tile];
1875 int px, py; 2079 int px = (x + 1) * T - tex.w;
2080 int py = (y + 1) * T - tex.h;
1876 2081
1877 if (key.texname != tex.name) 2082 if (key.texname != tex.name)
1878 { 2083 {
2084 self->tex [tile].unused = 0;
2085
1879 if (!tex.name) 2086 if (!tex.name)
1880 tex = self->tex [2]; /* missing, replace by noface */ 2087 tex = self->tex [2]; /* missing, replace by noface */
1881 2088
1882 key.texname = tex.name; 2089 key.texname = tex.name;
1883 arr = rc_array (rc, &key); 2090 arr = rc_array (rc, &key);
1884 } 2091 }
1885 2092
1886 px = (x + 1) * T - tex.w; 2093 if (expect_false (cell->player == player) && expect_false (z == 2))
1887 py = (y + 1) * T - tex.h; 2094 {
2095 pl_x = px;
2096 pl_y = py;
2097 pl_tex = tex;
2098 continue;
2099 }
1888 2100
1889 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2101 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1890 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2102 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1891 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2103 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1892 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2104 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1893 2105
1894 if (cell->flags && z == 2) 2106 if (expect_false (cell->flags) && expect_false (z == 2))
1895 { 2107 {
1896 // overlays such as the speech bubble, probably more to come 2108 // overlays such as the speech bubble, probably more to come
1897 if (cell->flags & 1) 2109 if (cell->flags & 1)
1898 { 2110 {
1899 maptex tex = self->tex [1]; 2111 maptex tex = self->tex [1];
… …
2000 { 2212 {
2001 // this time avoiding texture state changes 2213 // this time avoiding texture state changes
2002 // save gobs of state changes. 2214 // save gobs of state changes.
2003 if (key.texname != tex.name) 2215 if (key.texname != tex.name)
2004 { 2216 {
2217 self->tex [skey->tile].unused = 0;
2218
2005 glEnd (); 2219 glEnd ();
2006 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2220 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2007 glBegin (GL_QUADS); 2221 glBegin (GL_QUADS);
2008 } 2222 }
2009 2223
… …
2038 } 2252 }
2039 2253
2040 hv_clear (smooth); 2254 hv_clear (smooth);
2041 } 2255 }
2042 2256
2257 if (pl_tex.name)
2258 {
2259 maptex tex = pl_tex;
2260 int px = pl_x + sdx;
2261 int py = pl_y + sdy;
2262
2263 key.texname = tex.name;
2264 arr = rc_array (rc, &key);
2265
2266 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2267 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2268 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2269 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2270
2271 rc_draw (rc);
2272 }
2273
2043 glDisable (GL_BLEND); 2274 glDisable (GL_BLEND);
2044 rc_free (rc); 2275 rc_free (rc);
2045 2276
2046 // top layer: overlays such as the health bar 2277 // top layer: overlays such as the health bar
2047 for (y = 0; y < sh; y++) 2278 for (y = 0; y < sh; y++)
… …
2054 { 2285 {
2055 mapcell *cell = row->col + (x + mx - row->c0); 2286 mapcell *cell = row->col + (x + mx - row->c0);
2056 2287
2057 int px = x * T; 2288 int px = x * T;
2058 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 }
2059 2296
2060 if (cell->stat_hp) 2297 if (cell->stat_hp)
2061 { 2298 {
2062 int width = cell->stat_width * T; 2299 int width = cell->stat_width * T;
2063 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2300 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2152 SvCUR_set (darkness3_sv, sw34 * sh3); 2389 SvCUR_set (darkness3_sv, sw34 * sh3);
2153 2390
2154 mx += self->x - 1; 2391 mx += self->x - 1;
2155 my += self->y - 1; 2392 my += self->y - 1;
2156 2393
2157 memset (darkness1, 255, sw1 * sh1); 2394 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2158 2395
2159 for (y = 0; y < sh1; y++) 2396 for (y = 0; y < sh1; y++)
2160 if (0 <= y + my && y + my < self->rows) 2397 if (0 <= y + my && y + my < self->rows)
2161 { 2398 {
2162 maprow *row = self->row + (y + my); 2399 maprow *row = self->row + (y + my);
… …
2282 else 2519 else
2283 *data++ = 0; 2520 *data++ = 0;
2284 } 2521 }
2285 } 2522 }
2286 2523
2524 /* if size is w*h + 5 then no data has been found */
2525 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2526 {
2287 SvPOK_only (data_sv); 2527 SvPOK_only (data_sv);
2288 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2528 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2529 }
2530
2289 RETVAL = data_sv; 2531 RETVAL = data_sv;
2290} 2532}
2291 OUTPUT: 2533 OUTPUT:
2292 RETVAL 2534 RETVAL
2293 2535
2294void 2536void
2295set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2537set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2296 PPCODE: 2538 PPCODE:
2297{ 2539{
2298 int x, y, z; 2540 int x, y, z;
2299 int w, h; 2541 int w, h;
2300 int x1, y1; 2542 int x1, y1;
2543 STRLEN len;
2544 uint8_t *data, *end;
2545
2546 len = SvLEN (data_sv);
2547 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2548 data = SvPVbyte_nolen (data_sv);
2549 end = data + len + 8;
2550
2551 if (len < 5)
2552 XSRETURN_EMPTY;
2301 2553
2302 if (*data++ != 0) 2554 if (*data++ != 0)
2303 XSRETURN_EMPTY; /* version mismatch */ 2555 XSRETURN_EMPTY; /* version mismatch */
2304 2556
2305 w = *data++ << 8; w |= *data++; 2557 w = *data++ << 8; w |= *data++;
… …
2320 { 2572 {
2321 maprow *row = map_get_row (self, y); 2573 maprow *row = map_get_row (self, y);
2322 2574
2323 for (x = x0; x < x1; x++) 2575 for (x = x0; x < x1; x++)
2324 { 2576 {
2577 uint8_t flags;
2578
2579 if (data + 7 >= end)
2580 XSRETURN_EMPTY;
2581
2325 uint8_t flags = *data++; 2582 flags = *data++;
2326 2583
2327 if (flags) 2584 if (flags)
2328 { 2585 {
2329 mapcell *cell = row_get_cell (row, x); 2586 mapcell *cell = row_get_cell (row, x);
2330 tileid tile[3] = { 0, 0, 0 }; 2587 tileid tile[3] = { 0, 0, 0 };
… …
2333 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2590 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2334 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2591 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2335 2592
2336 if (cell->darkness == 0) 2593 if (cell->darkness == 0)
2337 { 2594 {
2338 cell->darkness = 0; 2595 /*cell->darkness = 0;*/
2596 EXTEND (SP, 3);
2339 2597
2340 for (z = 0; z <= 2; z++) 2598 for (z = 0; z <= 2; z++)
2341 { 2599 {
2342 tileid t = tile [z]; 2600 tileid t = tile [z];
2343 2601
2344 if (t >= self->texs || (t && !self->tex [t].name)) 2602 if (t >= self->texs || (t && !self->tex [t].name))
2345 { 2603 {
2346 XPUSHs (sv_2mortal (newSViv (t))); 2604 PUSHs (sv_2mortal (newSViv (t)));
2347 need_texid (self, t); 2605 need_texid (self, t);
2348 } 2606 }
2349 2607
2350 cell->tile [z] = t; 2608 cell->tile [z] = t;
2351 } 2609 }
… …
2783void glRotate (float angle, float x, float y, float z) 3041void glRotate (float angle, float x, float y, float z)
2784 CODE: 3042 CODE:
2785 glRotatef (angle, x, y, z); 3043 glRotatef (angle, x, y, z);
2786 3044
2787void 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: @
2788 ALIAS: 3047 ALIAS:
2789 glColor_premultiply = 1 3048 glColor_premultiply = 1
2790 CODE: 3049 CODE:
2791 if (ix) 3050 if (ix)
2792 { 3051 {

Diff Legend

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