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.273 by root, Wed Aug 20 13:30:02 2008 UTC vs.
Revision 1.313 by root, Sat Jan 7 15:24:41 2012 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>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 42
44/* work around os x broken headers */ 43/* work around os x broken headers */
45#ifdef __MACOSX__ 44#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 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);
47#endif 48#endif
48 49
49#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
51 52
81#define expect_false(expr) expect ((expr) != 0, 0) 82#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1) 83#define expect_true(expr) expect ((expr) != 0, 1)
83 84
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 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 */
86#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
87 91
88#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
90 94
91#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
92 96
93/* mask out modifiers we are not interested in */ 97/* mask out modifiers we are not interested in */
94#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}
95 123
96static AV *texture_av; 124static AV *texture_av;
97 125
98static struct 126static struct
99{ 127{
231 int w, h; 259 int w, h;
232 float s, t; 260 float s, t;
233 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
234 tileid smoothtile; 262 tileid smoothtile;
235 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
236} maptex; 265} maptex;
237 266
238typedef struct { 267typedef struct {
239 uint32_t player; 268 uint32_t player;
240 tileid tile[3]; 269 tileid tile[3];
453 482
454 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
455} 484}
456 485
457static unsigned int 486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
490}
491
492static unsigned int
458minpot (unsigned int n) 493minpot (unsigned int n)
459{ 494{
460 if (!n) 495 if (!n)
461 return 0; 496 return 0;
462 497
527 return 0; 562 return 0;
528 563
529 return 1; 564 return 1;
530} 565}
531 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
532static void 581static void
533deliantra_main () 582deliantra_main ()
534{ 583{
535 char *argv[] = { 0 }; 584 char *argv[] = { 0 };
536 call_argv ("::main", G_DISCARD | G_VOID, argv); 585 call_argv ("DC::Main::main", G_DISCARD | G_VOID, argv);
537 dSP;
538} 586}
539 587
540#ifdef __MACOSX__ 588#ifdef __MACOSX__
541 /* to due surprising braindamage on the side of SDL design, we 589 /* to due surprising braindamage on the side of SDL design, we
542 * do some mind-boggling hack here: SDL requires a custom main() 590 * do some mind-boggling hack here: SDL requires a custom main()
543 * on OS X, so... we provide one and call the original main(), which, 591 * on OS X, so... we provide one and call the original main(), which,
544 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 592 * due to shared library magic, calls -lSDLmain's main, not perl's main,
545 * and which calls our main (== SDL_main) back. 593 * and which calls our main (== SDL_main) back.
546 */ 594 */
547 extern C_LINKAGE int 595 extern C_LINKAGE int
548 main (int argc, char *argv[]) 596 main (int argc, char *argv[])
549 { 597 {
603 const_iv (SDL_USEREVENT), 651 const_iv (SDL_USEREVENT),
604 652
605 const_iv (SDL_APPINPUTFOCUS), 653 const_iv (SDL_APPINPUTFOCUS),
606 const_iv (SDL_APPMOUSEFOCUS), 654 const_iv (SDL_APPMOUSEFOCUS),
607 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),
608 706
609 const_iv (SDLK_FIRST), 707 const_iv (SDLK_FIRST),
610 const_iv (SDLK_LAST), 708 const_iv (SDLK_LAST),
611 const_iv (SDLK_KP0), 709 const_iv (SDLK_KP0),
612 const_iv (SDLK_KP1), 710 const_iv (SDLK_KP1),
688 const_iv (KMOD_RMETA), 786 const_iv (KMOD_RMETA),
689 const_iv (KMOD_NUM), 787 const_iv (KMOD_NUM),
690 const_iv (KMOD_CAPS), 788 const_iv (KMOD_CAPS),
691 const_iv (KMOD_MODE), 789 const_iv (KMOD_MODE),
692 790
791 const_iv (KMOD_LRAM),
792
693 const_iv (MIX_DEFAULT_FORMAT), 793 const_iv (MIX_DEFAULT_FORMAT),
694 794
695 const_iv (SDL_INIT_TIMER), 795 const_iv (SDL_INIT_TIMER),
696 const_iv (SDL_INIT_AUDIO), 796 const_iv (SDL_INIT_AUDIO),
697 const_iv (SDL_INIT_VIDEO), 797 const_iv (SDL_INIT_VIDEO),
721 821
722 const_iv (FOW_DARKNESS) 822 const_iv (FOW_DARKNESS)
723# undef const_iv 823# undef const_iv
724 }; 824 };
725 825
726 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--)
727 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 827 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
728 828
729 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 829 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
730 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 830 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
731} 831}
732 832
748NV ceil (NV x) 848NV ceil (NV x)
749 849
750IV minpot (UV n) 850IV minpot (UV n)
751 851
752IV 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
753 859
754void 860void
755pango_init () 861pango_init ()
756 CODE: 862 CODE:
757{ 863{
844 ); 950 );
845 951
846 if (RETVAL) 952 if (RETVAL)
847 { 953 {
848 av_clear (texture_av); 954 av_clear (texture_av);
849
850 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
851#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 955#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
852#include "glfunc.h" 956#include "glfunc.h"
853#undef GL_FUNC 957#undef GL_FUNC
958 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
959 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
854 } 960 }
855} 961}
856 OUTPUT: 962 OUTPUT:
857 RETVAL 963 RETVAL
858 964
859void 965void
966SDL_WM_SetCaption (const char *title, const char *icon)
967
968void
860SDL_GL_SwapBuffers () 969SDL_GL_SwapBuffers ()
861 970
862char * 971char *
863SDL_GetKeyName (int sym) 972SDL_GetKeyName (int sym)
864 973
866SDL_GetAppState () 975SDL_GetAppState ()
867 976
868int 977int
869SDL_GetModState () 978SDL_GetModState ()
870 979
980int
981SDL_WaitEvent ()
982 C_ARGS: 0
983
871void 984void
985SDL_PumpEvents ()
986
987void
872poll_events () 988peep_events ()
873 PPCODE: 989 PPCODE:
874{ 990{
875 SDL_Event ev; 991 SDL_Event ev;
876 992
877 SDL_PumpEvents (); 993 SDL_PumpEvents ();
884 { 1000 {
885 case SDL_KEYDOWN: 1001 case SDL_KEYDOWN:
886 case SDL_KEYUP: 1002 case SDL_KEYUP:
887 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1003 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
888 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1004 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
889 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1005 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
890 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1006 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
891 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1007 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
892 break; 1008 break;
893 1009
894 case SDL_ACTIVEEVENT: 1010 case SDL_ACTIVEEVENT:
895 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1011 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
913 x = ev.motion.x; 1029 x = ev.motion.x;
914 y = ev.motion.y; 1030 y = ev.motion.y;
915 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1031 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
916 } 1032 }
917 1033
918 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1034 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
919 hv_store (hv, "state", 5, newSViv (state), 0); 1035 hv_store (hv, "state", 5, newSViv (state), 0);
920 hv_store (hv, "x", 1, newSViv (x), 0); 1036 hv_store (hv, "x", 1, newSViv (x), 0);
921 hv_store (hv, "y", 1, newSViv (y), 0); 1037 hv_store (hv, "y", 1, newSViv (y), 0);
922 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1038 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
923 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1039 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
943 1059
944 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1060 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
945 } 1061 }
946} 1062}
947 1063
1064char *
1065SDL_AudioDriverName ()
1066 CODE:
1067{
1068 char buf [256];
1069 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1070 XSRETURN_UNDEF;
1071
1072 RETVAL = buf;
1073}
1074 OUTPUT:
1075 RETVAL
1076
948int 1077int
949Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1078Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
950 POSTCALL: 1079 POSTCALL:
951 Mix_HookMusicFinished (music_finished); 1080 Mix_HookMusicFinished (music_finished);
952 Mix_ChannelFinished (channel_finished); 1081 Mix_ChannelFinished (channel_finished);
1014add_font (char *file) 1143add_font (char *file)
1015 CODE: 1144 CODE:
1016 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1145 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1017 OUTPUT: 1146 OUTPUT:
1018 RETVAL 1147 RETVAL
1148
1149void
1150IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1151
1152# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1153void
1154Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1019 1155
1020void 1156void
1021load_image_inline (SV *image_) 1157load_image_inline (SV *image_)
1022 ALIAS: 1158 ALIAS:
1023 load_image_file = 1 1159 load_image_file = 1
1139#if DEBUG 1275#if DEBUG
1140 VALGRIND_DO_LEAK_CHECK; 1276 VALGRIND_DO_LEAK_CHECK;
1141#endif 1277#endif
1142} 1278}
1143 1279
1280int
1281SvREFCNT (SV *sv)
1282 CODE:
1283 RETVAL = SvREFCNT (sv);
1284 OUTPUT:
1285 RETVAL
1286
1144MODULE = Deliantra::Client PACKAGE = DC::Font 1287MODULE = Deliantra::Client PACKAGE = DC::Font
1145 1288
1146PROTOTYPES: DISABLE 1289PROTOTYPES: DISABLE
1147 1290
1148DC::Font 1291DC::Font
1577 if (ix) 1720 if (ix)
1578 { 1721 {
1579 glDisable (GL_ALPHA_TEST); 1722 glDisable (GL_ALPHA_TEST);
1580 glDisable (GL_BLEND); 1723 glDisable (GL_BLEND);
1581 } 1724 }
1725}
1726
1727void
1728draw_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)
1729 PROTOTYPE: @
1730 CODE:
1731{
1732 glEnable (GL_BLEND);
1733 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1734 glEnable (GL_TEXTURE_2D);
1735 glBindTexture (GL_TEXTURE_2D, name1);
1736
1737 glColor3f (intensity, intensity, intensity);
1738 glPushMatrix ();
1739 glScalef (1./3, 1./3, 1.);
1740
1741 if (blend > 0.f)
1742 {
1743 float dx3 = dx * -3.f / w;
1744 float dy3 = dy * -3.f / h;
1745 GLfloat env_color[4] = { 0., 0., 0., blend };
1746
1747 /* interpolate the two shadow textures */
1748 /* stage 0 == rgb(glcolor) + alpha(t0) */
1749 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1750
1751 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1752 gl.ActiveTexture (GL_TEXTURE1);
1753 glEnable (GL_TEXTURE_2D);
1754 glBindTexture (GL_TEXTURE_2D, name2);
1755 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1756
1757 /* rgb == rgb(glcolor) */
1758 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1759 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1760 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1761
1762 /* alpha = interpolate t0, t1 by env_alpha */
1763 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1764
1765 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1766 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1767 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1768
1769 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1770 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1771
1772 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1773 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1774
1775 glBegin (GL_QUADS);
1776 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1777 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1778 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1779 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1780 glEnd ();
1781
1782 glDisable (GL_TEXTURE_2D);
1783 gl.ActiveTexture (GL_TEXTURE0);
1784 }
1785 else
1786 {
1787 /* simple blending of one texture, also opengl <1.3 path */
1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1789
1790 glBegin (GL_QUADS);
1791 glTexCoord2f (0, 0); glVertex2f (0, 0);
1792 glTexCoord2f (0, t); glVertex2f (0, h);
1793 glTexCoord2f (s, t); glVertex2f (w, h);
1794 glTexCoord2f (s, 0); glVertex2f (w, 0);
1795 glEnd ();
1796 }
1797
1798 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1799 {
1800 int x, y;
1801 int dx3 = dx * 3;
1802 int dy3 = dy * 3;
1803
1804 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1805 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1806 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1807 glTranslatef (-1., -1., 0);
1808 glBegin (GL_QUADS);
1809
1810 for (y = 1; y < h; y += 3)
1811 {
1812 int y1 = y - dy3;
1813 int y1valid = y1 >= 0 && y1 < h;
1814
1815 for (x = 1; x < w; x += 3)
1816 {
1817 int x1 = x - dx3;
1818 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1819 uint8_t h2;
1820
1821 if (y1valid && x1 >= 0 && x1 < w)
1822 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1823 else
1824 h2 = 1; /* out of range == invisible */
1825
1826 if (h1 || h2)
1827 {
1828 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1829 glColor4f (1., 1., 1., alpha);
1830
1831 glTexCoord2f (0, 0.); glVertex2i (x , y );
1832 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1833 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1834 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1835 }
1836 }
1837 }
1838 }
1839
1840 glEnd ();
1841
1842 glPopMatrix ();
1843
1844 glDisable (GL_TEXTURE_2D);
1845 glDisable (GL_BLEND);
1582} 1846}
1583 1847
1584IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1848IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1585 CODE: 1849 CODE:
1586{ 1850{
1692 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1956 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1693 // use uglier nearest interpolation because linear suffers 1957 // use uglier nearest interpolation because linear suffers
1694 // from transparent color bleeding and ugly wrapping effects. 1958 // from transparent color bleeding and ugly wrapping effects.
1695 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1959 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1696} 1960}
1961
1962void
1963expire_textures (DC::Map self, int texid, int count)
1964 PPCODE:
1965 for (; texid < self->texs && count; ++texid, --count)
1966 {
1967 maptex *tex = self->tex + texid;
1968
1969 if (tex->name)
1970 {
1971 if (tex->unused)
1972 {
1973 tex->name = 0;
1974 tex->unused = 0;
1975 XPUSHs (sv_2mortal (newSViv (texid)));
1976 }
1977 else
1978 tex->unused = 1;
1979 }
1980 }
1697 1981
1698int 1982int
1699ox (DC::Map self) 1983ox (DC::Map self)
1700 ALIAS: 1984 ALIAS:
1701 oy = 1 1985 oy = 1
1782 { 2066 {
1783 ext = *data++; 2067 ext = *data++;
1784 cmd = ext & 0x7f; 2068 cmd = ext & 0x7f;
1785 2069
1786 if (cmd < 4) 2070 if (cmd < 4)
1787 cell->darkness = 255 - ext * 64 + 1; 2071 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1788 else if (cmd == 5) // health 2072 else if (cmd == 5) // health
1789 { 2073 {
1790 cell->stat_width = 1; 2074 cell->stat_width = 1;
1791 cell->stat_hp = *data++; 2075 cell->stat_hp = *data++;
1792 } 2076 }
1822 cell->tile [z] = self->face2tile [face]; 2106 cell->tile [z] = self->face2tile [face];
1823 2107
1824 if (cell->tile [z]) 2108 if (cell->tile [z])
1825 { 2109 {
1826 maptex *tex = self->tex + cell->tile [z]; 2110 maptex *tex = self->tex + cell->tile [z];
2111 tex->unused = 0;
1827 if (!tex->name) 2112 if (!tex->name)
1828 av_push (missing, newSViv (cell->tile [z])); 2113 av_push (missing, newSViv (cell->tile [z]));
1829 2114
1830 if (tex->smoothtile) 2115 if (tex->smoothtile)
1831 { 2116 {
1832 maptex *smooth = self->tex + tex->smoothtile; 2117 maptex *smooth = self->tex + tex->smoothtile;
2118 smooth->unused = 0;
1833 if (!smooth->name) 2119 if (!smooth->name)
1834 av_push (missing, newSViv (tex->smoothtile)); 2120 av_push (missing, newSViv (tex->smoothtile));
1835 } 2121 }
1836 } 2122 }
1837 } 2123 }
1865 ? self->row + y 2151 ? self->row + y
1866 : 0; 2152 : 0;
1867 2153
1868 for (x = x0; x < x1; x++) 2154 for (x = x0; x < x1; x++)
1869 { 2155 {
1870 int r = 32, g = 32, b = 32, a = 192; 2156 unsigned int r = 32, g = 32, b = 32, a = 192;
1871 2157
1872 if (row && row->c0 <= x && x < row->c1) 2158 if (row && row->c0 <= x && x < row->c1)
1873 { 2159 {
1874 mapcell *cell = row->col + (x - row->c0); 2160 mapcell *cell = row->col + (x - row->c0);
1875 2161
1877 { 2163 {
1878 maptex tex = self->tex [cell->tile [z]]; 2164 maptex tex = self->tex [cell->tile [z]];
1879 int a0 = 255 - tex.a; 2165 int a0 = 255 - tex.a;
1880 int a1 = tex.a; 2166 int a1 = tex.a;
1881 2167
1882 r = (r * a0 + tex.r * a1) / 255; 2168 r = div255 (r * a0 + tex.r * a1);
1883 g = (g * a0 + tex.g * a1) / 255; 2169 g = div255 (g * a0 + tex.g * a1);
1884 b = (b * a0 + tex.b * a1) / 255; 2170 b = div255 (b * a0 + tex.b * a1);
1885 a = (a * a0 + tex.a * a1) / 255; 2171 a = div255 (a * a0 + tex.a * a1);
1886 } 2172 }
1887 } 2173 }
1888 2174
1889 *map++ = (r ) 2175 *map++ = (r )
1890 | (g << 8) 2176 | (g << 8)
1897} 2183}
1898 OUTPUT: 2184 OUTPUT:
1899 RETVAL 2185 RETVAL
1900 2186
1901void 2187void
1902draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2188draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1903 CODE: 2189 CODE:
1904{ 2190{
1905 int x, y, z; 2191 int x, y, z;
1906 2192
1907 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2193 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1908 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2194 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1909 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2195 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1910 smooth_key skey; 2196 smooth_key skey;
1911 int pl_x, pl_y; 2197 int pl_x, pl_y;
1912 maptex pl_tex; 2198 maptex pl_tex;
1913 rc_t *rc = rc_alloc (); 2199 rc_t *rc = rc_alloc ();
2200 rc_t *rc_ov = rc_alloc ();
1914 rc_key_t key; 2201 rc_key_t key;
1915 rc_array_t *arr; 2202 rc_array_t *arr;
1916 2203
1917 pl_tex.name = 0; 2204 pl_tex.name = 0;
1918 2205
1919 // thats current max. sorry. 2206 // that's current max. sorry.
1920 if (sw > 255) sw = 255; 2207 if (sw > 255) sw = 255;
1921 if (sh > 255) sh = 255; 2208 if (sh > 255) sh = 255;
1922 2209
1923 // clear key, in case of extra padding 2210 // clear key, in case of extra padding
1924 memset (&skey, 0, sizeof (skey)); 2211 memset (&skey, 0, sizeof (skey));
1928 key.g = 255; 2215 key.g = 255;
1929 key.b = 255; 2216 key.b = 255;
1930 key.a = 255; 2217 key.a = 255;
1931 key.mode = GL_QUADS; 2218 key.mode = GL_QUADS;
1932 key.format = GL_T2F_V3F; 2219 key.format = GL_T2F_V3F;
1933 key.texname = -1;
1934 2220
1935 mx += self->x; 2221 mx += self->x;
1936 my += self->y; 2222 my += self->y;
1937 2223
1938 // first pass: determine smooth_max 2224 // first pass: determine smooth_max
1962 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2248 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1963 2249
1964 for (z = 0; z <= 2; z++) 2250 for (z = 0; z <= 2; z++)
1965 { 2251 {
1966 memset (smooth_level, 0, sizeof (smooth_level)); 2252 memset (smooth_level, 0, sizeof (smooth_level));
2253 key.texname = -1;
1967 2254
1968 for (y = 0; y < sh; y++) 2255 for (y = 0; y < sh; y++)
1969 if (0 <= y + my && y + my < self->rows) 2256 if (0 <= y + my && y + my < self->rows)
1970 { 2257 {
1971 maprow *row = self->row + (y + my); 2258 maprow *row = self->row + (y + my);
1977 tileid tile = cell->tile [z]; 2264 tileid tile = cell->tile [z];
1978 2265
1979 if (tile) 2266 if (tile)
1980 { 2267 {
1981 maptex tex = self->tex [tile]; 2268 maptex tex = self->tex [tile];
1982 int px = (x + 1) * T - tex.w; 2269 int px, py;
1983 int py = (y + 1) * T - tex.h;
1984 2270
1985 if (key.texname != tex.name) 2271 if (key.texname != tex.name)
1986 { 2272 {
2273 self->tex [tile].unused = 0;
2274
1987 if (!tex.name) 2275 if (!tex.name)
1988 tex = self->tex [2]; /* missing, replace by noface */ 2276 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1989 2277
1990 key.texname = tex.name; 2278 key.texname = tex.name;
1991 arr = rc_array (rc, &key); 2279 arr = rc_array (rc, &key);
1992 } 2280 }
2281
2282 px = (x + 1) * Th - tex.w;
2283 py = (y + 1) * Tw - tex.h;
1993 2284
1994 if (expect_false (cell->player == player) && expect_false (z == 2)) 2285 if (expect_false (cell->player == player) && expect_false (z == 2))
1995 { 2286 {
1996 pl_x = px; 2287 pl_x = px;
1997 pl_y = py; 2288 pl_y = py;
2002 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2293 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2003 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2294 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2004 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2295 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2005 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2296 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2006 2297
2007 if (expect_false (cell->flags) && expect_false (z == 2))
2008 {
2009 // overlays such as the speech bubble, probably more to come
2010 if (cell->flags & 1)
2011 {
2012 maptex tex = self->tex [1];
2013 int px = x * T + T * 2 / 32;
2014 int py = y * T - T * 6 / 32;
2015
2016 if (tex.name)
2017 {
2018 if (key.texname != tex.name)
2019 {
2020 key.texname = tex.name;
2021 arr = rc_array (rc, &key);
2022 }
2023
2024 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2025 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2026 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2027 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2028 }
2029 }
2030 }
2031
2032 // update smooth hash 2298 // update smooth hash
2033 if (tex.smoothtile) 2299 if (tex.smoothtile)
2034 { 2300 {
2035 skey.tile = tex.smoothtile; 2301 skey.tile = tex.smoothtile;
2036 skey.level = tex.smoothlevel; 2302 skey.level = tex.smoothlevel;
2064 // corners 2330 // corners
2065 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2331 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2066 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2332 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2067 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2333 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2068 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2334 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2335 }
2336 }
2337
2338 if (expect_false (z == 2) && expect_false (cell->flags))
2339 {
2340 // overlays such as the speech bubble, probably more to come
2341 if (cell->flags & 1)
2342 {
2343 rc_key_t key_ov = key;
2344 maptex tex = self->tex [TEXID_SPEECH];
2345 rc_array_t *arr;
2346 int px = x * Tw + Tw * 2 / 32;
2347 int py = y * Th - Th * 6 / 32;
2348
2349 key_ov.texname = tex.name;
2350 arr = rc_array (rc_ov, &key_ov);
2351
2352 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2353 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2354 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2355 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2069 } 2356 }
2070 } 2357 }
2071 } 2358 }
2072 } 2359 }
2073 2360
2100 if (!(bits & 0x1000) 2387 if (!(bits & 0x1000)
2101 && skey->level == level 2388 && skey->level == level
2102 && level > smooth_max [skey->x][skey->y]) 2389 && level > smooth_max [skey->x][skey->y])
2103 { 2390 {
2104 maptex tex = self->tex [skey->tile]; 2391 maptex tex = self->tex [skey->tile];
2105 int px = (((int)skey->x) - 1) * T; 2392 int px = (((int)skey->x) - 1) * Tw;
2106 int py = (((int)skey->y) - 1) * T; 2393 int py = (((int)skey->y) - 1) * Th;
2107 int border = bits & 15; 2394 int border = bits & 15;
2108 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2395 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2109 float dx = tex.s * .0625f; // 16 images/row 2396 float dx = tex.s * .0625f; // 16 images/row
2110 float dy = tex.t * .5f ; // 2 images/column 2397 float dy = tex.t * .5f ; // 2 images/column
2111 2398
2113 { 2400 {
2114 // this time avoiding texture state changes 2401 // this time avoiding texture state changes
2115 // save gobs of state changes. 2402 // save gobs of state changes.
2116 if (key.texname != tex.name) 2403 if (key.texname != tex.name)
2117 { 2404 {
2405 self->tex [skey->tile].unused = 0;
2406
2118 glEnd (); 2407 glEnd ();
2119 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2408 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2120 glBegin (GL_QUADS); 2409 glBegin (GL_QUADS);
2121 } 2410 }
2122 2411
2123 if (border) 2412 if (border)
2124 { 2413 {
2125 float ox = border * dx; 2414 float ox = border * dx;
2126 2415
2127 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2416 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2128 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2417 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2129 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2418 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2130 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2419 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2131 } 2420 }
2132 2421
2133 if (corner) 2422 if (corner)
2134 { 2423 {
2135 float ox = corner * dx; 2424 float ox = corner * dx;
2136 2425
2137 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2426 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2138 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2427 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2139 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2428 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2140 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2429 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2141 } 2430 }
2142 } 2431 }
2143 } 2432 }
2144 } 2433 }
2145 } 2434 }
2168 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2457 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2169 2458
2170 rc_draw (rc); 2459 rc_draw (rc);
2171 } 2460 }
2172 2461
2462 rc_draw (rc_ov);
2463 rc_clear (rc_ov);
2464
2173 glDisable (GL_BLEND); 2465 glDisable (GL_BLEND);
2174 rc_free (rc); 2466 rc_free (rc);
2467 rc_free (rc_ov);
2175 2468
2176 // top layer: overlays such as the health bar 2469 // top layer: overlays such as the health bar
2177 for (y = 0; y < sh; y++) 2470 for (y = 0; y < sh; y++)
2178 if (0 <= y + my && y + my < self->rows) 2471 if (0 <= y + my && y + my < self->rows)
2179 { 2472 {
2182 for (x = 0; x < sw; x++) 2475 for (x = 0; x < sw; x++)
2183 if (row->c0 <= x + mx && x + mx < row->c1) 2476 if (row->c0 <= x + mx && x + mx < row->c1)
2184 { 2477 {
2185 mapcell *cell = row->col + (x + mx - row->c0); 2478 mapcell *cell = row->col + (x + mx - row->c0);
2186 2479
2187 int px = x * T; 2480 int px = x * Tw;
2188 int py = y * T; 2481 int py = y * Th;
2482
2483 if (expect_false (cell->player == player))
2484 {
2485 px += sdx;
2486 py += sdy;
2487 }
2189 2488
2190 if (cell->stat_hp) 2489 if (cell->stat_hp)
2191 { 2490 {
2192 int width = cell->stat_width * T; 2491 int width = cell->stat_width * Tw;
2193 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2492 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2194 2493
2195 glColor3ub (0, 0, 0); 2494 glColor3ub (0, 0, 0);
2196 glRectf (px + 1, py - thick - 2, 2495 glRectf (px + 1, py - thick - 2,
2197 px + width - 1, py); 2496 px + width - 1, py);
2198 2497
2204 } 2503 }
2205 } 2504 }
2206} 2505}
2207 2506
2208void 2507void
2209draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2508draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2210 CODE: 2509 CODE:
2211{ 2510{
2212 static float color[16][3] = { 2511 static float color[16][3] = {
2213 { 0.00F, 0.00F, 0.00F }, 2512 { 0.00f, 0.00f, 0.00f },
2214 { 1.00F, 1.00F, 1.00F }, 2513 { 1.00f, 1.00f, 1.00f },
2215 { 0.00F, 0.00F, 0.55F }, 2514 { 0.00f, 0.00f, 0.55f },
2216 { 1.00F, 0.00F, 0.00F }, 2515 { 1.00f, 0.00f, 0.00f },
2217 2516
2218 { 1.00F, 0.54F, 0.00F }, 2517 { 1.00f, 0.54f, 0.00f },
2219 { 0.11F, 0.56F, 1.00F }, 2518 { 0.11f, 0.56f, 1.00f },
2220 { 0.93F, 0.46F, 0.00F }, 2519 { 0.93f, 0.46f, 0.00f },
2221 { 0.18F, 0.54F, 0.34F }, 2520 { 0.18f, 0.54f, 0.34f },
2222 2521
2223 { 0.56F, 0.73F, 0.56F }, 2522 { 0.56f, 0.73f, 0.56f },
2224 { 0.80F, 0.80F, 0.80F }, 2523 { 0.80f, 0.80f, 0.80f },
2225 { 0.55F, 0.41F, 0.13F }, 2524 { 0.55f, 0.41f, 0.13f },
2226 { 0.99F, 0.77F, 0.26F }, 2525 { 0.99f, 0.77f, 0.26f },
2227 2526
2228 { 0.74F, 0.65F, 0.41F }, 2527 { 0.74f, 0.65f, 0.41f },
2229 2528
2230 { 0.00F, 1.00F, 1.00F }, 2529 { 0.00f, 1.00f, 1.00f },
2231 { 1.00F, 0.00F, 1.00F }, 2530 { 1.00f, 0.00f, 1.00f },
2232 { 1.00F, 1.00F, 0.00F }, 2531 { 1.00f, 1.00f, 0.00f },
2233 }; 2532 };
2234 2533
2235 int x, y; 2534 int x, y;
2236 2535
2237 glEnable (GL_TEXTURE_2D); 2536 glEnable (GL_TEXTURE_2D);
2537 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2538 * but the nvidia driver (185.18.14) mishandles alpha textures
2539 * and takes the colour from god knows where instead of using
2540 * Cp. MODULATE results in the same colour, but slightly different
2541 * alpha, but atcually gives us the correct colour with nvidia.
2542 */
2238 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2543 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2239 glEnable (GL_BLEND); 2544 glEnable (GL_BLEND);
2240 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2545 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2241 glBegin (GL_QUADS); 2546 glBegin (GL_QUADS);
2242 2547
2243 for (y = 0; y < h; y++) 2548 for (y = 0; y < h; y++)
2247 2552
2248 if (m) 2553 if (m)
2249 { 2554 {
2250 float *c = color [m & 15]; 2555 float *c = color [m & 15];
2251 2556
2252 float tx1 = m & 0x40 ? 0.5 : 0.; 2557 float tx1 = m & 0x40 ? 0.5f : 0.f;
2253 float tx2 = tx1 + 0.5; 2558 float tx2 = tx1 + 0.5f;
2254 2559
2255 glColor4f (c[0], c[1], c[2], 0.75); 2560 glColor4f (c[0], c[1], c[2], 1);
2256 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2561 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2257 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2562 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2258 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2563 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2259 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2564 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2260 } 2565 }
2268void 2573void
2269fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2574fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2270 PPCODE: 2575 PPCODE:
2271{ 2576{
2272 int x, y; 2577 int x, y;
2273 int sw1 = sw + 2; 2578 int sw1 = sw + 2;
2274 int sh1 = sh + 2; 2579 int sh1 = sh + 2;
2275 int sh3 = sh * 3; 2580 int sh3 = sh * 3;
2276 int sw34 = (sw * 3 + 3) & ~3; 2581 int sw3 = sw * 3;
2582 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2583 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2277 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2584 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2278 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2585 memset (darkness1, 0, sw1*sh1);
2279 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2280 2586
2281 SvPOK_only (darkness3_sv); 2587 SvPOK_only (darkness3_sv);
2282 SvCUR_set (darkness3_sv, sw34 * sh3); 2588 SvCUR_set (darkness3_sv, sw3 * sh3);
2283 2589
2284 mx += self->x - 1; 2590 mx += self->x - 1;
2285 my += self->y - 1; 2591 my += self->y - 1;
2286
2287 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2288 2592
2289 for (y = 0; y < sh1; y++) 2593 for (y = 0; y < sh1; y++)
2290 if (0 <= y + my && y + my < self->rows) 2594 if (0 <= y + my && y + my < self->rows)
2291 { 2595 {
2292 maprow *row = self->row + (y + my); 2596 maprow *row = self->row + (y + my);
2295 if (row->c0 <= x + mx && x + mx < row->c1) 2599 if (row->c0 <= x + mx && x + mx < row->c1)
2296 { 2600 {
2297 mapcell *cell = row->col + (x + mx - row->c0); 2601 mapcell *cell = row->col + (x + mx - row->c0);
2298 2602
2299 darkness1 [y * sw1 + x] = cell->darkness 2603 darkness1 [y * sw1 + x] = cell->darkness
2300 ? 255 - (cell->darkness - 1) 2604 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2301 : 255 - FOW_DARKNESS; 2605 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2302 } 2606 }
2303 } 2607 }
2304 2608
2305 for (y = 0; y < sh; ++y) 2609 for (y = 0; y < sh; ++y)
2306 for (x = 0; x < sw; ++x) 2610 for (x = 0; x < sw; ++x)
2325 2629
2326 uint8_t r13 = (d13 + d23 + d12) / 3; 2630 uint8_t r13 = (d13 + d23 + d12) / 3;
2327 uint8_t r23 = d23; 2631 uint8_t r23 = d23;
2328 uint8_t r33 = (d23 + d33 + d32) / 3; 2632 uint8_t r33 = (d23 + d33 + d32) / 3;
2329 2633
2330 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2634 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2331 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2635 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2332 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2636 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2333 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2637 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2334 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2638 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2335 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2639 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2336 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2640 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2337 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2641 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2338 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2642 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2339 } 2643 }
2340 2644
2341 free (darkness1); 2645 free (darkness1);
2342 2646
2343 EXTEND (SP, 3); 2647 EXTEND (SP, 3);
2344 PUSHs (sv_2mortal (newSViv (sw34))); 2648 PUSHs (sv_2mortal (newSViv (sw3)));
2345 PUSHs (sv_2mortal (newSViv (sh3))); 2649 PUSHs (sv_2mortal (newSViv (sh3)));
2346 PUSHs (darkness3_sv); 2650 PUSHs (darkness3_sv);
2347} 2651}
2348 2652
2349SV * 2653SV *
2547 if (RETVAL < 0) 2851 if (RETVAL < 0)
2548 { 2852 {
2549 RETVAL = Mix_GroupOldest (-1); 2853 RETVAL = Mix_GroupOldest (-1);
2550 2854
2551 if (RETVAL < 0) 2855 if (RETVAL < 0)
2856 {
2857 // happens sometimes, maybe it just stopped playing(?)
2858 RETVAL = Mix_GroupAvailable (-1);
2859
2860 if (RETVAL < 0)
2552 XSRETURN_UNDEF; 2861 XSRETURN_UNDEF;
2553 2862 }
2863 else
2554 Mix_HaltChannel (RETVAL); 2864 Mix_HaltChannel (RETVAL);
2555 } 2865 }
2556 2866
2557 Mix_UnregisterAllEffects (RETVAL); 2867 Mix_UnregisterAllEffects (RETVAL);
2558 Mix_Volume (RETVAL, 128); 2868 Mix_Volume (RETVAL, 128);
2559} 2869}
2606void 2916void
2607set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2917set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2608 CODE: 2918 CODE:
2609{ 2919{
2610 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2920 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2611 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2921 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2612 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2922 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2613} 2923}
2614 2924
2615void 2925void
2616set_reverse_stereo (DC::Channel self, int flip) 2926set_reverse_stereo (DC::Channel self, int flip)
2618 Mix_SetReverseStereo (self, flip); 2928 Mix_SetReverseStereo (self, flip);
2619 2929
2620MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2930MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2621 2931
2622PROTOTYPES: DISABLE 2932PROTOTYPES: DISABLE
2933
2934void
2935decoders ()
2936 PPCODE:
2937#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2938 int i, num = Mix_GetNumChunkDecoders ();
2939 EXTEND (SP, num);
2940 for (i = 0; i < num; ++i)
2941 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2942#else
2943 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2944#endif
2623 2945
2624DC::MixChunk 2946DC::MixChunk
2625new (SV *class, DC::RW rwops) 2947new (SV *class, DC::RW rwops)
2626 CODE: 2948 CODE:
2627 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2949 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2660 OUTPUT: 2982 OUTPUT:
2661 RETVAL 2983 RETVAL
2662 2984
2663MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2985MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2664 2986
2987void
2988decoders ()
2989 PPCODE:
2990#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2991 int i, num = Mix_GetNumMusicDecoders ();
2992 EXTEND (SP, num);
2993 for (i = 0; i < num; ++i)
2994 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2995#else
2996 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2997#endif
2998
2665int 2999int
2666volume (int volume = -1) 3000volume (int volume = -1)
2667 PROTOTYPE: ;$ 3001 PROTOTYPE: ;$
2668 CODE: 3002 CODE:
2669 if (items > 0) 3003 if (items > 0)
2679 3013
2680void 3014void
2681halt () 3015halt ()
2682 CODE: 3016 CODE:
2683 Mix_HaltMusic (); 3017 Mix_HaltMusic ();
3018
3019int
3020playing ()
3021 CODE:
3022 RETVAL = Mix_PlayingMusic ();
3023 OUTPUT:
3024 RETVAL
2684 3025
2685DC::MixMusic 3026DC::MixMusic
2686new (SV *class, DC::RW rwops) 3027new (SV *class, DC::RW rwops)
2687 CODE: 3028 CODE:
2688 RETVAL = Mix_LoadMUS_RW (rwops); 3029 RETVAL = Mix_LoadMUS_RW (rwops);
2719 } *civ, const_iv[] = { 3060 } *civ, const_iv[] = {
2720# define const_iv(name) { # name, (IV)name } 3061# define const_iv(name) { # name, (IV)name }
2721 const_iv (GL_VENDOR), 3062 const_iv (GL_VENDOR),
2722 const_iv (GL_VERSION), 3063 const_iv (GL_VERSION),
2723 const_iv (GL_EXTENSIONS), 3064 const_iv (GL_EXTENSIONS),
3065 const_iv (GL_MAX_TEXTURE_UNITS),
2724 const_iv (GL_COLOR_MATERIAL), 3066 const_iv (GL_COLOR_MATERIAL),
2725 const_iv (GL_SMOOTH), 3067 const_iv (GL_SMOOTH),
2726 const_iv (GL_FLAT), 3068 const_iv (GL_FLAT),
2727 const_iv (GL_DITHER), 3069 const_iv (GL_DITHER),
2728 const_iv (GL_BLEND), 3070 const_iv (GL_BLEND),
2740 const_iv (GL_ZERO), 3082 const_iv (GL_ZERO),
2741 const_iv (GL_SRC_ALPHA), 3083 const_iv (GL_SRC_ALPHA),
2742 const_iv (GL_DST_ALPHA), 3084 const_iv (GL_DST_ALPHA),
2743 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3085 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2744 const_iv (GL_ONE_MINUS_DST_ALPHA), 3086 const_iv (GL_ONE_MINUS_DST_ALPHA),
3087 const_iv (GL_SRC_COLOR),
3088 const_iv (GL_DST_COLOR),
3089 const_iv (GL_ONE_MINUS_SRC_COLOR),
3090 const_iv (GL_ONE_MINUS_DST_COLOR),
2745 const_iv (GL_SRC_ALPHA_SATURATE), 3091 const_iv (GL_SRC_ALPHA_SATURATE),
2746 const_iv (GL_RGB), 3092 const_iv (GL_RGB),
2747 const_iv (GL_RGBA), 3093 const_iv (GL_RGBA),
2748 const_iv (GL_RGBA4), 3094 const_iv (GL_RGBA4),
2749 const_iv (GL_RGBA8), 3095 const_iv (GL_RGBA8),
2817 const_iv (GL_NICEST), 3163 const_iv (GL_NICEST),
2818 const_iv (GL_V2F), 3164 const_iv (GL_V2F),
2819 const_iv (GL_V3F), 3165 const_iv (GL_V3F),
2820 const_iv (GL_T2F_V3F), 3166 const_iv (GL_T2F_V3F),
2821 const_iv (GL_T2F_N3F_V3F), 3167 const_iv (GL_T2F_N3F_V3F),
3168 const_iv (GL_FUNC_ADD),
3169 const_iv (GL_FUNC_SUBTRACT),
3170 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2822# undef const_iv 3171# undef const_iv
2823 }; 3172 };
2824 3173
2825 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3174 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2826 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3175 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2827 3176
2828 texture_av = newAV (); 3177 texture_av = newAV ();
2829 AvREAL_off (texture_av); 3178 AvREAL_off (texture_av);
2830} 3179}
2831 3180
2832void 3181void
2833disable_GL_EXT_blend_func_separate () 3182disable_GL_EXT_blend_func_separate ()
2834 CODE: 3183 CODE:
2835 gl.BlendFuncSeparate = 0; 3184 gl.BlendFuncSeparate = 0;
2836 gl.BlendFuncSeparateEXT = 0; 3185 gl.BlendFuncSeparateEXT = 0;
3186
3187void
3188apple_nvidia_bug (int enable)
2837 3189
2838char * 3190char *
2839gl_vendor () 3191gl_vendor ()
2840 CODE: 3192 CODE:
2841 RETVAL = (char *)glGetString (GL_VENDOR); 3193 RETVAL = (char *)glGetString (GL_VENDOR);
2872 3224
2873int glGetError () 3225int glGetError ()
2874 3226
2875void glFinish () 3227void glFinish ()
2876 3228
3229void glFlush ()
3230
2877void glClear (int mask) 3231void glClear (int mask)
2878 3232
2879void glClearColor (float r, float g, float b, float a = 1.0) 3233void glClearColor (float r, float g, float b, float a = 1.0)
2880 PROTOTYPE: @ 3234 PROTOTYPE: @
2881 3235
2890void glBlendFunc (int sfactor, int dfactor) 3244void glBlendFunc (int sfactor, int dfactor)
2891 3245
2892void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3246void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2893 CODE: 3247 CODE:
2894 gl_BlendFuncSeparate (sa, da, saa, daa); 3248 gl_BlendFuncSeparate (sa, da, saa, daa);
3249
3250# void glBlendEquation (int se)
2895 3251
2896void glDepthMask (int flag) 3252void glDepthMask (int flag)
2897 3253
2898void glLogicOp (int opcode) 3254void glLogicOp (int opcode)
2899 3255
2934void glRotate (float angle, float x, float y, float z) 3290void glRotate (float angle, float x, float y, float z)
2935 CODE: 3291 CODE:
2936 glRotatef (angle, x, y, z); 3292 glRotatef (angle, x, y, z);
2937 3293
2938void glColor (float r, float g, float b, float a = 1.0) 3294void glColor (float r, float g, float b, float a = 1.0)
3295 PROTOTYPE: @
2939 ALIAS: 3296 ALIAS:
2940 glColor_premultiply = 1 3297 glColor_premultiply = 1
2941 CODE: 3298 CODE:
2942 if (ix) 3299 if (ix)
2943 { 3300 {
3048void glNewList (int list, int mode = GL_COMPILE) 3405void glNewList (int list, int mode = GL_COMPILE)
3049 3406
3050void glEndList () 3407void glEndList ()
3051 3408
3052void glCallList (int list) 3409void glCallList (int list)
3410
3411void c_init ()
3412 CODE:
3413 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3414 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3053 3415
3054MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3416MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3055 3417
3056PROTOTYPES: DISABLE 3418PROTOTYPES: DISABLE
3057 3419

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines