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.293 by root, Thu Dec 17 02:49:38 2009 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 64
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 97
98#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3
73 101
74static AV *texture_av; 102static AV *texture_av;
75 103
76static struct 104static struct
77{ 105{
… …
171 199
172static void 200static void
173layout_update_font (DC__Layout self) 201layout_update_font (DC__Layout self)
174{ 202{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 203 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 204 * reasonably well with dejavu/bistream fonts
177 */ 205 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 206 PangoFontDescription *font = self->font ? self->font : default_font;
179 207
180 pango_font_description_set_absolute_size (font, 208 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 209 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
209 int w, h; 237 int w, h;
210 float s, t; 238 float s, t;
211 uint8_t r, g, b, a; 239 uint8_t r, g, b, a;
212 tileid smoothtile; 240 tileid smoothtile;
213 uint8_t smoothlevel; 241 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */
214} maptex; 243} maptex;
215 244
216typedef struct { 245typedef struct {
217 uint32_t player; 246 uint32_t player;
218 tileid tile[3]; 247 tileid tile[3];
… …
350 self->oy = 0; 379 self->oy = 0;
351 self->row = 0; 380 self->row = 0;
352 self->rows = 0; 381 self->rows = 0;
353} 382}
354 383
384#define CELL_CLEAR(cell) \
385 do { \
386 if ((cell)->player) \
387 (cell)->tile [2] = 0; \
388 (cell)->darkness = 0; \
389 (cell)->stat_hp = 0; \
390 (cell)->flags = 0; \
391 (cell)->player = 0; \
392 } while (0)
393
355static void 394static void
356map_blank (DC__Map self, int x0, int y0, int w, int h) 395map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 396{
358 int x, y; 397 int x, y;
359 maprow *row; 398 maprow *row;
… …
373 if (x >= row->c1) 412 if (x >= row->c1)
374 break; 413 break;
375 414
376 cell = row->col + x - row->c0; 415 cell = row->col + x - row->c0;
377 416
378 cell->darkness = 0; 417 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 418 }
383 } 419 }
384} 420}
385 421
386typedef struct { 422typedef struct {
… …
497 if (!svp || !SvTRUE (*svp)) 533 if (!svp || !SvTRUE (*svp))
498 return 0; 534 return 0;
499 535
500 return 1; 536 return 1;
501} 537}
538
539/******************************************************************************/
540
541/* process keyboard modifiers */
542static int
543mod_munge (int mod)
544{
545 mod &= MOD_MASK;
546
547 if (mod & (KMOD_META | KMOD_ALT))
548 mod |= KMOD_LRAM;
549
550 return mod;
551}
552
553static void
554deliantra_main ()
555{
556 char *argv[] = { 0 };
557 call_argv ("::main", G_DISCARD | G_VOID, argv);
558}
559
560#ifdef __MACOSX__
561 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main()
563 * on OS X, so... we provide one and call the original main(), which,
564 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
565 * and which calls our main (== SDL_main) back.
566 */
567 extern C_LINKAGE int
568 main (int argc, char *argv[])
569 {
570 deliantra_main ();
571 }
572
573 #undef main
574
575 extern C_LINKAGE int main (int argc, char *argv[]);
576
577 static void
578 SDL_braino (void)
579 {
580 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv);
582 }
583#else
584 static void
585 SDL_braino (void)
586 {
587 deliantra_main ();
588 }
589#endif
502 590
503MODULE = Deliantra::Client PACKAGE = DC 591MODULE = Deliantra::Client PACKAGE = DC
504 592
505PROTOTYPES: ENABLE 593PROTOTYPES: ENABLE
506 594
… …
535 const_iv (SDL_USEREVENT), 623 const_iv (SDL_USEREVENT),
536 624
537 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
539 const_iv (SDL_APPACTIVE), 627 const_iv (SDL_APPACTIVE),
628
629
630 const_iv (SDLK_UNKNOWN),
631 const_iv (SDLK_FIRST),
632 const_iv (SDLK_BACKSPACE),
633 const_iv (SDLK_TAB),
634 const_iv (SDLK_CLEAR),
635 const_iv (SDLK_RETURN),
636 const_iv (SDLK_PAUSE),
637 const_iv (SDLK_ESCAPE),
638 const_iv (SDLK_SPACE),
639 const_iv (SDLK_EXCLAIM),
640 const_iv (SDLK_QUOTEDBL),
641 const_iv (SDLK_HASH),
642 const_iv (SDLK_DOLLAR),
643 const_iv (SDLK_AMPERSAND),
644 const_iv (SDLK_QUOTE),
645 const_iv (SDLK_LEFTPAREN),
646 const_iv (SDLK_RIGHTPAREN),
647 const_iv (SDLK_ASTERISK),
648 const_iv (SDLK_PLUS),
649 const_iv (SDLK_COMMA),
650 const_iv (SDLK_MINUS),
651 const_iv (SDLK_PERIOD),
652 const_iv (SDLK_SLASH),
653 const_iv (SDLK_0),
654 const_iv (SDLK_1),
655 const_iv (SDLK_2),
656 const_iv (SDLK_3),
657 const_iv (SDLK_4),
658 const_iv (SDLK_5),
659 const_iv (SDLK_6),
660 const_iv (SDLK_7),
661 const_iv (SDLK_8),
662 const_iv (SDLK_9),
663 const_iv (SDLK_COLON),
664 const_iv (SDLK_SEMICOLON),
665 const_iv (SDLK_LESS),
666 const_iv (SDLK_EQUALS),
667 const_iv (SDLK_GREATER),
668 const_iv (SDLK_QUESTION),
669 const_iv (SDLK_AT),
670
671 const_iv (SDLK_LEFTBRACKET),
672 const_iv (SDLK_BACKSLASH),
673 const_iv (SDLK_RIGHTBRACKET),
674 const_iv (SDLK_CARET),
675 const_iv (SDLK_UNDERSCORE),
676 const_iv (SDLK_BACKQUOTE),
677 const_iv (SDLK_DELETE),
540 678
541 const_iv (SDLK_FIRST), 679 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 680 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
… …
620 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 761 const_iv (KMOD_MODE),
624 762
763 const_iv (KMOD_LRAM),
764
625 const_iv (MIX_DEFAULT_FORMAT), 765 const_iv (MIX_DEFAULT_FORMAT),
766
767 const_iv (SDL_INIT_TIMER),
768 const_iv (SDL_INIT_AUDIO),
769 const_iv (SDL_INIT_VIDEO),
770 const_iv (SDL_INIT_CDROM),
771 const_iv (SDL_INIT_JOYSTICK),
772 const_iv (SDL_INIT_EVERYTHING),
773 const_iv (SDL_INIT_NOPARACHUTE),
774 const_iv (SDL_INIT_EVENTTHREAD),
775
776 const_iv (SDL_GL_RED_SIZE),
777 const_iv (SDL_GL_GREEN_SIZE),
778 const_iv (SDL_GL_BLUE_SIZE),
779 const_iv (SDL_GL_ALPHA_SIZE),
780 const_iv (SDL_GL_DOUBLEBUFFER),
781 const_iv (SDL_GL_BUFFER_SIZE),
782 const_iv (SDL_GL_DEPTH_SIZE),
783 const_iv (SDL_GL_STENCIL_SIZE),
784 const_iv (SDL_GL_ACCUM_RED_SIZE),
785 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
786 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
787 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
788 const_iv (SDL_GL_STEREO),
789 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
790 const_iv (SDL_GL_MULTISAMPLESAMPLES),
791 const_iv (SDL_GL_ACCELERATED_VISUAL),
792 const_iv (SDL_GL_SWAP_CONTROL),
793
794 const_iv (FOW_DARKNESS)
626# undef const_iv 795# undef const_iv
627 }; 796 };
628 797
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 798 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
659 CODE: 828 CODE:
660{ 829{
661 opengl_fontmap = pango_opengl_font_map_new (); 830 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 831 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); 832 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
833 /*pango_context_set_font_description (opengl_context, default_font);*/
834#if PANGO_VERSION_CHECK (1, 15, 2)
835 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
836 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
837#endif
664} 838}
665 839
666char *
667SDL_GetError () 840char *SDL_GetError ()
668 841
669int 842void SDL_braino ()
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 843
672void 844int SDL_Init (U32 flags)
845
846int SDL_InitSubSystem (U32 flags)
847
848void SDL_QuitSubSystem (U32 flags)
849
673SDL_Quit () 850void SDL_Quit ()
851
852int SDL_GL_SetAttribute (int attr, int value)
853
854int SDL_GL_GetAttribute (int attr)
855 CODE:
856 if (SDL_GL_GetAttribute (attr, &RETVAL))
857 XSRETURN_UNDEF;
858 OUTPUT:
859 RETVAL
674 860
675void 861void
676SDL_ListModes (int rgb, int alpha) 862SDL_ListModes (int rgb, int alpha)
677 PPCODE: 863 PPCODE:
678{ 864{
… …
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 876 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 877 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 878 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 879
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 880 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); 881 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 882
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 883 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 884
702 if (m && m != (SDL_Rect **)-1) 885 if (m && m != (SDL_Rect **)-1)
703 while (*m) 886 while (*m)
704 { 887 {
705 if ((*m)->w >= 800 && (*m)->h >= 480) 888 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 889 {
707 AV *av = newAV (); 890 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 891 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 892 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 893 av_push (av, newSViv (rgb));
… …
752SDL_GetKeyName (int sym) 935SDL_GetKeyName (int sym)
753 936
754int 937int
755SDL_GetAppState () 938SDL_GetAppState ()
756 939
940int
941SDL_GetModState ()
942
757void 943void
758poll_events () 944poll_events ()
759 PPCODE: 945 PPCODE:
760{ 946{
761 SDL_Event ev; 947 SDL_Event ev;
… …
770 { 956 {
771 case SDL_KEYDOWN: 957 case SDL_KEYDOWN:
772 case SDL_KEYUP: 958 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 959 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 960 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 961 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 */ 962 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); 963 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 964 break;
779 965
780 case SDL_ACTIVEEVENT: 966 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 967 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
799 x = ev.motion.x; 985 x = ev.motion.x;
800 y = ev.motion.y; 986 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 987 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 988 }
803 989
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 990 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 991 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 992 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 993 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 994 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 995 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 996 }
811 break; 997 break;
812 998
813 case SDL_MOUSEBUTTONDOWN: 999 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 1000 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1001 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 1002
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1003 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1004 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1005 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1006 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
894 } 1080 }
895 } 1081 }
896#endif 1082#endif
897} 1083}
898 1084
899void 1085int
900add_font (char *file) 1086add_font (char *file)
901 CODE: 1087 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1088 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089 OUTPUT:
1090 RETVAL
903 1091
904void 1092void
905load_image_inline (SV *image_) 1093load_image_inline (SV *image_)
906 ALIAS: 1094 ALIAS:
907 load_image_file = 1 1095 load_image_file = 1
… …
1023#if DEBUG 1211#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1212 VALGRIND_DO_LEAK_CHECK;
1025#endif 1213#endif
1026} 1214}
1027 1215
1216int
1217SvREFCNT (SV *sv)
1218 CODE:
1219 RETVAL = SvREFCNT (sv);
1220 OUTPUT:
1221 RETVAL
1222
1028MODULE = Deliantra::Client PACKAGE = DC::Font 1223MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1224
1030PROTOTYPES: DISABLE 1225PROTOTYPES: DISABLE
1031 1226
1032DC::Font 1227DC::Font
… …
1165{ 1360{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1361 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1362
1168 do 1363 do
1169 { 1364 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1365 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1366
1172 if (run && shape_attr_p (run)) 1367 if (run && shape_attr_p (run))
1173 { 1368 {
1174 PangoRectangle extents; 1369 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1370 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1279int 1474int
1280descent (DC::Layout self) 1475descent (DC::Layout self)
1281 CODE: 1476 CODE:
1282{ 1477{
1283 PangoRectangle rect; 1478 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1479 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1480 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1481 RETVAL = PANGO_DESCENT (rect);
1287} 1482}
1288 OUTPUT: 1483 OUTPUT:
1289 RETVAL 1484 RETVAL
… …
1301 1496
1302void 1497void
1303cursor_pos (DC::Layout self, int index) 1498cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1499 PPCODE:
1305{ 1500{
1306 PangoRectangle strong_pos; 1501 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1502 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1503
1309 EXTEND (SP, 3); 1504 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1505 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1506 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1507 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1508}
1314 1509
1315void 1510void
1316index_to_line_x (DC::Layout self, int index, int trailing = 0) 1511index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1512 PPCODE:
1318{ 1513{
1319 int line, x; 1514 int line, x;
1320 1515
1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1516 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1517#if !PANGO_VERSION_CHECK (1, 17, 3)
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1518 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323 1519 --line;
1520#endif
1324 EXTEND (SP, 2); 1521 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1522 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1523 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1524}
1328 1525
1329void 1526void
1330line_x_to_index (DC::Layout self, int line, int x) 1527line_x_to_index (DC::Layout self, int line, int x)
… …
1334 int index, trailing; 1531 int index, trailing;
1335 1532
1336 if (line < 0) 1533 if (line < 0)
1337 XSRETURN_EMPTY; 1534 XSRETURN_EMPTY;
1338 1535
1339 if (!(lp = pango_layout_get_line (self->pl, line))) 1536 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340 XSRETURN_EMPTY; /* do better */ 1537 XSRETURN_EMPTY; /* do better */
1341 1538
1342 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1539 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1343 1540
1344 EXTEND (SP, 2); 1541 EXTEND (SP, 2);
… …
1459 if (ix) 1656 if (ix)
1460 { 1657 {
1461 glDisable (GL_ALPHA_TEST); 1658 glDisable (GL_ALPHA_TEST);
1462 glDisable (GL_BLEND); 1659 glDisable (GL_BLEND);
1463 } 1660 }
1661}
1662
1663void
1664draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1)
1665 PROTOTYPE: @
1666 CODE:
1667{
1668 glEnable (GL_TEXTURE_2D);
1669 glEnable (GL_BLEND);
1670 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1671 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672
1673 glColor4f (intensity, intensity, intensity, 0.9);
1674 glPushMatrix ();
1675 glScalef (1./3, 1./3, 1.);
1676
1677 glBindTexture (GL_TEXTURE_2D, name1);
1678
1679 glBegin (GL_QUADS);
1680 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);
1681 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);
1682 glTexCoord2f (s1, t1); glVertex2f (w1, h1);
1683 glTexCoord2f (s1, 0); glVertex2f (w1, 0);
1684 glEnd ();
1685
1686 glPopMatrix ();
1687
1688 glDisable (GL_TEXTURE_2D);
1689 glDisable (GL_BLEND);
1464} 1690}
1465 1691
1466IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1692IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1467 CODE: 1693 CODE:
1468{ 1694{
… …
1574 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1800 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1575 // use uglier nearest interpolation because linear suffers 1801 // use uglier nearest interpolation because linear suffers
1576 // from transparent color bleeding and ugly wrapping effects. 1802 // from transparent color bleeding and ugly wrapping effects.
1577 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1803 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578} 1804}
1805
1806void
1807expire_textures (DC::Map self, int texid, int count)
1808 PPCODE:
1809 for (; texid < self->texs && count; ++texid, --count)
1810 {
1811 maptex *tex = self->tex + texid;
1812
1813 if (tex->name)
1814 {
1815 if (tex->unused)
1816 {
1817 tex->name = 0;
1818 tex->unused = 0;
1819 XPUSHs (sv_2mortal (newSViv (texid)));
1820 }
1821 else
1822 tex->unused = 1;
1823 }
1824 }
1579 1825
1580int 1826int
1581ox (DC::Map self) 1827ox (DC::Map self)
1582 ALIAS: 1828 ALIAS:
1583 oy = 1 1829 oy = 1
… …
1661 uint8_t ext, cmd; 1907 uint8_t ext, cmd;
1662 1908
1663 do 1909 do
1664 { 1910 {
1665 ext = *data++; 1911 ext = *data++;
1666 cmd = ext & 0x3f; 1912 cmd = ext & 0x7f;
1667 1913
1668 if (cmd < 4) 1914 if (cmd < 4)
1669 cell->darkness = 255 - ext * 64 + 1; 1915 cell->darkness = 255 - ext * 64 + 1;
1670 else if (cmd == 5) // health 1916 else if (cmd == 5) // health
1671 { 1917 {
… …
1674 } 1920 }
1675 else if (cmd == 6) // monster width 1921 else if (cmd == 6) // monster width
1676 cell->stat_width = *data++ + 1; 1922 cell->stat_width = *data++ + 1;
1677 else if (cmd == 0x47) 1923 else if (cmd == 0x47)
1678 { 1924 {
1679 if (*data == 4) 1925 if (*data == 1) cell->player = data [1];
1680 ; // decode player count 1926 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1927 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1928 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1681 1929
1682 data += *data + 1; 1930 data += *data + 1;
1683 } 1931 }
1684 else if (cmd == 8) // cell flags 1932 else if (cmd == 8) // cell flags
1685 cell->flags = *data++; 1933 cell->flags = *data++;
… …
1702 cell->tile [z] = self->face2tile [face]; 1950 cell->tile [z] = self->face2tile [face];
1703 1951
1704 if (cell->tile [z]) 1952 if (cell->tile [z])
1705 { 1953 {
1706 maptex *tex = self->tex + cell->tile [z]; 1954 maptex *tex = self->tex + cell->tile [z];
1955 tex->unused = 0;
1707 if (!tex->name) 1956 if (!tex->name)
1708 av_push (missing, newSViv (cell->tile [z])); 1957 av_push (missing, newSViv (cell->tile [z]));
1709 1958
1710 if (tex->smoothtile) 1959 if (tex->smoothtile)
1711 { 1960 {
1712 maptex *smooth = self->tex + tex->smoothtile; 1961 maptex *smooth = self->tex + tex->smoothtile;
1962 smooth->unused = 0;
1713 if (!smooth->name) 1963 if (!smooth->name)
1714 av_push (missing, newSViv (tex->smoothtile)); 1964 av_push (missing, newSViv (tex->smoothtile));
1715 } 1965 }
1716 } 1966 }
1717 } 1967 }
1718 } 1968 }
1719 else 1969 else
1720 cell->darkness = 0; 1970 CELL_CLEAR (cell);
1721 } 1971 }
1722} 1972}
1723 OUTPUT: 1973 OUTPUT:
1724 RETVAL 1974 RETVAL
1725 1975
… …
1777} 2027}
1778 OUTPUT: 2028 OUTPUT:
1779 RETVAL 2029 RETVAL
1780 2030
1781void 2031void
1782draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2032draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1783 CODE: 2033 CODE:
1784{ 2034{
1785 int x, y, z; 2035 int x, y, z;
1786 2036
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2037 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1788 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2038 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) 2039 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1790 smooth_key skey; 2040 smooth_key skey;
1791 2041 int pl_x, pl_y;
2042 maptex pl_tex;
1792 rc_t *rc = rc_alloc (); 2043 rc_t *rc = rc_alloc ();
2044 rc_t *rc_ov = rc_alloc ();
1793 rc_key_t key; 2045 rc_key_t key;
1794 rc_array_t *arr; 2046 rc_array_t *arr, *arr_hidden;
1795 2047
2048 pl_tex.name = 0;
2049
1796 // thats current max. sorry. 2050 // that's current max. sorry.
1797 if (sw > 255) sw = 255; 2051 if (sw > 255) sw = 255;
1798 if (sh > 255) sh = 255; 2052 if (sh > 255) sh = 255;
1799 2053
1800 // clear key, in case of extra padding 2054 // clear key, in case of extra padding
1801 memset (&skey, 0, sizeof (skey)); 2055 memset (&skey, 0, sizeof (skey));
… …
1805 key.g = 255; 2059 key.g = 255;
1806 key.b = 255; 2060 key.b = 255;
1807 key.a = 255; 2061 key.a = 255;
1808 key.mode = GL_QUADS; 2062 key.mode = GL_QUADS;
1809 key.format = GL_T2F_V3F; 2063 key.format = GL_T2F_V3F;
1810 key.texname = -1;
1811 2064
1812 mx += self->x; 2065 mx += self->x;
1813 my += self->y; 2066 my += self->y;
1814 2067
1815 // first pass: determine smooth_max 2068 // first pass: determine smooth_max
… …
1836 2089
1837 glEnable (GL_BLEND); 2090 glEnable (GL_BLEND);
1838 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2091 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1839 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1840 2093
2094 key.texname = self->tex [TEXID_HIDDEN].name;
2095 arr_hidden = rc_array (rc_ov, &key);
2096
1841 for (z = 0; z <= 2; z++) 2097 for (z = 0; z <= 2; z++)
1842 { 2098 {
1843 memset (smooth_level, 0, sizeof (smooth_level)); 2099 memset (smooth_level, 0, sizeof (smooth_level));
2100 key.texname = -1;
1844 2101
1845 for (y = 0; y < sh; y++) 2102 for (y = 0; y < sh; y++)
1846 if (0 <= y + my && y + my < self->rows) 2103 if (0 <= y + my && y + my < self->rows)
1847 { 2104 {
1848 maprow *row = self->row + (y + my); 2105 maprow *row = self->row + (y + my);
… …
1858 maptex tex = self->tex [tile]; 2115 maptex tex = self->tex [tile];
1859 int px, py; 2116 int px, py;
1860 2117
1861 if (key.texname != tex.name) 2118 if (key.texname != tex.name)
1862 { 2119 {
2120 self->tex [tile].unused = 0;
2121
1863 if (!tex.name) 2122 if (!tex.name)
1864 tex = self->tex [2]; /* missing, replace by noface */ 2123 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1865 2124
1866 key.texname = tex.name; 2125 key.texname = tex.name;
1867 arr = rc_array (rc, &key); 2126 arr = rc_array (rc, &key);
1868 } 2127 }
1869 2128
1870 px = (x + 1) * T - tex.w; 2129 px = (x + 1) * T - tex.w;
1871 py = (y + 1) * T - tex.h; 2130 py = (y + 1) * T - tex.h;
2131
2132 if (expect_false (cell->player == player) && expect_false (z == 2))
2133 {
2134 pl_x = px;
2135 pl_y = py;
2136 pl_tex = tex;
2137 continue;
2138 }
1872 2139
1873 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2140 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2141 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); 2142 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); 2143 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1877
1878 if (cell->flags && z == 2)
1879 {
1880 // overlays such as the speech bubble, probably more to come
1881 if (cell->flags & 1)
1882 {
1883 maptex tex = self->tex [1];
1884 int px = x * T + T * 2 / 32;
1885 int py = y * T - T * 6 / 32;
1886
1887 if (tex.name)
1888 {
1889 if (key.texname != tex.name)
1890 {
1891 key.texname = tex.name;
1892 arr = rc_array (rc, &key);
1893 }
1894
1895 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1896 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1897 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1898 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1899 }
1900 }
1901 }
1902 2144
1903 // update smooth hash 2145 // update smooth hash
1904 if (tex.smoothtile) 2146 if (tex.smoothtile)
1905 { 2147 {
1906 skey.tile = tex.smoothtile; 2148 skey.tile = tex.smoothtile;
… …
1935 // corners 2177 // corners
1936 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2178 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1937 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2179 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1938 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2180 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1939 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2181 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2182 }
2183 }
2184
2185 if (expect_false (z == 2))
2186 {
2187 /* draw question marks on top of hidden spaces */
2188 if (!cell->darkness)
2189 {
2190 maptex tex = self->tex [TEXID_HIDDEN];
2191 int px = (x + 1) * T - tex.w;
2192 int py = (y + 1) * T - tex.h;
2193
2194 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2195 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2196 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2197 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2198 }
2199
2200 if (expect_false (cell->flags))
2201 {
2202 // overlays such as the speech bubble, probably more to come
2203 if (cell->flags & 1)
2204 {
2205 rc_key_t key_ov = key;
2206 maptex tex = self->tex [TEXID_SPEECH];
2207 rc_array_t *arr;
2208 int px = x * T + T * 2 / 32;
2209 int py = y * T - T * 6 / 32;
2210
2211 key_ov.texname = tex.name;
2212 arr = rc_array (rc_ov, &key_ov);
2213
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2216 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2217 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2218 }
1940 } 2219 }
1941 } 2220 }
1942 } 2221 }
1943 } 2222 }
1944 2223
… …
1984 { 2263 {
1985 // this time avoiding texture state changes 2264 // this time avoiding texture state changes
1986 // save gobs of state changes. 2265 // save gobs of state changes.
1987 if (key.texname != tex.name) 2266 if (key.texname != tex.name)
1988 { 2267 {
2268 self->tex [skey->tile].unused = 0;
2269
1989 glEnd (); 2270 glEnd ();
1990 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2271 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1991 glBegin (GL_QUADS); 2272 glBegin (GL_QUADS);
1992 } 2273 }
1993 2274
… …
2022 } 2303 }
2023 2304
2024 hv_clear (smooth); 2305 hv_clear (smooth);
2025 } 2306 }
2026 2307
2308 if (pl_tex.name)
2309 {
2310 maptex tex = pl_tex;
2311 int px = pl_x + sdx;
2312 int py = pl_y + sdy;
2313
2314 key.texname = tex.name;
2315 arr = rc_array (rc, &key);
2316
2317 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2318 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2319 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2320 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2321
2322 rc_draw (rc);
2323 }
2324
2325 rc_draw (rc_ov);
2326 rc_clear (rc_ov);
2327
2027 glDisable (GL_BLEND); 2328 glDisable (GL_BLEND);
2028 rc_free (rc); 2329 rc_free (rc);
2330 rc_free (rc_ov);
2029 2331
2030 // top layer: overlays such as the health bar 2332 // top layer: overlays such as the health bar
2031 for (y = 0; y < sh; y++) 2333 for (y = 0; y < sh; y++)
2032 if (0 <= y + my && y + my < self->rows) 2334 if (0 <= y + my && y + my < self->rows)
2033 { 2335 {
… …
2038 { 2340 {
2039 mapcell *cell = row->col + (x + mx - row->c0); 2341 mapcell *cell = row->col + (x + mx - row->c0);
2040 2342
2041 int px = x * T; 2343 int px = x * T;
2042 int py = y * T; 2344 int py = y * T;
2345
2346 if (expect_false (cell->player == player))
2347 {
2348 px += sdx;
2349 py += sdy;
2350 }
2043 2351
2044 if (cell->stat_hp) 2352 if (cell->stat_hp)
2045 { 2353 {
2046 int width = cell->stat_width * T; 2354 int width = cell->stat_width * T;
2047 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2355 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2087 }; 2395 };
2088 2396
2089 int x, y; 2397 int x, y;
2090 2398
2091 glEnable (GL_TEXTURE_2D); 2399 glEnable (GL_TEXTURE_2D);
2400 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2401 * but the nvidia driver (185.18.14) mishandles alpha textures
2402 * ansd takes the colour from god knows where instead of using
2403 * Cp. MODULATE results in the same colour, but slightly different
2404 * alpha, but atcually gives us the correct colour with nvidia.
2405 */
2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2406 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2093 glEnable (GL_BLEND); 2407 glEnable (GL_BLEND);
2094 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2408 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2095 glBegin (GL_QUADS); 2409 glBegin (GL_QUADS);
2096 2410
2097 for (y = 0; y < h; y++) 2411 for (y = 0; y < h; y++)
… …
2104 float *c = color [m & 15]; 2418 float *c = color [m & 15];
2105 2419
2106 float tx1 = m & 0x40 ? 0.5 : 0.; 2420 float tx1 = m & 0x40 ? 0.5 : 0.;
2107 float tx2 = tx1 + 0.5; 2421 float tx2 = tx1 + 0.5;
2108 2422
2109 glColor4f (c[0], c[1], c[2], 0.75); 2423 glColor4f (c[0], c[1], c[2], 1);
2110 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2424 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2111 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2425 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2112 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2426 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2113 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2427 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2114 } 2428 }
… …
2136 SvCUR_set (darkness3_sv, sw34 * sh3); 2450 SvCUR_set (darkness3_sv, sw34 * sh3);
2137 2451
2138 mx += self->x - 1; 2452 mx += self->x - 1;
2139 my += self->y - 1; 2453 my += self->y - 1;
2140 2454
2141 memset (darkness1, 255, sw1 * sh1); 2455 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2142 2456
2143 for (y = 0; y < sh1; y++) 2457 for (y = 0; y < sh1; y++)
2144 if (0 <= y + my && y + my < self->rows) 2458 if (0 <= y + my && y + my < self->rows)
2145 { 2459 {
2146 maprow *row = self->row + (y + my); 2460 maprow *row = self->row + (y + my);
… …
2266 else 2580 else
2267 *data++ = 0; 2581 *data++ = 0;
2268 } 2582 }
2269 } 2583 }
2270 2584
2585 /* if size is w*h + 5 then no data has been found */
2586 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2587 {
2271 SvPOK_only (data_sv); 2588 SvPOK_only (data_sv);
2272 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2589 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2590 }
2591
2273 RETVAL = data_sv; 2592 RETVAL = data_sv;
2274} 2593}
2275 OUTPUT: 2594 OUTPUT:
2276 RETVAL 2595 RETVAL
2277 2596
2278void 2597void
2279set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2598set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280 PPCODE: 2599 PPCODE:
2281{ 2600{
2282 int x, y, z; 2601 int x, y, z;
2283 int w, h; 2602 int w, h;
2284 int x1, y1; 2603 int x1, y1;
2604 STRLEN len;
2605 uint8_t *data, *end;
2606
2607 len = SvLEN (data_sv);
2608 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2609 data = SvPVbyte_nolen (data_sv);
2610 end = data + len + 8;
2611
2612 if (len < 5)
2613 XSRETURN_EMPTY;
2285 2614
2286 if (*data++ != 0) 2615 if (*data++ != 0)
2287 XSRETURN_EMPTY; /* version mismatch */ 2616 XSRETURN_EMPTY; /* version mismatch */
2288 2617
2289 w = *data++ << 8; w |= *data++; 2618 w = *data++ << 8; w |= *data++;
… …
2304 { 2633 {
2305 maprow *row = map_get_row (self, y); 2634 maprow *row = map_get_row (self, y);
2306 2635
2307 for (x = x0; x < x1; x++) 2636 for (x = x0; x < x1; x++)
2308 { 2637 {
2638 uint8_t flags;
2639
2640 if (data + 7 >= end)
2641 XSRETURN_EMPTY;
2642
2309 uint8_t flags = *data++; 2643 flags = *data++;
2310 2644
2311 if (flags) 2645 if (flags)
2312 { 2646 {
2313 mapcell *cell = row_get_cell (row, x); 2647 mapcell *cell = row_get_cell (row, x);
2314 tileid tile[3] = { 0, 0, 0 }; 2648 tileid tile[3] = { 0, 0, 0 };
… …
2317 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2651 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2318 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2652 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2319 2653
2320 if (cell->darkness == 0) 2654 if (cell->darkness == 0)
2321 { 2655 {
2322 cell->darkness = 0; 2656 /*cell->darkness = 0;*/
2657 EXTEND (SP, 3);
2323 2658
2324 for (z = 0; z <= 2; z++) 2659 for (z = 0; z <= 2; z++)
2325 { 2660 {
2326 tileid t = tile [z]; 2661 tileid t = tile [z];
2327 2662
2328 if (t >= self->texs || (t && !self->tex [t].name)) 2663 if (t >= self->texs || (t && !self->tex [t].name))
2329 { 2664 {
2330 XPUSHs (sv_2mortal (newSViv (t))); 2665 PUSHs (sv_2mortal (newSViv (t)));
2331 need_texid (self, t); 2666 need_texid (self, t);
2332 } 2667 }
2333 2668
2334 cell->tile [z] = t; 2669 cell->tile [z] = t;
2335 } 2670 }
… …
2552 } *civ, const_iv[] = { 2887 } *civ, const_iv[] = {
2553# define const_iv(name) { # name, (IV)name } 2888# define const_iv(name) { # name, (IV)name }
2554 const_iv (GL_VENDOR), 2889 const_iv (GL_VENDOR),
2555 const_iv (GL_VERSION), 2890 const_iv (GL_VERSION),
2556 const_iv (GL_EXTENSIONS), 2891 const_iv (GL_EXTENSIONS),
2892 const_iv (GL_MAX_TEXTURE_UNITS),
2557 const_iv (GL_COLOR_MATERIAL), 2893 const_iv (GL_COLOR_MATERIAL),
2558 const_iv (GL_SMOOTH), 2894 const_iv (GL_SMOOTH),
2559 const_iv (GL_FLAT), 2895 const_iv (GL_FLAT),
2560 const_iv (GL_DITHER), 2896 const_iv (GL_DITHER),
2561 const_iv (GL_BLEND), 2897 const_iv (GL_BLEND),
… …
2573 const_iv (GL_ZERO), 2909 const_iv (GL_ZERO),
2574 const_iv (GL_SRC_ALPHA), 2910 const_iv (GL_SRC_ALPHA),
2575 const_iv (GL_DST_ALPHA), 2911 const_iv (GL_DST_ALPHA),
2576 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2912 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2577 const_iv (GL_ONE_MINUS_DST_ALPHA), 2913 const_iv (GL_ONE_MINUS_DST_ALPHA),
2914 const_iv (GL_SRC_COLOR),
2915 const_iv (GL_DST_COLOR),
2916 const_iv (GL_ONE_MINUS_SRC_COLOR),
2917 const_iv (GL_ONE_MINUS_DST_COLOR),
2578 const_iv (GL_SRC_ALPHA_SATURATE), 2918 const_iv (GL_SRC_ALPHA_SATURATE),
2579 const_iv (GL_RGB), 2919 const_iv (GL_RGB),
2580 const_iv (GL_RGBA), 2920 const_iv (GL_RGBA),
2581 const_iv (GL_RGBA4), 2921 const_iv (GL_RGBA4),
2582 const_iv (GL_RGBA8), 2922 const_iv (GL_RGBA8),
… …
2650 const_iv (GL_NICEST), 2990 const_iv (GL_NICEST),
2651 const_iv (GL_V2F), 2991 const_iv (GL_V2F),
2652 const_iv (GL_V3F), 2992 const_iv (GL_V3F),
2653 const_iv (GL_T2F_V3F), 2993 const_iv (GL_T2F_V3F),
2654 const_iv (GL_T2F_N3F_V3F), 2994 const_iv (GL_T2F_N3F_V3F),
2995 const_iv (GL_FUNC_ADD),
2996 const_iv (GL_FUNC_SUBTRACT),
2997 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2655# undef const_iv 2998# undef const_iv
2656 }; 2999 };
2657 3000
2658 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3001 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2659 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3002 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2666disable_GL_EXT_blend_func_separate () 3009disable_GL_EXT_blend_func_separate ()
2667 CODE: 3010 CODE:
2668 gl.BlendFuncSeparate = 0; 3011 gl.BlendFuncSeparate = 0;
2669 gl.BlendFuncSeparateEXT = 0; 3012 gl.BlendFuncSeparateEXT = 0;
2670 3013
3014void
3015apple_nvidia_bug (int enable)
3016
2671char * 3017char *
2672gl_vendor () 3018gl_vendor ()
2673 CODE: 3019 CODE:
2674 RETVAL = (char *)glGetString (GL_VENDOR); 3020 RETVAL = (char *)glGetString (GL_VENDOR);
2675 OUTPUT: 3021 OUTPUT:
… …
2724 3070
2725void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3071void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2726 CODE: 3072 CODE:
2727 gl_BlendFuncSeparate (sa, da, saa, daa); 3073 gl_BlendFuncSeparate (sa, da, saa, daa);
2728 3074
3075# void glBlendEquation (int se)
3076
2729void glDepthMask (int flag) 3077void glDepthMask (int flag)
2730 3078
2731void glLogicOp (int opcode) 3079void glLogicOp (int opcode)
2732 3080
2733void glColorMask (int red, int green, int blue, int alpha) 3081void glColorMask (int red, int green, int blue, int alpha)
… …
2767void glRotate (float angle, float x, float y, float z) 3115void glRotate (float angle, float x, float y, float z)
2768 CODE: 3116 CODE:
2769 glRotatef (angle, x, y, z); 3117 glRotatef (angle, x, y, z);
2770 3118
2771void glColor (float r, float g, float b, float a = 1.0) 3119void glColor (float r, float g, float b, float a = 1.0)
3120 PROTOTYPE: @
2772 ALIAS: 3121 ALIAS:
2773 glColor_premultiply = 1 3122 glColor_premultiply = 1
2774 CODE: 3123 CODE:
2775 if (ix) 3124 if (ix)
2776 { 3125 {
… …
2846void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3195void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2847 CODE: 3196 CODE:
2848 if (gl.SeparableFilter2D) 3197 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3198 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 3199
2851void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3200void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852 3201
2853void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3202void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854 3203
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 3204void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 3205

Diff Legend

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