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.293 by root, Thu Dec 17 02:49:38 2009 UTC vs.
Revision 1.317 by root, Fri Nov 23 12:39:05 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 64 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
95 99
96#define KMOD_LRAM 0x10000 // our extension 100#define KMOD_LRAM 0x10000 // our extension
97 101
98#define TEXID_SPEECH 1 102#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2 103#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3 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}
101 123
102static AV *texture_av; 124static AV *texture_av;
103 125
104static struct 126static struct
105{ 127{
460 482
461 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
462} 484}
463 485
464static unsigned int 486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
490}
491
492static unsigned int
465minpot (unsigned int n) 493minpot (unsigned int n)
466{ 494{
467 if (!n) 495 if (!n)
468 return 0; 496 return 0;
469 497
549 577
550 return mod; 578 return mod;
551} 579}
552 580
553static void 581static void
554deliantra_main () 582deliantra_main (SV *real_main)
555{ 583{
556 char *argv[] = { 0 }; 584 dSP;
557 call_argv ("::main", G_DISCARD | G_VOID, argv); 585
586 PUSHMARK (SP);
587 call_sv (real_main, G_DISCARD | G_VOID);
558} 588}
559 589
560#ifdef __MACOSX__ 590#ifdef __MACOSX__
591 static SV *real_main;
592
561 /* to due surprising braindamage on the side of SDL design, we 593 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main() 594 * do some mind-boggling hack here: SDL requires a custom main()
563 * 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,
564 * 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,
565 * and which calls our main (== SDL_main) back. 597 * and which calls our main (== SDL_main) back.
566 */ 598 */
567 extern C_LINKAGE int 599 extern C_LINKAGE int
568 main (int argc, char *argv[]) 600 main (int argc, char *argv[])
569 { 601 {
570 deliantra_main (); 602 deliantra_main (real_main);
571 } 603 }
572 604
573 #undef main 605 #undef main
574 606
575 extern C_LINKAGE int main (int argc, char *argv[]); 607 extern C_LINKAGE int main (int argc, char *argv[]);
576 608
577 static void 609 static void
578 SDL_braino (void) 610 SDL_main_hack (SV *real_main_)
579 { 611 {
612 real_main = real_main_;
613
580 char *argv[] = { "deliantra client", 0 }; 614 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv); 615 (main) (1, argv);
582 } 616 }
583#else 617#else
584 static void 618 static void
585 SDL_braino (void) 619 SDL_main_hack (SV *real_main)
586 { 620 {
587 deliantra_main (); 621 deliantra_main (real_main);
588 } 622 }
589#endif 623#endif
590 624
591MODULE = Deliantra::Client PACKAGE = DC 625MODULE = Deliantra::Client PACKAGE = DC
592 626
793 827
794 const_iv (FOW_DARKNESS) 828 const_iv (FOW_DARKNESS)
795# undef const_iv 829# undef const_iv
796 }; 830 };
797 831
798 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--)
799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 833 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
800 834
801 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 835 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
802 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 836 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
803} 837}
804 838
820NV ceil (NV x) 854NV ceil (NV x)
821 855
822IV minpot (UV n) 856IV minpot (UV n)
823 857
824IV 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
825 865
826void 866void
827pango_init () 867pango_init ()
828 CODE: 868 CODE:
829{ 869{
837#endif 877#endif
838} 878}
839 879
840char *SDL_GetError () 880char *SDL_GetError ()
841 881
842void SDL_braino () 882void SDL_main_hack (SV *real_main)
883 PROTOTYPE: &
843 884
844int SDL_Init (U32 flags) 885int SDL_Init (U32 flags)
845 886
846int SDL_InitSubSystem (U32 flags) 887int SDL_InitSubSystem (U32 flags)
847 888
916 ); 957 );
917 958
918 if (RETVAL) 959 if (RETVAL)
919 { 960 {
920 av_clear (texture_av); 961 av_clear (texture_av);
921
922 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
923#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);
924#include "glfunc.h" 963#include "glfunc.h"
925#undef GL_FUNC 964#undef GL_FUNC
965 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
966 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
926 } 967 }
927} 968}
928 OUTPUT: 969 OUTPUT:
929 RETVAL 970 RETVAL
930 971
931void 972void
973SDL_WM_SetCaption (const char *title, const char *icon)
974
975void
932SDL_GL_SwapBuffers () 976SDL_GL_SwapBuffers ()
933 977
934char * 978char *
935SDL_GetKeyName (int sym) 979SDL_GetKeyName (int sym)
936 980
938SDL_GetAppState () 982SDL_GetAppState ()
939 983
940int 984int
941SDL_GetModState () 985SDL_GetModState ()
942 986
987int
988SDL_WaitEvent ()
989 C_ARGS: 0
990
943void 991void
992SDL_PumpEvents ()
993
994void
944poll_events () 995peep_events ()
945 PPCODE: 996 PPCODE:
946{ 997{
947 SDL_Event ev; 998 SDL_Event ev;
948 999
949 SDL_PumpEvents (); 1000 SDL_PumpEvents ();
1015 1066
1016 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))));
1017 } 1068 }
1018} 1069}
1019 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
1020int 1084int
1021Mix_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)
1022 POSTCALL: 1086 POSTCALL:
1023 Mix_HookMusicFinished (music_finished); 1087 Mix_HookMusicFinished (music_finished);
1024 Mix_ChannelFinished (channel_finished); 1088 Mix_ChannelFinished (channel_finished);
1086add_font (char *file) 1150add_font (char *file)
1087 CODE: 1151 CODE:
1088 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1152 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089 OUTPUT: 1153 OUTPUT:
1090 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)
1091 1162
1092void 1163void
1093load_image_inline (SV *image_) 1164load_image_inline (SV *image_)
1094 ALIAS: 1165 ALIAS:
1095 load_image_file = 1 1166 load_image_file = 1
1421 1492
1422void 1493void
1423set_height (DC::Layout self, int base_height) 1494set_height (DC::Layout self, int base_height)
1424 CODE: 1495 CODE:
1425 if (self->base_height != base_height) 1496 if (self->base_height != base_height)
1426 { 1497 {
1427 self->base_height = base_height; 1498 self->base_height = base_height;
1428 layout_update_font (self); 1499 layout_update_font (self);
1429 } 1500 }
1430 1501
1431void 1502void
1659 glDisable (GL_BLEND); 1730 glDisable (GL_BLEND);
1660 } 1731 }
1661} 1732}
1662 1733
1663void 1734void
1664draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1) 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)
1665 PROTOTYPE: @ 1736 PROTOTYPE: @
1666 CODE: 1737 CODE:
1667{ 1738{
1739 glEnable (GL_BLEND);
1740 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1668 glEnable (GL_TEXTURE_2D); 1741 glEnable (GL_TEXTURE_2D);
1669 glEnable (GL_BLEND); 1742 glBindTexture (GL_TEXTURE_2D, name1);
1670 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1671 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672 1743
1673 glColor4f (intensity, intensity, intensity, 0.9); 1744 glColor3f (intensity, intensity, intensity);
1674 glPushMatrix (); 1745 glPushMatrix ();
1675 glScalef (1./3, 1./3, 1.); 1746 glScalef (1./3, 1./3, 1.);
1676 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);
1677 glBindTexture (GL_TEXTURE_2D, name1); 1761 glBindTexture (GL_TEXTURE_2D, name2);
1762 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1678 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);
1679 glBegin (GL_QUADS); 1815 glBegin (GL_QUADS);
1680 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0); 1816
1681 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1); 1817 for (y = 1; y < h; y += 3)
1682 glTexCoord2f (s1, t1); glVertex2f (w1, h1); 1818 {
1683 glTexCoord2f (s1, 0); glVertex2f (w1, 0); 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
1684 glEnd (); 1847 glEnd ();
1685 1848
1686 glPopMatrix (); 1849 glPopMatrix ();
1687 1850
1688 glDisable (GL_TEXTURE_2D); 1851 glDisable (GL_TEXTURE_2D);
1869 self->y += MAP_EXTEND_Y; 2032 self->y += MAP_EXTEND_Y;
1870 } 2033 }
1871} 2034}
1872 2035
1873SV * 2036SV *
1874map1a_update (DC::Map self, SV *data_, int extmap) 2037map1a_update (DC::Map self, SV *data_)
1875 CODE: 2038 CODE:
1876{ 2039{
1877 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2040 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1878 uint8_t *data_end = (uint8_t *)SvEND (data_); 2041 uint8_t *data_end = (uint8_t *)SvEND (data_);
1879 mapcell *cell; 2042 mapcell *cell;
1900 2063
1901 //TODO: don't trust server data to be in-range(!) 2064 //TODO: don't trust server data to be in-range(!)
1902 2065
1903 if (flags & 8) 2066 if (flags & 8)
1904 { 2067 {
2068 uint8_t ext, cmd;
2069
1905 if (extmap) 2070 do
1906 { 2071 {
1907 uint8_t ext, cmd; 2072 ext = *data++;
2073 cmd = ext & 0x7f;
1908 2074
1909 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
1910 { 2078 {
1911 ext = *data++;
1912 cmd = ext & 0x7f;
1913
1914 if (cmd < 4)
1915 cell->darkness = 255 - ext * 64 + 1;
1916 else if (cmd == 5) // health
1917 {
1918 cell->stat_width = 1; 2079 cell->stat_width = 1;
1919 cell->stat_hp = *data++; 2080 cell->stat_hp = *data++;
1920 }
1921 else if (cmd == 6) // monster width
1922 cell->stat_width = *data++ + 1;
1923 else if (cmd == 0x47)
1924 {
1925 if (*data == 1) cell->player = data [1];
1926 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1927 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1928 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1929
1930 data += *data + 1;
1931 }
1932 else if (cmd == 8) // cell flags
1933 cell->flags = *data++;
1934 else if (ext & 0x40) // unknown, multibyte => skip
1935 data += *data + 1;
1936 else
1937 data++;
1938 } 2081 }
1939 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++;
1940 } 2099 }
1941 else 2100 while (ext & 0x80);
1942 cell->darkness = *data++ + 1;
1943 } 2101 }
1944 2102
1945 for (z = 0; z <= 2; ++z) 2103 for (z = 0; z <= 2; ++z)
1946 if (flags & (4 >> z)) 2104 if (flags & (4 >> z))
1947 { 2105 {
1995 ? self->row + y 2153 ? self->row + y
1996 : 0; 2154 : 0;
1997 2155
1998 for (x = x0; x < x1; x++) 2156 for (x = x0; x < x1; x++)
1999 { 2157 {
2000 int r = 32, g = 32, b = 32, a = 192; 2158 unsigned int r = 32, g = 32, b = 32, a = 192;
2001 2159
2002 if (row && row->c0 <= x && x < row->c1) 2160 if (row && row->c0 <= x && x < row->c1)
2003 { 2161 {
2004 mapcell *cell = row->col + (x - row->c0); 2162 mapcell *cell = row->col + (x - row->c0);
2005 2163
2007 { 2165 {
2008 maptex tex = self->tex [cell->tile [z]]; 2166 maptex tex = self->tex [cell->tile [z]];
2009 int a0 = 255 - tex.a; 2167 int a0 = 255 - tex.a;
2010 int a1 = tex.a; 2168 int a1 = tex.a;
2011 2169
2012 r = (r * a0 + tex.r * a1) / 255; 2170 r = div255 (r * a0 + tex.r * a1);
2013 g = (g * a0 + tex.g * a1) / 255; 2171 g = div255 (g * a0 + tex.g * a1);
2014 b = (b * a0 + tex.b * a1) / 255; 2172 b = div255 (b * a0 + tex.b * a1);
2015 a = (a * a0 + tex.a * a1) / 255; 2173 a = div255 (a * a0 + tex.a * a1);
2016 } 2174 }
2017 } 2175 }
2018 2176
2019 *map++ = (r ) 2177 *map++ = (r )
2020 | (g << 8) 2178 | (g << 8)
2027} 2185}
2028 OUTPUT: 2186 OUTPUT:
2029 RETVAL 2187 RETVAL
2030 2188
2031void 2189void
2032draw (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)
2033 CODE: 2191 CODE:
2034{ 2192{
2035 int x, y, z; 2193 int x, y, z;
2036 2194
2037 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2195 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2041 int pl_x, pl_y; 2199 int pl_x, pl_y;
2042 maptex pl_tex; 2200 maptex pl_tex;
2043 rc_t *rc = rc_alloc (); 2201 rc_t *rc = rc_alloc ();
2044 rc_t *rc_ov = rc_alloc (); 2202 rc_t *rc_ov = rc_alloc ();
2045 rc_key_t key; 2203 rc_key_t key;
2046 rc_array_t *arr, *arr_hidden; 2204 rc_array_t *arr;
2047 2205
2048 pl_tex.name = 0; 2206 pl_tex.name = 0;
2049 2207
2050 // that's current max. sorry. 2208 // that's current max. sorry.
2051 if (sw > 255) sw = 255; 2209 if (sw > 255) sw = 255;
2088 } 2246 }
2089 2247
2090 glEnable (GL_BLEND); 2248 glEnable (GL_BLEND);
2091 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2249 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2250 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2093
2094 key.texname = self->tex [TEXID_HIDDEN].name;
2095 arr_hidden = rc_array (rc_ov, &key);
2096 2251
2097 for (z = 0; z <= 2; z++) 2252 for (z = 0; z <= 2; z++)
2098 { 2253 {
2099 memset (smooth_level, 0, sizeof (smooth_level)); 2254 memset (smooth_level, 0, sizeof (smooth_level));
2100 key.texname = -1; 2255 key.texname = -1;
2124 2279
2125 key.texname = tex.name; 2280 key.texname = tex.name;
2126 arr = rc_array (rc, &key); 2281 arr = rc_array (rc, &key);
2127 } 2282 }
2128 2283
2129 px = (x + 1) * T - tex.w; 2284 px = (x + 1) * Th - tex.w;
2130 py = (y + 1) * T - tex.h; 2285 py = (y + 1) * Tw - tex.h;
2131 2286
2132 if (expect_false (cell->player == player) && expect_false (z == 2)) 2287 if (expect_false (cell->player == player) && expect_false (z == 2))
2133 { 2288 {
2134 pl_x = px; 2289 pl_x = px;
2135 pl_y = py; 2290 pl_y = py;
2180 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);
2181 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);
2182 } 2337 }
2183 } 2338 }
2184 2339
2185 if (expect_false (z == 2)) 2340 if (expect_false (z == 2) && expect_false (cell->flags))
2186 { 2341 {
2187 /* draw question marks on top of hidden spaces */ 2342 // overlays such as the speech bubble, probably more to come
2188 if (!cell->darkness) 2343 if (cell->flags & 1)
2189 { 2344 {
2190 maptex tex = self->tex [TEXID_HIDDEN];
2191 int px = (x + 1) * T - tex.w;
2192 int py = (y + 1) * T - tex.h;
2193
2194 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2195 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2196 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2197 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2198 }
2199
2200 if (expect_false (cell->flags))
2201 {
2202 // overlays such as the speech bubble, probably more to come
2203 if (cell->flags & 1)
2204 {
2205 rc_key_t key_ov = key; 2345 rc_key_t key_ov = key;
2206 maptex tex = self->tex [TEXID_SPEECH]; 2346 maptex tex = self->tex [TEXID_SPEECH];
2207 rc_array_t *arr; 2347 rc_array_t *arr;
2208 int px = x * T + T * 2 / 32; 2348 int px = x * Tw + Tw * 2 / 32;
2209 int py = y * T - T * 6 / 32; 2349 int py = y * Th - Th * 6 / 32;
2210 2350
2211 key_ov.texname = tex.name; 2351 key_ov.texname = tex.name;
2212 arr = rc_array (rc_ov, &key_ov); 2352 arr = rc_array (rc_ov, &key_ov);
2213 2353
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2354 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2355 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2216 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2356 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2217 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2357 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2218 }
2219 } 2358 }
2220 } 2359 }
2221 } 2360 }
2222 } 2361 }
2223 2362
2250 if (!(bits & 0x1000) 2389 if (!(bits & 0x1000)
2251 && skey->level == level 2390 && skey->level == level
2252 && level > smooth_max [skey->x][skey->y]) 2391 && level > smooth_max [skey->x][skey->y])
2253 { 2392 {
2254 maptex tex = self->tex [skey->tile]; 2393 maptex tex = self->tex [skey->tile];
2255 int px = (((int)skey->x) - 1) * T; 2394 int px = (((int)skey->x) - 1) * Tw;
2256 int py = (((int)skey->y) - 1) * T; 2395 int py = (((int)skey->y) - 1) * Th;
2257 int border = bits & 15; 2396 int border = bits & 15;
2258 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2397 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2259 float dx = tex.s * .0625f; // 16 images/row 2398 float dx = tex.s * .0625f; // 16 images/row
2260 float dy = tex.t * .5f ; // 2 images/column 2399 float dy = tex.t * .5f ; // 2 images/column
2261 2400
2274 2413
2275 if (border) 2414 if (border)
2276 { 2415 {
2277 float ox = border * dx; 2416 float ox = border * dx;
2278 2417
2279 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2418 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2280 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2419 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2281 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2420 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2282 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2421 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2283 } 2422 }
2284 2423
2285 if (corner) 2424 if (corner)
2286 { 2425 {
2287 float ox = corner * dx; 2426 float ox = corner * dx;
2288 2427
2289 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2428 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2290 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2429 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2291 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2430 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2292 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2431 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2293 } 2432 }
2294 } 2433 }
2295 } 2434 }
2296 } 2435 }
2297 } 2436 }
2338 for (x = 0; x < sw; x++) 2477 for (x = 0; x < sw; x++)
2339 if (row->c0 <= x + mx && x + mx < row->c1) 2478 if (row->c0 <= x + mx && x + mx < row->c1)
2340 { 2479 {
2341 mapcell *cell = row->col + (x + mx - row->c0); 2480 mapcell *cell = row->col + (x + mx - row->c0);
2342 2481
2343 int px = x * T; 2482 int px = x * Tw;
2344 int py = y * T; 2483 int py = y * Th;
2345 2484
2346 if (expect_false (cell->player == player)) 2485 if (expect_false (cell->player == player))
2347 { 2486 {
2348 px += sdx; 2487 px += sdx;
2349 py += sdy; 2488 py += sdy;
2350 } 2489 }
2351 2490
2352 if (cell->stat_hp) 2491 if (cell->stat_hp)
2353 { 2492 {
2354 int width = cell->stat_width * T; 2493 int width = cell->stat_width * Tw;
2355 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2494 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2356 2495
2357 glColor3ub (0, 0, 0); 2496 glColor3ub (0, 0, 0);
2358 glRectf (px + 1, py - thick - 2, 2497 glRectf (px + 1, py - thick - 2,
2359 px + width - 1, py); 2498 px + width - 1, py);
2360 2499
2366 } 2505 }
2367 } 2506 }
2368} 2507}
2369 2508
2370void 2509void
2371draw_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)
2372 CODE: 2511 CODE:
2373{ 2512{
2374 static float color[16][3] = { 2513 static float color[16][3] = {
2375 { 0.00F, 0.00F, 0.00F }, 2514 { 0.00f, 0.00f, 0.00f },
2376 { 1.00F, 1.00F, 1.00F }, 2515 { 1.00f, 1.00f, 1.00f },
2377 { 0.00F, 0.00F, 0.55F }, 2516 { 0.00f, 0.00f, 0.55f },
2378 { 1.00F, 0.00F, 0.00F }, 2517 { 1.00f, 0.00f, 0.00f },
2379 2518
2380 { 1.00F, 0.54F, 0.00F }, 2519 { 1.00f, 0.54f, 0.00f },
2381 { 0.11F, 0.56F, 1.00F }, 2520 { 0.11f, 0.56f, 1.00f },
2382 { 0.93F, 0.46F, 0.00F }, 2521 { 0.93f, 0.46f, 0.00f },
2383 { 0.18F, 0.54F, 0.34F }, 2522 { 0.18f, 0.54f, 0.34f },
2384 2523
2385 { 0.56F, 0.73F, 0.56F }, 2524 { 0.56f, 0.73f, 0.56f },
2386 { 0.80F, 0.80F, 0.80F }, 2525 { 0.80f, 0.80f, 0.80f },
2387 { 0.55F, 0.41F, 0.13F }, 2526 { 0.55f, 0.41f, 0.13f },
2388 { 0.99F, 0.77F, 0.26F }, 2527 { 0.99f, 0.77f, 0.26f },
2389 2528
2390 { 0.74F, 0.65F, 0.41F }, 2529 { 0.74f, 0.65f, 0.41f },
2391 2530
2392 { 0.00F, 1.00F, 1.00F }, 2531 { 0.00f, 1.00f, 1.00f },
2393 { 1.00F, 0.00F, 1.00F }, 2532 { 1.00f, 0.00f, 1.00f },
2394 { 1.00F, 1.00F, 0.00F }, 2533 { 1.00f, 1.00f, 0.00f },
2395 }; 2534 };
2396 2535
2397 int x, y; 2536 int x, y;
2398 2537
2399 glEnable (GL_TEXTURE_2D); 2538 glEnable (GL_TEXTURE_2D);
2400 /* GL_REPLACE would be correct, as we don't need to modulate alpha, 2539 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2401 * but the nvidia driver (185.18.14) mishandles alpha textures 2540 * but the nvidia driver (185.18.14) mishandles alpha textures
2402 * ansd takes the colour from god knows where instead of using 2541 * and takes the colour from god knows where instead of using
2403 * Cp. MODULATE results in the same colour, but slightly different 2542 * Cp. MODULATE results in the same colour, but slightly different
2404 * alpha, but atcually gives us the correct colour with nvidia. 2543 * alpha, but atcually gives us the correct colour with nvidia.
2405 */ 2544 */
2406 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 2545 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2407 glEnable (GL_BLEND); 2546 glEnable (GL_BLEND);
2415 2554
2416 if (m) 2555 if (m)
2417 { 2556 {
2418 float *c = color [m & 15]; 2557 float *c = color [m & 15];
2419 2558
2420 float tx1 = m & 0x40 ? 0.5 : 0.; 2559 float tx1 = m & 0x40 ? 0.5f : 0.f;
2421 float tx2 = tx1 + 0.5; 2560 float tx2 = tx1 + 0.5f;
2422 2561
2423 glColor4f (c[0], c[1], c[2], 1); 2562 glColor4f (c[0], c[1], c[2], 1);
2424 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2563 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2425 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2564 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2426 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2565 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2436void 2575void
2437fow_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)
2438 PPCODE: 2577 PPCODE:
2439{ 2578{
2440 int x, y; 2579 int x, y;
2441 int sw1 = sw + 2; 2580 int sw1 = sw + 2;
2442 int sh1 = sh + 2; 2581 int sh1 = sh + 2;
2443 int sh3 = sh * 3; 2582 int sh3 = sh * 3;
2444 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);
2445 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2586 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2446 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2587 memset (darkness1, 0, sw1*sh1);
2447 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2448 2588
2449 SvPOK_only (darkness3_sv); 2589 SvPOK_only (darkness3_sv);
2450 SvCUR_set (darkness3_sv, sw34 * sh3); 2590 SvCUR_set (darkness3_sv, sw3 * sh3);
2451 2591
2452 mx += self->x - 1; 2592 mx += self->x - 1;
2453 my += self->y - 1; 2593 my += self->y - 1;
2454
2455 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2456 2594
2457 for (y = 0; y < sh1; y++) 2595 for (y = 0; y < sh1; y++)
2458 if (0 <= y + my && y + my < self->rows) 2596 if (0 <= y + my && y + my < self->rows)
2459 { 2597 {
2460 maprow *row = self->row + (y + my); 2598 maprow *row = self->row + (y + my);
2463 if (row->c0 <= x + mx && x + mx < row->c1) 2601 if (row->c0 <= x + mx && x + mx < row->c1)
2464 { 2602 {
2465 mapcell *cell = row->col + (x + mx - row->c0); 2603 mapcell *cell = row->col + (x + mx - row->c0);
2466 2604
2467 darkness1 [y * sw1 + x] = cell->darkness 2605 darkness1 [y * sw1 + x] = cell->darkness
2468 ? 255 - (cell->darkness - 1) 2606 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2469 : 255 - FOW_DARKNESS; 2607 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2470 } 2608 }
2471 } 2609 }
2472 2610
2473 for (y = 0; y < sh; ++y) 2611 for (y = 0; y < sh; ++y)
2474 for (x = 0; x < sw; ++x) 2612 for (x = 0; x < sw; ++x)
2493 2631
2494 uint8_t r13 = (d13 + d23 + d12) / 3; 2632 uint8_t r13 = (d13 + d23 + d12) / 3;
2495 uint8_t r23 = d23; 2633 uint8_t r23 = d23;
2496 uint8_t r33 = (d23 + d33 + d32) / 3; 2634 uint8_t r33 = (d23 + d33 + d32) / 3;
2497 2635
2498 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2636 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2499 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2637 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2500 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2638 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2501 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2639 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2502 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 */
2503 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2641 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2504 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2642 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2505 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2643 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2506 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2644 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2507 } 2645 }
2508 2646
2509 free (darkness1); 2647 free (darkness1);
2510 2648
2511 EXTEND (SP, 3); 2649 EXTEND (SP, 3);
2512 PUSHs (sv_2mortal (newSViv (sw34))); 2650 PUSHs (sv_2mortal (newSViv (sw3)));
2513 PUSHs (sv_2mortal (newSViv (sh3))); 2651 PUSHs (sv_2mortal (newSViv (sh3)));
2514 PUSHs (darkness3_sv); 2652 PUSHs (darkness3_sv);
2515} 2653}
2516 2654
2517SV * 2655SV *
2715 if (RETVAL < 0) 2853 if (RETVAL < 0)
2716 { 2854 {
2717 RETVAL = Mix_GroupOldest (-1); 2855 RETVAL = Mix_GroupOldest (-1);
2718 2856
2719 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)
2720 XSRETURN_UNDEF; 2863 XSRETURN_UNDEF;
2721 2864 }
2865 else
2722 Mix_HaltChannel (RETVAL); 2866 Mix_HaltChannel (RETVAL);
2723 } 2867 }
2724 2868
2725 Mix_UnregisterAllEffects (RETVAL); 2869 Mix_UnregisterAllEffects (RETVAL);
2726 Mix_Volume (RETVAL, 128); 2870 Mix_Volume (RETVAL, 128);
2727} 2871}
2774void 2918void
2775set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2919set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2776 CODE: 2920 CODE:
2777{ 2921{
2778 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));
2779 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;
2780 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2924 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2781} 2925}
2782 2926
2783void 2927void
2784set_reverse_stereo (DC::Channel self, int flip) 2928set_reverse_stereo (DC::Channel self, int flip)
2786 Mix_SetReverseStereo (self, flip); 2930 Mix_SetReverseStereo (self, flip);
2787 2931
2788MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2932MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2789 2933
2790PROTOTYPES: 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
2791 2947
2792DC::MixChunk 2948DC::MixChunk
2793new (SV *class, DC::RW rwops) 2949new (SV *class, DC::RW rwops)
2794 CODE: 2950 CODE:
2795 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2951 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2828 OUTPUT: 2984 OUTPUT:
2829 RETVAL 2985 RETVAL
2830 2986
2831MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2987MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2832 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
2833int 3001int
2834volume (int volume = -1) 3002volume (int volume = -1)
2835 PROTOTYPE: ;$ 3003 PROTOTYPE: ;$
2836 CODE: 3004 CODE:
2837 if (items > 0) 3005 if (items > 0)
2847 3015
2848void 3016void
2849halt () 3017halt ()
2850 CODE: 3018 CODE:
2851 Mix_HaltMusic (); 3019 Mix_HaltMusic ();
3020
3021int
3022playing ()
3023 CODE:
3024 RETVAL = Mix_PlayingMusic ();
3025 OUTPUT:
3026 RETVAL
2852 3027
2853DC::MixMusic 3028DC::MixMusic
2854new (SV *class, DC::RW rwops) 3029new (SV *class, DC::RW rwops)
2855 CODE: 3030 CODE:
2856 RETVAL = Mix_LoadMUS_RW (rwops); 3031 RETVAL = Mix_LoadMUS_RW (rwops);
2996 const_iv (GL_FUNC_SUBTRACT), 3171 const_iv (GL_FUNC_SUBTRACT),
2997 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3172 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2998# undef const_iv 3173# undef const_iv
2999 }; 3174 };
3000 3175
3001 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--)
3002 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3177 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3003 3178
3004 texture_av = newAV (); 3179 texture_av = newAV ();
3005 AvREAL_off (texture_av); 3180 AvREAL_off (texture_av);
3006} 3181}
3007 3182
3050 RETVAL 3225 RETVAL
3051 3226
3052int glGetError () 3227int glGetError ()
3053 3228
3054void glFinish () 3229void glFinish ()
3230
3231void glFlush ()
3055 3232
3056void glClear (int mask) 3233void glClear (int mask)
3057 3234
3058void glClearColor (float r, float g, float b, float a = 1.0) 3235void glClearColor (float r, float g, float b, float a = 1.0)
3059 PROTOTYPE: @ 3236 PROTOTYPE: @
3230void glNewList (int list, int mode = GL_COMPILE) 3407void glNewList (int list, int mode = GL_COMPILE)
3231 3408
3232void glEndList () 3409void glEndList ()
3233 3410
3234void 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);
3235 3417
3236MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3418MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3237 3419
3238PROTOTYPES: DISABLE 3420PROTOTYPES: DISABLE
3239 3421

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines