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.269 by root, Sun Jul 20 03:46:02 2008 UTC vs.
Revision 1.318 by root, Wed Dec 24 06:12:21 2014 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>
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>
43 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
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.h>
48 54
49#include <pango/pango.h> 55#include <pango/pango.h>
50 56
51#ifndef PANGO_VERSION_CHECK 57#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0 58# define PANGO_VERSION_CHECK(a,b,c) 0
76#define expect_false(expr) expect ((expr) != 0, 0) 82#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1) 83#define expect_true(expr) expect ((expr) != 0, 1)
78 84
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
81#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
82 91
83#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
85 94
86#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
87 96
88/* mask out modifiers we are not interested in */ 97/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
99
100#define KMOD_LRAM 0x10000 // our extension
101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
90 123
91static AV *texture_av; 124static AV *texture_av;
92 125
93static struct 126static struct
94{ 127{
226 int w, h; 259 int w, h;
227 float s, t; 260 float s, t;
228 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
229 tileid smoothtile; 262 tileid smoothtile;
230 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
231} maptex; 265} maptex;
232 266
233typedef struct { 267typedef struct {
234 uint32_t player; 268 uint32_t player;
235 tileid tile[3]; 269 tileid tile[3];
448 482
449 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
450} 484}
451 485
452static unsigned int 486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
490}
491
492static unsigned int
453minpot (unsigned int n) 493minpot (unsigned int n)
454{ 494{
455 if (!n) 495 if (!n)
456 return 0; 496 return 0;
457 497
521 if (!svp || !SvTRUE (*svp)) 561 if (!svp || !SvTRUE (*svp))
522 return 0; 562 return 0;
523 563
524 return 1; 564 return 1;
525} 565}
566
567/******************************************************************************/
568
569/* process keyboard modifiers */
570static int
571mod_munge (int mod)
572{
573 mod &= MOD_MASK;
574
575 if (mod & (KMOD_META | KMOD_ALT))
576 mod |= KMOD_LRAM;
577
578 return mod;
579}
580
581static void
582deliantra_main (SV *real_main)
583{
584 dSP;
585
586 PUSHMARK (SP);
587 call_sv (real_main, G_DISCARD | G_VOID);
588}
589
590#ifdef __MACOSX__
591 static SV *real_main;
592
593 /* to due surprising braindamage on the side of SDL design, we
594 * do some mind-boggling hack here: SDL requires a custom main()
595 * on OS X, so... we provide one and call the original main(), which,
596 * due to shared library magic, calls -lSDLmain's main, not perl's main,
597 * and which calls our main (== SDL_main) back.
598 */
599 extern C_LINKAGE int
600 main (int argc, char *argv[])
601 {
602 deliantra_main (real_main);
603 }
604
605 #undef main
606
607 extern C_LINKAGE int main (int argc, char *argv[]);
608
609 static void
610 SDL_main_hack (SV *real_main_)
611 {
612 real_main = real_main_;
613
614 char *argv[] = { "deliantra client", 0 };
615 (main) (1, argv);
616 }
617#else
618 static void
619 SDL_main_hack (SV *real_main)
620 {
621 deliantra_main (real_main);
622 }
623#endif
526 624
527MODULE = Deliantra::Client PACKAGE = DC 625MODULE = Deliantra::Client PACKAGE = DC
528 626
529PROTOTYPES: ENABLE 627PROTOTYPES: ENABLE
530 628
559 const_iv (SDL_USEREVENT), 657 const_iv (SDL_USEREVENT),
560 658
561 const_iv (SDL_APPINPUTFOCUS), 659 const_iv (SDL_APPINPUTFOCUS),
562 const_iv (SDL_APPMOUSEFOCUS), 660 const_iv (SDL_APPMOUSEFOCUS),
563 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),
564 712
565 const_iv (SDLK_FIRST), 713 const_iv (SDLK_FIRST),
566 const_iv (SDLK_LAST), 714 const_iv (SDLK_LAST),
567 const_iv (SDLK_KP0), 715 const_iv (SDLK_KP0),
568 const_iv (SDLK_KP1), 716 const_iv (SDLK_KP1),
644 const_iv (KMOD_RMETA), 792 const_iv (KMOD_RMETA),
645 const_iv (KMOD_NUM), 793 const_iv (KMOD_NUM),
646 const_iv (KMOD_CAPS), 794 const_iv (KMOD_CAPS),
647 const_iv (KMOD_MODE), 795 const_iv (KMOD_MODE),
648 796
797 const_iv (KMOD_LRAM),
798
649 const_iv (MIX_DEFAULT_FORMAT), 799 const_iv (MIX_DEFAULT_FORMAT),
650 800
651 const_iv (SDL_INIT_TIMER), 801 const_iv (SDL_INIT_TIMER),
652 const_iv (SDL_INIT_AUDIO), 802 const_iv (SDL_INIT_AUDIO),
653 const_iv (SDL_INIT_VIDEO), 803 const_iv (SDL_INIT_VIDEO),
677 827
678 const_iv (FOW_DARKNESS) 828 const_iv (FOW_DARKNESS)
679# undef const_iv 829# undef const_iv
680 }; 830 };
681 831
682 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--)
683 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 833 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
684 834
685 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 835 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
686 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 836 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
687} 837}
688 838
704NV ceil (NV x) 854NV ceil (NV x)
705 855
706IV minpot (UV n) 856IV minpot (UV n)
707 857
708IV 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
709 865
710void 866void
711pango_init () 867pango_init ()
712 CODE: 868 CODE:
713{ 869{
720 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 876 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
721#endif 877#endif
722} 878}
723 879
724char *SDL_GetError () 880char *SDL_GetError ()
881
882void SDL_main_hack (SV *real_main)
883 PROTOTYPE: &
725 884
726int SDL_Init (U32 flags) 885int SDL_Init (U32 flags)
727 886
728int SDL_InitSubSystem (U32 flags) 887int SDL_InitSubSystem (U32 flags)
729 888
798 ); 957 );
799 958
800 if (RETVAL) 959 if (RETVAL)
801 { 960 {
802 av_clear (texture_av); 961 av_clear (texture_av);
803
804 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
805#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);
806#include "glfunc.h" 963#include "glfunc.h"
807#undef GL_FUNC 964#undef GL_FUNC
965 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
966 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
808 } 967 }
809} 968}
810 OUTPUT: 969 OUTPUT:
811 RETVAL 970 RETVAL
812 971
813void 972void
973SDL_WM_SetCaption (const char *title, const char *icon)
974
975void
814SDL_GL_SwapBuffers () 976SDL_GL_SwapBuffers ()
815 977
816char * 978char *
817SDL_GetKeyName (int sym) 979SDL_GetKeyName (int sym)
818 980
820SDL_GetAppState () 982SDL_GetAppState ()
821 983
822int 984int
823SDL_GetModState () 985SDL_GetModState ()
824 986
987int
988SDL_WaitEvent ()
989 C_ARGS: 0
990
825void 991void
992SDL_PumpEvents ()
993
994void
826poll_events () 995peep_events ()
827 PPCODE: 996 PPCODE:
828{ 997{
829 SDL_Event ev; 998 SDL_Event ev;
830 999
831 SDL_PumpEvents (); 1000 SDL_PumpEvents ();
838 { 1007 {
839 case SDL_KEYDOWN: 1008 case SDL_KEYDOWN:
840 case SDL_KEYUP: 1009 case SDL_KEYUP:
841 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1010 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
842 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1011 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
843 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1012 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
844 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1013 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
845 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1014 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
846 break; 1015 break;
847 1016
848 case SDL_ACTIVEEVENT: 1017 case SDL_ACTIVEEVENT:
849 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1018 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
867 x = ev.motion.x; 1036 x = ev.motion.x;
868 y = ev.motion.y; 1037 y = ev.motion.y;
869 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1038 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
870 } 1039 }
871 1040
872 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1041 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
873 hv_store (hv, "state", 5, newSViv (state), 0); 1042 hv_store (hv, "state", 5, newSViv (state), 0);
874 hv_store (hv, "x", 1, newSViv (x), 0); 1043 hv_store (hv, "x", 1, newSViv (x), 0);
875 hv_store (hv, "y", 1, newSViv (y), 0); 1044 hv_store (hv, "y", 1, newSViv (y), 0);
876 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1045 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
877 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1046 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
897 1066
898 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))));
899 } 1068 }
900} 1069}
901 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
902int 1084int
903Mix_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)
904 POSTCALL: 1086 POSTCALL:
905 Mix_HookMusicFinished (music_finished); 1087 Mix_HookMusicFinished (music_finished);
906 Mix_ChannelFinished (channel_finished); 1088 Mix_ChannelFinished (channel_finished);
968add_font (char *file) 1150add_font (char *file)
969 CODE: 1151 CODE:
970 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1152 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
971 OUTPUT: 1153 OUTPUT:
972 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)
973 1162
974void 1163void
975load_image_inline (SV *image_) 1164load_image_inline (SV *image_)
976 ALIAS: 1165 ALIAS:
977 load_image_file = 1 1166 load_image_file = 1
1093#if DEBUG 1282#if DEBUG
1094 VALGRIND_DO_LEAK_CHECK; 1283 VALGRIND_DO_LEAK_CHECK;
1095#endif 1284#endif
1096} 1285}
1097 1286
1287int
1288SvREFCNT (SV *sv)
1289 CODE:
1290 RETVAL = SvREFCNT (sv);
1291 OUTPUT:
1292 RETVAL
1293
1098MODULE = Deliantra::Client PACKAGE = DC::Font 1294MODULE = Deliantra::Client PACKAGE = DC::Font
1099 1295
1100PROTOTYPES: DISABLE 1296PROTOTYPES: DISABLE
1101 1297
1102DC::Font 1298DC::Font
1296 1492
1297void 1493void
1298set_height (DC::Layout self, int base_height) 1494set_height (DC::Layout self, int base_height)
1299 CODE: 1495 CODE:
1300 if (self->base_height != base_height) 1496 if (self->base_height != base_height)
1301 { 1497 {
1302 self->base_height = base_height; 1498 self->base_height = base_height;
1303 layout_update_font (self); 1499 layout_update_font (self);
1304 } 1500 }
1305 1501
1306void 1502void
1531 if (ix) 1727 if (ix)
1532 { 1728 {
1533 glDisable (GL_ALPHA_TEST); 1729 glDisable (GL_ALPHA_TEST);
1534 glDisable (GL_BLEND); 1730 glDisable (GL_BLEND);
1535 } 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);
1536} 1853}
1537 1854
1538IV 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)
1539 CODE: 1856 CODE:
1540{ 1857{
1646 //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);
1647 // use uglier nearest interpolation because linear suffers 1964 // use uglier nearest interpolation because linear suffers
1648 // from transparent color bleeding and ugly wrapping effects. 1965 // from transparent color bleeding and ugly wrapping effects.
1649 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1966 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1650} 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 }
1651 1988
1652int 1989int
1653ox (DC::Map self) 1990ox (DC::Map self)
1654 ALIAS: 1991 ALIAS:
1655 oy = 1 1992 oy = 1
1695 self->y += MAP_EXTEND_Y; 2032 self->y += MAP_EXTEND_Y;
1696 } 2033 }
1697} 2034}
1698 2035
1699SV * 2036SV *
1700map1a_update (DC::Map self, SV *data_, int extmap) 2037map1a_update (DC::Map self, SV *data_)
1701 CODE: 2038 CODE:
1702{ 2039{
1703 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2040 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1704 uint8_t *data_end = (uint8_t *)SvEND (data_); 2041 uint8_t *data_end = (uint8_t *)SvEND (data_);
1705 mapcell *cell; 2042 mapcell *cell;
1726 2063
1727 //TODO: don't trust server data to be in-range(!) 2064 //TODO: don't trust server data to be in-range(!)
1728 2065
1729 if (flags & 8) 2066 if (flags & 8)
1730 { 2067 {
2068 uint8_t ext, cmd;
2069
1731 if (extmap) 2070 do
1732 { 2071 {
1733 uint8_t ext, cmd; 2072 ext = *data++;
2073 cmd = ext & 0x7f;
1734 2074
1735 do 2075 if (cmd < 4)
2076 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2077 else if (cmd == 5) // health
1736 { 2078 {
1737 ext = *data++;
1738 cmd = ext & 0x7f;
1739
1740 if (cmd < 4)
1741 cell->darkness = 255 - ext * 64 + 1;
1742 else if (cmd == 5) // health
1743 {
1744 cell->stat_width = 1; 2079 cell->stat_width = 1;
1745 cell->stat_hp = *data++; 2080 cell->stat_hp = *data++;
1746 }
1747 else if (cmd == 6) // monster width
1748 cell->stat_width = *data++ + 1;
1749 else if (cmd == 0x47)
1750 {
1751 if (*data == 1) cell->player = data [1];
1752 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1753 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1754 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1755
1756 data += *data + 1;
1757 }
1758 else if (cmd == 8) // cell flags
1759 cell->flags = *data++;
1760 else if (ext & 0x40) // unknown, multibyte => skip
1761 data += *data + 1;
1762 else
1763 data++;
1764 } 2081 }
1765 while (ext & 0x80); 2082 else if (cmd == 6) // monster width
2083 cell->stat_width = *data++ + 1;
2084 else if (cmd == 0x47)
2085 {
2086 if (*data == 1) cell->player = data [1];
2087 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2088 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2089 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2090
2091 data += *data + 1;
2092 }
2093 else if (cmd == 8) // cell flags
2094 cell->flags = *data++;
2095 else if (ext & 0x40) // unknown, multibyte => skip
2096 data += *data + 1;
2097 else
2098 data++;
1766 } 2099 }
1767 else 2100 while (ext & 0x80);
1768 cell->darkness = *data++ + 1;
1769 } 2101 }
1770 2102
1771 for (z = 0; z <= 2; ++z) 2103 for (z = 0; z <= 2; ++z)
1772 if (flags & (4 >> z)) 2104 if (flags & (4 >> z))
1773 { 2105 {
1776 cell->tile [z] = self->face2tile [face]; 2108 cell->tile [z] = self->face2tile [face];
1777 2109
1778 if (cell->tile [z]) 2110 if (cell->tile [z])
1779 { 2111 {
1780 maptex *tex = self->tex + cell->tile [z]; 2112 maptex *tex = self->tex + cell->tile [z];
2113 tex->unused = 0;
1781 if (!tex->name) 2114 if (!tex->name)
1782 av_push (missing, newSViv (cell->tile [z])); 2115 av_push (missing, newSViv (cell->tile [z]));
1783 2116
1784 if (tex->smoothtile) 2117 if (tex->smoothtile)
1785 { 2118 {
1786 maptex *smooth = self->tex + tex->smoothtile; 2119 maptex *smooth = self->tex + tex->smoothtile;
2120 smooth->unused = 0;
1787 if (!smooth->name) 2121 if (!smooth->name)
1788 av_push (missing, newSViv (tex->smoothtile)); 2122 av_push (missing, newSViv (tex->smoothtile));
1789 } 2123 }
1790 } 2124 }
1791 } 2125 }
1819 ? self->row + y 2153 ? self->row + y
1820 : 0; 2154 : 0;
1821 2155
1822 for (x = x0; x < x1; x++) 2156 for (x = x0; x < x1; x++)
1823 { 2157 {
1824 int r = 32, g = 32, b = 32, a = 192; 2158 unsigned int r = 32, g = 32, b = 32, a = 192;
1825 2159
1826 if (row && row->c0 <= x && x < row->c1) 2160 if (row && row->c0 <= x && x < row->c1)
1827 { 2161 {
1828 mapcell *cell = row->col + (x - row->c0); 2162 mapcell *cell = row->col + (x - row->c0);
1829 2163
1831 { 2165 {
1832 maptex tex = self->tex [cell->tile [z]]; 2166 maptex tex = self->tex [cell->tile [z]];
1833 int a0 = 255 - tex.a; 2167 int a0 = 255 - tex.a;
1834 int a1 = tex.a; 2168 int a1 = tex.a;
1835 2169
1836 r = (r * a0 + tex.r * a1) / 255; 2170 r = div255 (r * a0 + tex.r * a1);
1837 g = (g * a0 + tex.g * a1) / 255; 2171 g = div255 (g * a0 + tex.g * a1);
1838 b = (b * a0 + tex.b * a1) / 255; 2172 b = div255 (b * a0 + tex.b * a1);
1839 a = (a * a0 + tex.a * a1) / 255; 2173 a = div255 (a * a0 + tex.a * a1);
1840 } 2174 }
1841 } 2175 }
1842 2176
1843 *map++ = (r ) 2177 *map++ = (r )
1844 | (g << 8) 2178 | (g << 8)
1851} 2185}
1852 OUTPUT: 2186 OUTPUT:
1853 RETVAL 2187 RETVAL
1854 2188
1855void 2189void
1856draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2190draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1857 CODE: 2191 CODE:
1858{ 2192{
1859 int x, y, z; 2193 int x, y, z;
1860 2194
1861 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2195 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1862 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2196 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1863 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2197 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1864 smooth_key skey; 2198 smooth_key skey;
1865 int pl_x, pl_y; 2199 int pl_x, pl_y;
1866 maptex pl_tex; 2200 maptex pl_tex;
1867 rc_t *rc = rc_alloc (); 2201 rc_t *rc = rc_alloc ();
2202 rc_t *rc_ov = rc_alloc ();
1868 rc_key_t key; 2203 rc_key_t key;
1869 rc_array_t *arr; 2204 rc_array_t *arr;
1870 2205
1871 pl_tex.name = 0; 2206 pl_tex.name = 0;
1872 2207
1873 // thats current max. sorry. 2208 // that's current max. sorry.
1874 if (sw > 255) sw = 255; 2209 if (sw > 255) sw = 255;
1875 if (sh > 255) sh = 255; 2210 if (sh > 255) sh = 255;
1876 2211
1877 // clear key, in case of extra padding 2212 // clear key, in case of extra padding
1878 memset (&skey, 0, sizeof (skey)); 2213 memset (&skey, 0, sizeof (skey));
1882 key.g = 255; 2217 key.g = 255;
1883 key.b = 255; 2218 key.b = 255;
1884 key.a = 255; 2219 key.a = 255;
1885 key.mode = GL_QUADS; 2220 key.mode = GL_QUADS;
1886 key.format = GL_T2F_V3F; 2221 key.format = GL_T2F_V3F;
1887 key.texname = -1;
1888 2222
1889 mx += self->x; 2223 mx += self->x;
1890 my += self->y; 2224 my += self->y;
1891 2225
1892 // first pass: determine smooth_max 2226 // first pass: determine smooth_max
1916 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2250 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1917 2251
1918 for (z = 0; z <= 2; z++) 2252 for (z = 0; z <= 2; z++)
1919 { 2253 {
1920 memset (smooth_level, 0, sizeof (smooth_level)); 2254 memset (smooth_level, 0, sizeof (smooth_level));
2255 key.texname = -1;
1921 2256
1922 for (y = 0; y < sh; y++) 2257 for (y = 0; y < sh; y++)
1923 if (0 <= y + my && y + my < self->rows) 2258 if (0 <= y + my && y + my < self->rows)
1924 { 2259 {
1925 maprow *row = self->row + (y + my); 2260 maprow *row = self->row + (y + my);
1931 tileid tile = cell->tile [z]; 2266 tileid tile = cell->tile [z];
1932 2267
1933 if (tile) 2268 if (tile)
1934 { 2269 {
1935 maptex tex = self->tex [tile]; 2270 maptex tex = self->tex [tile];
1936 int px = (x + 1) * T - tex.w; 2271 int px, py;
1937 int py = (y + 1) * T - tex.h;
1938 2272
1939 if (key.texname != tex.name) 2273 if (key.texname != tex.name)
1940 { 2274 {
2275 self->tex [tile].unused = 0;
2276
1941 if (!tex.name) 2277 if (!tex.name)
1942 tex = self->tex [2]; /* missing, replace by noface */ 2278 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1943 2279
1944 key.texname = tex.name; 2280 key.texname = tex.name;
1945 arr = rc_array (rc, &key); 2281 arr = rc_array (rc, &key);
1946 } 2282 }
2283
2284 px = (x + 1) * Th - tex.w;
2285 py = (y + 1) * Tw - tex.h;
1947 2286
1948 if (expect_false (cell->player == player) && expect_false (z == 2)) 2287 if (expect_false (cell->player == player) && expect_false (z == 2))
1949 { 2288 {
1950 pl_x = px; 2289 pl_x = px;
1951 pl_y = py; 2290 pl_y = py;
1956 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2295 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1957 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2296 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1958 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2297 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1959 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2298 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1960 2299
1961 if (expect_false (cell->flags) && expect_false (z == 2))
1962 {
1963 // overlays such as the speech bubble, probably more to come
1964 if (cell->flags & 1)
1965 {
1966 maptex tex = self->tex [1];
1967 int px = x * T + T * 2 / 32;
1968 int py = y * T - T * 6 / 32;
1969
1970 if (tex.name)
1971 {
1972 if (key.texname != tex.name)
1973 {
1974 key.texname = tex.name;
1975 arr = rc_array (rc, &key);
1976 }
1977
1978 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1979 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1980 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1981 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1982 }
1983 }
1984 }
1985
1986 // update smooth hash 2300 // update smooth hash
1987 if (tex.smoothtile) 2301 if (tex.smoothtile)
1988 { 2302 {
1989 skey.tile = tex.smoothtile; 2303 skey.tile = tex.smoothtile;
1990 skey.level = tex.smoothlevel; 2304 skey.level = tex.smoothlevel;
2018 // corners 2332 // corners
2019 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2333 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2020 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2334 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2021 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2335 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2022 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2336 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2337 }
2338 }
2339
2340 if (expect_false (z == 2) && expect_false (cell->flags))
2341 {
2342 // overlays such as the speech bubble, probably more to come
2343 if (cell->flags & 1)
2344 {
2345 rc_key_t key_ov = key;
2346 maptex tex = self->tex [TEXID_SPEECH];
2347 rc_array_t *arr;
2348 int px = x * Tw + Tw * 2 / 32;
2349 int py = y * Th - Th * 6 / 32;
2350
2351 key_ov.texname = tex.name;
2352 arr = rc_array (rc_ov, &key_ov);
2353
2354 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2355 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2356 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2357 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2023 } 2358 }
2024 } 2359 }
2025 } 2360 }
2026 } 2361 }
2027 2362
2054 if (!(bits & 0x1000) 2389 if (!(bits & 0x1000)
2055 && skey->level == level 2390 && skey->level == level
2056 && level > smooth_max [skey->x][skey->y]) 2391 && level > smooth_max [skey->x][skey->y])
2057 { 2392 {
2058 maptex tex = self->tex [skey->tile]; 2393 maptex tex = self->tex [skey->tile];
2059 int px = (((int)skey->x) - 1) * T; 2394 int px = (((int)skey->x) - 1) * Tw;
2060 int py = (((int)skey->y) - 1) * T; 2395 int py = (((int)skey->y) - 1) * Th;
2061 int border = bits & 15; 2396 int border = bits & 15;
2062 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2397 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2063 float dx = tex.s * .0625f; // 16 images/row 2398 float dx = tex.s * .0625f; // 16 images/row
2064 float dy = tex.t * .5f ; // 2 images/column 2399 float dy = tex.t * .5f ; // 2 images/column
2065 2400
2067 { 2402 {
2068 // this time avoiding texture state changes 2403 // this time avoiding texture state changes
2069 // save gobs of state changes. 2404 // save gobs of state changes.
2070 if (key.texname != tex.name) 2405 if (key.texname != tex.name)
2071 { 2406 {
2407 self->tex [skey->tile].unused = 0;
2408
2072 glEnd (); 2409 glEnd ();
2073 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2410 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2074 glBegin (GL_QUADS); 2411 glBegin (GL_QUADS);
2075 } 2412 }
2076 2413
2077 if (border) 2414 if (border)
2078 { 2415 {
2079 float ox = border * dx; 2416 float ox = border * dx;
2080 2417
2081 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2418 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2082 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2419 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2083 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2420 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2084 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2421 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2085 } 2422 }
2086 2423
2087 if (corner) 2424 if (corner)
2088 { 2425 {
2089 float ox = corner * dx; 2426 float ox = corner * dx;
2090 2427
2091 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2428 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2092 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2429 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2093 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2430 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2094 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2431 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2095 } 2432 }
2096 } 2433 }
2097 } 2434 }
2098 } 2435 }
2099 } 2436 }
2122 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2459 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2123 2460
2124 rc_draw (rc); 2461 rc_draw (rc);
2125 } 2462 }
2126 2463
2464 rc_draw (rc_ov);
2465 rc_clear (rc_ov);
2466
2127 glDisable (GL_BLEND); 2467 glDisable (GL_BLEND);
2128 rc_free (rc); 2468 rc_free (rc);
2469 rc_free (rc_ov);
2129 2470
2130 // top layer: overlays such as the health bar 2471 // top layer: overlays such as the health bar
2131 for (y = 0; y < sh; y++) 2472 for (y = 0; y < sh; y++)
2132 if (0 <= y + my && y + my < self->rows) 2473 if (0 <= y + my && y + my < self->rows)
2133 { 2474 {
2136 for (x = 0; x < sw; x++) 2477 for (x = 0; x < sw; x++)
2137 if (row->c0 <= x + mx && x + mx < row->c1) 2478 if (row->c0 <= x + mx && x + mx < row->c1)
2138 { 2479 {
2139 mapcell *cell = row->col + (x + mx - row->c0); 2480 mapcell *cell = row->col + (x + mx - row->c0);
2140 2481
2141 int px = x * T; 2482 int px = x * Tw;
2142 int py = y * T; 2483 int py = y * Th;
2484
2485 if (expect_false (cell->player == player))
2486 {
2487 px += sdx;
2488 py += sdy;
2489 }
2143 2490
2144 if (cell->stat_hp) 2491 if (cell->stat_hp)
2145 { 2492 {
2146 int width = cell->stat_width * T; 2493 int width = cell->stat_width * Tw;
2147 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2494 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2148 2495
2149 glColor3ub (0, 0, 0); 2496 glColor3ub (0, 0, 0);
2150 glRectf (px + 1, py - thick - 2, 2497 glRectf (px + 1, py - thick - 2,
2151 px + width - 1, py); 2498 px + width - 1, py);
2152 2499
2158 } 2505 }
2159 } 2506 }
2160} 2507}
2161 2508
2162void 2509void
2163draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2510draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2164 CODE: 2511 CODE:
2165{ 2512{
2166 static float color[16][3] = { 2513 static float color[16][3] = {
2167 { 0.00F, 0.00F, 0.00F }, 2514 { 0.00f, 0.00f, 0.00f },
2168 { 1.00F, 1.00F, 1.00F }, 2515 { 1.00f, 1.00f, 1.00f },
2169 { 0.00F, 0.00F, 0.55F }, 2516 { 0.00f, 0.00f, 0.55f },
2170 { 1.00F, 0.00F, 0.00F }, 2517 { 1.00f, 0.00f, 0.00f },
2171 2518
2172 { 1.00F, 0.54F, 0.00F }, 2519 { 1.00f, 0.54f, 0.00f },
2173 { 0.11F, 0.56F, 1.00F }, 2520 { 0.11f, 0.56f, 1.00f },
2174 { 0.93F, 0.46F, 0.00F }, 2521 { 0.93f, 0.46f, 0.00f },
2175 { 0.18F, 0.54F, 0.34F }, 2522 { 0.18f, 0.54f, 0.34f },
2176 2523
2177 { 0.56F, 0.73F, 0.56F }, 2524 { 0.56f, 0.73f, 0.56f },
2178 { 0.80F, 0.80F, 0.80F }, 2525 { 0.80f, 0.80f, 0.80f },
2179 { 0.55F, 0.41F, 0.13F }, 2526 { 0.55f, 0.41f, 0.13f },
2180 { 0.99F, 0.77F, 0.26F }, 2527 { 0.99f, 0.77f, 0.26f },
2181 2528
2182 { 0.74F, 0.65F, 0.41F }, 2529 { 0.74f, 0.65f, 0.41f },
2183 2530
2184 { 0.00F, 1.00F, 1.00F }, 2531 { 0.00f, 1.00f, 1.00f },
2185 { 1.00F, 0.00F, 1.00F }, 2532 { 1.00f, 0.00f, 1.00f },
2186 { 1.00F, 1.00F, 0.00F }, 2533 { 1.00f, 1.00f, 0.00f },
2187 }; 2534 };
2188 2535
2189 int x, y; 2536 int x, y;
2190 2537
2191 glEnable (GL_TEXTURE_2D); 2538 glEnable (GL_TEXTURE_2D);
2539 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2540 * but the nvidia driver (185.18.14) mishandles alpha textures
2541 * and takes the colour from god knows where instead of using
2542 * Cp. MODULATE results in the same colour, but slightly different
2543 * alpha, but atcually gives us the correct colour with nvidia.
2544 */
2192 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2545 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2193 glEnable (GL_BLEND); 2546 glEnable (GL_BLEND);
2194 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2547 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2195 glBegin (GL_QUADS); 2548 glBegin (GL_QUADS);
2196 2549
2197 for (y = 0; y < h; y++) 2550 for (y = 0; y < h; y++)
2201 2554
2202 if (m) 2555 if (m)
2203 { 2556 {
2204 float *c = color [m & 15]; 2557 float *c = color [m & 15];
2205 2558
2206 float tx1 = m & 0x40 ? 0.5 : 0.; 2559 float tx1 = m & 0x40 ? 0.5f : 0.f;
2207 float tx2 = tx1 + 0.5; 2560 float tx2 = tx1 + 0.5f;
2208 2561
2209 glColor4f (c[0], c[1], c[2], 0.75); 2562 glColor4f (c[0], c[1], c[2], 1);
2210 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2563 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2211 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2564 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2212 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2565 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2213 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2566 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2214 } 2567 }
2222void 2575void
2223fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2576fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2224 PPCODE: 2577 PPCODE:
2225{ 2578{
2226 int x, y; 2579 int x, y;
2227 int sw1 = sw + 2; 2580 int sw1 = sw + 2;
2228 int sh1 = sh + 2; 2581 int sh1 = sh + 2;
2229 int sh3 = sh * 3; 2582 int sh3 = sh * 3;
2230 int sw34 = (sw * 3 + 3) & ~3; 2583 int sw3 = sw * 3;
2584 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2585 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2231 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2586 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2232 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2587 memset (darkness1, 0, sw1*sh1);
2233 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2234 2588
2235 SvPOK_only (darkness3_sv); 2589 SvPOK_only (darkness3_sv);
2236 SvCUR_set (darkness3_sv, sw34 * sh3); 2590 SvCUR_set (darkness3_sv, sw3 * sh3);
2237 2591
2238 mx += self->x - 1; 2592 mx += self->x - 1;
2239 my += self->y - 1; 2593 my += self->y - 1;
2240
2241 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2242 2594
2243 for (y = 0; y < sh1; y++) 2595 for (y = 0; y < sh1; y++)
2244 if (0 <= y + my && y + my < self->rows) 2596 if (0 <= y + my && y + my < self->rows)
2245 { 2597 {
2246 maprow *row = self->row + (y + my); 2598 maprow *row = self->row + (y + my);
2249 if (row->c0 <= x + mx && x + mx < row->c1) 2601 if (row->c0 <= x + mx && x + mx < row->c1)
2250 { 2602 {
2251 mapcell *cell = row->col + (x + mx - row->c0); 2603 mapcell *cell = row->col + (x + mx - row->c0);
2252 2604
2253 darkness1 [y * sw1 + x] = cell->darkness 2605 darkness1 [y * sw1 + x] = cell->darkness
2254 ? 255 - (cell->darkness - 1) 2606 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2255 : 255 - FOW_DARKNESS; 2607 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2256 } 2608 }
2257 } 2609 }
2258 2610
2259 for (y = 0; y < sh; ++y) 2611 for (y = 0; y < sh; ++y)
2260 for (x = 0; x < sw; ++x) 2612 for (x = 0; x < sw; ++x)
2279 2631
2280 uint8_t r13 = (d13 + d23 + d12) / 3; 2632 uint8_t r13 = (d13 + d23 + d12) / 3;
2281 uint8_t r23 = d23; 2633 uint8_t r23 = d23;
2282 uint8_t r33 = (d23 + d33 + d32) / 3; 2634 uint8_t r33 = (d23 + d33 + d32) / 3;
2283 2635
2284 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2636 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2285 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2637 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2286 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2638 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2287 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2639 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2288 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2640 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2289 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2641 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2290 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2642 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2291 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2643 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2292 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2644 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2293 } 2645 }
2294 2646
2295 free (darkness1); 2647 free (darkness1);
2296 2648
2297 EXTEND (SP, 3); 2649 EXTEND (SP, 3);
2298 PUSHs (sv_2mortal (newSViv (sw34))); 2650 PUSHs (sv_2mortal (newSViv (sw3)));
2299 PUSHs (sv_2mortal (newSViv (sh3))); 2651 PUSHs (sv_2mortal (newSViv (sh3)));
2300 PUSHs (darkness3_sv); 2652 PUSHs (darkness3_sv);
2301} 2653}
2302 2654
2303SV * 2655SV *
2501 if (RETVAL < 0) 2853 if (RETVAL < 0)
2502 { 2854 {
2503 RETVAL = Mix_GroupOldest (-1); 2855 RETVAL = Mix_GroupOldest (-1);
2504 2856
2505 if (RETVAL < 0) 2857 if (RETVAL < 0)
2858 {
2859 // happens sometimes, maybe it just stopped playing(?)
2860 RETVAL = Mix_GroupAvailable (-1);
2861
2862 if (RETVAL < 0)
2506 XSRETURN_UNDEF; 2863 XSRETURN_UNDEF;
2507 2864 }
2865 else
2508 Mix_HaltChannel (RETVAL); 2866 Mix_HaltChannel (RETVAL);
2509 } 2867 }
2510 2868
2511 Mix_UnregisterAllEffects (RETVAL); 2869 Mix_UnregisterAllEffects (RETVAL);
2512 Mix_Volume (RETVAL, 128); 2870 Mix_Volume (RETVAL, 128);
2513} 2871}
2560void 2918void
2561set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2919set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2562 CODE: 2920 CODE:
2563{ 2921{
2564 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2922 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2565 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2923 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2566 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2924 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2567} 2925}
2568 2926
2569void 2927void
2570set_reverse_stereo (DC::Channel self, int flip) 2928set_reverse_stereo (DC::Channel self, int flip)
2572 Mix_SetReverseStereo (self, flip); 2930 Mix_SetReverseStereo (self, flip);
2573 2931
2574MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2932MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2575 2933
2576PROTOTYPES: DISABLE 2934PROTOTYPES: DISABLE
2935
2936void
2937decoders ()
2938 PPCODE:
2939#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2940 int i, num = Mix_GetNumChunkDecoders ();
2941 EXTEND (SP, num);
2942 for (i = 0; i < num; ++i)
2943 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2944#else
2945 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2946#endif
2577 2947
2578DC::MixChunk 2948DC::MixChunk
2579new (SV *class, DC::RW rwops) 2949new (SV *class, DC::RW rwops)
2580 CODE: 2950 CODE:
2581 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2951 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2614 OUTPUT: 2984 OUTPUT:
2615 RETVAL 2985 RETVAL
2616 2986
2617MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2987MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2618 2988
2989void
2990decoders ()
2991 PPCODE:
2992#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2993 int i, num = Mix_GetNumMusicDecoders ();
2994 EXTEND (SP, num);
2995 for (i = 0; i < num; ++i)
2996 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2997#else
2998 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2999#endif
3000
2619int 3001int
2620volume (int volume = -1) 3002volume (int volume = -1)
2621 PROTOTYPE: ;$ 3003 PROTOTYPE: ;$
2622 CODE: 3004 CODE:
2623 if (items > 0) 3005 if (items > 0)
2633 3015
2634void 3016void
2635halt () 3017halt ()
2636 CODE: 3018 CODE:
2637 Mix_HaltMusic (); 3019 Mix_HaltMusic ();
3020
3021int
3022playing ()
3023 CODE:
3024 RETVAL = Mix_PlayingMusic ();
3025 OUTPUT:
3026 RETVAL
2638 3027
2639DC::MixMusic 3028DC::MixMusic
2640new (SV *class, DC::RW rwops) 3029new (SV *class, DC::RW rwops)
2641 CODE: 3030 CODE:
2642 RETVAL = Mix_LoadMUS_RW (rwops); 3031 RETVAL = Mix_LoadMUS_RW (rwops);
2673 } *civ, const_iv[] = { 3062 } *civ, const_iv[] = {
2674# define const_iv(name) { # name, (IV)name } 3063# define const_iv(name) { # name, (IV)name }
2675 const_iv (GL_VENDOR), 3064 const_iv (GL_VENDOR),
2676 const_iv (GL_VERSION), 3065 const_iv (GL_VERSION),
2677 const_iv (GL_EXTENSIONS), 3066 const_iv (GL_EXTENSIONS),
3067 const_iv (GL_MAX_TEXTURE_UNITS),
2678 const_iv (GL_COLOR_MATERIAL), 3068 const_iv (GL_COLOR_MATERIAL),
2679 const_iv (GL_SMOOTH), 3069 const_iv (GL_SMOOTH),
2680 const_iv (GL_FLAT), 3070 const_iv (GL_FLAT),
2681 const_iv (GL_DITHER), 3071 const_iv (GL_DITHER),
2682 const_iv (GL_BLEND), 3072 const_iv (GL_BLEND),
2694 const_iv (GL_ZERO), 3084 const_iv (GL_ZERO),
2695 const_iv (GL_SRC_ALPHA), 3085 const_iv (GL_SRC_ALPHA),
2696 const_iv (GL_DST_ALPHA), 3086 const_iv (GL_DST_ALPHA),
2697 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3087 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2698 const_iv (GL_ONE_MINUS_DST_ALPHA), 3088 const_iv (GL_ONE_MINUS_DST_ALPHA),
3089 const_iv (GL_SRC_COLOR),
3090 const_iv (GL_DST_COLOR),
3091 const_iv (GL_ONE_MINUS_SRC_COLOR),
3092 const_iv (GL_ONE_MINUS_DST_COLOR),
2699 const_iv (GL_SRC_ALPHA_SATURATE), 3093 const_iv (GL_SRC_ALPHA_SATURATE),
2700 const_iv (GL_RGB), 3094 const_iv (GL_RGB),
2701 const_iv (GL_RGBA), 3095 const_iv (GL_RGBA),
2702 const_iv (GL_RGBA4), 3096 const_iv (GL_RGBA4),
2703 const_iv (GL_RGBA8), 3097 const_iv (GL_RGBA8),
2771 const_iv (GL_NICEST), 3165 const_iv (GL_NICEST),
2772 const_iv (GL_V2F), 3166 const_iv (GL_V2F),
2773 const_iv (GL_V3F), 3167 const_iv (GL_V3F),
2774 const_iv (GL_T2F_V3F), 3168 const_iv (GL_T2F_V3F),
2775 const_iv (GL_T2F_N3F_V3F), 3169 const_iv (GL_T2F_N3F_V3F),
3170 const_iv (GL_FUNC_ADD),
3171 const_iv (GL_FUNC_SUBTRACT),
3172 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2776# undef const_iv 3173# undef const_iv
2777 }; 3174 };
2778 3175
2779 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3176 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2780 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3177 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2781 3178
2782 texture_av = newAV (); 3179 texture_av = newAV ();
2783 AvREAL_off (texture_av); 3180 AvREAL_off (texture_av);
2784} 3181}
2785 3182
2786void 3183void
2787disable_GL_EXT_blend_func_separate () 3184disable_GL_EXT_blend_func_separate ()
2788 CODE: 3185 CODE:
2789 gl.BlendFuncSeparate = 0; 3186 gl.BlendFuncSeparate = 0;
2790 gl.BlendFuncSeparateEXT = 0; 3187 gl.BlendFuncSeparateEXT = 0;
3188
3189void
3190apple_nvidia_bug (int enable)
2791 3191
2792char * 3192char *
2793gl_vendor () 3193gl_vendor ()
2794 CODE: 3194 CODE:
2795 RETVAL = (char *)glGetString (GL_VENDOR); 3195 RETVAL = (char *)glGetString (GL_VENDOR);
2826 3226
2827int glGetError () 3227int glGetError ()
2828 3228
2829void glFinish () 3229void glFinish ()
2830 3230
3231void glFlush ()
3232
2831void glClear (int mask) 3233void glClear (int mask)
2832 3234
2833void glClearColor (float r, float g, float b, float a = 1.0) 3235void glClearColor (float r, float g, float b, float a = 1.0)
2834 PROTOTYPE: @ 3236 PROTOTYPE: @
2835 3237
2844void glBlendFunc (int sfactor, int dfactor) 3246void glBlendFunc (int sfactor, int dfactor)
2845 3247
2846void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3248void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2847 CODE: 3249 CODE:
2848 gl_BlendFuncSeparate (sa, da, saa, daa); 3250 gl_BlendFuncSeparate (sa, da, saa, daa);
3251
3252# void glBlendEquation (int se)
2849 3253
2850void glDepthMask (int flag) 3254void glDepthMask (int flag)
2851 3255
2852void glLogicOp (int opcode) 3256void glLogicOp (int opcode)
2853 3257
2888void glRotate (float angle, float x, float y, float z) 3292void glRotate (float angle, float x, float y, float z)
2889 CODE: 3293 CODE:
2890 glRotatef (angle, x, y, z); 3294 glRotatef (angle, x, y, z);
2891 3295
2892void glColor (float r, float g, float b, float a = 1.0) 3296void glColor (float r, float g, float b, float a = 1.0)
3297 PROTOTYPE: @
2893 ALIAS: 3298 ALIAS:
2894 glColor_premultiply = 1 3299 glColor_premultiply = 1
2895 CODE: 3300 CODE:
2896 if (ix) 3301 if (ix)
2897 { 3302 {
3002void glNewList (int list, int mode = GL_COMPILE) 3407void glNewList (int list, int mode = GL_COMPILE)
3003 3408
3004void glEndList () 3409void glEndList ()
3005 3410
3006void glCallList (int list) 3411void glCallList (int list)
3412
3413void c_init ()
3414 CODE:
3415 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3416 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3007 3417
3008MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3418MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3009 3419
3010PROTOTYPES: DISABLE 3420PROTOTYPES: DISABLE
3011 3421

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines