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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.103 by root, Sun Jun 4 23:05:05 2006 UTC vs.
Revision 1.117 by root, Thu Jun 15 15:33:57 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>
…		…
85	static PangoFontMap ft2_fontmap, cairo_fontmap;	86	static PangoFontMap ft2_fontmap, cairo_fontmap;
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
		93	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		94	#endif
91	#ifdef _WIN32	95	#ifdef _WIN32
92	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
93	#else	97	#else
94	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
95	#endif	99	#endif
…		…
296	ev.code = 1;	300	ev.code = 1;
297	ev.data1 = (void *)(long)channel;	301	ev.data1 = (void *)(long)channel;
298	ev.data2 = 0;	302	ev.data2 = 0;
299		303
300	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;
301	}	322	}
302		323
303	MODULE = CFClient PACKAGE = CFClient	324	MODULE = CFClient PACKAGE = CFClient
304		325
305	PROTOTYPES: ENABLE	326	PROTOTYPES: ENABLE
…		…
415		436
416	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; )
417	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	438	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
418	}	439	}
419		440
		441	NV floor (NV x)
		442
		443	NV ceil (NV x)
		444
420	void	445	void
421	pango_init ()	446	pango_init ()
422	CODE:	447	CODE:
423	{
424	// delayed, so it can pick up new fonts added by AddFontResourceEx	448	// delayed, so it can pick up new fonts added by AddFontResourceEx
		449	{
		450	{
425	ft2_fontmap = pango_ft2_font_map_new ();	451	ft2_fontmap = pango_ft2_font_map_new ();
426	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	452	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
427	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	453	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
428		454	}
		455	{
		456	cairo_font_options_t *fopt = cairo_font_options_create ();
429	cairo_fontmap = pango_cairo_font_map_get_default ();	457	cairo_fontmap = pango_cairo_font_map_get_default ();
430	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);	458	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
		459	#ifdef _WIN32
		460	// cairo looks like shit eaten twice on windows
		461	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
		462	#else
		463	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
		464	#endif
		465	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
		466	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
		467	pango_cairo_context_set_font_options (cairo_context, fopt);
		468	cairo_font_options_destroy (fopt);
		469	}
431	}	470	}
432		471
433	int	472	int
434	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	473	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
435		474
…		…
446	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	485	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
447	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	486	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
448	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	487	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
449		488
450	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	489	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	490	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
452		491
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	492	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	493	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
455	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	494	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
456	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	495	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
…		…
686	CODE:	725	CODE:
687	fprintf (stderr, "FATAL: %s\n", message);	726	fprintf (stderr, "FATAL: %s\n", message);
688	#ifdef _WIN32	727	#ifdef _WIN32
689	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	728	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
690	#endif	729	#endif
691	exit (1);	730	_exit (1);
		731
		732	void
		733	_exit (int retval)
		734	CODE:
		735	_exit (retval);
692		736
693	MODULE = CFClient PACKAGE = CFClient::Font	737	MODULE = CFClient PACKAGE = CFClient::Font
694		738
695	CFClient::Font	739	CFClient::Font
696	new_from_file (SV class, char path, int id = 0)	740	new_from_file (SV class, char path, int id = 0)
…		…
717	MODULE = CFClient PACKAGE = CFClient::Layout	761	MODULE = CFClient PACKAGE = CFClient::Layout
718		762
719	CFClient::Layout	763	CFClient::Layout
720	new (SV *class, int rgba = 0)	764	new (SV *class, int rgba = 0)
721	CODE:	765	CODE:
722	#if _WIN32
723	//rgba = 0;//D makes text nicer, breaks TextView
724	#endif
725	New (0, RETVAL, 1, struct cf_layout);	766	New (0, RETVAL, 1, struct cf_layout);
726		767
727	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	768	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
728	RETVAL->rgba = rgba;	769	RETVAL->rgba = rgba;
729	RETVAL->r = 1.;	770	RETVAL->r = 1.;
…		…
773		814
774	SV *	815	SV *
775	get_text (CFClient::Layout self)	816	get_text (CFClient::Layout self)
776	CODE:	817	CODE:
777	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	818	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
778	SvUTF8_on (RETVAL);	819	sv_utf8_decode (RETVAL);
779	OUTPUT:	820	OUTPUT:
780	RETVAL	821	RETVAL
781		822
782	void	823	void
783	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	824	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
…		…
964	}	1005	}
965		1006
966	MODULE = CFClient PACKAGE = CFClient::Texture	1007	MODULE = CFClient PACKAGE = CFClient::Texture
967		1008
968	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
969	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.)
970	PROTOTYPE: $$$;$$	1048	PROTOTYPE: $$$;$$
971	ALIAS:	1049	ALIAS:
972	draw_quad_alpha = 1	1050	draw_quad_alpha = 1
973	draw_quad_alpha_premultiplied = 2	1051	draw_quad_alpha_premultiplied = 2
974	CODE:	1052	CODE:
…		…
990		1068
991	if (ix == 2)	1069	if (ix == 2)
992	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1070	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
993	else	1071	else
994	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	1072	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
995	GL_ONE_MINUS_DST_ALPHA, GL_ONE);	1073	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
996		1074
997	glEnable (GL_ALPHA_TEST);	1075	glEnable (GL_ALPHA_TEST);
998	glAlphaFunc (GL_GREATER, 0.01f);	1076	glAlphaFunc (GL_GREATER, 0.01f);
999	}	1077	}
1000		1078
…		…
1039	DESTROY (CFClient::Map self)	1117	DESTROY (CFClient::Map self)
1040	CODE:	1118	CODE:
1041	{	1119	{
1042	map_clear (self);	1120	map_clear (self);
1043	Safefree (self->face);	1121	Safefree (self->face);
		1122	Safefree (self->tex);
1044	Safefree (self);	1123	Safefree (self);
1045	}	1124	}
1046		1125
1047	void	1126	void
1048	clear (CFClient::Map self)	1127	clear (CFClient::Map self)
…		…
1255	OUTPUT:	1334	OUTPUT:
1256	RETVAL	1335	RETVAL
1257		1336
1258	void	1337	void
1259	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)
1260	PPCODE:	1339	CODE:
1261	{	1340	{
1262	int vx, vy;	1341	int vx, vy;
1263	int x, y, z;	1342	int x, y, z;
1264	int last_name;	1343	int last_name;
1265	mapface face;	1344	mapface face;
1266	int sw4 = (sw + 3) & ~3;
1267	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1268	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1269		1345
1270	memset (darkness, 255, sw4 * sh);
1271	SvPOK_only (darkness_sv);
1272	SvCUR_set (darkness_sv, sw4 * sh);
1273
1274	vx = self->x + (self->w - sw) / 2 - shift_x;	1346	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1275	vy = self->y + (self->h - sh) / 2 - shift_y;	1347	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1276		1348
1277	/*	1349	/*
1278	int vx = self->vx = self->w >= sw	1350	int vx = self->vx = self->w >= sw
1279	? self->x + (self->w - sw) / 2	1351	? self->x + (self->w - sw) / 2
1280	: 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));
…		…
1284	: 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));
1285	*/	1357	*/
1286		1358
1287	glColor4ub (255, 255, 255, 255);	1359	glColor4ub (255, 255, 255, 255);
1288		1360
		1361	glEnable (GL_BLEND);
1289	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1362	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1290	glEnable (GL_BLEND);
1291	glEnable (GL_TEXTURE_2D);	1363	glEnable (GL_TEXTURE_2D);
1292	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1364	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1293		1365
1294	glBegin (GL_QUADS);	1366	glBegin (GL_QUADS);
1295		1367
…		…
1303		1375
1304	for (x = 0; x < sw; x++)	1376	for (x = 0; x < sw; x++)
1305	if (row->c0 <= x + vx && x + vx < row->c1)	1377	if (row->c0 <= x + vx && x + vx < row->c1)
1306	{	1378	{
1307	mapcell *cell = row->col + (x + vx - row->c0);	1379	mapcell *cell = row->col + (x + vx - row->c0);
1308
1309	darkness[y * sw4 + x] = cell->darkness < 0
1310	? 255 - FOW_DARKNESS
1311	: 255 - cell->darkness;
1312		1380
1313	face = cell->face [z];	1381	face = cell->face [z];
1314		1382
1315	if (face)	1383	if (face)
1316	{	1384	{
…		…
1337		1405
1338	glEnd ();	1406	glEnd ();
1339		1407
1340	glDisable (GL_TEXTURE_2D);	1408	glDisable (GL_TEXTURE_2D);
1341	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	float *c = color [m & 15];
		1453
		1454	float tx1 = m & 0x40 ? 0.5 : m & 0x80 ? 0.25 : 0.;
		1455	float tx2 = tx1 + 0.25;
		1456
		1457	glColor4f (c[0], c[1], c[2], 0.75);
		1458	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1459	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1460	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1461	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1462	}
		1463
		1464	glEnd ();
		1465	glDisable (GL_BLEND);
		1466	glDisable (GL_TEXTURE_2D);
		1467	}
		1468
		1469	void
		1470	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1471	PPCODE:
		1472	{
		1473	int vx, vy;
		1474	int x, y;
		1475	int sw4 = (sw + 3) & ~3;
		1476	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1477	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1478
		1479	memset (darkness, 255, sw4 * sh);
		1480	SvPOK_only (darkness_sv);
		1481	SvCUR_set (darkness_sv, sw4 * sh);
		1482
		1483	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1484	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1485
		1486	for (y = 0; y < sh; y++)
		1487	if (0 <= y + vy && y + vy < self->rows)
		1488	{
		1489	maprow *row = self->row + (y + vy);
		1490
		1491	for (x = 0; x < sw; x++)
		1492	if (row->c0 <= x + vx && x + vx < row->c1)
		1493	{
		1494	mapcell *cell = row->col + (x + vx - row->c0);
		1495
		1496	darkness[y * sw4 + x] = cell->darkness < 0
		1497	? 255 - FOW_DARKNESS
		1498	: 255 - cell->darkness;
		1499	}
		1500	}
1342		1501
1343	EXTEND (SP, 3);	1502	EXTEND (SP, 3);
1344	PUSHs (sv_2mortal (newSViv (sw4)));	1503	PUSHs (sv_2mortal (newSViv (sw4)));
1345	PUSHs (sv_2mortal (newSViv (sh)));	1504	PUSHs (sv_2mortal (newSViv (sh)));
1346	PUSHs (darkness_sv);	1505	PUSHs (darkness_sv);
…		…
1557	const_iv (GL_RESCALE_NORMAL),	1716	const_iv (GL_RESCALE_NORMAL),
1558	const_iv (GL_AND),	1717	const_iv (GL_AND),
1559	const_iv (GL_ONE),	1718	const_iv (GL_ONE),
1560	const_iv (GL_ZERO),	1719	const_iv (GL_ZERO),
1561	const_iv (GL_SRC_ALPHA),	1720	const_iv (GL_SRC_ALPHA),
1562	const_iv (GL_SRC_ALPHA_SATURATE),	1721	const_iv (GL_DST_ALPHA),
1563	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1722	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1564	const_iv (GL_ONE_MINUS_DST_ALPHA),	1723	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1724	const_iv (GL_SRC_ALPHA_SATURATE),
1565	const_iv (GL_RGB),	1725	const_iv (GL_RGB),
1566	const_iv (GL_RGBA),	1726	const_iv (GL_RGBA),
		1727	const_iv (GL_RGBA4),
		1728	const_iv (GL_RGBA8),
		1729	const_iv (GL_RGB5_A1),
1567	const_iv (GL_UNSIGNED_BYTE),	1730	const_iv (GL_UNSIGNED_BYTE),
1568	const_iv (GL_UNSIGNED_SHORT),	1731	const_iv (GL_UNSIGNED_SHORT),
1569	const_iv (GL_UNSIGNED_INT),	1732	const_iv (GL_UNSIGNED_INT),
1570	const_iv (GL_ALPHA),	1733	const_iv (GL_ALPHA),
1571	const_iv (GL_INTENSITY),	1734	const_iv (GL_INTENSITY),
…		…
1645	OUTPUT:	1808	OUTPUT:
1646	RETVAL	1809	RETVAL
1647		1810
1648	int glGetError ()	1811	int glGetError ()
1649		1812
		1813	void glFinish ()
		1814
1650	void glClear (int mask)	1815	void glClear (int mask)
1651		1816
1652	void glClearColor (float r, float g, float b, float a = 1.0)	1817	void glClearColor (float r, float g, float b, float a = 1.0)
1653	PROTOTYPE: @	1818	PROTOTYPE: @
1654		1819

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.103 by root, Sun Jun 4 23:05:05 2006 UTC vs. Revision 1.117 by root, Thu Jun 15 15:33:57 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.103 by root, Sun Jun 4 23:05:05 2006 UTC vs.
Revision 1.117 by root, Thu Jun 15 15:33:57 2006 UTC