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.277 by root, Mon Sep 1 06:18:09 2008 UTC vs.
Revision 1.312 by root, Thu Dec 29 07:13:44 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
1152# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1153void
1154Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1086 1155
1087void 1156void
1088load_image_inline (SV *image_) 1157load_image_inline (SV *image_)
1089 ALIAS: 1158 ALIAS:
1090 load_image_file = 1 1159 load_image_file = 1
1206#if DEBUG 1275#if DEBUG
1207 VALGRIND_DO_LEAK_CHECK; 1276 VALGRIND_DO_LEAK_CHECK;
1208#endif 1277#endif
1209} 1278}
1210 1279
1280int
1281SvREFCNT (SV *sv)
1282 CODE:
1283 RETVAL = SvREFCNT (sv);
1284 OUTPUT:
1285 RETVAL
1286
1211MODULE = Deliantra::Client PACKAGE = DC::Font 1287MODULE = Deliantra::Client PACKAGE = DC::Font
1212 1288
1213PROTOTYPES: DISABLE 1289PROTOTYPES: DISABLE
1214 1290
1215DC::Font 1291DC::Font
1644 if (ix) 1720 if (ix)
1645 { 1721 {
1646 glDisable (GL_ALPHA_TEST); 1722 glDisable (GL_ALPHA_TEST);
1647 glDisable (GL_BLEND); 1723 glDisable (GL_BLEND);
1648 } 1724 }
1725}
1726
1727void
1728draw_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)
1729 PROTOTYPE: @
1730 CODE:
1731{
1732 glEnable (GL_BLEND);
1733 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1734 glEnable (GL_TEXTURE_2D);
1735 glBindTexture (GL_TEXTURE_2D, name1);
1736
1737 glColor3f (intensity, intensity, intensity);
1738 glPushMatrix ();
1739 glScalef (1./3, 1./3, 1.);
1740
1741 if (blend > 0.f)
1742 {
1743 float dx3 = dx * -3.f / w;
1744 float dy3 = dy * -3.f / h;
1745 GLfloat env_color[4] = { 0., 0., 0., blend };
1746
1747 /* interpolate the two shadow textures */
1748 /* stage 0 == rgb(glcolor) + alpha(t0) */
1749 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1750
1751 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1752 gl.ActiveTexture (GL_TEXTURE1);
1753 glEnable (GL_TEXTURE_2D);
1754 glBindTexture (GL_TEXTURE_2D, name2);
1755 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1756
1757 /* rgb == rgb(glcolor) */
1758 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1759 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1760 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1761
1762 /* alpha = interpolate t0, t1 by env_alpha */
1763 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1764
1765 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1766 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1767 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1768
1769 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1770 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1771
1772 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1773 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1774
1775 glBegin (GL_QUADS);
1776 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1777 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1778 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1779 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1780 glEnd ();
1781
1782 glDisable (GL_TEXTURE_2D);
1783 gl.ActiveTexture (GL_TEXTURE0);
1784 }
1785 else
1786 {
1787 /* simple blending of one texture, also opengl <1.3 path */
1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1789
1790 glBegin (GL_QUADS);
1791 glTexCoord2f (0, 0); glVertex2f (0, 0);
1792 glTexCoord2f (0, t); glVertex2f (0, h);
1793 glTexCoord2f (s, t); glVertex2f (w, h);
1794 glTexCoord2f (s, 0); glVertex2f (w, 0);
1795 glEnd ();
1796 }
1797
1798 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1799 {
1800 int x, y;
1801 int dx3 = dx * 3;
1802 int dy3 = dy * 3;
1803
1804 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1805 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1806 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1807 glTranslatef (-1., -1., 0);
1808 glBegin (GL_QUADS);
1809
1810 for (y = 1; y < h; y += 3)
1811 {
1812 int y1 = y - dy3;
1813 int y1valid = y1 >= 0 && y1 < h;
1814
1815 for (x = 1; x < w; x += 3)
1816 {
1817 int x1 = x - dx3;
1818 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1819 uint8_t h2;
1820
1821 if (y1valid && x1 >= 0 && x1 < w)
1822 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1823 else
1824 h2 = 1; /* out of range == invisible */
1825
1826 if (h1 || h2)
1827 {
1828 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1829 glColor4f (1., 1., 1., alpha);
1830
1831 glTexCoord2f (0, 0.); glVertex2i (x , y );
1832 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1833 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1834 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1835 }
1836 }
1837 }
1838 }
1839
1840 glEnd ();
1841
1842 glPopMatrix ();
1843
1844 glDisable (GL_TEXTURE_2D);
1845 glDisable (GL_BLEND);
1649} 1846}
1650 1847
1651IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1848IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1652 CODE: 1849 CODE:
1653{ 1850{
1759 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1956 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1760 // use uglier nearest interpolation because linear suffers 1957 // use uglier nearest interpolation because linear suffers
1761 // from transparent color bleeding and ugly wrapping effects. 1958 // from transparent color bleeding and ugly wrapping effects.
1762 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1959 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1763} 1960}
1961
1962void
1963expire_textures (DC::Map self, int texid, int count)
1964 PPCODE:
1965 for (; texid < self->texs && count; ++texid, --count)
1966 {
1967 maptex *tex = self->tex + texid;
1968
1969 if (tex->name)
1970 {
1971 if (tex->unused)
1972 {
1973 tex->name = 0;
1974 tex->unused = 0;
1975 XPUSHs (sv_2mortal (newSViv (texid)));
1976 }
1977 else
1978 tex->unused = 1;
1979 }
1980 }
1764 1981
1765int 1982int
1766ox (DC::Map self) 1983ox (DC::Map self)
1767 ALIAS: 1984 ALIAS:
1768 oy = 1 1985 oy = 1
1849 { 2066 {
1850 ext = *data++; 2067 ext = *data++;
1851 cmd = ext & 0x7f; 2068 cmd = ext & 0x7f;
1852 2069
1853 if (cmd < 4) 2070 if (cmd < 4)
1854 cell->darkness = 255 - ext * 64 + 1; 2071 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1855 else if (cmd == 5) // health 2072 else if (cmd == 5) // health
1856 { 2073 {
1857 cell->stat_width = 1; 2074 cell->stat_width = 1;
1858 cell->stat_hp = *data++; 2075 cell->stat_hp = *data++;
1859 } 2076 }
1889 cell->tile [z] = self->face2tile [face]; 2106 cell->tile [z] = self->face2tile [face];
1890 2107
1891 if (cell->tile [z]) 2108 if (cell->tile [z])
1892 { 2109 {
1893 maptex *tex = self->tex + cell->tile [z]; 2110 maptex *tex = self->tex + cell->tile [z];
2111 tex->unused = 0;
1894 if (!tex->name) 2112 if (!tex->name)
1895 av_push (missing, newSViv (cell->tile [z])); 2113 av_push (missing, newSViv (cell->tile [z]));
1896 2114
1897 if (tex->smoothtile) 2115 if (tex->smoothtile)
1898 { 2116 {
1899 maptex *smooth = self->tex + tex->smoothtile; 2117 maptex *smooth = self->tex + tex->smoothtile;
2118 smooth->unused = 0;
1900 if (!smooth->name) 2119 if (!smooth->name)
1901 av_push (missing, newSViv (tex->smoothtile)); 2120 av_push (missing, newSViv (tex->smoothtile));
1902 } 2121 }
1903 } 2122 }
1904 } 2123 }
1932 ? self->row + y 2151 ? self->row + y
1933 : 0; 2152 : 0;
1934 2153
1935 for (x = x0; x < x1; x++) 2154 for (x = x0; x < x1; x++)
1936 { 2155 {
1937 int r = 32, g = 32, b = 32, a = 192; 2156 unsigned int r = 32, g = 32, b = 32, a = 192;
1938 2157
1939 if (row && row->c0 <= x && x < row->c1) 2158 if (row && row->c0 <= x && x < row->c1)
1940 { 2159 {
1941 mapcell *cell = row->col + (x - row->c0); 2160 mapcell *cell = row->col + (x - row->c0);
1942 2161
1944 { 2163 {
1945 maptex tex = self->tex [cell->tile [z]]; 2164 maptex tex = self->tex [cell->tile [z]];
1946 int a0 = 255 - tex.a; 2165 int a0 = 255 - tex.a;
1947 int a1 = tex.a; 2166 int a1 = tex.a;
1948 2167
1949 r = (r * a0 + tex.r * a1) / 255; 2168 r = div255 (r * a0 + tex.r * a1);
1950 g = (g * a0 + tex.g * a1) / 255; 2169 g = div255 (g * a0 + tex.g * a1);
1951 b = (b * a0 + tex.b * a1) / 255; 2170 b = div255 (b * a0 + tex.b * a1);
1952 a = (a * a0 + tex.a * a1) / 255; 2171 a = div255 (a * a0 + tex.a * a1);
1953 } 2172 }
1954 } 2173 }
1955 2174
1956 *map++ = (r ) 2175 *map++ = (r )
1957 | (g << 8) 2176 | (g << 8)
1964} 2183}
1965 OUTPUT: 2184 OUTPUT:
1966 RETVAL 2185 RETVAL
1967 2186
1968void 2187void
1969draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2188draw (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: 2189 CODE:
1971{ 2190{
1972 int x, y, z; 2191 int x, y, z;
1973 2192
1974 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2193 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1975 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2194 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) 2195 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1977 smooth_key skey; 2196 smooth_key skey;
1978 int pl_x, pl_y; 2197 int pl_x, pl_y;
1979 maptex pl_tex; 2198 maptex pl_tex;
1980 rc_t *rc = rc_alloc (); 2199 rc_t *rc = rc_alloc ();
2200 rc_t *rc_ov = rc_alloc ();
1981 rc_key_t key; 2201 rc_key_t key;
1982 rc_array_t *arr; 2202 rc_array_t *arr;
1983 2203
1984 pl_tex.name = 0; 2204 pl_tex.name = 0;
1985 2205
1986 // thats current max. sorry. 2206 // that's current max. sorry.
1987 if (sw > 255) sw = 255; 2207 if (sw > 255) sw = 255;
1988 if (sh > 255) sh = 255; 2208 if (sh > 255) sh = 255;
1989 2209
1990 // clear key, in case of extra padding 2210 // clear key, in case of extra padding
1991 memset (&skey, 0, sizeof (skey)); 2211 memset (&skey, 0, sizeof (skey));
1995 key.g = 255; 2215 key.g = 255;
1996 key.b = 255; 2216 key.b = 255;
1997 key.a = 255; 2217 key.a = 255;
1998 key.mode = GL_QUADS; 2218 key.mode = GL_QUADS;
1999 key.format = GL_T2F_V3F; 2219 key.format = GL_T2F_V3F;
2000 key.texname = -1;
2001 2220
2002 mx += self->x; 2221 mx += self->x;
2003 my += self->y; 2222 my += self->y;
2004 2223
2005 // first pass: determine smooth_max 2224 // first pass: determine smooth_max
2029 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2248 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2030 2249
2031 for (z = 0; z <= 2; z++) 2250 for (z = 0; z <= 2; z++)
2032 { 2251 {
2033 memset (smooth_level, 0, sizeof (smooth_level)); 2252 memset (smooth_level, 0, sizeof (smooth_level));
2253 key.texname = -1;
2034 2254
2035 for (y = 0; y < sh; y++) 2255 for (y = 0; y < sh; y++)
2036 if (0 <= y + my && y + my < self->rows) 2256 if (0 <= y + my && y + my < self->rows)
2037 { 2257 {
2038 maprow *row = self->row + (y + my); 2258 maprow *row = self->row + (y + my);
2044 tileid tile = cell->tile [z]; 2264 tileid tile = cell->tile [z];
2045 2265
2046 if (tile) 2266 if (tile)
2047 { 2267 {
2048 maptex tex = self->tex [tile]; 2268 maptex tex = self->tex [tile];
2049 int px = (x + 1) * T - tex.w; 2269 int px, py;
2050 int py = (y + 1) * T - tex.h;
2051 2270
2052 if (key.texname != tex.name) 2271 if (key.texname != tex.name)
2053 { 2272 {
2273 self->tex [tile].unused = 0;
2274
2054 if (!tex.name) 2275 if (!tex.name)
2055 tex = self->tex [2]; /* missing, replace by noface */ 2276 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2056 2277
2057 key.texname = tex.name; 2278 key.texname = tex.name;
2058 arr = rc_array (rc, &key); 2279 arr = rc_array (rc, &key);
2059 } 2280 }
2281
2282 px = (x + 1) * Th - tex.w;
2283 py = (y + 1) * Tw - tex.h;
2060 2284
2061 if (expect_false (cell->player == player) && expect_false (z == 2)) 2285 if (expect_false (cell->player == player) && expect_false (z == 2))
2062 { 2286 {
2063 pl_x = px; 2287 pl_x = px;
2064 pl_y = py; 2288 pl_y = py;
2069 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2293 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2070 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2294 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); 2295 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); 2296 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2073 2297
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 2298 // update smooth hash
2100 if (tex.smoothtile) 2299 if (tex.smoothtile)
2101 { 2300 {
2102 skey.tile = tex.smoothtile; 2301 skey.tile = tex.smoothtile;
2103 skey.level = tex.smoothlevel; 2302 skey.level = tex.smoothlevel;
2131 // corners 2330 // corners
2132 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2331 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); 2332 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); 2333 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); 2334 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2335 }
2336 }
2337
2338 if (expect_false (z == 2) && expect_false (cell->flags))
2339 {
2340 // overlays such as the speech bubble, probably more to come
2341 if (cell->flags & 1)
2342 {
2343 rc_key_t key_ov = key;
2344 maptex tex = self->tex [TEXID_SPEECH];
2345 rc_array_t *arr;
2346 int px = x * Tw + Tw * 2 / 32;
2347 int py = y * Th - Th * 6 / 32;
2348
2349 key_ov.texname = tex.name;
2350 arr = rc_array (rc_ov, &key_ov);
2351
2352 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2353 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2354 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2355 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2136 } 2356 }
2137 } 2357 }
2138 } 2358 }
2139 } 2359 }
2140 2360
2167 if (!(bits & 0x1000) 2387 if (!(bits & 0x1000)
2168 && skey->level == level 2388 && skey->level == level
2169 && level > smooth_max [skey->x][skey->y]) 2389 && level > smooth_max [skey->x][skey->y])
2170 { 2390 {
2171 maptex tex = self->tex [skey->tile]; 2391 maptex tex = self->tex [skey->tile];
2172 int px = (((int)skey->x) - 1) * T; 2392 int px = (((int)skey->x) - 1) * Tw;
2173 int py = (((int)skey->y) - 1) * T; 2393 int py = (((int)skey->y) - 1) * Th;
2174 int border = bits & 15; 2394 int border = bits & 15;
2175 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2395 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2176 float dx = tex.s * .0625f; // 16 images/row 2396 float dx = tex.s * .0625f; // 16 images/row
2177 float dy = tex.t * .5f ; // 2 images/column 2397 float dy = tex.t * .5f ; // 2 images/column
2178 2398
2180 { 2400 {
2181 // this time avoiding texture state changes 2401 // this time avoiding texture state changes
2182 // save gobs of state changes. 2402 // save gobs of state changes.
2183 if (key.texname != tex.name) 2403 if (key.texname != tex.name)
2184 { 2404 {
2405 self->tex [skey->tile].unused = 0;
2406
2185 glEnd (); 2407 glEnd ();
2186 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2408 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2187 glBegin (GL_QUADS); 2409 glBegin (GL_QUADS);
2188 } 2410 }
2189 2411
2190 if (border) 2412 if (border)
2191 { 2413 {
2192 float ox = border * dx; 2414 float ox = border * dx;
2193 2415
2194 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2416 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2195 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2417 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2196 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2418 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2197 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2419 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2198 } 2420 }
2199 2421
2200 if (corner) 2422 if (corner)
2201 { 2423 {
2202 float ox = corner * dx; 2424 float ox = corner * dx;
2203 2425
2204 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2426 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2205 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2427 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2206 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2428 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2207 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2429 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2208 } 2430 }
2209 } 2431 }
2210 } 2432 }
2211 } 2433 }
2212 } 2434 }
2235 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2457 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2236 2458
2237 rc_draw (rc); 2459 rc_draw (rc);
2238 } 2460 }
2239 2461
2462 rc_draw (rc_ov);
2463 rc_clear (rc_ov);
2464
2240 glDisable (GL_BLEND); 2465 glDisable (GL_BLEND);
2241 rc_free (rc); 2466 rc_free (rc);
2467 rc_free (rc_ov);
2242 2468
2243 // top layer: overlays such as the health bar 2469 // top layer: overlays such as the health bar
2244 for (y = 0; y < sh; y++) 2470 for (y = 0; y < sh; y++)
2245 if (0 <= y + my && y + my < self->rows) 2471 if (0 <= y + my && y + my < self->rows)
2246 { 2472 {
2249 for (x = 0; x < sw; x++) 2475 for (x = 0; x < sw; x++)
2250 if (row->c0 <= x + mx && x + mx < row->c1) 2476 if (row->c0 <= x + mx && x + mx < row->c1)
2251 { 2477 {
2252 mapcell *cell = row->col + (x + mx - row->c0); 2478 mapcell *cell = row->col + (x + mx - row->c0);
2253 2479
2254 int px = x * T; 2480 int px = x * Tw;
2255 int py = y * T; 2481 int py = y * Th;
2482
2483 if (expect_false (cell->player == player))
2484 {
2485 px += sdx;
2486 py += sdy;
2487 }
2256 2488
2257 if (cell->stat_hp) 2489 if (cell->stat_hp)
2258 { 2490 {
2259 int width = cell->stat_width * T; 2491 int width = cell->stat_width * Tw;
2260 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2492 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2261 2493
2262 glColor3ub (0, 0, 0); 2494 glColor3ub (0, 0, 0);
2263 glRectf (px + 1, py - thick - 2, 2495 glRectf (px + 1, py - thick - 2,
2264 px + width - 1, py); 2496 px + width - 1, py);
2265 2497
2271 } 2503 }
2272 } 2504 }
2273} 2505}
2274 2506
2275void 2507void
2276draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2508draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2277 CODE: 2509 CODE:
2278{ 2510{
2279 static float color[16][3] = { 2511 static float color[16][3] = {
2280 { 0.00F, 0.00F, 0.00F }, 2512 { 0.00f, 0.00f, 0.00f },
2281 { 1.00F, 1.00F, 1.00F }, 2513 { 1.00f, 1.00f, 1.00f },
2282 { 0.00F, 0.00F, 0.55F }, 2514 { 0.00f, 0.00f, 0.55f },
2283 { 1.00F, 0.00F, 0.00F }, 2515 { 1.00f, 0.00f, 0.00f },
2284 2516
2285 { 1.00F, 0.54F, 0.00F }, 2517 { 1.00f, 0.54f, 0.00f },
2286 { 0.11F, 0.56F, 1.00F }, 2518 { 0.11f, 0.56f, 1.00f },
2287 { 0.93F, 0.46F, 0.00F }, 2519 { 0.93f, 0.46f, 0.00f },
2288 { 0.18F, 0.54F, 0.34F }, 2520 { 0.18f, 0.54f, 0.34f },
2289 2521
2290 { 0.56F, 0.73F, 0.56F }, 2522 { 0.56f, 0.73f, 0.56f },
2291 { 0.80F, 0.80F, 0.80F }, 2523 { 0.80f, 0.80f, 0.80f },
2292 { 0.55F, 0.41F, 0.13F }, 2524 { 0.55f, 0.41f, 0.13f },
2293 { 0.99F, 0.77F, 0.26F }, 2525 { 0.99f, 0.77f, 0.26f },
2294 2526
2295 { 0.74F, 0.65F, 0.41F }, 2527 { 0.74f, 0.65f, 0.41f },
2296 2528
2297 { 0.00F, 1.00F, 1.00F }, 2529 { 0.00f, 1.00f, 1.00f },
2298 { 1.00F, 0.00F, 1.00F }, 2530 { 1.00f, 0.00f, 1.00f },
2299 { 1.00F, 1.00F, 0.00F }, 2531 { 1.00f, 1.00f, 0.00f },
2300 }; 2532 };
2301 2533
2302 int x, y; 2534 int x, y;
2303 2535
2304 glEnable (GL_TEXTURE_2D); 2536 glEnable (GL_TEXTURE_2D);
2537 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2538 * but the nvidia driver (185.18.14) mishandles alpha textures
2539 * and takes the colour from god knows where instead of using
2540 * Cp. MODULATE results in the same colour, but slightly different
2541 * alpha, but atcually gives us the correct colour with nvidia.
2542 */
2305 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2543 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2306 glEnable (GL_BLEND); 2544 glEnable (GL_BLEND);
2307 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2545 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2308 glBegin (GL_QUADS); 2546 glBegin (GL_QUADS);
2309 2547
2310 for (y = 0; y < h; y++) 2548 for (y = 0; y < h; y++)
2314 2552
2315 if (m) 2553 if (m)
2316 { 2554 {
2317 float *c = color [m & 15]; 2555 float *c = color [m & 15];
2318 2556
2319 float tx1 = m & 0x40 ? 0.5 : 0.; 2557 float tx1 = m & 0x40 ? 0.5f : 0.f;
2320 float tx2 = tx1 + 0.5; 2558 float tx2 = tx1 + 0.5f;
2321 2559
2322 glColor4f (c[0], c[1], c[2], 0.75); 2560 glColor4f (c[0], c[1], c[2], 1);
2323 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2561 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2324 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2562 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2325 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2563 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2326 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2564 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2327 } 2565 }
2335void 2573void
2336fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2574fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2337 PPCODE: 2575 PPCODE:
2338{ 2576{
2339 int x, y; 2577 int x, y;
2340 int sw1 = sw + 2; 2578 int sw1 = sw + 2;
2341 int sh1 = sh + 2; 2579 int sh1 = sh + 2;
2342 int sh3 = sh * 3; 2580 int sh3 = sh * 3;
2343 int sw34 = (sw * 3 + 3) & ~3; 2581 int sw3 = sw * 3;
2582 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2583 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2344 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2584 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2345 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2585 memset (darkness1, 0, sw1*sh1);
2346 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2347 2586
2348 SvPOK_only (darkness3_sv); 2587 SvPOK_only (darkness3_sv);
2349 SvCUR_set (darkness3_sv, sw34 * sh3); 2588 SvCUR_set (darkness3_sv, sw3 * sh3);
2350 2589
2351 mx += self->x - 1; 2590 mx += self->x - 1;
2352 my += self->y - 1; 2591 my += self->y - 1;
2353
2354 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2355 2592
2356 for (y = 0; y < sh1; y++) 2593 for (y = 0; y < sh1; y++)
2357 if (0 <= y + my && y + my < self->rows) 2594 if (0 <= y + my && y + my < self->rows)
2358 { 2595 {
2359 maprow *row = self->row + (y + my); 2596 maprow *row = self->row + (y + my);
2362 if (row->c0 <= x + mx && x + mx < row->c1) 2599 if (row->c0 <= x + mx && x + mx < row->c1)
2363 { 2600 {
2364 mapcell *cell = row->col + (x + mx - row->c0); 2601 mapcell *cell = row->col + (x + mx - row->c0);
2365 2602
2366 darkness1 [y * sw1 + x] = cell->darkness 2603 darkness1 [y * sw1 + x] = cell->darkness
2367 ? 255 - (cell->darkness - 1) 2604 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2368 : 255 - FOW_DARKNESS; 2605 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2369 } 2606 }
2370 } 2607 }
2371 2608
2372 for (y = 0; y < sh; ++y) 2609 for (y = 0; y < sh; ++y)
2373 for (x = 0; x < sw; ++x) 2610 for (x = 0; x < sw; ++x)
2392 2629
2393 uint8_t r13 = (d13 + d23 + d12) / 3; 2630 uint8_t r13 = (d13 + d23 + d12) / 3;
2394 uint8_t r23 = d23; 2631 uint8_t r23 = d23;
2395 uint8_t r33 = (d23 + d33 + d32) / 3; 2632 uint8_t r33 = (d23 + d33 + d32) / 3;
2396 2633
2397 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2634 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2398 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2635 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2399 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2636 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2400 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2637 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2401 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2638 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2402 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2639 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2403 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2640 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2404 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2641 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2405 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2642 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2406 } 2643 }
2407 2644
2408 free (darkness1); 2645 free (darkness1);
2409 2646
2410 EXTEND (SP, 3); 2647 EXTEND (SP, 3);
2411 PUSHs (sv_2mortal (newSViv (sw34))); 2648 PUSHs (sv_2mortal (newSViv (sw3)));
2412 PUSHs (sv_2mortal (newSViv (sh3))); 2649 PUSHs (sv_2mortal (newSViv (sh3)));
2413 PUSHs (darkness3_sv); 2650 PUSHs (darkness3_sv);
2414} 2651}
2415 2652
2416SV * 2653SV *
2614 if (RETVAL < 0) 2851 if (RETVAL < 0)
2615 { 2852 {
2616 RETVAL = Mix_GroupOldest (-1); 2853 RETVAL = Mix_GroupOldest (-1);
2617 2854
2618 if (RETVAL < 0) 2855 if (RETVAL < 0)
2856 {
2857 // happens sometimes, maybe it just stopped playing(?)
2858 RETVAL = Mix_GroupAvailable (-1);
2859
2860 if (RETVAL < 0)
2619 XSRETURN_UNDEF; 2861 XSRETURN_UNDEF;
2620 2862 }
2863 else
2621 Mix_HaltChannel (RETVAL); 2864 Mix_HaltChannel (RETVAL);
2622 } 2865 }
2623 2866
2624 Mix_UnregisterAllEffects (RETVAL); 2867 Mix_UnregisterAllEffects (RETVAL);
2625 Mix_Volume (RETVAL, 128); 2868 Mix_Volume (RETVAL, 128);
2626} 2869}
2673void 2916void
2674set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2917set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2675 CODE: 2918 CODE:
2676{ 2919{
2677 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2920 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2678 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2921 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2679 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2922 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2680} 2923}
2681 2924
2682void 2925void
2683set_reverse_stereo (DC::Channel self, int flip) 2926set_reverse_stereo (DC::Channel self, int flip)
2685 Mix_SetReverseStereo (self, flip); 2928 Mix_SetReverseStereo (self, flip);
2686 2929
2687MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2930MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2688 2931
2689PROTOTYPES: DISABLE 2932PROTOTYPES: DISABLE
2933
2934void
2935decoders ()
2936 PPCODE:
2937#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2938 int i, num = Mix_GetNumChunkDecoders ();
2939 EXTEND (SP, num);
2940 for (i = 0; i < num; ++i)
2941 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2942#else
2943 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2944#endif
2690 2945
2691DC::MixChunk 2946DC::MixChunk
2692new (SV *class, DC::RW rwops) 2947new (SV *class, DC::RW rwops)
2693 CODE: 2948 CODE:
2694 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2949 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2727 OUTPUT: 2982 OUTPUT:
2728 RETVAL 2983 RETVAL
2729 2984
2730MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2985MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2731 2986
2987void
2988decoders ()
2989 PPCODE:
2990#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2991 int i, num = Mix_GetNumMusicDecoders ();
2992 EXTEND (SP, num);
2993 for (i = 0; i < num; ++i)
2994 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2995#else
2996 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2997#endif
2998
2732int 2999int
2733volume (int volume = -1) 3000volume (int volume = -1)
2734 PROTOTYPE: ;$ 3001 PROTOTYPE: ;$
2735 CODE: 3002 CODE:
2736 if (items > 0) 3003 if (items > 0)
2746 3013
2747void 3014void
2748halt () 3015halt ()
2749 CODE: 3016 CODE:
2750 Mix_HaltMusic (); 3017 Mix_HaltMusic ();
3018
3019int
3020playing ()
3021 CODE:
3022 RETVAL = Mix_PlayingMusic ();
3023 OUTPUT:
3024 RETVAL
2751 3025
2752DC::MixMusic 3026DC::MixMusic
2753new (SV *class, DC::RW rwops) 3027new (SV *class, DC::RW rwops)
2754 CODE: 3028 CODE:
2755 RETVAL = Mix_LoadMUS_RW (rwops); 3029 RETVAL = Mix_LoadMUS_RW (rwops);
2786 } *civ, const_iv[] = { 3060 } *civ, const_iv[] = {
2787# define const_iv(name) { # name, (IV)name } 3061# define const_iv(name) { # name, (IV)name }
2788 const_iv (GL_VENDOR), 3062 const_iv (GL_VENDOR),
2789 const_iv (GL_VERSION), 3063 const_iv (GL_VERSION),
2790 const_iv (GL_EXTENSIONS), 3064 const_iv (GL_EXTENSIONS),
3065 const_iv (GL_MAX_TEXTURE_UNITS),
2791 const_iv (GL_COLOR_MATERIAL), 3066 const_iv (GL_COLOR_MATERIAL),
2792 const_iv (GL_SMOOTH), 3067 const_iv (GL_SMOOTH),
2793 const_iv (GL_FLAT), 3068 const_iv (GL_FLAT),
2794 const_iv (GL_DITHER), 3069 const_iv (GL_DITHER),
2795 const_iv (GL_BLEND), 3070 const_iv (GL_BLEND),
2807 const_iv (GL_ZERO), 3082 const_iv (GL_ZERO),
2808 const_iv (GL_SRC_ALPHA), 3083 const_iv (GL_SRC_ALPHA),
2809 const_iv (GL_DST_ALPHA), 3084 const_iv (GL_DST_ALPHA),
2810 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3085 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2811 const_iv (GL_ONE_MINUS_DST_ALPHA), 3086 const_iv (GL_ONE_MINUS_DST_ALPHA),
3087 const_iv (GL_SRC_COLOR),
3088 const_iv (GL_DST_COLOR),
3089 const_iv (GL_ONE_MINUS_SRC_COLOR),
3090 const_iv (GL_ONE_MINUS_DST_COLOR),
2812 const_iv (GL_SRC_ALPHA_SATURATE), 3091 const_iv (GL_SRC_ALPHA_SATURATE),
2813 const_iv (GL_RGB), 3092 const_iv (GL_RGB),
2814 const_iv (GL_RGBA), 3093 const_iv (GL_RGBA),
2815 const_iv (GL_RGBA4), 3094 const_iv (GL_RGBA4),
2816 const_iv (GL_RGBA8), 3095 const_iv (GL_RGBA8),
2884 const_iv (GL_NICEST), 3163 const_iv (GL_NICEST),
2885 const_iv (GL_V2F), 3164 const_iv (GL_V2F),
2886 const_iv (GL_V3F), 3165 const_iv (GL_V3F),
2887 const_iv (GL_T2F_V3F), 3166 const_iv (GL_T2F_V3F),
2888 const_iv (GL_T2F_N3F_V3F), 3167 const_iv (GL_T2F_N3F_V3F),
3168 const_iv (GL_FUNC_ADD),
3169 const_iv (GL_FUNC_SUBTRACT),
3170 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2889# undef const_iv 3171# undef const_iv
2890 }; 3172 };
2891 3173
2892 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3174 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2893 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3175 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2894 3176
2895 texture_av = newAV (); 3177 texture_av = newAV ();
2896 AvREAL_off (texture_av); 3178 AvREAL_off (texture_av);
2897} 3179}
2898 3180
2899void 3181void
2900disable_GL_EXT_blend_func_separate () 3182disable_GL_EXT_blend_func_separate ()
2901 CODE: 3183 CODE:
2902 gl.BlendFuncSeparate = 0; 3184 gl.BlendFuncSeparate = 0;
2903 gl.BlendFuncSeparateEXT = 0; 3185 gl.BlendFuncSeparateEXT = 0;
3186
3187void
3188apple_nvidia_bug (int enable)
2904 3189
2905char * 3190char *
2906gl_vendor () 3191gl_vendor ()
2907 CODE: 3192 CODE:
2908 RETVAL = (char *)glGetString (GL_VENDOR); 3193 RETVAL = (char *)glGetString (GL_VENDOR);
2939 3224
2940int glGetError () 3225int glGetError ()
2941 3226
2942void glFinish () 3227void glFinish ()
2943 3228
3229void glFlush ()
3230
2944void glClear (int mask) 3231void glClear (int mask)
2945 3232
2946void glClearColor (float r, float g, float b, float a = 1.0) 3233void glClearColor (float r, float g, float b, float a = 1.0)
2947 PROTOTYPE: @ 3234 PROTOTYPE: @
2948 3235
2957void glBlendFunc (int sfactor, int dfactor) 3244void glBlendFunc (int sfactor, int dfactor)
2958 3245
2959void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3246void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2960 CODE: 3247 CODE:
2961 gl_BlendFuncSeparate (sa, da, saa, daa); 3248 gl_BlendFuncSeparate (sa, da, saa, daa);
3249
3250# void glBlendEquation (int se)
2962 3251
2963void glDepthMask (int flag) 3252void glDepthMask (int flag)
2964 3253
2965void glLogicOp (int opcode) 3254void glLogicOp (int opcode)
2966 3255
3001void glRotate (float angle, float x, float y, float z) 3290void glRotate (float angle, float x, float y, float z)
3002 CODE: 3291 CODE:
3003 glRotatef (angle, x, y, z); 3292 glRotatef (angle, x, y, z);
3004 3293
3005void glColor (float r, float g, float b, float a = 1.0) 3294void glColor (float r, float g, float b, float a = 1.0)
3295 PROTOTYPE: @
3006 ALIAS: 3296 ALIAS:
3007 glColor_premultiply = 1 3297 glColor_premultiply = 1
3008 CODE: 3298 CODE:
3009 if (ix) 3299 if (ix)
3010 { 3300 {
3115void glNewList (int list, int mode = GL_COMPILE) 3405void glNewList (int list, int mode = GL_COMPILE)
3116 3406
3117void glEndList () 3407void glEndList ()
3118 3408
3119void glCallList (int list) 3409void glCallList (int list)
3410
3411void c_init ()
3412 CODE:
3413 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3414 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3120 3415
3121MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3416MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3122 3417
3123PROTOTYPES: DISABLE 3418PROTOTYPES: DISABLE
3124 3419

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines