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.247 by root, Fri Dec 28 15:06:08 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>
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 16
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 95
71# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
72#endif
73 97
74static AV *texture_av; 98static AV *texture_av;
75 99
76static struct 100static struct
77{ 101{
… …
171 195
172static void 196static void
173layout_update_font (DC__Layout self) 197layout_update_font (DC__Layout self)
174{ 198{
175 /* 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
176 * reasonably well with bitstream vera 200 * reasonably well with dejavu/bistream fonts
177 */ 201 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 202 PangoFontDescription *font = self->font ? self->font : default_font;
179 203
180 pango_font_description_set_absolute_size (font, 204 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 205 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
209 int w, h; 233 int w, h;
210 float s, t; 234 float s, t;
211 uint8_t r, g, b, a; 235 uint8_t r, g, b, a;
212 tileid smoothtile; 236 tileid smoothtile;
213 uint8_t smoothlevel; 237 uint8_t smoothlevel;
238 uint8_t unused; /* set to zero on use */
214} maptex; 239} maptex;
215 240
216typedef struct { 241typedef struct {
217 uint32_t player; 242 uint32_t player;
218 tileid tile[3]; 243 tileid tile[3];
… …
350 self->oy = 0; 375 self->oy = 0;
351 self->row = 0; 376 self->row = 0;
352 self->rows = 0; 377 self->rows = 0;
353} 378}
354 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
355static void 390static void
356map_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)
357{ 392{
358 int x, y; 393 int x, y;
359 maprow *row; 394 maprow *row;
… …
373 if (x >= row->c1) 408 if (x >= row->c1)
374 break; 409 break;
375 410
376 cell = row->col + x - row->c0; 411 cell = row->col + x - row->c0;
377 412
378 cell->darkness = 0; 413 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 414 }
383 } 415 }
384} 416}
385 417
386typedef struct { 418typedef struct {
… …
497 if (!svp || !SvTRUE (*svp)) 529 if (!svp || !SvTRUE (*svp))
498 return 0; 530 return 0;
499 531
500 return 1; 532 return 1;
501} 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
502 586
503MODULE = Deliantra::Client PACKAGE = DC 587MODULE = Deliantra::Client PACKAGE = DC
504 588
505PROTOTYPES: ENABLE 589PROTOTYPES: ENABLE
506 590
… …
535 const_iv (SDL_USEREVENT), 619 const_iv (SDL_USEREVENT),
536 620
537 const_iv (SDL_APPINPUTFOCUS), 621 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 622 const_iv (SDL_APPMOUSEFOCUS),
539 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),
540 674
541 const_iv (SDLK_FIRST), 675 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 676 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 677 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 678 const_iv (SDLK_KP1),
… …
620 const_iv (KMOD_RMETA), 754 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 755 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 756 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 757 const_iv (KMOD_MODE),
624 758
759 const_iv (KMOD_LRAM),
760
625 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)
626# undef const_iv 791# undef const_iv
627 }; 792 };
628 793
629 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; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 795 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
659 CODE: 824 CODE:
660{ 825{
661 opengl_fontmap = pango_opengl_font_map_new (); 826 opengl_fontmap = pango_opengl_font_map_new ();
662 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);
663 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 828 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
829 /*pango_context_set_font_description (opengl_context, default_font);*/
830#if PANGO_VERSION_CHECK (1, 15, 2)
831 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
832 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
833#endif
664} 834}
665 835
666char *
667SDL_GetError () 836char *SDL_GetError ()
668 837
669int 838void SDL_braino ()
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 839
672void 840int SDL_Init (U32 flags)
841
842int SDL_InitSubSystem (U32 flags)
843
844void SDL_QuitSubSystem (U32 flags)
845
673SDL_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
674 856
675void 857void
676SDL_ListModes (int rgb, int alpha) 858SDL_ListModes (int rgb, int alpha)
677 PPCODE: 859 PPCODE:
678{ 860{
… …
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 872 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 873 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 874 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 875
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 876 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); 877 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 878
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 879 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 880
702 if (m && m != (SDL_Rect **)-1) 881 if (m && m != (SDL_Rect **)-1)
703 while (*m) 882 while (*m)
704 { 883 {
705 if ((*m)->w >= 800 && (*m)->h >= 480) 884 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 885 {
707 AV *av = newAV (); 886 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 887 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 888 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 889 av_push (av, newSViv (rgb));
… …
752SDL_GetKeyName (int sym) 931SDL_GetKeyName (int sym)
753 932
754int 933int
755SDL_GetAppState () 934SDL_GetAppState ()
756 935
936int
937SDL_GetModState ()
938
757void 939void
758poll_events () 940poll_events ()
759 PPCODE: 941 PPCODE:
760{ 942{
761 SDL_Event ev; 943 SDL_Event ev;
… …
770 { 952 {
771 case SDL_KEYDOWN: 953 case SDL_KEYDOWN:
772 case SDL_KEYUP: 954 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 955 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 956 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 957 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
776 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 958 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 959 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 960 break;
779 961
780 case SDL_ACTIVEEVENT: 962 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 963 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
799 x = ev.motion.x; 981 x = ev.motion.x;
800 y = ev.motion.y; 982 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 983 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 984 }
803 985
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 986 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 987 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 988 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 989 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 990 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 991 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 992 }
811 break; 993 break;
812 994
813 case SDL_MOUSEBUTTONDOWN: 995 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 996 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 997 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 998
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 999 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1000 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1001 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1002 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
894 } 1076 }
895 } 1077 }
896#endif 1078#endif
897} 1079}
898 1080
899void 1081int
900add_font (char *file) 1082add_font (char *file)
901 CODE: 1083 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1084 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1085 OUTPUT:
1086 RETVAL
903 1087
904void 1088void
905load_image_inline (SV *image_) 1089load_image_inline (SV *image_)
906 ALIAS: 1090 ALIAS:
907 load_image_file = 1 1091 load_image_file = 1
… …
1023#if DEBUG 1207#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1208 VALGRIND_DO_LEAK_CHECK;
1025#endif 1209#endif
1026} 1210}
1027 1211
1212int
1213SvREFCNT (SV *sv)
1214 CODE:
1215 RETVAL = SvREFCNT (sv);
1216 OUTPUT:
1217 RETVAL
1218
1028MODULE = Deliantra::Client PACKAGE = DC::Font 1219MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1220
1030PROTOTYPES: DISABLE 1221PROTOTYPES: DISABLE
1031 1222
1032DC::Font 1223DC::Font
… …
1165{ 1356{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1357 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1358
1168 do 1359 do
1169 { 1360 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1361 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1362
1172 if (run && shape_attr_p (run)) 1363 if (run && shape_attr_p (run))
1173 { 1364 {
1174 PangoRectangle extents; 1365 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1366 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1279int 1470int
1280descent (DC::Layout self) 1471descent (DC::Layout self)
1281 CODE: 1472 CODE:
1282{ 1473{
1283 PangoRectangle rect; 1474 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1475 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1476 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1477 RETVAL = PANGO_DESCENT (rect);
1287} 1478}
1288 OUTPUT: 1479 OUTPUT:
1289 RETVAL 1480 RETVAL
… …
1301 1492
1302void 1493void
1303cursor_pos (DC::Layout self, int index) 1494cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1495 PPCODE:
1305{ 1496{
1306 PangoRectangle strong_pos; 1497 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1498 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1499
1309 EXTEND (SP, 3); 1500 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1501 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1502 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1503 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1504}
1314 1505
1315void 1506void
1316index_to_line_x (DC::Layout self, int index, int trailing = 0) 1507index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1508 PPCODE:
… …
1336 int index, trailing; 1527 int index, trailing;
1337 1528
1338 if (line < 0) 1529 if (line < 0)
1339 XSRETURN_EMPTY; 1530 XSRETURN_EMPTY;
1340 1531
1341 if (!(lp = pango_layout_get_line (self->pl, line))) 1532 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1342 XSRETURN_EMPTY; /* do better */ 1533 XSRETURN_EMPTY; /* do better */
1343 1534
1344 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1535 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1345 1536
1346 EXTEND (SP, 2); 1537 EXTEND (SP, 2);
… …
1576 //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);
1577 // use uglier nearest interpolation because linear suffers 1768 // use uglier nearest interpolation because linear suffers
1578 // from transparent color bleeding and ugly wrapping effects. 1769 // from transparent color bleeding and ugly wrapping effects.
1579 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1770 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1580} 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 }
1581 1792
1582int 1793int
1583ox (DC::Map self) 1794ox (DC::Map self)
1584 ALIAS: 1795 ALIAS:
1585 oy = 1 1796 oy = 1
… …
1663 uint8_t ext, cmd; 1874 uint8_t ext, cmd;
1664 1875
1665 do 1876 do
1666 { 1877 {
1667 ext = *data++; 1878 ext = *data++;
1668 cmd = ext & 0x3f; 1879 cmd = ext & 0x7f;
1669 1880
1670 if (cmd < 4) 1881 if (cmd < 4)
1671 cell->darkness = 255 - ext * 64 + 1; 1882 cell->darkness = 255 - ext * 64 + 1;
1672 else if (cmd == 5) // health 1883 else if (cmd == 5) // health
1673 { 1884 {
… …
1676 } 1887 }
1677 else if (cmd == 6) // monster width 1888 else if (cmd == 6) // monster width
1678 cell->stat_width = *data++ + 1; 1889 cell->stat_width = *data++ + 1;
1679 else if (cmd == 0x47) 1890 else if (cmd == 0x47)
1680 { 1891 {
1681 if (*data == 4) 1892 if (*data == 1) cell->player = data [1];
1682 ; // 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);
1683 1896
1684 data += *data + 1; 1897 data += *data + 1;
1685 } 1898 }
1686 else if (cmd == 8) // cell flags 1899 else if (cmd == 8) // cell flags
1687 cell->flags = *data++; 1900 cell->flags = *data++;
… …
1704 cell->tile [z] = self->face2tile [face]; 1917 cell->tile [z] = self->face2tile [face];
1705 1918
1706 if (cell->tile [z]) 1919 if (cell->tile [z])
1707 { 1920 {
1708 maptex *tex = self->tex + cell->tile [z]; 1921 maptex *tex = self->tex + cell->tile [z];
1922 tex->unused = 0;
1709 if (!tex->name) 1923 if (!tex->name)
1710 av_push (missing, newSViv (cell->tile [z])); 1924 av_push (missing, newSViv (cell->tile [z]));
1711 1925
1712 if (tex->smoothtile) 1926 if (tex->smoothtile)
1713 { 1927 {
1714 maptex *smooth = self->tex + tex->smoothtile; 1928 maptex *smooth = self->tex + tex->smoothtile;
1929 smooth->unused = 0;
1715 if (!smooth->name) 1930 if (!smooth->name)
1716 av_push (missing, newSViv (tex->smoothtile)); 1931 av_push (missing, newSViv (tex->smoothtile));
1717 } 1932 }
1718 } 1933 }
1719 } 1934 }
1720 } 1935 }
1721 else 1936 else
1722 cell->darkness = 0; 1937 CELL_CLEAR (cell);
1723 } 1938 }
1724} 1939}
1725 OUTPUT: 1940 OUTPUT:
1726 RETVAL 1941 RETVAL
1727 1942
… …
1779} 1994}
1780 OUTPUT: 1995 OUTPUT:
1781 RETVAL 1996 RETVAL
1782 1997
1783void 1998void
1784draw (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)
1785 CODE: 2000 CODE:
1786{ 2001{
1787 int x, y, z; 2002 int x, y, z;
1788 2003
1789 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2004 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1790 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
1791 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)
1792 smooth_key skey; 2007 smooth_key skey;
1793 2008 int pl_x, pl_y;
2009 maptex pl_tex;
1794 rc_t *rc = rc_alloc (); 2010 rc_t *rc = rc_alloc ();
1795 rc_key_t key; 2011 rc_key_t key;
1796 rc_array_t *arr; 2012 rc_array_t *arr;
2013
2014 pl_tex.name = 0;
1797 2015
1798 // thats current max. sorry. 2016 // thats current max. sorry.
1799 if (sw > 255) sw = 255; 2017 if (sw > 255) sw = 255;
1800 if (sh > 255) sh = 255; 2018 if (sh > 255) sh = 255;
1801 2019
… …
1807 key.g = 255; 2025 key.g = 255;
1808 key.b = 255; 2026 key.b = 255;
1809 key.a = 255; 2027 key.a = 255;
1810 key.mode = GL_QUADS; 2028 key.mode = GL_QUADS;
1811 key.format = GL_T2F_V3F; 2029 key.format = GL_T2F_V3F;
1812 key.texname = -1;
1813 2030
1814 mx += self->x; 2031 mx += self->x;
1815 my += self->y; 2032 my += self->y;
1816 2033
1817 // first pass: determine smooth_max 2034 // first pass: determine smooth_max
… …
1841 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2058 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1842 2059
1843 for (z = 0; z <= 2; z++) 2060 for (z = 0; z <= 2; z++)
1844 { 2061 {
1845 memset (smooth_level, 0, sizeof (smooth_level)); 2062 memset (smooth_level, 0, sizeof (smooth_level));
2063 key.texname = -1;
1846 2064
1847 for (y = 0; y < sh; y++) 2065 for (y = 0; y < sh; y++)
1848 if (0 <= y + my && y + my < self->rows) 2066 if (0 <= y + my && y + my < self->rows)
1849 { 2067 {
1850 maprow *row = self->row + (y + my); 2068 maprow *row = self->row + (y + my);
… …
1856 tileid tile = cell->tile [z]; 2074 tileid tile = cell->tile [z];
1857 2075
1858 if (tile) 2076 if (tile)
1859 { 2077 {
1860 maptex tex = self->tex [tile]; 2078 maptex tex = self->tex [tile];
1861 int px, py; 2079 int px = (x + 1) * T - tex.w;
2080 int py = (y + 1) * T - tex.h;
1862 2081
1863 if (key.texname != tex.name) 2082 if (key.texname != tex.name)
1864 { 2083 {
2084 self->tex [tile].unused = 0;
2085
1865 if (!tex.name) 2086 if (!tex.name)
1866 tex = self->tex [2]; /* missing, replace by noface */ 2087 tex = self->tex [2]; /* missing, replace by noface */
1867 2088
1868 key.texname = tex.name; 2089 key.texname = tex.name;
1869 arr = rc_array (rc, &key); 2090 arr = rc_array (rc, &key);
1870 } 2091 }
1871 2092
1872 px = (x + 1) * T - tex.w; 2093 if (expect_false (cell->player == player) && expect_false (z == 2))
1873 py = (y + 1) * T - tex.h; 2094 {
2095 pl_x = px;
2096 pl_y = py;
2097 pl_tex = tex;
2098 continue;
2099 }
1874 2100
1875 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2101 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1876 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);
1877 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);
1878 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);
1879 2105
1880 if (cell->flags && z == 2) 2106 if (expect_false (cell->flags) && expect_false (z == 2))
1881 { 2107 {
1882 // overlays such as the speech bubble, probably more to come 2108 // overlays such as the speech bubble, probably more to come
1883 if (cell->flags & 1) 2109 if (cell->flags & 1)
1884 { 2110 {
1885 maptex tex = self->tex [1]; 2111 maptex tex = self->tex [1];
… …
1986 { 2212 {
1987 // this time avoiding texture state changes 2213 // this time avoiding texture state changes
1988 // save gobs of state changes. 2214 // save gobs of state changes.
1989 if (key.texname != tex.name) 2215 if (key.texname != tex.name)
1990 { 2216 {
2217 self->tex [skey->tile].unused = 0;
2218
1991 glEnd (); 2219 glEnd ();
1992 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2220 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1993 glBegin (GL_QUADS); 2221 glBegin (GL_QUADS);
1994 } 2222 }
1995 2223
… …
2024 } 2252 }
2025 2253
2026 hv_clear (smooth); 2254 hv_clear (smooth);
2027 } 2255 }
2028 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
2029 glDisable (GL_BLEND); 2274 glDisable (GL_BLEND);
2030 rc_free (rc); 2275 rc_free (rc);
2031 2276
2032 // top layer: overlays such as the health bar 2277 // top layer: overlays such as the health bar
2033 for (y = 0; y < sh; y++) 2278 for (y = 0; y < sh; y++)
… …
2040 { 2285 {
2041 mapcell *cell = row->col + (x + mx - row->c0); 2286 mapcell *cell = row->col + (x + mx - row->c0);
2042 2287
2043 int px = x * T; 2288 int px = x * T;
2044 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 }
2045 2296
2046 if (cell->stat_hp) 2297 if (cell->stat_hp)
2047 { 2298 {
2048 int width = cell->stat_width * T; 2299 int width = cell->stat_width * T;
2049 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2300 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2138 SvCUR_set (darkness3_sv, sw34 * sh3); 2389 SvCUR_set (darkness3_sv, sw34 * sh3);
2139 2390
2140 mx += self->x - 1; 2391 mx += self->x - 1;
2141 my += self->y - 1; 2392 my += self->y - 1;
2142 2393
2143 memset (darkness1, 255, sw1 * sh1); 2394 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2144 2395
2145 for (y = 0; y < sh1; y++) 2396 for (y = 0; y < sh1; y++)
2146 if (0 <= y + my && y + my < self->rows) 2397 if (0 <= y + my && y + my < self->rows)
2147 { 2398 {
2148 maprow *row = self->row + (y + my); 2399 maprow *row = self->row + (y + my);
… …
2268 else 2519 else
2269 *data++ = 0; 2520 *data++ = 0;
2270 } 2521 }
2271 } 2522 }
2272 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 {
2273 SvPOK_only (data_sv); 2527 SvPOK_only (data_sv);
2274 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2528 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2529 }
2530
2275 RETVAL = data_sv; 2531 RETVAL = data_sv;
2276} 2532}
2277 OUTPUT: 2533 OUTPUT:
2278 RETVAL 2534 RETVAL
2279 2535
2280void 2536void
2281set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2537set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2282 PPCODE: 2538 PPCODE:
2283{ 2539{
2284 int x, y, z; 2540 int x, y, z;
2285 int w, h; 2541 int w, h;
2286 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;
2287 2553
2288 if (*data++ != 0) 2554 if (*data++ != 0)
2289 XSRETURN_EMPTY; /* version mismatch */ 2555 XSRETURN_EMPTY; /* version mismatch */
2290 2556
2291 w = *data++ << 8; w |= *data++; 2557 w = *data++ << 8; w |= *data++;
… …
2306 { 2572 {
2307 maprow *row = map_get_row (self, y); 2573 maprow *row = map_get_row (self, y);
2308 2574
2309 for (x = x0; x < x1; x++) 2575 for (x = x0; x < x1; x++)
2310 { 2576 {
2577 uint8_t flags;
2578
2579 if (data + 7 >= end)
2580 XSRETURN_EMPTY;
2581
2311 uint8_t flags = *data++; 2582 flags = *data++;
2312 2583
2313 if (flags) 2584 if (flags)
2314 { 2585 {
2315 mapcell *cell = row_get_cell (row, x); 2586 mapcell *cell = row_get_cell (row, x);
2316 tileid tile[3] = { 0, 0, 0 }; 2587 tileid tile[3] = { 0, 0, 0 };
… …
2319 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2590 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2320 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2591 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2321 2592
2322 if (cell->darkness == 0) 2593 if (cell->darkness == 0)
2323 { 2594 {
2324 cell->darkness = 0; 2595 /*cell->darkness = 0;*/
2596 EXTEND (SP, 3);
2325 2597
2326 for (z = 0; z <= 2; z++) 2598 for (z = 0; z <= 2; z++)
2327 { 2599 {
2328 tileid t = tile [z]; 2600 tileid t = tile [z];
2329 2601
2330 if (t >= self->texs || (t && !self->tex [t].name)) 2602 if (t >= self->texs || (t && !self->tex [t].name))
2331 { 2603 {
2332 XPUSHs (sv_2mortal (newSViv (t))); 2604 PUSHs (sv_2mortal (newSViv (t)));
2333 need_texid (self, t); 2605 need_texid (self, t);
2334 } 2606 }
2335 2607
2336 cell->tile [z] = t; 2608 cell->tile [z] = t;
2337 } 2609 }
… …
2769void glRotate (float angle, float x, float y, float z) 3041void glRotate (float angle, float x, float y, float z)
2770 CODE: 3042 CODE:
2771 glRotatef (angle, x, y, z); 3043 glRotatef (angle, x, y, z);
2772 3044
2773void 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: @
2774 ALIAS: 3047 ALIAS:
2775 glColor_premultiply = 1 3048 glColor_premultiply = 1
2776 CODE: 3049 CODE:
2777 if (ix) 3050 if (ix)
2778 { 3051 {

Diff Legend

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