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.246 by root, Fri Dec 28 15:06:02 2007 UTC vs.
Revision 1.298 by root, Tue Dec 22 00:46:05 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);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
48#endif
49
44#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
46 52
47#include <glib/gmacros.h> 53#include <glib/gmacros.h>
48 54
49#include <pango/pango.h> 55#include <pango/pango.h>
56
57#ifndef PANGO_VERSION_CHECK
58# define PANGO_VERSION_CHECK(a,b,c) 0
59#endif
60
61#if !PANGO_VERSION_CHECK (1, 15, 2)
62# define pango_layout_get_line_readonly pango_layout_get_line
63# define pango_layout_get_lines_readonly pango_layout_get_lines
64# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
65# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
66#endif
50 67
51#ifndef _WIN32 68#ifndef _WIN32
52# include <sys/types.h> 69# include <sys/types.h>
53# include <sys/socket.h> 70# include <sys/socket.h>
54# include <netinet/in.h> 71# include <netinet/in.h>
55# include <netinet/tcp.h> 72# include <netinet/tcp.h>
56# include <inttypes.h> 73# include <inttypes.h>
57#endif 74#endif
58 75
76#if __GNUC__ >= 4
77# define expect(expr,value) __builtin_expect ((expr),(value))
78#else
79# define expect(expr,value) (expr)
80#endif
81
82#define expect_false(expr) expect ((expr) != 0, 0)
83#define expect_true(expr) expect ((expr) != 0, 1)
84
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
61#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
62 91
63#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
65 94
66#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
67 96
68#if 0 97/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 99
71# define PARACHUTE 0 100#define KMOD_LRAM 0x10000 // our extension
72#endif 101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
73 104
74static AV *texture_av; 105static AV *texture_av;
75 106
76static struct 107static struct
77{ 108{
… …
171 202
172static void 203static void
173layout_update_font (DC__Layout self) 204layout_update_font (DC__Layout self)
174{ 205{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 206 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 207 * reasonably well with dejavu/bistream fonts
177 */ 208 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 209 PangoFontDescription *font = self->font ? self->font : default_font;
179 210
180 pango_font_description_set_absolute_size (font, 211 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 212 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
209 int w, h; 240 int w, h;
210 float s, t; 241 float s, t;
211 uint8_t r, g, b, a; 242 uint8_t r, g, b, a;
212 tileid smoothtile; 243 tileid smoothtile;
213 uint8_t smoothlevel; 244 uint8_t smoothlevel;
245 uint8_t unused; /* set to zero on use */
214} maptex; 246} maptex;
215 247
216typedef struct { 248typedef struct {
217 uint32_t player; 249 uint32_t player;
218 tileid tile[3]; 250 tileid tile[3];
… …
350 self->oy = 0; 382 self->oy = 0;
351 self->row = 0; 383 self->row = 0;
352 self->rows = 0; 384 self->rows = 0;
353} 385}
354 386
387#define CELL_CLEAR(cell) \
388 do { \
389 if ((cell)->player) \
390 (cell)->tile [2] = 0; \
391 (cell)->darkness = 0; \
392 (cell)->stat_hp = 0; \
393 (cell)->flags = 0; \
394 (cell)->player = 0; \
395 } while (0)
396
355static void 397static void
356map_blank (DC__Map self, int x0, int y0, int w, int h) 398map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 399{
358 int x, y; 400 int x, y;
359 maprow *row; 401 maprow *row;
… …
373 if (x >= row->c1) 415 if (x >= row->c1)
374 break; 416 break;
375 417
376 cell = row->col + x - row->c0; 418 cell = row->col + x - row->c0;
377 419
378 cell->darkness = 0; 420 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 421 }
383 } 422 }
384} 423}
385 424
386typedef struct { 425typedef struct {
… …
497 if (!svp || !SvTRUE (*svp)) 536 if (!svp || !SvTRUE (*svp))
498 return 0; 537 return 0;
499 538
500 return 1; 539 return 1;
501} 540}
541
542/******************************************************************************/
543
544/* process keyboard modifiers */
545static int
546mod_munge (int mod)
547{
548 mod &= MOD_MASK;
549
550 if (mod & (KMOD_META | KMOD_ALT))
551 mod |= KMOD_LRAM;
552
553 return mod;
554}
555
556static void
557deliantra_main ()
558{
559 char *argv[] = { 0 };
560 call_argv ("::main", G_DISCARD | G_VOID, argv);
561}
562
563#ifdef __MACOSX__
564 /* to due surprising braindamage on the side of SDL design, we
565 * do some mind-boggling hack here: SDL requires a custom main()
566 * on OS X, so... we provide one and call the original main(), which,
567 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
568 * and which calls our main (== SDL_main) back.
569 */
570 extern C_LINKAGE int
571 main (int argc, char *argv[])
572 {
573 deliantra_main ();
574 }
575
576 #undef main
577
578 extern C_LINKAGE int main (int argc, char *argv[]);
579
580 static void
581 SDL_braino (void)
582 {
583 char *argv[] = { "deliantra client", 0 };
584 (main) (1, argv);
585 }
586#else
587 static void
588 SDL_braino (void)
589 {
590 deliantra_main ();
591 }
592#endif
502 593
503MODULE = Deliantra::Client PACKAGE = DC 594MODULE = Deliantra::Client PACKAGE = DC
504 595
505PROTOTYPES: ENABLE 596PROTOTYPES: ENABLE
506 597
… …
535 const_iv (SDL_USEREVENT), 626 const_iv (SDL_USEREVENT),
536 627
537 const_iv (SDL_APPINPUTFOCUS), 628 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 629 const_iv (SDL_APPMOUSEFOCUS),
539 const_iv (SDL_APPACTIVE), 630 const_iv (SDL_APPACTIVE),
631
632
633 const_iv (SDLK_UNKNOWN),
634 const_iv (SDLK_FIRST),
635 const_iv (SDLK_BACKSPACE),
636 const_iv (SDLK_TAB),
637 const_iv (SDLK_CLEAR),
638 const_iv (SDLK_RETURN),
639 const_iv (SDLK_PAUSE),
640 const_iv (SDLK_ESCAPE),
641 const_iv (SDLK_SPACE),
642 const_iv (SDLK_EXCLAIM),
643 const_iv (SDLK_QUOTEDBL),
644 const_iv (SDLK_HASH),
645 const_iv (SDLK_DOLLAR),
646 const_iv (SDLK_AMPERSAND),
647 const_iv (SDLK_QUOTE),
648 const_iv (SDLK_LEFTPAREN),
649 const_iv (SDLK_RIGHTPAREN),
650 const_iv (SDLK_ASTERISK),
651 const_iv (SDLK_PLUS),
652 const_iv (SDLK_COMMA),
653 const_iv (SDLK_MINUS),
654 const_iv (SDLK_PERIOD),
655 const_iv (SDLK_SLASH),
656 const_iv (SDLK_0),
657 const_iv (SDLK_1),
658 const_iv (SDLK_2),
659 const_iv (SDLK_3),
660 const_iv (SDLK_4),
661 const_iv (SDLK_5),
662 const_iv (SDLK_6),
663 const_iv (SDLK_7),
664 const_iv (SDLK_8),
665 const_iv (SDLK_9),
666 const_iv (SDLK_COLON),
667 const_iv (SDLK_SEMICOLON),
668 const_iv (SDLK_LESS),
669 const_iv (SDLK_EQUALS),
670 const_iv (SDLK_GREATER),
671 const_iv (SDLK_QUESTION),
672 const_iv (SDLK_AT),
673
674 const_iv (SDLK_LEFTBRACKET),
675 const_iv (SDLK_BACKSLASH),
676 const_iv (SDLK_RIGHTBRACKET),
677 const_iv (SDLK_CARET),
678 const_iv (SDLK_UNDERSCORE),
679 const_iv (SDLK_BACKQUOTE),
680 const_iv (SDLK_DELETE),
540 681
541 const_iv (SDLK_FIRST), 682 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 683 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 684 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 685 const_iv (SDLK_KP1),
… …
620 const_iv (KMOD_RMETA), 761 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 762 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 763 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 764 const_iv (KMOD_MODE),
624 765
766 const_iv (KMOD_LRAM),
767
625 const_iv (MIX_DEFAULT_FORMAT), 768 const_iv (MIX_DEFAULT_FORMAT),
769
770 const_iv (SDL_INIT_TIMER),
771 const_iv (SDL_INIT_AUDIO),
772 const_iv (SDL_INIT_VIDEO),
773 const_iv (SDL_INIT_CDROM),
774 const_iv (SDL_INIT_JOYSTICK),
775 const_iv (SDL_INIT_EVERYTHING),
776 const_iv (SDL_INIT_NOPARACHUTE),
777 const_iv (SDL_INIT_EVENTTHREAD),
778
779 const_iv (SDL_GL_RED_SIZE),
780 const_iv (SDL_GL_GREEN_SIZE),
781 const_iv (SDL_GL_BLUE_SIZE),
782 const_iv (SDL_GL_ALPHA_SIZE),
783 const_iv (SDL_GL_DOUBLEBUFFER),
784 const_iv (SDL_GL_BUFFER_SIZE),
785 const_iv (SDL_GL_DEPTH_SIZE),
786 const_iv (SDL_GL_STENCIL_SIZE),
787 const_iv (SDL_GL_ACCUM_RED_SIZE),
788 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
789 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
790 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
791 const_iv (SDL_GL_STEREO),
792 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
793 const_iv (SDL_GL_MULTISAMPLESAMPLES),
794 const_iv (SDL_GL_ACCELERATED_VISUAL),
795 const_iv (SDL_GL_SWAP_CONTROL),
796
797 const_iv (FOW_DARKNESS)
626# undef const_iv 798# undef const_iv
627 }; 799 };
628 800
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 801 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
652 824
653IV minpot (UV n) 825IV minpot (UV n)
654 826
655IV popcount (UV n) 827IV popcount (UV n)
656 828
829NV distance (NV dx, NV dy)
830 CODE:
831 RETVAL = pow (dx * dx + dy * dy, 0.5);
832 OUTPUT:
833 RETVAL
834
657void 835void
658pango_init () 836pango_init ()
659 CODE: 837 CODE:
660{ 838{
661 opengl_fontmap = pango_opengl_font_map_new (); 839 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 840 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); 841 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
842 /*pango_context_set_font_description (opengl_context, default_font);*/
843#if PANGO_VERSION_CHECK (1, 15, 2)
844 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
845 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
846#endif
664} 847}
665 848
666char *
667SDL_GetError () 849char *SDL_GetError ()
668 850
669int 851void SDL_braino ()
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 852
672void 853int SDL_Init (U32 flags)
854
855int SDL_InitSubSystem (U32 flags)
856
857void SDL_QuitSubSystem (U32 flags)
858
673SDL_Quit () 859void SDL_Quit ()
860
861int SDL_GL_SetAttribute (int attr, int value)
862
863int SDL_GL_GetAttribute (int attr)
864 CODE:
865 if (SDL_GL_GetAttribute (attr, &RETVAL))
866 XSRETURN_UNDEF;
867 OUTPUT:
868 RETVAL
674 869
675void 870void
676SDL_ListModes (int rgb, int alpha) 871SDL_ListModes (int rgb, int alpha)
677 PPCODE: 872 PPCODE:
678{ 873{
… …
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 885 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 886 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 887 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 888
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 889 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); 890 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 891
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 892 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 893
702 if (m && m != (SDL_Rect **)-1) 894 if (m && m != (SDL_Rect **)-1)
703 while (*m) 895 while (*m)
704 { 896 {
705 if ((*m)->w >= 800 && (*m)->h >= 480) 897 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 898 {
707 AV *av = newAV (); 899 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 900 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 901 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 902 av_push (av, newSViv (rgb));
… …
752SDL_GetKeyName (int sym) 944SDL_GetKeyName (int sym)
753 945
754int 946int
755SDL_GetAppState () 947SDL_GetAppState ()
756 948
949int
950SDL_GetModState ()
951
757void 952void
758poll_events () 953poll_events ()
759 PPCODE: 954 PPCODE:
760{ 955{
761 SDL_Event ev; 956 SDL_Event ev;
… …
770 { 965 {
771 case SDL_KEYDOWN: 966 case SDL_KEYDOWN:
772 case SDL_KEYUP: 967 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 968 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 969 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 970 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 */ 971 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); 972 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 973 break;
779 974
780 case SDL_ACTIVEEVENT: 975 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 976 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
799 x = ev.motion.x; 994 x = ev.motion.x;
800 y = ev.motion.y; 995 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 996 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 997 }
803 998
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 999 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 1000 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 1001 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 1002 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1003 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1004 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 1005 }
811 break; 1006 break;
812 1007
813 case SDL_MOUSEBUTTONDOWN: 1008 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 1009 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1010 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 1011
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1012 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1013 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1014 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1015 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
894 } 1089 }
895 } 1090 }
896#endif 1091#endif
897} 1092}
898 1093
899void 1094int
900add_font (char *file) 1095add_font (char *file)
901 CODE: 1096 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1097 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1098 OUTPUT:
1099 RETVAL
903 1100
904void 1101void
905load_image_inline (SV *image_) 1102load_image_inline (SV *image_)
906 ALIAS: 1103 ALIAS:
907 load_image_file = 1 1104 load_image_file = 1
… …
1023#if DEBUG 1220#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1221 VALGRIND_DO_LEAK_CHECK;
1025#endif 1222#endif
1026} 1223}
1027 1224
1225int
1226SvREFCNT (SV *sv)
1227 CODE:
1228 RETVAL = SvREFCNT (sv);
1229 OUTPUT:
1230 RETVAL
1231
1028MODULE = Deliantra::Client PACKAGE = DC::Font 1232MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1233
1030PROTOTYPES: DISABLE 1234PROTOTYPES: DISABLE
1031 1235
1032DC::Font 1236DC::Font
… …
1165{ 1369{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1370 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1371
1168 do 1372 do
1169 { 1373 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1374 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1375
1172 if (run && shape_attr_p (run)) 1376 if (run && shape_attr_p (run))
1173 { 1377 {
1174 PangoRectangle extents; 1378 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1379 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1279int 1483int
1280descent (DC::Layout self) 1484descent (DC::Layout self)
1281 CODE: 1485 CODE:
1282{ 1486{
1283 PangoRectangle rect; 1487 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1488 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1489 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1490 RETVAL = PANGO_DESCENT (rect);
1287} 1491}
1288 OUTPUT: 1492 OUTPUT:
1289 RETVAL 1493 RETVAL
… …
1301 1505
1302void 1506void
1303cursor_pos (DC::Layout self, int index) 1507cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1508 PPCODE:
1305{ 1509{
1306 PangoRectangle strong_pos; 1510 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1511 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1512
1309 EXTEND (SP, 3); 1513 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1514 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1515 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1516 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1517}
1314 1518
1315void 1519void
1316index_to_line_x (DC::Layout self, int index, int trailing = 0) 1520index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1521 PPCODE:
1318{ 1522{
1319 int line, x; 1523 int line, x;
1320 1524
1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1525 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1322#if !PANGO_VERSION_CHECK (1, 17. 3) 1526#if !PANGO_VERSION_CHECK (1, 17, 3)
1323 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1527 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1324 --line; 1528 --line;
1325#endif 1529#endif
1326 EXTEND (SP, 2); 1530 EXTEND (SP, 2);
1327 PUSHs (sv_2mortal (newSViv (line))); 1531 PUSHs (sv_2mortal (newSViv (line)));
… …
1336 int index, trailing; 1540 int index, trailing;
1337 1541
1338 if (line < 0) 1542 if (line < 0)
1339 XSRETURN_EMPTY; 1543 XSRETURN_EMPTY;
1340 1544
1341 if (!(lp = pango_layout_get_line (self->pl, line))) 1545 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1342 XSRETURN_EMPTY; /* do better */ 1546 XSRETURN_EMPTY; /* do better */
1343 1547
1344 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1548 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1345 1549
1346 EXTEND (SP, 2); 1550 EXTEND (SP, 2);
… …
1461 if (ix) 1665 if (ix)
1462 { 1666 {
1463 glDisable (GL_ALPHA_TEST); 1667 glDisable (GL_ALPHA_TEST);
1464 glDisable (GL_BLEND); 1668 glDisable (GL_BLEND);
1465 } 1669 }
1670}
1671
1672void
1673draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1674 PROTOTYPE: @
1675 CODE:
1676{
1677 glEnable (GL_TEXTURE_2D);
1678 glEnable (GL_BLEND);
1679 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1680 glBindTexture (GL_TEXTURE_2D, name1);
1681
1682 glColor3f (intensity, intensity, intensity);
1683 glPushMatrix ();
1684 glScalef (1./3, 1./3, 1.);
1685
1686 if (blend > 0.f)
1687 {
1688 float dx3 = dx * -3.f / w;
1689 float dy3 = dy * -3.f / h;
1690 GLfloat env_color[4] = { 0., 0., 0., blend };
1691
1692 /* interpolate the two shadow textures */
1693 /* stage 0 == rgb(glcolor) + alpha(t0) */
1694 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1695
1696 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1697 gl.ActiveTexture (GL_TEXTURE1);
1698 glEnable (GL_TEXTURE_2D);
1699 glBindTexture (GL_TEXTURE_2D, name2);
1700 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1701
1702 /* rgb == rgb(glcolor) */
1703 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1704 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
1705 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1706
1707 /* alpha = interpolate t0, t1 by env_alpha */
1708 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1709
1710 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1711 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1712 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1713
1714 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1715 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1716
1717 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1718 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1719
1720 glBegin (GL_QUADS);
1721 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1722 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1723 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1724 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1725 glEnd ();
1726
1727 glDisable (GL_TEXTURE_2D);
1728 gl.ActiveTexture (GL_TEXTURE0);
1729 }
1730 else
1731 {
1732 /* simple blending of one texture, also opengl <1.3 path */
1733 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1734
1735 glBegin (GL_QUADS);
1736 glTexCoord2f (0, 0); glVertex2f (0, 0);
1737 glTexCoord2f (0, t); glVertex2f (0, h);
1738 glTexCoord2f (s, t); glVertex2f (w, h);
1739 glTexCoord2f (s, 0); glVertex2f (w, 0);
1740 glEnd ();
1741 }
1742
1743 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1744 {
1745 int x, y;
1746 int dx3 = dx * 3;
1747 int dy3 = dy * 3;
1748
1749 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1750 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1751 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1752 glTranslatef (-1., -1., 0);
1753 glBegin (GL_QUADS);
1754
1755 for (y = 1; y < h; y += 3)
1756 {
1757 int y1 = y - dy3;
1758 int y1valid = y1 >= 0 && y1 < h;
1759
1760 for (x = 1; x < w; x += 3)
1761 {
1762 int x1 = x - dx3;
1763 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1764 uint8_t h2;
1765
1766 if (y1valid && x1 >= 0 && x1 < w)
1767 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1768 else
1769 h2 = 1; /* out of range == invisible */
1770
1771 if (h1 || h2)
1772 {
1773 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1774 glColor4f (1., 1., 1., alpha);
1775
1776 glTexCoord2f (0, 0.); glVertex2i (x , y );
1777 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1778 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1779 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1780 }
1781 }
1782 }
1783 }
1784
1785 glEnd ();
1786
1787 glPopMatrix ();
1788
1789 glDisable (GL_TEXTURE_2D);
1790 glDisable (GL_BLEND);
1466} 1791}
1467 1792
1468IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1793IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1469 CODE: 1794 CODE:
1470{ 1795{
… …
1576 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1901 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1577 // use uglier nearest interpolation because linear suffers 1902 // use uglier nearest interpolation because linear suffers
1578 // from transparent color bleeding and ugly wrapping effects. 1903 // from transparent color bleeding and ugly wrapping effects.
1579 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1904 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1580} 1905}
1906
1907void
1908expire_textures (DC::Map self, int texid, int count)
1909 PPCODE:
1910 for (; texid < self->texs && count; ++texid, --count)
1911 {
1912 maptex *tex = self->tex + texid;
1913
1914 if (tex->name)
1915 {
1916 if (tex->unused)
1917 {
1918 tex->name = 0;
1919 tex->unused = 0;
1920 XPUSHs (sv_2mortal (newSViv (texid)));
1921 }
1922 else
1923 tex->unused = 1;
1924 }
1925 }
1581 1926
1582int 1927int
1583ox (DC::Map self) 1928ox (DC::Map self)
1584 ALIAS: 1929 ALIAS:
1585 oy = 1 1930 oy = 1
… …
1663 uint8_t ext, cmd; 2008 uint8_t ext, cmd;
1664 2009
1665 do 2010 do
1666 { 2011 {
1667 ext = *data++; 2012 ext = *data++;
1668 cmd = ext & 0x3f; 2013 cmd = ext & 0x7f;
1669 2014
1670 if (cmd < 4) 2015 if (cmd < 4)
1671 cell->darkness = 255 - ext * 64 + 1; 2016 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1672 else if (cmd == 5) // health 2017 else if (cmd == 5) // health
1673 { 2018 {
1674 cell->stat_width = 1; 2019 cell->stat_width = 1;
1675 cell->stat_hp = *data++; 2020 cell->stat_hp = *data++;
1676 } 2021 }
1677 else if (cmd == 6) // monster width 2022 else if (cmd == 6) // monster width
1678 cell->stat_width = *data++ + 1; 2023 cell->stat_width = *data++ + 1;
1679 else if (cmd == 0x47) 2024 else if (cmd == 0x47)
1680 { 2025 {
1681 if (*data == 4) 2026 if (*data == 1) cell->player = data [1];
1682 ; // decode player count 2027 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2028 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2029 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1683 2030
1684 data += *data + 1; 2031 data += *data + 1;
1685 } 2032 }
1686 else if (cmd == 8) // cell flags 2033 else if (cmd == 8) // cell flags
1687 cell->flags = *data++; 2034 cell->flags = *data++;
… …
1704 cell->tile [z] = self->face2tile [face]; 2051 cell->tile [z] = self->face2tile [face];
1705 2052
1706 if (cell->tile [z]) 2053 if (cell->tile [z])
1707 { 2054 {
1708 maptex *tex = self->tex + cell->tile [z]; 2055 maptex *tex = self->tex + cell->tile [z];
2056 tex->unused = 0;
1709 if (!tex->name) 2057 if (!tex->name)
1710 av_push (missing, newSViv (cell->tile [z])); 2058 av_push (missing, newSViv (cell->tile [z]));
1711 2059
1712 if (tex->smoothtile) 2060 if (tex->smoothtile)
1713 { 2061 {
1714 maptex *smooth = self->tex + tex->smoothtile; 2062 maptex *smooth = self->tex + tex->smoothtile;
2063 smooth->unused = 0;
1715 if (!smooth->name) 2064 if (!smooth->name)
1716 av_push (missing, newSViv (tex->smoothtile)); 2065 av_push (missing, newSViv (tex->smoothtile));
1717 } 2066 }
1718 } 2067 }
1719 } 2068 }
1720 } 2069 }
1721 else 2070 else
1722 cell->darkness = 0; 2071 CELL_CLEAR (cell);
1723 } 2072 }
1724} 2073}
1725 OUTPUT: 2074 OUTPUT:
1726 RETVAL 2075 RETVAL
1727 2076
… …
1779} 2128}
1780 OUTPUT: 2129 OUTPUT:
1781 RETVAL 2130 RETVAL
1782 2131
1783void 2132void
1784draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2133draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1785 CODE: 2134 CODE:
1786{ 2135{
1787 int x, y, z; 2136 int x, y, z;
1788 2137
1789 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2138 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1790 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2139 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) 2140 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1792 smooth_key skey; 2141 smooth_key skey;
1793 2142 int pl_x, pl_y;
2143 maptex pl_tex;
1794 rc_t *rc = rc_alloc (); 2144 rc_t *rc = rc_alloc ();
2145 rc_t *rc_ov = rc_alloc ();
1795 rc_key_t key; 2146 rc_key_t key;
1796 rc_array_t *arr; 2147 rc_array_t *arr;
1797 2148
2149 pl_tex.name = 0;
2150
1798 // thats current max. sorry. 2151 // that's current max. sorry.
1799 if (sw > 255) sw = 255; 2152 if (sw > 255) sw = 255;
1800 if (sh > 255) sh = 255; 2153 if (sh > 255) sh = 255;
1801 2154
1802 // clear key, in case of extra padding 2155 // clear key, in case of extra padding
1803 memset (&skey, 0, sizeof (skey)); 2156 memset (&skey, 0, sizeof (skey));
… …
1807 key.g = 255; 2160 key.g = 255;
1808 key.b = 255; 2161 key.b = 255;
1809 key.a = 255; 2162 key.a = 255;
1810 key.mode = GL_QUADS; 2163 key.mode = GL_QUADS;
1811 key.format = GL_T2F_V3F; 2164 key.format = GL_T2F_V3F;
1812 key.texname = -1;
1813 2165
1814 mx += self->x; 2166 mx += self->x;
1815 my += self->y; 2167 my += self->y;
1816 2168
1817 // first pass: determine smooth_max 2169 // first pass: determine smooth_max
… …
1841 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2193 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1842 2194
1843 for (z = 0; z <= 2; z++) 2195 for (z = 0; z <= 2; z++)
1844 { 2196 {
1845 memset (smooth_level, 0, sizeof (smooth_level)); 2197 memset (smooth_level, 0, sizeof (smooth_level));
2198 key.texname = -1;
1846 2199
1847 for (y = 0; y < sh; y++) 2200 for (y = 0; y < sh; y++)
1848 if (0 <= y + my && y + my < self->rows) 2201 if (0 <= y + my && y + my < self->rows)
1849 { 2202 {
1850 maprow *row = self->row + (y + my); 2203 maprow *row = self->row + (y + my);
… …
1860 maptex tex = self->tex [tile]; 2213 maptex tex = self->tex [tile];
1861 int px, py; 2214 int px, py;
1862 2215
1863 if (key.texname != tex.name) 2216 if (key.texname != tex.name)
1864 { 2217 {
2218 self->tex [tile].unused = 0;
2219
1865 if (!tex.name) 2220 if (!tex.name)
1866 tex = self->tex [2]; /* missing, replace by noface */ 2221 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1867 2222
1868 key.texname = tex.name; 2223 key.texname = tex.name;
1869 arr = rc_array (rc, &key); 2224 arr = rc_array (rc, &key);
1870 } 2225 }
1871 2226
1872 px = (x + 1) * T - tex.w; 2227 px = (x + 1) * T - tex.w;
1873 py = (y + 1) * T - tex.h; 2228 py = (y + 1) * T - tex.h;
2229
2230 if (expect_false (cell->player == player) && expect_false (z == 2))
2231 {
2232 pl_x = px;
2233 pl_y = py;
2234 pl_tex = tex;
2235 continue;
2236 }
1874 2237
1875 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2238 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1876 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2239 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); 2240 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); 2241 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 2242
1905 // update smooth hash 2243 // update smooth hash
1906 if (tex.smoothtile) 2244 if (tex.smoothtile)
1907 { 2245 {
1908 skey.tile = tex.smoothtile; 2246 skey.tile = tex.smoothtile;
… …
1937 // corners 2275 // corners
1938 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2276 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); 2277 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); 2278 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); 2279 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2280 }
2281 }
2282
2283 if (expect_false (z == 2) && expect_false (cell->flags))
2284 {
2285 // overlays such as the speech bubble, probably more to come
2286 if (cell->flags & 1)
2287 {
2288 rc_key_t key_ov = key;
2289 maptex tex = self->tex [TEXID_SPEECH];
2290 rc_array_t *arr;
2291 int px = x * T + T * 2 / 32;
2292 int py = y * T - T * 6 / 32;
2293
2294 key_ov.texname = tex.name;
2295 arr = rc_array (rc_ov, &key_ov);
2296
2297 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2298 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2299 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2300 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1942 } 2301 }
1943 } 2302 }
1944 } 2303 }
1945 } 2304 }
1946 2305
… …
1986 { 2345 {
1987 // this time avoiding texture state changes 2346 // this time avoiding texture state changes
1988 // save gobs of state changes. 2347 // save gobs of state changes.
1989 if (key.texname != tex.name) 2348 if (key.texname != tex.name)
1990 { 2349 {
2350 self->tex [skey->tile].unused = 0;
2351
1991 glEnd (); 2352 glEnd ();
1992 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2353 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1993 glBegin (GL_QUADS); 2354 glBegin (GL_QUADS);
1994 } 2355 }
1995 2356
… …
2024 } 2385 }
2025 2386
2026 hv_clear (smooth); 2387 hv_clear (smooth);
2027 } 2388 }
2028 2389
2390 if (pl_tex.name)
2391 {
2392 maptex tex = pl_tex;
2393 int px = pl_x + sdx;
2394 int py = pl_y + sdy;
2395
2396 key.texname = tex.name;
2397 arr = rc_array (rc, &key);
2398
2399 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2400 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2401 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2402 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2403
2404 rc_draw (rc);
2405 }
2406
2407 rc_draw (rc_ov);
2408 rc_clear (rc_ov);
2409
2029 glDisable (GL_BLEND); 2410 glDisable (GL_BLEND);
2030 rc_free (rc); 2411 rc_free (rc);
2412 rc_free (rc_ov);
2031 2413
2032 // top layer: overlays such as the health bar 2414 // top layer: overlays such as the health bar
2033 for (y = 0; y < sh; y++) 2415 for (y = 0; y < sh; y++)
2034 if (0 <= y + my && y + my < self->rows) 2416 if (0 <= y + my && y + my < self->rows)
2035 { 2417 {
… …
2040 { 2422 {
2041 mapcell *cell = row->col + (x + mx - row->c0); 2423 mapcell *cell = row->col + (x + mx - row->c0);
2042 2424
2043 int px = x * T; 2425 int px = x * T;
2044 int py = y * T; 2426 int py = y * T;
2427
2428 if (expect_false (cell->player == player))
2429 {
2430 px += sdx;
2431 py += sdy;
2432 }
2045 2433
2046 if (cell->stat_hp) 2434 if (cell->stat_hp)
2047 { 2435 {
2048 int width = cell->stat_width * T; 2436 int width = cell->stat_width * T;
2049 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2437 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2060 } 2448 }
2061 } 2449 }
2062} 2450}
2063 2451
2064void 2452void
2065draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2453draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2066 CODE: 2454 CODE:
2067{ 2455{
2068 static float color[16][3] = { 2456 static float color[16][3] = {
2069 { 0.00F, 0.00F, 0.00F }, 2457 { 0.00f, 0.00f, 0.00f },
2070 { 1.00F, 1.00F, 1.00F }, 2458 { 1.00f, 1.00f, 1.00f },
2071 { 0.00F, 0.00F, 0.55F }, 2459 { 0.00f, 0.00f, 0.55f },
2072 { 1.00F, 0.00F, 0.00F }, 2460 { 1.00f, 0.00f, 0.00f },
2073 2461
2074 { 1.00F, 0.54F, 0.00F }, 2462 { 1.00f, 0.54f, 0.00f },
2075 { 0.11F, 0.56F, 1.00F }, 2463 { 0.11f, 0.56f, 1.00f },
2076 { 0.93F, 0.46F, 0.00F }, 2464 { 0.93f, 0.46f, 0.00f },
2077 { 0.18F, 0.54F, 0.34F }, 2465 { 0.18f, 0.54f, 0.34f },
2078 2466
2079 { 0.56F, 0.73F, 0.56F }, 2467 { 0.56f, 0.73f, 0.56f },
2080 { 0.80F, 0.80F, 0.80F }, 2468 { 0.80f, 0.80f, 0.80f },
2081 { 0.55F, 0.41F, 0.13F }, 2469 { 0.55f, 0.41f, 0.13f },
2082 { 0.99F, 0.77F, 0.26F }, 2470 { 0.99f, 0.77f, 0.26f },
2083 2471
2084 { 0.74F, 0.65F, 0.41F }, 2472 { 0.74f, 0.65f, 0.41f },
2085 2473
2086 { 0.00F, 1.00F, 1.00F }, 2474 { 0.00f, 1.00f, 1.00f },
2087 { 1.00F, 0.00F, 1.00F }, 2475 { 1.00f, 0.00f, 1.00f },
2088 { 1.00F, 1.00F, 0.00F }, 2476 { 1.00f, 1.00f, 0.00f },
2089 }; 2477 };
2090 2478
2091 int x, y; 2479 int x, y;
2092 2480
2093 glEnable (GL_TEXTURE_2D); 2481 glEnable (GL_TEXTURE_2D);
2482 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2483 * but the nvidia driver (185.18.14) mishandles alpha textures
2484 * and takes the colour from god knows where instead of using
2485 * Cp. MODULATE results in the same colour, but slightly different
2486 * alpha, but atcually gives us the correct colour with nvidia.
2487 */
2094 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2488 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2095 glEnable (GL_BLEND); 2489 glEnable (GL_BLEND);
2096 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2490 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2097 glBegin (GL_QUADS); 2491 glBegin (GL_QUADS);
2098 2492
2099 for (y = 0; y < h; y++) 2493 for (y = 0; y < h; y++)
… …
2103 2497
2104 if (m) 2498 if (m)
2105 { 2499 {
2106 float *c = color [m & 15]; 2500 float *c = color [m & 15];
2107 2501
2108 float tx1 = m & 0x40 ? 0.5 : 0.; 2502 float tx1 = m & 0x40 ? 0.5f : 0.f;
2109 float tx2 = tx1 + 0.5; 2503 float tx2 = tx1 + 0.5f;
2110 2504
2111 glColor4f (c[0], c[1], c[2], 0.75); 2505 glColor4f (c[0], c[1], c[2], 1);
2112 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2506 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2113 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2507 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2114 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2508 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2115 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2509 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2116 } 2510 }
… …
2124void 2518void
2125fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2519fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2126 PPCODE: 2520 PPCODE:
2127{ 2521{
2128 int x, y; 2522 int x, y;
2129 int sw1 = sw + 2; 2523 int sw1 = sw + 2;
2130 int sh1 = sh + 2; 2524 int sh1 = sh + 2;
2131 int sh3 = sh * 3; 2525 int sh3 = sh * 3;
2132 int sw34 = (sw * 3 + 3) & ~3; 2526 int sw3 = sw * 3;
2133 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2527 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2134 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2528 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2135 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2529 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2136 2530
2137 SvPOK_only (darkness3_sv); 2531 SvPOK_only (darkness3_sv);
2138 SvCUR_set (darkness3_sv, sw34 * sh3); 2532 SvCUR_set (darkness3_sv, sw3 * sh3);
2139 2533
2140 mx += self->x - 1; 2534 mx += self->x - 1;
2141 my += self->y - 1; 2535 my += self->y - 1;
2142
2143 memset (darkness1, 255, sw1 * sh1);
2144 2536
2145 for (y = 0; y < sh1; y++) 2537 for (y = 0; y < sh1; y++)
2146 if (0 <= y + my && y + my < self->rows) 2538 if (0 <= y + my && y + my < self->rows)
2147 { 2539 {
2148 maprow *row = self->row + (y + my); 2540 maprow *row = self->row + (y + my);
… …
2151 if (row->c0 <= x + mx && x + mx < row->c1) 2543 if (row->c0 <= x + mx && x + mx < row->c1)
2152 { 2544 {
2153 mapcell *cell = row->col + (x + mx - row->c0); 2545 mapcell *cell = row->col + (x + mx - row->c0);
2154 2546
2155 darkness1 [y * sw1 + x] = cell->darkness 2547 darkness1 [y * sw1 + x] = cell->darkness
2156 ? 255 - (cell->darkness - 1) 2548 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2157 : 255 - FOW_DARKNESS; 2549 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2158 } 2550 }
2159 } 2551 }
2160 2552
2161 for (y = 0; y < sh; ++y) 2553 for (y = 0; y < sh; ++y)
2162 for (x = 0; x < sw; ++x) 2554 for (x = 0; x < sw; ++x)
… …
2181 2573
2182 uint8_t r13 = (d13 + d23 + d12) / 3; 2574 uint8_t r13 = (d13 + d23 + d12) / 3;
2183 uint8_t r23 = d23; 2575 uint8_t r23 = d23;
2184 uint8_t r33 = (d23 + d33 + d32) / 3; 2576 uint8_t r33 = (d23 + d33 + d32) / 3;
2185 2577
2186 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2578 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2187 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2579 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2188 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2580 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2189 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2581 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2190 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2582 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2191 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2583 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2192 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2584 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2193 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2585 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2194 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2586 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2195 } 2587 }
2196 2588
2197 free (darkness1); 2589 free (darkness1);
2198 2590
2199 EXTEND (SP, 3); 2591 EXTEND (SP, 3);
2200 PUSHs (sv_2mortal (newSViv (sw34))); 2592 PUSHs (sv_2mortal (newSViv (sw3)));
2201 PUSHs (sv_2mortal (newSViv (sh3))); 2593 PUSHs (sv_2mortal (newSViv (sh3)));
2202 PUSHs (darkness3_sv); 2594 PUSHs (darkness3_sv);
2203} 2595}
2204 2596
2205SV * 2597SV *
… …
2268 else 2660 else
2269 *data++ = 0; 2661 *data++ = 0;
2270 } 2662 }
2271 } 2663 }
2272 2664
2665 /* if size is w*h + 5 then no data has been found */
2666 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2667 {
2273 SvPOK_only (data_sv); 2668 SvPOK_only (data_sv);
2274 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2669 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2670 }
2671
2275 RETVAL = data_sv; 2672 RETVAL = data_sv;
2276} 2673}
2277 OUTPUT: 2674 OUTPUT:
2278 RETVAL 2675 RETVAL
2279 2676
2280void 2677void
2281set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2678set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2282 PPCODE: 2679 PPCODE:
2283{ 2680{
2284 int x, y, z; 2681 int x, y, z;
2285 int w, h; 2682 int w, h;
2286 int x1, y1; 2683 int x1, y1;
2684 STRLEN len;
2685 uint8_t *data, *end;
2686
2687 len = SvLEN (data_sv);
2688 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2689 data = SvPVbyte_nolen (data_sv);
2690 end = data + len + 8;
2691
2692 if (len < 5)
2693 XSRETURN_EMPTY;
2287 2694
2288 if (*data++ != 0) 2695 if (*data++ != 0)
2289 XSRETURN_EMPTY; /* version mismatch */ 2696 XSRETURN_EMPTY; /* version mismatch */
2290 2697
2291 w = *data++ << 8; w |= *data++; 2698 w = *data++ << 8; w |= *data++;
… …
2306 { 2713 {
2307 maprow *row = map_get_row (self, y); 2714 maprow *row = map_get_row (self, y);
2308 2715
2309 for (x = x0; x < x1; x++) 2716 for (x = x0; x < x1; x++)
2310 { 2717 {
2718 uint8_t flags;
2719
2720 if (data + 7 >= end)
2721 XSRETURN_EMPTY;
2722
2311 uint8_t flags = *data++; 2723 flags = *data++;
2312 2724
2313 if (flags) 2725 if (flags)
2314 { 2726 {
2315 mapcell *cell = row_get_cell (row, x); 2727 mapcell *cell = row_get_cell (row, x);
2316 tileid tile[3] = { 0, 0, 0 }; 2728 tileid tile[3] = { 0, 0, 0 };
… …
2319 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2731 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2320 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2732 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2321 2733
2322 if (cell->darkness == 0) 2734 if (cell->darkness == 0)
2323 { 2735 {
2324 cell->darkness = 0; 2736 /*cell->darkness = 0;*/
2737 EXTEND (SP, 3);
2325 2738
2326 for (z = 0; z <= 2; z++) 2739 for (z = 0; z <= 2; z++)
2327 { 2740 {
2328 tileid t = tile [z]; 2741 tileid t = tile [z];
2329 2742
2330 if (t >= self->texs || (t && !self->tex [t].name)) 2743 if (t >= self->texs || (t && !self->tex [t].name))
2331 { 2744 {
2332 XPUSHs (sv_2mortal (newSViv (t))); 2745 PUSHs (sv_2mortal (newSViv (t)));
2333 need_texid (self, t); 2746 need_texid (self, t);
2334 } 2747 }
2335 2748
2336 cell->tile [z] = t; 2749 cell->tile [z] = t;
2337 } 2750 }
… …
2441void 2854void
2442set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2855set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2443 CODE: 2856 CODE:
2444{ 2857{
2445 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2858 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); 2859 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2447 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2860 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2448} 2861}
2449 2862
2450void 2863void
2451set_reverse_stereo (DC::Channel self, int flip) 2864set_reverse_stereo (DC::Channel self, int flip)
… …
2554 } *civ, const_iv[] = { 2967 } *civ, const_iv[] = {
2555# define const_iv(name) { # name, (IV)name } 2968# define const_iv(name) { # name, (IV)name }
2556 const_iv (GL_VENDOR), 2969 const_iv (GL_VENDOR),
2557 const_iv (GL_VERSION), 2970 const_iv (GL_VERSION),
2558 const_iv (GL_EXTENSIONS), 2971 const_iv (GL_EXTENSIONS),
2972 const_iv (GL_MAX_TEXTURE_UNITS),
2559 const_iv (GL_COLOR_MATERIAL), 2973 const_iv (GL_COLOR_MATERIAL),
2560 const_iv (GL_SMOOTH), 2974 const_iv (GL_SMOOTH),
2561 const_iv (GL_FLAT), 2975 const_iv (GL_FLAT),
2562 const_iv (GL_DITHER), 2976 const_iv (GL_DITHER),
2563 const_iv (GL_BLEND), 2977 const_iv (GL_BLEND),
… …
2575 const_iv (GL_ZERO), 2989 const_iv (GL_ZERO),
2576 const_iv (GL_SRC_ALPHA), 2990 const_iv (GL_SRC_ALPHA),
2577 const_iv (GL_DST_ALPHA), 2991 const_iv (GL_DST_ALPHA),
2578 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2992 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2579 const_iv (GL_ONE_MINUS_DST_ALPHA), 2993 const_iv (GL_ONE_MINUS_DST_ALPHA),
2994 const_iv (GL_SRC_COLOR),
2995 const_iv (GL_DST_COLOR),
2996 const_iv (GL_ONE_MINUS_SRC_COLOR),
2997 const_iv (GL_ONE_MINUS_DST_COLOR),
2580 const_iv (GL_SRC_ALPHA_SATURATE), 2998 const_iv (GL_SRC_ALPHA_SATURATE),
2581 const_iv (GL_RGB), 2999 const_iv (GL_RGB),
2582 const_iv (GL_RGBA), 3000 const_iv (GL_RGBA),
2583 const_iv (GL_RGBA4), 3001 const_iv (GL_RGBA4),
2584 const_iv (GL_RGBA8), 3002 const_iv (GL_RGBA8),
… …
2652 const_iv (GL_NICEST), 3070 const_iv (GL_NICEST),
2653 const_iv (GL_V2F), 3071 const_iv (GL_V2F),
2654 const_iv (GL_V3F), 3072 const_iv (GL_V3F),
2655 const_iv (GL_T2F_V3F), 3073 const_iv (GL_T2F_V3F),
2656 const_iv (GL_T2F_N3F_V3F), 3074 const_iv (GL_T2F_N3F_V3F),
3075 const_iv (GL_FUNC_ADD),
3076 const_iv (GL_FUNC_SUBTRACT),
3077 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2657# undef const_iv 3078# undef const_iv
2658 }; 3079 };
2659 3080
2660 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3081 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2661 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3082 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2668disable_GL_EXT_blend_func_separate () 3089disable_GL_EXT_blend_func_separate ()
2669 CODE: 3090 CODE:
2670 gl.BlendFuncSeparate = 0; 3091 gl.BlendFuncSeparate = 0;
2671 gl.BlendFuncSeparateEXT = 0; 3092 gl.BlendFuncSeparateEXT = 0;
2672 3093
3094void
3095apple_nvidia_bug (int enable)
3096
2673char * 3097char *
2674gl_vendor () 3098gl_vendor ()
2675 CODE: 3099 CODE:
2676 RETVAL = (char *)glGetString (GL_VENDOR); 3100 RETVAL = (char *)glGetString (GL_VENDOR);
2677 OUTPUT: 3101 OUTPUT:
… …
2726 3150
2727void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3151void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2728 CODE: 3152 CODE:
2729 gl_BlendFuncSeparate (sa, da, saa, daa); 3153 gl_BlendFuncSeparate (sa, da, saa, daa);
2730 3154
3155# void glBlendEquation (int se)
3156
2731void glDepthMask (int flag) 3157void glDepthMask (int flag)
2732 3158
2733void glLogicOp (int opcode) 3159void glLogicOp (int opcode)
2734 3160
2735void glColorMask (int red, int green, int blue, int alpha) 3161void glColorMask (int red, int green, int blue, int alpha)
… …
2769void glRotate (float angle, float x, float y, float z) 3195void glRotate (float angle, float x, float y, float z)
2770 CODE: 3196 CODE:
2771 glRotatef (angle, x, y, z); 3197 glRotatef (angle, x, y, z);
2772 3198
2773void glColor (float r, float g, float b, float a = 1.0) 3199void glColor (float r, float g, float b, float a = 1.0)
3200 PROTOTYPE: @
2774 ALIAS: 3201 ALIAS:
2775 glColor_premultiply = 1 3202 glColor_premultiply = 1
2776 CODE: 3203 CODE:
2777 if (ix) 3204 if (ix)
2778 { 3205 {
… …
2883void glNewList (int list, int mode = GL_COMPILE) 3310void glNewList (int list, int mode = GL_COMPILE)
2884 3311
2885void glEndList () 3312void glEndList ()
2886 3313
2887void glCallList (int list) 3314void glCallList (int list)
3315
3316void c_init ()
3317 CODE:
3318 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3319 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
2888 3320
2889MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3321MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2890 3322
2891PROTOTYPES: DISABLE 3323PROTOTYPES: DISABLE
2892 3324

Diff Legend

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