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.253 by root, Fri Dec 28 20:59:14 2007 UTC vs.
Revision 1.298 by root, Tue Dec 22 00:46:05 2009 UTC

… …
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
… …
39#include <SDL_endian.h> 38#include <SDL_endian.h>
40#include <SDL_image.h> 39#include <SDL_image.h>
41#include <SDL_mixer.h> 40#include <SDL_mixer.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
48#endif
49
44#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
46 52
47#include <glib/gmacros.h> 53#include <glib/gmacros.h>
48 54
49#include <pango/pango.h> 55#include <pango/pango.h>
50 56
51#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)) 57#ifndef PANGO_VERSION_CHECK
58# define PANGO_VERSION_CHECK(a,b,c) 0
59#endif
60
61#if !PANGO_VERSION_CHECK (1, 15, 2)
52# define pango_layout_get_line_readonly pango_layout_get_line_readonly 62# define pango_layout_get_line_readonly pango_layout_get_line
53# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly 63# define pango_layout_get_lines_readonly pango_layout_get_lines
54# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly 64# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
55# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run_readonly 65# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
56#endif 66#endif
57 67
58#ifndef _WIN32 68#ifndef _WIN32
59# include <sys/types.h> 69# include <sys/types.h>
60# include <sys/socket.h> 70# include <sys/socket.h>
61# include <netinet/in.h> 71# include <netinet/in.h>
62# include <netinet/tcp.h> 72# include <netinet/tcp.h>
63# include <inttypes.h> 73# include <inttypes.h>
64#endif 74#endif
65 75
76#if __GNUC__ >= 4
77# define expect(expr,value) __builtin_expect ((expr),(value))
78#else
79# define expect(expr,value) (expr)
80#endif
81
82#define expect_false(expr) expect ((expr) != 0, 0)
83#define expect_true(expr) expect ((expr) != 0, 1)
84
66#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
67 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
68#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
69 91
70#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
71#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
72 94
73#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
74 96
75/* mask out modifiers we are not interested in */ 97/* mask out modifiers we are not interested in */
76#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
77 99
78#if 0 100#define KMOD_LRAM 0x10000 // our extension
79# define PARACHUTE SDL_INIT_NOPARACHUTE 101
80#else 102#define TEXID_SPEECH 1
81# define PARACHUTE 0 103#define TEXID_NOFACE 2
82#endif
83 104
84static AV *texture_av; 105static AV *texture_av;
85 106
86static struct 107static struct
87{ 108{
… …
181 202
182static void 203static void
183layout_update_font (DC__Layout self) 204layout_update_font (DC__Layout self)
184{ 205{
185 /* use a random scale factor to account for unknown descenders, 0.8 works 206 /* use a random scale factor to account for unknown descenders, 0.8 works
186 * reasonably well with bitstream vera 207 * reasonably well with dejavu/bistream fonts
187 */ 208 */
188 PangoFontDescription *font = self->font ? self->font : default_font; 209 PangoFontDescription *font = self->font ? self->font : default_font;
189 210
190 pango_font_description_set_absolute_size (font, 211 pango_font_description_set_absolute_size (font,
191 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 212 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
219 int w, h; 240 int w, h;
220 float s, t; 241 float s, t;
221 uint8_t r, g, b, a; 242 uint8_t r, g, b, a;
222 tileid smoothtile; 243 tileid smoothtile;
223 uint8_t smoothlevel; 244 uint8_t smoothlevel;
245 uint8_t unused; /* set to zero on use */
224} maptex; 246} maptex;
225 247
226typedef struct { 248typedef struct {
227 uint32_t player; 249 uint32_t player;
228 tileid tile[3]; 250 tileid tile[3];
… …
360 self->oy = 0; 382 self->oy = 0;
361 self->row = 0; 383 self->row = 0;
362 self->rows = 0; 384 self->rows = 0;
363} 385}
364 386
387#define CELL_CLEAR(cell) \
388 do { \
389 if ((cell)->player) \
390 (cell)->tile [2] = 0; \
391 (cell)->darkness = 0; \
392 (cell)->stat_hp = 0; \
393 (cell)->flags = 0; \
394 (cell)->player = 0; \
395 } while (0)
396
365static void 397static void
366map_blank (DC__Map self, int x0, int y0, int w, int h) 398map_blank (DC__Map self, int x0, int y0, int w, int h)
367{ 399{
368 int x, y; 400 int x, y;
369 maprow *row; 401 maprow *row;
… …
383 if (x >= row->c1) 415 if (x >= row->c1)
384 break; 416 break;
385 417
386 cell = row->col + x - row->c0; 418 cell = row->col + x - row->c0;
387 419
388 cell->darkness = 0; 420 CELL_CLEAR (cell);
389 cell->stat_hp = 0;
390 cell->flags = 0;
391 cell->player = 0;
392 } 421 }
393 } 422 }
394} 423}
395 424
396typedef struct { 425typedef struct {
… …
507 if (!svp || !SvTRUE (*svp)) 536 if (!svp || !SvTRUE (*svp))
508 return 0; 537 return 0;
509 538
510 return 1; 539 return 1;
511} 540}
541
542/******************************************************************************/
543
544/* process keyboard modifiers */
545static int
546mod_munge (int mod)
547{
548 mod &= MOD_MASK;
549
550 if (mod & (KMOD_META | KMOD_ALT))
551 mod |= KMOD_LRAM;
552
553 return mod;
554}
555
556static void
557deliantra_main ()
558{
559 char *argv[] = { 0 };
560 call_argv ("::main", G_DISCARD | G_VOID, argv);
561}
562
563#ifdef __MACOSX__
564 /* to due surprising braindamage on the side of SDL design, we
565 * do some mind-boggling hack here: SDL requires a custom main()
566 * on OS X, so... we provide one and call the original main(), which,
567 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
568 * and which calls our main (== SDL_main) back.
569 */
570 extern C_LINKAGE int
571 main (int argc, char *argv[])
572 {
573 deliantra_main ();
574 }
575
576 #undef main
577
578 extern C_LINKAGE int main (int argc, char *argv[]);
579
580 static void
581 SDL_braino (void)
582 {
583 char *argv[] = { "deliantra client", 0 };
584 (main) (1, argv);
585 }
586#else
587 static void
588 SDL_braino (void)
589 {
590 deliantra_main ();
591 }
592#endif
512 593
513MODULE = Deliantra::Client PACKAGE = DC 594MODULE = Deliantra::Client PACKAGE = DC
514 595
515PROTOTYPES: ENABLE 596PROTOTYPES: ENABLE
516 597
… …
545 const_iv (SDL_USEREVENT), 626 const_iv (SDL_USEREVENT),
546 627
547 const_iv (SDL_APPINPUTFOCUS), 628 const_iv (SDL_APPINPUTFOCUS),
548 const_iv (SDL_APPMOUSEFOCUS), 629 const_iv (SDL_APPMOUSEFOCUS),
549 const_iv (SDL_APPACTIVE), 630 const_iv (SDL_APPACTIVE),
631
632
633 const_iv (SDLK_UNKNOWN),
634 const_iv (SDLK_FIRST),
635 const_iv (SDLK_BACKSPACE),
636 const_iv (SDLK_TAB),
637 const_iv (SDLK_CLEAR),
638 const_iv (SDLK_RETURN),
639 const_iv (SDLK_PAUSE),
640 const_iv (SDLK_ESCAPE),
641 const_iv (SDLK_SPACE),
642 const_iv (SDLK_EXCLAIM),
643 const_iv (SDLK_QUOTEDBL),
644 const_iv (SDLK_HASH),
645 const_iv (SDLK_DOLLAR),
646 const_iv (SDLK_AMPERSAND),
647 const_iv (SDLK_QUOTE),
648 const_iv (SDLK_LEFTPAREN),
649 const_iv (SDLK_RIGHTPAREN),
650 const_iv (SDLK_ASTERISK),
651 const_iv (SDLK_PLUS),
652 const_iv (SDLK_COMMA),
653 const_iv (SDLK_MINUS),
654 const_iv (SDLK_PERIOD),
655 const_iv (SDLK_SLASH),
656 const_iv (SDLK_0),
657 const_iv (SDLK_1),
658 const_iv (SDLK_2),
659 const_iv (SDLK_3),
660 const_iv (SDLK_4),
661 const_iv (SDLK_5),
662 const_iv (SDLK_6),
663 const_iv (SDLK_7),
664 const_iv (SDLK_8),
665 const_iv (SDLK_9),
666 const_iv (SDLK_COLON),
667 const_iv (SDLK_SEMICOLON),
668 const_iv (SDLK_LESS),
669 const_iv (SDLK_EQUALS),
670 const_iv (SDLK_GREATER),
671 const_iv (SDLK_QUESTION),
672 const_iv (SDLK_AT),
673
674 const_iv (SDLK_LEFTBRACKET),
675 const_iv (SDLK_BACKSLASH),
676 const_iv (SDLK_RIGHTBRACKET),
677 const_iv (SDLK_CARET),
678 const_iv (SDLK_UNDERSCORE),
679 const_iv (SDLK_BACKQUOTE),
680 const_iv (SDLK_DELETE),
550 681
551 const_iv (SDLK_FIRST), 682 const_iv (SDLK_FIRST),
552 const_iv (SDLK_LAST), 683 const_iv (SDLK_LAST),
553 const_iv (SDLK_KP0), 684 const_iv (SDLK_KP0),
554 const_iv (SDLK_KP1), 685 const_iv (SDLK_KP1),
… …
630 const_iv (KMOD_RMETA), 761 const_iv (KMOD_RMETA),
631 const_iv (KMOD_NUM), 762 const_iv (KMOD_NUM),
632 const_iv (KMOD_CAPS), 763 const_iv (KMOD_CAPS),
633 const_iv (KMOD_MODE), 764 const_iv (KMOD_MODE),
634 765
766 const_iv (KMOD_LRAM),
767
635 const_iv (MIX_DEFAULT_FORMAT), 768 const_iv (MIX_DEFAULT_FORMAT),
769
770 const_iv (SDL_INIT_TIMER),
771 const_iv (SDL_INIT_AUDIO),
772 const_iv (SDL_INIT_VIDEO),
773 const_iv (SDL_INIT_CDROM),
774 const_iv (SDL_INIT_JOYSTICK),
775 const_iv (SDL_INIT_EVERYTHING),
776 const_iv (SDL_INIT_NOPARACHUTE),
777 const_iv (SDL_INIT_EVENTTHREAD),
778
779 const_iv (SDL_GL_RED_SIZE),
780 const_iv (SDL_GL_GREEN_SIZE),
781 const_iv (SDL_GL_BLUE_SIZE),
782 const_iv (SDL_GL_ALPHA_SIZE),
783 const_iv (SDL_GL_DOUBLEBUFFER),
784 const_iv (SDL_GL_BUFFER_SIZE),
785 const_iv (SDL_GL_DEPTH_SIZE),
786 const_iv (SDL_GL_STENCIL_SIZE),
787 const_iv (SDL_GL_ACCUM_RED_SIZE),
788 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
789 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
790 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
791 const_iv (SDL_GL_STEREO),
792 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
793 const_iv (SDL_GL_MULTISAMPLESAMPLES),
794 const_iv (SDL_GL_ACCELERATED_VISUAL),
795 const_iv (SDL_GL_SWAP_CONTROL),
796
797 const_iv (FOW_DARKNESS)
636# undef const_iv 798# undef const_iv
637 }; 799 };
638 800
639 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 801 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
640 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
662 824
663IV minpot (UV n) 825IV minpot (UV n)
664 826
665IV popcount (UV n) 827IV popcount (UV n)
666 828
829NV distance (NV dx, NV dy)
830 CODE:
831 RETVAL = pow (dx * dx + dy * dy, 0.5);
832 OUTPUT:
833 RETVAL
834
667void 835void
668pango_init () 836pango_init ()
669 CODE: 837 CODE:
670{ 838{
671 opengl_fontmap = pango_opengl_font_map_new (); 839 opengl_fontmap = pango_opengl_font_map_new ();
672 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 840 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
673 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 841 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
674#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2) 842 /*pango_context_set_font_description (opengl_context, default_font);*/
843#if PANGO_VERSION_CHECK (1, 15, 2)
675 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 844 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
676 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 845 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
677#endif 846#endif
678} 847}
679 848
680char *
681SDL_GetError () 849char *SDL_GetError ()
682 850
683int 851void SDL_braino ()
684SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
685 852
686void 853int SDL_Init (U32 flags)
854
855int SDL_InitSubSystem (U32 flags)
856
857void SDL_QuitSubSystem (U32 flags)
858
687SDL_Quit () 859void SDL_Quit ()
860
861int SDL_GL_SetAttribute (int attr, int value)
862
863int SDL_GL_GetAttribute (int attr)
864 CODE:
865 if (SDL_GL_GetAttribute (attr, &RETVAL))
866 XSRETURN_UNDEF;
867 OUTPUT:
868 RETVAL
688 869
689void 870void
690SDL_ListModes (int rgb, int alpha) 871SDL_ListModes (int rgb, int alpha)
691 PPCODE: 872 PPCODE:
692{ 873{
… …
704 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 885 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
705 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 886 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
706 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 887 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
707 888
708 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 889 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
709#if SDL_VERSION_ATLEAST(1,2,10)
710 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
711 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 890 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
712#endif
713 891
714 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 892 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
715 893
716 if (m && m != (SDL_Rect **)-1) 894 if (m && m != (SDL_Rect **)-1)
717 while (*m) 895 while (*m)
718 { 896 {
719 if ((*m)->w >= 800 && (*m)->h >= 480) 897 if ((*m)->w >= 400 && (*m)->h >= 300)
720 { 898 {
721 AV *av = newAV (); 899 AV *av = newAV ();
722 av_push (av, newSViv ((*m)->w)); 900 av_push (av, newSViv ((*m)->w));
723 av_push (av, newSViv ((*m)->h)); 901 av_push (av, newSViv ((*m)->h));
724 av_push (av, newSViv (rgb)); 902 av_push (av, newSViv (rgb));
… …
766SDL_GetKeyName (int sym) 944SDL_GetKeyName (int sym)
767 945
768int 946int
769SDL_GetAppState () 947SDL_GetAppState ()
770 948
949int
950SDL_GetModState ()
951
771void 952void
772poll_events () 953poll_events ()
773 PPCODE: 954 PPCODE:
774{ 955{
775 SDL_Event ev; 956 SDL_Event ev;
… …
784 { 965 {
785 case SDL_KEYDOWN: 966 case SDL_KEYDOWN:
786 case SDL_KEYUP: 967 case SDL_KEYUP:
787 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 968 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
788 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 969 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
789 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 970 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
790 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 971 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
791 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 972 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
792 break; 973 break;
793 974
794 case SDL_ACTIVEEVENT: 975 case SDL_ACTIVEEVENT:
795 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 976 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
813 x = ev.motion.x; 994 x = ev.motion.x;
814 y = ev.motion.y; 995 y = ev.motion.y;
815 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 996 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
816 } 997 }
817 998
818 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 999 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
819 hv_store (hv, "state", 5, newSViv (state), 0); 1000 hv_store (hv, "state", 5, newSViv (state), 0);
820 hv_store (hv, "x", 1, newSViv (x), 0); 1001 hv_store (hv, "x", 1, newSViv (x), 0);
821 hv_store (hv, "y", 1, newSViv (y), 0); 1002 hv_store (hv, "y", 1, newSViv (y), 0);
822 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1003 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
823 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1004 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
908 } 1089 }
909 } 1090 }
910#endif 1091#endif
911} 1092}
912 1093
913void 1094int
914add_font (char *file) 1095add_font (char *file)
915 CODE: 1096 CODE:
916 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1097 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1098 OUTPUT:
1099 RETVAL
917 1100
918void 1101void
919load_image_inline (SV *image_) 1102load_image_inline (SV *image_)
920 ALIAS: 1103 ALIAS:
921 load_image_file = 1 1104 load_image_file = 1
… …
1037#if DEBUG 1220#if DEBUG
1038 VALGRIND_DO_LEAK_CHECK; 1221 VALGRIND_DO_LEAK_CHECK;
1039#endif 1222#endif
1040} 1223}
1041 1224
1225int
1226SvREFCNT (SV *sv)
1227 CODE:
1228 RETVAL = SvREFCNT (sv);
1229 OUTPUT:
1230 RETVAL
1231
1042MODULE = Deliantra::Client PACKAGE = DC::Font 1232MODULE = Deliantra::Client PACKAGE = DC::Font
1043 1233
1044PROTOTYPES: DISABLE 1234PROTOTYPES: DISABLE
1045 1235
1046DC::Font 1236DC::Font
… …
1331 PPCODE: 1521 PPCODE:
1332{ 1522{
1333 int line, x; 1523 int line, x;
1334 1524
1335 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1525 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1336#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3)) 1526#if !PANGO_VERSION_CHECK (1, 17, 3)
1337 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1527 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1338 --line; 1528 --line;
1339#endif 1529#endif
1340 EXTEND (SP, 2); 1530 EXTEND (SP, 2);
1341 PUSHs (sv_2mortal (newSViv (line))); 1531 PUSHs (sv_2mortal (newSViv (line)));
… …
1475 if (ix) 1665 if (ix)
1476 { 1666 {
1477 glDisable (GL_ALPHA_TEST); 1667 glDisable (GL_ALPHA_TEST);
1478 glDisable (GL_BLEND); 1668 glDisable (GL_BLEND);
1479 } 1669 }
1670}
1671
1672void
1673draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1674 PROTOTYPE: @
1675 CODE:
1676{
1677 glEnable (GL_TEXTURE_2D);
1678 glEnable (GL_BLEND);
1679 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1680 glBindTexture (GL_TEXTURE_2D, name1);
1681
1682 glColor3f (intensity, intensity, intensity);
1683 glPushMatrix ();
1684 glScalef (1./3, 1./3, 1.);
1685
1686 if (blend > 0.f)
1687 {
1688 float dx3 = dx * -3.f / w;
1689 float dy3 = dy * -3.f / h;
1690 GLfloat env_color[4] = { 0., 0., 0., blend };
1691
1692 /* interpolate the two shadow textures */
1693 /* stage 0 == rgb(glcolor) + alpha(t0) */
1694 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1695
1696 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1697 gl.ActiveTexture (GL_TEXTURE1);
1698 glEnable (GL_TEXTURE_2D);
1699 glBindTexture (GL_TEXTURE_2D, name2);
1700 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1701
1702 /* rgb == rgb(glcolor) */
1703 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1704 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
1705 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1706
1707 /* alpha = interpolate t0, t1 by env_alpha */
1708 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1709
1710 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1711 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1712 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1713
1714 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1715 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1716
1717 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1718 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1719
1720 glBegin (GL_QUADS);
1721 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1722 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1723 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1724 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1725 glEnd ();
1726
1727 glDisable (GL_TEXTURE_2D);
1728 gl.ActiveTexture (GL_TEXTURE0);
1729 }
1730 else
1731 {
1732 /* simple blending of one texture, also opengl <1.3 path */
1733 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1734
1735 glBegin (GL_QUADS);
1736 glTexCoord2f (0, 0); glVertex2f (0, 0);
1737 glTexCoord2f (0, t); glVertex2f (0, h);
1738 glTexCoord2f (s, t); glVertex2f (w, h);
1739 glTexCoord2f (s, 0); glVertex2f (w, 0);
1740 glEnd ();
1741 }
1742
1743 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1744 {
1745 int x, y;
1746 int dx3 = dx * 3;
1747 int dy3 = dy * 3;
1748
1749 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1750 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1751 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1752 glTranslatef (-1., -1., 0);
1753 glBegin (GL_QUADS);
1754
1755 for (y = 1; y < h; y += 3)
1756 {
1757 int y1 = y - dy3;
1758 int y1valid = y1 >= 0 && y1 < h;
1759
1760 for (x = 1; x < w; x += 3)
1761 {
1762 int x1 = x - dx3;
1763 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1764 uint8_t h2;
1765
1766 if (y1valid && x1 >= 0 && x1 < w)
1767 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1768 else
1769 h2 = 1; /* out of range == invisible */
1770
1771 if (h1 || h2)
1772 {
1773 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1774 glColor4f (1., 1., 1., alpha);
1775
1776 glTexCoord2f (0, 0.); glVertex2i (x , y );
1777 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1778 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1779 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1780 }
1781 }
1782 }
1783 }
1784
1785 glEnd ();
1786
1787 glPopMatrix ();
1788
1789 glDisable (GL_TEXTURE_2D);
1790 glDisable (GL_BLEND);
1480} 1791}
1481 1792
1482IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1793IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1483 CODE: 1794 CODE:
1484{ 1795{
… …
1590 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1901 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1591 // use uglier nearest interpolation because linear suffers 1902 // use uglier nearest interpolation because linear suffers
1592 // from transparent color bleeding and ugly wrapping effects. 1903 // from transparent color bleeding and ugly wrapping effects.
1593 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1904 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1594} 1905}
1906
1907void
1908expire_textures (DC::Map self, int texid, int count)
1909 PPCODE:
1910 for (; texid < self->texs && count; ++texid, --count)
1911 {
1912 maptex *tex = self->tex + texid;
1913
1914 if (tex->name)
1915 {
1916 if (tex->unused)
1917 {
1918 tex->name = 0;
1919 tex->unused = 0;
1920 XPUSHs (sv_2mortal (newSViv (texid)));
1921 }
1922 else
1923 tex->unused = 1;
1924 }
1925 }
1595 1926
1596int 1927int
1597ox (DC::Map self) 1928ox (DC::Map self)
1598 ALIAS: 1929 ALIAS:
1599 oy = 1 1930 oy = 1
… …
1677 uint8_t ext, cmd; 2008 uint8_t ext, cmd;
1678 2009
1679 do 2010 do
1680 { 2011 {
1681 ext = *data++; 2012 ext = *data++;
1682 cmd = ext & 0x3f; 2013 cmd = ext & 0x7f;
1683 2014
1684 if (cmd < 4) 2015 if (cmd < 4)
1685 cell->darkness = 255 - ext * 64 + 1; 2016 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1686 else if (cmd == 5) // health 2017 else if (cmd == 5) // health
1687 { 2018 {
1688 cell->stat_width = 1; 2019 cell->stat_width = 1;
1689 cell->stat_hp = *data++; 2020 cell->stat_hp = *data++;
1690 } 2021 }
1691 else if (cmd == 6) // monster width 2022 else if (cmd == 6) // monster width
1692 cell->stat_width = *data++ + 1; 2023 cell->stat_width = *data++ + 1;
1693 else if (cmd == 0x47) 2024 else if (cmd == 0x47)
1694 { 2025 {
1695 if (*data == 4) 2026 if (*data == 1) cell->player = data [1];
1696 ; // decode player count 2027 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2028 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2029 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1697 2030
1698 data += *data + 1; 2031 data += *data + 1;
1699 } 2032 }
1700 else if (cmd == 8) // cell flags 2033 else if (cmd == 8) // cell flags
1701 cell->flags = *data++; 2034 cell->flags = *data++;
… …
1718 cell->tile [z] = self->face2tile [face]; 2051 cell->tile [z] = self->face2tile [face];
1719 2052
1720 if (cell->tile [z]) 2053 if (cell->tile [z])
1721 { 2054 {
1722 maptex *tex = self->tex + cell->tile [z]; 2055 maptex *tex = self->tex + cell->tile [z];
2056 tex->unused = 0;
1723 if (!tex->name) 2057 if (!tex->name)
1724 av_push (missing, newSViv (cell->tile [z])); 2058 av_push (missing, newSViv (cell->tile [z]));
1725 2059
1726 if (tex->smoothtile) 2060 if (tex->smoothtile)
1727 { 2061 {
1728 maptex *smooth = self->tex + tex->smoothtile; 2062 maptex *smooth = self->tex + tex->smoothtile;
2063 smooth->unused = 0;
1729 if (!smooth->name) 2064 if (!smooth->name)
1730 av_push (missing, newSViv (tex->smoothtile)); 2065 av_push (missing, newSViv (tex->smoothtile));
1731 } 2066 }
1732 } 2067 }
1733 } 2068 }
1734 } 2069 }
1735 else 2070 else
1736 cell->darkness = 0; 2071 CELL_CLEAR (cell);
1737 } 2072 }
1738} 2073}
1739 OUTPUT: 2074 OUTPUT:
1740 RETVAL 2075 RETVAL
1741 2076
… …
1793} 2128}
1794 OUTPUT: 2129 OUTPUT:
1795 RETVAL 2130 RETVAL
1796 2131
1797void 2132void
1798draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2133draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1799 CODE: 2134 CODE:
1800{ 2135{
1801 int x, y, z; 2136 int x, y, z;
1802 2137
1803 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2138 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1804 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2139 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1805 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2140 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1806 smooth_key skey; 2141 smooth_key skey;
1807 2142 int pl_x, pl_y;
2143 maptex pl_tex;
1808 rc_t *rc = rc_alloc (); 2144 rc_t *rc = rc_alloc ();
2145 rc_t *rc_ov = rc_alloc ();
1809 rc_key_t key; 2146 rc_key_t key;
1810 rc_array_t *arr; 2147 rc_array_t *arr;
1811 2148
2149 pl_tex.name = 0;
2150
1812 // thats current max. sorry. 2151 // that's current max. sorry.
1813 if (sw > 255) sw = 255; 2152 if (sw > 255) sw = 255;
1814 if (sh > 255) sh = 255; 2153 if (sh > 255) sh = 255;
1815 2154
1816 // clear key, in case of extra padding 2155 // clear key, in case of extra padding
1817 memset (&skey, 0, sizeof (skey)); 2156 memset (&skey, 0, sizeof (skey));
… …
1821 key.g = 255; 2160 key.g = 255;
1822 key.b = 255; 2161 key.b = 255;
1823 key.a = 255; 2162 key.a = 255;
1824 key.mode = GL_QUADS; 2163 key.mode = GL_QUADS;
1825 key.format = GL_T2F_V3F; 2164 key.format = GL_T2F_V3F;
1826 key.texname = -1;
1827 2165
1828 mx += self->x; 2166 mx += self->x;
1829 my += self->y; 2167 my += self->y;
1830 2168
1831 // first pass: determine smooth_max 2169 // first pass: determine smooth_max
… …
1855 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2193 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1856 2194
1857 for (z = 0; z <= 2; z++) 2195 for (z = 0; z <= 2; z++)
1858 { 2196 {
1859 memset (smooth_level, 0, sizeof (smooth_level)); 2197 memset (smooth_level, 0, sizeof (smooth_level));
2198 key.texname = -1;
1860 2199
1861 for (y = 0; y < sh; y++) 2200 for (y = 0; y < sh; y++)
1862 if (0 <= y + my && y + my < self->rows) 2201 if (0 <= y + my && y + my < self->rows)
1863 { 2202 {
1864 maprow *row = self->row + (y + my); 2203 maprow *row = self->row + (y + my);
… …
1874 maptex tex = self->tex [tile]; 2213 maptex tex = self->tex [tile];
1875 int px, py; 2214 int px, py;
1876 2215
1877 if (key.texname != tex.name) 2216 if (key.texname != tex.name)
1878 { 2217 {
2218 self->tex [tile].unused = 0;
2219
1879 if (!tex.name) 2220 if (!tex.name)
1880 tex = self->tex [2]; /* missing, replace by noface */ 2221 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1881 2222
1882 key.texname = tex.name; 2223 key.texname = tex.name;
1883 arr = rc_array (rc, &key); 2224 arr = rc_array (rc, &key);
1884 } 2225 }
1885 2226
1886 px = (x + 1) * T - tex.w; 2227 px = (x + 1) * T - tex.w;
1887 py = (y + 1) * T - tex.h; 2228 py = (y + 1) * T - tex.h;
2229
2230 if (expect_false (cell->player == player) && expect_false (z == 2))
2231 {
2232 pl_x = px;
2233 pl_y = py;
2234 pl_tex = tex;
2235 continue;
2236 }
1888 2237
1889 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2238 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1890 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2239 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1891 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2240 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1892 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2241 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1893
1894 if (cell->flags && z == 2)
1895 {
1896 // overlays such as the speech bubble, probably more to come
1897 if (cell->flags & 1)
1898 {
1899 maptex tex = self->tex [1];
1900 int px = x * T + T * 2 / 32;
1901 int py = y * T - T * 6 / 32;
1902
1903 if (tex.name)
1904 {
1905 if (key.texname != tex.name)
1906 {
1907 key.texname = tex.name;
1908 arr = rc_array (rc, &key);
1909 }
1910
1911 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1912 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1913 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1914 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1915 }
1916 }
1917 }
1918 2242
1919 // update smooth hash 2243 // update smooth hash
1920 if (tex.smoothtile) 2244 if (tex.smoothtile)
1921 { 2245 {
1922 skey.tile = tex.smoothtile; 2246 skey.tile = tex.smoothtile;
… …
1951 // corners 2275 // corners
1952 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2276 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1953 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2277 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1954 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2278 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1955 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2279 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2280 }
2281 }
2282
2283 if (expect_false (z == 2) && expect_false (cell->flags))
2284 {
2285 // overlays such as the speech bubble, probably more to come
2286 if (cell->flags & 1)
2287 {
2288 rc_key_t key_ov = key;
2289 maptex tex = self->tex [TEXID_SPEECH];
2290 rc_array_t *arr;
2291 int px = x * T + T * 2 / 32;
2292 int py = y * T - T * 6 / 32;
2293
2294 key_ov.texname = tex.name;
2295 arr = rc_array (rc_ov, &key_ov);
2296
2297 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2298 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2299 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2300 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1956 } 2301 }
1957 } 2302 }
1958 } 2303 }
1959 } 2304 }
1960 2305
… …
2000 { 2345 {
2001 // this time avoiding texture state changes 2346 // this time avoiding texture state changes
2002 // save gobs of state changes. 2347 // save gobs of state changes.
2003 if (key.texname != tex.name) 2348 if (key.texname != tex.name)
2004 { 2349 {
2350 self->tex [skey->tile].unused = 0;
2351
2005 glEnd (); 2352 glEnd ();
2006 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2353 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2007 glBegin (GL_QUADS); 2354 glBegin (GL_QUADS);
2008 } 2355 }
2009 2356
… …
2038 } 2385 }
2039 2386
2040 hv_clear (smooth); 2387 hv_clear (smooth);
2041 } 2388 }
2042 2389
2390 if (pl_tex.name)
2391 {
2392 maptex tex = pl_tex;
2393 int px = pl_x + sdx;
2394 int py = pl_y + sdy;
2395
2396 key.texname = tex.name;
2397 arr = rc_array (rc, &key);
2398
2399 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2400 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2401 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2402 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2403
2404 rc_draw (rc);
2405 }
2406
2407 rc_draw (rc_ov);
2408 rc_clear (rc_ov);
2409
2043 glDisable (GL_BLEND); 2410 glDisable (GL_BLEND);
2044 rc_free (rc); 2411 rc_free (rc);
2412 rc_free (rc_ov);
2045 2413
2046 // top layer: overlays such as the health bar 2414 // top layer: overlays such as the health bar
2047 for (y = 0; y < sh; y++) 2415 for (y = 0; y < sh; y++)
2048 if (0 <= y + my && y + my < self->rows) 2416 if (0 <= y + my && y + my < self->rows)
2049 { 2417 {
… …
2054 { 2422 {
2055 mapcell *cell = row->col + (x + mx - row->c0); 2423 mapcell *cell = row->col + (x + mx - row->c0);
2056 2424
2057 int px = x * T; 2425 int px = x * T;
2058 int py = y * T; 2426 int py = y * T;
2427
2428 if (expect_false (cell->player == player))
2429 {
2430 px += sdx;
2431 py += sdy;
2432 }
2059 2433
2060 if (cell->stat_hp) 2434 if (cell->stat_hp)
2061 { 2435 {
2062 int width = cell->stat_width * T; 2436 int width = cell->stat_width * T;
2063 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2437 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2074 } 2448 }
2075 } 2449 }
2076} 2450}
2077 2451
2078void 2452void
2079draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2453draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2080 CODE: 2454 CODE:
2081{ 2455{
2082 static float color[16][3] = { 2456 static float color[16][3] = {
2083 { 0.00F, 0.00F, 0.00F }, 2457 { 0.00f, 0.00f, 0.00f },
2084 { 1.00F, 1.00F, 1.00F }, 2458 { 1.00f, 1.00f, 1.00f },
2085 { 0.00F, 0.00F, 0.55F }, 2459 { 0.00f, 0.00f, 0.55f },
2086 { 1.00F, 0.00F, 0.00F }, 2460 { 1.00f, 0.00f, 0.00f },
2087 2461
2088 { 1.00F, 0.54F, 0.00F }, 2462 { 1.00f, 0.54f, 0.00f },
2089 { 0.11F, 0.56F, 1.00F }, 2463 { 0.11f, 0.56f, 1.00f },
2090 { 0.93F, 0.46F, 0.00F }, 2464 { 0.93f, 0.46f, 0.00f },
2091 { 0.18F, 0.54F, 0.34F }, 2465 { 0.18f, 0.54f, 0.34f },
2092 2466
2093 { 0.56F, 0.73F, 0.56F }, 2467 { 0.56f, 0.73f, 0.56f },
2094 { 0.80F, 0.80F, 0.80F }, 2468 { 0.80f, 0.80f, 0.80f },
2095 { 0.55F, 0.41F, 0.13F }, 2469 { 0.55f, 0.41f, 0.13f },
2096 { 0.99F, 0.77F, 0.26F }, 2470 { 0.99f, 0.77f, 0.26f },
2097 2471
2098 { 0.74F, 0.65F, 0.41F }, 2472 { 0.74f, 0.65f, 0.41f },
2099 2473
2100 { 0.00F, 1.00F, 1.00F }, 2474 { 0.00f, 1.00f, 1.00f },
2101 { 1.00F, 0.00F, 1.00F }, 2475 { 1.00f, 0.00f, 1.00f },
2102 { 1.00F, 1.00F, 0.00F }, 2476 { 1.00f, 1.00f, 0.00f },
2103 }; 2477 };
2104 2478
2105 int x, y; 2479 int x, y;
2106 2480
2107 glEnable (GL_TEXTURE_2D); 2481 glEnable (GL_TEXTURE_2D);
2482 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2483 * but the nvidia driver (185.18.14) mishandles alpha textures
2484 * and takes the colour from god knows where instead of using
2485 * Cp. MODULATE results in the same colour, but slightly different
2486 * alpha, but atcually gives us the correct colour with nvidia.
2487 */
2108 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2488 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2109 glEnable (GL_BLEND); 2489 glEnable (GL_BLEND);
2110 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2490 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2111 glBegin (GL_QUADS); 2491 glBegin (GL_QUADS);
2112 2492
2113 for (y = 0; y < h; y++) 2493 for (y = 0; y < h; y++)
… …
2117 2497
2118 if (m) 2498 if (m)
2119 { 2499 {
2120 float *c = color [m & 15]; 2500 float *c = color [m & 15];
2121 2501
2122 float tx1 = m & 0x40 ? 0.5 : 0.; 2502 float tx1 = m & 0x40 ? 0.5f : 0.f;
2123 float tx2 = tx1 + 0.5; 2503 float tx2 = tx1 + 0.5f;
2124 2504
2125 glColor4f (c[0], c[1], c[2], 0.75); 2505 glColor4f (c[0], c[1], c[2], 1);
2126 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2506 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2127 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2507 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2128 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2508 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2129 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2509 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2130 } 2510 }
… …
2138void 2518void
2139fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2519fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2140 PPCODE: 2520 PPCODE:
2141{ 2521{
2142 int x, y; 2522 int x, y;
2143 int sw1 = sw + 2; 2523 int sw1 = sw + 2;
2144 int sh1 = sh + 2; 2524 int sh1 = sh + 2;
2145 int sh3 = sh * 3; 2525 int sh3 = sh * 3;
2146 int sw34 = (sw * 3 + 3) & ~3; 2526 int sw3 = sw * 3;
2147 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2527 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2148 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2528 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2149 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2529 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2150 2530
2151 SvPOK_only (darkness3_sv); 2531 SvPOK_only (darkness3_sv);
2152 SvCUR_set (darkness3_sv, sw34 * sh3); 2532 SvCUR_set (darkness3_sv, sw3 * sh3);
2153 2533
2154 mx += self->x - 1; 2534 mx += self->x - 1;
2155 my += self->y - 1; 2535 my += self->y - 1;
2156
2157 memset (darkness1, 255, sw1 * sh1);
2158 2536
2159 for (y = 0; y < sh1; y++) 2537 for (y = 0; y < sh1; y++)
2160 if (0 <= y + my && y + my < self->rows) 2538 if (0 <= y + my && y + my < self->rows)
2161 { 2539 {
2162 maprow *row = self->row + (y + my); 2540 maprow *row = self->row + (y + my);
… …
2165 if (row->c0 <= x + mx && x + mx < row->c1) 2543 if (row->c0 <= x + mx && x + mx < row->c1)
2166 { 2544 {
2167 mapcell *cell = row->col + (x + mx - row->c0); 2545 mapcell *cell = row->col + (x + mx - row->c0);
2168 2546
2169 darkness1 [y * sw1 + x] = cell->darkness 2547 darkness1 [y * sw1 + x] = cell->darkness
2170 ? 255 - (cell->darkness - 1) 2548 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2171 : 255 - FOW_DARKNESS; 2549 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2172 } 2550 }
2173 } 2551 }
2174 2552
2175 for (y = 0; y < sh; ++y) 2553 for (y = 0; y < sh; ++y)
2176 for (x = 0; x < sw; ++x) 2554 for (x = 0; x < sw; ++x)
… …
2195 2573
2196 uint8_t r13 = (d13 + d23 + d12) / 3; 2574 uint8_t r13 = (d13 + d23 + d12) / 3;
2197 uint8_t r23 = d23; 2575 uint8_t r23 = d23;
2198 uint8_t r33 = (d23 + d33 + d32) / 3; 2576 uint8_t r33 = (d23 + d33 + d32) / 3;
2199 2577
2200 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2578 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2201 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2579 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2202 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2580 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2203 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2581 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2204 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2582 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2205 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2583 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2206 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2584 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2207 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2585 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2208 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2586 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2209 } 2587 }
2210 2588
2211 free (darkness1); 2589 free (darkness1);
2212 2590
2213 EXTEND (SP, 3); 2591 EXTEND (SP, 3);
2214 PUSHs (sv_2mortal (newSViv (sw34))); 2592 PUSHs (sv_2mortal (newSViv (sw3)));
2215 PUSHs (sv_2mortal (newSViv (sh3))); 2593 PUSHs (sv_2mortal (newSViv (sh3)));
2216 PUSHs (darkness3_sv); 2594 PUSHs (darkness3_sv);
2217} 2595}
2218 2596
2219SV * 2597SV *
… …
2282 else 2660 else
2283 *data++ = 0; 2661 *data++ = 0;
2284 } 2662 }
2285 } 2663 }
2286 2664
2665 /* if size is w*h + 5 then no data has been found */
2666 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2667 {
2287 SvPOK_only (data_sv); 2668 SvPOK_only (data_sv);
2288 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2669 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2670 }
2671
2289 RETVAL = data_sv; 2672 RETVAL = data_sv;
2290} 2673}
2291 OUTPUT: 2674 OUTPUT:
2292 RETVAL 2675 RETVAL
2293 2676
2294void 2677void
2295set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2678set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2296 PPCODE: 2679 PPCODE:
2297{ 2680{
2298 int x, y, z; 2681 int x, y, z;
2299 int w, h; 2682 int w, h;
2300 int x1, y1; 2683 int x1, y1;
2684 STRLEN len;
2685 uint8_t *data, *end;
2686
2687 len = SvLEN (data_sv);
2688 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2689 data = SvPVbyte_nolen (data_sv);
2690 end = data + len + 8;
2691
2692 if (len < 5)
2693 XSRETURN_EMPTY;
2301 2694
2302 if (*data++ != 0) 2695 if (*data++ != 0)
2303 XSRETURN_EMPTY; /* version mismatch */ 2696 XSRETURN_EMPTY; /* version mismatch */
2304 2697
2305 w = *data++ << 8; w |= *data++; 2698 w = *data++ << 8; w |= *data++;
… …
2320 { 2713 {
2321 maprow *row = map_get_row (self, y); 2714 maprow *row = map_get_row (self, y);
2322 2715
2323 for (x = x0; x < x1; x++) 2716 for (x = x0; x < x1; x++)
2324 { 2717 {
2718 uint8_t flags;
2719
2720 if (data + 7 >= end)
2721 XSRETURN_EMPTY;
2722
2325 uint8_t flags = *data++; 2723 flags = *data++;
2326 2724
2327 if (flags) 2725 if (flags)
2328 { 2726 {
2329 mapcell *cell = row_get_cell (row, x); 2727 mapcell *cell = row_get_cell (row, x);
2330 tileid tile[3] = { 0, 0, 0 }; 2728 tileid tile[3] = { 0, 0, 0 };
… …
2333 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2731 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2334 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2732 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2335 2733
2336 if (cell->darkness == 0) 2734 if (cell->darkness == 0)
2337 { 2735 {
2338 cell->darkness = 0; 2736 /*cell->darkness = 0;*/
2737 EXTEND (SP, 3);
2339 2738
2340 for (z = 0; z <= 2; z++) 2739 for (z = 0; z <= 2; z++)
2341 { 2740 {
2342 tileid t = tile [z]; 2741 tileid t = tile [z];
2343 2742
2344 if (t >= self->texs || (t && !self->tex [t].name)) 2743 if (t >= self->texs || (t && !self->tex [t].name))
2345 { 2744 {
2346 XPUSHs (sv_2mortal (newSViv (t))); 2745 PUSHs (sv_2mortal (newSViv (t)));
2347 need_texid (self, t); 2746 need_texid (self, t);
2348 } 2747 }
2349 2748
2350 cell->tile [z] = t; 2749 cell->tile [z] = t;
2351 } 2750 }
… …
2455void 2854void
2456set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2855set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2457 CODE: 2856 CODE:
2458{ 2857{
2459 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2858 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2460 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2859 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2461 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2860 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2462} 2861}
2463 2862
2464void 2863void
2465set_reverse_stereo (DC::Channel self, int flip) 2864set_reverse_stereo (DC::Channel self, int flip)
… …
2568 } *civ, const_iv[] = { 2967 } *civ, const_iv[] = {
2569# define const_iv(name) { # name, (IV)name } 2968# define const_iv(name) { # name, (IV)name }
2570 const_iv (GL_VENDOR), 2969 const_iv (GL_VENDOR),
2571 const_iv (GL_VERSION), 2970 const_iv (GL_VERSION),
2572 const_iv (GL_EXTENSIONS), 2971 const_iv (GL_EXTENSIONS),
2972 const_iv (GL_MAX_TEXTURE_UNITS),
2573 const_iv (GL_COLOR_MATERIAL), 2973 const_iv (GL_COLOR_MATERIAL),
2574 const_iv (GL_SMOOTH), 2974 const_iv (GL_SMOOTH),
2575 const_iv (GL_FLAT), 2975 const_iv (GL_FLAT),
2576 const_iv (GL_DITHER), 2976 const_iv (GL_DITHER),
2577 const_iv (GL_BLEND), 2977 const_iv (GL_BLEND),
… …
2589 const_iv (GL_ZERO), 2989 const_iv (GL_ZERO),
2590 const_iv (GL_SRC_ALPHA), 2990 const_iv (GL_SRC_ALPHA),
2591 const_iv (GL_DST_ALPHA), 2991 const_iv (GL_DST_ALPHA),
2592 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2992 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2593 const_iv (GL_ONE_MINUS_DST_ALPHA), 2993 const_iv (GL_ONE_MINUS_DST_ALPHA),
2994 const_iv (GL_SRC_COLOR),
2995 const_iv (GL_DST_COLOR),
2996 const_iv (GL_ONE_MINUS_SRC_COLOR),
2997 const_iv (GL_ONE_MINUS_DST_COLOR),
2594 const_iv (GL_SRC_ALPHA_SATURATE), 2998 const_iv (GL_SRC_ALPHA_SATURATE),
2595 const_iv (GL_RGB), 2999 const_iv (GL_RGB),
2596 const_iv (GL_RGBA), 3000 const_iv (GL_RGBA),
2597 const_iv (GL_RGBA4), 3001 const_iv (GL_RGBA4),
2598 const_iv (GL_RGBA8), 3002 const_iv (GL_RGBA8),
… …
2666 const_iv (GL_NICEST), 3070 const_iv (GL_NICEST),
2667 const_iv (GL_V2F), 3071 const_iv (GL_V2F),
2668 const_iv (GL_V3F), 3072 const_iv (GL_V3F),
2669 const_iv (GL_T2F_V3F), 3073 const_iv (GL_T2F_V3F),
2670 const_iv (GL_T2F_N3F_V3F), 3074 const_iv (GL_T2F_N3F_V3F),
3075 const_iv (GL_FUNC_ADD),
3076 const_iv (GL_FUNC_SUBTRACT),
3077 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2671# undef const_iv 3078# undef const_iv
2672 }; 3079 };
2673 3080
2674 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3081 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2675 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3082 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2682disable_GL_EXT_blend_func_separate () 3089disable_GL_EXT_blend_func_separate ()
2683 CODE: 3090 CODE:
2684 gl.BlendFuncSeparate = 0; 3091 gl.BlendFuncSeparate = 0;
2685 gl.BlendFuncSeparateEXT = 0; 3092 gl.BlendFuncSeparateEXT = 0;
2686 3093
3094void
3095apple_nvidia_bug (int enable)
3096
2687char * 3097char *
2688gl_vendor () 3098gl_vendor ()
2689 CODE: 3099 CODE:
2690 RETVAL = (char *)glGetString (GL_VENDOR); 3100 RETVAL = (char *)glGetString (GL_VENDOR);
2691 OUTPUT: 3101 OUTPUT:
… …
2740 3150
2741void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3151void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2742 CODE: 3152 CODE:
2743 gl_BlendFuncSeparate (sa, da, saa, daa); 3153 gl_BlendFuncSeparate (sa, da, saa, daa);
2744 3154
3155# void glBlendEquation (int se)
3156
2745void glDepthMask (int flag) 3157void glDepthMask (int flag)
2746 3158
2747void glLogicOp (int opcode) 3159void glLogicOp (int opcode)
2748 3160
2749void glColorMask (int red, int green, int blue, int alpha) 3161void glColorMask (int red, int green, int blue, int alpha)
… …
2783void glRotate (float angle, float x, float y, float z) 3195void glRotate (float angle, float x, float y, float z)
2784 CODE: 3196 CODE:
2785 glRotatef (angle, x, y, z); 3197 glRotatef (angle, x, y, z);
2786 3198
2787void glColor (float r, float g, float b, float a = 1.0) 3199void glColor (float r, float g, float b, float a = 1.0)
3200 PROTOTYPE: @
2788 ALIAS: 3201 ALIAS:
2789 glColor_premultiply = 1 3202 glColor_premultiply = 1
2790 CODE: 3203 CODE:
2791 if (ix) 3204 if (ix)
2792 { 3205 {
… …
2897void glNewList (int list, int mode = GL_COMPILE) 3310void glNewList (int list, int mode = GL_COMPILE)
2898 3311
2899void glEndList () 3312void glEndList ()
2900 3313
2901void glCallList (int list) 3314void glCallList (int list)
3315
3316void c_init ()
3317 CODE:
3318 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3319 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
2902 3320
2903MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3321MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2904 3322
2905PROTOTYPES: DISABLE 3323PROTOTYPES: DISABLE
2906 3324

Diff Legend

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