ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.293 by root, Thu Dec 17 02:49:38 2009 UTC vs.
Revision 1.310 by root, Tue Dec 27 07:23:33 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 64 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
87 91
88#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
90 94
91#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
95 99
96#define KMOD_LRAM 0x10000 // our extension 100#define KMOD_LRAM 0x10000 // our extension
97 101
98#define TEXID_SPEECH 1 102#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2 103#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3 104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
101 123
102static AV *texture_av; 124static AV *texture_av;
103 125
104static struct 126static struct
105{ 127{
460 482
461 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
462} 484}
463 485
464static unsigned int 486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
490}
491
492static unsigned int
465minpot (unsigned int n) 493minpot (unsigned int n)
466{ 494{
467 if (!n) 495 if (!n)
468 return 0; 496 return 0;
469 497
552 580
553static void 581static void
554deliantra_main () 582deliantra_main ()
555{ 583{
556 char *argv[] = { 0 }; 584 char *argv[] = { 0 };
557 call_argv ("::main", G_DISCARD | G_VOID, argv); 585 call_argv ("DC::Main::main", G_DISCARD | G_VOID, argv);
558} 586}
559 587
560#ifdef __MACOSX__ 588#ifdef __MACOSX__
561 /* to due surprising braindamage on the side of SDL design, we 589 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main() 590 * do some mind-boggling hack here: SDL requires a custom main()
563 * on OS X, so... we provide one and call the original main(), which, 591 * on OS X, so... we provide one and call the original main(), which,
564 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 592 * due to shared library magic, calls -lSDLmain's main, not perl's main,
565 * and which calls our main (== SDL_main) back. 593 * and which calls our main (== SDL_main) back.
566 */ 594 */
567 extern C_LINKAGE int 595 extern C_LINKAGE int
568 main (int argc, char *argv[]) 596 main (int argc, char *argv[])
569 { 597 {
793 821
794 const_iv (FOW_DARKNESS) 822 const_iv (FOW_DARKNESS)
795# undef const_iv 823# undef const_iv
796 }; 824 };
797 825
798 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--)
799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 827 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
800 828
801 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 829 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
802 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 830 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
803} 831}
804 832
820NV ceil (NV x) 848NV ceil (NV x)
821 849
822IV minpot (UV n) 850IV minpot (UV n)
823 851
824IV 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
825 859
826void 860void
827pango_init () 861pango_init ()
828 CODE: 862 CODE:
829{ 863{
921 955
922 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra"); 956 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
923#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);
924#include "glfunc.h" 958#include "glfunc.h"
925#undef GL_FUNC 959#undef GL_FUNC
960
961 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
962 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
926 } 963 }
927} 964}
928 OUTPUT: 965 OUTPUT:
929 RETVAL 966 RETVAL
930 967
1015 1052
1016 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))));
1017 } 1054 }
1018} 1055}
1019 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
1020int 1070int
1021Mix_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)
1022 POSTCALL: 1072 POSTCALL:
1023 Mix_HookMusicFinished (music_finished); 1073 Mix_HookMusicFinished (music_finished);
1024 Mix_ChannelFinished (channel_finished); 1074 Mix_ChannelFinished (channel_finished);
1086add_font (char *file) 1136add_font (char *file)
1087 CODE: 1137 CODE:
1088 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1138 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089 OUTPUT: 1139 OUTPUT:
1090 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)
1091 1147
1092void 1148void
1093load_image_inline (SV *image_) 1149load_image_inline (SV *image_)
1094 ALIAS: 1150 ALIAS:
1095 load_image_file = 1 1151 load_image_file = 1
1659 glDisable (GL_BLEND); 1715 glDisable (GL_BLEND);
1660 } 1716 }
1661} 1717}
1662 1718
1663void 1719void
1664draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1) 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)
1665 PROTOTYPE: @ 1721 PROTOTYPE: @
1666 CODE: 1722 CODE:
1667{ 1723{
1724 glEnable (GL_BLEND);
1725 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1668 glEnable (GL_TEXTURE_2D); 1726 glEnable (GL_TEXTURE_2D);
1669 glEnable (GL_BLEND); 1727 glBindTexture (GL_TEXTURE_2D, name1);
1670 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1671 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672 1728
1673 glColor4f (intensity, intensity, intensity, 0.9); 1729 glColor3f (intensity, intensity, intensity);
1674 glPushMatrix (); 1730 glPushMatrix ();
1675 glScalef (1./3, 1./3, 1.); 1731 glScalef (1./3, 1./3, 1.);
1676 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);
1677 glBindTexture (GL_TEXTURE_2D, name1); 1746 glBindTexture (GL_TEXTURE_2D, name2);
1747 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1678 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);
1679 glBegin (GL_QUADS); 1800 glBegin (GL_QUADS);
1680 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0); 1801
1681 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1); 1802 for (y = 1; y < h; y += 3)
1682 glTexCoord2f (s1, t1); glVertex2f (w1, h1); 1803 {
1683 glTexCoord2f (s1, 0); glVertex2f (w1, 0); 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
1684 glEnd (); 1832 glEnd ();
1685 1833
1686 glPopMatrix (); 1834 glPopMatrix ();
1687 1835
1688 glDisable (GL_TEXTURE_2D); 1836 glDisable (GL_TEXTURE_2D);
1910 { 2058 {
1911 ext = *data++; 2059 ext = *data++;
1912 cmd = ext & 0x7f; 2060 cmd = ext & 0x7f;
1913 2061
1914 if (cmd < 4) 2062 if (cmd < 4)
1915 cell->darkness = 255 - ext * 64 + 1; 2063 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1916 else if (cmd == 5) // health 2064 else if (cmd == 5) // health
1917 { 2065 {
1918 cell->stat_width = 1; 2066 cell->stat_width = 1;
1919 cell->stat_hp = *data++; 2067 cell->stat_hp = *data++;
1920 } 2068 }
1995 ? self->row + y 2143 ? self->row + y
1996 : 0; 2144 : 0;
1997 2145
1998 for (x = x0; x < x1; x++) 2146 for (x = x0; x < x1; x++)
1999 { 2147 {
2000 int r = 32, g = 32, b = 32, a = 192; 2148 unsigned int r = 32, g = 32, b = 32, a = 192;
2001 2149
2002 if (row && row->c0 <= x && x < row->c1) 2150 if (row && row->c0 <= x && x < row->c1)
2003 { 2151 {
2004 mapcell *cell = row->col + (x - row->c0); 2152 mapcell *cell = row->col + (x - row->c0);
2005 2153
2007 { 2155 {
2008 maptex tex = self->tex [cell->tile [z]]; 2156 maptex tex = self->tex [cell->tile [z]];
2009 int a0 = 255 - tex.a; 2157 int a0 = 255 - tex.a;
2010 int a1 = tex.a; 2158 int a1 = tex.a;
2011 2159
2012 r = (r * a0 + tex.r * a1) / 255; 2160 r = div255 (r * a0 + tex.r * a1);
2013 g = (g * a0 + tex.g * a1) / 255; 2161 g = div255 (g * a0 + tex.g * a1);
2014 b = (b * a0 + tex.b * a1) / 255; 2162 b = div255 (b * a0 + tex.b * a1);
2015 a = (a * a0 + tex.a * a1) / 255; 2163 a = div255 (a * a0 + tex.a * a1);
2016 } 2164 }
2017 } 2165 }
2018 2166
2019 *map++ = (r ) 2167 *map++ = (r )
2020 | (g << 8) 2168 | (g << 8)
2027} 2175}
2028 OUTPUT: 2176 OUTPUT:
2029 RETVAL 2177 RETVAL
2030 2178
2031void 2179void
2032draw (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)
2033 CODE: 2181 CODE:
2034{ 2182{
2035 int x, y, z; 2183 int x, y, z;
2036 2184
2037 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2185 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2041 int pl_x, pl_y; 2189 int pl_x, pl_y;
2042 maptex pl_tex; 2190 maptex pl_tex;
2043 rc_t *rc = rc_alloc (); 2191 rc_t *rc = rc_alloc ();
2044 rc_t *rc_ov = rc_alloc (); 2192 rc_t *rc_ov = rc_alloc ();
2045 rc_key_t key; 2193 rc_key_t key;
2046 rc_array_t *arr, *arr_hidden; 2194 rc_array_t *arr;
2047 2195
2048 pl_tex.name = 0; 2196 pl_tex.name = 0;
2049 2197
2050 // that's current max. sorry. 2198 // that's current max. sorry.
2051 if (sw > 255) sw = 255; 2199 if (sw > 255) sw = 255;
2088 } 2236 }
2089 2237
2090 glEnable (GL_BLEND); 2238 glEnable (GL_BLEND);
2091 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2239 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2240 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2093
2094 key.texname = self->tex [TEXID_HIDDEN].name;
2095 arr_hidden = rc_array (rc_ov, &key);
2096 2241
2097 for (z = 0; z <= 2; z++) 2242 for (z = 0; z <= 2; z++)
2098 { 2243 {
2099 memset (smooth_level, 0, sizeof (smooth_level)); 2244 memset (smooth_level, 0, sizeof (smooth_level));
2100 key.texname = -1; 2245 key.texname = -1;
2124 2269
2125 key.texname = tex.name; 2270 key.texname = tex.name;
2126 arr = rc_array (rc, &key); 2271 arr = rc_array (rc, &key);
2127 } 2272 }
2128 2273
2129 px = (x + 1) * T - tex.w; 2274 px = (x + 1) * Th - tex.w;
2130 py = (y + 1) * T - tex.h; 2275 py = (y + 1) * Tw - tex.h;
2131 2276
2132 if (expect_false (cell->player == player) && expect_false (z == 2)) 2277 if (expect_false (cell->player == player) && expect_false (z == 2))
2133 { 2278 {
2134 pl_x = px; 2279 pl_x = px;
2135 pl_y = py; 2280 pl_y = py;
2180 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);
2181 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);
2182 } 2327 }
2183 } 2328 }
2184 2329
2185 if (expect_false (z == 2)) 2330 if (expect_false (z == 2) && expect_false (cell->flags))
2186 { 2331 {
2187 /* draw question marks on top of hidden spaces */ 2332 // overlays such as the speech bubble, probably more to come
2188 if (!cell->darkness) 2333 if (cell->flags & 1)
2189 { 2334 {
2190 maptex tex = self->tex [TEXID_HIDDEN];
2191 int px = (x + 1) * T - tex.w;
2192 int py = (y + 1) * T - tex.h;
2193
2194 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2195 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2196 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2197 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2198 }
2199
2200 if (expect_false (cell->flags))
2201 {
2202 // overlays such as the speech bubble, probably more to come
2203 if (cell->flags & 1)
2204 {
2205 rc_key_t key_ov = key; 2335 rc_key_t key_ov = key;
2206 maptex tex = self->tex [TEXID_SPEECH]; 2336 maptex tex = self->tex [TEXID_SPEECH];
2207 rc_array_t *arr; 2337 rc_array_t *arr;
2208 int px = x * T + T * 2 / 32; 2338 int px = x * Tw + Tw * 2 / 32;
2209 int py = y * T - T * 6 / 32; 2339 int py = y * Th - Th * 6 / 32;
2210 2340
2211 key_ov.texname = tex.name; 2341 key_ov.texname = tex.name;
2212 arr = rc_array (rc_ov, &key_ov); 2342 arr = rc_array (rc_ov, &key_ov);
2213 2343
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2344 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2345 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2216 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2346 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2217 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2347 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2218 }
2219 } 2348 }
2220 } 2349 }
2221 } 2350 }
2222 } 2351 }
2223 2352
2250 if (!(bits & 0x1000) 2379 if (!(bits & 0x1000)
2251 && skey->level == level 2380 && skey->level == level
2252 && level > smooth_max [skey->x][skey->y]) 2381 && level > smooth_max [skey->x][skey->y])
2253 { 2382 {
2254 maptex tex = self->tex [skey->tile]; 2383 maptex tex = self->tex [skey->tile];
2255 int px = (((int)skey->x) - 1) * T; 2384 int px = (((int)skey->x) - 1) * Tw;
2256 int py = (((int)skey->y) - 1) * T; 2385 int py = (((int)skey->y) - 1) * Th;
2257 int border = bits & 15; 2386 int border = bits & 15;
2258 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2387 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2259 float dx = tex.s * .0625f; // 16 images/row 2388 float dx = tex.s * .0625f; // 16 images/row
2260 float dy = tex.t * .5f ; // 2 images/column 2389 float dy = tex.t * .5f ; // 2 images/column
2261 2390
2274 2403
2275 if (border) 2404 if (border)
2276 { 2405 {
2277 float ox = border * dx; 2406 float ox = border * dx;
2278 2407
2279 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2408 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2280 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2409 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2281 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2410 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2282 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2411 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2283 } 2412 }
2284 2413
2285 if (corner) 2414 if (corner)
2286 { 2415 {
2287 float ox = corner * dx; 2416 float ox = corner * dx;
2288 2417
2289 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2418 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2290 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2419 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2291 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2420 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2292 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2421 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2293 } 2422 }
2294 } 2423 }
2295 } 2424 }
2296 } 2425 }
2297 } 2426 }
2338 for (x = 0; x < sw; x++) 2467 for (x = 0; x < sw; x++)
2339 if (row->c0 <= x + mx && x + mx < row->c1) 2468 if (row->c0 <= x + mx && x + mx < row->c1)
2340 { 2469 {
2341 mapcell *cell = row->col + (x + mx - row->c0); 2470 mapcell *cell = row->col + (x + mx - row->c0);
2342 2471
2343 int px = x * T; 2472 int px = x * Tw;
2344 int py = y * T; 2473 int py = y * Th;
2345 2474
2346 if (expect_false (cell->player == player)) 2475 if (expect_false (cell->player == player))
2347 { 2476 {
2348 px += sdx; 2477 px += sdx;
2349 py += sdy; 2478 py += sdy;
2350 } 2479 }
2351 2480
2352 if (cell->stat_hp) 2481 if (cell->stat_hp)
2353 { 2482 {
2354 int width = cell->stat_width * T; 2483 int width = cell->stat_width * Tw;
2355 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2484 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2356 2485
2357 glColor3ub (0, 0, 0); 2486 glColor3ub (0, 0, 0);
2358 glRectf (px + 1, py - thick - 2, 2487 glRectf (px + 1, py - thick - 2,
2359 px + width - 1, py); 2488 px + width - 1, py);
2360 2489
2366 } 2495 }
2367 } 2496 }
2368} 2497}
2369 2498
2370void 2499void
2371draw_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)
2372 CODE: 2501 CODE:
2373{ 2502{
2374 static float color[16][3] = { 2503 static float color[16][3] = {
2375 { 0.00F, 0.00F, 0.00F }, 2504 { 0.00f, 0.00f, 0.00f },
2376 { 1.00F, 1.00F, 1.00F }, 2505 { 1.00f, 1.00f, 1.00f },
2377 { 0.00F, 0.00F, 0.55F }, 2506 { 0.00f, 0.00f, 0.55f },
2378 { 1.00F, 0.00F, 0.00F }, 2507 { 1.00f, 0.00f, 0.00f },
2379 2508
2380 { 1.00F, 0.54F, 0.00F }, 2509 { 1.00f, 0.54f, 0.00f },
2381 { 0.11F, 0.56F, 1.00F }, 2510 { 0.11f, 0.56f, 1.00f },
2382 { 0.93F, 0.46F, 0.00F }, 2511 { 0.93f, 0.46f, 0.00f },
2383 { 0.18F, 0.54F, 0.34F }, 2512 { 0.18f, 0.54f, 0.34f },
2384 2513
2385 { 0.56F, 0.73F, 0.56F }, 2514 { 0.56f, 0.73f, 0.56f },
2386 { 0.80F, 0.80F, 0.80F }, 2515 { 0.80f, 0.80f, 0.80f },
2387 { 0.55F, 0.41F, 0.13F }, 2516 { 0.55f, 0.41f, 0.13f },
2388 { 0.99F, 0.77F, 0.26F }, 2517 { 0.99f, 0.77f, 0.26f },
2389 2518
2390 { 0.74F, 0.65F, 0.41F }, 2519 { 0.74f, 0.65f, 0.41f },
2391 2520
2392 { 0.00F, 1.00F, 1.00F }, 2521 { 0.00f, 1.00f, 1.00f },
2393 { 1.00F, 0.00F, 1.00F }, 2522 { 1.00f, 0.00f, 1.00f },
2394 { 1.00F, 1.00F, 0.00F }, 2523 { 1.00f, 1.00f, 0.00f },
2395 }; 2524 };
2396 2525
2397 int x, y; 2526 int x, y;
2398 2527
2399 glEnable (GL_TEXTURE_2D); 2528 glEnable (GL_TEXTURE_2D);
2400 /* GL_REPLACE would be correct, as we don't need to modulate alpha, 2529 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2401 * but the nvidia driver (185.18.14) mishandles alpha textures 2530 * but the nvidia driver (185.18.14) mishandles alpha textures
2402 * ansd takes the colour from god knows where instead of using 2531 * and takes the colour from god knows where instead of using
2403 * Cp. MODULATE results in the same colour, but slightly different 2532 * Cp. MODULATE results in the same colour, but slightly different
2404 * alpha, but atcually gives us the correct colour with nvidia. 2533 * alpha, but atcually gives us the correct colour with nvidia.
2405 */ 2534 */
2406 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 2535 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2407 glEnable (GL_BLEND); 2536 glEnable (GL_BLEND);
2415 2544
2416 if (m) 2545 if (m)
2417 { 2546 {
2418 float *c = color [m & 15]; 2547 float *c = color [m & 15];
2419 2548
2420 float tx1 = m & 0x40 ? 0.5 : 0.; 2549 float tx1 = m & 0x40 ? 0.5f : 0.f;
2421 float tx2 = tx1 + 0.5; 2550 float tx2 = tx1 + 0.5f;
2422 2551
2423 glColor4f (c[0], c[1], c[2], 1); 2552 glColor4f (c[0], c[1], c[2], 1);
2424 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2553 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2425 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2554 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2426 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2555 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2436void 2565void
2437fow_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)
2438 PPCODE: 2567 PPCODE:
2439{ 2568{
2440 int x, y; 2569 int x, y;
2441 int sw1 = sw + 2; 2570 int sw1 = sw + 2;
2442 int sh1 = sh + 2; 2571 int sh1 = sh + 2;
2443 int sh3 = sh * 3; 2572 int sh3 = sh * 3;
2444 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);
2445 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2576 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2446 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2577 memset (darkness1, 0, sw1*sh1);
2447 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2448 2578
2449 SvPOK_only (darkness3_sv); 2579 SvPOK_only (darkness3_sv);
2450 SvCUR_set (darkness3_sv, sw34 * sh3); 2580 SvCUR_set (darkness3_sv, sw3 * sh3);
2451 2581
2452 mx += self->x - 1; 2582 mx += self->x - 1;
2453 my += self->y - 1; 2583 my += self->y - 1;
2454
2455 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2456 2584
2457 for (y = 0; y < sh1; y++) 2585 for (y = 0; y < sh1; y++)
2458 if (0 <= y + my && y + my < self->rows) 2586 if (0 <= y + my && y + my < self->rows)
2459 { 2587 {
2460 maprow *row = self->row + (y + my); 2588 maprow *row = self->row + (y + my);
2463 if (row->c0 <= x + mx && x + mx < row->c1) 2591 if (row->c0 <= x + mx && x + mx < row->c1)
2464 { 2592 {
2465 mapcell *cell = row->col + (x + mx - row->c0); 2593 mapcell *cell = row->col + (x + mx - row->c0);
2466 2594
2467 darkness1 [y * sw1 + x] = cell->darkness 2595 darkness1 [y * sw1 + x] = cell->darkness
2468 ? 255 - (cell->darkness - 1) 2596 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2469 : 255 - FOW_DARKNESS; 2597 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2470 } 2598 }
2471 } 2599 }
2472 2600
2473 for (y = 0; y < sh; ++y) 2601 for (y = 0; y < sh; ++y)
2474 for (x = 0; x < sw; ++x) 2602 for (x = 0; x < sw; ++x)
2493 2621
2494 uint8_t r13 = (d13 + d23 + d12) / 3; 2622 uint8_t r13 = (d13 + d23 + d12) / 3;
2495 uint8_t r23 = d23; 2623 uint8_t r23 = d23;
2496 uint8_t r33 = (d23 + d33 + d32) / 3; 2624 uint8_t r33 = (d23 + d33 + d32) / 3;
2497 2625
2498 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2626 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2499 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2627 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2500 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2628 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2501 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2629 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2502 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 */
2503 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2631 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2504 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2632 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2505 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2633 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2506 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2634 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2507 } 2635 }
2508 2636
2509 free (darkness1); 2637 free (darkness1);
2510 2638
2511 EXTEND (SP, 3); 2639 EXTEND (SP, 3);
2512 PUSHs (sv_2mortal (newSViv (sw34))); 2640 PUSHs (sv_2mortal (newSViv (sw3)));
2513 PUSHs (sv_2mortal (newSViv (sh3))); 2641 PUSHs (sv_2mortal (newSViv (sh3)));
2514 PUSHs (darkness3_sv); 2642 PUSHs (darkness3_sv);
2515} 2643}
2516 2644
2517SV * 2645SV *
2715 if (RETVAL < 0) 2843 if (RETVAL < 0)
2716 { 2844 {
2717 RETVAL = Mix_GroupOldest (-1); 2845 RETVAL = Mix_GroupOldest (-1);
2718 2846
2719 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)
2720 XSRETURN_UNDEF; 2853 XSRETURN_UNDEF;
2721 2854 }
2855 else
2722 Mix_HaltChannel (RETVAL); 2856 Mix_HaltChannel (RETVAL);
2723 } 2857 }
2724 2858
2725 Mix_UnregisterAllEffects (RETVAL); 2859 Mix_UnregisterAllEffects (RETVAL);
2726 Mix_Volume (RETVAL, 128); 2860 Mix_Volume (RETVAL, 128);
2727} 2861}
2774void 2908void
2775set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2909set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2776 CODE: 2910 CODE:
2777{ 2911{
2778 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));
2779 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;
2780 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2914 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2781} 2915}
2782 2916
2783void 2917void
2784set_reverse_stereo (DC::Channel self, int flip) 2918set_reverse_stereo (DC::Channel self, int flip)
2786 Mix_SetReverseStereo (self, flip); 2920 Mix_SetReverseStereo (self, flip);
2787 2921
2788MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2922MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2789 2923
2790PROTOTYPES: 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
2791 2937
2792DC::MixChunk 2938DC::MixChunk
2793new (SV *class, DC::RW rwops) 2939new (SV *class, DC::RW rwops)
2794 CODE: 2940 CODE:
2795 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2941 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2828 OUTPUT: 2974 OUTPUT:
2829 RETVAL 2975 RETVAL
2830 2976
2831MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2977MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2832 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
2833int 2991int
2834volume (int volume = -1) 2992volume (int volume = -1)
2835 PROTOTYPE: ;$ 2993 PROTOTYPE: ;$
2836 CODE: 2994 CODE:
2837 if (items > 0) 2995 if (items > 0)
2847 3005
2848void 3006void
2849halt () 3007halt ()
2850 CODE: 3008 CODE:
2851 Mix_HaltMusic (); 3009 Mix_HaltMusic ();
3010
3011int
3012playing ()
3013 CODE:
3014 RETVAL = Mix_PlayingMusic ();
3015 OUTPUT:
3016 RETVAL
2852 3017
2853DC::MixMusic 3018DC::MixMusic
2854new (SV *class, DC::RW rwops) 3019new (SV *class, DC::RW rwops)
2855 CODE: 3020 CODE:
2856 RETVAL = Mix_LoadMUS_RW (rwops); 3021 RETVAL = Mix_LoadMUS_RW (rwops);
2996 const_iv (GL_FUNC_SUBTRACT), 3161 const_iv (GL_FUNC_SUBTRACT),
2997 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3162 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2998# undef const_iv 3163# undef const_iv
2999 }; 3164 };
3000 3165
3001 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--)
3002 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3167 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3003 3168
3004 texture_av = newAV (); 3169 texture_av = newAV ();
3005 AvREAL_off (texture_av); 3170 AvREAL_off (texture_av);
3006} 3171}
3007 3172
3050 RETVAL 3215 RETVAL
3051 3216
3052int glGetError () 3217int glGetError ()
3053 3218
3054void glFinish () 3219void glFinish ()
3220
3221void glFlush ()
3055 3222
3056void glClear (int mask) 3223void glClear (int mask)
3057 3224
3058void glClearColor (float r, float g, float b, float a = 1.0) 3225void glClearColor (float r, float g, float b, float a = 1.0)
3059 PROTOTYPE: @ 3226 PROTOTYPE: @
3230void glNewList (int list, int mode = GL_COMPILE) 3397void glNewList (int list, int mode = GL_COMPILE)
3231 3398
3232void glEndList () 3399void glEndList ()
3233 3400
3234void 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);
3235 3407
3236MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3408MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3237 3409
3238PROTOTYPES: DISABLE 3410PROTOTYPES: DISABLE
3239 3411

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines