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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.108 by root, Wed Jun 7 23:28:12 2006 UTC vs.
Revision 1.118 by root, Thu Jun 15 15:47:35 2006 UTC

…		…
10	#include "XSUB.h"	10	#include "XSUB.h"
11		11
12	#include <math.h>	12	#include <math.h>
13	#include <string.h>	13	#include <string.h>
14	#include <stdio.h>	14	#include <stdio.h>
		15	#include <stdlib.h>
15		16
16	#include <SDL.h>	17	#include <SDL.h>
17	#include <SDL_endian.h>	18	#include <SDL_endian.h>
18	#include <SDL_image.h>	19	#include <SDL_image.h>
19	#include <SDL_mixer.h>	20	#include <SDL_mixer.h>
…		…
86		87
87	static void	88	static void
88	substitute_func (FcPattern *pattern, gpointer data)	89	substitute_func (FcPattern *pattern, gpointer data)
89	{	90	{
90	FcPatternAddBool (pattern, FC_HINTING, 1);	91	FcPatternAddBool (pattern, FC_HINTING, 1);
		92	#ifdef FC_HINT_STYLE
91	FcPatternAddBool (pattern, FC_HINTSTYLE, FC_HINT_FULL);	93	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		94	#endif
92	#ifdef _WIN32	95	#ifdef _WIN32
93	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
94	#else	97	#else
95	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
96	#endif	99	#endif
…		…
297	ev.code = 1;	300	ev.code = 1;
298	ev.data1 = (void *)(long)channel;	301	ev.data1 = (void *)(long)channel;
299	ev.data2 = 0;	302	ev.data2 = 0;
300		303
301	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;
302	}	322	}
303		323
304	MODULE = CFClient PACKAGE = CFClient	324	MODULE = CFClient PACKAGE = CFClient
305		325
306	PROTOTYPES: ENABLE	326	PROTOTYPES: ENABLE
…		…
416		436
417	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; )
418	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	438	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
419	}	439	}
420		440
		441	NV floor (NV x)
		442
		443	NV ceil (NV x)
		444
421	void	445	void
422	pango_init ()	446	pango_init ()
423	CODE:	447	CODE:
424	// delayed, so it can pick up new fonts added by AddFontResourceEx	448	// delayed, so it can pick up new fonts added by AddFontResourceEx
425	{	449	{
…		…
461	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	485	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
462	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	486	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
463	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	487	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
464		488
465	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	489	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
466	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	490	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
467		491
468	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	492	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
469	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	493	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
470	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	494	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
471	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	495	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
…		…
701	CODE:	725	CODE:
702	fprintf (stderr, "FATAL: %s\n", message);	726	fprintf (stderr, "FATAL: %s\n", message);
703	#ifdef _WIN32	727	#ifdef _WIN32
704	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	728	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
705	#endif	729	#endif
706	exit (1);	730	_exit (1);
		731
		732	void
		733	_exit (int retval)
		734	CODE:
		735	_exit (retval);
707		736
708	MODULE = CFClient PACKAGE = CFClient::Font	737	MODULE = CFClient PACKAGE = CFClient::Font
709		738
710	CFClient::Font	739	CFClient::Font
711	new_from_file (SV class, char path, int id = 0)	740	new_from_file (SV class, char path, int id = 0)
…		…
976	}	1005	}
977		1006
978	MODULE = CFClient PACKAGE = CFClient::Texture	1007	MODULE = CFClient PACKAGE = CFClient::Texture
979		1008
980	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
981	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.)
982	PROTOTYPE: $$$;$$	1048	PROTOTYPE: $$$;$$
983	ALIAS:	1049	ALIAS:
984	draw_quad_alpha = 1	1050	draw_quad_alpha = 1
985	draw_quad_alpha_premultiplied = 2	1051	draw_quad_alpha_premultiplied = 2
986	CODE:	1052	CODE:
…		…
1051	DESTROY (CFClient::Map self)	1117	DESTROY (CFClient::Map self)
1052	CODE:	1118	CODE:
1053	{	1119	{
1054	map_clear (self);	1120	map_clear (self);
1055	Safefree (self->face);	1121	Safefree (self->face);
		1122	Safefree (self->tex);
1056	Safefree (self);	1123	Safefree (self);
1057	}	1124	}
1058		1125
1059	void	1126	void
1060	clear (CFClient::Map self)	1127	clear (CFClient::Map self)
…		…
1267	OUTPUT:	1334	OUTPUT:
1268	RETVAL	1335	RETVAL
1269		1336
1270	void	1337	void
1271	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)
1272	PPCODE:	1339	CODE:
1273	{	1340	{
1274	int vx, vy;	1341	int vx, vy;
1275	int x, y, z;	1342	int x, y, z;
1276	int last_name;	1343	int last_name;
1277	mapface face;	1344	mapface face;
1278	int sw4 = (sw + 3) & ~3;
1279	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1280	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1281		1345
1282	memset (darkness, 255, sw4 * sh);
1283	SvPOK_only (darkness_sv);
1284	SvCUR_set (darkness_sv, sw4 * sh);
1285
1286	vx = self->x + (self->w - sw) / 2 - shift_x;	1346	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1287	vy = self->y + (self->h - sh) / 2 - shift_y;	1347	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1288		1348
1289	/*	1349	/*
1290	int vx = self->vx = self->w >= sw	1350	int vx = self->vx = self->w >= sw
1291	? self->x + (self->w - sw) / 2	1351	? self->x + (self->w - sw) / 2
1292	: 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));
…		…
1296	: 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));
1297	*/	1357	*/
1298		1358
1299	glColor4ub (255, 255, 255, 255);	1359	glColor4ub (255, 255, 255, 255);
1300		1360
		1361	glEnable (GL_BLEND);
1301	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1362	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1302	glEnable (GL_BLEND);
1303	glEnable (GL_TEXTURE_2D);	1363	glEnable (GL_TEXTURE_2D);
1304	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1364	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1305		1365
1306	glBegin (GL_QUADS);	1366	glBegin (GL_QUADS);
1307		1367
…		…
1315		1375
1316	for (x = 0; x < sw; x++)	1376	for (x = 0; x < sw; x++)
1317	if (row->c0 <= x + vx && x + vx < row->c1)	1377	if (row->c0 <= x + vx && x + vx < row->c1)
1318	{	1378	{
1319	mapcell *cell = row->col + (x + vx - row->c0);	1379	mapcell *cell = row->col + (x + vx - row->c0);
1320
1321	darkness[y * sw4 + x] = cell->darkness < 0
1322	? 255 - FOW_DARKNESS
1323	: 255 - cell->darkness;
1324		1380
1325	face = cell->face [z];	1381	face = cell->face [z];
1326		1382
1327	if (face)	1383	if (face)
1328	{	1384	{
…		…
1349		1405
1350	glEnd ();	1406	glEnd ();
1351		1407
1352	glDisable (GL_TEXTURE_2D);	1408	glDisable (GL_TEXTURE_2D);
1353	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	}
1354		1504
1355	EXTEND (SP, 3);	1505	EXTEND (SP, 3);
1356	PUSHs (sv_2mortal (newSViv (sw4)));	1506	PUSHs (sv_2mortal (newSViv (sw4)));
1357	PUSHs (sv_2mortal (newSViv (sh)));	1507	PUSHs (sv_2mortal (newSViv (sh)));
1358	PUSHs (darkness_sv);	1508	PUSHs (darkness_sv);
…		…
1575	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1725	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1576	const_iv (GL_ONE_MINUS_DST_ALPHA),	1726	const_iv (GL_ONE_MINUS_DST_ALPHA),
1577	const_iv (GL_SRC_ALPHA_SATURATE),	1727	const_iv (GL_SRC_ALPHA_SATURATE),
1578	const_iv (GL_RGB),	1728	const_iv (GL_RGB),
1579	const_iv (GL_RGBA),	1729	const_iv (GL_RGBA),
		1730	const_iv (GL_RGBA4),
		1731	const_iv (GL_RGBA8),
		1732	const_iv (GL_RGB5_A1),
1580	const_iv (GL_UNSIGNED_BYTE),	1733	const_iv (GL_UNSIGNED_BYTE),
1581	const_iv (GL_UNSIGNED_SHORT),	1734	const_iv (GL_UNSIGNED_SHORT),
1582	const_iv (GL_UNSIGNED_INT),	1735	const_iv (GL_UNSIGNED_INT),
1583	const_iv (GL_ALPHA),	1736	const_iv (GL_ALPHA),
1584	const_iv (GL_INTENSITY),	1737	const_iv (GL_INTENSITY),
…		…
1658	OUTPUT:	1811	OUTPUT:
1659	RETVAL	1812	RETVAL
1660		1813
1661	int glGetError ()	1814	int glGetError ()
1662		1815
		1816	void glFinish ()
		1817
1663	void glClear (int mask)	1818	void glClear (int mask)
1664		1819
1665	void glClearColor (float r, float g, float b, float a = 1.0)	1820	void glClearColor (float r, float g, float b, float a = 1.0)
1666	PROTOTYPE: @	1821	PROTOTYPE: @
1667		1822

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.108 by root, Wed Jun 7 23:28:12 2006 UTC vs. Revision 1.118 by root, Thu Jun 15 15:47:35 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.108 by root, Wed Jun 7 23:28:12 2006 UTC vs.
Revision 1.118 by root, Thu Jun 15 15:47:35 2006 UTC