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.281 by root, Thu Dec 4 23:58:20 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 16 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)
95 99
96#define KMOD_LRAM 0x10000 // our extension 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}
97 123
98static AV *texture_av; 124static AV *texture_av;
99 125
100static struct 126static struct
101{ 127{
456 482
457 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
458} 484}
459 485
460static unsigned int 486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
490}
491
492static unsigned int
461minpot (unsigned int n) 493minpot (unsigned int n)
462{ 494{
463 if (!n) 495 if (!n)
464 return 0; 496 return 0;
465 497
545 577
546 return mod; 578 return mod;
547} 579}
548 580
549static void 581static void
550deliantra_main () 582deliantra_main (SV *real_main)
551{ 583{
552 char *argv[] = { 0 }; 584 dSP;
553 call_argv ("::main", G_DISCARD | G_VOID, argv); 585
586 PUSHMARK (SP);
587 call_sv (real_main, G_DISCARD | G_VOID);
554} 588}
555 589
556#ifdef __MACOSX__ 590#ifdef __MACOSX__
591 static SV *real_main;
592
557 /* to due surprising braindamage on the side of SDL design, we 593 /* to due surprising braindamage on the side of SDL design, we
558 * do some mind-boggling hack here: SDL requires a custom main() 594 * do some mind-boggling hack here: SDL requires a custom main()
559 * 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,
560 * 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,
561 * and which calls our main (== SDL_main) back. 597 * and which calls our main (== SDL_main) back.
562 */ 598 */
563 extern C_LINKAGE int 599 extern C_LINKAGE int
564 main (int argc, char *argv[]) 600 main (int argc, char *argv[])
565 { 601 {
566 deliantra_main (); 602 deliantra_main (real_main);
567 } 603 }
568 604
569 #undef main 605 #undef main
570 606
571 extern C_LINKAGE int main (int argc, char *argv[]); 607 extern C_LINKAGE int main (int argc, char *argv[]);
572 608
573 static void 609 static void
574 SDL_braino (void) 610 SDL_main_hack (SV *real_main_)
575 { 611 {
612 real_main = real_main_;
613
576 char *argv[] = { "deliantra client", 0 }; 614 char *argv[] = { "deliantra client", 0 };
577 (main) (1, argv); 615 (main) (1, argv);
578 } 616 }
579#else 617#else
580 static void 618 static void
581 SDL_braino (void) 619 SDL_main_hack (SV *real_main)
582 { 620 {
583 deliantra_main (); 621 deliantra_main (real_main);
584 } 622 }
585#endif 623#endif
586 624
587MODULE = Deliantra::Client PACKAGE = DC 625MODULE = Deliantra::Client PACKAGE = DC
588 626
789 827
790 const_iv (FOW_DARKNESS) 828 const_iv (FOW_DARKNESS)
791# undef const_iv 829# undef const_iv
792 }; 830 };
793 831
794 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--)
795 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 833 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
796 834
797 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 835 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
798 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 836 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
799} 837}
800 838
816NV ceil (NV x) 854NV ceil (NV x)
817 855
818IV minpot (UV n) 856IV minpot (UV n)
819 857
820IV 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
821 865
822void 866void
823pango_init () 867pango_init ()
824 CODE: 868 CODE:
825{ 869{
833#endif 877#endif
834} 878}
835 879
836char *SDL_GetError () 880char *SDL_GetError ()
837 881
838void SDL_braino () 882void SDL_main_hack (SV *real_main)
883 PROTOTYPE: &
839 884
840int SDL_Init (U32 flags) 885int SDL_Init (U32 flags)
841 886
842int SDL_InitSubSystem (U32 flags) 887int SDL_InitSubSystem (U32 flags)
843 888
912 ); 957 );
913 958
914 if (RETVAL) 959 if (RETVAL)
915 { 960 {
916 av_clear (texture_av); 961 av_clear (texture_av);
917
918 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
919#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);
920#include "glfunc.h" 963#include "glfunc.h"
921#undef GL_FUNC 964#undef GL_FUNC
965 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
966 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
922 } 967 }
923} 968}
924 OUTPUT: 969 OUTPUT:
925 RETVAL 970 RETVAL
926 971
927void 972void
973SDL_WM_SetCaption (const char *title, const char *icon)
974
975void
928SDL_GL_SwapBuffers () 976SDL_GL_SwapBuffers ()
929 977
930char * 978char *
931SDL_GetKeyName (int sym) 979SDL_GetKeyName (int sym)
932 980
934SDL_GetAppState () 982SDL_GetAppState ()
935 983
936int 984int
937SDL_GetModState () 985SDL_GetModState ()
938 986
987int
988SDL_WaitEvent ()
989 C_ARGS: 0
990
939void 991void
992SDL_PumpEvents ()
993
994void
940poll_events () 995peep_events ()
941 PPCODE: 996 PPCODE:
942{ 997{
943 SDL_Event ev; 998 SDL_Event ev;
944 999
945 SDL_PumpEvents (); 1000 SDL_PumpEvents ();
1011 1066
1012 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))));
1013 } 1068 }
1014} 1069}
1015 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
1016int 1084int
1017Mix_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)
1018 POSTCALL: 1086 POSTCALL:
1019 Mix_HookMusicFinished (music_finished); 1087 Mix_HookMusicFinished (music_finished);
1020 Mix_ChannelFinished (channel_finished); 1088 Mix_ChannelFinished (channel_finished);
1082add_font (char *file) 1150add_font (char *file)
1083 CODE: 1151 CODE:
1084 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1152 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1085 OUTPUT: 1153 OUTPUT:
1086 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)
1087 1162
1088void 1163void
1089load_image_inline (SV *image_) 1164load_image_inline (SV *image_)
1090 ALIAS: 1165 ALIAS:
1091 load_image_file = 1 1166 load_image_file = 1
1654 glDisable (GL_ALPHA_TEST); 1729 glDisable (GL_ALPHA_TEST);
1655 glDisable (GL_BLEND); 1730 glDisable (GL_BLEND);
1656 } 1731 }
1657} 1732}
1658 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);
1853}
1854
1659IV 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)
1660 CODE: 1856 CODE:
1661{ 1857{
1662 GLint width; 1858 GLint width;
1663 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1859 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1780 if (tex->name) 1976 if (tex->name)
1781 { 1977 {
1782 if (tex->unused) 1978 if (tex->unused)
1783 { 1979 {
1784 tex->name = 0; 1980 tex->name = 0;
1785 tex->unused = 0, 1981 tex->unused = 0;
1786 XPUSHs (sv_2mortal (newSViv (texid))); 1982 XPUSHs (sv_2mortal (newSViv (texid)));
1787 } 1983 }
1788 else 1984 else
1789 tex->unused = 1; 1985 tex->unused = 1;
1790 } 1986 }
1836 self->y += MAP_EXTEND_Y; 2032 self->y += MAP_EXTEND_Y;
1837 } 2033 }
1838} 2034}
1839 2035
1840SV * 2036SV *
1841map1a_update (DC::Map self, SV *data_, int extmap) 2037map1a_update (DC::Map self, SV *data_)
1842 CODE: 2038 CODE:
1843{ 2039{
1844 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2040 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1845 uint8_t *data_end = (uint8_t *)SvEND (data_); 2041 uint8_t *data_end = (uint8_t *)SvEND (data_);
1846 mapcell *cell; 2042 mapcell *cell;
1867 2063
1868 //TODO: don't trust server data to be in-range(!) 2064 //TODO: don't trust server data to be in-range(!)
1869 2065
1870 if (flags & 8) 2066 if (flags & 8)
1871 { 2067 {
2068 uint8_t ext, cmd;
2069
1872 if (extmap) 2070 do
1873 { 2071 {
1874 uint8_t ext, cmd; 2072 ext = *data++;
2073 cmd = ext & 0x7f;
1875 2074
1876 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
1877 { 2078 {
1878 ext = *data++;
1879 cmd = ext & 0x7f;
1880
1881 if (cmd < 4)
1882 cell->darkness = 255 - ext * 64 + 1;
1883 else if (cmd == 5) // health
1884 {
1885 cell->stat_width = 1; 2079 cell->stat_width = 1;
1886 cell->stat_hp = *data++; 2080 cell->stat_hp = *data++;
1887 }
1888 else if (cmd == 6) // monster width
1889 cell->stat_width = *data++ + 1;
1890 else if (cmd == 0x47)
1891 {
1892 if (*data == 1) cell->player = data [1];
1893 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1894 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1895 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1896
1897 data += *data + 1;
1898 }
1899 else if (cmd == 8) // cell flags
1900 cell->flags = *data++;
1901 else if (ext & 0x40) // unknown, multibyte => skip
1902 data += *data + 1;
1903 else
1904 data++;
1905 } 2081 }
1906 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++;
1907 } 2099 }
1908 else 2100 while (ext & 0x80);
1909 cell->darkness = *data++ + 1;
1910 } 2101 }
1911 2102
1912 for (z = 0; z <= 2; ++z) 2103 for (z = 0; z <= 2; ++z)
1913 if (flags & (4 >> z)) 2104 if (flags & (4 >> z))
1914 { 2105 {
1962 ? self->row + y 2153 ? self->row + y
1963 : 0; 2154 : 0;
1964 2155
1965 for (x = x0; x < x1; x++) 2156 for (x = x0; x < x1; x++)
1966 { 2157 {
1967 int r = 32, g = 32, b = 32, a = 192; 2158 unsigned int r = 32, g = 32, b = 32, a = 192;
1968 2159
1969 if (row && row->c0 <= x && x < row->c1) 2160 if (row && row->c0 <= x && x < row->c1)
1970 { 2161 {
1971 mapcell *cell = row->col + (x - row->c0); 2162 mapcell *cell = row->col + (x - row->c0);
1972 2163
1974 { 2165 {
1975 maptex tex = self->tex [cell->tile [z]]; 2166 maptex tex = self->tex [cell->tile [z]];
1976 int a0 = 255 - tex.a; 2167 int a0 = 255 - tex.a;
1977 int a1 = tex.a; 2168 int a1 = tex.a;
1978 2169
1979 r = (r * a0 + tex.r * a1) / 255; 2170 r = div255 (r * a0 + tex.r * a1);
1980 g = (g * a0 + tex.g * a1) / 255; 2171 g = div255 (g * a0 + tex.g * a1);
1981 b = (b * a0 + tex.b * a1) / 255; 2172 b = div255 (b * a0 + tex.b * a1);
1982 a = (a * a0 + tex.a * a1) / 255; 2173 a = div255 (a * a0 + tex.a * a1);
1983 } 2174 }
1984 } 2175 }
1985 2176
1986 *map++ = (r ) 2177 *map++ = (r )
1987 | (g << 8) 2178 | (g << 8)
1994} 2185}
1995 OUTPUT: 2186 OUTPUT:
1996 RETVAL 2187 RETVAL
1997 2188
1998void 2189void
1999draw (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)
2000 CODE: 2191 CODE:
2001{ 2192{
2002 int x, y, z; 2193 int x, y, z;
2003 2194
2004 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2195 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2005 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
2006 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)
2007 smooth_key skey; 2198 smooth_key skey;
2008 int pl_x, pl_y; 2199 int pl_x, pl_y;
2009 maptex pl_tex; 2200 maptex pl_tex;
2010 rc_t *rc = rc_alloc (); 2201 rc_t *rc = rc_alloc ();
2202 rc_t *rc_ov = rc_alloc ();
2011 rc_key_t key; 2203 rc_key_t key;
2012 rc_array_t *arr; 2204 rc_array_t *arr;
2013 2205
2014 pl_tex.name = 0; 2206 pl_tex.name = 0;
2015 2207
2016 // thats current max. sorry. 2208 // that's current max. sorry.
2017 if (sw > 255) sw = 255; 2209 if (sw > 255) sw = 255;
2018 if (sh > 255) sh = 255; 2210 if (sh > 255) sh = 255;
2019 2211
2020 // clear key, in case of extra padding 2212 // clear key, in case of extra padding
2021 memset (&skey, 0, sizeof (skey)); 2213 memset (&skey, 0, sizeof (skey));
2025 key.g = 255; 2217 key.g = 255;
2026 key.b = 255; 2218 key.b = 255;
2027 key.a = 255; 2219 key.a = 255;
2028 key.mode = GL_QUADS; 2220 key.mode = GL_QUADS;
2029 key.format = GL_T2F_V3F; 2221 key.format = GL_T2F_V3F;
2030 key.texname = -1;
2031 2222
2032 mx += self->x; 2223 mx += self->x;
2033 my += self->y; 2224 my += self->y;
2034 2225
2035 // first pass: determine smooth_max 2226 // first pass: determine smooth_max
2059 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2250 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2060 2251
2061 for (z = 0; z <= 2; z++) 2252 for (z = 0; z <= 2; z++)
2062 { 2253 {
2063 memset (smooth_level, 0, sizeof (smooth_level)); 2254 memset (smooth_level, 0, sizeof (smooth_level));
2255 key.texname = -1;
2064 2256
2065 for (y = 0; y < sh; y++) 2257 for (y = 0; y < sh; y++)
2066 if (0 <= y + my && y + my < self->rows) 2258 if (0 <= y + my && y + my < self->rows)
2067 { 2259 {
2068 maprow *row = self->row + (y + my); 2260 maprow *row = self->row + (y + my);
2074 tileid tile = cell->tile [z]; 2266 tileid tile = cell->tile [z];
2075 2267
2076 if (tile) 2268 if (tile)
2077 { 2269 {
2078 maptex tex = self->tex [tile]; 2270 maptex tex = self->tex [tile];
2079 int px = (x + 1) * T - tex.w; 2271 int px, py;
2080 int py = (y + 1) * T - tex.h;
2081 2272
2082 if (key.texname != tex.name) 2273 if (key.texname != tex.name)
2083 { 2274 {
2084 self->tex [tile].unused = 0; 2275 self->tex [tile].unused = 0;
2085 2276
2086 if (!tex.name) 2277 if (!tex.name)
2087 tex = self->tex [2]; /* missing, replace by noface */ 2278 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2088 2279
2089 key.texname = tex.name; 2280 key.texname = tex.name;
2090 arr = rc_array (rc, &key); 2281 arr = rc_array (rc, &key);
2091 } 2282 }
2283
2284 px = (x + 1) * Th - tex.w;
2285 py = (y + 1) * Tw - tex.h;
2092 2286
2093 if (expect_false (cell->player == player) && expect_false (z == 2)) 2287 if (expect_false (cell->player == player) && expect_false (z == 2))
2094 { 2288 {
2095 pl_x = px; 2289 pl_x = px;
2096 pl_y = py; 2290 pl_y = py;
2101 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2295 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2102 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);
2103 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);
2104 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);
2105 2299
2106 if (expect_false (cell->flags) && expect_false (z == 2))
2107 {
2108 // overlays such as the speech bubble, probably more to come
2109 if (cell->flags & 1)
2110 {
2111 maptex tex = self->tex [1];
2112 int px = x * T + T * 2 / 32;
2113 int py = y * T - T * 6 / 32;
2114
2115 if (tex.name)
2116 {
2117 if (key.texname != tex.name)
2118 {
2119 key.texname = tex.name;
2120 arr = rc_array (rc, &key);
2121 }
2122
2123 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2124 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2125 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2126 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2127 }
2128 }
2129 }
2130
2131 // update smooth hash 2300 // update smooth hash
2132 if (tex.smoothtile) 2301 if (tex.smoothtile)
2133 { 2302 {
2134 skey.tile = tex.smoothtile; 2303 skey.tile = tex.smoothtile;
2135 skey.level = tex.smoothlevel; 2304 skey.level = tex.smoothlevel;
2163 // corners 2332 // corners
2164 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);
2165 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);
2166 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);
2167 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);
2168 } 2358 }
2169 } 2359 }
2170 } 2360 }
2171 } 2361 }
2172 2362
2199 if (!(bits & 0x1000) 2389 if (!(bits & 0x1000)
2200 && skey->level == level 2390 && skey->level == level
2201 && level > smooth_max [skey->x][skey->y]) 2391 && level > smooth_max [skey->x][skey->y])
2202 { 2392 {
2203 maptex tex = self->tex [skey->tile]; 2393 maptex tex = self->tex [skey->tile];
2204 int px = (((int)skey->x) - 1) * T; 2394 int px = (((int)skey->x) - 1) * Tw;
2205 int py = (((int)skey->y) - 1) * T; 2395 int py = (((int)skey->y) - 1) * Th;
2206 int border = bits & 15; 2396 int border = bits & 15;
2207 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2397 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2208 float dx = tex.s * .0625f; // 16 images/row 2398 float dx = tex.s * .0625f; // 16 images/row
2209 float dy = tex.t * .5f ; // 2 images/column 2399 float dy = tex.t * .5f ; // 2 images/column
2210 2400
2223 2413
2224 if (border) 2414 if (border)
2225 { 2415 {
2226 float ox = border * dx; 2416 float ox = border * dx;
2227 2417
2228 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2418 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2229 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2419 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2230 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2420 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2231 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2421 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2232 } 2422 }
2233 2423
2234 if (corner) 2424 if (corner)
2235 { 2425 {
2236 float ox = corner * dx; 2426 float ox = corner * dx;
2237 2427
2238 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2428 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2239 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2429 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2240 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2430 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2241 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2431 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2242 } 2432 }
2243 } 2433 }
2244 } 2434 }
2245 } 2435 }
2246 } 2436 }
2269 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);
2270 2460
2271 rc_draw (rc); 2461 rc_draw (rc);
2272 } 2462 }
2273 2463
2464 rc_draw (rc_ov);
2465 rc_clear (rc_ov);
2466
2274 glDisable (GL_BLEND); 2467 glDisable (GL_BLEND);
2275 rc_free (rc); 2468 rc_free (rc);
2469 rc_free (rc_ov);
2276 2470
2277 // top layer: overlays such as the health bar 2471 // top layer: overlays such as the health bar
2278 for (y = 0; y < sh; y++) 2472 for (y = 0; y < sh; y++)
2279 if (0 <= y + my && y + my < self->rows) 2473 if (0 <= y + my && y + my < self->rows)
2280 { 2474 {
2283 for (x = 0; x < sw; x++) 2477 for (x = 0; x < sw; x++)
2284 if (row->c0 <= x + mx && x + mx < row->c1) 2478 if (row->c0 <= x + mx && x + mx < row->c1)
2285 { 2479 {
2286 mapcell *cell = row->col + (x + mx - row->c0); 2480 mapcell *cell = row->col + (x + mx - row->c0);
2287 2481
2288 int px = x * T; 2482 int px = x * Tw;
2289 int py = y * T; 2483 int py = y * Th;
2290 2484
2291 if (expect_false (cell->player == player)) 2485 if (expect_false (cell->player == player))
2292 { 2486 {
2293 px += sdx; 2487 px += sdx;
2294 py += sdy; 2488 py += sdy;
2295 } 2489 }
2296 2490
2297 if (cell->stat_hp) 2491 if (cell->stat_hp)
2298 { 2492 {
2299 int width = cell->stat_width * T; 2493 int width = cell->stat_width * Tw;
2300 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2494 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2301 2495
2302 glColor3ub (0, 0, 0); 2496 glColor3ub (0, 0, 0);
2303 glRectf (px + 1, py - thick - 2, 2497 glRectf (px + 1, py - thick - 2,
2304 px + width - 1, py); 2498 px + width - 1, py);
2305 2499
2311 } 2505 }
2312 } 2506 }
2313} 2507}
2314 2508
2315void 2509void
2316draw_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)
2317 CODE: 2511 CODE:
2318{ 2512{
2319 static float color[16][3] = { 2513 static float color[16][3] = {
2320 { 0.00F, 0.00F, 0.00F }, 2514 { 0.00f, 0.00f, 0.00f },
2321 { 1.00F, 1.00F, 1.00F }, 2515 { 1.00f, 1.00f, 1.00f },
2322 { 0.00F, 0.00F, 0.55F }, 2516 { 0.00f, 0.00f, 0.55f },
2323 { 1.00F, 0.00F, 0.00F }, 2517 { 1.00f, 0.00f, 0.00f },
2324 2518
2325 { 1.00F, 0.54F, 0.00F }, 2519 { 1.00f, 0.54f, 0.00f },
2326 { 0.11F, 0.56F, 1.00F }, 2520 { 0.11f, 0.56f, 1.00f },
2327 { 0.93F, 0.46F, 0.00F }, 2521 { 0.93f, 0.46f, 0.00f },
2328 { 0.18F, 0.54F, 0.34F }, 2522 { 0.18f, 0.54f, 0.34f },
2329 2523
2330 { 0.56F, 0.73F, 0.56F }, 2524 { 0.56f, 0.73f, 0.56f },
2331 { 0.80F, 0.80F, 0.80F }, 2525 { 0.80f, 0.80f, 0.80f },
2332 { 0.55F, 0.41F, 0.13F }, 2526 { 0.55f, 0.41f, 0.13f },
2333 { 0.99F, 0.77F, 0.26F }, 2527 { 0.99f, 0.77f, 0.26f },
2334 2528
2335 { 0.74F, 0.65F, 0.41F }, 2529 { 0.74f, 0.65f, 0.41f },
2336 2530
2337 { 0.00F, 1.00F, 1.00F }, 2531 { 0.00f, 1.00f, 1.00f },
2338 { 1.00F, 0.00F, 1.00F }, 2532 { 1.00f, 0.00f, 1.00f },
2339 { 1.00F, 1.00F, 0.00F }, 2533 { 1.00f, 1.00f, 0.00f },
2340 }; 2534 };
2341 2535
2342 int x, y; 2536 int x, y;
2343 2537
2344 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 */
2345 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2545 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2346 glEnable (GL_BLEND); 2546 glEnable (GL_BLEND);
2347 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2547 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2348 glBegin (GL_QUADS); 2548 glBegin (GL_QUADS);
2349 2549
2350 for (y = 0; y < h; y++) 2550 for (y = 0; y < h; y++)
2354 2554
2355 if (m) 2555 if (m)
2356 { 2556 {
2357 float *c = color [m & 15]; 2557 float *c = color [m & 15];
2358 2558
2359 float tx1 = m & 0x40 ? 0.5 : 0.; 2559 float tx1 = m & 0x40 ? 0.5f : 0.f;
2360 float tx2 = tx1 + 0.5; 2560 float tx2 = tx1 + 0.5f;
2361 2561
2362 glColor4f (c[0], c[1], c[2], 0.75); 2562 glColor4f (c[0], c[1], c[2], 1);
2363 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2563 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2364 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2564 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2365 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2565 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2366 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2566 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2367 } 2567 }
2375void 2575void
2376fow_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)
2377 PPCODE: 2577 PPCODE:
2378{ 2578{
2379 int x, y; 2579 int x, y;
2380 int sw1 = sw + 2; 2580 int sw1 = sw + 2;
2381 int sh1 = sh + 2; 2581 int sh1 = sh + 2;
2382 int sh3 = sh * 3; 2582 int sh3 = sh * 3;
2383 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);
2384 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2586 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2385 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2587 memset (darkness1, 0, sw1*sh1);
2386 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2387 2588
2388 SvPOK_only (darkness3_sv); 2589 SvPOK_only (darkness3_sv);
2389 SvCUR_set (darkness3_sv, sw34 * sh3); 2590 SvCUR_set (darkness3_sv, sw3 * sh3);
2390 2591
2391 mx += self->x - 1; 2592 mx += self->x - 1;
2392 my += self->y - 1; 2593 my += self->y - 1;
2393
2394 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2395 2594
2396 for (y = 0; y < sh1; y++) 2595 for (y = 0; y < sh1; y++)
2397 if (0 <= y + my && y + my < self->rows) 2596 if (0 <= y + my && y + my < self->rows)
2398 { 2597 {
2399 maprow *row = self->row + (y + my); 2598 maprow *row = self->row + (y + my);
2402 if (row->c0 <= x + mx && x + mx < row->c1) 2601 if (row->c0 <= x + mx && x + mx < row->c1)
2403 { 2602 {
2404 mapcell *cell = row->col + (x + mx - row->c0); 2603 mapcell *cell = row->col + (x + mx - row->c0);
2405 2604
2406 darkness1 [y * sw1 + x] = cell->darkness 2605 darkness1 [y * sw1 + x] = cell->darkness
2407 ? 255 - (cell->darkness - 1) 2606 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2408 : 255 - FOW_DARKNESS; 2607 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2409 } 2608 }
2410 } 2609 }
2411 2610
2412 for (y = 0; y < sh; ++y) 2611 for (y = 0; y < sh; ++y)
2413 for (x = 0; x < sw; ++x) 2612 for (x = 0; x < sw; ++x)
2432 2631
2433 uint8_t r13 = (d13 + d23 + d12) / 3; 2632 uint8_t r13 = (d13 + d23 + d12) / 3;
2434 uint8_t r23 = d23; 2633 uint8_t r23 = d23;
2435 uint8_t r33 = (d23 + d33 + d32) / 3; 2634 uint8_t r33 = (d23 + d33 + d32) / 3;
2436 2635
2437 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2636 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2438 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2637 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2439 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2638 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2440 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2639 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2441 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 */
2442 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2641 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2443 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2642 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2444 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2643 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2445 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2644 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2446 } 2645 }
2447 2646
2448 free (darkness1); 2647 free (darkness1);
2449 2648
2450 EXTEND (SP, 3); 2649 EXTEND (SP, 3);
2451 PUSHs (sv_2mortal (newSViv (sw34))); 2650 PUSHs (sv_2mortal (newSViv (sw3)));
2452 PUSHs (sv_2mortal (newSViv (sh3))); 2651 PUSHs (sv_2mortal (newSViv (sh3)));
2453 PUSHs (darkness3_sv); 2652 PUSHs (darkness3_sv);
2454} 2653}
2455 2654
2456SV * 2655SV *
2654 if (RETVAL < 0) 2853 if (RETVAL < 0)
2655 { 2854 {
2656 RETVAL = Mix_GroupOldest (-1); 2855 RETVAL = Mix_GroupOldest (-1);
2657 2856
2658 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)
2659 XSRETURN_UNDEF; 2863 XSRETURN_UNDEF;
2660 2864 }
2865 else
2661 Mix_HaltChannel (RETVAL); 2866 Mix_HaltChannel (RETVAL);
2662 } 2867 }
2663 2868
2664 Mix_UnregisterAllEffects (RETVAL); 2869 Mix_UnregisterAllEffects (RETVAL);
2665 Mix_Volume (RETVAL, 128); 2870 Mix_Volume (RETVAL, 128);
2666} 2871}
2713void 2918void
2714set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2919set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2715 CODE: 2920 CODE:
2716{ 2921{
2717 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));
2718 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;
2719 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2924 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2720} 2925}
2721 2926
2722void 2927void
2723set_reverse_stereo (DC::Channel self, int flip) 2928set_reverse_stereo (DC::Channel self, int flip)
2725 Mix_SetReverseStereo (self, flip); 2930 Mix_SetReverseStereo (self, flip);
2726 2931
2727MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2932MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2728 2933
2729PROTOTYPES: 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
2730 2947
2731DC::MixChunk 2948DC::MixChunk
2732new (SV *class, DC::RW rwops) 2949new (SV *class, DC::RW rwops)
2733 CODE: 2950 CODE:
2734 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2951 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2767 OUTPUT: 2984 OUTPUT:
2768 RETVAL 2985 RETVAL
2769 2986
2770MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2987MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2771 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
2772int 3001int
2773volume (int volume = -1) 3002volume (int volume = -1)
2774 PROTOTYPE: ;$ 3003 PROTOTYPE: ;$
2775 CODE: 3004 CODE:
2776 if (items > 0) 3005 if (items > 0)
2786 3015
2787void 3016void
2788halt () 3017halt ()
2789 CODE: 3018 CODE:
2790 Mix_HaltMusic (); 3019 Mix_HaltMusic ();
3020
3021int
3022playing ()
3023 CODE:
3024 RETVAL = Mix_PlayingMusic ();
3025 OUTPUT:
3026 RETVAL
2791 3027
2792DC::MixMusic 3028DC::MixMusic
2793new (SV *class, DC::RW rwops) 3029new (SV *class, DC::RW rwops)
2794 CODE: 3030 CODE:
2795 RETVAL = Mix_LoadMUS_RW (rwops); 3031 RETVAL = Mix_LoadMUS_RW (rwops);
2826 } *civ, const_iv[] = { 3062 } *civ, const_iv[] = {
2827# define const_iv(name) { # name, (IV)name } 3063# define const_iv(name) { # name, (IV)name }
2828 const_iv (GL_VENDOR), 3064 const_iv (GL_VENDOR),
2829 const_iv (GL_VERSION), 3065 const_iv (GL_VERSION),
2830 const_iv (GL_EXTENSIONS), 3066 const_iv (GL_EXTENSIONS),
3067 const_iv (GL_MAX_TEXTURE_UNITS),
2831 const_iv (GL_COLOR_MATERIAL), 3068 const_iv (GL_COLOR_MATERIAL),
2832 const_iv (GL_SMOOTH), 3069 const_iv (GL_SMOOTH),
2833 const_iv (GL_FLAT), 3070 const_iv (GL_FLAT),
2834 const_iv (GL_DITHER), 3071 const_iv (GL_DITHER),
2835 const_iv (GL_BLEND), 3072 const_iv (GL_BLEND),
2847 const_iv (GL_ZERO), 3084 const_iv (GL_ZERO),
2848 const_iv (GL_SRC_ALPHA), 3085 const_iv (GL_SRC_ALPHA),
2849 const_iv (GL_DST_ALPHA), 3086 const_iv (GL_DST_ALPHA),
2850 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3087 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2851 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),
2852 const_iv (GL_SRC_ALPHA_SATURATE), 3093 const_iv (GL_SRC_ALPHA_SATURATE),
2853 const_iv (GL_RGB), 3094 const_iv (GL_RGB),
2854 const_iv (GL_RGBA), 3095 const_iv (GL_RGBA),
2855 const_iv (GL_RGBA4), 3096 const_iv (GL_RGBA4),
2856 const_iv (GL_RGBA8), 3097 const_iv (GL_RGBA8),
2924 const_iv (GL_NICEST), 3165 const_iv (GL_NICEST),
2925 const_iv (GL_V2F), 3166 const_iv (GL_V2F),
2926 const_iv (GL_V3F), 3167 const_iv (GL_V3F),
2927 const_iv (GL_T2F_V3F), 3168 const_iv (GL_T2F_V3F),
2928 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),
2929# undef const_iv 3173# undef const_iv
2930 }; 3174 };
2931 3175
2932 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--)
2933 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3177 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2934 3178
2935 texture_av = newAV (); 3179 texture_av = newAV ();
2936 AvREAL_off (texture_av); 3180 AvREAL_off (texture_av);
2937} 3181}
2938 3182
2939void 3183void
2940disable_GL_EXT_blend_func_separate () 3184disable_GL_EXT_blend_func_separate ()
2941 CODE: 3185 CODE:
2942 gl.BlendFuncSeparate = 0; 3186 gl.BlendFuncSeparate = 0;
2943 gl.BlendFuncSeparateEXT = 0; 3187 gl.BlendFuncSeparateEXT = 0;
3188
3189void
3190apple_nvidia_bug (int enable)
2944 3191
2945char * 3192char *
2946gl_vendor () 3193gl_vendor ()
2947 CODE: 3194 CODE:
2948 RETVAL = (char *)glGetString (GL_VENDOR); 3195 RETVAL = (char *)glGetString (GL_VENDOR);
2979 3226
2980int glGetError () 3227int glGetError ()
2981 3228
2982void glFinish () 3229void glFinish ()
2983 3230
3231void glFlush ()
3232
2984void glClear (int mask) 3233void glClear (int mask)
2985 3234
2986void glClearColor (float r, float g, float b, float a = 1.0) 3235void glClearColor (float r, float g, float b, float a = 1.0)
2987 PROTOTYPE: @ 3236 PROTOTYPE: @
2988 3237
2997void glBlendFunc (int sfactor, int dfactor) 3246void glBlendFunc (int sfactor, int dfactor)
2998 3247
2999void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3248void glBlendFuncSeparate (int sa, int da, int saa, int daa)
3000 CODE: 3249 CODE:
3001 gl_BlendFuncSeparate (sa, da, saa, daa); 3250 gl_BlendFuncSeparate (sa, da, saa, daa);
3251
3252# void glBlendEquation (int se)
3002 3253
3003void glDepthMask (int flag) 3254void glDepthMask (int flag)
3004 3255
3005void glLogicOp (int opcode) 3256void glLogicOp (int opcode)
3006 3257
3156void glNewList (int list, int mode = GL_COMPILE) 3407void glNewList (int list, int mode = GL_COMPILE)
3157 3408
3158void glEndList () 3409void glEndList ()
3159 3410
3160void 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);
3161 3417
3162MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3418MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3163 3419
3164PROTOTYPES: DISABLE 3420PROTOTYPES: DISABLE
3165 3421

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines