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.295 by root, Mon Dec 21 03:30:22 2009 UTC

… …
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
… …
39#include <SDL_endian.h> 38#include <SDL_endian.h>
40#include <SDL_image.h> 39#include <SDL_image.h>
41#include <SDL_mixer.h> 40#include <SDL_mixer.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46#endif
47
44#define PANGO_ENABLE_BACKEND 48#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 49#define G_DISABLE_CAST_CHECKS
46 50
47#include <glib/gmacros.h> 51#include <glib/gmacros.h>
48 52
49#include <pango/pango.h> 53#include <pango/pango.h>
54
55#ifndef PANGO_VERSION_CHECK
56# define PANGO_VERSION_CHECK(a,b,c) 0
57#endif
58
59#if !PANGO_VERSION_CHECK (1, 15, 2)
60# define pango_layout_get_line_readonly pango_layout_get_line
61# define pango_layout_get_lines_readonly pango_layout_get_lines
62# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
63# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
64#endif
50 65
51#ifndef _WIN32 66#ifndef _WIN32
52# include <sys/types.h> 67# include <sys/types.h>
53# include <sys/socket.h> 68# include <sys/socket.h>
54# include <netinet/in.h> 69# include <netinet/in.h>
55# include <netinet/tcp.h> 70# include <netinet/tcp.h>
56# include <inttypes.h> 71# include <inttypes.h>
57#endif 72#endif
58 73
74#if __GNUC__ >= 4
75# define expect(expr,value) __builtin_expect ((expr),(value))
76#else
77# define expect(expr,value) (expr)
78#endif
79
80#define expect_false(expr) expect ((expr) != 0, 0)
81#define expect_true(expr) expect ((expr) != 0, 1)
82
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 84
61#define FOW_DARKNESS 32 85#define FOW_DARKNESS 64
86#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */
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));
… …
652 821
653IV minpot (UV n) 822IV minpot (UV n)
654 823
655IV popcount (UV n) 824IV popcount (UV n)
656 825
826NV distance (NV dx, NV dy)
827 CODE:
828 RETVAL = pow (dx * dx + dy * dy, 0.5);
829 OUTPUT:
830 RETVAL
831
657void 832void
658pango_init () 833pango_init ()
659 CODE: 834 CODE:
660{ 835{
661 opengl_fontmap = pango_opengl_font_map_new (); 836 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 837 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); 838 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
839 /*pango_context_set_font_description (opengl_context, default_font);*/
840#if PANGO_VERSION_CHECK (1, 15, 2)
841 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
842 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
843#endif
664} 844}
665 845
666char *
667SDL_GetError () 846char *SDL_GetError ()
668 847
669int 848void SDL_braino ()
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 849
672void 850int SDL_Init (U32 flags)
851
852int SDL_InitSubSystem (U32 flags)
853
854void SDL_QuitSubSystem (U32 flags)
855
673SDL_Quit () 856void SDL_Quit ()
857
858int SDL_GL_SetAttribute (int attr, int value)
859
860int SDL_GL_GetAttribute (int attr)
861 CODE:
862 if (SDL_GL_GetAttribute (attr, &RETVAL))
863 XSRETURN_UNDEF;
864 OUTPUT:
865 RETVAL
674 866
675void 867void
676SDL_ListModes (int rgb, int alpha) 868SDL_ListModes (int rgb, int alpha)
677 PPCODE: 869 PPCODE:
678{ 870{
… …
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 882 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 883 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 884 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 885
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 886 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); 887 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 888
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 889 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 890
702 if (m && m != (SDL_Rect **)-1) 891 if (m && m != (SDL_Rect **)-1)
703 while (*m) 892 while (*m)
704 { 893 {
705 if ((*m)->w >= 800 && (*m)->h >= 480) 894 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 895 {
707 AV *av = newAV (); 896 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 897 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 898 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 899 av_push (av, newSViv (rgb));
… …
752SDL_GetKeyName (int sym) 941SDL_GetKeyName (int sym)
753 942
754int 943int
755SDL_GetAppState () 944SDL_GetAppState ()
756 945
946int
947SDL_GetModState ()
948
757void 949void
758poll_events () 950poll_events ()
759 PPCODE: 951 PPCODE:
760{ 952{
761 SDL_Event ev; 953 SDL_Event ev;
… …
770 { 962 {
771 case SDL_KEYDOWN: 963 case SDL_KEYDOWN:
772 case SDL_KEYUP: 964 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 965 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 966 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 967 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 */ 968 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); 969 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 970 break;
779 971
780 case SDL_ACTIVEEVENT: 972 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 973 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
799 x = ev.motion.x; 991 x = ev.motion.x;
800 y = ev.motion.y; 992 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 993 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 994 }
803 995
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 996 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 997 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 998 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 999 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1000 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1001 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 1002 }
811 break; 1003 break;
812 1004
813 case SDL_MOUSEBUTTONDOWN: 1005 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 1006 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1007 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 1008
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1009 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1010 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1011 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1012 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
894 } 1086 }
895 } 1087 }
896#endif 1088#endif
897} 1089}
898 1090
899void 1091int
900add_font (char *file) 1092add_font (char *file)
901 CODE: 1093 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1094 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1095 OUTPUT:
1096 RETVAL
903 1097
904void 1098void
905load_image_inline (SV *image_) 1099load_image_inline (SV *image_)
906 ALIAS: 1100 ALIAS:
907 load_image_file = 1 1101 load_image_file = 1
… …
1023#if DEBUG 1217#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1218 VALGRIND_DO_LEAK_CHECK;
1025#endif 1219#endif
1026} 1220}
1027 1221
1222int
1223SvREFCNT (SV *sv)
1224 CODE:
1225 RETVAL = SvREFCNT (sv);
1226 OUTPUT:
1227 RETVAL
1228
1028MODULE = Deliantra::Client PACKAGE = DC::Font 1229MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1230
1030PROTOTYPES: DISABLE 1231PROTOTYPES: DISABLE
1031 1232
1032DC::Font 1233DC::Font
… …
1165{ 1366{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1367 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1368
1168 do 1369 do
1169 { 1370 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1371 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1372
1172 if (run && shape_attr_p (run)) 1373 if (run && shape_attr_p (run))
1173 { 1374 {
1174 PangoRectangle extents; 1375 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1376 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1279int 1480int
1280descent (DC::Layout self) 1481descent (DC::Layout self)
1281 CODE: 1482 CODE:
1282{ 1483{
1283 PangoRectangle rect; 1484 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1485 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1486 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1487 RETVAL = PANGO_DESCENT (rect);
1287} 1488}
1288 OUTPUT: 1489 OUTPUT:
1289 RETVAL 1490 RETVAL
… …
1301 1502
1302void 1503void
1303cursor_pos (DC::Layout self, int index) 1504cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1505 PPCODE:
1305{ 1506{
1306 PangoRectangle strong_pos; 1507 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1508 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1509
1309 EXTEND (SP, 3); 1510 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1511 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1512 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1513 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1514}
1314 1515
1315void 1516void
1316index_to_line_x (DC::Layout self, int index, int trailing = 0) 1517index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1518 PPCODE:
… …
1336 int index, trailing; 1537 int index, trailing;
1337 1538
1338 if (line < 0) 1539 if (line < 0)
1339 XSRETURN_EMPTY; 1540 XSRETURN_EMPTY;
1340 1541
1341 if (!(lp = pango_layout_get_line (self->pl, line))) 1542 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1342 XSRETURN_EMPTY; /* do better */ 1543 XSRETURN_EMPTY; /* do better */
1343 1544
1344 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1545 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1345 1546
1346 EXTEND (SP, 2); 1547 EXTEND (SP, 2);
… …
1461 if (ix) 1662 if (ix)
1462 { 1663 {
1463 glDisable (GL_ALPHA_TEST); 1664 glDisable (GL_ALPHA_TEST);
1464 glDisable (GL_BLEND); 1665 glDisable (GL_BLEND);
1465 } 1666 }
1667}
1668
1669void
1670draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f)
1671 PROTOTYPE: @
1672 CODE:
1673{
1674 glEnable (GL_TEXTURE_2D);
1675 glEnable (GL_BLEND);
1676 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1677 glBindTexture (GL_TEXTURE_2D, name1);
1678
1679 glColor3f (intensity, intensity, intensity);
1680 glPushMatrix ();
1681 glScalef (1./3, 1./3, 1.);
1682
1683 if (blend > 0.f)
1684 {
1685 float S2, T2; /* 0. 0. for texture 2 */
1686 float w = w1 > w2 ? w1 : w2;
1687 float h = h1 > h2 ? h1 : h2;
1688 GLfloat env_color[4] = { 0., 0., 0., blend };
1689
1690 /* interpolate the two shadow textures */
1691 /* stage 0 == rgb(glcolor) + alpha(t0) */
1692 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1693
1694 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1695 gl.ActiveTexture (GL_TEXTURE1);
1696 glEnable (GL_TEXTURE_2D);
1697 glBindTexture (GL_TEXTURE_2D, name2);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1699
1700 /* rgb == rgb(glcolor) */
1701 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1702 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1704
1705 /* alpha = interpolate t0, t1 by env_alpha */
1706 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1707
1708 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1709 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1710 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1711
1712 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1713 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1714
1715 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1716 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1717
1718 s1 *= w / w1;
1719 t1 *= h / h1;
1720
1721 dx *= -3.f / w2;
1722 dy *= -3.f / h2;
1723 dx *= w / w2;
1724 dy *= h / h2;
1725
1726 s2 *= w / w2;
1727 t2 *= h / h2;
1728
1729 glBegin (GL_QUADS);
1730 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0);
1731 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1);
1732 gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1);
1733 gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0);
1734 glEnd ();
1735
1736 glDisable (GL_TEXTURE_2D);
1737 gl.ActiveTexture (GL_TEXTURE0);
1738 }
1739 else
1740 {
1741 /* simple blending of one texture, also opengl <1.3 path */
1742 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1743
1744 glBegin (GL_QUADS);
1745 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);
1746 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);
1747 glTexCoord2f (s1, t1); glVertex2f (w1, h1);
1748 glTexCoord2f (s1, 0); glVertex2f (w1, 0);
1749 glEnd ();
1750 }
1751
1752 glPopMatrix ();
1753
1754 glDisable (GL_TEXTURE_2D);
1755 glDisable (GL_BLEND);
1466} 1756}
1467 1757
1468IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1758IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1469 CODE: 1759 CODE:
1470{ 1760{
… …
1576 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1866 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1577 // use uglier nearest interpolation because linear suffers 1867 // use uglier nearest interpolation because linear suffers
1578 // from transparent color bleeding and ugly wrapping effects. 1868 // from transparent color bleeding and ugly wrapping effects.
1579 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1869 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1580} 1870}
1871
1872void
1873expire_textures (DC::Map self, int texid, int count)
1874 PPCODE:
1875 for (; texid < self->texs && count; ++texid, --count)
1876 {
1877 maptex *tex = self->tex + texid;
1878
1879 if (tex->name)
1880 {
1881 if (tex->unused)
1882 {
1883 tex->name = 0;
1884 tex->unused = 0;
1885 XPUSHs (sv_2mortal (newSViv (texid)));
1886 }
1887 else
1888 tex->unused = 1;
1889 }
1890 }
1581 1891
1582int 1892int
1583ox (DC::Map self) 1893ox (DC::Map self)
1584 ALIAS: 1894 ALIAS:
1585 oy = 1 1895 oy = 1
… …
1663 uint8_t ext, cmd; 1973 uint8_t ext, cmd;
1664 1974
1665 do 1975 do
1666 { 1976 {
1667 ext = *data++; 1977 ext = *data++;
1668 cmd = ext & 0x3f; 1978 cmd = ext & 0x7f;
1669 1979
1670 if (cmd < 4) 1980 if (cmd < 4)
1671 cell->darkness = 255 - ext * 64 + 1; 1981 cell->darkness = 255 - ext * 64 + 1;
1672 else if (cmd == 5) // health 1982 else if (cmd == 5) // health
1673 { 1983 {
… …
1676 } 1986 }
1677 else if (cmd == 6) // monster width 1987 else if (cmd == 6) // monster width
1678 cell->stat_width = *data++ + 1; 1988 cell->stat_width = *data++ + 1;
1679 else if (cmd == 0x47) 1989 else if (cmd == 0x47)
1680 { 1990 {
1681 if (*data == 4) 1991 if (*data == 1) cell->player = data [1];
1682 ; // decode player count 1992 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1993 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1994 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1683 1995
1684 data += *data + 1; 1996 data += *data + 1;
1685 } 1997 }
1686 else if (cmd == 8) // cell flags 1998 else if (cmd == 8) // cell flags
1687 cell->flags = *data++; 1999 cell->flags = *data++;
… …
1704 cell->tile [z] = self->face2tile [face]; 2016 cell->tile [z] = self->face2tile [face];
1705 2017
1706 if (cell->tile [z]) 2018 if (cell->tile [z])
1707 { 2019 {
1708 maptex *tex = self->tex + cell->tile [z]; 2020 maptex *tex = self->tex + cell->tile [z];
2021 tex->unused = 0;
1709 if (!tex->name) 2022 if (!tex->name)
1710 av_push (missing, newSViv (cell->tile [z])); 2023 av_push (missing, newSViv (cell->tile [z]));
1711 2024
1712 if (tex->smoothtile) 2025 if (tex->smoothtile)
1713 { 2026 {
1714 maptex *smooth = self->tex + tex->smoothtile; 2027 maptex *smooth = self->tex + tex->smoothtile;
2028 smooth->unused = 0;
1715 if (!smooth->name) 2029 if (!smooth->name)
1716 av_push (missing, newSViv (tex->smoothtile)); 2030 av_push (missing, newSViv (tex->smoothtile));
1717 } 2031 }
1718 } 2032 }
1719 } 2033 }
1720 } 2034 }
1721 else 2035 else
1722 cell->darkness = 0; 2036 CELL_CLEAR (cell);
1723 } 2037 }
1724} 2038}
1725 OUTPUT: 2039 OUTPUT:
1726 RETVAL 2040 RETVAL
1727 2041
… …
1779} 2093}
1780 OUTPUT: 2094 OUTPUT:
1781 RETVAL 2095 RETVAL
1782 2096
1783void 2097void
1784draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2098draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1785 CODE: 2099 CODE:
1786{ 2100{
1787 int x, y, z; 2101 int x, y, z;
1788 2102
1789 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2103 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1790 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2104 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) 2105 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1792 smooth_key skey; 2106 smooth_key skey;
1793 2107 int pl_x, pl_y;
2108 maptex pl_tex;
1794 rc_t *rc = rc_alloc (); 2109 rc_t *rc = rc_alloc ();
2110 rc_t *rc_ov = rc_alloc ();
1795 rc_key_t key; 2111 rc_key_t key;
1796 rc_array_t *arr; 2112 rc_array_t *arr, *arr_hidden;
1797 2113
2114 pl_tex.name = 0;
2115
1798 // thats current max. sorry. 2116 // that's current max. sorry.
1799 if (sw > 255) sw = 255; 2117 if (sw > 255) sw = 255;
1800 if (sh > 255) sh = 255; 2118 if (sh > 255) sh = 255;
1801 2119
1802 // clear key, in case of extra padding 2120 // clear key, in case of extra padding
1803 memset (&skey, 0, sizeof (skey)); 2121 memset (&skey, 0, sizeof (skey));
… …
1807 key.g = 255; 2125 key.g = 255;
1808 key.b = 255; 2126 key.b = 255;
1809 key.a = 255; 2127 key.a = 255;
1810 key.mode = GL_QUADS; 2128 key.mode = GL_QUADS;
1811 key.format = GL_T2F_V3F; 2129 key.format = GL_T2F_V3F;
1812 key.texname = -1;
1813 2130
1814 mx += self->x; 2131 mx += self->x;
1815 my += self->y; 2132 my += self->y;
1816 2133
1817 // first pass: determine smooth_max 2134 // first pass: determine smooth_max
… …
1838 2155
1839 glEnable (GL_BLEND); 2156 glEnable (GL_BLEND);
1840 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2157 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1841 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2158 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1842 2159
2160 key.texname = self->tex [TEXID_HIDDEN].name;
2161 arr_hidden = rc_array (rc_ov, &key);
2162
1843 for (z = 0; z <= 2; z++) 2163 for (z = 0; z <= 2; z++)
1844 { 2164 {
1845 memset (smooth_level, 0, sizeof (smooth_level)); 2165 memset (smooth_level, 0, sizeof (smooth_level));
2166 key.texname = -1;
1846 2167
1847 for (y = 0; y < sh; y++) 2168 for (y = 0; y < sh; y++)
1848 if (0 <= y + my && y + my < self->rows) 2169 if (0 <= y + my && y + my < self->rows)
1849 { 2170 {
1850 maprow *row = self->row + (y + my); 2171 maprow *row = self->row + (y + my);
… …
1860 maptex tex = self->tex [tile]; 2181 maptex tex = self->tex [tile];
1861 int px, py; 2182 int px, py;
1862 2183
1863 if (key.texname != tex.name) 2184 if (key.texname != tex.name)
1864 { 2185 {
2186 self->tex [tile].unused = 0;
2187
1865 if (!tex.name) 2188 if (!tex.name)
1866 tex = self->tex [2]; /* missing, replace by noface */ 2189 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1867 2190
1868 key.texname = tex.name; 2191 key.texname = tex.name;
1869 arr = rc_array (rc, &key); 2192 arr = rc_array (rc, &key);
1870 } 2193 }
1871 2194
1872 px = (x + 1) * T - tex.w; 2195 px = (x + 1) * T - tex.w;
1873 py = (y + 1) * T - tex.h; 2196 py = (y + 1) * T - tex.h;
2197
2198 if (expect_false (cell->player == player) && expect_false (z == 2))
2199 {
2200 pl_x = px;
2201 pl_y = py;
2202 pl_tex = tex;
2203 continue;
2204 }
1874 2205
1875 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2206 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1876 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2207 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); 2208 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); 2209 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1879
1880 if (cell->flags && z == 2)
1881 {
1882 // overlays such as the speech bubble, probably more to come
1883 if (cell->flags & 1)
1884 {
1885 maptex tex = self->tex [1];
1886 int px = x * T + T * 2 / 32;
1887 int py = y * T - T * 6 / 32;
1888
1889 if (tex.name)
1890 {
1891 if (key.texname != tex.name)
1892 {
1893 key.texname = tex.name;
1894 arr = rc_array (rc, &key);
1895 }
1896
1897 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1898 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1899 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1900 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1901 }
1902 }
1903 }
1904 2210
1905 // update smooth hash 2211 // update smooth hash
1906 if (tex.smoothtile) 2212 if (tex.smoothtile)
1907 { 2213 {
1908 skey.tile = tex.smoothtile; 2214 skey.tile = tex.smoothtile;
… …
1937 // corners 2243 // corners
1938 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2244 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1939 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2245 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1940 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2246 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1941 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2247 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2248 }
2249 }
2250
2251 if (expect_false (z == 2))
2252 {
2253 /* draw question marks on top of hidden spaces */
2254 if (!cell->darkness)
2255 {
2256 maptex tex = self->tex [TEXID_HIDDEN];
2257 int px = (x + 1) * T - tex.w;
2258 int py = (y + 1) * T - tex.h;
2259
2260 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2261 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2262 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2263 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2264 }
2265
2266 if (expect_false (cell->flags))
2267 {
2268 // overlays such as the speech bubble, probably more to come
2269 if (cell->flags & 1)
2270 {
2271 rc_key_t key_ov = key;
2272 maptex tex = self->tex [TEXID_SPEECH];
2273 rc_array_t *arr;
2274 int px = x * T + T * 2 / 32;
2275 int py = y * T - T * 6 / 32;
2276
2277 key_ov.texname = tex.name;
2278 arr = rc_array (rc_ov, &key_ov);
2279
2280 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2281 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2282 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2283 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2284 }
1942 } 2285 }
1943 } 2286 }
1944 } 2287 }
1945 } 2288 }
1946 2289
… …
1986 { 2329 {
1987 // this time avoiding texture state changes 2330 // this time avoiding texture state changes
1988 // save gobs of state changes. 2331 // save gobs of state changes.
1989 if (key.texname != tex.name) 2332 if (key.texname != tex.name)
1990 { 2333 {
2334 self->tex [skey->tile].unused = 0;
2335
1991 glEnd (); 2336 glEnd ();
1992 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2337 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1993 glBegin (GL_QUADS); 2338 glBegin (GL_QUADS);
1994 } 2339 }
1995 2340
… …
2024 } 2369 }
2025 2370
2026 hv_clear (smooth); 2371 hv_clear (smooth);
2027 } 2372 }
2028 2373
2374 if (pl_tex.name)
2375 {
2376 maptex tex = pl_tex;
2377 int px = pl_x + sdx;
2378 int py = pl_y + sdy;
2379
2380 key.texname = tex.name;
2381 arr = rc_array (rc, &key);
2382
2383 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2384 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2385 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2386 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2387
2388 rc_draw (rc);
2389 }
2390
2391 rc_draw (rc_ov);
2392 rc_clear (rc_ov);
2393
2029 glDisable (GL_BLEND); 2394 glDisable (GL_BLEND);
2030 rc_free (rc); 2395 rc_free (rc);
2396 rc_free (rc_ov);
2031 2397
2032 // top layer: overlays such as the health bar 2398 // top layer: overlays such as the health bar
2033 for (y = 0; y < sh; y++) 2399 for (y = 0; y < sh; y++)
2034 if (0 <= y + my && y + my < self->rows) 2400 if (0 <= y + my && y + my < self->rows)
2035 { 2401 {
… …
2040 { 2406 {
2041 mapcell *cell = row->col + (x + mx - row->c0); 2407 mapcell *cell = row->col + (x + mx - row->c0);
2042 2408
2043 int px = x * T; 2409 int px = x * T;
2044 int py = y * T; 2410 int py = y * T;
2411
2412 if (expect_false (cell->player == player))
2413 {
2414 px += sdx;
2415 py += sdy;
2416 }
2045 2417
2046 if (cell->stat_hp) 2418 if (cell->stat_hp)
2047 { 2419 {
2048 int width = cell->stat_width * T; 2420 int width = cell->stat_width * T;
2049 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2421 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2060 } 2432 }
2061 } 2433 }
2062} 2434}
2063 2435
2064void 2436void
2065draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2437draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2066 CODE: 2438 CODE:
2067{ 2439{
2068 static float color[16][3] = { 2440 static float color[16][3] = {
2069 { 0.00F, 0.00F, 0.00F }, 2441 { 0.00f, 0.00f, 0.00f },
2070 { 1.00F, 1.00F, 1.00F }, 2442 { 1.00f, 1.00f, 1.00f },
2071 { 0.00F, 0.00F, 0.55F }, 2443 { 0.00f, 0.00f, 0.55f },
2072 { 1.00F, 0.00F, 0.00F }, 2444 { 1.00f, 0.00f, 0.00f },
2073 2445
2074 { 1.00F, 0.54F, 0.00F }, 2446 { 1.00f, 0.54f, 0.00f },
2075 { 0.11F, 0.56F, 1.00F }, 2447 { 0.11f, 0.56f, 1.00f },
2076 { 0.93F, 0.46F, 0.00F }, 2448 { 0.93f, 0.46f, 0.00f },
2077 { 0.18F, 0.54F, 0.34F }, 2449 { 0.18f, 0.54f, 0.34f },
2078 2450
2079 { 0.56F, 0.73F, 0.56F }, 2451 { 0.56f, 0.73f, 0.56f },
2080 { 0.80F, 0.80F, 0.80F }, 2452 { 0.80f, 0.80f, 0.80f },
2081 { 0.55F, 0.41F, 0.13F }, 2453 { 0.55f, 0.41f, 0.13f },
2082 { 0.99F, 0.77F, 0.26F }, 2454 { 0.99f, 0.77f, 0.26f },
2083 2455
2084 { 0.74F, 0.65F, 0.41F }, 2456 { 0.74f, 0.65f, 0.41f },
2085 2457
2086 { 0.00F, 1.00F, 1.00F }, 2458 { 0.00f, 1.00f, 1.00f },
2087 { 1.00F, 0.00F, 1.00F }, 2459 { 1.00f, 0.00f, 1.00f },
2088 { 1.00F, 1.00F, 0.00F }, 2460 { 1.00f, 1.00f, 0.00f },
2089 }; 2461 };
2090 2462
2091 int x, y; 2463 int x, y;
2092 2464
2093 glEnable (GL_TEXTURE_2D); 2465 glEnable (GL_TEXTURE_2D);
2466 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2467 * but the nvidia driver (185.18.14) mishandles alpha textures
2468 * ansd takes the colour from god knows where instead of using
2469 * Cp. MODULATE results in the same colour, but slightly different
2470 * alpha, but atcually gives us the correct colour with nvidia.
2471 */
2094 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2472 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2095 glEnable (GL_BLEND); 2473 glEnable (GL_BLEND);
2096 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2474 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2097 glBegin (GL_QUADS); 2475 glBegin (GL_QUADS);
2098 2476
2099 for (y = 0; y < h; y++) 2477 for (y = 0; y < h; y++)
… …
2103 2481
2104 if (m) 2482 if (m)
2105 { 2483 {
2106 float *c = color [m & 15]; 2484 float *c = color [m & 15];
2107 2485
2108 float tx1 = m & 0x40 ? 0.5 : 0.; 2486 float tx1 = m & 0x40 ? 0.5f : 0.f;
2109 float tx2 = tx1 + 0.5; 2487 float tx2 = tx1 + 0.5f;
2110 2488
2111 glColor4f (c[0], c[1], c[2], 0.75); 2489 glColor4f (c[0], c[1], c[2], 1);
2112 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2490 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2113 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2491 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2114 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2492 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2115 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2493 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2116 } 2494 }
… …
2138 SvCUR_set (darkness3_sv, sw34 * sh3); 2516 SvCUR_set (darkness3_sv, sw34 * sh3);
2139 2517
2140 mx += self->x - 1; 2518 mx += self->x - 1;
2141 my += self->y - 1; 2519 my += self->y - 1;
2142 2520
2143 memset (darkness1, 255, sw1 * sh1); 2521 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2144 2522
2145 for (y = 0; y < sh1; y++) 2523 for (y = 0; y < sh1; y++)
2146 if (0 <= y + my && y + my < self->rows) 2524 if (0 <= y + my && y + my < self->rows)
2147 { 2525 {
2148 maprow *row = self->row + (y + my); 2526 maprow *row = self->row + (y + my);
… …
2151 if (row->c0 <= x + mx && x + mx < row->c1) 2529 if (row->c0 <= x + mx && x + mx < row->c1)
2152 { 2530 {
2153 mapcell *cell = row->col + (x + mx - row->c0); 2531 mapcell *cell = row->col + (x + mx - row->c0);
2154 2532
2155 darkness1 [y * sw1 + x] = cell->darkness 2533 darkness1 [y * sw1 + x] = cell->darkness
2156 ? 255 - (cell->darkness - 1) 2534 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2157 : 255 - FOW_DARKNESS; 2535 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2158 } 2536 }
2159 } 2537 }
2160 2538
2161 for (y = 0; y < sh; ++y) 2539 for (y = 0; y < sh; ++y)
2162 for (x = 0; x < sw; ++x) 2540 for (x = 0; x < sw; ++x)
… …
2268 else 2646 else
2269 *data++ = 0; 2647 *data++ = 0;
2270 } 2648 }
2271 } 2649 }
2272 2650
2651 /* if size is w*h + 5 then no data has been found */
2652 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2653 {
2273 SvPOK_only (data_sv); 2654 SvPOK_only (data_sv);
2274 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2655 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2656 }
2657
2275 RETVAL = data_sv; 2658 RETVAL = data_sv;
2276} 2659}
2277 OUTPUT: 2660 OUTPUT:
2278 RETVAL 2661 RETVAL
2279 2662
2280void 2663void
2281set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2664set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2282 PPCODE: 2665 PPCODE:
2283{ 2666{
2284 int x, y, z; 2667 int x, y, z;
2285 int w, h; 2668 int w, h;
2286 int x1, y1; 2669 int x1, y1;
2670 STRLEN len;
2671 uint8_t *data, *end;
2672
2673 len = SvLEN (data_sv);
2674 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2675 data = SvPVbyte_nolen (data_sv);
2676 end = data + len + 8;
2677
2678 if (len < 5)
2679 XSRETURN_EMPTY;
2287 2680
2288 if (*data++ != 0) 2681 if (*data++ != 0)
2289 XSRETURN_EMPTY; /* version mismatch */ 2682 XSRETURN_EMPTY; /* version mismatch */
2290 2683
2291 w = *data++ << 8; w |= *data++; 2684 w = *data++ << 8; w |= *data++;
… …
2306 { 2699 {
2307 maprow *row = map_get_row (self, y); 2700 maprow *row = map_get_row (self, y);
2308 2701
2309 for (x = x0; x < x1; x++) 2702 for (x = x0; x < x1; x++)
2310 { 2703 {
2704 uint8_t flags;
2705
2706 if (data + 7 >= end)
2707 XSRETURN_EMPTY;
2708
2311 uint8_t flags = *data++; 2709 flags = *data++;
2312 2710
2313 if (flags) 2711 if (flags)
2314 { 2712 {
2315 mapcell *cell = row_get_cell (row, x); 2713 mapcell *cell = row_get_cell (row, x);
2316 tileid tile[3] = { 0, 0, 0 }; 2714 tileid tile[3] = { 0, 0, 0 };
… …
2319 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2717 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2320 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2718 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2321 2719
2322 if (cell->darkness == 0) 2720 if (cell->darkness == 0)
2323 { 2721 {
2324 cell->darkness = 0; 2722 /*cell->darkness = 0;*/
2723 EXTEND (SP, 3);
2325 2724
2326 for (z = 0; z <= 2; z++) 2725 for (z = 0; z <= 2; z++)
2327 { 2726 {
2328 tileid t = tile [z]; 2727 tileid t = tile [z];
2329 2728
2330 if (t >= self->texs || (t && !self->tex [t].name)) 2729 if (t >= self->texs || (t && !self->tex [t].name))
2331 { 2730 {
2332 XPUSHs (sv_2mortal (newSViv (t))); 2731 PUSHs (sv_2mortal (newSViv (t)));
2333 need_texid (self, t); 2732 need_texid (self, t);
2334 } 2733 }
2335 2734
2336 cell->tile [z] = t; 2735 cell->tile [z] = t;
2337 } 2736 }
… …
2441void 2840void
2442set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2841set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2443 CODE: 2842 CODE:
2444{ 2843{
2445 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2844 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2446 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2845 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2447 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2846 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2448} 2847}
2449 2848
2450void 2849void
2451set_reverse_stereo (DC::Channel self, int flip) 2850set_reverse_stereo (DC::Channel self, int flip)
… …
2554 } *civ, const_iv[] = { 2953 } *civ, const_iv[] = {
2555# define const_iv(name) { # name, (IV)name } 2954# define const_iv(name) { # name, (IV)name }
2556 const_iv (GL_VENDOR), 2955 const_iv (GL_VENDOR),
2557 const_iv (GL_VERSION), 2956 const_iv (GL_VERSION),
2558 const_iv (GL_EXTENSIONS), 2957 const_iv (GL_EXTENSIONS),
2958 const_iv (GL_MAX_TEXTURE_UNITS),
2559 const_iv (GL_COLOR_MATERIAL), 2959 const_iv (GL_COLOR_MATERIAL),
2560 const_iv (GL_SMOOTH), 2960 const_iv (GL_SMOOTH),
2561 const_iv (GL_FLAT), 2961 const_iv (GL_FLAT),
2562 const_iv (GL_DITHER), 2962 const_iv (GL_DITHER),
2563 const_iv (GL_BLEND), 2963 const_iv (GL_BLEND),
… …
2575 const_iv (GL_ZERO), 2975 const_iv (GL_ZERO),
2576 const_iv (GL_SRC_ALPHA), 2976 const_iv (GL_SRC_ALPHA),
2577 const_iv (GL_DST_ALPHA), 2977 const_iv (GL_DST_ALPHA),
2578 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2978 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2579 const_iv (GL_ONE_MINUS_DST_ALPHA), 2979 const_iv (GL_ONE_MINUS_DST_ALPHA),
2980 const_iv (GL_SRC_COLOR),
2981 const_iv (GL_DST_COLOR),
2982 const_iv (GL_ONE_MINUS_SRC_COLOR),
2983 const_iv (GL_ONE_MINUS_DST_COLOR),
2580 const_iv (GL_SRC_ALPHA_SATURATE), 2984 const_iv (GL_SRC_ALPHA_SATURATE),
2581 const_iv (GL_RGB), 2985 const_iv (GL_RGB),
2582 const_iv (GL_RGBA), 2986 const_iv (GL_RGBA),
2583 const_iv (GL_RGBA4), 2987 const_iv (GL_RGBA4),
2584 const_iv (GL_RGBA8), 2988 const_iv (GL_RGBA8),
… …
2652 const_iv (GL_NICEST), 3056 const_iv (GL_NICEST),
2653 const_iv (GL_V2F), 3057 const_iv (GL_V2F),
2654 const_iv (GL_V3F), 3058 const_iv (GL_V3F),
2655 const_iv (GL_T2F_V3F), 3059 const_iv (GL_T2F_V3F),
2656 const_iv (GL_T2F_N3F_V3F), 3060 const_iv (GL_T2F_N3F_V3F),
3061 const_iv (GL_FUNC_ADD),
3062 const_iv (GL_FUNC_SUBTRACT),
3063 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2657# undef const_iv 3064# undef const_iv
2658 }; 3065 };
2659 3066
2660 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3067 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2661 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3068 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2668disable_GL_EXT_blend_func_separate () 3075disable_GL_EXT_blend_func_separate ()
2669 CODE: 3076 CODE:
2670 gl.BlendFuncSeparate = 0; 3077 gl.BlendFuncSeparate = 0;
2671 gl.BlendFuncSeparateEXT = 0; 3078 gl.BlendFuncSeparateEXT = 0;
2672 3079
3080void
3081apple_nvidia_bug (int enable)
3082
2673char * 3083char *
2674gl_vendor () 3084gl_vendor ()
2675 CODE: 3085 CODE:
2676 RETVAL = (char *)glGetString (GL_VENDOR); 3086 RETVAL = (char *)glGetString (GL_VENDOR);
2677 OUTPUT: 3087 OUTPUT:
… …
2726 3136
2727void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3137void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2728 CODE: 3138 CODE:
2729 gl_BlendFuncSeparate (sa, da, saa, daa); 3139 gl_BlendFuncSeparate (sa, da, saa, daa);
2730 3140
3141# void glBlendEquation (int se)
3142
2731void glDepthMask (int flag) 3143void glDepthMask (int flag)
2732 3144
2733void glLogicOp (int opcode) 3145void glLogicOp (int opcode)
2734 3146
2735void glColorMask (int red, int green, int blue, int alpha) 3147void glColorMask (int red, int green, int blue, int alpha)
… …
2769void glRotate (float angle, float x, float y, float z) 3181void glRotate (float angle, float x, float y, float z)
2770 CODE: 3182 CODE:
2771 glRotatef (angle, x, y, z); 3183 glRotatef (angle, x, y, z);
2772 3184
2773void glColor (float r, float g, float b, float a = 1.0) 3185void glColor (float r, float g, float b, float a = 1.0)
3186 PROTOTYPE: @
2774 ALIAS: 3187 ALIAS:
2775 glColor_premultiply = 1 3188 glColor_premultiply = 1
2776 CODE: 3189 CODE:
2777 if (ix) 3190 if (ix)
2778 { 3191 {

Diff Legend

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