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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.112 by root, Mon Jun 12 14:55:41 2006 UTC vs.
Revision 1.119 by root, Sat Jun 17 15:07:52 2006 UTC

…		…
300	ev.code = 1;	300	ev.code = 1;
301	ev.data1 = (void *)(long)channel;	301	ev.data1 = (void *)(long)channel;
302	ev.data2 = 0;	302	ev.data2 = 0;
303		303
304	SDL_PushEvent ((SDL_Event *)&ev);	304	SDL_PushEvent ((SDL_Event *)&ev);
		305	}
		306
		307	static unsigned int
		308	minpot (unsigned int n)
		309	{
		310	if (!n)
		311	return 0;
		312
		313	--n;
		314
		315	n \|= n >> 1;
		316	n \|= n >> 2;
		317	n \|= n >> 4;
		318	n \|= n >> 8;
		319	n \|= n >> 16;
		320
		321	return n + 1;
305	}	322	}
306		323
307	MODULE = CFClient PACKAGE = CFClient	324	MODULE = CFClient PACKAGE = CFClient
308		325
309	PROTOTYPES: ENABLE	326	PROTOTYPES: ENABLE
…		…
419		436
420	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	437	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
421	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	438	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
422	}	439	}
423		440
		441	NV floor (NV x)
		442
		443	NV ceil (NV x)
		444
424	void	445	void
425	pango_init ()	446	pango_init ()
426	CODE:	447	CODE:
427	// delayed, so it can pick up new fonts added by AddFontResourceEx	448	// delayed, so it can pick up new fonts added by AddFontResourceEx
428	{	449	{
…		…
464	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	485	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
465	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	486	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
466	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	487	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
467		488
468	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	489	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
469	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	490	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
470		491
471	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	492	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
472	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	493	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
473	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	494	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
474	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	495	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
…		…
984	}	1005	}
985		1006
986	MODULE = CFClient PACKAGE = CFClient::Texture	1007	MODULE = CFClient PACKAGE = CFClient::Texture
987		1008
988	void	1009	void
		1010	pad2pot (SV data_, SV w_, SV *h_)
		1011	CODE:
		1012	{
		1013	int ow = SvIV (w_);
		1014	int oh = SvIV (h_);
		1015
		1016	if (ow && oh)
		1017	{
		1018	int nw = minpot (ow);
		1019	int nh = minpot (oh);
		1020
		1021	if (nw != ow \|\| nh != oh)
		1022	{
		1023	if (SvOK (data_))
		1024	{
		1025	STRLEN datalen;
		1026	char *data = SvPVbyte (data_, datalen);
		1027	int bpp = datalen / (ow * oh);
		1028	SV result_ = sv_2mortal (newSV (nw nh * bpp));
		1029
		1030	SvPOK_only (result_);
		1031	SvCUR_set (result_, nw * nh * bpp);
		1032
		1033	memset (SvPVX (result_), 0, nw * nh * bpp);
		1034	while (oh--)
		1035	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1036
		1037	sv_setsv (data_, result_);
		1038	}
		1039
		1040	sv_setiv (w_, nw);
		1041	sv_setiv (h_, nh);
		1042	}
		1043	}
		1044	}
		1045
		1046	void
989	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1047	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
990	PROTOTYPE: $$$;$$	1048	PROTOTYPE: $$$;$$
991	ALIAS:	1049	ALIAS:
992	draw_quad_alpha = 1	1050	draw_quad_alpha = 1
993	draw_quad_alpha_premultiplied = 2	1051	draw_quad_alpha_premultiplied = 2
994	CODE:	1052	CODE:
…		…
1276	OUTPUT:	1334	OUTPUT:
1277	RETVAL	1335	RETVAL
1278		1336
1279	void	1337	void
1280	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1338	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1281	PPCODE:	1339	CODE:
1282	{	1340	{
1283	int vx, vy;	1341	int vx, vy;
1284	int x, y, z;	1342	int x, y, z;
1285	int last_name;	1343	int last_name;
1286	mapface face;	1344	mapface face;
1287	int sw4 = (sw + 3) & ~3;
1288	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1289	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1290		1345
1291	memset (darkness, 255, sw4 * sh);
1292	SvPOK_only (darkness_sv);
1293	SvCUR_set (darkness_sv, sw4 * sh);
1294
1295	vx = self->x + (self->w - sw) / 2 - shift_x;	1346	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1296	vy = self->y + (self->h - sh) / 2 - shift_y;	1347	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1297		1348
1298	/*	1349	/*
1299	int vx = self->vx = self->w >= sw	1350	int vx = self->vx = self->w >= sw
1300	? self->x + (self->w - sw) / 2	1351	? self->x + (self->w - sw) / 2
1301	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1352	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1305	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1356	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1306	*/	1357	*/
1307		1358
1308	glColor4ub (255, 255, 255, 255);	1359	glColor4ub (255, 255, 255, 255);
1309		1360
		1361	glEnable (GL_BLEND);
1310	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1362	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1311	glEnable (GL_BLEND);
1312	glEnable (GL_TEXTURE_2D);	1363	glEnable (GL_TEXTURE_2D);
1313	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1364	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1314		1365
1315	glBegin (GL_QUADS);	1366	glBegin (GL_QUADS);
1316		1367
…		…
1324		1375
1325	for (x = 0; x < sw; x++)	1376	for (x = 0; x < sw; x++)
1326	if (row->c0 <= x + vx && x + vx < row->c1)	1377	if (row->c0 <= x + vx && x + vx < row->c1)
1327	{	1378	{
1328	mapcell *cell = row->col + (x + vx - row->c0);	1379	mapcell *cell = row->col + (x + vx - row->c0);
1329
1330	darkness[y * sw4 + x] = cell->darkness < 0
1331	? 255 - FOW_DARKNESS
1332	: 255 - cell->darkness;
1333		1380
1334	face = cell->face [z];	1381	face = cell->face [z];
1335		1382
1336	if (face)	1383	if (face)
1337	{	1384	{
…		…
1358		1405
1359	glEnd ();	1406	glEnd ();
1360		1407
1361	glDisable (GL_TEXTURE_2D);	1408	glDisable (GL_TEXTURE_2D);
1362	glDisable (GL_BLEND);	1409	glDisable (GL_BLEND);
		1410	}
		1411
		1412	void
		1413	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1414	CODE:
		1415	{
		1416	static float color[16][3] = {
		1417	{ 0.00, 0.00, 0.00 },
		1418	{ 1.00, 1.00, 1.00 },
		1419	{ 0.00, 0.00, 0.55 },
		1420	{ 1.00, 0.00, 0.00 },
		1421
		1422	{ 1.00, 0.54, 0.00 },
		1423	{ 0.11, 0.56, 1.00 },
		1424	{ 0.93, 0.46, 0.00 },
		1425	{ 0.18, 0.54, 0.34 },
		1426
		1427	{ 0.56, 0.73, 0.56 },
		1428	{ 0.80, 0.80, 0.80 },
		1429	{ 0.55, 0.41, 0.13 },
		1430	{ 0.99, 0.77, 0.26 },
		1431
		1432	{ 0.74, 0.65, 0.41 },
		1433
		1434	{ 0.00, 1.00, 1.00 },
		1435	{ 1.00, 0.00, 1.00 },
		1436	{ 1.00, 1.00, 0.00 },
		1437	};
		1438
		1439	int x, y;
		1440
		1441	glEnable (GL_TEXTURE_2D);
		1442	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1443	glEnable (GL_BLEND);
		1444	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1445	glBegin (GL_QUADS);
		1446
		1447	for (y = 0; y < h; y++)
		1448	for (x = 0; x < w; x++)
		1449	{
		1450	unsigned char m = data [x + y * w];
		1451
		1452	if (m)
		1453	{
		1454	float *c = color [m & 15];
		1455
		1456	float tx1 = m & 0x40 ? 0.5 : 0.;
		1457	float tx2 = tx1 + 0.5;
		1458
		1459	glColor4f (c[0], c[1], c[2], 0.75);
		1460	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1461	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1462	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1463	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1464	}
		1465	}
		1466
		1467	glEnd ();
		1468	glDisable (GL_BLEND);
		1469	glDisable (GL_TEXTURE_2D);
		1470	}
		1471
		1472	void
		1473	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1474	PPCODE:
		1475	{
		1476	int vx, vy;
		1477	int x, y;
		1478	int sw4 = (sw + 3) & ~3;
		1479	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1480	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1481
		1482	memset (darkness, 255, sw4 * sh);
		1483	SvPOK_only (darkness_sv);
		1484	SvCUR_set (darkness_sv, sw4 * sh);
		1485
		1486	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1487	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1488
		1489	for (y = 0; y < sh; y++)
		1490	if (0 <= y + vy && y + vy < self->rows)
		1491	{
		1492	maprow *row = self->row + (y + vy);
		1493
		1494	for (x = 0; x < sw; x++)
		1495	if (row->c0 <= x + vx && x + vx < row->c1)
		1496	{
		1497	mapcell *cell = row->col + (x + vx - row->c0);
		1498
		1499	darkness[y * sw4 + x] = cell->darkness < 0
		1500	? 255 - FOW_DARKNESS
		1501	: 255 - cell->darkness;
		1502	}
		1503	}
1363		1504
1364	EXTEND (SP, 3);	1505	EXTEND (SP, 3);
1365	PUSHs (sv_2mortal (newSViv (sw4)));	1506	PUSHs (sv_2mortal (newSViv (sw4)));
1366	PUSHs (sv_2mortal (newSViv (sh)));	1507	PUSHs (sv_2mortal (newSViv (sh)));
1367	PUSHs (darkness_sv);	1508	PUSHs (darkness_sv);
…		…
1574	const_iv (GL_SCISSOR_TEST),	1715	const_iv (GL_SCISSOR_TEST),
1575	const_iv (GL_DEPTH_TEST),	1716	const_iv (GL_DEPTH_TEST),
1576	const_iv (GL_ALPHA_TEST),	1717	const_iv (GL_ALPHA_TEST),
1577	const_iv (GL_NORMALIZE),	1718	const_iv (GL_NORMALIZE),
1578	const_iv (GL_RESCALE_NORMAL),	1719	const_iv (GL_RESCALE_NORMAL),
		1720	const_iv (GL_FRONT),
		1721	const_iv (GL_BACK),
1579	const_iv (GL_AND),	1722	const_iv (GL_AND),
1580	const_iv (GL_ONE),	1723	const_iv (GL_ONE),
1581	const_iv (GL_ZERO),	1724	const_iv (GL_ZERO),
1582	const_iv (GL_SRC_ALPHA),	1725	const_iv (GL_SRC_ALPHA),
1583	const_iv (GL_DST_ALPHA),	1726	const_iv (GL_DST_ALPHA),
1584	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1727	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1585	const_iv (GL_ONE_MINUS_DST_ALPHA),	1728	const_iv (GL_ONE_MINUS_DST_ALPHA),
1586	const_iv (GL_SRC_ALPHA_SATURATE),	1729	const_iv (GL_SRC_ALPHA_SATURATE),
1587	const_iv (GL_RGB),	1730	const_iv (GL_RGB),
1588	const_iv (GL_RGBA),	1731	const_iv (GL_RGBA),
		1732	const_iv (GL_RGBA4),
		1733	const_iv (GL_RGBA8),
		1734	const_iv (GL_RGB5_A1),
1589	const_iv (GL_UNSIGNED_BYTE),	1735	const_iv (GL_UNSIGNED_BYTE),
1590	const_iv (GL_UNSIGNED_SHORT),	1736	const_iv (GL_UNSIGNED_SHORT),
1591	const_iv (GL_UNSIGNED_INT),	1737	const_iv (GL_UNSIGNED_INT),
1592	const_iv (GL_ALPHA),	1738	const_iv (GL_ALPHA),
1593	const_iv (GL_INTENSITY),	1739	const_iv (GL_INTENSITY),
…		…
1667	OUTPUT:	1813	OUTPUT:
1668	RETVAL	1814	RETVAL
1669		1815
1670	int glGetError ()	1816	int glGetError ()
1671		1817
		1818	void glFinish ()
		1819
1672	void glClear (int mask)	1820	void glClear (int mask)
1673		1821
1674	void glClearColor (float r, float g, float b, float a = 1.0)	1822	void glClearColor (float r, float g, float b, float a = 1.0)
1675	PROTOTYPE: @	1823	PROTOTYPE: @
1676		1824
…		…
1699	void glPushMatrix ()	1847	void glPushMatrix ()
1700		1848
1701	void glPopMatrix ()	1849	void glPopMatrix ()
1702		1850
1703	void glLoadIdentity ()	1851	void glLoadIdentity ()
		1852
		1853	void glDrawBuffer (int buffer)
		1854
		1855	void glReadBuffer (int buffer)
1704		1856
1705	# near_ and far_ are due to microsofts buggy "c" compiler	1857	# near_ and far_ are due to microsofts buggy "c" compiler
1706	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1858	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1707		1859
1708	# near_ and far_ are due to microsofts buggy "c" compiler	1860	# near_ and far_ are due to microsofts buggy "c" compiler

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.112 by root, Mon Jun 12 14:55:41 2006 UTC vs. Revision 1.119 by root, Sat Jun 17 15:07:52 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.112 by root, Mon Jun 12 14:55:41 2006 UTC vs.
Revision 1.119 by root, Sat Jun 17 15:07:52 2006 UTC