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

Diff Legend

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