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.256 by root, Mon Mar 24 00:24:46 2008 UTC vs.
Revision 1.295 by root, Mon Dec 21 03:30:22 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>
… …
38#include <SDL_thread.h> 37#include <SDL_thread.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>
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
43 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>
… …
65# include <netinet/in.h> 69# include <netinet/in.h>
66# include <netinet/tcp.h> 70# include <netinet/tcp.h>
67# include <inttypes.h> 71# include <inttypes.h>
68#endif 72#endif
69 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
70#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
71 84
72#define FOW_DARKNESS 32 85#define FOW_DARKNESS 64
86#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */
73 87
74#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
75#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
76 90
77#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
78 92
79/* mask out modifiers we are not interested in */ 93/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
81 95
82#if 0 96#define KMOD_LRAM 0x10000 // our extension
83# define PARACHUTE SDL_INIT_NOPARACHUTE 97
84#else 98#define TEXID_SPEECH 1
85# define PARACHUTE 0 99#define TEXID_NOFACE 2
86#endif 100#define TEXID_HIDDEN 3
87 101
88static AV *texture_av; 102static AV *texture_av;
89 103
90static struct 104static struct
91{ 105{
… …
185 199
186static void 200static void
187layout_update_font (DC__Layout self) 201layout_update_font (DC__Layout self)
188{ 202{
189 /* use a random scale factor to account for unknown descenders, 0.8 works 203 /* use a random scale factor to account for unknown descenders, 0.8 works
190 * reasonably well with bitstream vera 204 * reasonably well with dejavu/bistream fonts
191 */ 205 */
192 PangoFontDescription *font = self->font ? self->font : default_font; 206 PangoFontDescription *font = self->font ? self->font : default_font;
193 207
194 pango_font_description_set_absolute_size (font, 208 pango_font_description_set_absolute_size (font,
195 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 209 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
223 int w, h; 237 int w, h;
224 float s, t; 238 float s, t;
225 uint8_t r, g, b, a; 239 uint8_t r, g, b, a;
226 tileid smoothtile; 240 tileid smoothtile;
227 uint8_t smoothlevel; 241 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */
228} maptex; 243} maptex;
229 244
230typedef struct { 245typedef struct {
231 uint32_t player; 246 uint32_t player;
232 tileid tile[3]; 247 tileid tile[3];
… …
364 self->oy = 0; 379 self->oy = 0;
365 self->row = 0; 380 self->row = 0;
366 self->rows = 0; 381 self->rows = 0;
367} 382}
368 383
384#define CELL_CLEAR(cell) \
385 do { \
386 if ((cell)->player) \
387 (cell)->tile [2] = 0; \
388 (cell)->darkness = 0; \
389 (cell)->stat_hp = 0; \
390 (cell)->flags = 0; \
391 (cell)->player = 0; \
392 } while (0)
393
369static void 394static void
370map_blank (DC__Map self, int x0, int y0, int w, int h) 395map_blank (DC__Map self, int x0, int y0, int w, int h)
371{ 396{
372 int x, y; 397 int x, y;
373 maprow *row; 398 maprow *row;
… …
387 if (x >= row->c1) 412 if (x >= row->c1)
388 break; 413 break;
389 414
390 cell = row->col + x - row->c0; 415 cell = row->col + x - row->c0;
391 416
392 cell->darkness = 0; 417 CELL_CLEAR (cell);
393 cell->stat_hp = 0;
394 cell->flags = 0;
395 cell->player = 0;
396 } 418 }
397 } 419 }
398} 420}
399 421
400typedef struct { 422typedef struct {
… …
511 if (!svp || !SvTRUE (*svp)) 533 if (!svp || !SvTRUE (*svp))
512 return 0; 534 return 0;
513 535
514 return 1; 536 return 1;
515} 537}
538
539/******************************************************************************/
540
541/* process keyboard modifiers */
542static int
543mod_munge (int mod)
544{
545 mod &= MOD_MASK;
546
547 if (mod & (KMOD_META | KMOD_ALT))
548 mod |= KMOD_LRAM;
549
550 return mod;
551}
552
553static void
554deliantra_main ()
555{
556 char *argv[] = { 0 };
557 call_argv ("::main", G_DISCARD | G_VOID, argv);
558}
559
560#ifdef __MACOSX__
561 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main()
563 * on OS X, so... we provide one and call the original main(), which,
564 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
565 * and which calls our main (== SDL_main) back.
566 */
567 extern C_LINKAGE int
568 main (int argc, char *argv[])
569 {
570 deliantra_main ();
571 }
572
573 #undef main
574
575 extern C_LINKAGE int main (int argc, char *argv[]);
576
577 static void
578 SDL_braino (void)
579 {
580 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv);
582 }
583#else
584 static void
585 SDL_braino (void)
586 {
587 deliantra_main ();
588 }
589#endif
516 590
517MODULE = Deliantra::Client PACKAGE = DC 591MODULE = Deliantra::Client PACKAGE = DC
518 592
519PROTOTYPES: ENABLE 593PROTOTYPES: ENABLE
520 594
… …
549 const_iv (SDL_USEREVENT), 623 const_iv (SDL_USEREVENT),
550 624
551 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
552 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
553 const_iv (SDL_APPACTIVE), 627 const_iv (SDL_APPACTIVE),
628
629
630 const_iv (SDLK_UNKNOWN),
631 const_iv (SDLK_FIRST),
632 const_iv (SDLK_BACKSPACE),
633 const_iv (SDLK_TAB),
634 const_iv (SDLK_CLEAR),
635 const_iv (SDLK_RETURN),
636 const_iv (SDLK_PAUSE),
637 const_iv (SDLK_ESCAPE),
638 const_iv (SDLK_SPACE),
639 const_iv (SDLK_EXCLAIM),
640 const_iv (SDLK_QUOTEDBL),
641 const_iv (SDLK_HASH),
642 const_iv (SDLK_DOLLAR),
643 const_iv (SDLK_AMPERSAND),
644 const_iv (SDLK_QUOTE),
645 const_iv (SDLK_LEFTPAREN),
646 const_iv (SDLK_RIGHTPAREN),
647 const_iv (SDLK_ASTERISK),
648 const_iv (SDLK_PLUS),
649 const_iv (SDLK_COMMA),
650 const_iv (SDLK_MINUS),
651 const_iv (SDLK_PERIOD),
652 const_iv (SDLK_SLASH),
653 const_iv (SDLK_0),
654 const_iv (SDLK_1),
655 const_iv (SDLK_2),
656 const_iv (SDLK_3),
657 const_iv (SDLK_4),
658 const_iv (SDLK_5),
659 const_iv (SDLK_6),
660 const_iv (SDLK_7),
661 const_iv (SDLK_8),
662 const_iv (SDLK_9),
663 const_iv (SDLK_COLON),
664 const_iv (SDLK_SEMICOLON),
665 const_iv (SDLK_LESS),
666 const_iv (SDLK_EQUALS),
667 const_iv (SDLK_GREATER),
668 const_iv (SDLK_QUESTION),
669 const_iv (SDLK_AT),
670
671 const_iv (SDLK_LEFTBRACKET),
672 const_iv (SDLK_BACKSLASH),
673 const_iv (SDLK_RIGHTBRACKET),
674 const_iv (SDLK_CARET),
675 const_iv (SDLK_UNDERSCORE),
676 const_iv (SDLK_BACKQUOTE),
677 const_iv (SDLK_DELETE),
554 678
555 const_iv (SDLK_FIRST), 679 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST), 680 const_iv (SDLK_LAST),
557 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
558 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
… …
634 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
635 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
636 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
637 const_iv (KMOD_MODE), 761 const_iv (KMOD_MODE),
638 762
763 const_iv (KMOD_LRAM),
764
639 const_iv (MIX_DEFAULT_FORMAT), 765 const_iv (MIX_DEFAULT_FORMAT),
766
767 const_iv (SDL_INIT_TIMER),
768 const_iv (SDL_INIT_AUDIO),
769 const_iv (SDL_INIT_VIDEO),
770 const_iv (SDL_INIT_CDROM),
771 const_iv (SDL_INIT_JOYSTICK),
772 const_iv (SDL_INIT_EVERYTHING),
773 const_iv (SDL_INIT_NOPARACHUTE),
774 const_iv (SDL_INIT_EVENTTHREAD),
775
776 const_iv (SDL_GL_RED_SIZE),
777 const_iv (SDL_GL_GREEN_SIZE),
778 const_iv (SDL_GL_BLUE_SIZE),
779 const_iv (SDL_GL_ALPHA_SIZE),
780 const_iv (SDL_GL_DOUBLEBUFFER),
781 const_iv (SDL_GL_BUFFER_SIZE),
782 const_iv (SDL_GL_DEPTH_SIZE),
783 const_iv (SDL_GL_STENCIL_SIZE),
784 const_iv (SDL_GL_ACCUM_RED_SIZE),
785 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
786 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
787 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
788 const_iv (SDL_GL_STEREO),
789 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
790 const_iv (SDL_GL_MULTISAMPLESAMPLES),
791 const_iv (SDL_GL_ACCELERATED_VISUAL),
792 const_iv (SDL_GL_SWAP_CONTROL),
793
794 const_iv (FOW_DARKNESS)
640# undef const_iv 795# undef const_iv
641 }; 796 };
642 797
643 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 798 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
666 821
667IV minpot (UV n) 822IV minpot (UV n)
668 823
669IV popcount (UV n) 824IV popcount (UV n)
670 825
826NV distance (NV dx, NV dy)
827 CODE:
828 RETVAL = pow (dx * dx + dy * dy, 0.5);
829 OUTPUT:
830 RETVAL
831
671void 832void
672pango_init () 833pango_init ()
673 CODE: 834 CODE:
674{ 835{
675 opengl_fontmap = pango_opengl_font_map_new (); 836 opengl_fontmap = pango_opengl_font_map_new ();
676 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 837 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
677 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 838 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
839 /*pango_context_set_font_description (opengl_context, default_font);*/
678#if PANGO_VERSION_CHECK (1, 15, 2) 840#if PANGO_VERSION_CHECK (1, 15, 2)
679 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 841 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
680 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 842 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
681#endif 843#endif
682} 844}
683 845
684char *
685SDL_GetError () 846char *SDL_GetError ()
686 847
687int 848void SDL_braino ()
688SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
689 849
690void 850int SDL_Init (U32 flags)
851
852int SDL_InitSubSystem (U32 flags)
853
854void SDL_QuitSubSystem (U32 flags)
855
691SDL_Quit () 856void SDL_Quit ()
857
858int SDL_GL_SetAttribute (int attr, int value)
859
860int SDL_GL_GetAttribute (int attr)
861 CODE:
862 if (SDL_GL_GetAttribute (attr, &RETVAL))
863 XSRETURN_UNDEF;
864 OUTPUT:
865 RETVAL
692 866
693void 867void
694SDL_ListModes (int rgb, int alpha) 868SDL_ListModes (int rgb, int alpha)
695 PPCODE: 869 PPCODE:
696{ 870{
… …
708 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 882 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
709 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 883 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
710 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 884 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
711 885
712 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 886 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
713#if SDL_VERSION_ATLEAST(1,2,10)
714 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
715 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 887 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
716#endif
717 888
718 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 889 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
719 890
720 if (m && m != (SDL_Rect **)-1) 891 if (m && m != (SDL_Rect **)-1)
721 while (*m) 892 while (*m)
722 { 893 {
723 if ((*m)->w >= 800 && (*m)->h >= 480) 894 if ((*m)->w >= 400 && (*m)->h >= 300)
724 { 895 {
725 AV *av = newAV (); 896 AV *av = newAV ();
726 av_push (av, newSViv ((*m)->w)); 897 av_push (av, newSViv ((*m)->w));
727 av_push (av, newSViv ((*m)->h)); 898 av_push (av, newSViv ((*m)->h));
728 av_push (av, newSViv (rgb)); 899 av_push (av, newSViv (rgb));
… …
791 { 962 {
792 case SDL_KEYDOWN: 963 case SDL_KEYDOWN:
793 case SDL_KEYUP: 964 case SDL_KEYUP:
794 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 965 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
795 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 966 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
796 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 967 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
797 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 968 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
798 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 969 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
799 break; 970 break;
800 971
801 case SDL_ACTIVEEVENT: 972 case SDL_ACTIVEEVENT:
802 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 973 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
820 x = ev.motion.x; 991 x = ev.motion.x;
821 y = ev.motion.y; 992 y = ev.motion.y;
822 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 993 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
823 } 994 }
824 995
825 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 996 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
826 hv_store (hv, "state", 5, newSViv (state), 0); 997 hv_store (hv, "state", 5, newSViv (state), 0);
827 hv_store (hv, "x", 1, newSViv (x), 0); 998 hv_store (hv, "x", 1, newSViv (x), 0);
828 hv_store (hv, "y", 1, newSViv (y), 0); 999 hv_store (hv, "y", 1, newSViv (y), 0);
829 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1000 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
830 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1001 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
915 } 1086 }
916 } 1087 }
917#endif 1088#endif
918} 1089}
919 1090
920void 1091int
921add_font (char *file) 1092add_font (char *file)
922 CODE: 1093 CODE:
923 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1094 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1095 OUTPUT:
1096 RETVAL
924 1097
925void 1098void
926load_image_inline (SV *image_) 1099load_image_inline (SV *image_)
927 ALIAS: 1100 ALIAS:
928 load_image_file = 1 1101 load_image_file = 1
… …
1044#if DEBUG 1217#if DEBUG
1045 VALGRIND_DO_LEAK_CHECK; 1218 VALGRIND_DO_LEAK_CHECK;
1046#endif 1219#endif
1047} 1220}
1048 1221
1222int
1223SvREFCNT (SV *sv)
1224 CODE:
1225 RETVAL = SvREFCNT (sv);
1226 OUTPUT:
1227 RETVAL
1228
1049MODULE = Deliantra::Client PACKAGE = DC::Font 1229MODULE = Deliantra::Client PACKAGE = DC::Font
1050 1230
1051PROTOTYPES: DISABLE 1231PROTOTYPES: DISABLE
1052 1232
1053DC::Font 1233DC::Font
… …
1482 if (ix) 1662 if (ix)
1483 { 1663 {
1484 glDisable (GL_ALPHA_TEST); 1664 glDisable (GL_ALPHA_TEST);
1485 glDisable (GL_BLEND); 1665 glDisable (GL_BLEND);
1486 } 1666 }
1667}
1668
1669void
1670draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f)
1671 PROTOTYPE: @
1672 CODE:
1673{
1674 glEnable (GL_TEXTURE_2D);
1675 glEnable (GL_BLEND);
1676 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1677 glBindTexture (GL_TEXTURE_2D, name1);
1678
1679 glColor3f (intensity, intensity, intensity);
1680 glPushMatrix ();
1681 glScalef (1./3, 1./3, 1.);
1682
1683 if (blend > 0.f)
1684 {
1685 float S2, T2; /* 0. 0. for texture 2 */
1686 float w = w1 > w2 ? w1 : w2;
1687 float h = h1 > h2 ? h1 : h2;
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 s1 *= w / w1;
1719 t1 *= h / h1;
1720
1721 dx *= -3.f / w2;
1722 dy *= -3.f / h2;
1723 dx *= w / w2;
1724 dy *= h / h2;
1725
1726 s2 *= w / w2;
1727 t2 *= h / h2;
1728
1729 glBegin (GL_QUADS);
1730 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0);
1731 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1);
1732 gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1);
1733 gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0);
1734 glEnd ();
1735
1736 glDisable (GL_TEXTURE_2D);
1737 gl.ActiveTexture (GL_TEXTURE0);
1738 }
1739 else
1740 {
1741 /* simple blending of one texture, also opengl <1.3 path */
1742 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1743
1744 glBegin (GL_QUADS);
1745 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);
1746 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);
1747 glTexCoord2f (s1, t1); glVertex2f (w1, h1);
1748 glTexCoord2f (s1, 0); glVertex2f (w1, 0);
1749 glEnd ();
1750 }
1751
1752 glPopMatrix ();
1753
1754 glDisable (GL_TEXTURE_2D);
1755 glDisable (GL_BLEND);
1487} 1756}
1488 1757
1489IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1758IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1490 CODE: 1759 CODE:
1491{ 1760{
… …
1597 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1866 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1598 // use uglier nearest interpolation because linear suffers 1867 // use uglier nearest interpolation because linear suffers
1599 // from transparent color bleeding and ugly wrapping effects. 1868 // from transparent color bleeding and ugly wrapping effects.
1600 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1869 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1601} 1870}
1871
1872void
1873expire_textures (DC::Map self, int texid, int count)
1874 PPCODE:
1875 for (; texid < self->texs && count; ++texid, --count)
1876 {
1877 maptex *tex = self->tex + texid;
1878
1879 if (tex->name)
1880 {
1881 if (tex->unused)
1882 {
1883 tex->name = 0;
1884 tex->unused = 0;
1885 XPUSHs (sv_2mortal (newSViv (texid)));
1886 }
1887 else
1888 tex->unused = 1;
1889 }
1890 }
1602 1891
1603int 1892int
1604ox (DC::Map self) 1893ox (DC::Map self)
1605 ALIAS: 1894 ALIAS:
1606 oy = 1 1895 oy = 1
… …
1684 uint8_t ext, cmd; 1973 uint8_t ext, cmd;
1685 1974
1686 do 1975 do
1687 { 1976 {
1688 ext = *data++; 1977 ext = *data++;
1689 cmd = ext & 0x3f; 1978 cmd = ext & 0x7f;
1690 1979
1691 if (cmd < 4) 1980 if (cmd < 4)
1692 cell->darkness = 255 - ext * 64 + 1; 1981 cell->darkness = 255 - ext * 64 + 1;
1693 else if (cmd == 5) // health 1982 else if (cmd == 5) // health
1694 { 1983 {
… …
1697 } 1986 }
1698 else if (cmd == 6) // monster width 1987 else if (cmd == 6) // monster width
1699 cell->stat_width = *data++ + 1; 1988 cell->stat_width = *data++ + 1;
1700 else if (cmd == 0x47) 1989 else if (cmd == 0x47)
1701 { 1990 {
1702 if (*data == 4) 1991 if (*data == 1) cell->player = data [1];
1703 ; // decode player count 1992 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1993 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1994 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1704 1995
1705 data += *data + 1; 1996 data += *data + 1;
1706 } 1997 }
1707 else if (cmd == 8) // cell flags 1998 else if (cmd == 8) // cell flags
1708 cell->flags = *data++; 1999 cell->flags = *data++;
… …
1725 cell->tile [z] = self->face2tile [face]; 2016 cell->tile [z] = self->face2tile [face];
1726 2017
1727 if (cell->tile [z]) 2018 if (cell->tile [z])
1728 { 2019 {
1729 maptex *tex = self->tex + cell->tile [z]; 2020 maptex *tex = self->tex + cell->tile [z];
2021 tex->unused = 0;
1730 if (!tex->name) 2022 if (!tex->name)
1731 av_push (missing, newSViv (cell->tile [z])); 2023 av_push (missing, newSViv (cell->tile [z]));
1732 2024
1733 if (tex->smoothtile) 2025 if (tex->smoothtile)
1734 { 2026 {
1735 maptex *smooth = self->tex + tex->smoothtile; 2027 maptex *smooth = self->tex + tex->smoothtile;
2028 smooth->unused = 0;
1736 if (!smooth->name) 2029 if (!smooth->name)
1737 av_push (missing, newSViv (tex->smoothtile)); 2030 av_push (missing, newSViv (tex->smoothtile));
1738 } 2031 }
1739 } 2032 }
1740 } 2033 }
1741 } 2034 }
1742 else 2035 else
1743 cell->darkness = 0; 2036 CELL_CLEAR (cell);
1744 } 2037 }
1745} 2038}
1746 OUTPUT: 2039 OUTPUT:
1747 RETVAL 2040 RETVAL
1748 2041
… …
1800} 2093}
1801 OUTPUT: 2094 OUTPUT:
1802 RETVAL 2095 RETVAL
1803 2096
1804void 2097void
1805draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2098draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1806 CODE: 2099 CODE:
1807{ 2100{
1808 int x, y, z; 2101 int x, y, z;
1809 2102
1810 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2103 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1811 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2104 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1812 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2105 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1813 smooth_key skey; 2106 smooth_key skey;
1814 2107 int pl_x, pl_y;
2108 maptex pl_tex;
1815 rc_t *rc = rc_alloc (); 2109 rc_t *rc = rc_alloc ();
2110 rc_t *rc_ov = rc_alloc ();
1816 rc_key_t key; 2111 rc_key_t key;
1817 rc_array_t *arr; 2112 rc_array_t *arr, *arr_hidden;
1818 2113
2114 pl_tex.name = 0;
2115
1819 // thats current max. sorry. 2116 // that's current max. sorry.
1820 if (sw > 255) sw = 255; 2117 if (sw > 255) sw = 255;
1821 if (sh > 255) sh = 255; 2118 if (sh > 255) sh = 255;
1822 2119
1823 // clear key, in case of extra padding 2120 // clear key, in case of extra padding
1824 memset (&skey, 0, sizeof (skey)); 2121 memset (&skey, 0, sizeof (skey));
… …
1828 key.g = 255; 2125 key.g = 255;
1829 key.b = 255; 2126 key.b = 255;
1830 key.a = 255; 2127 key.a = 255;
1831 key.mode = GL_QUADS; 2128 key.mode = GL_QUADS;
1832 key.format = GL_T2F_V3F; 2129 key.format = GL_T2F_V3F;
1833 key.texname = -1;
1834 2130
1835 mx += self->x; 2131 mx += self->x;
1836 my += self->y; 2132 my += self->y;
1837 2133
1838 // first pass: determine smooth_max 2134 // first pass: determine smooth_max
… …
1859 2155
1860 glEnable (GL_BLEND); 2156 glEnable (GL_BLEND);
1861 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2157 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1862 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2158 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1863 2159
2160 key.texname = self->tex [TEXID_HIDDEN].name;
2161 arr_hidden = rc_array (rc_ov, &key);
2162
1864 for (z = 0; z <= 2; z++) 2163 for (z = 0; z <= 2; z++)
1865 { 2164 {
1866 memset (smooth_level, 0, sizeof (smooth_level)); 2165 memset (smooth_level, 0, sizeof (smooth_level));
2166 key.texname = -1;
1867 2167
1868 for (y = 0; y < sh; y++) 2168 for (y = 0; y < sh; y++)
1869 if (0 <= y + my && y + my < self->rows) 2169 if (0 <= y + my && y + my < self->rows)
1870 { 2170 {
1871 maprow *row = self->row + (y + my); 2171 maprow *row = self->row + (y + my);
… …
1881 maptex tex = self->tex [tile]; 2181 maptex tex = self->tex [tile];
1882 int px, py; 2182 int px, py;
1883 2183
1884 if (key.texname != tex.name) 2184 if (key.texname != tex.name)
1885 { 2185 {
2186 self->tex [tile].unused = 0;
2187
1886 if (!tex.name) 2188 if (!tex.name)
1887 tex = self->tex [2]; /* missing, replace by noface */ 2189 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1888 2190
1889 key.texname = tex.name; 2191 key.texname = tex.name;
1890 arr = rc_array (rc, &key); 2192 arr = rc_array (rc, &key);
1891 } 2193 }
1892 2194
1893 px = (x + 1) * T - tex.w; 2195 px = (x + 1) * T - tex.w;
1894 py = (y + 1) * T - tex.h; 2196 py = (y + 1) * T - tex.h;
2197
2198 if (expect_false (cell->player == player) && expect_false (z == 2))
2199 {
2200 pl_x = px;
2201 pl_y = py;
2202 pl_tex = tex;
2203 continue;
2204 }
1895 2205
1896 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2206 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1897 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2207 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1898 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2208 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1899 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2209 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1900
1901 if (cell->flags && z == 2)
1902 {
1903 // overlays such as the speech bubble, probably more to come
1904 if (cell->flags & 1)
1905 {
1906 maptex tex = self->tex [1];
1907 int px = x * T + T * 2 / 32;
1908 int py = y * T - T * 6 / 32;
1909
1910 if (tex.name)
1911 {
1912 if (key.texname != tex.name)
1913 {
1914 key.texname = tex.name;
1915 arr = rc_array (rc, &key);
1916 }
1917
1918 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1919 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1920 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1921 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1922 }
1923 }
1924 }
1925 2210
1926 // update smooth hash 2211 // update smooth hash
1927 if (tex.smoothtile) 2212 if (tex.smoothtile)
1928 { 2213 {
1929 skey.tile = tex.smoothtile; 2214 skey.tile = tex.smoothtile;
… …
1958 // corners 2243 // corners
1959 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2244 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1960 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2245 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1961 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2246 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1962 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2247 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2248 }
2249 }
2250
2251 if (expect_false (z == 2))
2252 {
2253 /* draw question marks on top of hidden spaces */
2254 if (!cell->darkness)
2255 {
2256 maptex tex = self->tex [TEXID_HIDDEN];
2257 int px = (x + 1) * T - tex.w;
2258 int py = (y + 1) * T - tex.h;
2259
2260 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2261 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2262 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2263 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2264 }
2265
2266 if (expect_false (cell->flags))
2267 {
2268 // overlays such as the speech bubble, probably more to come
2269 if (cell->flags & 1)
2270 {
2271 rc_key_t key_ov = key;
2272 maptex tex = self->tex [TEXID_SPEECH];
2273 rc_array_t *arr;
2274 int px = x * T + T * 2 / 32;
2275 int py = y * T - T * 6 / 32;
2276
2277 key_ov.texname = tex.name;
2278 arr = rc_array (rc_ov, &key_ov);
2279
2280 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2281 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2282 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2283 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2284 }
1963 } 2285 }
1964 } 2286 }
1965 } 2287 }
1966 } 2288 }
1967 2289
… …
2007 { 2329 {
2008 // this time avoiding texture state changes 2330 // this time avoiding texture state changes
2009 // save gobs of state changes. 2331 // save gobs of state changes.
2010 if (key.texname != tex.name) 2332 if (key.texname != tex.name)
2011 { 2333 {
2334 self->tex [skey->tile].unused = 0;
2335
2012 glEnd (); 2336 glEnd ();
2013 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2337 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2014 glBegin (GL_QUADS); 2338 glBegin (GL_QUADS);
2015 } 2339 }
2016 2340
… …
2045 } 2369 }
2046 2370
2047 hv_clear (smooth); 2371 hv_clear (smooth);
2048 } 2372 }
2049 2373
2374 if (pl_tex.name)
2375 {
2376 maptex tex = pl_tex;
2377 int px = pl_x + sdx;
2378 int py = pl_y + sdy;
2379
2380 key.texname = tex.name;
2381 arr = rc_array (rc, &key);
2382
2383 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2384 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2385 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2386 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2387
2388 rc_draw (rc);
2389 }
2390
2391 rc_draw (rc_ov);
2392 rc_clear (rc_ov);
2393
2050 glDisable (GL_BLEND); 2394 glDisable (GL_BLEND);
2051 rc_free (rc); 2395 rc_free (rc);
2396 rc_free (rc_ov);
2052 2397
2053 // top layer: overlays such as the health bar 2398 // top layer: overlays such as the health bar
2054 for (y = 0; y < sh; y++) 2399 for (y = 0; y < sh; y++)
2055 if (0 <= y + my && y + my < self->rows) 2400 if (0 <= y + my && y + my < self->rows)
2056 { 2401 {
… …
2061 { 2406 {
2062 mapcell *cell = row->col + (x + mx - row->c0); 2407 mapcell *cell = row->col + (x + mx - row->c0);
2063 2408
2064 int px = x * T; 2409 int px = x * T;
2065 int py = y * T; 2410 int py = y * T;
2411
2412 if (expect_false (cell->player == player))
2413 {
2414 px += sdx;
2415 py += sdy;
2416 }
2066 2417
2067 if (cell->stat_hp) 2418 if (cell->stat_hp)
2068 { 2419 {
2069 int width = cell->stat_width * T; 2420 int width = cell->stat_width * T;
2070 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2421 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2081 } 2432 }
2082 } 2433 }
2083} 2434}
2084 2435
2085void 2436void
2086draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2437draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2087 CODE: 2438 CODE:
2088{ 2439{
2089 static float color[16][3] = { 2440 static float color[16][3] = {
2090 { 0.00F, 0.00F, 0.00F }, 2441 { 0.00f, 0.00f, 0.00f },
2091 { 1.00F, 1.00F, 1.00F }, 2442 { 1.00f, 1.00f, 1.00f },
2092 { 0.00F, 0.00F, 0.55F }, 2443 { 0.00f, 0.00f, 0.55f },
2093 { 1.00F, 0.00F, 0.00F }, 2444 { 1.00f, 0.00f, 0.00f },
2094 2445
2095 { 1.00F, 0.54F, 0.00F }, 2446 { 1.00f, 0.54f, 0.00f },
2096 { 0.11F, 0.56F, 1.00F }, 2447 { 0.11f, 0.56f, 1.00f },
2097 { 0.93F, 0.46F, 0.00F }, 2448 { 0.93f, 0.46f, 0.00f },
2098 { 0.18F, 0.54F, 0.34F }, 2449 { 0.18f, 0.54f, 0.34f },
2099 2450
2100 { 0.56F, 0.73F, 0.56F }, 2451 { 0.56f, 0.73f, 0.56f },
2101 { 0.80F, 0.80F, 0.80F }, 2452 { 0.80f, 0.80f, 0.80f },
2102 { 0.55F, 0.41F, 0.13F }, 2453 { 0.55f, 0.41f, 0.13f },
2103 { 0.99F, 0.77F, 0.26F }, 2454 { 0.99f, 0.77f, 0.26f },
2104 2455
2105 { 0.74F, 0.65F, 0.41F }, 2456 { 0.74f, 0.65f, 0.41f },
2106 2457
2107 { 0.00F, 1.00F, 1.00F }, 2458 { 0.00f, 1.00f, 1.00f },
2108 { 1.00F, 0.00F, 1.00F }, 2459 { 1.00f, 0.00f, 1.00f },
2109 { 1.00F, 1.00F, 0.00F }, 2460 { 1.00f, 1.00f, 0.00f },
2110 }; 2461 };
2111 2462
2112 int x, y; 2463 int x, y;
2113 2464
2114 glEnable (GL_TEXTURE_2D); 2465 glEnable (GL_TEXTURE_2D);
2466 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2467 * but the nvidia driver (185.18.14) mishandles alpha textures
2468 * ansd takes the colour from god knows where instead of using
2469 * Cp. MODULATE results in the same colour, but slightly different
2470 * alpha, but atcually gives us the correct colour with nvidia.
2471 */
2115 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2472 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2116 glEnable (GL_BLEND); 2473 glEnable (GL_BLEND);
2117 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2474 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2118 glBegin (GL_QUADS); 2475 glBegin (GL_QUADS);
2119 2476
2120 for (y = 0; y < h; y++) 2477 for (y = 0; y < h; y++)
… …
2124 2481
2125 if (m) 2482 if (m)
2126 { 2483 {
2127 float *c = color [m & 15]; 2484 float *c = color [m & 15];
2128 2485
2129 float tx1 = m & 0x40 ? 0.5 : 0.; 2486 float tx1 = m & 0x40 ? 0.5f : 0.f;
2130 float tx2 = tx1 + 0.5; 2487 float tx2 = tx1 + 0.5f;
2131 2488
2132 glColor4f (c[0], c[1], c[2], 0.75); 2489 glColor4f (c[0], c[1], c[2], 1);
2133 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2490 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2134 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2491 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2135 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2492 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2136 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2493 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2137 } 2494 }
… …
2159 SvCUR_set (darkness3_sv, sw34 * sh3); 2516 SvCUR_set (darkness3_sv, sw34 * sh3);
2160 2517
2161 mx += self->x - 1; 2518 mx += self->x - 1;
2162 my += self->y - 1; 2519 my += self->y - 1;
2163 2520
2164 memset (darkness1, 255, sw1 * sh1); 2521 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2165 2522
2166 for (y = 0; y < sh1; y++) 2523 for (y = 0; y < sh1; y++)
2167 if (0 <= y + my && y + my < self->rows) 2524 if (0 <= y + my && y + my < self->rows)
2168 { 2525 {
2169 maprow *row = self->row + (y + my); 2526 maprow *row = self->row + (y + my);
… …
2172 if (row->c0 <= x + mx && x + mx < row->c1) 2529 if (row->c0 <= x + mx && x + mx < row->c1)
2173 { 2530 {
2174 mapcell *cell = row->col + (x + mx - row->c0); 2531 mapcell *cell = row->col + (x + mx - row->c0);
2175 2532
2176 darkness1 [y * sw1 + x] = cell->darkness 2533 darkness1 [y * sw1 + x] = cell->darkness
2177 ? 255 - (cell->darkness - 1) 2534 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2178 : 255 - FOW_DARKNESS; 2535 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2179 } 2536 }
2180 } 2537 }
2181 2538
2182 for (y = 0; y < sh; ++y) 2539 for (y = 0; y < sh; ++y)
2183 for (x = 0; x < sw; ++x) 2540 for (x = 0; x < sw; ++x)
… …
2289 else 2646 else
2290 *data++ = 0; 2647 *data++ = 0;
2291 } 2648 }
2292 } 2649 }
2293 2650
2651 /* if size is w*h + 5 then no data has been found */
2652 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2653 {
2294 SvPOK_only (data_sv); 2654 SvPOK_only (data_sv);
2295 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2655 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2656 }
2657
2296 RETVAL = data_sv; 2658 RETVAL = data_sv;
2297} 2659}
2298 OUTPUT: 2660 OUTPUT:
2299 RETVAL 2661 RETVAL
2300 2662
2301void 2663void
2302set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2664set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2303 PPCODE: 2665 PPCODE:
2304{ 2666{
2305 int x, y, z; 2667 int x, y, z;
2306 int w, h; 2668 int w, h;
2307 int x1, y1; 2669 int x1, y1;
2670 STRLEN len;
2671 uint8_t *data, *end;
2672
2673 len = SvLEN (data_sv);
2674 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2675 data = SvPVbyte_nolen (data_sv);
2676 end = data + len + 8;
2677
2678 if (len < 5)
2679 XSRETURN_EMPTY;
2308 2680
2309 if (*data++ != 0) 2681 if (*data++ != 0)
2310 XSRETURN_EMPTY; /* version mismatch */ 2682 XSRETURN_EMPTY; /* version mismatch */
2311 2683
2312 w = *data++ << 8; w |= *data++; 2684 w = *data++ << 8; w |= *data++;
… …
2327 { 2699 {
2328 maprow *row = map_get_row (self, y); 2700 maprow *row = map_get_row (self, y);
2329 2701
2330 for (x = x0; x < x1; x++) 2702 for (x = x0; x < x1; x++)
2331 { 2703 {
2704 uint8_t flags;
2705
2706 if (data + 7 >= end)
2707 XSRETURN_EMPTY;
2708
2332 uint8_t flags = *data++; 2709 flags = *data++;
2333 2710
2334 if (flags) 2711 if (flags)
2335 { 2712 {
2336 mapcell *cell = row_get_cell (row, x); 2713 mapcell *cell = row_get_cell (row, x);
2337 tileid tile[3] = { 0, 0, 0 }; 2714 tileid tile[3] = { 0, 0, 0 };
… …
2340 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2717 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2341 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2718 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2342 2719
2343 if (cell->darkness == 0) 2720 if (cell->darkness == 0)
2344 { 2721 {
2345 cell->darkness = 0; 2722 /*cell->darkness = 0;*/
2723 EXTEND (SP, 3);
2346 2724
2347 for (z = 0; z <= 2; z++) 2725 for (z = 0; z <= 2; z++)
2348 { 2726 {
2349 tileid t = tile [z]; 2727 tileid t = tile [z];
2350 2728
2351 if (t >= self->texs || (t && !self->tex [t].name)) 2729 if (t >= self->texs || (t && !self->tex [t].name))
2352 { 2730 {
2353 XPUSHs (sv_2mortal (newSViv (t))); 2731 PUSHs (sv_2mortal (newSViv (t)));
2354 need_texid (self, t); 2732 need_texid (self, t);
2355 } 2733 }
2356 2734
2357 cell->tile [z] = t; 2735 cell->tile [z] = t;
2358 } 2736 }
… …
2462void 2840void
2463set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2841set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2464 CODE: 2842 CODE:
2465{ 2843{
2466 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2844 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2467 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2845 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2468 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2846 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2469} 2847}
2470 2848
2471void 2849void
2472set_reverse_stereo (DC::Channel self, int flip) 2850set_reverse_stereo (DC::Channel self, int flip)
… …
2575 } *civ, const_iv[] = { 2953 } *civ, const_iv[] = {
2576# define const_iv(name) { # name, (IV)name } 2954# define const_iv(name) { # name, (IV)name }
2577 const_iv (GL_VENDOR), 2955 const_iv (GL_VENDOR),
2578 const_iv (GL_VERSION), 2956 const_iv (GL_VERSION),
2579 const_iv (GL_EXTENSIONS), 2957 const_iv (GL_EXTENSIONS),
2958 const_iv (GL_MAX_TEXTURE_UNITS),
2580 const_iv (GL_COLOR_MATERIAL), 2959 const_iv (GL_COLOR_MATERIAL),
2581 const_iv (GL_SMOOTH), 2960 const_iv (GL_SMOOTH),
2582 const_iv (GL_FLAT), 2961 const_iv (GL_FLAT),
2583 const_iv (GL_DITHER), 2962 const_iv (GL_DITHER),
2584 const_iv (GL_BLEND), 2963 const_iv (GL_BLEND),
… …
2596 const_iv (GL_ZERO), 2975 const_iv (GL_ZERO),
2597 const_iv (GL_SRC_ALPHA), 2976 const_iv (GL_SRC_ALPHA),
2598 const_iv (GL_DST_ALPHA), 2977 const_iv (GL_DST_ALPHA),
2599 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2978 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2600 const_iv (GL_ONE_MINUS_DST_ALPHA), 2979 const_iv (GL_ONE_MINUS_DST_ALPHA),
2980 const_iv (GL_SRC_COLOR),
2981 const_iv (GL_DST_COLOR),
2982 const_iv (GL_ONE_MINUS_SRC_COLOR),
2983 const_iv (GL_ONE_MINUS_DST_COLOR),
2601 const_iv (GL_SRC_ALPHA_SATURATE), 2984 const_iv (GL_SRC_ALPHA_SATURATE),
2602 const_iv (GL_RGB), 2985 const_iv (GL_RGB),
2603 const_iv (GL_RGBA), 2986 const_iv (GL_RGBA),
2604 const_iv (GL_RGBA4), 2987 const_iv (GL_RGBA4),
2605 const_iv (GL_RGBA8), 2988 const_iv (GL_RGBA8),
… …
2673 const_iv (GL_NICEST), 3056 const_iv (GL_NICEST),
2674 const_iv (GL_V2F), 3057 const_iv (GL_V2F),
2675 const_iv (GL_V3F), 3058 const_iv (GL_V3F),
2676 const_iv (GL_T2F_V3F), 3059 const_iv (GL_T2F_V3F),
2677 const_iv (GL_T2F_N3F_V3F), 3060 const_iv (GL_T2F_N3F_V3F),
3061 const_iv (GL_FUNC_ADD),
3062 const_iv (GL_FUNC_SUBTRACT),
3063 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2678# undef const_iv 3064# undef const_iv
2679 }; 3065 };
2680 3066
2681 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3067 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2682 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3068 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2689disable_GL_EXT_blend_func_separate () 3075disable_GL_EXT_blend_func_separate ()
2690 CODE: 3076 CODE:
2691 gl.BlendFuncSeparate = 0; 3077 gl.BlendFuncSeparate = 0;
2692 gl.BlendFuncSeparateEXT = 0; 3078 gl.BlendFuncSeparateEXT = 0;
2693 3079
3080void
3081apple_nvidia_bug (int enable)
3082
2694char * 3083char *
2695gl_vendor () 3084gl_vendor ()
2696 CODE: 3085 CODE:
2697 RETVAL = (char *)glGetString (GL_VENDOR); 3086 RETVAL = (char *)glGetString (GL_VENDOR);
2698 OUTPUT: 3087 OUTPUT:
… …
2747 3136
2748void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3137void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2749 CODE: 3138 CODE:
2750 gl_BlendFuncSeparate (sa, da, saa, daa); 3139 gl_BlendFuncSeparate (sa, da, saa, daa);
2751 3140
3141# void glBlendEquation (int se)
3142
2752void glDepthMask (int flag) 3143void glDepthMask (int flag)
2753 3144
2754void glLogicOp (int opcode) 3145void glLogicOp (int opcode)
2755 3146
2756void glColorMask (int red, int green, int blue, int alpha) 3147void glColorMask (int red, int green, int blue, int alpha)
… …
2790void glRotate (float angle, float x, float y, float z) 3181void glRotate (float angle, float x, float y, float z)
2791 CODE: 3182 CODE:
2792 glRotatef (angle, x, y, z); 3183 glRotatef (angle, x, y, z);
2793 3184
2794void glColor (float r, float g, float b, float a = 1.0) 3185void glColor (float r, float g, float b, float a = 1.0)
3186 PROTOTYPE: @
2795 ALIAS: 3187 ALIAS:
2796 glColor_premultiply = 1 3188 glColor_premultiply = 1
2797 CODE: 3189 CODE:
2798 if (ix) 3190 if (ix)
2799 { 3191 {

Diff Legend

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