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

Diff Legend

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