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.275 by root, Thu Aug 28 00:53:53 2008 UTC vs.
Revision 1.316 by root, Sun Nov 4 02:13:53 2012 UTC

19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 42
44/* work around os x broken headers */ 43/* work around os x broken headers */
45#ifdef __MACOSX__ 44#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
47#endif 48#endif
48 49
49#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
51 52
81#define expect_false(expr) expect ((expr) != 0, 0) 82#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1) 83#define expect_true(expr) expect ((expr) != 0, 1)
83 84
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
87 91
88#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
90 94
91#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
92 96
93/* mask out modifiers we are not interested in */ 97/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
99
100#define KMOD_LRAM 0x10000 // our extension
101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
95 123
96static AV *texture_av; 124static AV *texture_av;
97 125
98static struct 126static struct
99{ 127{
231 int w, h; 259 int w, h;
232 float s, t; 260 float s, t;
233 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
234 tileid smoothtile; 262 tileid smoothtile;
235 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
236} maptex; 265} maptex;
237 266
238typedef struct { 267typedef struct {
239 uint32_t player; 268 uint32_t player;
240 tileid tile[3]; 269 tileid tile[3];
453 482
454 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
455} 484}
456 485
457static unsigned int 486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
490}
491
492static unsigned int
458minpot (unsigned int n) 493minpot (unsigned int n)
459{ 494{
460 if (!n) 495 if (!n)
461 return 0; 496 return 0;
462 497
527 return 0; 562 return 0;
528 563
529 return 1; 564 return 1;
530} 565}
531 566
567/******************************************************************************/
568
569/* process keyboard modifiers */
570static int
571mod_munge (int mod)
572{
573 mod &= MOD_MASK;
574
575 if (mod & (KMOD_META | KMOD_ALT))
576 mod |= KMOD_LRAM;
577
578 return mod;
579}
580
532static void 581static void
533deliantra_main () 582deliantra_main (SV *real_main)
534{ 583{
535 char *argv[] = { 0 }; 584 dSP;
536 call_argv ("::main", G_DISCARD | G_VOID, argv); 585
586 PUSHMARK (SP);
587 call_sv (real_main, G_DISCARD | G_VOID);
537} 588}
538 589
539#ifdef __MACOSX__ 590#ifdef __MACOSX__
591 static SV *real_main;
592
540 /* to due surprising braindamage on the side of SDL design, we 593 /* to due surprising braindamage on the side of SDL design, we
541 * do some mind-boggling hack here: SDL requires a custom main() 594 * do some mind-boggling hack here: SDL requires a custom main()
542 * on OS X, so... we provide one and call the original main(), which, 595 * on OS X, so... we provide one and call the original main(), which,
543 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 596 * due to shared library magic, calls -lSDLmain's main, not perl's main,
544 * and which calls our main (== SDL_main) back. 597 * and which calls our main (== SDL_main) back.
545 */ 598 */
546 extern C_LINKAGE int 599 extern C_LINKAGE int
547 main (int argc, char *argv[]) 600 main (int argc, char *argv[])
548 { 601 {
549 deliantra_main (); 602 deliantra_main (real_main);
550 } 603 }
551 604
552 #undef main 605 #undef main
553 606
554 extern C_LINKAGE int main (int argc, char *argv[]); 607 extern C_LINKAGE int main (int argc, char *argv[]);
555 608
556 static void 609 static void
557 SDL_braino (void) 610 SDL_main_hack (SV *real_main_)
558 { 611 {
612 real_main = real_main_;
613
559 char *argv[] = { "deliantra client", 0 }; 614 char *argv[] = { "deliantra client", 0 };
560 (main) (1, argv); 615 (main) (1, argv);
561 } 616 }
562#else 617#else
563 static void 618 static void
564 SDL_braino (void) 619 SDL_main_hack (SV *real_main)
565 { 620 {
566 deliantra_main (); 621 deliantra_main (real_main);
567 } 622 }
568#endif 623#endif
569 624
570MODULE = Deliantra::Client PACKAGE = DC 625MODULE = Deliantra::Client PACKAGE = DC
571 626
737 const_iv (KMOD_RMETA), 792 const_iv (KMOD_RMETA),
738 const_iv (KMOD_NUM), 793 const_iv (KMOD_NUM),
739 const_iv (KMOD_CAPS), 794 const_iv (KMOD_CAPS),
740 const_iv (KMOD_MODE), 795 const_iv (KMOD_MODE),
741 796
797 const_iv (KMOD_LRAM),
798
742 const_iv (MIX_DEFAULT_FORMAT), 799 const_iv (MIX_DEFAULT_FORMAT),
743 800
744 const_iv (SDL_INIT_TIMER), 801 const_iv (SDL_INIT_TIMER),
745 const_iv (SDL_INIT_AUDIO), 802 const_iv (SDL_INIT_AUDIO),
746 const_iv (SDL_INIT_VIDEO), 803 const_iv (SDL_INIT_VIDEO),
770 827
771 const_iv (FOW_DARKNESS) 828 const_iv (FOW_DARKNESS)
772# undef const_iv 829# undef const_iv
773 }; 830 };
774 831
775 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--)
776 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 833 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
777 834
778 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 835 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
779 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 836 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
780} 837}
781 838
797NV ceil (NV x) 854NV ceil (NV x)
798 855
799IV minpot (UV n) 856IV minpot (UV n)
800 857
801IV 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
802 865
803void 866void
804pango_init () 867pango_init ()
805 CODE: 868 CODE:
806{ 869{
814#endif 877#endif
815} 878}
816 879
817char *SDL_GetError () 880char *SDL_GetError ()
818 881
819void SDL_braino () 882void SDL_main_hack (SV *real_main)
883 PROTOTYPE: &
820 884
821int SDL_Init (U32 flags) 885int SDL_Init (U32 flags)
822 886
823int SDL_InitSubSystem (U32 flags) 887int SDL_InitSubSystem (U32 flags)
824 888
893 ); 957 );
894 958
895 if (RETVAL) 959 if (RETVAL)
896 { 960 {
897 av_clear (texture_av); 961 av_clear (texture_av);
898
899 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
900#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);
901#include "glfunc.h" 963#include "glfunc.h"
902#undef GL_FUNC 964#undef GL_FUNC
965 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
966 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
903 } 967 }
904} 968}
905 OUTPUT: 969 OUTPUT:
906 RETVAL 970 RETVAL
907 971
908void 972void
973SDL_WM_SetCaption (const char *title, const char *icon)
974
975void
909SDL_GL_SwapBuffers () 976SDL_GL_SwapBuffers ()
910 977
911char * 978char *
912SDL_GetKeyName (int sym) 979SDL_GetKeyName (int sym)
913 980
915SDL_GetAppState () 982SDL_GetAppState ()
916 983
917int 984int
918SDL_GetModState () 985SDL_GetModState ()
919 986
987int
988SDL_WaitEvent ()
989 C_ARGS: 0
990
920void 991void
992SDL_PumpEvents ()
993
994void
921poll_events () 995peep_events ()
922 PPCODE: 996 PPCODE:
923{ 997{
924 SDL_Event ev; 998 SDL_Event ev;
925 999
926 SDL_PumpEvents (); 1000 SDL_PumpEvents ();
933 { 1007 {
934 case SDL_KEYDOWN: 1008 case SDL_KEYDOWN:
935 case SDL_KEYUP: 1009 case SDL_KEYUP:
936 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1010 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
937 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1011 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
938 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);
939 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 */
940 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1014 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
941 break; 1015 break;
942 1016
943 case SDL_ACTIVEEVENT: 1017 case SDL_ACTIVEEVENT:
944 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1018 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
962 x = ev.motion.x; 1036 x = ev.motion.x;
963 y = ev.motion.y; 1037 y = ev.motion.y;
964 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1038 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
965 } 1039 }
966 1040
967 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1041 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
968 hv_store (hv, "state", 5, newSViv (state), 0); 1042 hv_store (hv, "state", 5, newSViv (state), 0);
969 hv_store (hv, "x", 1, newSViv (x), 0); 1043 hv_store (hv, "x", 1, newSViv (x), 0);
970 hv_store (hv, "y", 1, newSViv (y), 0); 1044 hv_store (hv, "y", 1, newSViv (y), 0);
971 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1045 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
972 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1046 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
992 1066
993 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))));
994 } 1068 }
995} 1069}
996 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
997int 1084int
998Mix_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)
999 POSTCALL: 1086 POSTCALL:
1000 Mix_HookMusicFinished (music_finished); 1087 Mix_HookMusicFinished (music_finished);
1001 Mix_ChannelFinished (channel_finished); 1088 Mix_ChannelFinished (channel_finished);
1063add_font (char *file) 1150add_font (char *file)
1064 CODE: 1151 CODE:
1065 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1152 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1066 OUTPUT: 1153 OUTPUT:
1067 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)
1068 1162
1069void 1163void
1070load_image_inline (SV *image_) 1164load_image_inline (SV *image_)
1071 ALIAS: 1165 ALIAS:
1072 load_image_file = 1 1166 load_image_file = 1
1188#if DEBUG 1282#if DEBUG
1189 VALGRIND_DO_LEAK_CHECK; 1283 VALGRIND_DO_LEAK_CHECK;
1190#endif 1284#endif
1191} 1285}
1192 1286
1287int
1288SvREFCNT (SV *sv)
1289 CODE:
1290 RETVAL = SvREFCNT (sv);
1291 OUTPUT:
1292 RETVAL
1293
1193MODULE = Deliantra::Client PACKAGE = DC::Font 1294MODULE = Deliantra::Client PACKAGE = DC::Font
1194 1295
1195PROTOTYPES: DISABLE 1296PROTOTYPES: DISABLE
1196 1297
1197DC::Font 1298DC::Font
1626 if (ix) 1727 if (ix)
1627 { 1728 {
1628 glDisable (GL_ALPHA_TEST); 1729 glDisable (GL_ALPHA_TEST);
1629 glDisable (GL_BLEND); 1730 glDisable (GL_BLEND);
1630 } 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);
1631} 1853}
1632 1854
1633IV 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)
1634 CODE: 1856 CODE:
1635{ 1857{
1741 //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);
1742 // use uglier nearest interpolation because linear suffers 1964 // use uglier nearest interpolation because linear suffers
1743 // from transparent color bleeding and ugly wrapping effects. 1965 // from transparent color bleeding and ugly wrapping effects.
1744 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1966 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1745} 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 }
1746 1988
1747int 1989int
1748ox (DC::Map self) 1990ox (DC::Map self)
1749 ALIAS: 1991 ALIAS:
1750 oy = 1 1992 oy = 1
1790 self->y += MAP_EXTEND_Y; 2032 self->y += MAP_EXTEND_Y;
1791 } 2033 }
1792} 2034}
1793 2035
1794SV * 2036SV *
1795map1a_update (DC::Map self, SV *data_, int extmap) 2037map1a_update (DC::Map self, SV *data_)
1796 CODE: 2038 CODE:
1797{ 2039{
1798 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2040 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1799 uint8_t *data_end = (uint8_t *)SvEND (data_); 2041 uint8_t *data_end = (uint8_t *)SvEND (data_);
1800 mapcell *cell; 2042 mapcell *cell;
1821 2063
1822 //TODO: don't trust server data to be in-range(!) 2064 //TODO: don't trust server data to be in-range(!)
1823 2065
1824 if (flags & 8) 2066 if (flags & 8)
1825 { 2067 {
2068 uint8_t ext, cmd;
2069
1826 if (extmap) 2070 do
1827 { 2071 {
1828 uint8_t ext, cmd; 2072 ext = *data++;
2073 cmd = ext & 0x7f;
1829 2074
1830 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
1831 { 2078 {
1832 ext = *data++;
1833 cmd = ext & 0x7f;
1834
1835 if (cmd < 4)
1836 cell->darkness = 255 - ext * 64 + 1;
1837 else if (cmd == 5) // health
1838 {
1839 cell->stat_width = 1; 2079 cell->stat_width = 1;
1840 cell->stat_hp = *data++; 2080 cell->stat_hp = *data++;
1841 }
1842 else if (cmd == 6) // monster width
1843 cell->stat_width = *data++ + 1;
1844 else if (cmd == 0x47)
1845 {
1846 if (*data == 1) cell->player = data [1];
1847 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1848 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1849 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1850
1851 data += *data + 1;
1852 }
1853 else if (cmd == 8) // cell flags
1854 cell->flags = *data++;
1855 else if (ext & 0x40) // unknown, multibyte => skip
1856 data += *data + 1;
1857 else
1858 data++;
1859 } 2081 }
1860 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++;
1861 } 2099 }
1862 else 2100 while (ext & 0x80);
1863 cell->darkness = *data++ + 1;
1864 } 2101 }
1865 2102
1866 for (z = 0; z <= 2; ++z) 2103 for (z = 0; z <= 2; ++z)
1867 if (flags & (4 >> z)) 2104 if (flags & (4 >> z))
1868 { 2105 {
1871 cell->tile [z] = self->face2tile [face]; 2108 cell->tile [z] = self->face2tile [face];
1872 2109
1873 if (cell->tile [z]) 2110 if (cell->tile [z])
1874 { 2111 {
1875 maptex *tex = self->tex + cell->tile [z]; 2112 maptex *tex = self->tex + cell->tile [z];
2113 tex->unused = 0;
1876 if (!tex->name) 2114 if (!tex->name)
1877 av_push (missing, newSViv (cell->tile [z])); 2115 av_push (missing, newSViv (cell->tile [z]));
1878 2116
1879 if (tex->smoothtile) 2117 if (tex->smoothtile)
1880 { 2118 {
1881 maptex *smooth = self->tex + tex->smoothtile; 2119 maptex *smooth = self->tex + tex->smoothtile;
2120 smooth->unused = 0;
1882 if (!smooth->name) 2121 if (!smooth->name)
1883 av_push (missing, newSViv (tex->smoothtile)); 2122 av_push (missing, newSViv (tex->smoothtile));
1884 } 2123 }
1885 } 2124 }
1886 } 2125 }
1914 ? self->row + y 2153 ? self->row + y
1915 : 0; 2154 : 0;
1916 2155
1917 for (x = x0; x < x1; x++) 2156 for (x = x0; x < x1; x++)
1918 { 2157 {
1919 int r = 32, g = 32, b = 32, a = 192; 2158 unsigned int r = 32, g = 32, b = 32, a = 192;
1920 2159
1921 if (row && row->c0 <= x && x < row->c1) 2160 if (row && row->c0 <= x && x < row->c1)
1922 { 2161 {
1923 mapcell *cell = row->col + (x - row->c0); 2162 mapcell *cell = row->col + (x - row->c0);
1924 2163
1926 { 2165 {
1927 maptex tex = self->tex [cell->tile [z]]; 2166 maptex tex = self->tex [cell->tile [z]];
1928 int a0 = 255 - tex.a; 2167 int a0 = 255 - tex.a;
1929 int a1 = tex.a; 2168 int a1 = tex.a;
1930 2169
1931 r = (r * a0 + tex.r * a1) / 255; 2170 r = div255 (r * a0 + tex.r * a1);
1932 g = (g * a0 + tex.g * a1) / 255; 2171 g = div255 (g * a0 + tex.g * a1);
1933 b = (b * a0 + tex.b * a1) / 255; 2172 b = div255 (b * a0 + tex.b * a1);
1934 a = (a * a0 + tex.a * a1) / 255; 2173 a = div255 (a * a0 + tex.a * a1);
1935 } 2174 }
1936 } 2175 }
1937 2176
1938 *map++ = (r ) 2177 *map++ = (r )
1939 | (g << 8) 2178 | (g << 8)
1946} 2185}
1947 OUTPUT: 2186 OUTPUT:
1948 RETVAL 2187 RETVAL
1949 2188
1950void 2189void
1951draw (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)
1952 CODE: 2191 CODE:
1953{ 2192{
1954 int x, y, z; 2193 int x, y, z;
1955 2194
1956 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2195 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1957 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
1958 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)
1959 smooth_key skey; 2198 smooth_key skey;
1960 int pl_x, pl_y; 2199 int pl_x, pl_y;
1961 maptex pl_tex; 2200 maptex pl_tex;
1962 rc_t *rc = rc_alloc (); 2201 rc_t *rc = rc_alloc ();
2202 rc_t *rc_ov = rc_alloc ();
1963 rc_key_t key; 2203 rc_key_t key;
1964 rc_array_t *arr; 2204 rc_array_t *arr;
1965 2205
1966 pl_tex.name = 0; 2206 pl_tex.name = 0;
1967 2207
1968 // thats current max. sorry. 2208 // that's current max. sorry.
1969 if (sw > 255) sw = 255; 2209 if (sw > 255) sw = 255;
1970 if (sh > 255) sh = 255; 2210 if (sh > 255) sh = 255;
1971 2211
1972 // clear key, in case of extra padding 2212 // clear key, in case of extra padding
1973 memset (&skey, 0, sizeof (skey)); 2213 memset (&skey, 0, sizeof (skey));
1977 key.g = 255; 2217 key.g = 255;
1978 key.b = 255; 2218 key.b = 255;
1979 key.a = 255; 2219 key.a = 255;
1980 key.mode = GL_QUADS; 2220 key.mode = GL_QUADS;
1981 key.format = GL_T2F_V3F; 2221 key.format = GL_T2F_V3F;
1982 key.texname = -1;
1983 2222
1984 mx += self->x; 2223 mx += self->x;
1985 my += self->y; 2224 my += self->y;
1986 2225
1987 // first pass: determine smooth_max 2226 // first pass: determine smooth_max
2011 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2250 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2012 2251
2013 for (z = 0; z <= 2; z++) 2252 for (z = 0; z <= 2; z++)
2014 { 2253 {
2015 memset (smooth_level, 0, sizeof (smooth_level)); 2254 memset (smooth_level, 0, sizeof (smooth_level));
2255 key.texname = -1;
2016 2256
2017 for (y = 0; y < sh; y++) 2257 for (y = 0; y < sh; y++)
2018 if (0 <= y + my && y + my < self->rows) 2258 if (0 <= y + my && y + my < self->rows)
2019 { 2259 {
2020 maprow *row = self->row + (y + my); 2260 maprow *row = self->row + (y + my);
2026 tileid tile = cell->tile [z]; 2266 tileid tile = cell->tile [z];
2027 2267
2028 if (tile) 2268 if (tile)
2029 { 2269 {
2030 maptex tex = self->tex [tile]; 2270 maptex tex = self->tex [tile];
2031 int px = (x + 1) * T - tex.w; 2271 int px, py;
2032 int py = (y + 1) * T - tex.h;
2033 2272
2034 if (key.texname != tex.name) 2273 if (key.texname != tex.name)
2035 { 2274 {
2275 self->tex [tile].unused = 0;
2276
2036 if (!tex.name) 2277 if (!tex.name)
2037 tex = self->tex [2]; /* missing, replace by noface */ 2278 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2038 2279
2039 key.texname = tex.name; 2280 key.texname = tex.name;
2040 arr = rc_array (rc, &key); 2281 arr = rc_array (rc, &key);
2041 } 2282 }
2283
2284 px = (x + 1) * Th - tex.w;
2285 py = (y + 1) * Tw - tex.h;
2042 2286
2043 if (expect_false (cell->player == player) && expect_false (z == 2)) 2287 if (expect_false (cell->player == player) && expect_false (z == 2))
2044 { 2288 {
2045 pl_x = px; 2289 pl_x = px;
2046 pl_y = py; 2290 pl_y = py;
2051 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2295 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2052 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);
2053 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);
2054 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);
2055 2299
2056 if (expect_false (cell->flags) && expect_false (z == 2))
2057 {
2058 // overlays such as the speech bubble, probably more to come
2059 if (cell->flags & 1)
2060 {
2061 maptex tex = self->tex [1];
2062 int px = x * T + T * 2 / 32;
2063 int py = y * T - T * 6 / 32;
2064
2065 if (tex.name)
2066 {
2067 if (key.texname != tex.name)
2068 {
2069 key.texname = tex.name;
2070 arr = rc_array (rc, &key);
2071 }
2072
2073 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2074 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2075 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2076 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2077 }
2078 }
2079 }
2080
2081 // update smooth hash 2300 // update smooth hash
2082 if (tex.smoothtile) 2301 if (tex.smoothtile)
2083 { 2302 {
2084 skey.tile = tex.smoothtile; 2303 skey.tile = tex.smoothtile;
2085 skey.level = tex.smoothlevel; 2304 skey.level = tex.smoothlevel;
2113 // corners 2332 // corners
2114 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);
2115 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);
2116 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);
2117 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);
2118 } 2358 }
2119 } 2359 }
2120 } 2360 }
2121 } 2361 }
2122 2362
2149 if (!(bits & 0x1000) 2389 if (!(bits & 0x1000)
2150 && skey->level == level 2390 && skey->level == level
2151 && level > smooth_max [skey->x][skey->y]) 2391 && level > smooth_max [skey->x][skey->y])
2152 { 2392 {
2153 maptex tex = self->tex [skey->tile]; 2393 maptex tex = self->tex [skey->tile];
2154 int px = (((int)skey->x) - 1) * T; 2394 int px = (((int)skey->x) - 1) * Tw;
2155 int py = (((int)skey->y) - 1) * T; 2395 int py = (((int)skey->y) - 1) * Th;
2156 int border = bits & 15; 2396 int border = bits & 15;
2157 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2397 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2158 float dx = tex.s * .0625f; // 16 images/row 2398 float dx = tex.s * .0625f; // 16 images/row
2159 float dy = tex.t * .5f ; // 2 images/column 2399 float dy = tex.t * .5f ; // 2 images/column
2160 2400
2162 { 2402 {
2163 // this time avoiding texture state changes 2403 // this time avoiding texture state changes
2164 // save gobs of state changes. 2404 // save gobs of state changes.
2165 if (key.texname != tex.name) 2405 if (key.texname != tex.name)
2166 { 2406 {
2407 self->tex [skey->tile].unused = 0;
2408
2167 glEnd (); 2409 glEnd ();
2168 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2410 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2169 glBegin (GL_QUADS); 2411 glBegin (GL_QUADS);
2170 } 2412 }
2171 2413
2172 if (border) 2414 if (border)
2173 { 2415 {
2174 float ox = border * dx; 2416 float ox = border * dx;
2175 2417
2176 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2418 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2177 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2419 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2178 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2420 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2179 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2421 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2180 } 2422 }
2181 2423
2182 if (corner) 2424 if (corner)
2183 { 2425 {
2184 float ox = corner * dx; 2426 float ox = corner * dx;
2185 2427
2186 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2428 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2187 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2429 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2188 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2430 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2189 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2431 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2190 } 2432 }
2191 } 2433 }
2192 } 2434 }
2193 } 2435 }
2194 } 2436 }
2217 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);
2218 2460
2219 rc_draw (rc); 2461 rc_draw (rc);
2220 } 2462 }
2221 2463
2464 rc_draw (rc_ov);
2465 rc_clear (rc_ov);
2466
2222 glDisable (GL_BLEND); 2467 glDisable (GL_BLEND);
2223 rc_free (rc); 2468 rc_free (rc);
2469 rc_free (rc_ov);
2224 2470
2225 // top layer: overlays such as the health bar 2471 // top layer: overlays such as the health bar
2226 for (y = 0; y < sh; y++) 2472 for (y = 0; y < sh; y++)
2227 if (0 <= y + my && y + my < self->rows) 2473 if (0 <= y + my && y + my < self->rows)
2228 { 2474 {
2231 for (x = 0; x < sw; x++) 2477 for (x = 0; x < sw; x++)
2232 if (row->c0 <= x + mx && x + mx < row->c1) 2478 if (row->c0 <= x + mx && x + mx < row->c1)
2233 { 2479 {
2234 mapcell *cell = row->col + (x + mx - row->c0); 2480 mapcell *cell = row->col + (x + mx - row->c0);
2235 2481
2236 int px = x * T; 2482 int px = x * Tw;
2237 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 }
2238 2490
2239 if (cell->stat_hp) 2491 if (cell->stat_hp)
2240 { 2492 {
2241 int width = cell->stat_width * T; 2493 int width = cell->stat_width * Tw;
2242 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2494 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2243 2495
2244 glColor3ub (0, 0, 0); 2496 glColor3ub (0, 0, 0);
2245 glRectf (px + 1, py - thick - 2, 2497 glRectf (px + 1, py - thick - 2,
2246 px + width - 1, py); 2498 px + width - 1, py);
2247 2499
2253 } 2505 }
2254 } 2506 }
2255} 2507}
2256 2508
2257void 2509void
2258draw_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)
2259 CODE: 2511 CODE:
2260{ 2512{
2261 static float color[16][3] = { 2513 static float color[16][3] = {
2262 { 0.00F, 0.00F, 0.00F }, 2514 { 0.00f, 0.00f, 0.00f },
2263 { 1.00F, 1.00F, 1.00F }, 2515 { 1.00f, 1.00f, 1.00f },
2264 { 0.00F, 0.00F, 0.55F }, 2516 { 0.00f, 0.00f, 0.55f },
2265 { 1.00F, 0.00F, 0.00F }, 2517 { 1.00f, 0.00f, 0.00f },
2266 2518
2267 { 1.00F, 0.54F, 0.00F }, 2519 { 1.00f, 0.54f, 0.00f },
2268 { 0.11F, 0.56F, 1.00F }, 2520 { 0.11f, 0.56f, 1.00f },
2269 { 0.93F, 0.46F, 0.00F }, 2521 { 0.93f, 0.46f, 0.00f },
2270 { 0.18F, 0.54F, 0.34F }, 2522 { 0.18f, 0.54f, 0.34f },
2271 2523
2272 { 0.56F, 0.73F, 0.56F }, 2524 { 0.56f, 0.73f, 0.56f },
2273 { 0.80F, 0.80F, 0.80F }, 2525 { 0.80f, 0.80f, 0.80f },
2274 { 0.55F, 0.41F, 0.13F }, 2526 { 0.55f, 0.41f, 0.13f },
2275 { 0.99F, 0.77F, 0.26F }, 2527 { 0.99f, 0.77f, 0.26f },
2276 2528
2277 { 0.74F, 0.65F, 0.41F }, 2529 { 0.74f, 0.65f, 0.41f },
2278 2530
2279 { 0.00F, 1.00F, 1.00F }, 2531 { 0.00f, 1.00f, 1.00f },
2280 { 1.00F, 0.00F, 1.00F }, 2532 { 1.00f, 0.00f, 1.00f },
2281 { 1.00F, 1.00F, 0.00F }, 2533 { 1.00f, 1.00f, 0.00f },
2282 }; 2534 };
2283 2535
2284 int x, y; 2536 int x, y;
2285 2537
2286 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 */
2287 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2545 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2288 glEnable (GL_BLEND); 2546 glEnable (GL_BLEND);
2289 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2547 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2290 glBegin (GL_QUADS); 2548 glBegin (GL_QUADS);
2291 2549
2292 for (y = 0; y < h; y++) 2550 for (y = 0; y < h; y++)
2296 2554
2297 if (m) 2555 if (m)
2298 { 2556 {
2299 float *c = color [m & 15]; 2557 float *c = color [m & 15];
2300 2558
2301 float tx1 = m & 0x40 ? 0.5 : 0.; 2559 float tx1 = m & 0x40 ? 0.5f : 0.f;
2302 float tx2 = tx1 + 0.5; 2560 float tx2 = tx1 + 0.5f;
2303 2561
2304 glColor4f (c[0], c[1], c[2], 0.75); 2562 glColor4f (c[0], c[1], c[2], 1);
2305 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2563 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2306 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2564 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2307 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2565 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2308 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2566 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2309 } 2567 }
2317void 2575void
2318fow_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)
2319 PPCODE: 2577 PPCODE:
2320{ 2578{
2321 int x, y; 2579 int x, y;
2322 int sw1 = sw + 2; 2580 int sw1 = sw + 2;
2323 int sh1 = sh + 2; 2581 int sh1 = sh + 2;
2324 int sh3 = sh * 3; 2582 int sh3 = sh * 3;
2325 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);
2326 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2586 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2327 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2587 memset (darkness1, 0, sw1*sh1);
2328 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2329 2588
2330 SvPOK_only (darkness3_sv); 2589 SvPOK_only (darkness3_sv);
2331 SvCUR_set (darkness3_sv, sw34 * sh3); 2590 SvCUR_set (darkness3_sv, sw3 * sh3);
2332 2591
2333 mx += self->x - 1; 2592 mx += self->x - 1;
2334 my += self->y - 1; 2593 my += self->y - 1;
2335
2336 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2337 2594
2338 for (y = 0; y < sh1; y++) 2595 for (y = 0; y < sh1; y++)
2339 if (0 <= y + my && y + my < self->rows) 2596 if (0 <= y + my && y + my < self->rows)
2340 { 2597 {
2341 maprow *row = self->row + (y + my); 2598 maprow *row = self->row + (y + my);
2344 if (row->c0 <= x + mx && x + mx < row->c1) 2601 if (row->c0 <= x + mx && x + mx < row->c1)
2345 { 2602 {
2346 mapcell *cell = row->col + (x + mx - row->c0); 2603 mapcell *cell = row->col + (x + mx - row->c0);
2347 2604
2348 darkness1 [y * sw1 + x] = cell->darkness 2605 darkness1 [y * sw1 + x] = cell->darkness
2349 ? 255 - (cell->darkness - 1) 2606 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2350 : 255 - FOW_DARKNESS; 2607 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2351 } 2608 }
2352 } 2609 }
2353 2610
2354 for (y = 0; y < sh; ++y) 2611 for (y = 0; y < sh; ++y)
2355 for (x = 0; x < sw; ++x) 2612 for (x = 0; x < sw; ++x)
2374 2631
2375 uint8_t r13 = (d13 + d23 + d12) / 3; 2632 uint8_t r13 = (d13 + d23 + d12) / 3;
2376 uint8_t r23 = d23; 2633 uint8_t r23 = d23;
2377 uint8_t r33 = (d23 + d33 + d32) / 3; 2634 uint8_t r33 = (d23 + d33 + d32) / 3;
2378 2635
2379 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2636 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2380 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2637 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2381 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2638 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2382 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2639 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2383 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 */
2384 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2641 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2385 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2642 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2386 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2643 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2387 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2644 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2388 } 2645 }
2389 2646
2390 free (darkness1); 2647 free (darkness1);
2391 2648
2392 EXTEND (SP, 3); 2649 EXTEND (SP, 3);
2393 PUSHs (sv_2mortal (newSViv (sw34))); 2650 PUSHs (sv_2mortal (newSViv (sw3)));
2394 PUSHs (sv_2mortal (newSViv (sh3))); 2651 PUSHs (sv_2mortal (newSViv (sh3)));
2395 PUSHs (darkness3_sv); 2652 PUSHs (darkness3_sv);
2396} 2653}
2397 2654
2398SV * 2655SV *
2596 if (RETVAL < 0) 2853 if (RETVAL < 0)
2597 { 2854 {
2598 RETVAL = Mix_GroupOldest (-1); 2855 RETVAL = Mix_GroupOldest (-1);
2599 2856
2600 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)
2601 XSRETURN_UNDEF; 2863 XSRETURN_UNDEF;
2602 2864 }
2865 else
2603 Mix_HaltChannel (RETVAL); 2866 Mix_HaltChannel (RETVAL);
2604 } 2867 }
2605 2868
2606 Mix_UnregisterAllEffects (RETVAL); 2869 Mix_UnregisterAllEffects (RETVAL);
2607 Mix_Volume (RETVAL, 128); 2870 Mix_Volume (RETVAL, 128);
2608} 2871}
2655void 2918void
2656set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2919set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2657 CODE: 2920 CODE:
2658{ 2921{
2659 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));
2660 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;
2661 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2924 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2662} 2925}
2663 2926
2664void 2927void
2665set_reverse_stereo (DC::Channel self, int flip) 2928set_reverse_stereo (DC::Channel self, int flip)
2667 Mix_SetReverseStereo (self, flip); 2930 Mix_SetReverseStereo (self, flip);
2668 2931
2669MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2932MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2670 2933
2671PROTOTYPES: 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
2672 2947
2673DC::MixChunk 2948DC::MixChunk
2674new (SV *class, DC::RW rwops) 2949new (SV *class, DC::RW rwops)
2675 CODE: 2950 CODE:
2676 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2951 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2709 OUTPUT: 2984 OUTPUT:
2710 RETVAL 2985 RETVAL
2711 2986
2712MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2987MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2713 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
2714int 3001int
2715volume (int volume = -1) 3002volume (int volume = -1)
2716 PROTOTYPE: ;$ 3003 PROTOTYPE: ;$
2717 CODE: 3004 CODE:
2718 if (items > 0) 3005 if (items > 0)
2728 3015
2729void 3016void
2730halt () 3017halt ()
2731 CODE: 3018 CODE:
2732 Mix_HaltMusic (); 3019 Mix_HaltMusic ();
3020
3021int
3022playing ()
3023 CODE:
3024 RETVAL = Mix_PlayingMusic ();
3025 OUTPUT:
3026 RETVAL
2733 3027
2734DC::MixMusic 3028DC::MixMusic
2735new (SV *class, DC::RW rwops) 3029new (SV *class, DC::RW rwops)
2736 CODE: 3030 CODE:
2737 RETVAL = Mix_LoadMUS_RW (rwops); 3031 RETVAL = Mix_LoadMUS_RW (rwops);
2768 } *civ, const_iv[] = { 3062 } *civ, const_iv[] = {
2769# define const_iv(name) { # name, (IV)name } 3063# define const_iv(name) { # name, (IV)name }
2770 const_iv (GL_VENDOR), 3064 const_iv (GL_VENDOR),
2771 const_iv (GL_VERSION), 3065 const_iv (GL_VERSION),
2772 const_iv (GL_EXTENSIONS), 3066 const_iv (GL_EXTENSIONS),
3067 const_iv (GL_MAX_TEXTURE_UNITS),
2773 const_iv (GL_COLOR_MATERIAL), 3068 const_iv (GL_COLOR_MATERIAL),
2774 const_iv (GL_SMOOTH), 3069 const_iv (GL_SMOOTH),
2775 const_iv (GL_FLAT), 3070 const_iv (GL_FLAT),
2776 const_iv (GL_DITHER), 3071 const_iv (GL_DITHER),
2777 const_iv (GL_BLEND), 3072 const_iv (GL_BLEND),
2789 const_iv (GL_ZERO), 3084 const_iv (GL_ZERO),
2790 const_iv (GL_SRC_ALPHA), 3085 const_iv (GL_SRC_ALPHA),
2791 const_iv (GL_DST_ALPHA), 3086 const_iv (GL_DST_ALPHA),
2792 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3087 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2793 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),
2794 const_iv (GL_SRC_ALPHA_SATURATE), 3093 const_iv (GL_SRC_ALPHA_SATURATE),
2795 const_iv (GL_RGB), 3094 const_iv (GL_RGB),
2796 const_iv (GL_RGBA), 3095 const_iv (GL_RGBA),
2797 const_iv (GL_RGBA4), 3096 const_iv (GL_RGBA4),
2798 const_iv (GL_RGBA8), 3097 const_iv (GL_RGBA8),
2866 const_iv (GL_NICEST), 3165 const_iv (GL_NICEST),
2867 const_iv (GL_V2F), 3166 const_iv (GL_V2F),
2868 const_iv (GL_V3F), 3167 const_iv (GL_V3F),
2869 const_iv (GL_T2F_V3F), 3168 const_iv (GL_T2F_V3F),
2870 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),
2871# undef const_iv 3173# undef const_iv
2872 }; 3174 };
2873 3175
2874 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--)
2875 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3177 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2876 3178
2877 texture_av = newAV (); 3179 texture_av = newAV ();
2878 AvREAL_off (texture_av); 3180 AvREAL_off (texture_av);
2879} 3181}
2880 3182
2881void 3183void
2882disable_GL_EXT_blend_func_separate () 3184disable_GL_EXT_blend_func_separate ()
2883 CODE: 3185 CODE:
2884 gl.BlendFuncSeparate = 0; 3186 gl.BlendFuncSeparate = 0;
2885 gl.BlendFuncSeparateEXT = 0; 3187 gl.BlendFuncSeparateEXT = 0;
3188
3189void
3190apple_nvidia_bug (int enable)
2886 3191
2887char * 3192char *
2888gl_vendor () 3193gl_vendor ()
2889 CODE: 3194 CODE:
2890 RETVAL = (char *)glGetString (GL_VENDOR); 3195 RETVAL = (char *)glGetString (GL_VENDOR);
2921 3226
2922int glGetError () 3227int glGetError ()
2923 3228
2924void glFinish () 3229void glFinish ()
2925 3230
3231void glFlush ()
3232
2926void glClear (int mask) 3233void glClear (int mask)
2927 3234
2928void glClearColor (float r, float g, float b, float a = 1.0) 3235void glClearColor (float r, float g, float b, float a = 1.0)
2929 PROTOTYPE: @ 3236 PROTOTYPE: @
2930 3237
2939void glBlendFunc (int sfactor, int dfactor) 3246void glBlendFunc (int sfactor, int dfactor)
2940 3247
2941void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3248void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2942 CODE: 3249 CODE:
2943 gl_BlendFuncSeparate (sa, da, saa, daa); 3250 gl_BlendFuncSeparate (sa, da, saa, daa);
3251
3252# void glBlendEquation (int se)
2944 3253
2945void glDepthMask (int flag) 3254void glDepthMask (int flag)
2946 3255
2947void glLogicOp (int opcode) 3256void glLogicOp (int opcode)
2948 3257
2983void glRotate (float angle, float x, float y, float z) 3292void glRotate (float angle, float x, float y, float z)
2984 CODE: 3293 CODE:
2985 glRotatef (angle, x, y, z); 3294 glRotatef (angle, x, y, z);
2986 3295
2987void 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: @
2988 ALIAS: 3298 ALIAS:
2989 glColor_premultiply = 1 3299 glColor_premultiply = 1
2990 CODE: 3300 CODE:
2991 if (ix) 3301 if (ix)
2992 { 3302 {
3097void glNewList (int list, int mode = GL_COMPILE) 3407void glNewList (int list, int mode = GL_COMPILE)
3098 3408
3099void glEndList () 3409void glEndList ()
3100 3410
3101void 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);
3102 3417
3103MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3418MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3104 3419
3105PROTOTYPES: DISABLE 3420PROTOTYPES: DISABLE
3106 3421

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines