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.279 by root, Thu Oct 2 15:59:40 2008 UTC vs.
Revision 1.311 by root, Tue Dec 27 09:17:27 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
547 580
548static void 581static void
549deliantra_main () 582deliantra_main ()
550{ 583{
551 char *argv[] = { 0 }; 584 char *argv[] = { 0 };
552 call_argv ("::main", G_DISCARD | G_VOID, argv); 585 call_argv ("DC::Main::main", G_DISCARD | G_VOID, argv);
553} 586}
554 587
555#ifdef __MACOSX__ 588#ifdef __MACOSX__
556 /* to due surprising braindamage on the side of SDL design, we 589 /* to due surprising braindamage on the side of SDL design, we
557 * do some mind-boggling hack here: SDL requires a custom main() 590 * do some mind-boggling hack here: SDL requires a custom main()
558 * on OS X, so... we provide one and call the original main(), which, 591 * on OS X, so... we provide one and call the original main(), which,
559 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 592 * due to shared library magic, calls -lSDLmain's main, not perl's main,
560 * and which calls our main (== SDL_main) back. 593 * and which calls our main (== SDL_main) back.
561 */ 594 */
562 extern C_LINKAGE int 595 extern C_LINKAGE int
563 main (int argc, char *argv[]) 596 main (int argc, char *argv[])
564 { 597 {
788 821
789 const_iv (FOW_DARKNESS) 822 const_iv (FOW_DARKNESS)
790# undef const_iv 823# undef const_iv
791 }; 824 };
792 825
793 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--)
794 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 827 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
795 828
796 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 829 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
797 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 830 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
798} 831}
799 832
815NV ceil (NV x) 848NV ceil (NV x)
816 849
817IV minpot (UV n) 850IV minpot (UV n)
818 851
819IV 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
820 859
821void 860void
822pango_init () 861pango_init ()
823 CODE: 862 CODE:
824{ 863{
916 955
917 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra"); 956 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
918#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);
919#include "glfunc.h" 958#include "glfunc.h"
920#undef GL_FUNC 959#undef GL_FUNC
960
961 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
962 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
921 } 963 }
922} 964}
923 OUTPUT: 965 OUTPUT:
924 RETVAL 966 RETVAL
925 967
933SDL_GetAppState () 975SDL_GetAppState ()
934 976
935int 977int
936SDL_GetModState () 978SDL_GetModState ()
937 979
980int
981SDL_WaitEvent ()
982 C_ARGS: 0
983
938void 984void
985SDL_PumpEvents ()
986
987void
939poll_events () 988peep_events ()
940 PPCODE: 989 PPCODE:
941{ 990{
942 SDL_Event ev; 991 SDL_Event ev;
943 992
944 SDL_PumpEvents (); 993 SDL_PumpEvents ();
1010 1059
1011 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1060 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1012 } 1061 }
1013} 1062}
1014 1063
1064char *
1065SDL_AudioDriverName ()
1066 CODE:
1067{
1068 char buf [256];
1069 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1070 XSRETURN_UNDEF;
1071
1072 RETVAL = buf;
1073}
1074 OUTPUT:
1075 RETVAL
1076
1015int 1077int
1016Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1078Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1017 POSTCALL: 1079 POSTCALL:
1018 Mix_HookMusicFinished (music_finished); 1080 Mix_HookMusicFinished (music_finished);
1019 Mix_ChannelFinished (channel_finished); 1081 Mix_ChannelFinished (channel_finished);
1081add_font (char *file) 1143add_font (char *file)
1082 CODE: 1144 CODE:
1083 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1145 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1084 OUTPUT: 1146 OUTPUT:
1085 RETVAL 1147 RETVAL
1148
1149void
1150IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1151
1152void
1153Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_MP3 | MIX_INIT_OGG)
1086 1154
1087void 1155void
1088load_image_inline (SV *image_) 1156load_image_inline (SV *image_)
1089 ALIAS: 1157 ALIAS:
1090 load_image_file = 1 1158 load_image_file = 1
1206#if DEBUG 1274#if DEBUG
1207 VALGRIND_DO_LEAK_CHECK; 1275 VALGRIND_DO_LEAK_CHECK;
1208#endif 1276#endif
1209} 1277}
1210 1278
1279int
1280SvREFCNT (SV *sv)
1281 CODE:
1282 RETVAL = SvREFCNT (sv);
1283 OUTPUT:
1284 RETVAL
1285
1211MODULE = Deliantra::Client PACKAGE = DC::Font 1286MODULE = Deliantra::Client PACKAGE = DC::Font
1212 1287
1213PROTOTYPES: DISABLE 1288PROTOTYPES: DISABLE
1214 1289
1215DC::Font 1290DC::Font
1644 if (ix) 1719 if (ix)
1645 { 1720 {
1646 glDisable (GL_ALPHA_TEST); 1721 glDisable (GL_ALPHA_TEST);
1647 glDisable (GL_BLEND); 1722 glDisable (GL_BLEND);
1648 } 1723 }
1724}
1725
1726void
1727draw_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)
1728 PROTOTYPE: @
1729 CODE:
1730{
1731 glEnable (GL_BLEND);
1732 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1733 glEnable (GL_TEXTURE_2D);
1734 glBindTexture (GL_TEXTURE_2D, name1);
1735
1736 glColor3f (intensity, intensity, intensity);
1737 glPushMatrix ();
1738 glScalef (1./3, 1./3, 1.);
1739
1740 if (blend > 0.f)
1741 {
1742 float dx3 = dx * -3.f / w;
1743 float dy3 = dy * -3.f / h;
1744 GLfloat env_color[4] = { 0., 0., 0., blend };
1745
1746 /* interpolate the two shadow textures */
1747 /* stage 0 == rgb(glcolor) + alpha(t0) */
1748 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1749
1750 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1751 gl.ActiveTexture (GL_TEXTURE1);
1752 glEnable (GL_TEXTURE_2D);
1753 glBindTexture (GL_TEXTURE_2D, name2);
1754 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1755
1756 /* rgb == rgb(glcolor) */
1757 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1758 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1759 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1760
1761 /* alpha = interpolate t0, t1 by env_alpha */
1762 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1763
1764 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1765 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1766 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1767
1768 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1769 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1770
1771 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1772 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1773
1774 glBegin (GL_QUADS);
1775 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1776 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1777 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1778 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1779 glEnd ();
1780
1781 glDisable (GL_TEXTURE_2D);
1782 gl.ActiveTexture (GL_TEXTURE0);
1783 }
1784 else
1785 {
1786 /* simple blending of one texture, also opengl <1.3 path */
1787 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1788
1789 glBegin (GL_QUADS);
1790 glTexCoord2f (0, 0); glVertex2f (0, 0);
1791 glTexCoord2f (0, t); glVertex2f (0, h);
1792 glTexCoord2f (s, t); glVertex2f (w, h);
1793 glTexCoord2f (s, 0); glVertex2f (w, 0);
1794 glEnd ();
1795 }
1796
1797 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1798 {
1799 int x, y;
1800 int dx3 = dx * 3;
1801 int dy3 = dy * 3;
1802
1803 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1804 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1805 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1806 glTranslatef (-1., -1., 0);
1807 glBegin (GL_QUADS);
1808
1809 for (y = 1; y < h; y += 3)
1810 {
1811 int y1 = y - dy3;
1812 int y1valid = y1 >= 0 && y1 < h;
1813
1814 for (x = 1; x < w; x += 3)
1815 {
1816 int x1 = x - dx3;
1817 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1818 uint8_t h2;
1819
1820 if (y1valid && x1 >= 0 && x1 < w)
1821 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1822 else
1823 h2 = 1; /* out of range == invisible */
1824
1825 if (h1 || h2)
1826 {
1827 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1828 glColor4f (1., 1., 1., alpha);
1829
1830 glTexCoord2f (0, 0.); glVertex2i (x , y );
1831 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1832 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1833 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1834 }
1835 }
1836 }
1837 }
1838
1839 glEnd ();
1840
1841 glPopMatrix ();
1842
1843 glDisable (GL_TEXTURE_2D);
1844 glDisable (GL_BLEND);
1649} 1845}
1650 1846
1651IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1847IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1652 CODE: 1848 CODE:
1653{ 1849{
1759 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1955 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1760 // use uglier nearest interpolation because linear suffers 1956 // use uglier nearest interpolation because linear suffers
1761 // from transparent color bleeding and ugly wrapping effects. 1957 // from transparent color bleeding and ugly wrapping effects.
1762 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1958 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1763} 1959}
1960
1961void
1962expire_textures (DC::Map self, int texid, int count)
1963 PPCODE:
1964 for (; texid < self->texs && count; ++texid, --count)
1965 {
1966 maptex *tex = self->tex + texid;
1967
1968 if (tex->name)
1969 {
1970 if (tex->unused)
1971 {
1972 tex->name = 0;
1973 tex->unused = 0;
1974 XPUSHs (sv_2mortal (newSViv (texid)));
1975 }
1976 else
1977 tex->unused = 1;
1978 }
1979 }
1764 1980
1765int 1981int
1766ox (DC::Map self) 1982ox (DC::Map self)
1767 ALIAS: 1983 ALIAS:
1768 oy = 1 1984 oy = 1
1849 { 2065 {
1850 ext = *data++; 2066 ext = *data++;
1851 cmd = ext & 0x7f; 2067 cmd = ext & 0x7f;
1852 2068
1853 if (cmd < 4) 2069 if (cmd < 4)
1854 cell->darkness = 255 - ext * 64 + 1; 2070 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1855 else if (cmd == 5) // health 2071 else if (cmd == 5) // health
1856 { 2072 {
1857 cell->stat_width = 1; 2073 cell->stat_width = 1;
1858 cell->stat_hp = *data++; 2074 cell->stat_hp = *data++;
1859 } 2075 }
1889 cell->tile [z] = self->face2tile [face]; 2105 cell->tile [z] = self->face2tile [face];
1890 2106
1891 if (cell->tile [z]) 2107 if (cell->tile [z])
1892 { 2108 {
1893 maptex *tex = self->tex + cell->tile [z]; 2109 maptex *tex = self->tex + cell->tile [z];
2110 tex->unused = 0;
1894 if (!tex->name) 2111 if (!tex->name)
1895 av_push (missing, newSViv (cell->tile [z])); 2112 av_push (missing, newSViv (cell->tile [z]));
1896 2113
1897 if (tex->smoothtile) 2114 if (tex->smoothtile)
1898 { 2115 {
1899 maptex *smooth = self->tex + tex->smoothtile; 2116 maptex *smooth = self->tex + tex->smoothtile;
2117 smooth->unused = 0;
1900 if (!smooth->name) 2118 if (!smooth->name)
1901 av_push (missing, newSViv (tex->smoothtile)); 2119 av_push (missing, newSViv (tex->smoothtile));
1902 } 2120 }
1903 } 2121 }
1904 } 2122 }
1932 ? self->row + y 2150 ? self->row + y
1933 : 0; 2151 : 0;
1934 2152
1935 for (x = x0; x < x1; x++) 2153 for (x = x0; x < x1; x++)
1936 { 2154 {
1937 int r = 32, g = 32, b = 32, a = 192; 2155 unsigned int r = 32, g = 32, b = 32, a = 192;
1938 2156
1939 if (row && row->c0 <= x && x < row->c1) 2157 if (row && row->c0 <= x && x < row->c1)
1940 { 2158 {
1941 mapcell *cell = row->col + (x - row->c0); 2159 mapcell *cell = row->col + (x - row->c0);
1942 2160
1944 { 2162 {
1945 maptex tex = self->tex [cell->tile [z]]; 2163 maptex tex = self->tex [cell->tile [z]];
1946 int a0 = 255 - tex.a; 2164 int a0 = 255 - tex.a;
1947 int a1 = tex.a; 2165 int a1 = tex.a;
1948 2166
1949 r = (r * a0 + tex.r * a1) / 255; 2167 r = div255 (r * a0 + tex.r * a1);
1950 g = (g * a0 + tex.g * a1) / 255; 2168 g = div255 (g * a0 + tex.g * a1);
1951 b = (b * a0 + tex.b * a1) / 255; 2169 b = div255 (b * a0 + tex.b * a1);
1952 a = (a * a0 + tex.a * a1) / 255; 2170 a = div255 (a * a0 + tex.a * a1);
1953 } 2171 }
1954 } 2172 }
1955 2173
1956 *map++ = (r ) 2174 *map++ = (r )
1957 | (g << 8) 2175 | (g << 8)
1964} 2182}
1965 OUTPUT: 2183 OUTPUT:
1966 RETVAL 2184 RETVAL
1967 2185
1968void 2186void
1969draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2187draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1970 CODE: 2188 CODE:
1971{ 2189{
1972 int x, y, z; 2190 int x, y, z;
1973 2191
1974 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2192 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1975 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2193 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1976 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2194 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1977 smooth_key skey; 2195 smooth_key skey;
1978 int pl_x, pl_y; 2196 int pl_x, pl_y;
1979 maptex pl_tex; 2197 maptex pl_tex;
1980 rc_t *rc = rc_alloc (); 2198 rc_t *rc = rc_alloc ();
2199 rc_t *rc_ov = rc_alloc ();
1981 rc_key_t key; 2200 rc_key_t key;
1982 rc_array_t *arr; 2201 rc_array_t *arr;
1983 2202
1984 pl_tex.name = 0; 2203 pl_tex.name = 0;
1985 2204
1986 // thats current max. sorry. 2205 // that's current max. sorry.
1987 if (sw > 255) sw = 255; 2206 if (sw > 255) sw = 255;
1988 if (sh > 255) sh = 255; 2207 if (sh > 255) sh = 255;
1989 2208
1990 // clear key, in case of extra padding 2209 // clear key, in case of extra padding
1991 memset (&skey, 0, sizeof (skey)); 2210 memset (&skey, 0, sizeof (skey));
1995 key.g = 255; 2214 key.g = 255;
1996 key.b = 255; 2215 key.b = 255;
1997 key.a = 255; 2216 key.a = 255;
1998 key.mode = GL_QUADS; 2217 key.mode = GL_QUADS;
1999 key.format = GL_T2F_V3F; 2218 key.format = GL_T2F_V3F;
2000 key.texname = -1;
2001 2219
2002 mx += self->x; 2220 mx += self->x;
2003 my += self->y; 2221 my += self->y;
2004 2222
2005 // first pass: determine smooth_max 2223 // first pass: determine smooth_max
2029 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2247 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2030 2248
2031 for (z = 0; z <= 2; z++) 2249 for (z = 0; z <= 2; z++)
2032 { 2250 {
2033 memset (smooth_level, 0, sizeof (smooth_level)); 2251 memset (smooth_level, 0, sizeof (smooth_level));
2252 key.texname = -1;
2034 2253
2035 for (y = 0; y < sh; y++) 2254 for (y = 0; y < sh; y++)
2036 if (0 <= y + my && y + my < self->rows) 2255 if (0 <= y + my && y + my < self->rows)
2037 { 2256 {
2038 maprow *row = self->row + (y + my); 2257 maprow *row = self->row + (y + my);
2044 tileid tile = cell->tile [z]; 2263 tileid tile = cell->tile [z];
2045 2264
2046 if (tile) 2265 if (tile)
2047 { 2266 {
2048 maptex tex = self->tex [tile]; 2267 maptex tex = self->tex [tile];
2049 int px = (x + 1) * T - tex.w; 2268 int px, py;
2050 int py = (y + 1) * T - tex.h;
2051 2269
2052 if (key.texname != tex.name) 2270 if (key.texname != tex.name)
2053 { 2271 {
2272 self->tex [tile].unused = 0;
2273
2054 if (!tex.name) 2274 if (!tex.name)
2055 tex = self->tex [2]; /* missing, replace by noface */ 2275 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2056 2276
2057 key.texname = tex.name; 2277 key.texname = tex.name;
2058 arr = rc_array (rc, &key); 2278 arr = rc_array (rc, &key);
2059 } 2279 }
2280
2281 px = (x + 1) * Th - tex.w;
2282 py = (y + 1) * Tw - tex.h;
2060 2283
2061 if (expect_false (cell->player == player) && expect_false (z == 2)) 2284 if (expect_false (cell->player == player) && expect_false (z == 2))
2062 { 2285 {
2063 pl_x = px; 2286 pl_x = px;
2064 pl_y = py; 2287 pl_y = py;
2069 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2292 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2070 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2293 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2071 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2294 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2072 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2295 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2073 2296
2074 if (expect_false (cell->flags) && expect_false (z == 2))
2075 {
2076 // overlays such as the speech bubble, probably more to come
2077 if (cell->flags & 1)
2078 {
2079 maptex tex = self->tex [1];
2080 int px = x * T + T * 2 / 32;
2081 int py = y * T - T * 6 / 32;
2082
2083 if (tex.name)
2084 {
2085 if (key.texname != tex.name)
2086 {
2087 key.texname = tex.name;
2088 arr = rc_array (rc, &key);
2089 }
2090
2091 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2092 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2093 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2094 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2095 }
2096 }
2097 }
2098
2099 // update smooth hash 2297 // update smooth hash
2100 if (tex.smoothtile) 2298 if (tex.smoothtile)
2101 { 2299 {
2102 skey.tile = tex.smoothtile; 2300 skey.tile = tex.smoothtile;
2103 skey.level = tex.smoothlevel; 2301 skey.level = tex.smoothlevel;
2131 // corners 2329 // corners
2132 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2330 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2133 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2331 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2134 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2332 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2135 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2333 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2334 }
2335 }
2336
2337 if (expect_false (z == 2) && expect_false (cell->flags))
2338 {
2339 // overlays such as the speech bubble, probably more to come
2340 if (cell->flags & 1)
2341 {
2342 rc_key_t key_ov = key;
2343 maptex tex = self->tex [TEXID_SPEECH];
2344 rc_array_t *arr;
2345 int px = x * Tw + Tw * 2 / 32;
2346 int py = y * Th - Th * 6 / 32;
2347
2348 key_ov.texname = tex.name;
2349 arr = rc_array (rc_ov, &key_ov);
2350
2351 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2352 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2353 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2354 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2136 } 2355 }
2137 } 2356 }
2138 } 2357 }
2139 } 2358 }
2140 2359
2167 if (!(bits & 0x1000) 2386 if (!(bits & 0x1000)
2168 && skey->level == level 2387 && skey->level == level
2169 && level > smooth_max [skey->x][skey->y]) 2388 && level > smooth_max [skey->x][skey->y])
2170 { 2389 {
2171 maptex tex = self->tex [skey->tile]; 2390 maptex tex = self->tex [skey->tile];
2172 int px = (((int)skey->x) - 1) * T; 2391 int px = (((int)skey->x) - 1) * Tw;
2173 int py = (((int)skey->y) - 1) * T; 2392 int py = (((int)skey->y) - 1) * Th;
2174 int border = bits & 15; 2393 int border = bits & 15;
2175 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2394 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2176 float dx = tex.s * .0625f; // 16 images/row 2395 float dx = tex.s * .0625f; // 16 images/row
2177 float dy = tex.t * .5f ; // 2 images/column 2396 float dy = tex.t * .5f ; // 2 images/column
2178 2397
2180 { 2399 {
2181 // this time avoiding texture state changes 2400 // this time avoiding texture state changes
2182 // save gobs of state changes. 2401 // save gobs of state changes.
2183 if (key.texname != tex.name) 2402 if (key.texname != tex.name)
2184 { 2403 {
2404 self->tex [skey->tile].unused = 0;
2405
2185 glEnd (); 2406 glEnd ();
2186 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2407 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2187 glBegin (GL_QUADS); 2408 glBegin (GL_QUADS);
2188 } 2409 }
2189 2410
2190 if (border) 2411 if (border)
2191 { 2412 {
2192 float ox = border * dx; 2413 float ox = border * dx;
2193 2414
2194 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2415 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2195 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2416 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2196 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2417 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2197 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2418 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2198 } 2419 }
2199 2420
2200 if (corner) 2421 if (corner)
2201 { 2422 {
2202 float ox = corner * dx; 2423 float ox = corner * dx;
2203 2424
2204 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2425 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2205 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2426 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2206 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2427 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2207 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2428 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2208 } 2429 }
2209 } 2430 }
2210 } 2431 }
2211 } 2432 }
2212 } 2433 }
2235 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2456 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2236 2457
2237 rc_draw (rc); 2458 rc_draw (rc);
2238 } 2459 }
2239 2460
2461 rc_draw (rc_ov);
2462 rc_clear (rc_ov);
2463
2240 glDisable (GL_BLEND); 2464 glDisable (GL_BLEND);
2241 rc_free (rc); 2465 rc_free (rc);
2466 rc_free (rc_ov);
2242 2467
2243 // top layer: overlays such as the health bar 2468 // top layer: overlays such as the health bar
2244 for (y = 0; y < sh; y++) 2469 for (y = 0; y < sh; y++)
2245 if (0 <= y + my && y + my < self->rows) 2470 if (0 <= y + my && y + my < self->rows)
2246 { 2471 {
2249 for (x = 0; x < sw; x++) 2474 for (x = 0; x < sw; x++)
2250 if (row->c0 <= x + mx && x + mx < row->c1) 2475 if (row->c0 <= x + mx && x + mx < row->c1)
2251 { 2476 {
2252 mapcell *cell = row->col + (x + mx - row->c0); 2477 mapcell *cell = row->col + (x + mx - row->c0);
2253 2478
2254 int px = x * T; 2479 int px = x * Tw;
2255 int py = y * T; 2480 int py = y * Th;
2256 2481
2257 if (expect_false (cell->player == player)) 2482 if (expect_false (cell->player == player))
2258 { 2483 {
2259 px += sdx; 2484 px += sdx;
2260 py += sdy; 2485 py += sdy;
2261 } 2486 }
2262 2487
2263 if (cell->stat_hp) 2488 if (cell->stat_hp)
2264 { 2489 {
2265 int width = cell->stat_width * T; 2490 int width = cell->stat_width * Tw;
2266 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2491 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2267 2492
2268 glColor3ub (0, 0, 0); 2493 glColor3ub (0, 0, 0);
2269 glRectf (px + 1, py - thick - 2, 2494 glRectf (px + 1, py - thick - 2,
2270 px + width - 1, py); 2495 px + width - 1, py);
2271 2496
2277 } 2502 }
2278 } 2503 }
2279} 2504}
2280 2505
2281void 2506void
2282draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2507draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2283 CODE: 2508 CODE:
2284{ 2509{
2285 static float color[16][3] = { 2510 static float color[16][3] = {
2286 { 0.00F, 0.00F, 0.00F }, 2511 { 0.00f, 0.00f, 0.00f },
2287 { 1.00F, 1.00F, 1.00F }, 2512 { 1.00f, 1.00f, 1.00f },
2288 { 0.00F, 0.00F, 0.55F }, 2513 { 0.00f, 0.00f, 0.55f },
2289 { 1.00F, 0.00F, 0.00F }, 2514 { 1.00f, 0.00f, 0.00f },
2290 2515
2291 { 1.00F, 0.54F, 0.00F }, 2516 { 1.00f, 0.54f, 0.00f },
2292 { 0.11F, 0.56F, 1.00F }, 2517 { 0.11f, 0.56f, 1.00f },
2293 { 0.93F, 0.46F, 0.00F }, 2518 { 0.93f, 0.46f, 0.00f },
2294 { 0.18F, 0.54F, 0.34F }, 2519 { 0.18f, 0.54f, 0.34f },
2295 2520
2296 { 0.56F, 0.73F, 0.56F }, 2521 { 0.56f, 0.73f, 0.56f },
2297 { 0.80F, 0.80F, 0.80F }, 2522 { 0.80f, 0.80f, 0.80f },
2298 { 0.55F, 0.41F, 0.13F }, 2523 { 0.55f, 0.41f, 0.13f },
2299 { 0.99F, 0.77F, 0.26F }, 2524 { 0.99f, 0.77f, 0.26f },
2300 2525
2301 { 0.74F, 0.65F, 0.41F }, 2526 { 0.74f, 0.65f, 0.41f },
2302 2527
2303 { 0.00F, 1.00F, 1.00F }, 2528 { 0.00f, 1.00f, 1.00f },
2304 { 1.00F, 0.00F, 1.00F }, 2529 { 1.00f, 0.00f, 1.00f },
2305 { 1.00F, 1.00F, 0.00F }, 2530 { 1.00f, 1.00f, 0.00f },
2306 }; 2531 };
2307 2532
2308 int x, y; 2533 int x, y;
2309 2534
2310 glEnable (GL_TEXTURE_2D); 2535 glEnable (GL_TEXTURE_2D);
2536 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2537 * but the nvidia driver (185.18.14) mishandles alpha textures
2538 * and takes the colour from god knows where instead of using
2539 * Cp. MODULATE results in the same colour, but slightly different
2540 * alpha, but atcually gives us the correct colour with nvidia.
2541 */
2311 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2542 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2312 glEnable (GL_BLEND); 2543 glEnable (GL_BLEND);
2313 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2544 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2314 glBegin (GL_QUADS); 2545 glBegin (GL_QUADS);
2315 2546
2316 for (y = 0; y < h; y++) 2547 for (y = 0; y < h; y++)
2320 2551
2321 if (m) 2552 if (m)
2322 { 2553 {
2323 float *c = color [m & 15]; 2554 float *c = color [m & 15];
2324 2555
2325 float tx1 = m & 0x40 ? 0.5 : 0.; 2556 float tx1 = m & 0x40 ? 0.5f : 0.f;
2326 float tx2 = tx1 + 0.5; 2557 float tx2 = tx1 + 0.5f;
2327 2558
2328 glColor4f (c[0], c[1], c[2], 0.75); 2559 glColor4f (c[0], c[1], c[2], 1);
2329 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2560 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2330 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2561 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2331 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2562 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2332 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2563 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2333 } 2564 }
2341void 2572void
2342fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2573fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2343 PPCODE: 2574 PPCODE:
2344{ 2575{
2345 int x, y; 2576 int x, y;
2346 int sw1 = sw + 2; 2577 int sw1 = sw + 2;
2347 int sh1 = sh + 2; 2578 int sh1 = sh + 2;
2348 int sh3 = sh * 3; 2579 int sh3 = sh * 3;
2349 int sw34 = (sw * 3 + 3) & ~3; 2580 int sw3 = sw * 3;
2581 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2582 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2350 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2583 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2351 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2584 memset (darkness1, 0, sw1*sh1);
2352 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2353 2585
2354 SvPOK_only (darkness3_sv); 2586 SvPOK_only (darkness3_sv);
2355 SvCUR_set (darkness3_sv, sw34 * sh3); 2587 SvCUR_set (darkness3_sv, sw3 * sh3);
2356 2588
2357 mx += self->x - 1; 2589 mx += self->x - 1;
2358 my += self->y - 1; 2590 my += self->y - 1;
2359
2360 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2361 2591
2362 for (y = 0; y < sh1; y++) 2592 for (y = 0; y < sh1; y++)
2363 if (0 <= y + my && y + my < self->rows) 2593 if (0 <= y + my && y + my < self->rows)
2364 { 2594 {
2365 maprow *row = self->row + (y + my); 2595 maprow *row = self->row + (y + my);
2368 if (row->c0 <= x + mx && x + mx < row->c1) 2598 if (row->c0 <= x + mx && x + mx < row->c1)
2369 { 2599 {
2370 mapcell *cell = row->col + (x + mx - row->c0); 2600 mapcell *cell = row->col + (x + mx - row->c0);
2371 2601
2372 darkness1 [y * sw1 + x] = cell->darkness 2602 darkness1 [y * sw1 + x] = cell->darkness
2373 ? 255 - (cell->darkness - 1) 2603 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2374 : 255 - FOW_DARKNESS; 2604 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2375 } 2605 }
2376 } 2606 }
2377 2607
2378 for (y = 0; y < sh; ++y) 2608 for (y = 0; y < sh; ++y)
2379 for (x = 0; x < sw; ++x) 2609 for (x = 0; x < sw; ++x)
2398 2628
2399 uint8_t r13 = (d13 + d23 + d12) / 3; 2629 uint8_t r13 = (d13 + d23 + d12) / 3;
2400 uint8_t r23 = d23; 2630 uint8_t r23 = d23;
2401 uint8_t r33 = (d23 + d33 + d32) / 3; 2631 uint8_t r33 = (d23 + d33 + d32) / 3;
2402 2632
2403 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2633 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2404 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2634 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2405 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2635 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2406 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2636 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2407 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2637 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2408 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2638 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2409 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2639 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2410 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2640 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2411 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2641 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2412 } 2642 }
2413 2643
2414 free (darkness1); 2644 free (darkness1);
2415 2645
2416 EXTEND (SP, 3); 2646 EXTEND (SP, 3);
2417 PUSHs (sv_2mortal (newSViv (sw34))); 2647 PUSHs (sv_2mortal (newSViv (sw3)));
2418 PUSHs (sv_2mortal (newSViv (sh3))); 2648 PUSHs (sv_2mortal (newSViv (sh3)));
2419 PUSHs (darkness3_sv); 2649 PUSHs (darkness3_sv);
2420} 2650}
2421 2651
2422SV * 2652SV *
2620 if (RETVAL < 0) 2850 if (RETVAL < 0)
2621 { 2851 {
2622 RETVAL = Mix_GroupOldest (-1); 2852 RETVAL = Mix_GroupOldest (-1);
2623 2853
2624 if (RETVAL < 0) 2854 if (RETVAL < 0)
2855 {
2856 // happens sometimes, maybe it just stopped playing(?)
2857 RETVAL = Mix_GroupAvailable (-1);
2858
2859 if (RETVAL < 0)
2625 XSRETURN_UNDEF; 2860 XSRETURN_UNDEF;
2626 2861 }
2862 else
2627 Mix_HaltChannel (RETVAL); 2863 Mix_HaltChannel (RETVAL);
2628 } 2864 }
2629 2865
2630 Mix_UnregisterAllEffects (RETVAL); 2866 Mix_UnregisterAllEffects (RETVAL);
2631 Mix_Volume (RETVAL, 128); 2867 Mix_Volume (RETVAL, 128);
2632} 2868}
2679void 2915void
2680set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2916set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2681 CODE: 2917 CODE:
2682{ 2918{
2683 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2919 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2684 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2920 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2685 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2921 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2686} 2922}
2687 2923
2688void 2924void
2689set_reverse_stereo (DC::Channel self, int flip) 2925set_reverse_stereo (DC::Channel self, int flip)
2691 Mix_SetReverseStereo (self, flip); 2927 Mix_SetReverseStereo (self, flip);
2692 2928
2693MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2929MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2694 2930
2695PROTOTYPES: DISABLE 2931PROTOTYPES: DISABLE
2932
2933void
2934decoders ()
2935 PPCODE:
2936#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2937 int i, num = Mix_GetNumChunkDecoders ();
2938 EXTEND (SP, num);
2939 for (i = 0; i < num; ++i)
2940 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2941#else
2942 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2943#endif
2696 2944
2697DC::MixChunk 2945DC::MixChunk
2698new (SV *class, DC::RW rwops) 2946new (SV *class, DC::RW rwops)
2699 CODE: 2947 CODE:
2700 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2948 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2733 OUTPUT: 2981 OUTPUT:
2734 RETVAL 2982 RETVAL
2735 2983
2736MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2984MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2737 2985
2986void
2987decoders ()
2988 PPCODE:
2989#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2990 int i, num = Mix_GetNumMusicDecoders ();
2991 EXTEND (SP, num);
2992 for (i = 0; i < num; ++i)
2993 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2994#else
2995 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2996#endif
2997
2738int 2998int
2739volume (int volume = -1) 2999volume (int volume = -1)
2740 PROTOTYPE: ;$ 3000 PROTOTYPE: ;$
2741 CODE: 3001 CODE:
2742 if (items > 0) 3002 if (items > 0)
2752 3012
2753void 3013void
2754halt () 3014halt ()
2755 CODE: 3015 CODE:
2756 Mix_HaltMusic (); 3016 Mix_HaltMusic ();
3017
3018int
3019playing ()
3020 CODE:
3021 RETVAL = Mix_PlayingMusic ();
3022 OUTPUT:
3023 RETVAL
2757 3024
2758DC::MixMusic 3025DC::MixMusic
2759new (SV *class, DC::RW rwops) 3026new (SV *class, DC::RW rwops)
2760 CODE: 3027 CODE:
2761 RETVAL = Mix_LoadMUS_RW (rwops); 3028 RETVAL = Mix_LoadMUS_RW (rwops);
2792 } *civ, const_iv[] = { 3059 } *civ, const_iv[] = {
2793# define const_iv(name) { # name, (IV)name } 3060# define const_iv(name) { # name, (IV)name }
2794 const_iv (GL_VENDOR), 3061 const_iv (GL_VENDOR),
2795 const_iv (GL_VERSION), 3062 const_iv (GL_VERSION),
2796 const_iv (GL_EXTENSIONS), 3063 const_iv (GL_EXTENSIONS),
3064 const_iv (GL_MAX_TEXTURE_UNITS),
2797 const_iv (GL_COLOR_MATERIAL), 3065 const_iv (GL_COLOR_MATERIAL),
2798 const_iv (GL_SMOOTH), 3066 const_iv (GL_SMOOTH),
2799 const_iv (GL_FLAT), 3067 const_iv (GL_FLAT),
2800 const_iv (GL_DITHER), 3068 const_iv (GL_DITHER),
2801 const_iv (GL_BLEND), 3069 const_iv (GL_BLEND),
2813 const_iv (GL_ZERO), 3081 const_iv (GL_ZERO),
2814 const_iv (GL_SRC_ALPHA), 3082 const_iv (GL_SRC_ALPHA),
2815 const_iv (GL_DST_ALPHA), 3083 const_iv (GL_DST_ALPHA),
2816 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3084 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2817 const_iv (GL_ONE_MINUS_DST_ALPHA), 3085 const_iv (GL_ONE_MINUS_DST_ALPHA),
3086 const_iv (GL_SRC_COLOR),
3087 const_iv (GL_DST_COLOR),
3088 const_iv (GL_ONE_MINUS_SRC_COLOR),
3089 const_iv (GL_ONE_MINUS_DST_COLOR),
2818 const_iv (GL_SRC_ALPHA_SATURATE), 3090 const_iv (GL_SRC_ALPHA_SATURATE),
2819 const_iv (GL_RGB), 3091 const_iv (GL_RGB),
2820 const_iv (GL_RGBA), 3092 const_iv (GL_RGBA),
2821 const_iv (GL_RGBA4), 3093 const_iv (GL_RGBA4),
2822 const_iv (GL_RGBA8), 3094 const_iv (GL_RGBA8),
2890 const_iv (GL_NICEST), 3162 const_iv (GL_NICEST),
2891 const_iv (GL_V2F), 3163 const_iv (GL_V2F),
2892 const_iv (GL_V3F), 3164 const_iv (GL_V3F),
2893 const_iv (GL_T2F_V3F), 3165 const_iv (GL_T2F_V3F),
2894 const_iv (GL_T2F_N3F_V3F), 3166 const_iv (GL_T2F_N3F_V3F),
3167 const_iv (GL_FUNC_ADD),
3168 const_iv (GL_FUNC_SUBTRACT),
3169 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2895# undef const_iv 3170# undef const_iv
2896 }; 3171 };
2897 3172
2898 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3173 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2899 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3174 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2900 3175
2901 texture_av = newAV (); 3176 texture_av = newAV ();
2902 AvREAL_off (texture_av); 3177 AvREAL_off (texture_av);
2903} 3178}
2904 3179
2905void 3180void
2906disable_GL_EXT_blend_func_separate () 3181disable_GL_EXT_blend_func_separate ()
2907 CODE: 3182 CODE:
2908 gl.BlendFuncSeparate = 0; 3183 gl.BlendFuncSeparate = 0;
2909 gl.BlendFuncSeparateEXT = 0; 3184 gl.BlendFuncSeparateEXT = 0;
3185
3186void
3187apple_nvidia_bug (int enable)
2910 3188
2911char * 3189char *
2912gl_vendor () 3190gl_vendor ()
2913 CODE: 3191 CODE:
2914 RETVAL = (char *)glGetString (GL_VENDOR); 3192 RETVAL = (char *)glGetString (GL_VENDOR);
2945 3223
2946int glGetError () 3224int glGetError ()
2947 3225
2948void glFinish () 3226void glFinish ()
2949 3227
3228void glFlush ()
3229
2950void glClear (int mask) 3230void glClear (int mask)
2951 3231
2952void glClearColor (float r, float g, float b, float a = 1.0) 3232void glClearColor (float r, float g, float b, float a = 1.0)
2953 PROTOTYPE: @ 3233 PROTOTYPE: @
2954 3234
2963void glBlendFunc (int sfactor, int dfactor) 3243void glBlendFunc (int sfactor, int dfactor)
2964 3244
2965void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3245void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2966 CODE: 3246 CODE:
2967 gl_BlendFuncSeparate (sa, da, saa, daa); 3247 gl_BlendFuncSeparate (sa, da, saa, daa);
3248
3249# void glBlendEquation (int se)
2968 3250
2969void glDepthMask (int flag) 3251void glDepthMask (int flag)
2970 3252
2971void glLogicOp (int opcode) 3253void glLogicOp (int opcode)
2972 3254
3122void glNewList (int list, int mode = GL_COMPILE) 3404void glNewList (int list, int mode = GL_COMPILE)
3123 3405
3124void glEndList () 3406void glEndList ()
3125 3407
3126void glCallList (int list) 3408void glCallList (int list)
3409
3410void c_init ()
3411 CODE:
3412 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3413 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3127 3414
3128MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3415MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3129 3416
3130PROTOTYPES: DISABLE 3417PROTOTYPES: DISABLE
3131 3418

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines