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.267 by root, Sun Jul 20 02:55:36 2008 UTC vs.
Revision 1.312 by root, Thu Dec 29 07:13:44 2011 UTC

19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
38#include <SDL_thread.h> 37#include <SDL_thread.h>
39#include <SDL_endian.h> 38#include <SDL_endian.h>
40#include <SDL_image.h> 39#include <SDL_image.h>
41#include <SDL_mixer.h> 40#include <SDL_mixer.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
48#endif
43 49
44#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
46 52
47#include <glib/gmacros.h> 53#include <glib/gmacros.h>
76#define expect_false(expr) expect ((expr) != 0, 0) 82#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1) 83#define expect_true(expr) expect ((expr) != 0, 1)
78 84
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
81#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
82 91
83#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
85 94
86#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
87 96
88/* mask out modifiers we are not interested in */ 97/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
99
100#define KMOD_LRAM 0x10000 // our extension
101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
90 123
91static AV *texture_av; 124static AV *texture_av;
92 125
93static struct 126static struct
94{ 127{
226 int w, h; 259 int w, h;
227 float s, t; 260 float s, t;
228 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
229 tileid smoothtile; 262 tileid smoothtile;
230 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
231} maptex; 265} maptex;
232 266
233typedef struct { 267typedef struct {
234 uint32_t player; 268 uint32_t player;
235 tileid tile[3]; 269 tileid tile[3];
369 self->rows = 0; 403 self->rows = 0;
370} 404}
371 405
372#define CELL_CLEAR(cell) \ 406#define CELL_CLEAR(cell) \
373 do { \ 407 do { \
408 if ((cell)->player) \
409 (cell)->tile [2] = 0; \
374 (cell)->darkness = 0; \ 410 (cell)->darkness = 0; \
375 (cell)->stat_hp = 0; \ 411 (cell)->stat_hp = 0; \
376 (cell)->flags = 0; \ 412 (cell)->flags = 0; \
377 (cell)->player = 0; \ 413 (cell)->player = 0; \
378 } while (0) 414 } while (0)
446 482
447 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
448} 484}
449 485
450static unsigned int 486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
490}
491
492static unsigned int
451minpot (unsigned int n) 493minpot (unsigned int n)
452{ 494{
453 if (!n) 495 if (!n)
454 return 0; 496 return 0;
455 497
519 if (!svp || !SvTRUE (*svp)) 561 if (!svp || !SvTRUE (*svp))
520 return 0; 562 return 0;
521 563
522 return 1; 564 return 1;
523} 565}
566
567/******************************************************************************/
568
569/* process keyboard modifiers */
570static int
571mod_munge (int mod)
572{
573 mod &= MOD_MASK;
574
575 if (mod & (KMOD_META | KMOD_ALT))
576 mod |= KMOD_LRAM;
577
578 return mod;
579}
580
581static void
582deliantra_main ()
583{
584 char *argv[] = { 0 };
585 call_argv ("DC::Main::main", G_DISCARD | G_VOID, argv);
586}
587
588#ifdef __MACOSX__
589 /* to due surprising braindamage on the side of SDL design, we
590 * do some mind-boggling hack here: SDL requires a custom main()
591 * on OS X, so... we provide one and call the original main(), which,
592 * due to shared library magic, calls -lSDLmain's main, not perl's main,
593 * and which calls our main (== SDL_main) back.
594 */
595 extern C_LINKAGE int
596 main (int argc, char *argv[])
597 {
598 deliantra_main ();
599 }
600
601 #undef main
602
603 extern C_LINKAGE int main (int argc, char *argv[]);
604
605 static void
606 SDL_braino (void)
607 {
608 char *argv[] = { "deliantra client", 0 };
609 (main) (1, argv);
610 }
611#else
612 static void
613 SDL_braino (void)
614 {
615 deliantra_main ();
616 }
617#endif
524 618
525MODULE = Deliantra::Client PACKAGE = DC 619MODULE = Deliantra::Client PACKAGE = DC
526 620
527PROTOTYPES: ENABLE 621PROTOTYPES: ENABLE
528 622
557 const_iv (SDL_USEREVENT), 651 const_iv (SDL_USEREVENT),
558 652
559 const_iv (SDL_APPINPUTFOCUS), 653 const_iv (SDL_APPINPUTFOCUS),
560 const_iv (SDL_APPMOUSEFOCUS), 654 const_iv (SDL_APPMOUSEFOCUS),
561 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),
562 706
563 const_iv (SDLK_FIRST), 707 const_iv (SDLK_FIRST),
564 const_iv (SDLK_LAST), 708 const_iv (SDLK_LAST),
565 const_iv (SDLK_KP0), 709 const_iv (SDLK_KP0),
566 const_iv (SDLK_KP1), 710 const_iv (SDLK_KP1),
642 const_iv (KMOD_RMETA), 786 const_iv (KMOD_RMETA),
643 const_iv (KMOD_NUM), 787 const_iv (KMOD_NUM),
644 const_iv (KMOD_CAPS), 788 const_iv (KMOD_CAPS),
645 const_iv (KMOD_MODE), 789 const_iv (KMOD_MODE),
646 790
791 const_iv (KMOD_LRAM),
792
647 const_iv (MIX_DEFAULT_FORMAT), 793 const_iv (MIX_DEFAULT_FORMAT),
648 794
649 const_iv (SDL_INIT_TIMER), 795 const_iv (SDL_INIT_TIMER),
650 const_iv (SDL_INIT_AUDIO), 796 const_iv (SDL_INIT_AUDIO),
651 const_iv (SDL_INIT_VIDEO), 797 const_iv (SDL_INIT_VIDEO),
669 const_iv (SDL_GL_ACCUM_ALPHA_SIZE), 815 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
670 const_iv (SDL_GL_STEREO), 816 const_iv (SDL_GL_STEREO),
671 const_iv (SDL_GL_MULTISAMPLEBUFFERS), 817 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
672 const_iv (SDL_GL_MULTISAMPLESAMPLES), 818 const_iv (SDL_GL_MULTISAMPLESAMPLES),
673 const_iv (SDL_GL_ACCELERATED_VISUAL), 819 const_iv (SDL_GL_ACCELERATED_VISUAL),
674 const_iv (SDL_GL_SWAP_CONTROL) 820 const_iv (SDL_GL_SWAP_CONTROL),
821
822 const_iv (FOW_DARKNESS)
675# undef const_iv 823# undef const_iv
676 }; 824 };
677 825
678 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--)
679 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 827 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
680 828
681 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 829 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
682 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 830 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
683} 831}
684 832
700NV ceil (NV x) 848NV ceil (NV x)
701 849
702IV minpot (UV n) 850IV minpot (UV n)
703 851
704IV 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
705 859
706void 860void
707pango_init () 861pango_init ()
708 CODE: 862 CODE:
709{ 863{
716 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 870 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
717#endif 871#endif
718} 872}
719 873
720char *SDL_GetError () 874char *SDL_GetError ()
875
876void SDL_braino ()
721 877
722int SDL_Init (U32 flags) 878int SDL_Init (U32 flags)
723 879
724int SDL_InitSubSystem (U32 flags) 880int SDL_InitSubSystem (U32 flags)
725 881
799 955
800 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra"); 956 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
801#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 957#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
802#include "glfunc.h" 958#include "glfunc.h"
803#undef GL_FUNC 959#undef GL_FUNC
960
961 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
962 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
804 } 963 }
805} 964}
806 OUTPUT: 965 OUTPUT:
807 RETVAL 966 RETVAL
808 967
816SDL_GetAppState () 975SDL_GetAppState ()
817 976
818int 977int
819SDL_GetModState () 978SDL_GetModState ()
820 979
980int
981SDL_WaitEvent ()
982 C_ARGS: 0
983
821void 984void
985SDL_PumpEvents ()
986
987void
822poll_events () 988peep_events ()
823 PPCODE: 989 PPCODE:
824{ 990{
825 SDL_Event ev; 991 SDL_Event ev;
826 992
827 SDL_PumpEvents (); 993 SDL_PumpEvents ();
834 { 1000 {
835 case SDL_KEYDOWN: 1001 case SDL_KEYDOWN:
836 case SDL_KEYUP: 1002 case SDL_KEYUP:
837 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1003 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
838 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1004 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
839 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);
840 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 */
841 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1007 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
842 break; 1008 break;
843 1009
844 case SDL_ACTIVEEVENT: 1010 case SDL_ACTIVEEVENT:
845 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1011 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
863 x = ev.motion.x; 1029 x = ev.motion.x;
864 y = ev.motion.y; 1030 y = ev.motion.y;
865 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1031 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
866 } 1032 }
867 1033
868 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1034 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
869 hv_store (hv, "state", 5, newSViv (state), 0); 1035 hv_store (hv, "state", 5, newSViv (state), 0);
870 hv_store (hv, "x", 1, newSViv (x), 0); 1036 hv_store (hv, "x", 1, newSViv (x), 0);
871 hv_store (hv, "y", 1, newSViv (y), 0); 1037 hv_store (hv, "y", 1, newSViv (y), 0);
872 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1038 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
873 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1039 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
893 1059
894 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))));
895 } 1061 }
896} 1062}
897 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
898int 1077int
899Mix_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)
900 POSTCALL: 1079 POSTCALL:
901 Mix_HookMusicFinished (music_finished); 1080 Mix_HookMusicFinished (music_finished);
902 Mix_ChannelFinished (channel_finished); 1081 Mix_ChannelFinished (channel_finished);
964add_font (char *file) 1143add_font (char *file)
965 CODE: 1144 CODE:
966 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1145 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
967 OUTPUT: 1146 OUTPUT:
968 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)
969 1155
970void 1156void
971load_image_inline (SV *image_) 1157load_image_inline (SV *image_)
972 ALIAS: 1158 ALIAS:
973 load_image_file = 1 1159 load_image_file = 1
1089#if DEBUG 1275#if DEBUG
1090 VALGRIND_DO_LEAK_CHECK; 1276 VALGRIND_DO_LEAK_CHECK;
1091#endif 1277#endif
1092} 1278}
1093 1279
1280int
1281SvREFCNT (SV *sv)
1282 CODE:
1283 RETVAL = SvREFCNT (sv);
1284 OUTPUT:
1285 RETVAL
1286
1094MODULE = Deliantra::Client PACKAGE = DC::Font 1287MODULE = Deliantra::Client PACKAGE = DC::Font
1095 1288
1096PROTOTYPES: DISABLE 1289PROTOTYPES: DISABLE
1097 1290
1098DC::Font 1291DC::Font
1527 if (ix) 1720 if (ix)
1528 { 1721 {
1529 glDisable (GL_ALPHA_TEST); 1722 glDisable (GL_ALPHA_TEST);
1530 glDisable (GL_BLEND); 1723 glDisable (GL_BLEND);
1531 } 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);
1532} 1846}
1533 1847
1534IV 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)
1535 CODE: 1849 CODE:
1536{ 1850{
1642 //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);
1643 // use uglier nearest interpolation because linear suffers 1957 // use uglier nearest interpolation because linear suffers
1644 // from transparent color bleeding and ugly wrapping effects. 1958 // from transparent color bleeding and ugly wrapping effects.
1645 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1959 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1646} 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 }
1647 1981
1648int 1982int
1649ox (DC::Map self) 1983ox (DC::Map self)
1650 ALIAS: 1984 ALIAS:
1651 oy = 1 1985 oy = 1
1732 { 2066 {
1733 ext = *data++; 2067 ext = *data++;
1734 cmd = ext & 0x7f; 2068 cmd = ext & 0x7f;
1735 2069
1736 if (cmd < 4) 2070 if (cmd < 4)
1737 cell->darkness = 255 - ext * 64 + 1; 2071 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1738 else if (cmd == 5) // health 2072 else if (cmd == 5) // health
1739 { 2073 {
1740 cell->stat_width = 1; 2074 cell->stat_width = 1;
1741 cell->stat_hp = *data++; 2075 cell->stat_hp = *data++;
1742 } 2076 }
1772 cell->tile [z] = self->face2tile [face]; 2106 cell->tile [z] = self->face2tile [face];
1773 2107
1774 if (cell->tile [z]) 2108 if (cell->tile [z])
1775 { 2109 {
1776 maptex *tex = self->tex + cell->tile [z]; 2110 maptex *tex = self->tex + cell->tile [z];
2111 tex->unused = 0;
1777 if (!tex->name) 2112 if (!tex->name)
1778 av_push (missing, newSViv (cell->tile [z])); 2113 av_push (missing, newSViv (cell->tile [z]));
1779 2114
1780 if (tex->smoothtile) 2115 if (tex->smoothtile)
1781 { 2116 {
1782 maptex *smooth = self->tex + tex->smoothtile; 2117 maptex *smooth = self->tex + tex->smoothtile;
2118 smooth->unused = 0;
1783 if (!smooth->name) 2119 if (!smooth->name)
1784 av_push (missing, newSViv (tex->smoothtile)); 2120 av_push (missing, newSViv (tex->smoothtile));
1785 } 2121 }
1786 } 2122 }
1787 } 2123 }
1815 ? self->row + y 2151 ? self->row + y
1816 : 0; 2152 : 0;
1817 2153
1818 for (x = x0; x < x1; x++) 2154 for (x = x0; x < x1; x++)
1819 { 2155 {
1820 int r = 32, g = 32, b = 32, a = 192; 2156 unsigned int r = 32, g = 32, b = 32, a = 192;
1821 2157
1822 if (row && row->c0 <= x && x < row->c1) 2158 if (row && row->c0 <= x && x < row->c1)
1823 { 2159 {
1824 mapcell *cell = row->col + (x - row->c0); 2160 mapcell *cell = row->col + (x - row->c0);
1825 2161
1827 { 2163 {
1828 maptex tex = self->tex [cell->tile [z]]; 2164 maptex tex = self->tex [cell->tile [z]];
1829 int a0 = 255 - tex.a; 2165 int a0 = 255 - tex.a;
1830 int a1 = tex.a; 2166 int a1 = tex.a;
1831 2167
1832 r = (r * a0 + tex.r * a1) / 255; 2168 r = div255 (r * a0 + tex.r * a1);
1833 g = (g * a0 + tex.g * a1) / 255; 2169 g = div255 (g * a0 + tex.g * a1);
1834 b = (b * a0 + tex.b * a1) / 255; 2170 b = div255 (b * a0 + tex.b * a1);
1835 a = (a * a0 + tex.a * a1) / 255; 2171 a = div255 (a * a0 + tex.a * a1);
1836 } 2172 }
1837 } 2173 }
1838 2174
1839 *map++ = (r ) 2175 *map++ = (r )
1840 | (g << 8) 2176 | (g << 8)
1847} 2183}
1848 OUTPUT: 2184 OUTPUT:
1849 RETVAL 2185 RETVAL
1850 2186
1851void 2187void
1852draw (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)
1853 CODE: 2189 CODE:
1854{ 2190{
1855 int x, y, z; 2191 int x, y, z;
1856 2192
1857 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2193 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1858 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
1859 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)
1860 smooth_key skey; 2196 smooth_key skey;
1861 int pl_x, pl_y; 2197 int pl_x, pl_y;
1862 maptex pl_tex; 2198 maptex pl_tex;
1863 rc_t *rc = rc_alloc (); 2199 rc_t *rc = rc_alloc ();
2200 rc_t *rc_ov = rc_alloc ();
1864 rc_key_t key; 2201 rc_key_t key;
1865 rc_array_t *arr; 2202 rc_array_t *arr;
1866 2203
1867 pl_tex.name = 0; 2204 pl_tex.name = 0;
1868 2205
1869 // thats current max. sorry. 2206 // that's current max. sorry.
1870 if (sw > 255) sw = 255; 2207 if (sw > 255) sw = 255;
1871 if (sh > 255) sh = 255; 2208 if (sh > 255) sh = 255;
1872 2209
1873 // clear key, in case of extra padding 2210 // clear key, in case of extra padding
1874 memset (&skey, 0, sizeof (skey)); 2211 memset (&skey, 0, sizeof (skey));
1878 key.g = 255; 2215 key.g = 255;
1879 key.b = 255; 2216 key.b = 255;
1880 key.a = 255; 2217 key.a = 255;
1881 key.mode = GL_QUADS; 2218 key.mode = GL_QUADS;
1882 key.format = GL_T2F_V3F; 2219 key.format = GL_T2F_V3F;
1883 key.texname = -1;
1884 2220
1885 mx += self->x; 2221 mx += self->x;
1886 my += self->y; 2222 my += self->y;
1887 2223
1888 // first pass: determine smooth_max 2224 // first pass: determine smooth_max
1912 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2248 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1913 2249
1914 for (z = 0; z <= 2; z++) 2250 for (z = 0; z <= 2; z++)
1915 { 2251 {
1916 memset (smooth_level, 0, sizeof (smooth_level)); 2252 memset (smooth_level, 0, sizeof (smooth_level));
2253 key.texname = -1;
1917 2254
1918 for (y = 0; y < sh; y++) 2255 for (y = 0; y < sh; y++)
1919 if (0 <= y + my && y + my < self->rows) 2256 if (0 <= y + my && y + my < self->rows)
1920 { 2257 {
1921 maprow *row = self->row + (y + my); 2258 maprow *row = self->row + (y + my);
1927 tileid tile = cell->tile [z]; 2264 tileid tile = cell->tile [z];
1928 2265
1929 if (tile) 2266 if (tile)
1930 { 2267 {
1931 maptex tex = self->tex [tile]; 2268 maptex tex = self->tex [tile];
1932 int px = (x + 1) * T - tex.w; 2269 int px, py;
1933 int py = (y + 1) * T - tex.h;
1934 2270
1935 if (key.texname != tex.name) 2271 if (key.texname != tex.name)
1936 { 2272 {
2273 self->tex [tile].unused = 0;
2274
1937 if (!tex.name) 2275 if (!tex.name)
1938 tex = self->tex [2]; /* missing, replace by noface */ 2276 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1939 2277
1940 key.texname = tex.name; 2278 key.texname = tex.name;
1941 arr = rc_array (rc, &key); 2279 arr = rc_array (rc, &key);
1942 } 2280 }
2281
2282 px = (x + 1) * Th - tex.w;
2283 py = (y + 1) * Tw - tex.h;
1943 2284
1944 if (expect_false (cell->player == player) && expect_false (z == 2)) 2285 if (expect_false (cell->player == player) && expect_false (z == 2))
1945 { 2286 {
1946 pl_x = px; 2287 pl_x = px;
1947 pl_y = py; 2288 pl_y = py;
1952 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2293 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1953 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);
1954 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);
1955 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);
1956 2297
1957 if (expect_false (cell->flags) && expect_false (z == 2))
1958 {
1959 // overlays such as the speech bubble, probably more to come
1960 if (cell->flags & 1)
1961 {
1962 maptex tex = self->tex [1];
1963 int px = x * T + T * 2 / 32;
1964 int py = y * T - T * 6 / 32;
1965
1966 if (tex.name)
1967 {
1968 if (key.texname != tex.name)
1969 {
1970 key.texname = tex.name;
1971 arr = rc_array (rc, &key);
1972 }
1973
1974 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1975 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1976 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1977 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1978 }
1979 }
1980 }
1981
1982 // update smooth hash 2298 // update smooth hash
1983 if (tex.smoothtile) 2299 if (tex.smoothtile)
1984 { 2300 {
1985 skey.tile = tex.smoothtile; 2301 skey.tile = tex.smoothtile;
1986 skey.level = tex.smoothlevel; 2302 skey.level = tex.smoothlevel;
2014 // corners 2330 // corners
2015 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);
2016 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);
2017 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);
2018 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);
2019 } 2356 }
2020 } 2357 }
2021 } 2358 }
2022 } 2359 }
2023 2360
2050 if (!(bits & 0x1000) 2387 if (!(bits & 0x1000)
2051 && skey->level == level 2388 && skey->level == level
2052 && level > smooth_max [skey->x][skey->y]) 2389 && level > smooth_max [skey->x][skey->y])
2053 { 2390 {
2054 maptex tex = self->tex [skey->tile]; 2391 maptex tex = self->tex [skey->tile];
2055 int px = (((int)skey->x) - 1) * T; 2392 int px = (((int)skey->x) - 1) * Tw;
2056 int py = (((int)skey->y) - 1) * T; 2393 int py = (((int)skey->y) - 1) * Th;
2057 int border = bits & 15; 2394 int border = bits & 15;
2058 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2395 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2059 float dx = tex.s * .0625f; // 16 images/row 2396 float dx = tex.s * .0625f; // 16 images/row
2060 float dy = tex.t * .5f ; // 2 images/column 2397 float dy = tex.t * .5f ; // 2 images/column
2061 2398
2063 { 2400 {
2064 // this time avoiding texture state changes 2401 // this time avoiding texture state changes
2065 // save gobs of state changes. 2402 // save gobs of state changes.
2066 if (key.texname != tex.name) 2403 if (key.texname != tex.name)
2067 { 2404 {
2405 self->tex [skey->tile].unused = 0;
2406
2068 glEnd (); 2407 glEnd ();
2069 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2408 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2070 glBegin (GL_QUADS); 2409 glBegin (GL_QUADS);
2071 } 2410 }
2072 2411
2073 if (border) 2412 if (border)
2074 { 2413 {
2075 float ox = border * dx; 2414 float ox = border * dx;
2076 2415
2077 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2416 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2078 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2417 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2079 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2418 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2080 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2419 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2081 } 2420 }
2082 2421
2083 if (corner) 2422 if (corner)
2084 { 2423 {
2085 float ox = corner * dx; 2424 float ox = corner * dx;
2086 2425
2087 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2426 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2088 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2427 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2089 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2428 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2090 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2429 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2091 } 2430 }
2092 } 2431 }
2093 } 2432 }
2094 } 2433 }
2095 } 2434 }
2118 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);
2119 2458
2120 rc_draw (rc); 2459 rc_draw (rc);
2121 } 2460 }
2122 2461
2462 rc_draw (rc_ov);
2463 rc_clear (rc_ov);
2464
2123 glDisable (GL_BLEND); 2465 glDisable (GL_BLEND);
2124 rc_free (rc); 2466 rc_free (rc);
2467 rc_free (rc_ov);
2125 2468
2126 // top layer: overlays such as the health bar 2469 // top layer: overlays such as the health bar
2127 for (y = 0; y < sh; y++) 2470 for (y = 0; y < sh; y++)
2128 if (0 <= y + my && y + my < self->rows) 2471 if (0 <= y + my && y + my < self->rows)
2129 { 2472 {
2132 for (x = 0; x < sw; x++) 2475 for (x = 0; x < sw; x++)
2133 if (row->c0 <= x + mx && x + mx < row->c1) 2476 if (row->c0 <= x + mx && x + mx < row->c1)
2134 { 2477 {
2135 mapcell *cell = row->col + (x + mx - row->c0); 2478 mapcell *cell = row->col + (x + mx - row->c0);
2136 2479
2137 int px = x * T; 2480 int px = x * Tw;
2138 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 }
2139 2488
2140 if (cell->stat_hp) 2489 if (cell->stat_hp)
2141 { 2490 {
2142 int width = cell->stat_width * T; 2491 int width = cell->stat_width * Tw;
2143 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2492 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2144 2493
2145 glColor3ub (0, 0, 0); 2494 glColor3ub (0, 0, 0);
2146 glRectf (px + 1, py - thick - 2, 2495 glRectf (px + 1, py - thick - 2,
2147 px + width - 1, py); 2496 px + width - 1, py);
2148 2497
2154 } 2503 }
2155 } 2504 }
2156} 2505}
2157 2506
2158void 2507void
2159draw_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)
2160 CODE: 2509 CODE:
2161{ 2510{
2162 static float color[16][3] = { 2511 static float color[16][3] = {
2163 { 0.00F, 0.00F, 0.00F }, 2512 { 0.00f, 0.00f, 0.00f },
2164 { 1.00F, 1.00F, 1.00F }, 2513 { 1.00f, 1.00f, 1.00f },
2165 { 0.00F, 0.00F, 0.55F }, 2514 { 0.00f, 0.00f, 0.55f },
2166 { 1.00F, 0.00F, 0.00F }, 2515 { 1.00f, 0.00f, 0.00f },
2167 2516
2168 { 1.00F, 0.54F, 0.00F }, 2517 { 1.00f, 0.54f, 0.00f },
2169 { 0.11F, 0.56F, 1.00F }, 2518 { 0.11f, 0.56f, 1.00f },
2170 { 0.93F, 0.46F, 0.00F }, 2519 { 0.93f, 0.46f, 0.00f },
2171 { 0.18F, 0.54F, 0.34F }, 2520 { 0.18f, 0.54f, 0.34f },
2172 2521
2173 { 0.56F, 0.73F, 0.56F }, 2522 { 0.56f, 0.73f, 0.56f },
2174 { 0.80F, 0.80F, 0.80F }, 2523 { 0.80f, 0.80f, 0.80f },
2175 { 0.55F, 0.41F, 0.13F }, 2524 { 0.55f, 0.41f, 0.13f },
2176 { 0.99F, 0.77F, 0.26F }, 2525 { 0.99f, 0.77f, 0.26f },
2177 2526
2178 { 0.74F, 0.65F, 0.41F }, 2527 { 0.74f, 0.65f, 0.41f },
2179 2528
2180 { 0.00F, 1.00F, 1.00F }, 2529 { 0.00f, 1.00f, 1.00f },
2181 { 1.00F, 0.00F, 1.00F }, 2530 { 1.00f, 0.00f, 1.00f },
2182 { 1.00F, 1.00F, 0.00F }, 2531 { 1.00f, 1.00f, 0.00f },
2183 }; 2532 };
2184 2533
2185 int x, y; 2534 int x, y;
2186 2535
2187 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 */
2188 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2543 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2189 glEnable (GL_BLEND); 2544 glEnable (GL_BLEND);
2190 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2545 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2191 glBegin (GL_QUADS); 2546 glBegin (GL_QUADS);
2192 2547
2193 for (y = 0; y < h; y++) 2548 for (y = 0; y < h; y++)
2197 2552
2198 if (m) 2553 if (m)
2199 { 2554 {
2200 float *c = color [m & 15]; 2555 float *c = color [m & 15];
2201 2556
2202 float tx1 = m & 0x40 ? 0.5 : 0.; 2557 float tx1 = m & 0x40 ? 0.5f : 0.f;
2203 float tx2 = tx1 + 0.5; 2558 float tx2 = tx1 + 0.5f;
2204 2559
2205 glColor4f (c[0], c[1], c[2], 0.75); 2560 glColor4f (c[0], c[1], c[2], 1);
2206 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2561 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2207 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2562 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2208 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2563 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2209 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2564 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2210 } 2565 }
2218void 2573void
2219fow_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)
2220 PPCODE: 2575 PPCODE:
2221{ 2576{
2222 int x, y; 2577 int x, y;
2223 int sw1 = sw + 2; 2578 int sw1 = sw + 2;
2224 int sh1 = sh + 2; 2579 int sh1 = sh + 2;
2225 int sh3 = sh * 3; 2580 int sh3 = sh * 3;
2226 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);
2227 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2584 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2228 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2585 memset (darkness1, 0, sw1*sh1);
2229 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2230 2586
2231 SvPOK_only (darkness3_sv); 2587 SvPOK_only (darkness3_sv);
2232 SvCUR_set (darkness3_sv, sw34 * sh3); 2588 SvCUR_set (darkness3_sv, sw3 * sh3);
2233 2589
2234 mx += self->x - 1; 2590 mx += self->x - 1;
2235 my += self->y - 1; 2591 my += self->y - 1;
2236
2237 memset (darkness1, 255, sw1 * sh1);
2238 2592
2239 for (y = 0; y < sh1; y++) 2593 for (y = 0; y < sh1; y++)
2240 if (0 <= y + my && y + my < self->rows) 2594 if (0 <= y + my && y + my < self->rows)
2241 { 2595 {
2242 maprow *row = self->row + (y + my); 2596 maprow *row = self->row + (y + my);
2245 if (row->c0 <= x + mx && x + mx < row->c1) 2599 if (row->c0 <= x + mx && x + mx < row->c1)
2246 { 2600 {
2247 mapcell *cell = row->col + (x + mx - row->c0); 2601 mapcell *cell = row->col + (x + mx - row->c0);
2248 2602
2249 darkness1 [y * sw1 + x] = cell->darkness 2603 darkness1 [y * sw1 + x] = cell->darkness
2250 ? 255 - (cell->darkness - 1) 2604 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2251 : 255 - FOW_DARKNESS; 2605 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2252 } 2606 }
2253 } 2607 }
2254 2608
2255 for (y = 0; y < sh; ++y) 2609 for (y = 0; y < sh; ++y)
2256 for (x = 0; x < sw; ++x) 2610 for (x = 0; x < sw; ++x)
2275 2629
2276 uint8_t r13 = (d13 + d23 + d12) / 3; 2630 uint8_t r13 = (d13 + d23 + d12) / 3;
2277 uint8_t r23 = d23; 2631 uint8_t r23 = d23;
2278 uint8_t r33 = (d23 + d33 + d32) / 3; 2632 uint8_t r33 = (d23 + d33 + d32) / 3;
2279 2633
2280 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2634 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2281 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2635 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2282 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2636 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2283 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2637 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2284 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 */
2285 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2639 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2286 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2640 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2287 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2641 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2288 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2642 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2289 } 2643 }
2290 2644
2291 free (darkness1); 2645 free (darkness1);
2292 2646
2293 EXTEND (SP, 3); 2647 EXTEND (SP, 3);
2294 PUSHs (sv_2mortal (newSViv (sw34))); 2648 PUSHs (sv_2mortal (newSViv (sw3)));
2295 PUSHs (sv_2mortal (newSViv (sh3))); 2649 PUSHs (sv_2mortal (newSViv (sh3)));
2296 PUSHs (darkness3_sv); 2650 PUSHs (darkness3_sv);
2297} 2651}
2298 2652
2299SV * 2653SV *
2497 if (RETVAL < 0) 2851 if (RETVAL < 0)
2498 { 2852 {
2499 RETVAL = Mix_GroupOldest (-1); 2853 RETVAL = Mix_GroupOldest (-1);
2500 2854
2501 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)
2502 XSRETURN_UNDEF; 2861 XSRETURN_UNDEF;
2503 2862 }
2863 else
2504 Mix_HaltChannel (RETVAL); 2864 Mix_HaltChannel (RETVAL);
2505 } 2865 }
2506 2866
2507 Mix_UnregisterAllEffects (RETVAL); 2867 Mix_UnregisterAllEffects (RETVAL);
2508 Mix_Volume (RETVAL, 128); 2868 Mix_Volume (RETVAL, 128);
2509} 2869}
2556void 2916void
2557set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2917set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2558 CODE: 2918 CODE:
2559{ 2919{
2560 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));
2561 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;
2562 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2922 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2563} 2923}
2564 2924
2565void 2925void
2566set_reverse_stereo (DC::Channel self, int flip) 2926set_reverse_stereo (DC::Channel self, int flip)
2568 Mix_SetReverseStereo (self, flip); 2928 Mix_SetReverseStereo (self, flip);
2569 2929
2570MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2930MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2571 2931
2572PROTOTYPES: 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
2573 2945
2574DC::MixChunk 2946DC::MixChunk
2575new (SV *class, DC::RW rwops) 2947new (SV *class, DC::RW rwops)
2576 CODE: 2948 CODE:
2577 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2949 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2610 OUTPUT: 2982 OUTPUT:
2611 RETVAL 2983 RETVAL
2612 2984
2613MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2985MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2614 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
2615int 2999int
2616volume (int volume = -1) 3000volume (int volume = -1)
2617 PROTOTYPE: ;$ 3001 PROTOTYPE: ;$
2618 CODE: 3002 CODE:
2619 if (items > 0) 3003 if (items > 0)
2629 3013
2630void 3014void
2631halt () 3015halt ()
2632 CODE: 3016 CODE:
2633 Mix_HaltMusic (); 3017 Mix_HaltMusic ();
3018
3019int
3020playing ()
3021 CODE:
3022 RETVAL = Mix_PlayingMusic ();
3023 OUTPUT:
3024 RETVAL
2634 3025
2635DC::MixMusic 3026DC::MixMusic
2636new (SV *class, DC::RW rwops) 3027new (SV *class, DC::RW rwops)
2637 CODE: 3028 CODE:
2638 RETVAL = Mix_LoadMUS_RW (rwops); 3029 RETVAL = Mix_LoadMUS_RW (rwops);
2669 } *civ, const_iv[] = { 3060 } *civ, const_iv[] = {
2670# define const_iv(name) { # name, (IV)name } 3061# define const_iv(name) { # name, (IV)name }
2671 const_iv (GL_VENDOR), 3062 const_iv (GL_VENDOR),
2672 const_iv (GL_VERSION), 3063 const_iv (GL_VERSION),
2673 const_iv (GL_EXTENSIONS), 3064 const_iv (GL_EXTENSIONS),
3065 const_iv (GL_MAX_TEXTURE_UNITS),
2674 const_iv (GL_COLOR_MATERIAL), 3066 const_iv (GL_COLOR_MATERIAL),
2675 const_iv (GL_SMOOTH), 3067 const_iv (GL_SMOOTH),
2676 const_iv (GL_FLAT), 3068 const_iv (GL_FLAT),
2677 const_iv (GL_DITHER), 3069 const_iv (GL_DITHER),
2678 const_iv (GL_BLEND), 3070 const_iv (GL_BLEND),
2690 const_iv (GL_ZERO), 3082 const_iv (GL_ZERO),
2691 const_iv (GL_SRC_ALPHA), 3083 const_iv (GL_SRC_ALPHA),
2692 const_iv (GL_DST_ALPHA), 3084 const_iv (GL_DST_ALPHA),
2693 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3085 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2694 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),
2695 const_iv (GL_SRC_ALPHA_SATURATE), 3091 const_iv (GL_SRC_ALPHA_SATURATE),
2696 const_iv (GL_RGB), 3092 const_iv (GL_RGB),
2697 const_iv (GL_RGBA), 3093 const_iv (GL_RGBA),
2698 const_iv (GL_RGBA4), 3094 const_iv (GL_RGBA4),
2699 const_iv (GL_RGBA8), 3095 const_iv (GL_RGBA8),
2767 const_iv (GL_NICEST), 3163 const_iv (GL_NICEST),
2768 const_iv (GL_V2F), 3164 const_iv (GL_V2F),
2769 const_iv (GL_V3F), 3165 const_iv (GL_V3F),
2770 const_iv (GL_T2F_V3F), 3166 const_iv (GL_T2F_V3F),
2771 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),
2772# undef const_iv 3171# undef const_iv
2773 }; 3172 };
2774 3173
2775 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--)
2776 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3175 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2777 3176
2778 texture_av = newAV (); 3177 texture_av = newAV ();
2779 AvREAL_off (texture_av); 3178 AvREAL_off (texture_av);
2780} 3179}
2781 3180
2782void 3181void
2783disable_GL_EXT_blend_func_separate () 3182disable_GL_EXT_blend_func_separate ()
2784 CODE: 3183 CODE:
2785 gl.BlendFuncSeparate = 0; 3184 gl.BlendFuncSeparate = 0;
2786 gl.BlendFuncSeparateEXT = 0; 3185 gl.BlendFuncSeparateEXT = 0;
3186
3187void
3188apple_nvidia_bug (int enable)
2787 3189
2788char * 3190char *
2789gl_vendor () 3191gl_vendor ()
2790 CODE: 3192 CODE:
2791 RETVAL = (char *)glGetString (GL_VENDOR); 3193 RETVAL = (char *)glGetString (GL_VENDOR);
2822 3224
2823int glGetError () 3225int glGetError ()
2824 3226
2825void glFinish () 3227void glFinish ()
2826 3228
3229void glFlush ()
3230
2827void glClear (int mask) 3231void glClear (int mask)
2828 3232
2829void glClearColor (float r, float g, float b, float a = 1.0) 3233void glClearColor (float r, float g, float b, float a = 1.0)
2830 PROTOTYPE: @ 3234 PROTOTYPE: @
2831 3235
2840void glBlendFunc (int sfactor, int dfactor) 3244void glBlendFunc (int sfactor, int dfactor)
2841 3245
2842void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3246void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2843 CODE: 3247 CODE:
2844 gl_BlendFuncSeparate (sa, da, saa, daa); 3248 gl_BlendFuncSeparate (sa, da, saa, daa);
3249
3250# void glBlendEquation (int se)
2845 3251
2846void glDepthMask (int flag) 3252void glDepthMask (int flag)
2847 3253
2848void glLogicOp (int opcode) 3254void glLogicOp (int opcode)
2849 3255
2884void glRotate (float angle, float x, float y, float z) 3290void glRotate (float angle, float x, float y, float z)
2885 CODE: 3291 CODE:
2886 glRotatef (angle, x, y, z); 3292 glRotatef (angle, x, y, z);
2887 3293
2888void 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: @
2889 ALIAS: 3296 ALIAS:
2890 glColor_premultiply = 1 3297 glColor_premultiply = 1
2891 CODE: 3298 CODE:
2892 if (ix) 3299 if (ix)
2893 { 3300 {
2998void glNewList (int list, int mode = GL_COMPILE) 3405void glNewList (int list, int mode = GL_COMPILE)
2999 3406
3000void glEndList () 3407void glEndList ()
3001 3408
3002void 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);
3003 3415
3004MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3416MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3005 3417
3006PROTOTYPES: DISABLE 3418PROTOTYPES: DISABLE
3007 3419

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines