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.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>
… …
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
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 */
72#define FOW_DARKNESS 32 87#define FOW_DARKNESS 50
88#define DARKNESS_ADJUST(n) (n)
73 89
74#define MAP_EXTEND_X 32 90#define MAP_EXTEND_X 32
75#define MAP_EXTEND_Y 512 91#define MAP_EXTEND_Y 512
76 92
77#define MIN_FONT_HEIGHT 10 93#define MIN_FONT_HEIGHT 10
78 94
79/* mask out modifiers we are not interested in */ 95/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 96#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
81 97
82#if 0 98#define KMOD_LRAM 0x10000 // our extension
83# define PARACHUTE SDL_INIT_NOPARACHUTE 99
84#else 100#define TEXID_SPEECH 1
85# define PARACHUTE 0 101#define TEXID_NOFACE 2
86#endif
87 102
88static AV *texture_av; 103static AV *texture_av;
89 104
90static struct 105static struct
91{ 106{
… …
185 200
186static void 201static void
187layout_update_font (DC__Layout self) 202layout_update_font (DC__Layout self)
188{ 203{
189 /* 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
190 * reasonably well with bitstream vera 205 * reasonably well with dejavu/bistream fonts
191 */ 206 */
192 PangoFontDescription *font = self->font ? self->font : default_font; 207 PangoFontDescription *font = self->font ? self->font : default_font;
193 208
194 pango_font_description_set_absolute_size (font, 209 pango_font_description_set_absolute_size (font,
195 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 210 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
223 int w, h; 238 int w, h;
224 float s, t; 239 float s, t;
225 uint8_t r, g, b, a; 240 uint8_t r, g, b, a;
226 tileid smoothtile; 241 tileid smoothtile;
227 uint8_t smoothlevel; 242 uint8_t smoothlevel;
243 uint8_t unused; /* set to zero on use */
228} maptex; 244} maptex;
229 245
230typedef struct { 246typedef struct {
231 uint32_t player; 247 uint32_t player;
232 tileid tile[3]; 248 tileid tile[3];
… …
364 self->oy = 0; 380 self->oy = 0;
365 self->row = 0; 381 self->row = 0;
366 self->rows = 0; 382 self->rows = 0;
367} 383}
368 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
369static void 395static void
370map_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)
371{ 397{
372 int x, y; 398 int x, y;
373 maprow *row; 399 maprow *row;
… …
387 if (x >= row->c1) 413 if (x >= row->c1)
388 break; 414 break;
389 415
390 cell = row->col + x - row->c0; 416 cell = row->col + x - row->c0;
391 417
392 cell->darkness = 0; 418 CELL_CLEAR (cell);
393 cell->stat_hp = 0;
394 cell->flags = 0;
395 cell->player = 0;
396 } 419 }
397 } 420 }
398} 421}
399 422
400typedef struct { 423typedef struct {
… …
511 if (!svp || !SvTRUE (*svp)) 534 if (!svp || !SvTRUE (*svp))
512 return 0; 535 return 0;
513 536
514 return 1; 537 return 1;
515} 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
516 591
517MODULE = Deliantra::Client PACKAGE = DC 592MODULE = Deliantra::Client PACKAGE = DC
518 593
519PROTOTYPES: ENABLE 594PROTOTYPES: ENABLE
520 595
… …
549 const_iv (SDL_USEREVENT), 624 const_iv (SDL_USEREVENT),
550 625
551 const_iv (SDL_APPINPUTFOCUS), 626 const_iv (SDL_APPINPUTFOCUS),
552 const_iv (SDL_APPMOUSEFOCUS), 627 const_iv (SDL_APPMOUSEFOCUS),
553 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),
554 679
555 const_iv (SDLK_FIRST), 680 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST), 681 const_iv (SDLK_LAST),
557 const_iv (SDLK_KP0), 682 const_iv (SDLK_KP0),
558 const_iv (SDLK_KP1), 683 const_iv (SDLK_KP1),
… …
634 const_iv (KMOD_RMETA), 759 const_iv (KMOD_RMETA),
635 const_iv (KMOD_NUM), 760 const_iv (KMOD_NUM),
636 const_iv (KMOD_CAPS), 761 const_iv (KMOD_CAPS),
637 const_iv (KMOD_MODE), 762 const_iv (KMOD_MODE),
638 763
764 const_iv (KMOD_LRAM),
765
639 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)
640# undef const_iv 796# undef const_iv
641 }; 797 };
642 798
643 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; )
644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 800 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
666 822
667IV minpot (UV n) 823IV minpot (UV n)
668 824
669IV popcount (UV n) 825IV popcount (UV n)
670 826
827NV distance (NV dx, NV dy)
828 CODE:
829 RETVAL = pow (dx * dx + dy * dy, 0.5);
830 OUTPUT:
831 RETVAL
832
671void 833void
672pango_init () 834pango_init ()
673 CODE: 835 CODE:
674{ 836{
675 opengl_fontmap = pango_opengl_font_map_new (); 837 opengl_fontmap = pango_opengl_font_map_new ();
676 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);
677 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 839 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
840 /*pango_context_set_font_description (opengl_context, default_font);*/
678#if PANGO_VERSION_CHECK (1, 15, 2) 841#if PANGO_VERSION_CHECK (1, 15, 2)
679 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 842 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
680 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 843 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
681#endif 844#endif
682} 845}
683 846
684char *
685SDL_GetError () 847char *SDL_GetError ()
686 848
687int 849void SDL_braino ()
688SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
689 850
690void 851int SDL_Init (U32 flags)
852
853int SDL_InitSubSystem (U32 flags)
854
855void SDL_QuitSubSystem (U32 flags)
856
691SDL_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
692 867
693void 868void
694SDL_ListModes (int rgb, int alpha) 869SDL_ListModes (int rgb, int alpha)
695 PPCODE: 870 PPCODE:
696{ 871{
… …
708 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 883 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
709 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 884 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
710 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 885 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
711 886
712 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 887 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); 888 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
716#endif
717 889
718 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 890 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
719 891
720 if (m && m != (SDL_Rect **)-1) 892 if (m && m != (SDL_Rect **)-1)
721 while (*m) 893 while (*m)
722 { 894 {
723 if ((*m)->w >= 800 && (*m)->h >= 480) 895 if ((*m)->w >= 400 && (*m)->h >= 300)
724 { 896 {
725 AV *av = newAV (); 897 AV *av = newAV ();
726 av_push (av, newSViv ((*m)->w)); 898 av_push (av, newSViv ((*m)->w));
727 av_push (av, newSViv ((*m)->h)); 899 av_push (av, newSViv ((*m)->h));
728 av_push (av, newSViv (rgb)); 900 av_push (av, newSViv (rgb));
… …
791 { 963 {
792 case SDL_KEYDOWN: 964 case SDL_KEYDOWN:
793 case SDL_KEYUP: 965 case SDL_KEYUP:
794 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 966 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
795 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 967 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); 968 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 */ 969 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); 970 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
799 break; 971 break;
800 972
801 case SDL_ACTIVEEVENT: 973 case SDL_ACTIVEEVENT:
802 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 974 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
820 x = ev.motion.x; 992 x = ev.motion.x;
821 y = ev.motion.y; 993 y = ev.motion.y;
822 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 994 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
823 } 995 }
824 996
825 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 997 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
826 hv_store (hv, "state", 5, newSViv (state), 0); 998 hv_store (hv, "state", 5, newSViv (state), 0);
827 hv_store (hv, "x", 1, newSViv (x), 0); 999 hv_store (hv, "x", 1, newSViv (x), 0);
828 hv_store (hv, "y", 1, newSViv (y), 0); 1000 hv_store (hv, "y", 1, newSViv (y), 0);
829 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1001 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
830 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1002 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
915 } 1087 }
916 } 1088 }
917#endif 1089#endif
918} 1090}
919 1091
920void 1092int
921add_font (char *file) 1093add_font (char *file)
922 CODE: 1094 CODE:
923 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1095 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1096 OUTPUT:
1097 RETVAL
924 1098
925void 1099void
926load_image_inline (SV *image_) 1100load_image_inline (SV *image_)
927 ALIAS: 1101 ALIAS:
928 load_image_file = 1 1102 load_image_file = 1
… …
1044#if DEBUG 1218#if DEBUG
1045 VALGRIND_DO_LEAK_CHECK; 1219 VALGRIND_DO_LEAK_CHECK;
1046#endif 1220#endif
1047} 1221}
1048 1222
1223int
1224SvREFCNT (SV *sv)
1225 CODE:
1226 RETVAL = SvREFCNT (sv);
1227 OUTPUT:
1228 RETVAL
1229
1049MODULE = Deliantra::Client PACKAGE = DC::Font 1230MODULE = Deliantra::Client PACKAGE = DC::Font
1050 1231
1051PROTOTYPES: DISABLE 1232PROTOTYPES: DISABLE
1052 1233
1053DC::Font 1234DC::Font
… …
1482 if (ix) 1663 if (ix)
1483 { 1664 {
1484 glDisable (GL_ALPHA_TEST); 1665 glDisable (GL_ALPHA_TEST);
1485 glDisable (GL_BLEND); 1666 glDisable (GL_BLEND);
1486 } 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);
1487} 1789}
1488 1790
1489IV 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)
1490 CODE: 1792 CODE:
1491{ 1793{
… …
1597 //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);
1598 // use uglier nearest interpolation because linear suffers 1900 // use uglier nearest interpolation because linear suffers
1599 // from transparent color bleeding and ugly wrapping effects. 1901 // from transparent color bleeding and ugly wrapping effects.
1600 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1902 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1601} 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 }
1602 1924
1603int 1925int
1604ox (DC::Map self) 1926ox (DC::Map self)
1605 ALIAS: 1927 ALIAS:
1606 oy = 1 1928 oy = 1
… …
1684 uint8_t ext, cmd; 2006 uint8_t ext, cmd;
1685 2007
1686 do 2008 do
1687 { 2009 {
1688 ext = *data++; 2010 ext = *data++;
1689 cmd = ext & 0x3f; 2011 cmd = ext & 0x7f;
1690 2012
1691 if (cmd < 4) 2013 if (cmd < 4)
1692 cell->darkness = 255 - ext * 64 + 1; 2014 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1693 else if (cmd == 5) // health 2015 else if (cmd == 5) // health
1694 { 2016 {
1695 cell->stat_width = 1; 2017 cell->stat_width = 1;
1696 cell->stat_hp = *data++; 2018 cell->stat_hp = *data++;
1697 } 2019 }
1698 else if (cmd == 6) // monster width 2020 else if (cmd == 6) // monster width
1699 cell->stat_width = *data++ + 1; 2021 cell->stat_width = *data++ + 1;
1700 else if (cmd == 0x47) 2022 else if (cmd == 0x47)
1701 { 2023 {
1702 if (*data == 4) 2024 if (*data == 1) cell->player = data [1];
1703 ; // 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);
1704 2028
1705 data += *data + 1; 2029 data += *data + 1;
1706 } 2030 }
1707 else if (cmd == 8) // cell flags 2031 else if (cmd == 8) // cell flags
1708 cell->flags = *data++; 2032 cell->flags = *data++;
… …
1725 cell->tile [z] = self->face2tile [face]; 2049 cell->tile [z] = self->face2tile [face];
1726 2050
1727 if (cell->tile [z]) 2051 if (cell->tile [z])
1728 { 2052 {
1729 maptex *tex = self->tex + cell->tile [z]; 2053 maptex *tex = self->tex + cell->tile [z];
2054 tex->unused = 0;
1730 if (!tex->name) 2055 if (!tex->name)
1731 av_push (missing, newSViv (cell->tile [z])); 2056 av_push (missing, newSViv (cell->tile [z]));
1732 2057
1733 if (tex->smoothtile) 2058 if (tex->smoothtile)
1734 { 2059 {
1735 maptex *smooth = self->tex + tex->smoothtile; 2060 maptex *smooth = self->tex + tex->smoothtile;
2061 smooth->unused = 0;
1736 if (!smooth->name) 2062 if (!smooth->name)
1737 av_push (missing, newSViv (tex->smoothtile)); 2063 av_push (missing, newSViv (tex->smoothtile));
1738 } 2064 }
1739 } 2065 }
1740 } 2066 }
1741 } 2067 }
1742 else 2068 else
1743 cell->darkness = 0; 2069 CELL_CLEAR (cell);
1744 } 2070 }
1745} 2071}
1746 OUTPUT: 2072 OUTPUT:
1747 RETVAL 2073 RETVAL
1748 2074
… …
1800} 2126}
1801 OUTPUT: 2127 OUTPUT:
1802 RETVAL 2128 RETVAL
1803 2129
1804void 2130void
1805draw (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)
1806 CODE: 2132 CODE:
1807{ 2133{
1808 int x, y, z; 2134 int x, y, z;
1809 2135
1810 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2136 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1811 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
1812 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)
1813 smooth_key skey; 2139 smooth_key skey;
1814 2140 int pl_x, pl_y;
2141 maptex pl_tex;
1815 rc_t *rc = rc_alloc (); 2142 rc_t *rc = rc_alloc ();
2143 rc_t *rc_ov = rc_alloc ();
1816 rc_key_t key; 2144 rc_key_t key;
1817 rc_array_t *arr; 2145 rc_array_t *arr;
1818 2146
2147 pl_tex.name = 0;
2148
1819 // thats current max. sorry. 2149 // that's current max. sorry.
1820 if (sw > 255) sw = 255; 2150 if (sw > 255) sw = 255;
1821 if (sh > 255) sh = 255; 2151 if (sh > 255) sh = 255;
1822 2152
1823 // clear key, in case of extra padding 2153 // clear key, in case of extra padding
1824 memset (&skey, 0, sizeof (skey)); 2154 memset (&skey, 0, sizeof (skey));
… …
1828 key.g = 255; 2158 key.g = 255;
1829 key.b = 255; 2159 key.b = 255;
1830 key.a = 255; 2160 key.a = 255;
1831 key.mode = GL_QUADS; 2161 key.mode = GL_QUADS;
1832 key.format = GL_T2F_V3F; 2162 key.format = GL_T2F_V3F;
1833 key.texname = -1;
1834 2163
1835 mx += self->x; 2164 mx += self->x;
1836 my += self->y; 2165 my += self->y;
1837 2166
1838 // first pass: determine smooth_max 2167 // first pass: determine smooth_max
… …
1862 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2191 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1863 2192
1864 for (z = 0; z <= 2; z++) 2193 for (z = 0; z <= 2; z++)
1865 { 2194 {
1866 memset (smooth_level, 0, sizeof (smooth_level)); 2195 memset (smooth_level, 0, sizeof (smooth_level));
2196 key.texname = -1;
1867 2197
1868 for (y = 0; y < sh; y++) 2198 for (y = 0; y < sh; y++)
1869 if (0 <= y + my && y + my < self->rows) 2199 if (0 <= y + my && y + my < self->rows)
1870 { 2200 {
1871 maprow *row = self->row + (y + my); 2201 maprow *row = self->row + (y + my);
… …
1881 maptex tex = self->tex [tile]; 2211 maptex tex = self->tex [tile];
1882 int px, py; 2212 int px, py;
1883 2213
1884 if (key.texname != tex.name) 2214 if (key.texname != tex.name)
1885 { 2215 {
2216 self->tex [tile].unused = 0;
2217
1886 if (!tex.name) 2218 if (!tex.name)
1887 tex = self->tex [2]; /* missing, replace by noface */ 2219 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1888 2220
1889 key.texname = tex.name; 2221 key.texname = tex.name;
1890 arr = rc_array (rc, &key); 2222 arr = rc_array (rc, &key);
1891 } 2223 }
1892 2224
1893 px = (x + 1) * T - tex.w; 2225 px = (x + 1) * T - tex.w;
1894 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 }
1895 2235
1896 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2236 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1897 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);
1898 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);
1899 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);
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 2240
1926 // update smooth hash 2241 // update smooth hash
1927 if (tex.smoothtile) 2242 if (tex.smoothtile)
1928 { 2243 {
1929 skey.tile = tex.smoothtile; 2244 skey.tile = tex.smoothtile;
… …
1958 // corners 2273 // corners
1959 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);
1960 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);
1961 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);
1962 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);
1963 } 2299 }
1964 } 2300 }
1965 } 2301 }
1966 } 2302 }
1967 2303
… …
2007 { 2343 {
2008 // this time avoiding texture state changes 2344 // this time avoiding texture state changes
2009 // save gobs of state changes. 2345 // save gobs of state changes.
2010 if (key.texname != tex.name) 2346 if (key.texname != tex.name)
2011 { 2347 {
2348 self->tex [skey->tile].unused = 0;
2349
2012 glEnd (); 2350 glEnd ();
2013 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2351 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2014 glBegin (GL_QUADS); 2352 glBegin (GL_QUADS);
2015 } 2353 }
2016 2354
… …
2045 } 2383 }
2046 2384
2047 hv_clear (smooth); 2385 hv_clear (smooth);
2048 } 2386 }
2049 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
2050 glDisable (GL_BLEND); 2408 glDisable (GL_BLEND);
2051 rc_free (rc); 2409 rc_free (rc);
2410 rc_free (rc_ov);
2052 2411
2053 // top layer: overlays such as the health bar 2412 // top layer: overlays such as the health bar
2054 for (y = 0; y < sh; y++) 2413 for (y = 0; y < sh; y++)
2055 if (0 <= y + my && y + my < self->rows) 2414 if (0 <= y + my && y + my < self->rows)
2056 { 2415 {
… …
2061 { 2420 {
2062 mapcell *cell = row->col + (x + mx - row->c0); 2421 mapcell *cell = row->col + (x + mx - row->c0);
2063 2422
2064 int px = x * T; 2423 int px = x * T;
2065 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 }
2066 2431
2067 if (cell->stat_hp) 2432 if (cell->stat_hp)
2068 { 2433 {
2069 int width = cell->stat_width * T; 2434 int width = cell->stat_width * T;
2070 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2435 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2081 } 2446 }
2082 } 2447 }
2083} 2448}
2084 2449
2085void 2450void
2086draw_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)
2087 CODE: 2452 CODE:
2088{ 2453{
2089 static float color[16][3] = { 2454 static float color[16][3] = {
2090 { 0.00F, 0.00F, 0.00F }, 2455 { 0.00f, 0.00f, 0.00f },
2091 { 1.00F, 1.00F, 1.00F }, 2456 { 1.00f, 1.00f, 1.00f },
2092 { 0.00F, 0.00F, 0.55F }, 2457 { 0.00f, 0.00f, 0.55f },
2093 { 1.00F, 0.00F, 0.00F }, 2458 { 1.00f, 0.00f, 0.00f },
2094 2459
2095 { 1.00F, 0.54F, 0.00F }, 2460 { 1.00f, 0.54f, 0.00f },
2096 { 0.11F, 0.56F, 1.00F }, 2461 { 0.11f, 0.56f, 1.00f },
2097 { 0.93F, 0.46F, 0.00F }, 2462 { 0.93f, 0.46f, 0.00f },
2098 { 0.18F, 0.54F, 0.34F }, 2463 { 0.18f, 0.54f, 0.34f },
2099 2464
2100 { 0.56F, 0.73F, 0.56F }, 2465 { 0.56f, 0.73f, 0.56f },
2101 { 0.80F, 0.80F, 0.80F }, 2466 { 0.80f, 0.80f, 0.80f },
2102 { 0.55F, 0.41F, 0.13F }, 2467 { 0.55f, 0.41f, 0.13f },
2103 { 0.99F, 0.77F, 0.26F }, 2468 { 0.99f, 0.77f, 0.26f },
2104 2469
2105 { 0.74F, 0.65F, 0.41F }, 2470 { 0.74f, 0.65f, 0.41f },
2106 2471
2107 { 0.00F, 1.00F, 1.00F }, 2472 { 0.00f, 1.00f, 1.00f },
2108 { 1.00F, 0.00F, 1.00F }, 2473 { 1.00f, 0.00f, 1.00f },
2109 { 1.00F, 1.00F, 0.00F }, 2474 { 1.00f, 1.00f, 0.00f },
2110 }; 2475 };
2111 2476
2112 int x, y; 2477 int x, y;
2113 2478
2114 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 */
2115 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2486 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2116 glEnable (GL_BLEND); 2487 glEnable (GL_BLEND);
2117 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2488 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2118 glBegin (GL_QUADS); 2489 glBegin (GL_QUADS);
2119 2490
2120 for (y = 0; y < h; y++) 2491 for (y = 0; y < h; y++)
… …
2124 2495
2125 if (m) 2496 if (m)
2126 { 2497 {
2127 float *c = color [m & 15]; 2498 float *c = color [m & 15];
2128 2499
2129 float tx1 = m & 0x40 ? 0.5 : 0.; 2500 float tx1 = m & 0x40 ? 0.5f : 0.f;
2130 float tx2 = tx1 + 0.5; 2501 float tx2 = tx1 + 0.5f;
2131 2502
2132 glColor4f (c[0], c[1], c[2], 0.75); 2503 glColor4f (c[0], c[1], c[2], 1);
2133 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2504 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2134 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2505 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2135 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2506 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2136 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2507 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2137 } 2508 }
… …
2145void 2516void
2146fow_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)
2147 PPCODE: 2518 PPCODE:
2148{ 2519{
2149 int x, y; 2520 int x, y;
2150 int sw1 = sw + 2; 2521 int sw1 = sw + 2;
2151 int sh1 = sh + 2; 2522 int sh1 = sh + 2;
2152 int sh3 = sh * 3; 2523 int sh3 = sh * 3;
2153 int sw34 = (sw * 3 + 3) & ~3; 2524 int sw3 = sw * 3;
2154 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2525 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2155 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2526 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2156 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2527 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2157 2528
2158 SvPOK_only (darkness3_sv); 2529 SvPOK_only (darkness3_sv);
2159 SvCUR_set (darkness3_sv, sw34 * sh3); 2530 SvCUR_set (darkness3_sv, sw3 * sh3);
2160 2531
2161 mx += self->x - 1; 2532 mx += self->x - 1;
2162 my += self->y - 1; 2533 my += self->y - 1;
2163
2164 memset (darkness1, 255, sw1 * sh1);
2165 2534
2166 for (y = 0; y < sh1; y++) 2535 for (y = 0; y < sh1; y++)
2167 if (0 <= y + my && y + my < self->rows) 2536 if (0 <= y + my && y + my < self->rows)
2168 { 2537 {
2169 maprow *row = self->row + (y + my); 2538 maprow *row = self->row + (y + my);
… …
2172 if (row->c0 <= x + mx && x + mx < row->c1) 2541 if (row->c0 <= x + mx && x + mx < row->c1)
2173 { 2542 {
2174 mapcell *cell = row->col + (x + mx - row->c0); 2543 mapcell *cell = row->col + (x + mx - row->c0);
2175 2544
2176 darkness1 [y * sw1 + x] = cell->darkness 2545 darkness1 [y * sw1 + x] = cell->darkness
2177 ? 255 - (cell->darkness - 1) 2546 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2178 : 255 - FOW_DARKNESS; 2547 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2179 } 2548 }
2180 } 2549 }
2181 2550
2182 for (y = 0; y < sh; ++y) 2551 for (y = 0; y < sh; ++y)
2183 for (x = 0; x < sw; ++x) 2552 for (x = 0; x < sw; ++x)
… …
2202 2571
2203 uint8_t r13 = (d13 + d23 + d12) / 3; 2572 uint8_t r13 = (d13 + d23 + d12) / 3;
2204 uint8_t r23 = d23; 2573 uint8_t r23 = d23;
2205 uint8_t r33 = (d23 + d33 + d32) / 3; 2574 uint8_t r33 = (d23 + d33 + d32) / 3;
2206 2575
2207 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2576 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2208 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2577 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2209 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2578 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2210 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2579 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2211 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 */
2212 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2581 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2213 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2582 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2214 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2583 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2215 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2584 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2216 } 2585 }
2217 2586
2218 free (darkness1); 2587 free (darkness1);
2219 2588
2220 EXTEND (SP, 3); 2589 EXTEND (SP, 3);
2221 PUSHs (sv_2mortal (newSViv (sw34))); 2590 PUSHs (sv_2mortal (newSViv (sw3)));
2222 PUSHs (sv_2mortal (newSViv (sh3))); 2591 PUSHs (sv_2mortal (newSViv (sh3)));
2223 PUSHs (darkness3_sv); 2592 PUSHs (darkness3_sv);
2224} 2593}
2225 2594
2226SV * 2595SV *
… …
2289 else 2658 else
2290 *data++ = 0; 2659 *data++ = 0;
2291 } 2660 }
2292 } 2661 }
2293 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 {
2294 SvPOK_only (data_sv); 2666 SvPOK_only (data_sv);
2295 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2667 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2668 }
2669
2296 RETVAL = data_sv; 2670 RETVAL = data_sv;
2297} 2671}
2298 OUTPUT: 2672 OUTPUT:
2299 RETVAL 2673 RETVAL
2300 2674
2301void 2675void
2302set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2676set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2303 PPCODE: 2677 PPCODE:
2304{ 2678{
2305 int x, y, z; 2679 int x, y, z;
2306 int w, h; 2680 int w, h;
2307 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;
2308 2692
2309 if (*data++ != 0) 2693 if (*data++ != 0)
2310 XSRETURN_EMPTY; /* version mismatch */ 2694 XSRETURN_EMPTY; /* version mismatch */
2311 2695
2312 w = *data++ << 8; w |= *data++; 2696 w = *data++ << 8; w |= *data++;
… …
2327 { 2711 {
2328 maprow *row = map_get_row (self, y); 2712 maprow *row = map_get_row (self, y);
2329 2713
2330 for (x = x0; x < x1; x++) 2714 for (x = x0; x < x1; x++)
2331 { 2715 {
2716 uint8_t flags;
2717
2718 if (data + 7 >= end)
2719 XSRETURN_EMPTY;
2720
2332 uint8_t flags = *data++; 2721 flags = *data++;
2333 2722
2334 if (flags) 2723 if (flags)
2335 { 2724 {
2336 mapcell *cell = row_get_cell (row, x); 2725 mapcell *cell = row_get_cell (row, x);
2337 tileid tile[3] = { 0, 0, 0 }; 2726 tileid tile[3] = { 0, 0, 0 };
… …
2340 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2729 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2341 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2730 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2342 2731
2343 if (cell->darkness == 0) 2732 if (cell->darkness == 0)
2344 { 2733 {
2345 cell->darkness = 0; 2734 /*cell->darkness = 0;*/
2735 EXTEND (SP, 3);
2346 2736
2347 for (z = 0; z <= 2; z++) 2737 for (z = 0; z <= 2; z++)
2348 { 2738 {
2349 tileid t = tile [z]; 2739 tileid t = tile [z];
2350 2740
2351 if (t >= self->texs || (t && !self->tex [t].name)) 2741 if (t >= self->texs || (t && !self->tex [t].name))
2352 { 2742 {
2353 XPUSHs (sv_2mortal (newSViv (t))); 2743 PUSHs (sv_2mortal (newSViv (t)));
2354 need_texid (self, t); 2744 need_texid (self, t);
2355 } 2745 }
2356 2746
2357 cell->tile [z] = t; 2747 cell->tile [z] = t;
2358 } 2748 }
… …
2462void 2852void
2463set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2853set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2464 CODE: 2854 CODE:
2465{ 2855{
2466 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));
2467 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;
2468 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2858 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2469} 2859}
2470 2860
2471void 2861void
2472set_reverse_stereo (DC::Channel self, int flip) 2862set_reverse_stereo (DC::Channel self, int flip)
… …
2575 } *civ, const_iv[] = { 2965 } *civ, const_iv[] = {
2576# define const_iv(name) { # name, (IV)name } 2966# define const_iv(name) { # name, (IV)name }
2577 const_iv (GL_VENDOR), 2967 const_iv (GL_VENDOR),
2578 const_iv (GL_VERSION), 2968 const_iv (GL_VERSION),
2579 const_iv (GL_EXTENSIONS), 2969 const_iv (GL_EXTENSIONS),
2970 const_iv (GL_MAX_TEXTURE_UNITS),
2580 const_iv (GL_COLOR_MATERIAL), 2971 const_iv (GL_COLOR_MATERIAL),
2581 const_iv (GL_SMOOTH), 2972 const_iv (GL_SMOOTH),
2582 const_iv (GL_FLAT), 2973 const_iv (GL_FLAT),
2583 const_iv (GL_DITHER), 2974 const_iv (GL_DITHER),
2584 const_iv (GL_BLEND), 2975 const_iv (GL_BLEND),
… …
2596 const_iv (GL_ZERO), 2987 const_iv (GL_ZERO),
2597 const_iv (GL_SRC_ALPHA), 2988 const_iv (GL_SRC_ALPHA),
2598 const_iv (GL_DST_ALPHA), 2989 const_iv (GL_DST_ALPHA),
2599 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2990 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2600 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),
2601 const_iv (GL_SRC_ALPHA_SATURATE), 2996 const_iv (GL_SRC_ALPHA_SATURATE),
2602 const_iv (GL_RGB), 2997 const_iv (GL_RGB),
2603 const_iv (GL_RGBA), 2998 const_iv (GL_RGBA),
2604 const_iv (GL_RGBA4), 2999 const_iv (GL_RGBA4),
2605 const_iv (GL_RGBA8), 3000 const_iv (GL_RGBA8),
… …
2673 const_iv (GL_NICEST), 3068 const_iv (GL_NICEST),
2674 const_iv (GL_V2F), 3069 const_iv (GL_V2F),
2675 const_iv (GL_V3F), 3070 const_iv (GL_V3F),
2676 const_iv (GL_T2F_V3F), 3071 const_iv (GL_T2F_V3F),
2677 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),
2678# undef const_iv 3076# undef const_iv
2679 }; 3077 };
2680 3078
2681 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; )
2682 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3080 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2689disable_GL_EXT_blend_func_separate () 3087disable_GL_EXT_blend_func_separate ()
2690 CODE: 3088 CODE:
2691 gl.BlendFuncSeparate = 0; 3089 gl.BlendFuncSeparate = 0;
2692 gl.BlendFuncSeparateEXT = 0; 3090 gl.BlendFuncSeparateEXT = 0;
2693 3091
3092void
3093apple_nvidia_bug (int enable)
3094
2694char * 3095char *
2695gl_vendor () 3096gl_vendor ()
2696 CODE: 3097 CODE:
2697 RETVAL = (char *)glGetString (GL_VENDOR); 3098 RETVAL = (char *)glGetString (GL_VENDOR);
2698 OUTPUT: 3099 OUTPUT:
… …
2747 3148
2748void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3149void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2749 CODE: 3150 CODE:
2750 gl_BlendFuncSeparate (sa, da, saa, daa); 3151 gl_BlendFuncSeparate (sa, da, saa, daa);
2751 3152
3153# void glBlendEquation (int se)
3154
2752void glDepthMask (int flag) 3155void glDepthMask (int flag)
2753 3156
2754void glLogicOp (int opcode) 3157void glLogicOp (int opcode)
2755 3158
2756void glColorMask (int red, int green, int blue, int alpha) 3159void glColorMask (int red, int green, int blue, int alpha)
… …
2790void glRotate (float angle, float x, float y, float z) 3193void glRotate (float angle, float x, float y, float z)
2791 CODE: 3194 CODE:
2792 glRotatef (angle, x, y, z); 3195 glRotatef (angle, x, y, z);
2793 3196
2794void 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: @
2795 ALIAS: 3199 ALIAS:
2796 glColor_premultiply = 1 3200 glColor_premultiply = 1
2797 CODE: 3201 CODE:
2798 if (ix) 3202 if (ix)
2799 { 3203 {
… …
2904void glNewList (int list, int mode = GL_COMPILE) 3308void glNewList (int list, int mode = GL_COMPILE)
2905 3309
2906void glEndList () 3310void glEndList ()
2907 3311
2908void 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);
2909 3318
2910MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3319MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2911 3320
2912PROTOTYPES: DISABLE 3321PROTOTYPES: DISABLE
2913 3322

Diff Legend

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