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.296 by root, Mon Dec 21 23:52:34 2009 UTC

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

Diff Legend

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