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.297 by root, Tue Dec 22 00:08:11 2009 UTC

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

Diff Legend

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