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.259 by root, Tue May 20 02:47:21 2008 UTC vs.
Revision 1.299 by root, Tue Dec 22 01:37:41 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);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
48#endif
43 49
44#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
46 52
47#include <glib/gmacros.h> 53#include <glib/gmacros.h>
65# include <netinet/in.h> 71# include <netinet/in.h>
66# include <netinet/tcp.h> 72# include <netinet/tcp.h>
67# include <inttypes.h> 73# include <inttypes.h>
68#endif 74#endif
69 75
76#if __GNUC__ >= 4
77# define expect(expr,value) __builtin_expect ((expr),(value))
78#else
79# define expect(expr,value) (expr)
80#endif
81
82#define expect_false(expr) expect ((expr) != 0, 0)
83#define expect_true(expr) expect ((expr) != 0, 1)
84
70#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
71 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
72#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
73 91
74#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
75#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
76 94
77#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
78 96
79/* mask out modifiers we are not interested in */ 97/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
81 99
82#if 0 100#define KMOD_LRAM 0x10000 // our extension
83# define PARACHUTE SDL_INIT_NOPARACHUTE 101
84#else 102#define TEXID_SPEECH 1
85# define PARACHUTE 0 103#define TEXID_NOFACE 2
86#endif
87 104
88static AV *texture_av; 105static AV *texture_av;
89 106
90static struct 107static struct
91{ 108{
223 int w, h; 240 int w, h;
224 float s, t; 241 float s, t;
225 uint8_t r, g, b, a; 242 uint8_t r, g, b, a;
226 tileid smoothtile; 243 tileid smoothtile;
227 uint8_t smoothlevel; 244 uint8_t smoothlevel;
245 uint8_t unused; /* set to zero on use */
228} maptex; 246} maptex;
229 247
230typedef struct { 248typedef struct {
231 uint32_t player; 249 uint32_t player;
232 tileid tile[3]; 250 tileid tile[3];
364 self->oy = 0; 382 self->oy = 0;
365 self->row = 0; 383 self->row = 0;
366 self->rows = 0; 384 self->rows = 0;
367} 385}
368 386
387#define CELL_CLEAR(cell) \
388 do { \
389 if ((cell)->player) \
390 (cell)->tile [2] = 0; \
391 (cell)->darkness = 0; \
392 (cell)->stat_hp = 0; \
393 (cell)->flags = 0; \
394 (cell)->player = 0; \
395 } while (0)
396
369static void 397static void
370map_blank (DC__Map self, int x0, int y0, int w, int h) 398map_blank (DC__Map self, int x0, int y0, int w, int h)
371{ 399{
372 int x, y; 400 int x, y;
373 maprow *row; 401 maprow *row;
387 if (x >= row->c1) 415 if (x >= row->c1)
388 break; 416 break;
389 417
390 cell = row->col + x - row->c0; 418 cell = row->col + x - row->c0;
391 419
392 cell->darkness = 0; 420 CELL_CLEAR (cell);
393 cell->stat_hp = 0;
394 cell->flags = 0;
395 cell->player = 0;
396 } 421 }
397 } 422 }
398} 423}
399 424
400typedef struct { 425typedef struct {
511 if (!svp || !SvTRUE (*svp)) 536 if (!svp || !SvTRUE (*svp))
512 return 0; 537 return 0;
513 538
514 return 1; 539 return 1;
515} 540}
541
542/******************************************************************************/
543
544/* process keyboard modifiers */
545static int
546mod_munge (int mod)
547{
548 mod &= MOD_MASK;
549
550 if (mod & (KMOD_META | KMOD_ALT))
551 mod |= KMOD_LRAM;
552
553 return mod;
554}
555
556static void
557deliantra_main ()
558{
559 char *argv[] = { 0 };
560 call_argv ("::main", G_DISCARD | G_VOID, argv);
561}
562
563#ifdef __MACOSX__
564 /* to due surprising braindamage on the side of SDL design, we
565 * do some mind-boggling hack here: SDL requires a custom main()
566 * on OS X, so... we provide one and call the original main(), which,
567 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
568 * and which calls our main (== SDL_main) back.
569 */
570 extern C_LINKAGE int
571 main (int argc, char *argv[])
572 {
573 deliantra_main ();
574 }
575
576 #undef main
577
578 extern C_LINKAGE int main (int argc, char *argv[]);
579
580 static void
581 SDL_braino (void)
582 {
583 char *argv[] = { "deliantra client", 0 };
584 (main) (1, argv);
585 }
586#else
587 static void
588 SDL_braino (void)
589 {
590 deliantra_main ();
591 }
592#endif
516 593
517MODULE = Deliantra::Client PACKAGE = DC 594MODULE = Deliantra::Client PACKAGE = DC
518 595
519PROTOTYPES: ENABLE 596PROTOTYPES: ENABLE
520 597
549 const_iv (SDL_USEREVENT), 626 const_iv (SDL_USEREVENT),
550 627
551 const_iv (SDL_APPINPUTFOCUS), 628 const_iv (SDL_APPINPUTFOCUS),
552 const_iv (SDL_APPMOUSEFOCUS), 629 const_iv (SDL_APPMOUSEFOCUS),
553 const_iv (SDL_APPACTIVE), 630 const_iv (SDL_APPACTIVE),
631
632
633 const_iv (SDLK_UNKNOWN),
634 const_iv (SDLK_FIRST),
635 const_iv (SDLK_BACKSPACE),
636 const_iv (SDLK_TAB),
637 const_iv (SDLK_CLEAR),
638 const_iv (SDLK_RETURN),
639 const_iv (SDLK_PAUSE),
640 const_iv (SDLK_ESCAPE),
641 const_iv (SDLK_SPACE),
642 const_iv (SDLK_EXCLAIM),
643 const_iv (SDLK_QUOTEDBL),
644 const_iv (SDLK_HASH),
645 const_iv (SDLK_DOLLAR),
646 const_iv (SDLK_AMPERSAND),
647 const_iv (SDLK_QUOTE),
648 const_iv (SDLK_LEFTPAREN),
649 const_iv (SDLK_RIGHTPAREN),
650 const_iv (SDLK_ASTERISK),
651 const_iv (SDLK_PLUS),
652 const_iv (SDLK_COMMA),
653 const_iv (SDLK_MINUS),
654 const_iv (SDLK_PERIOD),
655 const_iv (SDLK_SLASH),
656 const_iv (SDLK_0),
657 const_iv (SDLK_1),
658 const_iv (SDLK_2),
659 const_iv (SDLK_3),
660 const_iv (SDLK_4),
661 const_iv (SDLK_5),
662 const_iv (SDLK_6),
663 const_iv (SDLK_7),
664 const_iv (SDLK_8),
665 const_iv (SDLK_9),
666 const_iv (SDLK_COLON),
667 const_iv (SDLK_SEMICOLON),
668 const_iv (SDLK_LESS),
669 const_iv (SDLK_EQUALS),
670 const_iv (SDLK_GREATER),
671 const_iv (SDLK_QUESTION),
672 const_iv (SDLK_AT),
673
674 const_iv (SDLK_LEFTBRACKET),
675 const_iv (SDLK_BACKSLASH),
676 const_iv (SDLK_RIGHTBRACKET),
677 const_iv (SDLK_CARET),
678 const_iv (SDLK_UNDERSCORE),
679 const_iv (SDLK_BACKQUOTE),
680 const_iv (SDLK_DELETE),
554 681
555 const_iv (SDLK_FIRST), 682 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST), 683 const_iv (SDLK_LAST),
557 const_iv (SDLK_KP0), 684 const_iv (SDLK_KP0),
558 const_iv (SDLK_KP1), 685 const_iv (SDLK_KP1),
634 const_iv (KMOD_RMETA), 761 const_iv (KMOD_RMETA),
635 const_iv (KMOD_NUM), 762 const_iv (KMOD_NUM),
636 const_iv (KMOD_CAPS), 763 const_iv (KMOD_CAPS),
637 const_iv (KMOD_MODE), 764 const_iv (KMOD_MODE),
638 765
766 const_iv (KMOD_LRAM),
767
639 const_iv (MIX_DEFAULT_FORMAT), 768 const_iv (MIX_DEFAULT_FORMAT),
769
770 const_iv (SDL_INIT_TIMER),
771 const_iv (SDL_INIT_AUDIO),
772 const_iv (SDL_INIT_VIDEO),
773 const_iv (SDL_INIT_CDROM),
774 const_iv (SDL_INIT_JOYSTICK),
775 const_iv (SDL_INIT_EVERYTHING),
776 const_iv (SDL_INIT_NOPARACHUTE),
777 const_iv (SDL_INIT_EVENTTHREAD),
778
779 const_iv (SDL_GL_RED_SIZE),
780 const_iv (SDL_GL_GREEN_SIZE),
781 const_iv (SDL_GL_BLUE_SIZE),
782 const_iv (SDL_GL_ALPHA_SIZE),
783 const_iv (SDL_GL_DOUBLEBUFFER),
784 const_iv (SDL_GL_BUFFER_SIZE),
785 const_iv (SDL_GL_DEPTH_SIZE),
786 const_iv (SDL_GL_STENCIL_SIZE),
787 const_iv (SDL_GL_ACCUM_RED_SIZE),
788 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
789 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
790 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
791 const_iv (SDL_GL_STEREO),
792 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
793 const_iv (SDL_GL_MULTISAMPLESAMPLES),
794 const_iv (SDL_GL_ACCELERATED_VISUAL),
795 const_iv (SDL_GL_SWAP_CONTROL),
796
797 const_iv (FOW_DARKNESS)
640# undef const_iv 798# undef const_iv
641 }; 799 };
642 800
643 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 801 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
665NV ceil (NV x) 823NV ceil (NV x)
666 824
667IV minpot (UV n) 825IV minpot (UV n)
668 826
669IV popcount (UV n) 827IV popcount (UV n)
828
829NV distance (NV dx, NV dy)
830 CODE:
831 RETVAL = pow (dx * dx + dy * dy, 0.5);
832 OUTPUT:
833 RETVAL
670 834
671void 835void
672pango_init () 836pango_init ()
673 CODE: 837 CODE:
674{ 838{
680 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 844 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
681 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 845 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
682#endif 846#endif
683} 847}
684 848
685char *
686SDL_GetError () 849char *SDL_GetError ()
687 850
688int 851void SDL_braino ()
689SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
690 852
691void 853int SDL_Init (U32 flags)
854
855int SDL_InitSubSystem (U32 flags)
856
857void SDL_QuitSubSystem (U32 flags)
858
692SDL_Quit () 859void SDL_Quit ()
860
861int SDL_GL_SetAttribute (int attr, int value)
862
863int SDL_GL_GetAttribute (int attr)
864 CODE:
865 if (SDL_GL_GetAttribute (attr, &RETVAL))
866 XSRETURN_UNDEF;
867 OUTPUT:
868 RETVAL
693 869
694void 870void
695SDL_ListModes (int rgb, int alpha) 871SDL_ListModes (int rgb, int alpha)
696 PPCODE: 872 PPCODE:
697{ 873{
709 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 885 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
710 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 886 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
711 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 887 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
712 888
713 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 889 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
714#if SDL_VERSION_ATLEAST(1,2,10)
715 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
716 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 890 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
717#endif
718 891
719 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 892 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
720 893
721 if (m && m != (SDL_Rect **)-1) 894 if (m && m != (SDL_Rect **)-1)
722 while (*m) 895 while (*m)
723 { 896 {
724 if ((*m)->w >= 800 && (*m)->h >= 480) 897 if ((*m)->w >= 400 && (*m)->h >= 300)
725 { 898 {
726 AV *av = newAV (); 899 AV *av = newAV ();
727 av_push (av, newSViv ((*m)->w)); 900 av_push (av, newSViv ((*m)->w));
728 av_push (av, newSViv ((*m)->h)); 901 av_push (av, newSViv ((*m)->h));
729 av_push (av, newSViv (rgb)); 902 av_push (av, newSViv (rgb));
757 930
758 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra"); 931 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
759#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 932#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
760#include "glfunc.h" 933#include "glfunc.h"
761#undef GL_FUNC 934#undef GL_FUNC
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
762 } 938 }
763} 939}
764 OUTPUT: 940 OUTPUT:
765 RETVAL 941 RETVAL
766 942
792 { 968 {
793 case SDL_KEYDOWN: 969 case SDL_KEYDOWN:
794 case SDL_KEYUP: 970 case SDL_KEYUP:
795 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 971 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
796 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 972 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
797 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 973 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
798 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 974 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
799 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 975 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
800 break; 976 break;
801 977
802 case SDL_ACTIVEEVENT: 978 case SDL_ACTIVEEVENT:
803 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 979 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
821 x = ev.motion.x; 997 x = ev.motion.x;
822 y = ev.motion.y; 998 y = ev.motion.y;
823 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 999 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
824 } 1000 }
825 1001
826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1002 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
827 hv_store (hv, "state", 5, newSViv (state), 0); 1003 hv_store (hv, "state", 5, newSViv (state), 0);
828 hv_store (hv, "x", 1, newSViv (x), 0); 1004 hv_store (hv, "x", 1, newSViv (x), 0);
829 hv_store (hv, "y", 1, newSViv (y), 0); 1005 hv_store (hv, "y", 1, newSViv (y), 0);
830 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1006 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
831 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1007 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
1047#if DEBUG 1223#if DEBUG
1048 VALGRIND_DO_LEAK_CHECK; 1224 VALGRIND_DO_LEAK_CHECK;
1049#endif 1225#endif
1050} 1226}
1051 1227
1228int
1229SvREFCNT (SV *sv)
1230 CODE:
1231 RETVAL = SvREFCNT (sv);
1232 OUTPUT:
1233 RETVAL
1234
1052MODULE = Deliantra::Client PACKAGE = DC::Font 1235MODULE = Deliantra::Client PACKAGE = DC::Font
1053 1236
1054PROTOTYPES: DISABLE 1237PROTOTYPES: DISABLE
1055 1238
1056DC::Font 1239DC::Font
1485 if (ix) 1668 if (ix)
1486 { 1669 {
1487 glDisable (GL_ALPHA_TEST); 1670 glDisable (GL_ALPHA_TEST);
1488 glDisable (GL_BLEND); 1671 glDisable (GL_BLEND);
1489 } 1672 }
1673}
1674
1675void
1676draw_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)
1677 PROTOTYPE: @
1678 CODE:
1679{
1680 glEnable (GL_BLEND);
1681 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1682 glEnable (GL_TEXTURE_2D);
1683 glBindTexture (GL_TEXTURE_2D, name1);
1684
1685 glColor3f (intensity, intensity, intensity);
1686 glPushMatrix ();
1687 glScalef (1./3, 1./3, 1.);
1688
1689 if (blend > 0.f)
1690 {
1691 float dx3 = dx * -3.f / w;
1692 float dy3 = dy * -3.f / h;
1693 GLfloat env_color[4] = { 0., 0., 0., blend };
1694
1695 /* interpolate the two shadow textures */
1696 /* stage 0 == rgb(glcolor) + alpha(t0) */
1697 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1698
1699 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1700 gl.ActiveTexture (GL_TEXTURE1);
1701 glEnable (GL_TEXTURE_2D);
1702 glBindTexture (GL_TEXTURE_2D, name2);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1704
1705 /* rgb == rgb(glcolor) */
1706 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1707 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
1708 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1709
1710 /* alpha = interpolate t0, t1 by env_alpha */
1711 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1712
1713 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1714 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1715 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1716
1717 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1718 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1719
1720 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1721 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1722
1723 glBegin (GL_QUADS);
1724 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1725 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1726 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1727 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1728 glEnd ();
1729
1730 glDisable (GL_TEXTURE_2D);
1731 gl.ActiveTexture (GL_TEXTURE0);
1732 }
1733 else
1734 {
1735 /* simple blending of one texture, also opengl <1.3 path */
1736 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1737
1738 glBegin (GL_QUADS);
1739 glTexCoord2f (0, 0); glVertex2f (0, 0);
1740 glTexCoord2f (0, t); glVertex2f (0, h);
1741 glTexCoord2f (s, t); glVertex2f (w, h);
1742 glTexCoord2f (s, 0); glVertex2f (w, 0);
1743 glEnd ();
1744 }
1745
1746 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1747 {
1748 int x, y;
1749 int dx3 = dx * 3;
1750 int dy3 = dy * 3;
1751
1752 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1753 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1754 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1755 glTranslatef (-1., -1., 0);
1756 glBegin (GL_QUADS);
1757
1758 for (y = 1; y < h; y += 3)
1759 {
1760 int y1 = y - dy3;
1761 int y1valid = y1 >= 0 && y1 < h;
1762
1763 for (x = 1; x < w; x += 3)
1764 {
1765 int x1 = x - dx3;
1766 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1767 uint8_t h2;
1768
1769 if (y1valid && x1 >= 0 && x1 < w)
1770 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1771 else
1772 h2 = 1; /* out of range == invisible */
1773
1774 if (h1 || h2)
1775 {
1776 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1777 glColor4f (1., 1., 1., alpha);
1778
1779 glTexCoord2f (0, 0.); glVertex2i (x , y );
1780 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1781 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1782 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1783 }
1784 }
1785 }
1786 }
1787
1788 glEnd ();
1789
1790 glPopMatrix ();
1791
1792 glDisable (GL_TEXTURE_2D);
1793 glDisable (GL_BLEND);
1490} 1794}
1491 1795
1492IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1796IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1493 CODE: 1797 CODE:
1494{ 1798{
1600 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1904 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1601 // use uglier nearest interpolation because linear suffers 1905 // use uglier nearest interpolation because linear suffers
1602 // from transparent color bleeding and ugly wrapping effects. 1906 // from transparent color bleeding and ugly wrapping effects.
1603 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1907 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1604} 1908}
1909
1910void
1911expire_textures (DC::Map self, int texid, int count)
1912 PPCODE:
1913 for (; texid < self->texs && count; ++texid, --count)
1914 {
1915 maptex *tex = self->tex + texid;
1916
1917 if (tex->name)
1918 {
1919 if (tex->unused)
1920 {
1921 tex->name = 0;
1922 tex->unused = 0;
1923 XPUSHs (sv_2mortal (newSViv (texid)));
1924 }
1925 else
1926 tex->unused = 1;
1927 }
1928 }
1605 1929
1606int 1930int
1607ox (DC::Map self) 1931ox (DC::Map self)
1608 ALIAS: 1932 ALIAS:
1609 oy = 1 1933 oy = 1
1687 uint8_t ext, cmd; 2011 uint8_t ext, cmd;
1688 2012
1689 do 2013 do
1690 { 2014 {
1691 ext = *data++; 2015 ext = *data++;
1692 cmd = ext & 0x3f; 2016 cmd = ext & 0x7f;
1693 2017
1694 if (cmd < 4) 2018 if (cmd < 4)
1695 cell->darkness = 255 - ext * 64 + 1; 2019 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1696 else if (cmd == 5) // health 2020 else if (cmd == 5) // health
1697 { 2021 {
1698 cell->stat_width = 1; 2022 cell->stat_width = 1;
1699 cell->stat_hp = *data++; 2023 cell->stat_hp = *data++;
1700 } 2024 }
1701 else if (cmd == 6) // monster width 2025 else if (cmd == 6) // monster width
1702 cell->stat_width = *data++ + 1; 2026 cell->stat_width = *data++ + 1;
1703 else if (cmd == 0x47) 2027 else if (cmd == 0x47)
1704 { 2028 {
1705 if (*data == 4) 2029 if (*data == 1) cell->player = data [1];
1706 ; // decode player count 2030 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2031 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2032 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1707 2033
1708 data += *data + 1; 2034 data += *data + 1;
1709 } 2035 }
1710 else if (cmd == 8) // cell flags 2036 else if (cmd == 8) // cell flags
1711 cell->flags = *data++; 2037 cell->flags = *data++;
1728 cell->tile [z] = self->face2tile [face]; 2054 cell->tile [z] = self->face2tile [face];
1729 2055
1730 if (cell->tile [z]) 2056 if (cell->tile [z])
1731 { 2057 {
1732 maptex *tex = self->tex + cell->tile [z]; 2058 maptex *tex = self->tex + cell->tile [z];
2059 tex->unused = 0;
1733 if (!tex->name) 2060 if (!tex->name)
1734 av_push (missing, newSViv (cell->tile [z])); 2061 av_push (missing, newSViv (cell->tile [z]));
1735 2062
1736 if (tex->smoothtile) 2063 if (tex->smoothtile)
1737 { 2064 {
1738 maptex *smooth = self->tex + tex->smoothtile; 2065 maptex *smooth = self->tex + tex->smoothtile;
2066 smooth->unused = 0;
1739 if (!smooth->name) 2067 if (!smooth->name)
1740 av_push (missing, newSViv (tex->smoothtile)); 2068 av_push (missing, newSViv (tex->smoothtile));
1741 } 2069 }
1742 } 2070 }
1743 } 2071 }
1744 } 2072 }
1745 else 2073 else
1746 cell->darkness = 0; 2074 CELL_CLEAR (cell);
1747 } 2075 }
1748} 2076}
1749 OUTPUT: 2077 OUTPUT:
1750 RETVAL 2078 RETVAL
1751 2079
1803} 2131}
1804 OUTPUT: 2132 OUTPUT:
1805 RETVAL 2133 RETVAL
1806 2134
1807void 2135void
1808draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2136draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1809 CODE: 2137 CODE:
1810{ 2138{
1811 int x, y, z; 2139 int x, y, z;
1812 2140
1813 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2141 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1814 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2142 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1815 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2143 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1816 smooth_key skey; 2144 smooth_key skey;
1817 2145 int pl_x, pl_y;
2146 maptex pl_tex;
1818 rc_t *rc = rc_alloc (); 2147 rc_t *rc = rc_alloc ();
2148 rc_t *rc_ov = rc_alloc ();
1819 rc_key_t key; 2149 rc_key_t key;
1820 rc_array_t *arr; 2150 rc_array_t *arr;
1821 2151
2152 pl_tex.name = 0;
2153
1822 // thats current max. sorry. 2154 // that's current max. sorry.
1823 if (sw > 255) sw = 255; 2155 if (sw > 255) sw = 255;
1824 if (sh > 255) sh = 255; 2156 if (sh > 255) sh = 255;
1825 2157
1826 // clear key, in case of extra padding 2158 // clear key, in case of extra padding
1827 memset (&skey, 0, sizeof (skey)); 2159 memset (&skey, 0, sizeof (skey));
1831 key.g = 255; 2163 key.g = 255;
1832 key.b = 255; 2164 key.b = 255;
1833 key.a = 255; 2165 key.a = 255;
1834 key.mode = GL_QUADS; 2166 key.mode = GL_QUADS;
1835 key.format = GL_T2F_V3F; 2167 key.format = GL_T2F_V3F;
1836 key.texname = -1;
1837 2168
1838 mx += self->x; 2169 mx += self->x;
1839 my += self->y; 2170 my += self->y;
1840 2171
1841 // first pass: determine smooth_max 2172 // first pass: determine smooth_max
1865 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2196 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1866 2197
1867 for (z = 0; z <= 2; z++) 2198 for (z = 0; z <= 2; z++)
1868 { 2199 {
1869 memset (smooth_level, 0, sizeof (smooth_level)); 2200 memset (smooth_level, 0, sizeof (smooth_level));
2201 key.texname = -1;
1870 2202
1871 for (y = 0; y < sh; y++) 2203 for (y = 0; y < sh; y++)
1872 if (0 <= y + my && y + my < self->rows) 2204 if (0 <= y + my && y + my < self->rows)
1873 { 2205 {
1874 maprow *row = self->row + (y + my); 2206 maprow *row = self->row + (y + my);
1884 maptex tex = self->tex [tile]; 2216 maptex tex = self->tex [tile];
1885 int px, py; 2217 int px, py;
1886 2218
1887 if (key.texname != tex.name) 2219 if (key.texname != tex.name)
1888 { 2220 {
2221 self->tex [tile].unused = 0;
2222
1889 if (!tex.name) 2223 if (!tex.name)
1890 tex = self->tex [2]; /* missing, replace by noface */ 2224 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1891 2225
1892 key.texname = tex.name; 2226 key.texname = tex.name;
1893 arr = rc_array (rc, &key); 2227 arr = rc_array (rc, &key);
1894 } 2228 }
1895 2229
1896 px = (x + 1) * T - tex.w; 2230 px = (x + 1) * T - tex.w;
1897 py = (y + 1) * T - tex.h; 2231 py = (y + 1) * T - tex.h;
2232
2233 if (expect_false (cell->player == player) && expect_false (z == 2))
2234 {
2235 pl_x = px;
2236 pl_y = py;
2237 pl_tex = tex;
2238 continue;
2239 }
1898 2240
1899 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2241 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1900 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2242 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1901 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2243 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1902 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2244 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1903
1904 if (cell->flags && z == 2)
1905 {
1906 // overlays such as the speech bubble, probably more to come
1907 if (cell->flags & 1)
1908 {
1909 maptex tex = self->tex [1];
1910 int px = x * T + T * 2 / 32;
1911 int py = y * T - T * 6 / 32;
1912
1913 if (tex.name)
1914 {
1915 if (key.texname != tex.name)
1916 {
1917 key.texname = tex.name;
1918 arr = rc_array (rc, &key);
1919 }
1920
1921 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1922 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1923 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1924 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1925 }
1926 }
1927 }
1928 2245
1929 // update smooth hash 2246 // update smooth hash
1930 if (tex.smoothtile) 2247 if (tex.smoothtile)
1931 { 2248 {
1932 skey.tile = tex.smoothtile; 2249 skey.tile = tex.smoothtile;
1961 // corners 2278 // corners
1962 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2279 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1963 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2280 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1964 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2281 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1965 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2282 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2283 }
2284 }
2285
2286 if (expect_false (z == 2) && expect_false (cell->flags))
2287 {
2288 // overlays such as the speech bubble, probably more to come
2289 if (cell->flags & 1)
2290 {
2291 rc_key_t key_ov = key;
2292 maptex tex = self->tex [TEXID_SPEECH];
2293 rc_array_t *arr;
2294 int px = x * T + T * 2 / 32;
2295 int py = y * T - T * 6 / 32;
2296
2297 key_ov.texname = tex.name;
2298 arr = rc_array (rc_ov, &key_ov);
2299
2300 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2301 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2302 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2303 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1966 } 2304 }
1967 } 2305 }
1968 } 2306 }
1969 } 2307 }
1970 2308
2010 { 2348 {
2011 // this time avoiding texture state changes 2349 // this time avoiding texture state changes
2012 // save gobs of state changes. 2350 // save gobs of state changes.
2013 if (key.texname != tex.name) 2351 if (key.texname != tex.name)
2014 { 2352 {
2353 self->tex [skey->tile].unused = 0;
2354
2015 glEnd (); 2355 glEnd ();
2016 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2356 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2017 glBegin (GL_QUADS); 2357 glBegin (GL_QUADS);
2018 } 2358 }
2019 2359
2048 } 2388 }
2049 2389
2050 hv_clear (smooth); 2390 hv_clear (smooth);
2051 } 2391 }
2052 2392
2393 if (pl_tex.name)
2394 {
2395 maptex tex = pl_tex;
2396 int px = pl_x + sdx;
2397 int py = pl_y + sdy;
2398
2399 key.texname = tex.name;
2400 arr = rc_array (rc, &key);
2401
2402 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2403 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2404 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2405 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2406
2407 rc_draw (rc);
2408 }
2409
2410 rc_draw (rc_ov);
2411 rc_clear (rc_ov);
2412
2053 glDisable (GL_BLEND); 2413 glDisable (GL_BLEND);
2054 rc_free (rc); 2414 rc_free (rc);
2415 rc_free (rc_ov);
2055 2416
2056 // top layer: overlays such as the health bar 2417 // top layer: overlays such as the health bar
2057 for (y = 0; y < sh; y++) 2418 for (y = 0; y < sh; y++)
2058 if (0 <= y + my && y + my < self->rows) 2419 if (0 <= y + my && y + my < self->rows)
2059 { 2420 {
2064 { 2425 {
2065 mapcell *cell = row->col + (x + mx - row->c0); 2426 mapcell *cell = row->col + (x + mx - row->c0);
2066 2427
2067 int px = x * T; 2428 int px = x * T;
2068 int py = y * T; 2429 int py = y * T;
2430
2431 if (expect_false (cell->player == player))
2432 {
2433 px += sdx;
2434 py += sdy;
2435 }
2069 2436
2070 if (cell->stat_hp) 2437 if (cell->stat_hp)
2071 { 2438 {
2072 int width = cell->stat_width * T; 2439 int width = cell->stat_width * T;
2073 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2440 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
2084 } 2451 }
2085 } 2452 }
2086} 2453}
2087 2454
2088void 2455void
2089draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2456draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2090 CODE: 2457 CODE:
2091{ 2458{
2092 static float color[16][3] = { 2459 static float color[16][3] = {
2093 { 0.00F, 0.00F, 0.00F }, 2460 { 0.00f, 0.00f, 0.00f },
2094 { 1.00F, 1.00F, 1.00F }, 2461 { 1.00f, 1.00f, 1.00f },
2095 { 0.00F, 0.00F, 0.55F }, 2462 { 0.00f, 0.00f, 0.55f },
2096 { 1.00F, 0.00F, 0.00F }, 2463 { 1.00f, 0.00f, 0.00f },
2097 2464
2098 { 1.00F, 0.54F, 0.00F }, 2465 { 1.00f, 0.54f, 0.00f },
2099 { 0.11F, 0.56F, 1.00F }, 2466 { 0.11f, 0.56f, 1.00f },
2100 { 0.93F, 0.46F, 0.00F }, 2467 { 0.93f, 0.46f, 0.00f },
2101 { 0.18F, 0.54F, 0.34F }, 2468 { 0.18f, 0.54f, 0.34f },
2102 2469
2103 { 0.56F, 0.73F, 0.56F }, 2470 { 0.56f, 0.73f, 0.56f },
2104 { 0.80F, 0.80F, 0.80F }, 2471 { 0.80f, 0.80f, 0.80f },
2105 { 0.55F, 0.41F, 0.13F }, 2472 { 0.55f, 0.41f, 0.13f },
2106 { 0.99F, 0.77F, 0.26F }, 2473 { 0.99f, 0.77f, 0.26f },
2107 2474
2108 { 0.74F, 0.65F, 0.41F }, 2475 { 0.74f, 0.65f, 0.41f },
2109 2476
2110 { 0.00F, 1.00F, 1.00F }, 2477 { 0.00f, 1.00f, 1.00f },
2111 { 1.00F, 0.00F, 1.00F }, 2478 { 1.00f, 0.00f, 1.00f },
2112 { 1.00F, 1.00F, 0.00F }, 2479 { 1.00f, 1.00f, 0.00f },
2113 }; 2480 };
2114 2481
2115 int x, y; 2482 int x, y;
2116 2483
2117 glEnable (GL_TEXTURE_2D); 2484 glEnable (GL_TEXTURE_2D);
2485 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2486 * but the nvidia driver (185.18.14) mishandles alpha textures
2487 * and takes the colour from god knows where instead of using
2488 * Cp. MODULATE results in the same colour, but slightly different
2489 * alpha, but atcually gives us the correct colour with nvidia.
2490 */
2118 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2491 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2119 glEnable (GL_BLEND); 2492 glEnable (GL_BLEND);
2120 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2493 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2121 glBegin (GL_QUADS); 2494 glBegin (GL_QUADS);
2122 2495
2123 for (y = 0; y < h; y++) 2496 for (y = 0; y < h; y++)
2127 2500
2128 if (m) 2501 if (m)
2129 { 2502 {
2130 float *c = color [m & 15]; 2503 float *c = color [m & 15];
2131 2504
2132 float tx1 = m & 0x40 ? 0.5 : 0.; 2505 float tx1 = m & 0x40 ? 0.5f : 0.f;
2133 float tx2 = tx1 + 0.5; 2506 float tx2 = tx1 + 0.5f;
2134 2507
2135 glColor4f (c[0], c[1], c[2], 0.75); 2508 glColor4f (c[0], c[1], c[2], 1);
2136 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2509 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2137 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2510 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2138 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2511 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2139 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2512 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2140 } 2513 }
2148void 2521void
2149fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2522fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2150 PPCODE: 2523 PPCODE:
2151{ 2524{
2152 int x, y; 2525 int x, y;
2153 int sw1 = sw + 2; 2526 int sw1 = sw + 2;
2154 int sh1 = sh + 2; 2527 int sh1 = sh + 2;
2155 int sh3 = sh * 3; 2528 int sh3 = sh * 3;
2156 int sw34 = (sw * 3 + 3) & ~3; 2529 int sw3 = sw * 3;
2157 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2530 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2158 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2531 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2159 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2532 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2160 2533
2161 SvPOK_only (darkness3_sv); 2534 SvPOK_only (darkness3_sv);
2162 SvCUR_set (darkness3_sv, sw34 * sh3); 2535 SvCUR_set (darkness3_sv, sw3 * sh3);
2163 2536
2164 mx += self->x - 1; 2537 mx += self->x - 1;
2165 my += self->y - 1; 2538 my += self->y - 1;
2166
2167 memset (darkness1, 255, sw1 * sh1);
2168 2539
2169 for (y = 0; y < sh1; y++) 2540 for (y = 0; y < sh1; y++)
2170 if (0 <= y + my && y + my < self->rows) 2541 if (0 <= y + my && y + my < self->rows)
2171 { 2542 {
2172 maprow *row = self->row + (y + my); 2543 maprow *row = self->row + (y + my);
2175 if (row->c0 <= x + mx && x + mx < row->c1) 2546 if (row->c0 <= x + mx && x + mx < row->c1)
2176 { 2547 {
2177 mapcell *cell = row->col + (x + mx - row->c0); 2548 mapcell *cell = row->col + (x + mx - row->c0);
2178 2549
2179 darkness1 [y * sw1 + x] = cell->darkness 2550 darkness1 [y * sw1 + x] = cell->darkness
2180 ? 255 - (cell->darkness - 1) 2551 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2181 : 255 - FOW_DARKNESS; 2552 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2182 } 2553 }
2183 } 2554 }
2184 2555
2185 for (y = 0; y < sh; ++y) 2556 for (y = 0; y < sh; ++y)
2186 for (x = 0; x < sw; ++x) 2557 for (x = 0; x < sw; ++x)
2205 2576
2206 uint8_t r13 = (d13 + d23 + d12) / 3; 2577 uint8_t r13 = (d13 + d23 + d12) / 3;
2207 uint8_t r23 = d23; 2578 uint8_t r23 = d23;
2208 uint8_t r33 = (d23 + d33 + d32) / 3; 2579 uint8_t r33 = (d23 + d33 + d32) / 3;
2209 2580
2210 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2581 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2211 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2582 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2212 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2583 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2213 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2584 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2214 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2585 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2215 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2586 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2216 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2587 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2217 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2588 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2218 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2589 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2219 } 2590 }
2220 2591
2221 free (darkness1); 2592 free (darkness1);
2222 2593
2223 EXTEND (SP, 3); 2594 EXTEND (SP, 3);
2224 PUSHs (sv_2mortal (newSViv (sw34))); 2595 PUSHs (sv_2mortal (newSViv (sw3)));
2225 PUSHs (sv_2mortal (newSViv (sh3))); 2596 PUSHs (sv_2mortal (newSViv (sh3)));
2226 PUSHs (darkness3_sv); 2597 PUSHs (darkness3_sv);
2227} 2598}
2228 2599
2229SV * 2600SV *
2292 else 2663 else
2293 *data++ = 0; 2664 *data++ = 0;
2294 } 2665 }
2295 } 2666 }
2296 2667
2668 /* if size is w*h + 5 then no data has been found */
2297 if (data - (uint8_t *)SvPVX (data_sv) == w * h + 5) 2669 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2298 {
2299 SvREFCNT_dec (data_sv);
2300 RETVAL = &PL_sv_undef;
2301 }
2302 else
2303 { 2670 {
2304 SvPOK_only (data_sv); 2671 SvPOK_only (data_sv);
2305 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2672 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2306 RETVAL = data_sv;
2307 } 2673 }
2674
2675 RETVAL = data_sv;
2308} 2676}
2309 OUTPUT: 2677 OUTPUT:
2310 RETVAL 2678 RETVAL
2311 2679
2312void 2680void
2318 int x1, y1; 2686 int x1, y1;
2319 STRLEN len; 2687 STRLEN len;
2320 uint8_t *data, *end; 2688 uint8_t *data, *end;
2321 2689
2322 len = SvLEN (data_sv); 2690 len = SvLEN (data_sv);
2323 SvGROW (data_sv, len + 7); // reserve at least 7+ bytes more 2691 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2324 data = SvPVbyte_nolen (data_sv); 2692 data = SvPVbyte_nolen (data_sv);
2325 end = data + len + 7; 2693 end = data + len + 8;
2326 2694
2327 if (len < 5) 2695 if (len < 5)
2328 XSRETURN_EMPTY; 2696 XSRETURN_EMPTY;
2329 2697
2330 if (*data++ != 0) 2698 if (*data++ != 0)
2366 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2734 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2367 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2735 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2368 2736
2369 if (cell->darkness == 0) 2737 if (cell->darkness == 0)
2370 { 2738 {
2371 cell->darkness = 0; 2739 /*cell->darkness = 0;*/
2740 EXTEND (SP, 3);
2372 2741
2373 for (z = 0; z <= 2; z++) 2742 for (z = 0; z <= 2; z++)
2374 { 2743 {
2375 tileid t = tile [z]; 2744 tileid t = tile [z];
2376 2745
2377 if (t >= self->texs || (t && !self->tex [t].name)) 2746 if (t >= self->texs || (t && !self->tex [t].name))
2378 { 2747 {
2379 XPUSHs (sv_2mortal (newSViv (t))); 2748 PUSHs (sv_2mortal (newSViv (t)));
2380 need_texid (self, t); 2749 need_texid (self, t);
2381 } 2750 }
2382 2751
2383 cell->tile [z] = t; 2752 cell->tile [z] = t;
2384 } 2753 }
2488void 2857void
2489set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2858set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2490 CODE: 2859 CODE:
2491{ 2860{
2492 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2861 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2493 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2862 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2494 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2863 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2495} 2864}
2496 2865
2497void 2866void
2498set_reverse_stereo (DC::Channel self, int flip) 2867set_reverse_stereo (DC::Channel self, int flip)
2601 } *civ, const_iv[] = { 2970 } *civ, const_iv[] = {
2602# define const_iv(name) { # name, (IV)name } 2971# define const_iv(name) { # name, (IV)name }
2603 const_iv (GL_VENDOR), 2972 const_iv (GL_VENDOR),
2604 const_iv (GL_VERSION), 2973 const_iv (GL_VERSION),
2605 const_iv (GL_EXTENSIONS), 2974 const_iv (GL_EXTENSIONS),
2975 const_iv (GL_MAX_TEXTURE_UNITS),
2606 const_iv (GL_COLOR_MATERIAL), 2976 const_iv (GL_COLOR_MATERIAL),
2607 const_iv (GL_SMOOTH), 2977 const_iv (GL_SMOOTH),
2608 const_iv (GL_FLAT), 2978 const_iv (GL_FLAT),
2609 const_iv (GL_DITHER), 2979 const_iv (GL_DITHER),
2610 const_iv (GL_BLEND), 2980 const_iv (GL_BLEND),
2622 const_iv (GL_ZERO), 2992 const_iv (GL_ZERO),
2623 const_iv (GL_SRC_ALPHA), 2993 const_iv (GL_SRC_ALPHA),
2624 const_iv (GL_DST_ALPHA), 2994 const_iv (GL_DST_ALPHA),
2625 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2995 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2626 const_iv (GL_ONE_MINUS_DST_ALPHA), 2996 const_iv (GL_ONE_MINUS_DST_ALPHA),
2997 const_iv (GL_SRC_COLOR),
2998 const_iv (GL_DST_COLOR),
2999 const_iv (GL_ONE_MINUS_SRC_COLOR),
3000 const_iv (GL_ONE_MINUS_DST_COLOR),
2627 const_iv (GL_SRC_ALPHA_SATURATE), 3001 const_iv (GL_SRC_ALPHA_SATURATE),
2628 const_iv (GL_RGB), 3002 const_iv (GL_RGB),
2629 const_iv (GL_RGBA), 3003 const_iv (GL_RGBA),
2630 const_iv (GL_RGBA4), 3004 const_iv (GL_RGBA4),
2631 const_iv (GL_RGBA8), 3005 const_iv (GL_RGBA8),
2699 const_iv (GL_NICEST), 3073 const_iv (GL_NICEST),
2700 const_iv (GL_V2F), 3074 const_iv (GL_V2F),
2701 const_iv (GL_V3F), 3075 const_iv (GL_V3F),
2702 const_iv (GL_T2F_V3F), 3076 const_iv (GL_T2F_V3F),
2703 const_iv (GL_T2F_N3F_V3F), 3077 const_iv (GL_T2F_N3F_V3F),
3078 const_iv (GL_FUNC_ADD),
3079 const_iv (GL_FUNC_SUBTRACT),
3080 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2704# undef const_iv 3081# undef const_iv
2705 }; 3082 };
2706 3083
2707 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3084 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2708 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3085 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2715disable_GL_EXT_blend_func_separate () 3092disable_GL_EXT_blend_func_separate ()
2716 CODE: 3093 CODE:
2717 gl.BlendFuncSeparate = 0; 3094 gl.BlendFuncSeparate = 0;
2718 gl.BlendFuncSeparateEXT = 0; 3095 gl.BlendFuncSeparateEXT = 0;
2719 3096
3097void
3098apple_nvidia_bug (int enable)
3099
2720char * 3100char *
2721gl_vendor () 3101gl_vendor ()
2722 CODE: 3102 CODE:
2723 RETVAL = (char *)glGetString (GL_VENDOR); 3103 RETVAL = (char *)glGetString (GL_VENDOR);
2724 OUTPUT: 3104 OUTPUT:
2773 3153
2774void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3154void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2775 CODE: 3155 CODE:
2776 gl_BlendFuncSeparate (sa, da, saa, daa); 3156 gl_BlendFuncSeparate (sa, da, saa, daa);
2777 3157
3158# void glBlendEquation (int se)
3159
2778void glDepthMask (int flag) 3160void glDepthMask (int flag)
2779 3161
2780void glLogicOp (int opcode) 3162void glLogicOp (int opcode)
2781 3163
2782void glColorMask (int red, int green, int blue, int alpha) 3164void glColorMask (int red, int green, int blue, int alpha)
2816void glRotate (float angle, float x, float y, float z) 3198void glRotate (float angle, float x, float y, float z)
2817 CODE: 3199 CODE:
2818 glRotatef (angle, x, y, z); 3200 glRotatef (angle, x, y, z);
2819 3201
2820void glColor (float r, float g, float b, float a = 1.0) 3202void glColor (float r, float g, float b, float a = 1.0)
3203 PROTOTYPE: @
2821 ALIAS: 3204 ALIAS:
2822 glColor_premultiply = 1 3205 glColor_premultiply = 1
2823 CODE: 3206 CODE:
2824 if (ix) 3207 if (ix)
2825 { 3208 {
2930void glNewList (int list, int mode = GL_COMPILE) 3313void glNewList (int list, int mode = GL_COMPILE)
2931 3314
2932void glEndList () 3315void glEndList ()
2933 3316
2934void glCallList (int list) 3317void glCallList (int list)
3318
3319void c_init ()
3320 CODE:
3321 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3322 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
2935 3323
2936MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3324MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2937 3325
2938PROTOTYPES: DISABLE 3326PROTOTYPES: DISABLE
2939 3327

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines