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.314 by root, Wed Jan 18 15:31:51 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 (SV *real_main)
534{ 583{
535 char *argv[] = { 0 };
536 call_argv ("::main", G_DISCARD | G_VOID, argv);
537 dSP; 584 dSP;
585
586 PUSHMARK (SP);
587 call_sv (real_main, G_DISCARD | G_VOID);
538} 588}
539 589
540#ifdef __MACOSX__ 590#ifdef __MACOSX__
591 static SV *real_main;
592
541 /* to due surprising braindamage on the side of SDL design, we 593 /* to due surprising braindamage on the side of SDL design, we
542 * do some mind-boggling hack here: SDL requires a custom main() 594 * 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, 595 * 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, 596 * due to shared library magic, calls -lSDLmain's main, not perl's main,
545 * and which calls our main (== SDL_main) back. 597 * and which calls our main (== SDL_main) back.
546 */ 598 */
547 extern C_LINKAGE int 599 extern C_LINKAGE int
548 main (int argc, char *argv[]) 600 main (int argc, char *argv[])
549 { 601 {
550 deliantra_main (); 602 deliantra_main (real_main);
551 } 603 }
552 604
553 #undef main 605 #undef main
554 606
555 extern C_LINKAGE int main (int argc, char *argv[]); 607 extern C_LINKAGE int main (int argc, char *argv[]);
556 608
557 static void 609 static void
558 SDL_braino (void) 610 SDL_main_hack (SV *real_main_)
559 { 611 {
612 real_main = real_main;
613
560 char *argv[] = { "deliantra client", 0 }; 614 char *argv[] = { "deliantra client", 0 };
561 (main) (1, argv); 615 (main) (1, argv);
562 } 616 }
563#else 617#else
564 static void 618 static void
565 SDL_braino (void) 619 SDL_main_hack (SV *real_main)
566 { 620 {
567 deliantra_main (); 621 deliantra_main (real_main);
568 } 622 }
569#endif 623#endif
570 624
571MODULE = Deliantra::Client PACKAGE = DC 625MODULE = Deliantra::Client PACKAGE = DC
572 626
603 const_iv (SDL_USEREVENT), 657 const_iv (SDL_USEREVENT),
604 658
605 const_iv (SDL_APPINPUTFOCUS), 659 const_iv (SDL_APPINPUTFOCUS),
606 const_iv (SDL_APPMOUSEFOCUS), 660 const_iv (SDL_APPMOUSEFOCUS),
607 const_iv (SDL_APPACTIVE), 661 const_iv (SDL_APPACTIVE),
662
663
664 const_iv (SDLK_UNKNOWN),
665 const_iv (SDLK_FIRST),
666 const_iv (SDLK_BACKSPACE),
667 const_iv (SDLK_TAB),
668 const_iv (SDLK_CLEAR),
669 const_iv (SDLK_RETURN),
670 const_iv (SDLK_PAUSE),
671 const_iv (SDLK_ESCAPE),
672 const_iv (SDLK_SPACE),
673 const_iv (SDLK_EXCLAIM),
674 const_iv (SDLK_QUOTEDBL),
675 const_iv (SDLK_HASH),
676 const_iv (SDLK_DOLLAR),
677 const_iv (SDLK_AMPERSAND),
678 const_iv (SDLK_QUOTE),
679 const_iv (SDLK_LEFTPAREN),
680 const_iv (SDLK_RIGHTPAREN),
681 const_iv (SDLK_ASTERISK),
682 const_iv (SDLK_PLUS),
683 const_iv (SDLK_COMMA),
684 const_iv (SDLK_MINUS),
685 const_iv (SDLK_PERIOD),
686 const_iv (SDLK_SLASH),
687 const_iv (SDLK_0),
688 const_iv (SDLK_1),
689 const_iv (SDLK_2),
690 const_iv (SDLK_3),
691 const_iv (SDLK_4),
692 const_iv (SDLK_5),
693 const_iv (SDLK_6),
694 const_iv (SDLK_7),
695 const_iv (SDLK_8),
696 const_iv (SDLK_9),
697 const_iv (SDLK_COLON),
698 const_iv (SDLK_SEMICOLON),
699 const_iv (SDLK_LESS),
700 const_iv (SDLK_EQUALS),
701 const_iv (SDLK_GREATER),
702 const_iv (SDLK_QUESTION),
703 const_iv (SDLK_AT),
704
705 const_iv (SDLK_LEFTBRACKET),
706 const_iv (SDLK_BACKSLASH),
707 const_iv (SDLK_RIGHTBRACKET),
708 const_iv (SDLK_CARET),
709 const_iv (SDLK_UNDERSCORE),
710 const_iv (SDLK_BACKQUOTE),
711 const_iv (SDLK_DELETE),
608 712
609 const_iv (SDLK_FIRST), 713 const_iv (SDLK_FIRST),
610 const_iv (SDLK_LAST), 714 const_iv (SDLK_LAST),
611 const_iv (SDLK_KP0), 715 const_iv (SDLK_KP0),
612 const_iv (SDLK_KP1), 716 const_iv (SDLK_KP1),
688 const_iv (KMOD_RMETA), 792 const_iv (KMOD_RMETA),
689 const_iv (KMOD_NUM), 793 const_iv (KMOD_NUM),
690 const_iv (KMOD_CAPS), 794 const_iv (KMOD_CAPS),
691 const_iv (KMOD_MODE), 795 const_iv (KMOD_MODE),
692 796
797 const_iv (KMOD_LRAM),
798
693 const_iv (MIX_DEFAULT_FORMAT), 799 const_iv (MIX_DEFAULT_FORMAT),
694 800
695 const_iv (SDL_INIT_TIMER), 801 const_iv (SDL_INIT_TIMER),
696 const_iv (SDL_INIT_AUDIO), 802 const_iv (SDL_INIT_AUDIO),
697 const_iv (SDL_INIT_VIDEO), 803 const_iv (SDL_INIT_VIDEO),
721 827
722 const_iv (FOW_DARKNESS) 828 const_iv (FOW_DARKNESS)
723# undef const_iv 829# undef const_iv
724 }; 830 };
725 831
726 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 832 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
727 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 833 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
728 834
729 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 835 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
730 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 836 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
731} 837}
732 838
748NV ceil (NV x) 854NV ceil (NV x)
749 855
750IV minpot (UV n) 856IV minpot (UV n)
751 857
752IV popcount (UV n) 858IV popcount (UV n)
859
860NV distance (NV dx, NV dy)
861 CODE:
862 RETVAL = pow (dx * dx + dy * dy, 0.5);
863 OUTPUT:
864 RETVAL
753 865
754void 866void
755pango_init () 867pango_init ()
756 CODE: 868 CODE:
757{ 869{
765#endif 877#endif
766} 878}
767 879
768char *SDL_GetError () 880char *SDL_GetError ()
769 881
770void SDL_braino () 882void SDL_main_hack (SV *real_main)
883 PROTOTYPE: &
771 884
772int SDL_Init (U32 flags) 885int SDL_Init (U32 flags)
773 886
774int SDL_InitSubSystem (U32 flags) 887int SDL_InitSubSystem (U32 flags)
775 888
844 ); 957 );
845 958
846 if (RETVAL) 959 if (RETVAL)
847 { 960 {
848 av_clear (texture_av); 961 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); 962#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
852#include "glfunc.h" 963#include "glfunc.h"
853#undef GL_FUNC 964#undef GL_FUNC
965 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
966 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
854 } 967 }
855} 968}
856 OUTPUT: 969 OUTPUT:
857 RETVAL 970 RETVAL
858 971
859void 972void
973SDL_WM_SetCaption (const char *title, const char *icon)
974
975void
860SDL_GL_SwapBuffers () 976SDL_GL_SwapBuffers ()
861 977
862char * 978char *
863SDL_GetKeyName (int sym) 979SDL_GetKeyName (int sym)
864 980
866SDL_GetAppState () 982SDL_GetAppState ()
867 983
868int 984int
869SDL_GetModState () 985SDL_GetModState ()
870 986
987int
988SDL_WaitEvent ()
989 C_ARGS: 0
990
871void 991void
992SDL_PumpEvents ()
993
994void
872poll_events () 995peep_events ()
873 PPCODE: 996 PPCODE:
874{ 997{
875 SDL_Event ev; 998 SDL_Event ev;
876 999
877 SDL_PumpEvents (); 1000 SDL_PumpEvents ();
884 { 1007 {
885 case SDL_KEYDOWN: 1008 case SDL_KEYDOWN:
886 case SDL_KEYUP: 1009 case SDL_KEYUP:
887 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1010 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
888 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1011 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); 1012 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 */ 1013 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); 1014 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
892 break; 1015 break;
893 1016
894 case SDL_ACTIVEEVENT: 1017 case SDL_ACTIVEEVENT:
895 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1018 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
913 x = ev.motion.x; 1036 x = ev.motion.x;
914 y = ev.motion.y; 1037 y = ev.motion.y;
915 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1038 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
916 } 1039 }
917 1040
918 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1041 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
919 hv_store (hv, "state", 5, newSViv (state), 0); 1042 hv_store (hv, "state", 5, newSViv (state), 0);
920 hv_store (hv, "x", 1, newSViv (x), 0); 1043 hv_store (hv, "x", 1, newSViv (x), 0);
921 hv_store (hv, "y", 1, newSViv (y), 0); 1044 hv_store (hv, "y", 1, newSViv (y), 0);
922 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1045 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
923 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1046 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
943 1066
944 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1067 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
945 } 1068 }
946} 1069}
947 1070
1071char *
1072SDL_AudioDriverName ()
1073 CODE:
1074{
1075 char buf [256];
1076 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1077 XSRETURN_UNDEF;
1078
1079 RETVAL = buf;
1080}
1081 OUTPUT:
1082 RETVAL
1083
948int 1084int
949Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1085Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
950 POSTCALL: 1086 POSTCALL:
951 Mix_HookMusicFinished (music_finished); 1087 Mix_HookMusicFinished (music_finished);
952 Mix_ChannelFinished (channel_finished); 1088 Mix_ChannelFinished (channel_finished);
1014add_font (char *file) 1150add_font (char *file)
1015 CODE: 1151 CODE:
1016 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1152 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1017 OUTPUT: 1153 OUTPUT:
1018 RETVAL 1154 RETVAL
1155
1156void
1157IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1158
1159# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1160void
1161Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1019 1162
1020void 1163void
1021load_image_inline (SV *image_) 1164load_image_inline (SV *image_)
1022 ALIAS: 1165 ALIAS:
1023 load_image_file = 1 1166 load_image_file = 1
1139#if DEBUG 1282#if DEBUG
1140 VALGRIND_DO_LEAK_CHECK; 1283 VALGRIND_DO_LEAK_CHECK;
1141#endif 1284#endif
1142} 1285}
1143 1286
1287int
1288SvREFCNT (SV *sv)
1289 CODE:
1290 RETVAL = SvREFCNT (sv);
1291 OUTPUT:
1292 RETVAL
1293
1144MODULE = Deliantra::Client PACKAGE = DC::Font 1294MODULE = Deliantra::Client PACKAGE = DC::Font
1145 1295
1146PROTOTYPES: DISABLE 1296PROTOTYPES: DISABLE
1147 1297
1148DC::Font 1298DC::Font
1577 if (ix) 1727 if (ix)
1578 { 1728 {
1579 glDisable (GL_ALPHA_TEST); 1729 glDisable (GL_ALPHA_TEST);
1580 glDisable (GL_BLEND); 1730 glDisable (GL_BLEND);
1581 } 1731 }
1732}
1733
1734void
1735draw_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)
1736 PROTOTYPE: @
1737 CODE:
1738{
1739 glEnable (GL_BLEND);
1740 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1741 glEnable (GL_TEXTURE_2D);
1742 glBindTexture (GL_TEXTURE_2D, name1);
1743
1744 glColor3f (intensity, intensity, intensity);
1745 glPushMatrix ();
1746 glScalef (1./3, 1./3, 1.);
1747
1748 if (blend > 0.f)
1749 {
1750 float dx3 = dx * -3.f / w;
1751 float dy3 = dy * -3.f / h;
1752 GLfloat env_color[4] = { 0., 0., 0., blend };
1753
1754 /* interpolate the two shadow textures */
1755 /* stage 0 == rgb(glcolor) + alpha(t0) */
1756 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1757
1758 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1759 gl.ActiveTexture (GL_TEXTURE1);
1760 glEnable (GL_TEXTURE_2D);
1761 glBindTexture (GL_TEXTURE_2D, name2);
1762 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1763
1764 /* rgb == rgb(glcolor) */
1765 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1766 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1767 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1768
1769 /* alpha = interpolate t0, t1 by env_alpha */
1770 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1771
1772 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1773 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1774 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1775
1776 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1777 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1778
1779 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1780 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1781
1782 glBegin (GL_QUADS);
1783 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1784 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1785 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1786 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1787 glEnd ();
1788
1789 glDisable (GL_TEXTURE_2D);
1790 gl.ActiveTexture (GL_TEXTURE0);
1791 }
1792 else
1793 {
1794 /* simple blending of one texture, also opengl <1.3 path */
1795 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1796
1797 glBegin (GL_QUADS);
1798 glTexCoord2f (0, 0); glVertex2f (0, 0);
1799 glTexCoord2f (0, t); glVertex2f (0, h);
1800 glTexCoord2f (s, t); glVertex2f (w, h);
1801 glTexCoord2f (s, 0); glVertex2f (w, 0);
1802 glEnd ();
1803 }
1804
1805 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1806 {
1807 int x, y;
1808 int dx3 = dx * 3;
1809 int dy3 = dy * 3;
1810
1811 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1812 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1813 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1814 glTranslatef (-1., -1., 0);
1815 glBegin (GL_QUADS);
1816
1817 for (y = 1; y < h; y += 3)
1818 {
1819 int y1 = y - dy3;
1820 int y1valid = y1 >= 0 && y1 < h;
1821
1822 for (x = 1; x < w; x += 3)
1823 {
1824 int x1 = x - dx3;
1825 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1826 uint8_t h2;
1827
1828 if (y1valid && x1 >= 0 && x1 < w)
1829 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1830 else
1831 h2 = 1; /* out of range == invisible */
1832
1833 if (h1 || h2)
1834 {
1835 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1836 glColor4f (1., 1., 1., alpha);
1837
1838 glTexCoord2f (0, 0.); glVertex2i (x , y );
1839 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1840 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1841 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1842 }
1843 }
1844 }
1845 }
1846
1847 glEnd ();
1848
1849 glPopMatrix ();
1850
1851 glDisable (GL_TEXTURE_2D);
1852 glDisable (GL_BLEND);
1582} 1853}
1583 1854
1584IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1855IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1585 CODE: 1856 CODE:
1586{ 1857{
1692 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1963 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1693 // use uglier nearest interpolation because linear suffers 1964 // use uglier nearest interpolation because linear suffers
1694 // from transparent color bleeding and ugly wrapping effects. 1965 // from transparent color bleeding and ugly wrapping effects.
1695 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1966 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1696} 1967}
1968
1969void
1970expire_textures (DC::Map self, int texid, int count)
1971 PPCODE:
1972 for (; texid < self->texs && count; ++texid, --count)
1973 {
1974 maptex *tex = self->tex + texid;
1975
1976 if (tex->name)
1977 {
1978 if (tex->unused)
1979 {
1980 tex->name = 0;
1981 tex->unused = 0;
1982 XPUSHs (sv_2mortal (newSViv (texid)));
1983 }
1984 else
1985 tex->unused = 1;
1986 }
1987 }
1697 1988
1698int 1989int
1699ox (DC::Map self) 1990ox (DC::Map self)
1700 ALIAS: 1991 ALIAS:
1701 oy = 1 1992 oy = 1
1782 { 2073 {
1783 ext = *data++; 2074 ext = *data++;
1784 cmd = ext & 0x7f; 2075 cmd = ext & 0x7f;
1785 2076
1786 if (cmd < 4) 2077 if (cmd < 4)
1787 cell->darkness = 255 - ext * 64 + 1; 2078 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1788 else if (cmd == 5) // health 2079 else if (cmd == 5) // health
1789 { 2080 {
1790 cell->stat_width = 1; 2081 cell->stat_width = 1;
1791 cell->stat_hp = *data++; 2082 cell->stat_hp = *data++;
1792 } 2083 }
1822 cell->tile [z] = self->face2tile [face]; 2113 cell->tile [z] = self->face2tile [face];
1823 2114
1824 if (cell->tile [z]) 2115 if (cell->tile [z])
1825 { 2116 {
1826 maptex *tex = self->tex + cell->tile [z]; 2117 maptex *tex = self->tex + cell->tile [z];
2118 tex->unused = 0;
1827 if (!tex->name) 2119 if (!tex->name)
1828 av_push (missing, newSViv (cell->tile [z])); 2120 av_push (missing, newSViv (cell->tile [z]));
1829 2121
1830 if (tex->smoothtile) 2122 if (tex->smoothtile)
1831 { 2123 {
1832 maptex *smooth = self->tex + tex->smoothtile; 2124 maptex *smooth = self->tex + tex->smoothtile;
2125 smooth->unused = 0;
1833 if (!smooth->name) 2126 if (!smooth->name)
1834 av_push (missing, newSViv (tex->smoothtile)); 2127 av_push (missing, newSViv (tex->smoothtile));
1835 } 2128 }
1836 } 2129 }
1837 } 2130 }
1865 ? self->row + y 2158 ? self->row + y
1866 : 0; 2159 : 0;
1867 2160
1868 for (x = x0; x < x1; x++) 2161 for (x = x0; x < x1; x++)
1869 { 2162 {
1870 int r = 32, g = 32, b = 32, a = 192; 2163 unsigned int r = 32, g = 32, b = 32, a = 192;
1871 2164
1872 if (row && row->c0 <= x && x < row->c1) 2165 if (row && row->c0 <= x && x < row->c1)
1873 { 2166 {
1874 mapcell *cell = row->col + (x - row->c0); 2167 mapcell *cell = row->col + (x - row->c0);
1875 2168
1877 { 2170 {
1878 maptex tex = self->tex [cell->tile [z]]; 2171 maptex tex = self->tex [cell->tile [z]];
1879 int a0 = 255 - tex.a; 2172 int a0 = 255 - tex.a;
1880 int a1 = tex.a; 2173 int a1 = tex.a;
1881 2174
1882 r = (r * a0 + tex.r * a1) / 255; 2175 r = div255 (r * a0 + tex.r * a1);
1883 g = (g * a0 + tex.g * a1) / 255; 2176 g = div255 (g * a0 + tex.g * a1);
1884 b = (b * a0 + tex.b * a1) / 255; 2177 b = div255 (b * a0 + tex.b * a1);
1885 a = (a * a0 + tex.a * a1) / 255; 2178 a = div255 (a * a0 + tex.a * a1);
1886 } 2179 }
1887 } 2180 }
1888 2181
1889 *map++ = (r ) 2182 *map++ = (r )
1890 | (g << 8) 2183 | (g << 8)
1897} 2190}
1898 OUTPUT: 2191 OUTPUT:
1899 RETVAL 2192 RETVAL
1900 2193
1901void 2194void
1902draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2195draw (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: 2196 CODE:
1904{ 2197{
1905 int x, y, z; 2198 int x, y, z;
1906 2199
1907 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2200 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1908 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2201 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) 2202 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1910 smooth_key skey; 2203 smooth_key skey;
1911 int pl_x, pl_y; 2204 int pl_x, pl_y;
1912 maptex pl_tex; 2205 maptex pl_tex;
1913 rc_t *rc = rc_alloc (); 2206 rc_t *rc = rc_alloc ();
2207 rc_t *rc_ov = rc_alloc ();
1914 rc_key_t key; 2208 rc_key_t key;
1915 rc_array_t *arr; 2209 rc_array_t *arr;
1916 2210
1917 pl_tex.name = 0; 2211 pl_tex.name = 0;
1918 2212
1919 // thats current max. sorry. 2213 // that's current max. sorry.
1920 if (sw > 255) sw = 255; 2214 if (sw > 255) sw = 255;
1921 if (sh > 255) sh = 255; 2215 if (sh > 255) sh = 255;
1922 2216
1923 // clear key, in case of extra padding 2217 // clear key, in case of extra padding
1924 memset (&skey, 0, sizeof (skey)); 2218 memset (&skey, 0, sizeof (skey));
1928 key.g = 255; 2222 key.g = 255;
1929 key.b = 255; 2223 key.b = 255;
1930 key.a = 255; 2224 key.a = 255;
1931 key.mode = GL_QUADS; 2225 key.mode = GL_QUADS;
1932 key.format = GL_T2F_V3F; 2226 key.format = GL_T2F_V3F;
1933 key.texname = -1;
1934 2227
1935 mx += self->x; 2228 mx += self->x;
1936 my += self->y; 2229 my += self->y;
1937 2230
1938 // first pass: determine smooth_max 2231 // first pass: determine smooth_max
1962 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2255 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1963 2256
1964 for (z = 0; z <= 2; z++) 2257 for (z = 0; z <= 2; z++)
1965 { 2258 {
1966 memset (smooth_level, 0, sizeof (smooth_level)); 2259 memset (smooth_level, 0, sizeof (smooth_level));
2260 key.texname = -1;
1967 2261
1968 for (y = 0; y < sh; y++) 2262 for (y = 0; y < sh; y++)
1969 if (0 <= y + my && y + my < self->rows) 2263 if (0 <= y + my && y + my < self->rows)
1970 { 2264 {
1971 maprow *row = self->row + (y + my); 2265 maprow *row = self->row + (y + my);
1977 tileid tile = cell->tile [z]; 2271 tileid tile = cell->tile [z];
1978 2272
1979 if (tile) 2273 if (tile)
1980 { 2274 {
1981 maptex tex = self->tex [tile]; 2275 maptex tex = self->tex [tile];
1982 int px = (x + 1) * T - tex.w; 2276 int px, py;
1983 int py = (y + 1) * T - tex.h;
1984 2277
1985 if (key.texname != tex.name) 2278 if (key.texname != tex.name)
1986 { 2279 {
2280 self->tex [tile].unused = 0;
2281
1987 if (!tex.name) 2282 if (!tex.name)
1988 tex = self->tex [2]; /* missing, replace by noface */ 2283 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1989 2284
1990 key.texname = tex.name; 2285 key.texname = tex.name;
1991 arr = rc_array (rc, &key); 2286 arr = rc_array (rc, &key);
1992 } 2287 }
2288
2289 px = (x + 1) * Th - tex.w;
2290 py = (y + 1) * Tw - tex.h;
1993 2291
1994 if (expect_false (cell->player == player) && expect_false (z == 2)) 2292 if (expect_false (cell->player == player) && expect_false (z == 2))
1995 { 2293 {
1996 pl_x = px; 2294 pl_x = px;
1997 pl_y = py; 2295 pl_y = py;
2002 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2300 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2003 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2301 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); 2302 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); 2303 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2006 2304
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 2305 // update smooth hash
2033 if (tex.smoothtile) 2306 if (tex.smoothtile)
2034 { 2307 {
2035 skey.tile = tex.smoothtile; 2308 skey.tile = tex.smoothtile;
2036 skey.level = tex.smoothlevel; 2309 skey.level = tex.smoothlevel;
2064 // corners 2337 // corners
2065 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2338 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); 2339 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); 2340 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); 2341 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2342 }
2343 }
2344
2345 if (expect_false (z == 2) && expect_false (cell->flags))
2346 {
2347 // overlays such as the speech bubble, probably more to come
2348 if (cell->flags & 1)
2349 {
2350 rc_key_t key_ov = key;
2351 maptex tex = self->tex [TEXID_SPEECH];
2352 rc_array_t *arr;
2353 int px = x * Tw + Tw * 2 / 32;
2354 int py = y * Th - Th * 6 / 32;
2355
2356 key_ov.texname = tex.name;
2357 arr = rc_array (rc_ov, &key_ov);
2358
2359 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2360 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2361 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2362 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2069 } 2363 }
2070 } 2364 }
2071 } 2365 }
2072 } 2366 }
2073 2367
2100 if (!(bits & 0x1000) 2394 if (!(bits & 0x1000)
2101 && skey->level == level 2395 && skey->level == level
2102 && level > smooth_max [skey->x][skey->y]) 2396 && level > smooth_max [skey->x][skey->y])
2103 { 2397 {
2104 maptex tex = self->tex [skey->tile]; 2398 maptex tex = self->tex [skey->tile];
2105 int px = (((int)skey->x) - 1) * T; 2399 int px = (((int)skey->x) - 1) * Tw;
2106 int py = (((int)skey->y) - 1) * T; 2400 int py = (((int)skey->y) - 1) * Th;
2107 int border = bits & 15; 2401 int border = bits & 15;
2108 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2402 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2109 float dx = tex.s * .0625f; // 16 images/row 2403 float dx = tex.s * .0625f; // 16 images/row
2110 float dy = tex.t * .5f ; // 2 images/column 2404 float dy = tex.t * .5f ; // 2 images/column
2111 2405
2113 { 2407 {
2114 // this time avoiding texture state changes 2408 // this time avoiding texture state changes
2115 // save gobs of state changes. 2409 // save gobs of state changes.
2116 if (key.texname != tex.name) 2410 if (key.texname != tex.name)
2117 { 2411 {
2412 self->tex [skey->tile].unused = 0;
2413
2118 glEnd (); 2414 glEnd ();
2119 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2415 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2120 glBegin (GL_QUADS); 2416 glBegin (GL_QUADS);
2121 } 2417 }
2122 2418
2123 if (border) 2419 if (border)
2124 { 2420 {
2125 float ox = border * dx; 2421 float ox = border * dx;
2126 2422
2127 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2423 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2128 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2424 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2129 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2425 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2130 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2426 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2131 } 2427 }
2132 2428
2133 if (corner) 2429 if (corner)
2134 { 2430 {
2135 float ox = corner * dx; 2431 float ox = corner * dx;
2136 2432
2137 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2433 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2138 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2434 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2139 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2435 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2140 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2436 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2141 } 2437 }
2142 } 2438 }
2143 } 2439 }
2144 } 2440 }
2145 } 2441 }
2168 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2464 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2169 2465
2170 rc_draw (rc); 2466 rc_draw (rc);
2171 } 2467 }
2172 2468
2469 rc_draw (rc_ov);
2470 rc_clear (rc_ov);
2471
2173 glDisable (GL_BLEND); 2472 glDisable (GL_BLEND);
2174 rc_free (rc); 2473 rc_free (rc);
2474 rc_free (rc_ov);
2175 2475
2176 // top layer: overlays such as the health bar 2476 // top layer: overlays such as the health bar
2177 for (y = 0; y < sh; y++) 2477 for (y = 0; y < sh; y++)
2178 if (0 <= y + my && y + my < self->rows) 2478 if (0 <= y + my && y + my < self->rows)
2179 { 2479 {
2182 for (x = 0; x < sw; x++) 2482 for (x = 0; x < sw; x++)
2183 if (row->c0 <= x + mx && x + mx < row->c1) 2483 if (row->c0 <= x + mx && x + mx < row->c1)
2184 { 2484 {
2185 mapcell *cell = row->col + (x + mx - row->c0); 2485 mapcell *cell = row->col + (x + mx - row->c0);
2186 2486
2187 int px = x * T; 2487 int px = x * Tw;
2188 int py = y * T; 2488 int py = y * Th;
2489
2490 if (expect_false (cell->player == player))
2491 {
2492 px += sdx;
2493 py += sdy;
2494 }
2189 2495
2190 if (cell->stat_hp) 2496 if (cell->stat_hp)
2191 { 2497 {
2192 int width = cell->stat_width * T; 2498 int width = cell->stat_width * Tw;
2193 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2499 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2194 2500
2195 glColor3ub (0, 0, 0); 2501 glColor3ub (0, 0, 0);
2196 glRectf (px + 1, py - thick - 2, 2502 glRectf (px + 1, py - thick - 2,
2197 px + width - 1, py); 2503 px + width - 1, py);
2198 2504
2204 } 2510 }
2205 } 2511 }
2206} 2512}
2207 2513
2208void 2514void
2209draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2515draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2210 CODE: 2516 CODE:
2211{ 2517{
2212 static float color[16][3] = { 2518 static float color[16][3] = {
2213 { 0.00F, 0.00F, 0.00F }, 2519 { 0.00f, 0.00f, 0.00f },
2214 { 1.00F, 1.00F, 1.00F }, 2520 { 1.00f, 1.00f, 1.00f },
2215 { 0.00F, 0.00F, 0.55F }, 2521 { 0.00f, 0.00f, 0.55f },
2216 { 1.00F, 0.00F, 0.00F }, 2522 { 1.00f, 0.00f, 0.00f },
2217 2523
2218 { 1.00F, 0.54F, 0.00F }, 2524 { 1.00f, 0.54f, 0.00f },
2219 { 0.11F, 0.56F, 1.00F }, 2525 { 0.11f, 0.56f, 1.00f },
2220 { 0.93F, 0.46F, 0.00F }, 2526 { 0.93f, 0.46f, 0.00f },
2221 { 0.18F, 0.54F, 0.34F }, 2527 { 0.18f, 0.54f, 0.34f },
2222 2528
2223 { 0.56F, 0.73F, 0.56F }, 2529 { 0.56f, 0.73f, 0.56f },
2224 { 0.80F, 0.80F, 0.80F }, 2530 { 0.80f, 0.80f, 0.80f },
2225 { 0.55F, 0.41F, 0.13F }, 2531 { 0.55f, 0.41f, 0.13f },
2226 { 0.99F, 0.77F, 0.26F }, 2532 { 0.99f, 0.77f, 0.26f },
2227 2533
2228 { 0.74F, 0.65F, 0.41F }, 2534 { 0.74f, 0.65f, 0.41f },
2229 2535
2230 { 0.00F, 1.00F, 1.00F }, 2536 { 0.00f, 1.00f, 1.00f },
2231 { 1.00F, 0.00F, 1.00F }, 2537 { 1.00f, 0.00f, 1.00f },
2232 { 1.00F, 1.00F, 0.00F }, 2538 { 1.00f, 1.00f, 0.00f },
2233 }; 2539 };
2234 2540
2235 int x, y; 2541 int x, y;
2236 2542
2237 glEnable (GL_TEXTURE_2D); 2543 glEnable (GL_TEXTURE_2D);
2544 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2545 * but the nvidia driver (185.18.14) mishandles alpha textures
2546 * and takes the colour from god knows where instead of using
2547 * Cp. MODULATE results in the same colour, but slightly different
2548 * alpha, but atcually gives us the correct colour with nvidia.
2549 */
2238 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2550 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2239 glEnable (GL_BLEND); 2551 glEnable (GL_BLEND);
2240 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2552 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2241 glBegin (GL_QUADS); 2553 glBegin (GL_QUADS);
2242 2554
2243 for (y = 0; y < h; y++) 2555 for (y = 0; y < h; y++)
2247 2559
2248 if (m) 2560 if (m)
2249 { 2561 {
2250 float *c = color [m & 15]; 2562 float *c = color [m & 15];
2251 2563
2252 float tx1 = m & 0x40 ? 0.5 : 0.; 2564 float tx1 = m & 0x40 ? 0.5f : 0.f;
2253 float tx2 = tx1 + 0.5; 2565 float tx2 = tx1 + 0.5f;
2254 2566
2255 glColor4f (c[0], c[1], c[2], 0.75); 2567 glColor4f (c[0], c[1], c[2], 1);
2256 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2568 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2257 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2569 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2258 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2570 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2259 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2571 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2260 } 2572 }
2268void 2580void
2269fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2581fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2270 PPCODE: 2582 PPCODE:
2271{ 2583{
2272 int x, y; 2584 int x, y;
2273 int sw1 = sw + 2; 2585 int sw1 = sw + 2;
2274 int sh1 = sh + 2; 2586 int sh1 = sh + 2;
2275 int sh3 = sh * 3; 2587 int sh3 = sh * 3;
2276 int sw34 = (sw * 3 + 3) & ~3; 2588 int sw3 = sw * 3;
2589 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2590 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2277 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2591 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2278 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2592 memset (darkness1, 0, sw1*sh1);
2279 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2280 2593
2281 SvPOK_only (darkness3_sv); 2594 SvPOK_only (darkness3_sv);
2282 SvCUR_set (darkness3_sv, sw34 * sh3); 2595 SvCUR_set (darkness3_sv, sw3 * sh3);
2283 2596
2284 mx += self->x - 1; 2597 mx += self->x - 1;
2285 my += self->y - 1; 2598 my += self->y - 1;
2286
2287 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2288 2599
2289 for (y = 0; y < sh1; y++) 2600 for (y = 0; y < sh1; y++)
2290 if (0 <= y + my && y + my < self->rows) 2601 if (0 <= y + my && y + my < self->rows)
2291 { 2602 {
2292 maprow *row = self->row + (y + my); 2603 maprow *row = self->row + (y + my);
2295 if (row->c0 <= x + mx && x + mx < row->c1) 2606 if (row->c0 <= x + mx && x + mx < row->c1)
2296 { 2607 {
2297 mapcell *cell = row->col + (x + mx - row->c0); 2608 mapcell *cell = row->col + (x + mx - row->c0);
2298 2609
2299 darkness1 [y * sw1 + x] = cell->darkness 2610 darkness1 [y * sw1 + x] = cell->darkness
2300 ? 255 - (cell->darkness - 1) 2611 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2301 : 255 - FOW_DARKNESS; 2612 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2302 } 2613 }
2303 } 2614 }
2304 2615
2305 for (y = 0; y < sh; ++y) 2616 for (y = 0; y < sh; ++y)
2306 for (x = 0; x < sw; ++x) 2617 for (x = 0; x < sw; ++x)
2325 2636
2326 uint8_t r13 = (d13 + d23 + d12) / 3; 2637 uint8_t r13 = (d13 + d23 + d12) / 3;
2327 uint8_t r23 = d23; 2638 uint8_t r23 = d23;
2328 uint8_t r33 = (d23 + d33 + d32) / 3; 2639 uint8_t r33 = (d23 + d33 + d32) / 3;
2329 2640
2330 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2331 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2642 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2332 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2643 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2333 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2334 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2645 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); 2646 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2336 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2337 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2648 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2338 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2649 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2339 } 2650 }
2340 2651
2341 free (darkness1); 2652 free (darkness1);
2342 2653
2343 EXTEND (SP, 3); 2654 EXTEND (SP, 3);
2344 PUSHs (sv_2mortal (newSViv (sw34))); 2655 PUSHs (sv_2mortal (newSViv (sw3)));
2345 PUSHs (sv_2mortal (newSViv (sh3))); 2656 PUSHs (sv_2mortal (newSViv (sh3)));
2346 PUSHs (darkness3_sv); 2657 PUSHs (darkness3_sv);
2347} 2658}
2348 2659
2349SV * 2660SV *
2547 if (RETVAL < 0) 2858 if (RETVAL < 0)
2548 { 2859 {
2549 RETVAL = Mix_GroupOldest (-1); 2860 RETVAL = Mix_GroupOldest (-1);
2550 2861
2551 if (RETVAL < 0) 2862 if (RETVAL < 0)
2863 {
2864 // happens sometimes, maybe it just stopped playing(?)
2865 RETVAL = Mix_GroupAvailable (-1);
2866
2867 if (RETVAL < 0)
2552 XSRETURN_UNDEF; 2868 XSRETURN_UNDEF;
2553 2869 }
2870 else
2554 Mix_HaltChannel (RETVAL); 2871 Mix_HaltChannel (RETVAL);
2555 } 2872 }
2556 2873
2557 Mix_UnregisterAllEffects (RETVAL); 2874 Mix_UnregisterAllEffects (RETVAL);
2558 Mix_Volume (RETVAL, 128); 2875 Mix_Volume (RETVAL, 128);
2559} 2876}
2606void 2923void
2607set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2924set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2608 CODE: 2925 CODE:
2609{ 2926{
2610 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2927 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); 2928 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2612 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2929 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2613} 2930}
2614 2931
2615void 2932void
2616set_reverse_stereo (DC::Channel self, int flip) 2933set_reverse_stereo (DC::Channel self, int flip)
2618 Mix_SetReverseStereo (self, flip); 2935 Mix_SetReverseStereo (self, flip);
2619 2936
2620MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2937MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2621 2938
2622PROTOTYPES: DISABLE 2939PROTOTYPES: DISABLE
2940
2941void
2942decoders ()
2943 PPCODE:
2944#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2945 int i, num = Mix_GetNumChunkDecoders ();
2946 EXTEND (SP, num);
2947 for (i = 0; i < num; ++i)
2948 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2949#else
2950 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2951#endif
2623 2952
2624DC::MixChunk 2953DC::MixChunk
2625new (SV *class, DC::RW rwops) 2954new (SV *class, DC::RW rwops)
2626 CODE: 2955 CODE:
2627 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2956 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2660 OUTPUT: 2989 OUTPUT:
2661 RETVAL 2990 RETVAL
2662 2991
2663MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2992MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2664 2993
2994void
2995decoders ()
2996 PPCODE:
2997#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2998 int i, num = Mix_GetNumMusicDecoders ();
2999 EXTEND (SP, num);
3000 for (i = 0; i < num; ++i)
3001 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3002#else
3003 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3004#endif
3005
2665int 3006int
2666volume (int volume = -1) 3007volume (int volume = -1)
2667 PROTOTYPE: ;$ 3008 PROTOTYPE: ;$
2668 CODE: 3009 CODE:
2669 if (items > 0) 3010 if (items > 0)
2679 3020
2680void 3021void
2681halt () 3022halt ()
2682 CODE: 3023 CODE:
2683 Mix_HaltMusic (); 3024 Mix_HaltMusic ();
3025
3026int
3027playing ()
3028 CODE:
3029 RETVAL = Mix_PlayingMusic ();
3030 OUTPUT:
3031 RETVAL
2684 3032
2685DC::MixMusic 3033DC::MixMusic
2686new (SV *class, DC::RW rwops) 3034new (SV *class, DC::RW rwops)
2687 CODE: 3035 CODE:
2688 RETVAL = Mix_LoadMUS_RW (rwops); 3036 RETVAL = Mix_LoadMUS_RW (rwops);
2719 } *civ, const_iv[] = { 3067 } *civ, const_iv[] = {
2720# define const_iv(name) { # name, (IV)name } 3068# define const_iv(name) { # name, (IV)name }
2721 const_iv (GL_VENDOR), 3069 const_iv (GL_VENDOR),
2722 const_iv (GL_VERSION), 3070 const_iv (GL_VERSION),
2723 const_iv (GL_EXTENSIONS), 3071 const_iv (GL_EXTENSIONS),
3072 const_iv (GL_MAX_TEXTURE_UNITS),
2724 const_iv (GL_COLOR_MATERIAL), 3073 const_iv (GL_COLOR_MATERIAL),
2725 const_iv (GL_SMOOTH), 3074 const_iv (GL_SMOOTH),
2726 const_iv (GL_FLAT), 3075 const_iv (GL_FLAT),
2727 const_iv (GL_DITHER), 3076 const_iv (GL_DITHER),
2728 const_iv (GL_BLEND), 3077 const_iv (GL_BLEND),
2740 const_iv (GL_ZERO), 3089 const_iv (GL_ZERO),
2741 const_iv (GL_SRC_ALPHA), 3090 const_iv (GL_SRC_ALPHA),
2742 const_iv (GL_DST_ALPHA), 3091 const_iv (GL_DST_ALPHA),
2743 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3092 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2744 const_iv (GL_ONE_MINUS_DST_ALPHA), 3093 const_iv (GL_ONE_MINUS_DST_ALPHA),
3094 const_iv (GL_SRC_COLOR),
3095 const_iv (GL_DST_COLOR),
3096 const_iv (GL_ONE_MINUS_SRC_COLOR),
3097 const_iv (GL_ONE_MINUS_DST_COLOR),
2745 const_iv (GL_SRC_ALPHA_SATURATE), 3098 const_iv (GL_SRC_ALPHA_SATURATE),
2746 const_iv (GL_RGB), 3099 const_iv (GL_RGB),
2747 const_iv (GL_RGBA), 3100 const_iv (GL_RGBA),
2748 const_iv (GL_RGBA4), 3101 const_iv (GL_RGBA4),
2749 const_iv (GL_RGBA8), 3102 const_iv (GL_RGBA8),
2817 const_iv (GL_NICEST), 3170 const_iv (GL_NICEST),
2818 const_iv (GL_V2F), 3171 const_iv (GL_V2F),
2819 const_iv (GL_V3F), 3172 const_iv (GL_V3F),
2820 const_iv (GL_T2F_V3F), 3173 const_iv (GL_T2F_V3F),
2821 const_iv (GL_T2F_N3F_V3F), 3174 const_iv (GL_T2F_N3F_V3F),
3175 const_iv (GL_FUNC_ADD),
3176 const_iv (GL_FUNC_SUBTRACT),
3177 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2822# undef const_iv 3178# undef const_iv
2823 }; 3179 };
2824 3180
2825 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3181 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2826 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3182 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2827 3183
2828 texture_av = newAV (); 3184 texture_av = newAV ();
2829 AvREAL_off (texture_av); 3185 AvREAL_off (texture_av);
2830} 3186}
2831 3187
2832void 3188void
2833disable_GL_EXT_blend_func_separate () 3189disable_GL_EXT_blend_func_separate ()
2834 CODE: 3190 CODE:
2835 gl.BlendFuncSeparate = 0; 3191 gl.BlendFuncSeparate = 0;
2836 gl.BlendFuncSeparateEXT = 0; 3192 gl.BlendFuncSeparateEXT = 0;
3193
3194void
3195apple_nvidia_bug (int enable)
2837 3196
2838char * 3197char *
2839gl_vendor () 3198gl_vendor ()
2840 CODE: 3199 CODE:
2841 RETVAL = (char *)glGetString (GL_VENDOR); 3200 RETVAL = (char *)glGetString (GL_VENDOR);
2872 3231
2873int glGetError () 3232int glGetError ()
2874 3233
2875void glFinish () 3234void glFinish ()
2876 3235
3236void glFlush ()
3237
2877void glClear (int mask) 3238void glClear (int mask)
2878 3239
2879void glClearColor (float r, float g, float b, float a = 1.0) 3240void glClearColor (float r, float g, float b, float a = 1.0)
2880 PROTOTYPE: @ 3241 PROTOTYPE: @
2881 3242
2890void glBlendFunc (int sfactor, int dfactor) 3251void glBlendFunc (int sfactor, int dfactor)
2891 3252
2892void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3253void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2893 CODE: 3254 CODE:
2894 gl_BlendFuncSeparate (sa, da, saa, daa); 3255 gl_BlendFuncSeparate (sa, da, saa, daa);
3256
3257# void glBlendEquation (int se)
2895 3258
2896void glDepthMask (int flag) 3259void glDepthMask (int flag)
2897 3260
2898void glLogicOp (int opcode) 3261void glLogicOp (int opcode)
2899 3262
2934void glRotate (float angle, float x, float y, float z) 3297void glRotate (float angle, float x, float y, float z)
2935 CODE: 3298 CODE:
2936 glRotatef (angle, x, y, z); 3299 glRotatef (angle, x, y, z);
2937 3300
2938void glColor (float r, float g, float b, float a = 1.0) 3301void glColor (float r, float g, float b, float a = 1.0)
3302 PROTOTYPE: @
2939 ALIAS: 3303 ALIAS:
2940 glColor_premultiply = 1 3304 glColor_premultiply = 1
2941 CODE: 3305 CODE:
2942 if (ix) 3306 if (ix)
2943 { 3307 {
3048void glNewList (int list, int mode = GL_COMPILE) 3412void glNewList (int list, int mode = GL_COMPILE)
3049 3413
3050void glEndList () 3414void glEndList ()
3051 3415
3052void glCallList (int list) 3416void glCallList (int list)
3417
3418void c_init ()
3419 CODE:
3420 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3421 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3053 3422
3054MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3423MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3055 3424
3056PROTOTYPES: DISABLE 3425PROTOTYPES: DISABLE
3057 3426

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines