[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.293 by root, Thu Dec 17 02:49:38 2009 UTC vs.
Revision 1.297 by root, Tue Dec 22 00:08:11 2009 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>
…		…
81	#define expect_false(expr) expect ((expr) != 0, 0)	80	#define expect_false(expr) expect ((expr) != 0, 0)
82	#define expect_true(expr) expect ((expr) != 0, 1)	81	#define expect_true(expr) expect ((expr) != 0, 1)
83		82
84	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	83	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85		84
		85	/* this is used as fow flag as well, so has to have a different value */
		86	/* then anything that is computed by incoming darkness */
86	#define FOW_DARKNESS 64	87	#define FOW_DARKNESS 50
		88	#define DARKNESS_ADJUST(n) (n)
87		89
88	#define MAP_EXTEND_X 32	90	#define MAP_EXTEND_X 32
89	#define MAP_EXTEND_Y 512	91	#define MAP_EXTEND_Y 512
90		92
91	#define MIN_FONT_HEIGHT 10	93	#define MIN_FONT_HEIGHT 10
…		…
95		97
96	#define KMOD_LRAM 0x10000 // our extension	98	#define KMOD_LRAM 0x10000 // our extension
97		99
98	#define TEXID_SPEECH 1	100	#define TEXID_SPEECH 1
99	#define TEXID_NOFACE 2	101	#define TEXID_NOFACE 2
100	#define TEXID_HIDDEN 3
101		102
102	static AV *texture_av;	103	static AV *texture_av;
103		104
104	static struct	105	static struct
105	{	106	{
…		…
821		822
822	IV minpot (UV n)	823	IV minpot (UV n)
823		824
824	IV popcount (UV n)	825	IV popcount (UV n)
825		826
		827	NV distance (NV dx, NV dy)
		828	CODE:
		829	RETVAL = pow (dx * dx + dy * dy, 0.5);
		830	OUTPUT:
		831	RETVAL
		832
826	void	833	void
827	pango_init ()	834	pango_init ()
828	CODE:	835	CODE:
829	{	836	{
830	opengl_fontmap = pango_opengl_font_map_new ();	837	opengl_fontmap = pango_opengl_font_map_new ();
…		…
1659	glDisable (GL_BLEND);	1666	glDisable (GL_BLEND);
1660	}	1667	}
1661	}	1668	}
1662		1669
1663	void	1670	void
1664	draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1)	1671	draw_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: @	1672	PROTOTYPE: @
1666	CODE:	1673	CODE:
1667	{	1674	{
1668	glEnable (GL_TEXTURE_2D);	1675	glEnable (GL_TEXTURE_2D);
1669	glEnable (GL_BLEND);	1676	glEnable (GL_BLEND);
1670	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1671	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1677	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1678	glBindTexture (GL_TEXTURE_2D, name1);
1672		1679
1673	glColor4f (intensity, intensity, intensity, 0.9);	1680	glColor3f (intensity, intensity, intensity);
1674	glPushMatrix ();	1681	glPushMatrix ();
1675	glScalef (1./3, 1./3, 1.);	1682	glScalef (1./3, 1./3, 1.);
1676		1683
		1684	if (blend > 0.f)
		1685	{
		1686	float dx3 = dx * -3.f / w;
		1687	float dy3 = dy * -3.f / h;
		1688	GLfloat env_color[4] = { 0., 0., 0., blend };
		1689
		1690	/* interpolate the two shadow textures */
		1691	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1692	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1693
		1694	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1695	gl.ActiveTexture (GL_TEXTURE1);
		1696	glEnable (GL_TEXTURE_2D);
1677	glBindTexture (GL_TEXTURE_2D, name1);	1697	glBindTexture (GL_TEXTURE_2D, name2);
		1698	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1678		1699
		1700	/* rgb == rgb(glcolor) */
		1701	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1702	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
		1703	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1704
		1705	/* alpha = interpolate t0, t1 by env_alpha */
		1706	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1707
		1708	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1709	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1710	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1711
		1712	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1713	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1714
		1715	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1716	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1717
		1718	glBegin (GL_QUADS);
		1719	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1720	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1721	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1722	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1723	glEnd ();
		1724
		1725	glDisable (GL_TEXTURE_2D);
		1726	gl.ActiveTexture (GL_TEXTURE0);
		1727	}
		1728	else
		1729	{
		1730	/* simple blending of one texture, also opengl <1.3 path */
		1731	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1732
		1733	glBegin (GL_QUADS);
		1734	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1735	glTexCoord2f (0, t); glVertex2f (0, h);
		1736	glTexCoord2f (s, t); glVertex2f (w, h);
		1737	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1738	glEnd ();
		1739	}
		1740
		1741	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1742	{
		1743	int x, y;
		1744	int dx3 = dx * 3;
		1745	int dy3 = dy * 3;
		1746
		1747	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1748	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1749	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1750	glTranslatef (-1., -1., 0);
1679	glBegin (GL_QUADS);	1751	glBegin (GL_QUADS);
1680	glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);	1752
1681	glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);	1753	for (y = 1; y < h; y += 3)
1682	glTexCoord2f (s1, t1); glVertex2f (w1, h1);	1754	{
1683	glTexCoord2f (s1, 0); glVertex2f (w1, 0);	1755	int y1 = y - dy3;
		1756	int y1valid = y1 >= 0 && y1 < h;
		1757
		1758	for (x = 1; x < w; x += 3)
		1759	{
		1760	int x1 = x - dx3;
		1761	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1762	uint8_t h2;
		1763
		1764	if (y1valid && x1 >= 0 && x1 < w)
		1765	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1766	else
		1767	h2 = 1; /* out of range == invisible */
		1768
		1769	if (h1 \|\| h2)
		1770	{
		1771	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1772	glColor4f (1., 1., 1., alpha);
		1773
		1774	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1775	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1776	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1777	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1778	}
		1779	}
		1780	}
		1781	}
		1782
1684	glEnd ();	1783	glEnd ();
1685		1784
1686	glPopMatrix ();	1785	glPopMatrix ();
1687		1786
1688	glDisable (GL_TEXTURE_2D);	1787	glDisable (GL_TEXTURE_2D);
…		…
1910	{	2009	{
1911	ext = *data++;	2010	ext = *data++;
1912	cmd = ext & 0x7f;	2011	cmd = ext & 0x7f;
1913		2012
1914	if (cmd < 4)	2013	if (cmd < 4)
1915	cell->darkness = 255 - ext * 64 + 1;	2014	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1916	else if (cmd == 5) // health	2015	else if (cmd == 5) // health
1917	{	2016	{
1918	cell->stat_width = 1;	2017	cell->stat_width = 1;
1919	cell->stat_hp = *data++;	2018	cell->stat_hp = *data++;
1920	}	2019	}
…		…
2041	int pl_x, pl_y;	2140	int pl_x, pl_y;
2042	maptex pl_tex;	2141	maptex pl_tex;
2043	rc_t *rc = rc_alloc ();	2142	rc_t *rc = rc_alloc ();
2044	rc_t *rc_ov = rc_alloc ();	2143	rc_t *rc_ov = rc_alloc ();
2045	rc_key_t key;	2144	rc_key_t key;
2046	rc_array_t arr, arr_hidden;	2145	rc_array_t *arr;
2047		2146
2048	pl_tex.name = 0;	2147	pl_tex.name = 0;
2049		2148
2050	// that's current max. sorry.	2149	// that's current max. sorry.
2051	if (sw > 255) sw = 255;	2150	if (sw > 255) sw = 255;
…		…
2088	}	2187	}
2089		2188
2090	glEnable (GL_BLEND);	2189	glEnable (GL_BLEND);
2091	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2190	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2092	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2191	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		2192
2097	for (z = 0; z <= 2; z++)	2193	for (z = 0; z <= 2; z++)
2098	{	2194	{
2099	memset (smooth_level, 0, sizeof (smooth_level));	2195	memset (smooth_level, 0, sizeof (smooth_level));
2100	key.texname = -1;	2196	key.texname = -1;
…		…
2180	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2276	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);	2277	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2182	}	2278	}
2183	}	2279	}
2184		2280
2185	if (expect_false (z == 2))	2281	if (expect_false (z == 2) && expect_false (cell->flags))
2186	{	2282	{
2187	/* draw question marks on top of hidden spaces */	2283	// overlays such as the speech bubble, probably more to come
2188	if (!cell->darkness)	2284	if (cell->flags & 1)
2189	{	2285	{
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;	2286	rc_key_t key_ov = key;
2206	maptex tex = self->tex [TEXID_SPEECH];	2287	maptex tex = self->tex [TEXID_SPEECH];
2207	rc_array_t *arr;	2288	rc_array_t *arr;
2208	int px = x * T + T * 2 / 32;	2289	int px = x * T + T * 2 / 32;
2209	int py = y * T - T * 6 / 32;	2290	int py = y * T - T * 6 / 32;
2210		2291
2211	key_ov.texname = tex.name;	2292	key_ov.texname = tex.name;
2212	arr = rc_array (rc_ov, &key_ov);	2293	arr = rc_array (rc_ov, &key_ov);
2213		2294
2214	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2295	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2215	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2296	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2216	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);	2297	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2217	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2298	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2218	}
2219	}	2299	}
2220	}	2300	}
2221	}	2301	}
2222	}	2302	}
2223		2303
…		…
2366	}	2446	}
2367	}	2447	}
2368	}	2448	}
2369		2449
2370	void	2450	void
2371	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)	2451	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2372	CODE:	2452	CODE:
2373	{	2453	{
2374	static float color[16][3] = {	2454	static float color[16][3] = {
2375	{ 0.00F, 0.00F, 0.00F },	2455	{ 0.00f, 0.00f, 0.00f },
2376	{ 1.00F, 1.00F, 1.00F },	2456	{ 1.00f, 1.00f, 1.00f },
2377	{ 0.00F, 0.00F, 0.55F },	2457	{ 0.00f, 0.00f, 0.55f },
2378	{ 1.00F, 0.00F, 0.00F },	2458	{ 1.00f, 0.00f, 0.00f },
2379		2459
2380	{ 1.00F, 0.54F, 0.00F },	2460	{ 1.00f, 0.54f, 0.00f },
2381	{ 0.11F, 0.56F, 1.00F },	2461	{ 0.11f, 0.56f, 1.00f },
2382	{ 0.93F, 0.46F, 0.00F },	2462	{ 0.93f, 0.46f, 0.00f },
2383	{ 0.18F, 0.54F, 0.34F },	2463	{ 0.18f, 0.54f, 0.34f },
2384		2464
2385	{ 0.56F, 0.73F, 0.56F },	2465	{ 0.56f, 0.73f, 0.56f },
2386	{ 0.80F, 0.80F, 0.80F },	2466	{ 0.80f, 0.80f, 0.80f },
2387	{ 0.55F, 0.41F, 0.13F },	2467	{ 0.55f, 0.41f, 0.13f },
2388	{ 0.99F, 0.77F, 0.26F },	2468	{ 0.99f, 0.77f, 0.26f },
2389		2469
2390	{ 0.74F, 0.65F, 0.41F },	2470	{ 0.74f, 0.65f, 0.41f },
2391		2471
2392	{ 0.00F, 1.00F, 1.00F },	2472	{ 0.00f, 1.00f, 1.00f },
2393	{ 1.00F, 0.00F, 1.00F },	2473	{ 1.00f, 0.00f, 1.00f },
2394	{ 1.00F, 1.00F, 0.00F },	2474	{ 1.00f, 1.00f, 0.00f },
2395	};	2475	};
2396		2476
2397	int x, y;	2477	int x, y;
2398		2478
2399	glEnable (GL_TEXTURE_2D);	2479	glEnable (GL_TEXTURE_2D);
2400	/* GL_REPLACE would be correct, as we don't need to modulate alpha,	2480	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
2401	* but the nvidia driver (185.18.14) mishandles alpha textures	2481	* but the nvidia driver (185.18.14) mishandles alpha textures
2402	* ansd takes the colour from god knows where instead of using	2482	* and takes the colour from god knows where instead of using
2403	* Cp. MODULATE results in the same colour, but slightly different	2483	* Cp. MODULATE results in the same colour, but slightly different
2404	* alpha, but atcually gives us the correct colour with nvidia.	2484	* alpha, but atcually gives us the correct colour with nvidia.
2405	*/	2485	*/
2406	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	2486	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2407	glEnable (GL_BLEND);	2487	glEnable (GL_BLEND);
…		…
2415		2495
2416	if (m)	2496	if (m)
2417	{	2497	{
2418	float *c = color [m & 15];	2498	float *c = color [m & 15];
2419		2499
2420	float tx1 = m & 0x40 ? 0.5 : 0.;	2500	float tx1 = m & 0x40 ? 0.5f : 0.f;
2421	float tx2 = tx1 + 0.5;	2501	float tx2 = tx1 + 0.5f;
2422		2502
2423	glColor4f (c[0], c[1], c[2], 1);	2503	glColor4f (c[0], c[1], c[2], 1);
2424	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2504	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2425	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2505	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2426	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2506	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
…		…
2436	void	2516	void
2437	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2517	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2438	PPCODE:	2518	PPCODE:
2439	{	2519	{
2440	int x, y;	2520	int x, y;
2441	int sw1 = sw + 2;	2521	int sw1 = sw + 2;
2442	int sh1 = sh + 2;	2522	int sh1 = sh + 2;
2443	int sh3 = sh * 3;	2523	int sh3 = sh * 3;
2444	int sw34 = (sw * 3 + 3) & ~3;	2524	int sw3 = sw * 3;
2445	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2525	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2446	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2526	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
2447	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);	2527	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2448		2528
2449	SvPOK_only (darkness3_sv);	2529	SvPOK_only (darkness3_sv);
2450	SvCUR_set (darkness3_sv, sw34 * sh3);	2530	SvCUR_set (darkness3_sv, sw3 * sh3);
2451		2531
2452	mx += self->x - 1;	2532	mx += self->x - 1;
2453	my += self->y - 1;	2533	my += self->y - 1;
2454
2455	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2456		2534
2457	for (y = 0; y < sh1; y++)	2535	for (y = 0; y < sh1; y++)
2458	if (0 <= y + my && y + my < self->rows)	2536	if (0 <= y + my && y + my < self->rows)
2459	{	2537	{
2460	maprow *row = self->row + (y + my);	2538	maprow *row = self->row + (y + my);
…		…
2463	if (row->c0 <= x + mx && x + mx < row->c1)	2541	if (row->c0 <= x + mx && x + mx < row->c1)
2464	{	2542	{
2465	mapcell *cell = row->col + (x + mx - row->c0);	2543	mapcell *cell = row->col + (x + mx - row->c0);
2466		2544
2467	darkness1 [y * sw1 + x] = cell->darkness	2545	darkness1 [y * sw1 + x] = cell->darkness
2468	? 255 - (cell->darkness - 1)	2546	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2469	: 255 - FOW_DARKNESS;	2547	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2470	}	2548	}
2471	}	2549	}
2472		2550
2473	for (y = 0; y < sh; ++y)	2551	for (y = 0; y < sh; ++y)
2474	for (x = 0; x < sw; ++x)	2552	for (x = 0; x < sw; ++x)
…		…
2493		2571
2494	uint8_t r13 = (d13 + d23 + d12) / 3;	2572	uint8_t r13 = (d13 + d23 + d12) / 3;
2495	uint8_t r23 = d23;	2573	uint8_t r23 = d23;
2496	uint8_t r33 = (d23 + d33 + d32) / 3;	2574	uint8_t r33 = (d23 + d33 + d32) / 3;
2497		2575
2498	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2576	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2499	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2577	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2500	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2578	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2501	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2579	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2502	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2580	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);	2581	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2504	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2582	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2505	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2583	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2506	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2584	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2507	}	2585	}
2508		2586
2509	free (darkness1);	2587	free (darkness1);
2510		2588
2511	EXTEND (SP, 3);	2589	EXTEND (SP, 3);
2512	PUSHs (sv_2mortal (newSViv (sw34)));	2590	PUSHs (sv_2mortal (newSViv (sw3)));
2513	PUSHs (sv_2mortal (newSViv (sh3)));	2591	PUSHs (sv_2mortal (newSViv (sh3)));
2514	PUSHs (darkness3_sv);	2592	PUSHs (darkness3_sv);
2515	}	2593	}
2516		2594
2517	SV *	2595	SV *
…		…
2774	void	2852	void
2775	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2853	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2776	CODE:	2854	CODE:
2777	{	2855	{
2778	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2856	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);	2857	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2780	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2858	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2781	}	2859	}
2782		2860
2783	void	2861	void
2784	set_reverse_stereo (DC::Channel self, int flip)	2862	set_reverse_stereo (DC::Channel self, int flip)
…		…
3231		3309
3232	void glEndList ()	3310	void glEndList ()
3233		3311
3234	void glCallList (int list)	3312	void glCallList (int list)
3235		3313
		3314	void c_init ()
		3315	CODE:
		3316	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3317	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
		3318
3236	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3319	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3237		3320
3238	PROTOTYPES: DISABLE	3321	PROTOTYPES: DISABLE
3239		3322
3240	void	3323	void

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.293 by root, Thu Dec 17 02:49:38 2009 UTC vs. Revision 1.297 by root, Tue Dec 22 00:08:11 2009 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.293 by root, Thu Dec 17 02:49:38 2009 UTC vs.
Revision 1.297 by root, Tue Dec 22 00:08:11 2009 UTC