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.276 by root, Sat Aug 30 08:04:01 2008 UTC vs.
Revision 1.309 by root, Mon Dec 26 22:30:21 2011 UTC

19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
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)
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{
233 int w, h; 259 int w, h;
234 float s, t; 260 float s, t;
235 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
236 tileid smoothtile; 262 tileid smoothtile;
237 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
238} maptex; 265} maptex;
239 266
240typedef struct { 267typedef struct {
241 uint32_t player; 268 uint32_t player;
242 tileid tile[3]; 269 tileid tile[3];
455 482
456 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
457} 484}
458 485
459static unsigned int 486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
490}
491
492static unsigned int
460minpot (unsigned int n) 493minpot (unsigned int n)
461{ 494{
462 if (!n) 495 if (!n)
463 return 0; 496 return 0;
464 497
528 if (!svp || !SvTRUE (*svp)) 561 if (!svp || !SvTRUE (*svp))
529 return 0; 562 return 0;
530 563
531 return 1; 564 return 1;
532} 565}
566
567/******************************************************************************/
533 568
534/* process keyboard modifiers */ 569/* process keyboard modifiers */
535static int 570static int
536mod_munge (int mod) 571mod_munge (int mod)
537{ 572{
786 821
787 const_iv (FOW_DARKNESS) 822 const_iv (FOW_DARKNESS)
788# undef const_iv 823# undef const_iv
789 }; 824 };
790 825
791 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 826 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
792 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 827 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
793 828
794 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 829 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
795 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 830 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
796} 831}
797 832
813NV ceil (NV x) 848NV ceil (NV x)
814 849
815IV minpot (UV n) 850IV minpot (UV n)
816 851
817IV popcount (UV n) 852IV popcount (UV n)
853
854NV distance (NV dx, NV dy)
855 CODE:
856 RETVAL = pow (dx * dx + dy * dy, 0.5);
857 OUTPUT:
858 RETVAL
818 859
819void 860void
820pango_init () 861pango_init ()
821 CODE: 862 CODE:
822{ 863{
914 955
915 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra"); 956 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
916#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 957#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
917#include "glfunc.h" 958#include "glfunc.h"
918#undef GL_FUNC 959#undef GL_FUNC
960
961 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
962 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
919 } 963 }
920} 964}
921 OUTPUT: 965 OUTPUT:
922 RETVAL 966 RETVAL
923 967
1008 1052
1009 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1053 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1010 } 1054 }
1011} 1055}
1012 1056
1057char *
1058SDL_AudioDriverName ()
1059 CODE:
1060{
1061 char buf [256];
1062 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1063 XSRETURN_UNDEF;
1064
1065 RETVAL = buf;
1066}
1067 OUTPUT:
1068 RETVAL
1069
1013int 1070int
1014Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1071Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1015 POSTCALL: 1072 POSTCALL:
1016 Mix_HookMusicFinished (music_finished); 1073 Mix_HookMusicFinished (music_finished);
1017 Mix_ChannelFinished (channel_finished); 1074 Mix_ChannelFinished (channel_finished);
1079add_font (char *file) 1136add_font (char *file)
1080 CODE: 1137 CODE:
1081 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1138 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1082 OUTPUT: 1139 OUTPUT:
1083 RETVAL 1140 RETVAL
1141
1142void
1143IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1144
1145void
1146Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_MP3 | MIX_INIT_OGG)
1084 1147
1085void 1148void
1086load_image_inline (SV *image_) 1149load_image_inline (SV *image_)
1087 ALIAS: 1150 ALIAS:
1088 load_image_file = 1 1151 load_image_file = 1
1204#if DEBUG 1267#if DEBUG
1205 VALGRIND_DO_LEAK_CHECK; 1268 VALGRIND_DO_LEAK_CHECK;
1206#endif 1269#endif
1207} 1270}
1208 1271
1272int
1273SvREFCNT (SV *sv)
1274 CODE:
1275 RETVAL = SvREFCNT (sv);
1276 OUTPUT:
1277 RETVAL
1278
1209MODULE = Deliantra::Client PACKAGE = DC::Font 1279MODULE = Deliantra::Client PACKAGE = DC::Font
1210 1280
1211PROTOTYPES: DISABLE 1281PROTOTYPES: DISABLE
1212 1282
1213DC::Font 1283DC::Font
1642 if (ix) 1712 if (ix)
1643 { 1713 {
1644 glDisable (GL_ALPHA_TEST); 1714 glDisable (GL_ALPHA_TEST);
1645 glDisable (GL_BLEND); 1715 glDisable (GL_BLEND);
1646 } 1716 }
1717}
1718
1719void
1720draw_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)
1721 PROTOTYPE: @
1722 CODE:
1723{
1724 glEnable (GL_BLEND);
1725 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1726 glEnable (GL_TEXTURE_2D);
1727 glBindTexture (GL_TEXTURE_2D, name1);
1728
1729 glColor3f (intensity, intensity, intensity);
1730 glPushMatrix ();
1731 glScalef (1./3, 1./3, 1.);
1732
1733 if (blend > 0.f)
1734 {
1735 float dx3 = dx * -3.f / w;
1736 float dy3 = dy * -3.f / h;
1737 GLfloat env_color[4] = { 0., 0., 0., blend };
1738
1739 /* interpolate the two shadow textures */
1740 /* stage 0 == rgb(glcolor) + alpha(t0) */
1741 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1742
1743 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1744 gl.ActiveTexture (GL_TEXTURE1);
1745 glEnable (GL_TEXTURE_2D);
1746 glBindTexture (GL_TEXTURE_2D, name2);
1747 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1748
1749 /* rgb == rgb(glcolor) */
1750 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1751 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1752 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1753
1754 /* alpha = interpolate t0, t1 by env_alpha */
1755 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1756
1757 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1758 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1759 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1760
1761 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1762 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1763
1764 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1765 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1766
1767 glBegin (GL_QUADS);
1768 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1769 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1770 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1771 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1772 glEnd ();
1773
1774 glDisable (GL_TEXTURE_2D);
1775 gl.ActiveTexture (GL_TEXTURE0);
1776 }
1777 else
1778 {
1779 /* simple blending of one texture, also opengl <1.3 path */
1780 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1781
1782 glBegin (GL_QUADS);
1783 glTexCoord2f (0, 0); glVertex2f (0, 0);
1784 glTexCoord2f (0, t); glVertex2f (0, h);
1785 glTexCoord2f (s, t); glVertex2f (w, h);
1786 glTexCoord2f (s, 0); glVertex2f (w, 0);
1787 glEnd ();
1788 }
1789
1790 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1791 {
1792 int x, y;
1793 int dx3 = dx * 3;
1794 int dy3 = dy * 3;
1795
1796 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1797 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1798 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1799 glTranslatef (-1., -1., 0);
1800 glBegin (GL_QUADS);
1801
1802 for (y = 1; y < h; y += 3)
1803 {
1804 int y1 = y - dy3;
1805 int y1valid = y1 >= 0 && y1 < h;
1806
1807 for (x = 1; x < w; x += 3)
1808 {
1809 int x1 = x - dx3;
1810 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1811 uint8_t h2;
1812
1813 if (y1valid && x1 >= 0 && x1 < w)
1814 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1815 else
1816 h2 = 1; /* out of range == invisible */
1817
1818 if (h1 || h2)
1819 {
1820 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1821 glColor4f (1., 1., 1., alpha);
1822
1823 glTexCoord2f (0, 0.); glVertex2i (x , y );
1824 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1825 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1826 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1827 }
1828 }
1829 }
1830 }
1831
1832 glEnd ();
1833
1834 glPopMatrix ();
1835
1836 glDisable (GL_TEXTURE_2D);
1837 glDisable (GL_BLEND);
1647} 1838}
1648 1839
1649IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1840IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1650 CODE: 1841 CODE:
1651{ 1842{
1757 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1948 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1758 // use uglier nearest interpolation because linear suffers 1949 // use uglier nearest interpolation because linear suffers
1759 // from transparent color bleeding and ugly wrapping effects. 1950 // from transparent color bleeding and ugly wrapping effects.
1760 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1951 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1761} 1952}
1953
1954void
1955expire_textures (DC::Map self, int texid, int count)
1956 PPCODE:
1957 for (; texid < self->texs && count; ++texid, --count)
1958 {
1959 maptex *tex = self->tex + texid;
1960
1961 if (tex->name)
1962 {
1963 if (tex->unused)
1964 {
1965 tex->name = 0;
1966 tex->unused = 0;
1967 XPUSHs (sv_2mortal (newSViv (texid)));
1968 }
1969 else
1970 tex->unused = 1;
1971 }
1972 }
1762 1973
1763int 1974int
1764ox (DC::Map self) 1975ox (DC::Map self)
1765 ALIAS: 1976 ALIAS:
1766 oy = 1 1977 oy = 1
1847 { 2058 {
1848 ext = *data++; 2059 ext = *data++;
1849 cmd = ext & 0x7f; 2060 cmd = ext & 0x7f;
1850 2061
1851 if (cmd < 4) 2062 if (cmd < 4)
1852 cell->darkness = 255 - ext * 64 + 1; 2063 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1853 else if (cmd == 5) // health 2064 else if (cmd == 5) // health
1854 { 2065 {
1855 cell->stat_width = 1; 2066 cell->stat_width = 1;
1856 cell->stat_hp = *data++; 2067 cell->stat_hp = *data++;
1857 } 2068 }
1887 cell->tile [z] = self->face2tile [face]; 2098 cell->tile [z] = self->face2tile [face];
1888 2099
1889 if (cell->tile [z]) 2100 if (cell->tile [z])
1890 { 2101 {
1891 maptex *tex = self->tex + cell->tile [z]; 2102 maptex *tex = self->tex + cell->tile [z];
2103 tex->unused = 0;
1892 if (!tex->name) 2104 if (!tex->name)
1893 av_push (missing, newSViv (cell->tile [z])); 2105 av_push (missing, newSViv (cell->tile [z]));
1894 2106
1895 if (tex->smoothtile) 2107 if (tex->smoothtile)
1896 { 2108 {
1897 maptex *smooth = self->tex + tex->smoothtile; 2109 maptex *smooth = self->tex + tex->smoothtile;
2110 smooth->unused = 0;
1898 if (!smooth->name) 2111 if (!smooth->name)
1899 av_push (missing, newSViv (tex->smoothtile)); 2112 av_push (missing, newSViv (tex->smoothtile));
1900 } 2113 }
1901 } 2114 }
1902 } 2115 }
1930 ? self->row + y 2143 ? self->row + y
1931 : 0; 2144 : 0;
1932 2145
1933 for (x = x0; x < x1; x++) 2146 for (x = x0; x < x1; x++)
1934 { 2147 {
1935 int r = 32, g = 32, b = 32, a = 192; 2148 unsigned int r = 32, g = 32, b = 32, a = 192;
1936 2149
1937 if (row && row->c0 <= x && x < row->c1) 2150 if (row && row->c0 <= x && x < row->c1)
1938 { 2151 {
1939 mapcell *cell = row->col + (x - row->c0); 2152 mapcell *cell = row->col + (x - row->c0);
1940 2153
1942 { 2155 {
1943 maptex tex = self->tex [cell->tile [z]]; 2156 maptex tex = self->tex [cell->tile [z]];
1944 int a0 = 255 - tex.a; 2157 int a0 = 255 - tex.a;
1945 int a1 = tex.a; 2158 int a1 = tex.a;
1946 2159
1947 r = (r * a0 + tex.r * a1) / 255; 2160 r = div255 (r * a0 + tex.r * a1);
1948 g = (g * a0 + tex.g * a1) / 255; 2161 g = div255 (g * a0 + tex.g * a1);
1949 b = (b * a0 + tex.b * a1) / 255; 2162 b = div255 (b * a0 + tex.b * a1);
1950 a = (a * a0 + tex.a * a1) / 255; 2163 a = div255 (a * a0 + tex.a * a1);
1951 } 2164 }
1952 } 2165 }
1953 2166
1954 *map++ = (r ) 2167 *map++ = (r )
1955 | (g << 8) 2168 | (g << 8)
1962} 2175}
1963 OUTPUT: 2176 OUTPUT:
1964 RETVAL 2177 RETVAL
1965 2178
1966void 2179void
1967draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2180draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1968 CODE: 2181 CODE:
1969{ 2182{
1970 int x, y, z; 2183 int x, y, z;
1971 2184
1972 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2185 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1973 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2186 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1974 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2187 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1975 smooth_key skey; 2188 smooth_key skey;
1976 int pl_x, pl_y; 2189 int pl_x, pl_y;
1977 maptex pl_tex; 2190 maptex pl_tex;
1978 rc_t *rc = rc_alloc (); 2191 rc_t *rc = rc_alloc ();
2192 rc_t *rc_ov = rc_alloc ();
1979 rc_key_t key; 2193 rc_key_t key;
1980 rc_array_t *arr; 2194 rc_array_t *arr;
1981 2195
1982 pl_tex.name = 0; 2196 pl_tex.name = 0;
1983 2197
1984 // thats current max. sorry. 2198 // that's current max. sorry.
1985 if (sw > 255) sw = 255; 2199 if (sw > 255) sw = 255;
1986 if (sh > 255) sh = 255; 2200 if (sh > 255) sh = 255;
1987 2201
1988 // clear key, in case of extra padding 2202 // clear key, in case of extra padding
1989 memset (&skey, 0, sizeof (skey)); 2203 memset (&skey, 0, sizeof (skey));
1993 key.g = 255; 2207 key.g = 255;
1994 key.b = 255; 2208 key.b = 255;
1995 key.a = 255; 2209 key.a = 255;
1996 key.mode = GL_QUADS; 2210 key.mode = GL_QUADS;
1997 key.format = GL_T2F_V3F; 2211 key.format = GL_T2F_V3F;
1998 key.texname = -1;
1999 2212
2000 mx += self->x; 2213 mx += self->x;
2001 my += self->y; 2214 my += self->y;
2002 2215
2003 // first pass: determine smooth_max 2216 // first pass: determine smooth_max
2027 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2240 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2028 2241
2029 for (z = 0; z <= 2; z++) 2242 for (z = 0; z <= 2; z++)
2030 { 2243 {
2031 memset (smooth_level, 0, sizeof (smooth_level)); 2244 memset (smooth_level, 0, sizeof (smooth_level));
2245 key.texname = -1;
2032 2246
2033 for (y = 0; y < sh; y++) 2247 for (y = 0; y < sh; y++)
2034 if (0 <= y + my && y + my < self->rows) 2248 if (0 <= y + my && y + my < self->rows)
2035 { 2249 {
2036 maprow *row = self->row + (y + my); 2250 maprow *row = self->row + (y + my);
2042 tileid tile = cell->tile [z]; 2256 tileid tile = cell->tile [z];
2043 2257
2044 if (tile) 2258 if (tile)
2045 { 2259 {
2046 maptex tex = self->tex [tile]; 2260 maptex tex = self->tex [tile];
2047 int px = (x + 1) * T - tex.w; 2261 int px, py;
2048 int py = (y + 1) * T - tex.h;
2049 2262
2050 if (key.texname != tex.name) 2263 if (key.texname != tex.name)
2051 { 2264 {
2265 self->tex [tile].unused = 0;
2266
2052 if (!tex.name) 2267 if (!tex.name)
2053 tex = self->tex [2]; /* missing, replace by noface */ 2268 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2054 2269
2055 key.texname = tex.name; 2270 key.texname = tex.name;
2056 arr = rc_array (rc, &key); 2271 arr = rc_array (rc, &key);
2057 } 2272 }
2273
2274 px = (x + 1) * Th - tex.w;
2275 py = (y + 1) * Tw - tex.h;
2058 2276
2059 if (expect_false (cell->player == player) && expect_false (z == 2)) 2277 if (expect_false (cell->player == player) && expect_false (z == 2))
2060 { 2278 {
2061 pl_x = px; 2279 pl_x = px;
2062 pl_y = py; 2280 pl_y = py;
2067 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2285 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2068 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2286 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2069 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2287 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2070 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2288 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2071 2289
2072 if (expect_false (cell->flags) && expect_false (z == 2))
2073 {
2074 // overlays such as the speech bubble, probably more to come
2075 if (cell->flags & 1)
2076 {
2077 maptex tex = self->tex [1];
2078 int px = x * T + T * 2 / 32;
2079 int py = y * T - T * 6 / 32;
2080
2081 if (tex.name)
2082 {
2083 if (key.texname != tex.name)
2084 {
2085 key.texname = tex.name;
2086 arr = rc_array (rc, &key);
2087 }
2088
2089 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2090 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2091 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2092 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2093 }
2094 }
2095 }
2096
2097 // update smooth hash 2290 // update smooth hash
2098 if (tex.smoothtile) 2291 if (tex.smoothtile)
2099 { 2292 {
2100 skey.tile = tex.smoothtile; 2293 skey.tile = tex.smoothtile;
2101 skey.level = tex.smoothlevel; 2294 skey.level = tex.smoothlevel;
2129 // corners 2322 // corners
2130 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2323 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2131 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2324 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2132 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2325 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2133 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2326 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2327 }
2328 }
2329
2330 if (expect_false (z == 2) && expect_false (cell->flags))
2331 {
2332 // overlays such as the speech bubble, probably more to come
2333 if (cell->flags & 1)
2334 {
2335 rc_key_t key_ov = key;
2336 maptex tex = self->tex [TEXID_SPEECH];
2337 rc_array_t *arr;
2338 int px = x * Tw + Tw * 2 / 32;
2339 int py = y * Th - Th * 6 / 32;
2340
2341 key_ov.texname = tex.name;
2342 arr = rc_array (rc_ov, &key_ov);
2343
2344 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2345 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2346 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2347 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2134 } 2348 }
2135 } 2349 }
2136 } 2350 }
2137 } 2351 }
2138 2352
2165 if (!(bits & 0x1000) 2379 if (!(bits & 0x1000)
2166 && skey->level == level 2380 && skey->level == level
2167 && level > smooth_max [skey->x][skey->y]) 2381 && level > smooth_max [skey->x][skey->y])
2168 { 2382 {
2169 maptex tex = self->tex [skey->tile]; 2383 maptex tex = self->tex [skey->tile];
2170 int px = (((int)skey->x) - 1) * T; 2384 int px = (((int)skey->x) - 1) * Tw;
2171 int py = (((int)skey->y) - 1) * T; 2385 int py = (((int)skey->y) - 1) * Th;
2172 int border = bits & 15; 2386 int border = bits & 15;
2173 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2387 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2174 float dx = tex.s * .0625f; // 16 images/row 2388 float dx = tex.s * .0625f; // 16 images/row
2175 float dy = tex.t * .5f ; // 2 images/column 2389 float dy = tex.t * .5f ; // 2 images/column
2176 2390
2178 { 2392 {
2179 // this time avoiding texture state changes 2393 // this time avoiding texture state changes
2180 // save gobs of state changes. 2394 // save gobs of state changes.
2181 if (key.texname != tex.name) 2395 if (key.texname != tex.name)
2182 { 2396 {
2397 self->tex [skey->tile].unused = 0;
2398
2183 glEnd (); 2399 glEnd ();
2184 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2400 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2185 glBegin (GL_QUADS); 2401 glBegin (GL_QUADS);
2186 } 2402 }
2187 2403
2188 if (border) 2404 if (border)
2189 { 2405 {
2190 float ox = border * dx; 2406 float ox = border * dx;
2191 2407
2192 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2408 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2193 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2409 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2194 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2410 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2195 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2411 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2196 } 2412 }
2197 2413
2198 if (corner) 2414 if (corner)
2199 { 2415 {
2200 float ox = corner * dx; 2416 float ox = corner * dx;
2201 2417
2202 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2418 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2203 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2419 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2204 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2420 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2205 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2421 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2206 } 2422 }
2207 } 2423 }
2208 } 2424 }
2209 } 2425 }
2210 } 2426 }
2233 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2449 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2234 2450
2235 rc_draw (rc); 2451 rc_draw (rc);
2236 } 2452 }
2237 2453
2454 rc_draw (rc_ov);
2455 rc_clear (rc_ov);
2456
2238 glDisable (GL_BLEND); 2457 glDisable (GL_BLEND);
2239 rc_free (rc); 2458 rc_free (rc);
2459 rc_free (rc_ov);
2240 2460
2241 // top layer: overlays such as the health bar 2461 // top layer: overlays such as the health bar
2242 for (y = 0; y < sh; y++) 2462 for (y = 0; y < sh; y++)
2243 if (0 <= y + my && y + my < self->rows) 2463 if (0 <= y + my && y + my < self->rows)
2244 { 2464 {
2247 for (x = 0; x < sw; x++) 2467 for (x = 0; x < sw; x++)
2248 if (row->c0 <= x + mx && x + mx < row->c1) 2468 if (row->c0 <= x + mx && x + mx < row->c1)
2249 { 2469 {
2250 mapcell *cell = row->col + (x + mx - row->c0); 2470 mapcell *cell = row->col + (x + mx - row->c0);
2251 2471
2252 int px = x * T; 2472 int px = x * Tw;
2253 int py = y * T; 2473 int py = y * Th;
2474
2475 if (expect_false (cell->player == player))
2476 {
2477 px += sdx;
2478 py += sdy;
2479 }
2254 2480
2255 if (cell->stat_hp) 2481 if (cell->stat_hp)
2256 { 2482 {
2257 int width = cell->stat_width * T; 2483 int width = cell->stat_width * Tw;
2258 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2484 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2259 2485
2260 glColor3ub (0, 0, 0); 2486 glColor3ub (0, 0, 0);
2261 glRectf (px + 1, py - thick - 2, 2487 glRectf (px + 1, py - thick - 2,
2262 px + width - 1, py); 2488 px + width - 1, py);
2263 2489
2269 } 2495 }
2270 } 2496 }
2271} 2497}
2272 2498
2273void 2499void
2274draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2500draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2275 CODE: 2501 CODE:
2276{ 2502{
2277 static float color[16][3] = { 2503 static float color[16][3] = {
2278 { 0.00F, 0.00F, 0.00F }, 2504 { 0.00f, 0.00f, 0.00f },
2279 { 1.00F, 1.00F, 1.00F }, 2505 { 1.00f, 1.00f, 1.00f },
2280 { 0.00F, 0.00F, 0.55F }, 2506 { 0.00f, 0.00f, 0.55f },
2281 { 1.00F, 0.00F, 0.00F }, 2507 { 1.00f, 0.00f, 0.00f },
2282 2508
2283 { 1.00F, 0.54F, 0.00F }, 2509 { 1.00f, 0.54f, 0.00f },
2284 { 0.11F, 0.56F, 1.00F }, 2510 { 0.11f, 0.56f, 1.00f },
2285 { 0.93F, 0.46F, 0.00F }, 2511 { 0.93f, 0.46f, 0.00f },
2286 { 0.18F, 0.54F, 0.34F }, 2512 { 0.18f, 0.54f, 0.34f },
2287 2513
2288 { 0.56F, 0.73F, 0.56F }, 2514 { 0.56f, 0.73f, 0.56f },
2289 { 0.80F, 0.80F, 0.80F }, 2515 { 0.80f, 0.80f, 0.80f },
2290 { 0.55F, 0.41F, 0.13F }, 2516 { 0.55f, 0.41f, 0.13f },
2291 { 0.99F, 0.77F, 0.26F }, 2517 { 0.99f, 0.77f, 0.26f },
2292 2518
2293 { 0.74F, 0.65F, 0.41F }, 2519 { 0.74f, 0.65f, 0.41f },
2294 2520
2295 { 0.00F, 1.00F, 1.00F }, 2521 { 0.00f, 1.00f, 1.00f },
2296 { 1.00F, 0.00F, 1.00F }, 2522 { 1.00f, 0.00f, 1.00f },
2297 { 1.00F, 1.00F, 0.00F }, 2523 { 1.00f, 1.00f, 0.00f },
2298 }; 2524 };
2299 2525
2300 int x, y; 2526 int x, y;
2301 2527
2302 glEnable (GL_TEXTURE_2D); 2528 glEnable (GL_TEXTURE_2D);
2529 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2530 * but the nvidia driver (185.18.14) mishandles alpha textures
2531 * and takes the colour from god knows where instead of using
2532 * Cp. MODULATE results in the same colour, but slightly different
2533 * alpha, but atcually gives us the correct colour with nvidia.
2534 */
2303 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2535 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2304 glEnable (GL_BLEND); 2536 glEnable (GL_BLEND);
2305 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2537 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2306 glBegin (GL_QUADS); 2538 glBegin (GL_QUADS);
2307 2539
2308 for (y = 0; y < h; y++) 2540 for (y = 0; y < h; y++)
2312 2544
2313 if (m) 2545 if (m)
2314 { 2546 {
2315 float *c = color [m & 15]; 2547 float *c = color [m & 15];
2316 2548
2317 float tx1 = m & 0x40 ? 0.5 : 0.; 2549 float tx1 = m & 0x40 ? 0.5f : 0.f;
2318 float tx2 = tx1 + 0.5; 2550 float tx2 = tx1 + 0.5f;
2319 2551
2320 glColor4f (c[0], c[1], c[2], 0.75); 2552 glColor4f (c[0], c[1], c[2], 1);
2321 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2553 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2322 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2554 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2323 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2555 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2324 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2556 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2325 } 2557 }
2333void 2565void
2334fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2566fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2335 PPCODE: 2567 PPCODE:
2336{ 2568{
2337 int x, y; 2569 int x, y;
2338 int sw1 = sw + 2; 2570 int sw1 = sw + 2;
2339 int sh1 = sh + 2; 2571 int sh1 = sh + 2;
2340 int sh3 = sh * 3; 2572 int sh3 = sh * 3;
2341 int sw34 = (sw * 3 + 3) & ~3; 2573 int sw3 = sw * 3;
2574 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2575 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2342 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2576 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2343 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2577 memset (darkness1, 0, sw1*sh1);
2344 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2345 2578
2346 SvPOK_only (darkness3_sv); 2579 SvPOK_only (darkness3_sv);
2347 SvCUR_set (darkness3_sv, sw34 * sh3); 2580 SvCUR_set (darkness3_sv, sw3 * sh3);
2348 2581
2349 mx += self->x - 1; 2582 mx += self->x - 1;
2350 my += self->y - 1; 2583 my += self->y - 1;
2351
2352 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2353 2584
2354 for (y = 0; y < sh1; y++) 2585 for (y = 0; y < sh1; y++)
2355 if (0 <= y + my && y + my < self->rows) 2586 if (0 <= y + my && y + my < self->rows)
2356 { 2587 {
2357 maprow *row = self->row + (y + my); 2588 maprow *row = self->row + (y + my);
2360 if (row->c0 <= x + mx && x + mx < row->c1) 2591 if (row->c0 <= x + mx && x + mx < row->c1)
2361 { 2592 {
2362 mapcell *cell = row->col + (x + mx - row->c0); 2593 mapcell *cell = row->col + (x + mx - row->c0);
2363 2594
2364 darkness1 [y * sw1 + x] = cell->darkness 2595 darkness1 [y * sw1 + x] = cell->darkness
2365 ? 255 - (cell->darkness - 1) 2596 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2366 : 255 - FOW_DARKNESS; 2597 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2367 } 2598 }
2368 } 2599 }
2369 2600
2370 for (y = 0; y < sh; ++y) 2601 for (y = 0; y < sh; ++y)
2371 for (x = 0; x < sw; ++x) 2602 for (x = 0; x < sw; ++x)
2390 2621
2391 uint8_t r13 = (d13 + d23 + d12) / 3; 2622 uint8_t r13 = (d13 + d23 + d12) / 3;
2392 uint8_t r23 = d23; 2623 uint8_t r23 = d23;
2393 uint8_t r33 = (d23 + d33 + d32) / 3; 2624 uint8_t r33 = (d23 + d33 + d32) / 3;
2394 2625
2395 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2626 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2396 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2627 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2397 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2628 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2398 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2629 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2399 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2630 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2400 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2631 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2401 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2632 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2402 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2633 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2403 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2634 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2404 } 2635 }
2405 2636
2406 free (darkness1); 2637 free (darkness1);
2407 2638
2408 EXTEND (SP, 3); 2639 EXTEND (SP, 3);
2409 PUSHs (sv_2mortal (newSViv (sw34))); 2640 PUSHs (sv_2mortal (newSViv (sw3)));
2410 PUSHs (sv_2mortal (newSViv (sh3))); 2641 PUSHs (sv_2mortal (newSViv (sh3)));
2411 PUSHs (darkness3_sv); 2642 PUSHs (darkness3_sv);
2412} 2643}
2413 2644
2414SV * 2645SV *
2612 if (RETVAL < 0) 2843 if (RETVAL < 0)
2613 { 2844 {
2614 RETVAL = Mix_GroupOldest (-1); 2845 RETVAL = Mix_GroupOldest (-1);
2615 2846
2616 if (RETVAL < 0) 2847 if (RETVAL < 0)
2848 {
2849 // happens sometimes, maybe it just stopped playing(?)
2850 RETVAL = Mix_GroupAvailable (-1);
2851
2852 if (RETVAL < 0)
2617 XSRETURN_UNDEF; 2853 XSRETURN_UNDEF;
2618 2854 }
2855 else
2619 Mix_HaltChannel (RETVAL); 2856 Mix_HaltChannel (RETVAL);
2620 } 2857 }
2621 2858
2622 Mix_UnregisterAllEffects (RETVAL); 2859 Mix_UnregisterAllEffects (RETVAL);
2623 Mix_Volume (RETVAL, 128); 2860 Mix_Volume (RETVAL, 128);
2624} 2861}
2671void 2908void
2672set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2909set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2673 CODE: 2910 CODE:
2674{ 2911{
2675 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2912 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2676 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2913 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2677 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2914 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2678} 2915}
2679 2916
2680void 2917void
2681set_reverse_stereo (DC::Channel self, int flip) 2918set_reverse_stereo (DC::Channel self, int flip)
2683 Mix_SetReverseStereo (self, flip); 2920 Mix_SetReverseStereo (self, flip);
2684 2921
2685MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2922MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2686 2923
2687PROTOTYPES: DISABLE 2924PROTOTYPES: DISABLE
2925
2926void
2927decoders ()
2928 PPCODE:
2929#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2930 int i, num = Mix_GetNumChunkDecoders ();
2931 EXTEND (SP, num);
2932 for (i = 0; i < num; ++i)
2933 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2934#else
2935 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2936#endif
2688 2937
2689DC::MixChunk 2938DC::MixChunk
2690new (SV *class, DC::RW rwops) 2939new (SV *class, DC::RW rwops)
2691 CODE: 2940 CODE:
2692 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2941 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2725 OUTPUT: 2974 OUTPUT:
2726 RETVAL 2975 RETVAL
2727 2976
2728MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2977MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2729 2978
2979void
2980decoders ()
2981 PPCODE:
2982#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2983 int i, num = Mix_GetNumMusicDecoders ();
2984 EXTEND (SP, num);
2985 for (i = 0; i < num; ++i)
2986 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2987#else
2988 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2989#endif
2990
2730int 2991int
2731volume (int volume = -1) 2992volume (int volume = -1)
2732 PROTOTYPE: ;$ 2993 PROTOTYPE: ;$
2733 CODE: 2994 CODE:
2734 if (items > 0) 2995 if (items > 0)
2744 3005
2745void 3006void
2746halt () 3007halt ()
2747 CODE: 3008 CODE:
2748 Mix_HaltMusic (); 3009 Mix_HaltMusic ();
3010
3011int
3012playing ()
3013 CODE:
3014 RETVAL = Mix_PlayingMusic ();
3015 OUTPUT:
3016 RETVAL
2749 3017
2750DC::MixMusic 3018DC::MixMusic
2751new (SV *class, DC::RW rwops) 3019new (SV *class, DC::RW rwops)
2752 CODE: 3020 CODE:
2753 RETVAL = Mix_LoadMUS_RW (rwops); 3021 RETVAL = Mix_LoadMUS_RW (rwops);
2784 } *civ, const_iv[] = { 3052 } *civ, const_iv[] = {
2785# define const_iv(name) { # name, (IV)name } 3053# define const_iv(name) { # name, (IV)name }
2786 const_iv (GL_VENDOR), 3054 const_iv (GL_VENDOR),
2787 const_iv (GL_VERSION), 3055 const_iv (GL_VERSION),
2788 const_iv (GL_EXTENSIONS), 3056 const_iv (GL_EXTENSIONS),
3057 const_iv (GL_MAX_TEXTURE_UNITS),
2789 const_iv (GL_COLOR_MATERIAL), 3058 const_iv (GL_COLOR_MATERIAL),
2790 const_iv (GL_SMOOTH), 3059 const_iv (GL_SMOOTH),
2791 const_iv (GL_FLAT), 3060 const_iv (GL_FLAT),
2792 const_iv (GL_DITHER), 3061 const_iv (GL_DITHER),
2793 const_iv (GL_BLEND), 3062 const_iv (GL_BLEND),
2805 const_iv (GL_ZERO), 3074 const_iv (GL_ZERO),
2806 const_iv (GL_SRC_ALPHA), 3075 const_iv (GL_SRC_ALPHA),
2807 const_iv (GL_DST_ALPHA), 3076 const_iv (GL_DST_ALPHA),
2808 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3077 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2809 const_iv (GL_ONE_MINUS_DST_ALPHA), 3078 const_iv (GL_ONE_MINUS_DST_ALPHA),
3079 const_iv (GL_SRC_COLOR),
3080 const_iv (GL_DST_COLOR),
3081 const_iv (GL_ONE_MINUS_SRC_COLOR),
3082 const_iv (GL_ONE_MINUS_DST_COLOR),
2810 const_iv (GL_SRC_ALPHA_SATURATE), 3083 const_iv (GL_SRC_ALPHA_SATURATE),
2811 const_iv (GL_RGB), 3084 const_iv (GL_RGB),
2812 const_iv (GL_RGBA), 3085 const_iv (GL_RGBA),
2813 const_iv (GL_RGBA4), 3086 const_iv (GL_RGBA4),
2814 const_iv (GL_RGBA8), 3087 const_iv (GL_RGBA8),
2882 const_iv (GL_NICEST), 3155 const_iv (GL_NICEST),
2883 const_iv (GL_V2F), 3156 const_iv (GL_V2F),
2884 const_iv (GL_V3F), 3157 const_iv (GL_V3F),
2885 const_iv (GL_T2F_V3F), 3158 const_iv (GL_T2F_V3F),
2886 const_iv (GL_T2F_N3F_V3F), 3159 const_iv (GL_T2F_N3F_V3F),
3160 const_iv (GL_FUNC_ADD),
3161 const_iv (GL_FUNC_SUBTRACT),
3162 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2887# undef const_iv 3163# undef const_iv
2888 }; 3164 };
2889 3165
2890 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3166 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2891 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3167 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2892 3168
2893 texture_av = newAV (); 3169 texture_av = newAV ();
2894 AvREAL_off (texture_av); 3170 AvREAL_off (texture_av);
2895} 3171}
2896 3172
2897void 3173void
2898disable_GL_EXT_blend_func_separate () 3174disable_GL_EXT_blend_func_separate ()
2899 CODE: 3175 CODE:
2900 gl.BlendFuncSeparate = 0; 3176 gl.BlendFuncSeparate = 0;
2901 gl.BlendFuncSeparateEXT = 0; 3177 gl.BlendFuncSeparateEXT = 0;
3178
3179void
3180apple_nvidia_bug (int enable)
2902 3181
2903char * 3182char *
2904gl_vendor () 3183gl_vendor ()
2905 CODE: 3184 CODE:
2906 RETVAL = (char *)glGetString (GL_VENDOR); 3185 RETVAL = (char *)glGetString (GL_VENDOR);
2937 3216
2938int glGetError () 3217int glGetError ()
2939 3218
2940void glFinish () 3219void glFinish ()
2941 3220
3221void glFlush ()
3222
2942void glClear (int mask) 3223void glClear (int mask)
2943 3224
2944void glClearColor (float r, float g, float b, float a = 1.0) 3225void glClearColor (float r, float g, float b, float a = 1.0)
2945 PROTOTYPE: @ 3226 PROTOTYPE: @
2946 3227
2955void glBlendFunc (int sfactor, int dfactor) 3236void glBlendFunc (int sfactor, int dfactor)
2956 3237
2957void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3238void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2958 CODE: 3239 CODE:
2959 gl_BlendFuncSeparate (sa, da, saa, daa); 3240 gl_BlendFuncSeparate (sa, da, saa, daa);
3241
3242# void glBlendEquation (int se)
2960 3243
2961void glDepthMask (int flag) 3244void glDepthMask (int flag)
2962 3245
2963void glLogicOp (int opcode) 3246void glLogicOp (int opcode)
2964 3247
2999void glRotate (float angle, float x, float y, float z) 3282void glRotate (float angle, float x, float y, float z)
3000 CODE: 3283 CODE:
3001 glRotatef (angle, x, y, z); 3284 glRotatef (angle, x, y, z);
3002 3285
3003void glColor (float r, float g, float b, float a = 1.0) 3286void glColor (float r, float g, float b, float a = 1.0)
3287 PROTOTYPE: @
3004 ALIAS: 3288 ALIAS:
3005 glColor_premultiply = 1 3289 glColor_premultiply = 1
3006 CODE: 3290 CODE:
3007 if (ix) 3291 if (ix)
3008 { 3292 {
3113void glNewList (int list, int mode = GL_COMPILE) 3397void glNewList (int list, int mode = GL_COMPILE)
3114 3398
3115void glEndList () 3399void glEndList ()
3116 3400
3117void glCallList (int list) 3401void glCallList (int list)
3402
3403void c_init ()
3404 CODE:
3405 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3406 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3118 3407
3119MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3408MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3120 3409
3121PROTOTYPES: DISABLE 3410PROTOTYPES: DISABLE
3122 3411

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines