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.271 by root, Sun Jul 20 15:09:29 2008 UTC vs.
Revision 1.308 by root, Fri Jul 29 08:35:35 2011 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>
76#define expect_false(expr) expect ((expr) != 0, 0) 82#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1) 83#define expect_true(expr) expect ((expr) != 0, 1)
78 84
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 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 */
81#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
82 91
83#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
85 94
86#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
87 96
88/* mask out modifiers we are not interested in */ 97/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
99
100#define KMOD_LRAM 0x10000 // our extension
101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
90 123
91static AV *texture_av; 124static AV *texture_av;
92 125
93static struct 126static struct
94{ 127{
226 int w, h; 259 int w, h;
227 float s, t; 260 float s, t;
228 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
229 tileid smoothtile; 262 tileid smoothtile;
230 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
231} maptex; 265} maptex;
232 266
233typedef struct { 267typedef struct {
234 uint32_t player; 268 uint32_t player;
235 tileid tile[3]; 269 tileid tile[3];
448 482
449 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
450} 484}
451 485
452static unsigned int 486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
490}
491
492static unsigned int
453minpot (unsigned int n) 493minpot (unsigned int n)
454{ 494{
455 if (!n) 495 if (!n)
456 return 0; 496 return 0;
457 497
521 if (!svp || !SvTRUE (*svp)) 561 if (!svp || !SvTRUE (*svp))
522 return 0; 562 return 0;
523 563
524 return 1; 564 return 1;
525} 565}
566
567/******************************************************************************/
568
569/* process keyboard modifiers */
570static int
571mod_munge (int mod)
572{
573 mod &= MOD_MASK;
574
575 if (mod & (KMOD_META | KMOD_ALT))
576 mod |= KMOD_LRAM;
577
578 return mod;
579}
580
581static void
582deliantra_main ()
583{
584 char *argv[] = { 0 };
585 call_argv ("::main", G_DISCARD | G_VOID, argv);
586}
587
588#ifdef __MACOSX__
589 /* to due surprising braindamage on the side of SDL design, we
590 * do some mind-boggling hack here: SDL requires a custom main()
591 * on OS X, so... we provide one and call the original main(), which,
592 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
593 * and which calls our main (== SDL_main) back.
594 */
595 extern C_LINKAGE int
596 main (int argc, char *argv[])
597 {
598 deliantra_main ();
599 }
600
601 #undef main
602
603 extern C_LINKAGE int main (int argc, char *argv[]);
604
605 static void
606 SDL_braino (void)
607 {
608 char *argv[] = { "deliantra client", 0 };
609 (main) (1, argv);
610 }
611#else
612 static void
613 SDL_braino (void)
614 {
615 deliantra_main ();
616 }
617#endif
526 618
527MODULE = Deliantra::Client PACKAGE = DC 619MODULE = Deliantra::Client PACKAGE = DC
528 620
529PROTOTYPES: ENABLE 621PROTOTYPES: ENABLE
530 622
559 const_iv (SDL_USEREVENT), 651 const_iv (SDL_USEREVENT),
560 652
561 const_iv (SDL_APPINPUTFOCUS), 653 const_iv (SDL_APPINPUTFOCUS),
562 const_iv (SDL_APPMOUSEFOCUS), 654 const_iv (SDL_APPMOUSEFOCUS),
563 const_iv (SDL_APPACTIVE), 655 const_iv (SDL_APPACTIVE),
656
657
658 const_iv (SDLK_UNKNOWN),
659 const_iv (SDLK_FIRST),
660 const_iv (SDLK_BACKSPACE),
661 const_iv (SDLK_TAB),
662 const_iv (SDLK_CLEAR),
663 const_iv (SDLK_RETURN),
664 const_iv (SDLK_PAUSE),
665 const_iv (SDLK_ESCAPE),
666 const_iv (SDLK_SPACE),
667 const_iv (SDLK_EXCLAIM),
668 const_iv (SDLK_QUOTEDBL),
669 const_iv (SDLK_HASH),
670 const_iv (SDLK_DOLLAR),
671 const_iv (SDLK_AMPERSAND),
672 const_iv (SDLK_QUOTE),
673 const_iv (SDLK_LEFTPAREN),
674 const_iv (SDLK_RIGHTPAREN),
675 const_iv (SDLK_ASTERISK),
676 const_iv (SDLK_PLUS),
677 const_iv (SDLK_COMMA),
678 const_iv (SDLK_MINUS),
679 const_iv (SDLK_PERIOD),
680 const_iv (SDLK_SLASH),
681 const_iv (SDLK_0),
682 const_iv (SDLK_1),
683 const_iv (SDLK_2),
684 const_iv (SDLK_3),
685 const_iv (SDLK_4),
686 const_iv (SDLK_5),
687 const_iv (SDLK_6),
688 const_iv (SDLK_7),
689 const_iv (SDLK_8),
690 const_iv (SDLK_9),
691 const_iv (SDLK_COLON),
692 const_iv (SDLK_SEMICOLON),
693 const_iv (SDLK_LESS),
694 const_iv (SDLK_EQUALS),
695 const_iv (SDLK_GREATER),
696 const_iv (SDLK_QUESTION),
697 const_iv (SDLK_AT),
698
699 const_iv (SDLK_LEFTBRACKET),
700 const_iv (SDLK_BACKSLASH),
701 const_iv (SDLK_RIGHTBRACKET),
702 const_iv (SDLK_CARET),
703 const_iv (SDLK_UNDERSCORE),
704 const_iv (SDLK_BACKQUOTE),
705 const_iv (SDLK_DELETE),
564 706
565 const_iv (SDLK_FIRST), 707 const_iv (SDLK_FIRST),
566 const_iv (SDLK_LAST), 708 const_iv (SDLK_LAST),
567 const_iv (SDLK_KP0), 709 const_iv (SDLK_KP0),
568 const_iv (SDLK_KP1), 710 const_iv (SDLK_KP1),
644 const_iv (KMOD_RMETA), 786 const_iv (KMOD_RMETA),
645 const_iv (KMOD_NUM), 787 const_iv (KMOD_NUM),
646 const_iv (KMOD_CAPS), 788 const_iv (KMOD_CAPS),
647 const_iv (KMOD_MODE), 789 const_iv (KMOD_MODE),
648 790
791 const_iv (KMOD_LRAM),
792
649 const_iv (MIX_DEFAULT_FORMAT), 793 const_iv (MIX_DEFAULT_FORMAT),
650 794
651 const_iv (SDL_INIT_TIMER), 795 const_iv (SDL_INIT_TIMER),
652 const_iv (SDL_INIT_AUDIO), 796 const_iv (SDL_INIT_AUDIO),
653 const_iv (SDL_INIT_VIDEO), 797 const_iv (SDL_INIT_VIDEO),
677 821
678 const_iv (FOW_DARKNESS) 822 const_iv (FOW_DARKNESS)
679# undef const_iv 823# undef const_iv
680 }; 824 };
681 825
682 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 826 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
683 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 827 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
684 828
685 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 829 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
686 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 830 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
687} 831}
688 832
704NV ceil (NV x) 848NV ceil (NV x)
705 849
706IV minpot (UV n) 850IV minpot (UV n)
707 851
708IV popcount (UV n) 852IV popcount (UV n)
853
854NV distance (NV dx, NV dy)
855 CODE:
856 RETVAL = pow (dx * dx + dy * dy, 0.5);
857 OUTPUT:
858 RETVAL
709 859
710void 860void
711pango_init () 861pango_init ()
712 CODE: 862 CODE:
713{ 863{
720 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 870 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
721#endif 871#endif
722} 872}
723 873
724char *SDL_GetError () 874char *SDL_GetError ()
875
876void SDL_braino ()
725 877
726int SDL_Init (U32 flags) 878int SDL_Init (U32 flags)
727 879
728int SDL_InitSubSystem (U32 flags) 880int SDL_InitSubSystem (U32 flags)
729 881
803 955
804 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra"); 956 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
805#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 957#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
806#include "glfunc.h" 958#include "glfunc.h"
807#undef GL_FUNC 959#undef GL_FUNC
960
961 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
962 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
808 } 963 }
809} 964}
810 OUTPUT: 965 OUTPUT:
811 RETVAL 966 RETVAL
812 967
838 { 993 {
839 case SDL_KEYDOWN: 994 case SDL_KEYDOWN:
840 case SDL_KEYUP: 995 case SDL_KEYUP:
841 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 996 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
842 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 997 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
843 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 998 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
844 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 999 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
845 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1000 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
846 break; 1001 break;
847 1002
848 case SDL_ACTIVEEVENT: 1003 case SDL_ACTIVEEVENT:
849 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1004 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
867 x = ev.motion.x; 1022 x = ev.motion.x;
868 y = ev.motion.y; 1023 y = ev.motion.y;
869 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1024 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
870 } 1025 }
871 1026
872 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1027 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
873 hv_store (hv, "state", 5, newSViv (state), 0); 1028 hv_store (hv, "state", 5, newSViv (state), 0);
874 hv_store (hv, "x", 1, newSViv (x), 0); 1029 hv_store (hv, "x", 1, newSViv (x), 0);
875 hv_store (hv, "y", 1, newSViv (y), 0); 1030 hv_store (hv, "y", 1, newSViv (y), 0);
876 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1031 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
877 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1032 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
897 1052
898 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1053 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
899 } 1054 }
900} 1055}
901 1056
1057char *
1058SDL_AudioDriverName ()
1059 CODE:
1060{
1061 char buf [256];
1062 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1063 XSRETURN_UNDEF;
1064
1065 RETVAL = buf;
1066}
1067 OUTPUT:
1068 RETVAL
1069
902int 1070int
903Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1071Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
904 POSTCALL: 1072 POSTCALL:
905 Mix_HookMusicFinished (music_finished); 1073 Mix_HookMusicFinished (music_finished);
906 Mix_ChannelFinished (channel_finished); 1074 Mix_ChannelFinished (channel_finished);
968add_font (char *file) 1136add_font (char *file)
969 CODE: 1137 CODE:
970 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1138 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
971 OUTPUT: 1139 OUTPUT:
972 RETVAL 1140 RETVAL
1141
1142void
1143IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
973 1144
974void 1145void
975load_image_inline (SV *image_) 1146load_image_inline (SV *image_)
976 ALIAS: 1147 ALIAS:
977 load_image_file = 1 1148 load_image_file = 1
1093#if DEBUG 1264#if DEBUG
1094 VALGRIND_DO_LEAK_CHECK; 1265 VALGRIND_DO_LEAK_CHECK;
1095#endif 1266#endif
1096} 1267}
1097 1268
1269int
1270SvREFCNT (SV *sv)
1271 CODE:
1272 RETVAL = SvREFCNT (sv);
1273 OUTPUT:
1274 RETVAL
1275
1098MODULE = Deliantra::Client PACKAGE = DC::Font 1276MODULE = Deliantra::Client PACKAGE = DC::Font
1099 1277
1100PROTOTYPES: DISABLE 1278PROTOTYPES: DISABLE
1101 1279
1102DC::Font 1280DC::Font
1531 if (ix) 1709 if (ix)
1532 { 1710 {
1533 glDisable (GL_ALPHA_TEST); 1711 glDisable (GL_ALPHA_TEST);
1534 glDisable (GL_BLEND); 1712 glDisable (GL_BLEND);
1535 } 1713 }
1714}
1715
1716void
1717draw_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)
1718 PROTOTYPE: @
1719 CODE:
1720{
1721 glEnable (GL_BLEND);
1722 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1723 glEnable (GL_TEXTURE_2D);
1724 glBindTexture (GL_TEXTURE_2D, name1);
1725
1726 glColor3f (intensity, intensity, intensity);
1727 glPushMatrix ();
1728 glScalef (1./3, 1./3, 1.);
1729
1730 if (blend > 0.f)
1731 {
1732 float dx3 = dx * -3.f / w;
1733 float dy3 = dy * -3.f / h;
1734 GLfloat env_color[4] = { 0., 0., 0., blend };
1735
1736 /* interpolate the two shadow textures */
1737 /* stage 0 == rgb(glcolor) + alpha(t0) */
1738 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1739
1740 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1741 gl.ActiveTexture (GL_TEXTURE1);
1742 glEnable (GL_TEXTURE_2D);
1743 glBindTexture (GL_TEXTURE_2D, name2);
1744 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1745
1746 /* rgb == rgb(glcolor) */
1747 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1748 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1749 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1750
1751 /* alpha = interpolate t0, t1 by env_alpha */
1752 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1753
1754 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1755 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1756 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1757
1758 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1759 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1760
1761 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1762 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1763
1764 glBegin (GL_QUADS);
1765 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1766 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1767 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1768 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1769 glEnd ();
1770
1771 glDisable (GL_TEXTURE_2D);
1772 gl.ActiveTexture (GL_TEXTURE0);
1773 }
1774 else
1775 {
1776 /* simple blending of one texture, also opengl <1.3 path */
1777 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1778
1779 glBegin (GL_QUADS);
1780 glTexCoord2f (0, 0); glVertex2f (0, 0);
1781 glTexCoord2f (0, t); glVertex2f (0, h);
1782 glTexCoord2f (s, t); glVertex2f (w, h);
1783 glTexCoord2f (s, 0); glVertex2f (w, 0);
1784 glEnd ();
1785 }
1786
1787 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1788 {
1789 int x, y;
1790 int dx3 = dx * 3;
1791 int dy3 = dy * 3;
1792
1793 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1794 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1795 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1796 glTranslatef (-1., -1., 0);
1797 glBegin (GL_QUADS);
1798
1799 for (y = 1; y < h; y += 3)
1800 {
1801 int y1 = y - dy3;
1802 int y1valid = y1 >= 0 && y1 < h;
1803
1804 for (x = 1; x < w; x += 3)
1805 {
1806 int x1 = x - dx3;
1807 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1808 uint8_t h2;
1809
1810 if (y1valid && x1 >= 0 && x1 < w)
1811 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1812 else
1813 h2 = 1; /* out of range == invisible */
1814
1815 if (h1 || h2)
1816 {
1817 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1818 glColor4f (1., 1., 1., alpha);
1819
1820 glTexCoord2f (0, 0.); glVertex2i (x , y );
1821 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1822 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1823 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1824 }
1825 }
1826 }
1827 }
1828
1829 glEnd ();
1830
1831 glPopMatrix ();
1832
1833 glDisable (GL_TEXTURE_2D);
1834 glDisable (GL_BLEND);
1536} 1835}
1537 1836
1538IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1837IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1539 CODE: 1838 CODE:
1540{ 1839{
1646 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1945 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1647 // use uglier nearest interpolation because linear suffers 1946 // use uglier nearest interpolation because linear suffers
1648 // from transparent color bleeding and ugly wrapping effects. 1947 // from transparent color bleeding and ugly wrapping effects.
1649 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1948 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1650} 1949}
1950
1951void
1952expire_textures (DC::Map self, int texid, int count)
1953 PPCODE:
1954 for (; texid < self->texs && count; ++texid, --count)
1955 {
1956 maptex *tex = self->tex + texid;
1957
1958 if (tex->name)
1959 {
1960 if (tex->unused)
1961 {
1962 tex->name = 0;
1963 tex->unused = 0;
1964 XPUSHs (sv_2mortal (newSViv (texid)));
1965 }
1966 else
1967 tex->unused = 1;
1968 }
1969 }
1651 1970
1652int 1971int
1653ox (DC::Map self) 1972ox (DC::Map self)
1654 ALIAS: 1973 ALIAS:
1655 oy = 1 1974 oy = 1
1736 { 2055 {
1737 ext = *data++; 2056 ext = *data++;
1738 cmd = ext & 0x7f; 2057 cmd = ext & 0x7f;
1739 2058
1740 if (cmd < 4) 2059 if (cmd < 4)
1741 cell->darkness = 255 - ext * 64 + 1; 2060 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1742 else if (cmd == 5) // health 2061 else if (cmd == 5) // health
1743 { 2062 {
1744 cell->stat_width = 1; 2063 cell->stat_width = 1;
1745 cell->stat_hp = *data++; 2064 cell->stat_hp = *data++;
1746 } 2065 }
1776 cell->tile [z] = self->face2tile [face]; 2095 cell->tile [z] = self->face2tile [face];
1777 2096
1778 if (cell->tile [z]) 2097 if (cell->tile [z])
1779 { 2098 {
1780 maptex *tex = self->tex + cell->tile [z]; 2099 maptex *tex = self->tex + cell->tile [z];
2100 tex->unused = 0;
1781 if (!tex->name) 2101 if (!tex->name)
1782 av_push (missing, newSViv (cell->tile [z])); 2102 av_push (missing, newSViv (cell->tile [z]));
1783 2103
1784 if (tex->smoothtile) 2104 if (tex->smoothtile)
1785 { 2105 {
1786 maptex *smooth = self->tex + tex->smoothtile; 2106 maptex *smooth = self->tex + tex->smoothtile;
2107 smooth->unused = 0;
1787 if (!smooth->name) 2108 if (!smooth->name)
1788 av_push (missing, newSViv (tex->smoothtile)); 2109 av_push (missing, newSViv (tex->smoothtile));
1789 } 2110 }
1790 } 2111 }
1791 } 2112 }
1819 ? self->row + y 2140 ? self->row + y
1820 : 0; 2141 : 0;
1821 2142
1822 for (x = x0; x < x1; x++) 2143 for (x = x0; x < x1; x++)
1823 { 2144 {
1824 int r = 32, g = 32, b = 32, a = 192; 2145 unsigned int r = 32, g = 32, b = 32, a = 192;
1825 2146
1826 if (row && row->c0 <= x && x < row->c1) 2147 if (row && row->c0 <= x && x < row->c1)
1827 { 2148 {
1828 mapcell *cell = row->col + (x - row->c0); 2149 mapcell *cell = row->col + (x - row->c0);
1829 2150
1831 { 2152 {
1832 maptex tex = self->tex [cell->tile [z]]; 2153 maptex tex = self->tex [cell->tile [z]];
1833 int a0 = 255 - tex.a; 2154 int a0 = 255 - tex.a;
1834 int a1 = tex.a; 2155 int a1 = tex.a;
1835 2156
1836 r = (r * a0 + tex.r * a1) / 255; 2157 r = div255 (r * a0 + tex.r * a1);
1837 g = (g * a0 + tex.g * a1) / 255; 2158 g = div255 (g * a0 + tex.g * a1);
1838 b = (b * a0 + tex.b * a1) / 255; 2159 b = div255 (b * a0 + tex.b * a1);
1839 a = (a * a0 + tex.a * a1) / 255; 2160 a = div255 (a * a0 + tex.a * a1);
1840 } 2161 }
1841 } 2162 }
1842 2163
1843 *map++ = (r ) 2164 *map++ = (r )
1844 | (g << 8) 2165 | (g << 8)
1851} 2172}
1852 OUTPUT: 2173 OUTPUT:
1853 RETVAL 2174 RETVAL
1854 2175
1855void 2176void
1856draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2177draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1857 CODE: 2178 CODE:
1858{ 2179{
1859 int x, y, z; 2180 int x, y, z;
1860 2181
1861 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2182 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1862 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2183 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1863 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2184 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1864 smooth_key skey; 2185 smooth_key skey;
1865 int pl_x, pl_y; 2186 int pl_x, pl_y;
1866 maptex pl_tex; 2187 maptex pl_tex;
1867 rc_t *rc = rc_alloc (); 2188 rc_t *rc = rc_alloc ();
2189 rc_t *rc_ov = rc_alloc ();
1868 rc_key_t key; 2190 rc_key_t key;
1869 rc_array_t *arr; 2191 rc_array_t *arr;
1870 2192
1871 pl_tex.name = 0; 2193 pl_tex.name = 0;
1872 2194
1873 // thats current max. sorry. 2195 // that's current max. sorry.
1874 if (sw > 255) sw = 255; 2196 if (sw > 255) sw = 255;
1875 if (sh > 255) sh = 255; 2197 if (sh > 255) sh = 255;
1876 2198
1877 // clear key, in case of extra padding 2199 // clear key, in case of extra padding
1878 memset (&skey, 0, sizeof (skey)); 2200 memset (&skey, 0, sizeof (skey));
1882 key.g = 255; 2204 key.g = 255;
1883 key.b = 255; 2205 key.b = 255;
1884 key.a = 255; 2206 key.a = 255;
1885 key.mode = GL_QUADS; 2207 key.mode = GL_QUADS;
1886 key.format = GL_T2F_V3F; 2208 key.format = GL_T2F_V3F;
1887 key.texname = -1;
1888 2209
1889 mx += self->x; 2210 mx += self->x;
1890 my += self->y; 2211 my += self->y;
1891 2212
1892 // first pass: determine smooth_max 2213 // first pass: determine smooth_max
1916 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2237 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1917 2238
1918 for (z = 0; z <= 2; z++) 2239 for (z = 0; z <= 2; z++)
1919 { 2240 {
1920 memset (smooth_level, 0, sizeof (smooth_level)); 2241 memset (smooth_level, 0, sizeof (smooth_level));
2242 key.texname = -1;
1921 2243
1922 for (y = 0; y < sh; y++) 2244 for (y = 0; y < sh; y++)
1923 if (0 <= y + my && y + my < self->rows) 2245 if (0 <= y + my && y + my < self->rows)
1924 { 2246 {
1925 maprow *row = self->row + (y + my); 2247 maprow *row = self->row + (y + my);
1931 tileid tile = cell->tile [z]; 2253 tileid tile = cell->tile [z];
1932 2254
1933 if (tile) 2255 if (tile)
1934 { 2256 {
1935 maptex tex = self->tex [tile]; 2257 maptex tex = self->tex [tile];
1936 int px = (x + 1) * T - tex.w; 2258 int px, py;
1937 int py = (y + 1) * T - tex.h;
1938 2259
1939 if (key.texname != tex.name) 2260 if (key.texname != tex.name)
1940 { 2261 {
2262 self->tex [tile].unused = 0;
2263
1941 if (!tex.name) 2264 if (!tex.name)
1942 tex = self->tex [2]; /* missing, replace by noface */ 2265 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1943 2266
1944 key.texname = tex.name; 2267 key.texname = tex.name;
1945 arr = rc_array (rc, &key); 2268 arr = rc_array (rc, &key);
1946 } 2269 }
2270
2271 px = (x + 1) * Th - tex.w;
2272 py = (y + 1) * Tw - tex.h;
1947 2273
1948 if (expect_false (cell->player == player) && expect_false (z == 2)) 2274 if (expect_false (cell->player == player) && expect_false (z == 2))
1949 { 2275 {
1950 pl_x = px; 2276 pl_x = px;
1951 pl_y = py; 2277 pl_y = py;
1956 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2282 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1957 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2283 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1958 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2284 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1959 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2285 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1960 2286
1961 if (expect_false (cell->flags) && expect_false (z == 2))
1962 {
1963 // overlays such as the speech bubble, probably more to come
1964 if (cell->flags & 1)
1965 {
1966 maptex tex = self->tex [1];
1967 int px = x * T + T * 2 / 32;
1968 int py = y * T - T * 6 / 32;
1969
1970 if (tex.name)
1971 {
1972 if (key.texname != tex.name)
1973 {
1974 key.texname = tex.name;
1975 arr = rc_array (rc, &key);
1976 }
1977
1978 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1979 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1980 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1981 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1982 }
1983 }
1984 }
1985
1986 // update smooth hash 2287 // update smooth hash
1987 if (tex.smoothtile) 2288 if (tex.smoothtile)
1988 { 2289 {
1989 skey.tile = tex.smoothtile; 2290 skey.tile = tex.smoothtile;
1990 skey.level = tex.smoothlevel; 2291 skey.level = tex.smoothlevel;
2018 // corners 2319 // corners
2019 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2320 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2020 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2321 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2021 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2322 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2022 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2323 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2324 }
2325 }
2326
2327 if (expect_false (z == 2) && expect_false (cell->flags))
2328 {
2329 // overlays such as the speech bubble, probably more to come
2330 if (cell->flags & 1)
2331 {
2332 rc_key_t key_ov = key;
2333 maptex tex = self->tex [TEXID_SPEECH];
2334 rc_array_t *arr;
2335 int px = x * Tw + Tw * 2 / 32;
2336 int py = y * Th - Th * 6 / 32;
2337
2338 key_ov.texname = tex.name;
2339 arr = rc_array (rc_ov, &key_ov);
2340
2341 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2342 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2343 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2344 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2023 } 2345 }
2024 } 2346 }
2025 } 2347 }
2026 } 2348 }
2027 2349
2054 if (!(bits & 0x1000) 2376 if (!(bits & 0x1000)
2055 && skey->level == level 2377 && skey->level == level
2056 && level > smooth_max [skey->x][skey->y]) 2378 && level > smooth_max [skey->x][skey->y])
2057 { 2379 {
2058 maptex tex = self->tex [skey->tile]; 2380 maptex tex = self->tex [skey->tile];
2059 int px = (((int)skey->x) - 1) * T; 2381 int px = (((int)skey->x) - 1) * Tw;
2060 int py = (((int)skey->y) - 1) * T; 2382 int py = (((int)skey->y) - 1) * Th;
2061 int border = bits & 15; 2383 int border = bits & 15;
2062 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2384 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2063 float dx = tex.s * .0625f; // 16 images/row 2385 float dx = tex.s * .0625f; // 16 images/row
2064 float dy = tex.t * .5f ; // 2 images/column 2386 float dy = tex.t * .5f ; // 2 images/column
2065 2387
2067 { 2389 {
2068 // this time avoiding texture state changes 2390 // this time avoiding texture state changes
2069 // save gobs of state changes. 2391 // save gobs of state changes.
2070 if (key.texname != tex.name) 2392 if (key.texname != tex.name)
2071 { 2393 {
2394 self->tex [skey->tile].unused = 0;
2395
2072 glEnd (); 2396 glEnd ();
2073 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2397 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2074 glBegin (GL_QUADS); 2398 glBegin (GL_QUADS);
2075 } 2399 }
2076 2400
2077 if (border) 2401 if (border)
2078 { 2402 {
2079 float ox = border * dx; 2403 float ox = border * dx;
2080 2404
2081 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2405 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2082 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2406 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2083 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2407 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2084 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2408 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2085 } 2409 }
2086 2410
2087 if (corner) 2411 if (corner)
2088 { 2412 {
2089 float ox = corner * dx; 2413 float ox = corner * dx;
2090 2414
2091 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2415 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2092 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2416 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2093 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2417 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2094 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2418 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2095 } 2419 }
2096 } 2420 }
2097 } 2421 }
2098 } 2422 }
2099 } 2423 }
2122 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2446 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2123 2447
2124 rc_draw (rc); 2448 rc_draw (rc);
2125 } 2449 }
2126 2450
2451 rc_draw (rc_ov);
2452 rc_clear (rc_ov);
2453
2127 glDisable (GL_BLEND); 2454 glDisable (GL_BLEND);
2128 rc_free (rc); 2455 rc_free (rc);
2456 rc_free (rc_ov);
2129 2457
2130 // top layer: overlays such as the health bar 2458 // top layer: overlays such as the health bar
2131 for (y = 0; y < sh; y++) 2459 for (y = 0; y < sh; y++)
2132 if (0 <= y + my && y + my < self->rows) 2460 if (0 <= y + my && y + my < self->rows)
2133 { 2461 {
2136 for (x = 0; x < sw; x++) 2464 for (x = 0; x < sw; x++)
2137 if (row->c0 <= x + mx && x + mx < row->c1) 2465 if (row->c0 <= x + mx && x + mx < row->c1)
2138 { 2466 {
2139 mapcell *cell = row->col + (x + mx - row->c0); 2467 mapcell *cell = row->col + (x + mx - row->c0);
2140 2468
2141 int px = x * T; 2469 int px = x * Tw;
2142 int py = y * T; 2470 int py = y * Th;
2471
2472 if (expect_false (cell->player == player))
2473 {
2474 px += sdx;
2475 py += sdy;
2476 }
2143 2477
2144 if (cell->stat_hp) 2478 if (cell->stat_hp)
2145 { 2479 {
2146 int width = cell->stat_width * T; 2480 int width = cell->stat_width * Tw;
2147 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2481 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2148 2482
2149 glColor3ub (0, 0, 0); 2483 glColor3ub (0, 0, 0);
2150 glRectf (px + 1, py - thick - 2, 2484 glRectf (px + 1, py - thick - 2,
2151 px + width - 1, py); 2485 px + width - 1, py);
2152 2486
2158 } 2492 }
2159 } 2493 }
2160} 2494}
2161 2495
2162void 2496void
2163draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2497draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2164 CODE: 2498 CODE:
2165{ 2499{
2166 static float color[16][3] = { 2500 static float color[16][3] = {
2167 { 0.00F, 0.00F, 0.00F }, 2501 { 0.00f, 0.00f, 0.00f },
2168 { 1.00F, 1.00F, 1.00F }, 2502 { 1.00f, 1.00f, 1.00f },
2169 { 0.00F, 0.00F, 0.55F }, 2503 { 0.00f, 0.00f, 0.55f },
2170 { 1.00F, 0.00F, 0.00F }, 2504 { 1.00f, 0.00f, 0.00f },
2171 2505
2172 { 1.00F, 0.54F, 0.00F }, 2506 { 1.00f, 0.54f, 0.00f },
2173 { 0.11F, 0.56F, 1.00F }, 2507 { 0.11f, 0.56f, 1.00f },
2174 { 0.93F, 0.46F, 0.00F }, 2508 { 0.93f, 0.46f, 0.00f },
2175 { 0.18F, 0.54F, 0.34F }, 2509 { 0.18f, 0.54f, 0.34f },
2176 2510
2177 { 0.56F, 0.73F, 0.56F }, 2511 { 0.56f, 0.73f, 0.56f },
2178 { 0.80F, 0.80F, 0.80F }, 2512 { 0.80f, 0.80f, 0.80f },
2179 { 0.55F, 0.41F, 0.13F }, 2513 { 0.55f, 0.41f, 0.13f },
2180 { 0.99F, 0.77F, 0.26F }, 2514 { 0.99f, 0.77f, 0.26f },
2181 2515
2182 { 0.74F, 0.65F, 0.41F }, 2516 { 0.74f, 0.65f, 0.41f },
2183 2517
2184 { 0.00F, 1.00F, 1.00F }, 2518 { 0.00f, 1.00f, 1.00f },
2185 { 1.00F, 0.00F, 1.00F }, 2519 { 1.00f, 0.00f, 1.00f },
2186 { 1.00F, 1.00F, 0.00F }, 2520 { 1.00f, 1.00f, 0.00f },
2187 }; 2521 };
2188 2522
2189 int x, y; 2523 int x, y;
2190 2524
2191 glEnable (GL_TEXTURE_2D); 2525 glEnable (GL_TEXTURE_2D);
2526 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2527 * but the nvidia driver (185.18.14) mishandles alpha textures
2528 * and takes the colour from god knows where instead of using
2529 * Cp. MODULATE results in the same colour, but slightly different
2530 * alpha, but atcually gives us the correct colour with nvidia.
2531 */
2192 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2532 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2193 glEnable (GL_BLEND); 2533 glEnable (GL_BLEND);
2194 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2534 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2195 glBegin (GL_QUADS); 2535 glBegin (GL_QUADS);
2196 2536
2197 for (y = 0; y < h; y++) 2537 for (y = 0; y < h; y++)
2201 2541
2202 if (m) 2542 if (m)
2203 { 2543 {
2204 float *c = color [m & 15]; 2544 float *c = color [m & 15];
2205 2545
2206 float tx1 = m & 0x40 ? 0.5 : 0.; 2546 float tx1 = m & 0x40 ? 0.5f : 0.f;
2207 float tx2 = tx1 + 0.5; 2547 float tx2 = tx1 + 0.5f;
2208 2548
2209 glColor4f (c[0], c[1], c[2], 0.75); 2549 glColor4f (c[0], c[1], c[2], 1);
2210 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2550 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2211 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2551 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2212 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2552 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2213 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2553 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2214 } 2554 }
2222void 2562void
2223fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2563fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2224 PPCODE: 2564 PPCODE:
2225{ 2565{
2226 int x, y; 2566 int x, y;
2227 int sw1 = sw + 2; 2567 int sw1 = sw + 2;
2228 int sh1 = sh + 2; 2568 int sh1 = sh + 2;
2229 int sh3 = sh * 3; 2569 int sh3 = sh * 3;
2230 int sw34 = (sw * 3 + 3) & ~3; 2570 int sw3 = sw * 3;
2571 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2572 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2231 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2573 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2232 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2574 memset (darkness1, 0, sw1*sh1);
2233 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2234 2575
2235 SvPOK_only (darkness3_sv); 2576 SvPOK_only (darkness3_sv);
2236 SvCUR_set (darkness3_sv, sw34 * sh3); 2577 SvCUR_set (darkness3_sv, sw3 * sh3);
2237 2578
2238 mx += self->x - 1; 2579 mx += self->x - 1;
2239 my += self->y - 1; 2580 my += self->y - 1;
2240
2241 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2242 2581
2243 for (y = 0; y < sh1; y++) 2582 for (y = 0; y < sh1; y++)
2244 if (0 <= y + my && y + my < self->rows) 2583 if (0 <= y + my && y + my < self->rows)
2245 { 2584 {
2246 maprow *row = self->row + (y + my); 2585 maprow *row = self->row + (y + my);
2249 if (row->c0 <= x + mx && x + mx < row->c1) 2588 if (row->c0 <= x + mx && x + mx < row->c1)
2250 { 2589 {
2251 mapcell *cell = row->col + (x + mx - row->c0); 2590 mapcell *cell = row->col + (x + mx - row->c0);
2252 2591
2253 darkness1 [y * sw1 + x] = cell->darkness 2592 darkness1 [y * sw1 + x] = cell->darkness
2254 ? 255 - (cell->darkness - 1) 2593 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2255 : 255 - FOW_DARKNESS; 2594 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2256 } 2595 }
2257 } 2596 }
2258 2597
2259 for (y = 0; y < sh; ++y) 2598 for (y = 0; y < sh; ++y)
2260 for (x = 0; x < sw; ++x) 2599 for (x = 0; x < sw; ++x)
2279 2618
2280 uint8_t r13 = (d13 + d23 + d12) / 3; 2619 uint8_t r13 = (d13 + d23 + d12) / 3;
2281 uint8_t r23 = d23; 2620 uint8_t r23 = d23;
2282 uint8_t r33 = (d23 + d33 + d32) / 3; 2621 uint8_t r33 = (d23 + d33 + d32) / 3;
2283 2622
2284 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2623 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2285 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2624 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2286 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2625 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2287 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2626 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2288 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2627 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2289 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2628 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2290 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2629 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2291 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2630 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2292 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2631 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2293 } 2632 }
2294 2633
2295 free (darkness1); 2634 free (darkness1);
2296 2635
2297 EXTEND (SP, 3); 2636 EXTEND (SP, 3);
2298 PUSHs (sv_2mortal (newSViv (sw34))); 2637 PUSHs (sv_2mortal (newSViv (sw3)));
2299 PUSHs (sv_2mortal (newSViv (sh3))); 2638 PUSHs (sv_2mortal (newSViv (sh3)));
2300 PUSHs (darkness3_sv); 2639 PUSHs (darkness3_sv);
2301} 2640}
2302 2641
2303SV * 2642SV *
2501 if (RETVAL < 0) 2840 if (RETVAL < 0)
2502 { 2841 {
2503 RETVAL = Mix_GroupOldest (-1); 2842 RETVAL = Mix_GroupOldest (-1);
2504 2843
2505 if (RETVAL < 0) 2844 if (RETVAL < 0)
2845 {
2846 // happens sometimes, maybe it just stopped playing(?)
2847 RETVAL = Mix_GroupAvailable (-1);
2848
2849 if (RETVAL < 0)
2506 XSRETURN_UNDEF; 2850 XSRETURN_UNDEF;
2507 2851 }
2852 else
2508 Mix_HaltChannel (RETVAL); 2853 Mix_HaltChannel (RETVAL);
2509 } 2854 }
2510 2855
2511 Mix_UnregisterAllEffects (RETVAL); 2856 Mix_UnregisterAllEffects (RETVAL);
2512 Mix_Volume (RETVAL, 128); 2857 Mix_Volume (RETVAL, 128);
2513} 2858}
2560void 2905void
2561set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2906set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2562 CODE: 2907 CODE:
2563{ 2908{
2564 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2909 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2565 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2910 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2566 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2911 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2567} 2912}
2568 2913
2569void 2914void
2570set_reverse_stereo (DC::Channel self, int flip) 2915set_reverse_stereo (DC::Channel self, int flip)
2572 Mix_SetReverseStereo (self, flip); 2917 Mix_SetReverseStereo (self, flip);
2573 2918
2574MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2919MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2575 2920
2576PROTOTYPES: DISABLE 2921PROTOTYPES: DISABLE
2922
2923void
2924decoders ()
2925 PPCODE:
2926#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2927 int i, num = Mix_GetNumChunkDecoders ();
2928 EXTEND (SP, num);
2929 for (i = 0; i < num; ++i)
2930 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2931#else
2932 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2933#endif
2577 2934
2578DC::MixChunk 2935DC::MixChunk
2579new (SV *class, DC::RW rwops) 2936new (SV *class, DC::RW rwops)
2580 CODE: 2937 CODE:
2581 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2938 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2614 OUTPUT: 2971 OUTPUT:
2615 RETVAL 2972 RETVAL
2616 2973
2617MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2974MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2618 2975
2976void
2977decoders ()
2978 PPCODE:
2979#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2980 int i, num = Mix_GetNumMusicDecoders ();
2981 EXTEND (SP, num);
2982 for (i = 0; i < num; ++i)
2983 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2984#else
2985 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2986#endif
2987
2619int 2988int
2620volume (int volume = -1) 2989volume (int volume = -1)
2621 PROTOTYPE: ;$ 2990 PROTOTYPE: ;$
2622 CODE: 2991 CODE:
2623 if (items > 0) 2992 if (items > 0)
2633 3002
2634void 3003void
2635halt () 3004halt ()
2636 CODE: 3005 CODE:
2637 Mix_HaltMusic (); 3006 Mix_HaltMusic ();
3007
3008int
3009playing ()
3010 CODE:
3011 RETVAL = Mix_PlayingMusic ();
3012 OUTPUT:
3013 RETVAL
2638 3014
2639DC::MixMusic 3015DC::MixMusic
2640new (SV *class, DC::RW rwops) 3016new (SV *class, DC::RW rwops)
2641 CODE: 3017 CODE:
2642 RETVAL = Mix_LoadMUS_RW (rwops); 3018 RETVAL = Mix_LoadMUS_RW (rwops);
2673 } *civ, const_iv[] = { 3049 } *civ, const_iv[] = {
2674# define const_iv(name) { # name, (IV)name } 3050# define const_iv(name) { # name, (IV)name }
2675 const_iv (GL_VENDOR), 3051 const_iv (GL_VENDOR),
2676 const_iv (GL_VERSION), 3052 const_iv (GL_VERSION),
2677 const_iv (GL_EXTENSIONS), 3053 const_iv (GL_EXTENSIONS),
3054 const_iv (GL_MAX_TEXTURE_UNITS),
2678 const_iv (GL_COLOR_MATERIAL), 3055 const_iv (GL_COLOR_MATERIAL),
2679 const_iv (GL_SMOOTH), 3056 const_iv (GL_SMOOTH),
2680 const_iv (GL_FLAT), 3057 const_iv (GL_FLAT),
2681 const_iv (GL_DITHER), 3058 const_iv (GL_DITHER),
2682 const_iv (GL_BLEND), 3059 const_iv (GL_BLEND),
2694 const_iv (GL_ZERO), 3071 const_iv (GL_ZERO),
2695 const_iv (GL_SRC_ALPHA), 3072 const_iv (GL_SRC_ALPHA),
2696 const_iv (GL_DST_ALPHA), 3073 const_iv (GL_DST_ALPHA),
2697 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3074 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2698 const_iv (GL_ONE_MINUS_DST_ALPHA), 3075 const_iv (GL_ONE_MINUS_DST_ALPHA),
3076 const_iv (GL_SRC_COLOR),
3077 const_iv (GL_DST_COLOR),
3078 const_iv (GL_ONE_MINUS_SRC_COLOR),
3079 const_iv (GL_ONE_MINUS_DST_COLOR),
2699 const_iv (GL_SRC_ALPHA_SATURATE), 3080 const_iv (GL_SRC_ALPHA_SATURATE),
2700 const_iv (GL_RGB), 3081 const_iv (GL_RGB),
2701 const_iv (GL_RGBA), 3082 const_iv (GL_RGBA),
2702 const_iv (GL_RGBA4), 3083 const_iv (GL_RGBA4),
2703 const_iv (GL_RGBA8), 3084 const_iv (GL_RGBA8),
2771 const_iv (GL_NICEST), 3152 const_iv (GL_NICEST),
2772 const_iv (GL_V2F), 3153 const_iv (GL_V2F),
2773 const_iv (GL_V3F), 3154 const_iv (GL_V3F),
2774 const_iv (GL_T2F_V3F), 3155 const_iv (GL_T2F_V3F),
2775 const_iv (GL_T2F_N3F_V3F), 3156 const_iv (GL_T2F_N3F_V3F),
3157 const_iv (GL_FUNC_ADD),
3158 const_iv (GL_FUNC_SUBTRACT),
3159 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2776# undef const_iv 3160# undef const_iv
2777 }; 3161 };
2778 3162
2779 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3163 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2780 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3164 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2781 3165
2782 texture_av = newAV (); 3166 texture_av = newAV ();
2783 AvREAL_off (texture_av); 3167 AvREAL_off (texture_av);
2784} 3168}
2785 3169
2786void 3170void
2787disable_GL_EXT_blend_func_separate () 3171disable_GL_EXT_blend_func_separate ()
2788 CODE: 3172 CODE:
2789 gl.BlendFuncSeparate = 0; 3173 gl.BlendFuncSeparate = 0;
2790 gl.BlendFuncSeparateEXT = 0; 3174 gl.BlendFuncSeparateEXT = 0;
3175
3176void
3177apple_nvidia_bug (int enable)
2791 3178
2792char * 3179char *
2793gl_vendor () 3180gl_vendor ()
2794 CODE: 3181 CODE:
2795 RETVAL = (char *)glGetString (GL_VENDOR); 3182 RETVAL = (char *)glGetString (GL_VENDOR);
2826 3213
2827int glGetError () 3214int glGetError ()
2828 3215
2829void glFinish () 3216void glFinish ()
2830 3217
3218void glFlush ()
3219
2831void glClear (int mask) 3220void glClear (int mask)
2832 3221
2833void glClearColor (float r, float g, float b, float a = 1.0) 3222void glClearColor (float r, float g, float b, float a = 1.0)
2834 PROTOTYPE: @ 3223 PROTOTYPE: @
2835 3224
2844void glBlendFunc (int sfactor, int dfactor) 3233void glBlendFunc (int sfactor, int dfactor)
2845 3234
2846void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3235void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2847 CODE: 3236 CODE:
2848 gl_BlendFuncSeparate (sa, da, saa, daa); 3237 gl_BlendFuncSeparate (sa, da, saa, daa);
3238
3239# void glBlendEquation (int se)
2849 3240
2850void glDepthMask (int flag) 3241void glDepthMask (int flag)
2851 3242
2852void glLogicOp (int opcode) 3243void glLogicOp (int opcode)
2853 3244
2888void glRotate (float angle, float x, float y, float z) 3279void glRotate (float angle, float x, float y, float z)
2889 CODE: 3280 CODE:
2890 glRotatef (angle, x, y, z); 3281 glRotatef (angle, x, y, z);
2891 3282
2892void glColor (float r, float g, float b, float a = 1.0) 3283void glColor (float r, float g, float b, float a = 1.0)
3284 PROTOTYPE: @
2893 ALIAS: 3285 ALIAS:
2894 glColor_premultiply = 1 3286 glColor_premultiply = 1
2895 CODE: 3287 CODE:
2896 if (ix) 3288 if (ix)
2897 { 3289 {
3002void glNewList (int list, int mode = GL_COMPILE) 3394void glNewList (int list, int mode = GL_COMPILE)
3003 3395
3004void glEndList () 3396void glEndList ()
3005 3397
3006void glCallList (int list) 3398void glCallList (int list)
3399
3400void c_init ()
3401 CODE:
3402 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3403 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3007 3404
3008MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3405MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3009 3406
3010PROTOTYPES: DISABLE 3407PROTOTYPES: DISABLE
3011 3408

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines