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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.100 by root, Wed May 31 17:16:47 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>
…		…
48	#define MAP_EXTEND_X 32	49	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	50	#define MAP_EXTEND_Y 512
50		51
51	#define MIN_FONT_HEIGHT 10	52	#define MIN_FONT_HEIGHT 10
52		53
53	#define GL_CALL(type,func,args) \	54	static struct
54	{ \	55	{
55	static int init_; \	56	#define GL_FUNC(ptr,name) ptr name;
56	static type fptr_; \	57	#include "glfunc.h"
57	\	58	#undef GL_FUNC
58	if (!init_) \	59	} gl;
59	{ \	60
60	init_ = 1; \	61	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \	62	{
62	} \	63	if (gl.BlendFuncSeparate)
63	\	64	gl.BlendFuncSeparate (sa, da, saa, daa);
64	if (fptr_) \	65	else if (gl.BlendFuncSeparateEXT)
65	fptr_ args; \	66	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	}	67	else
		68	glBlendFunc (sa, da);
		69	}
67		70
68	typedef Mix_Chunk *CFClient__MixChunk;	71	typedef Mix_Chunk *CFClient__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	72	typedef Mix_Music *CFClient__MixMusic;
70		73
71	typedef PangoFontDescription *CFClient__Font;	74	typedef PangoFontDescription *CFClient__Font;
…		…
83	static PangoFontMap ft2_fontmap, cairo_fontmap;	86	static PangoFontMap ft2_fontmap, cairo_fontmap;
84		87
85	static void	88	static void
86	substitute_func (FcPattern *pattern, gpointer data)	89	substitute_func (FcPattern *pattern, gpointer data)
87	{	90	{
88	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
89	#ifdef _WIN32	95	#ifdef _WIN32
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91	#else	97	#else
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif	99	#endif
…		…
294	ev.code = 1;	300	ev.code = 1;
295	ev.data1 = (void *)(long)channel;	301	ev.data1 = (void *)(long)channel;
296	ev.data2 = 0;	302	ev.data2 = 0;
297		303
298	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;
299	}	322	}
300		323
301	MODULE = CFClient PACKAGE = CFClient	324	MODULE = CFClient PACKAGE = CFClient
302		325
303	PROTOTYPES: ENABLE	326	PROTOTYPES: ENABLE
…		…
413		436
414	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; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	438	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416	}	439	}
417		440
		441	NV floor (NV x)
		442
		443	NV ceil (NV x)
		444
418	void	445	void
419	pango_init ()	446	pango_init ()
420	CODE:	447	CODE:
421	{
422	// 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	{
423	ft2_fontmap = pango_ft2_font_map_new ();	451	ft2_fontmap = pango_ft2_font_map_new ();
424	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);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	453	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426		454	}
		455	{
		456	cairo_font_options_t *fopt = cairo_font_options_create ();
427	cairo_fontmap = pango_cairo_font_map_get_default ();	457	cairo_fontmap = pango_cairo_font_map_get_default ();
428	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	}
429	}	470	}
430		471
431	int	472	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	473	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
433		474
…		…
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	485	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	486	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	487	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		488
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	489	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	490	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450		491
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	492	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	493	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	494	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	495	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	520	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	521	CODE:
481	RETVAL = !!SDL_SetVideoMode (	522	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	523	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	524	);
		525	if (RETVAL)
		526	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	527	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		528	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		529	# include "glfunc.h"
		530	# undef GL_FUNC
		531	}
485	OUTPUT:	532	OUTPUT:
486	RETVAL	533	RETVAL
487		534
488	void	535	void
489	SDL_GL_SwapBuffers ()	536	SDL_GL_SwapBuffers ()
…		…
678	CODE:	725	CODE:
679	fprintf (stderr, "FATAL: %s\n", message);	726	fprintf (stderr, "FATAL: %s\n", message);
680	#ifdef _WIN32	727	#ifdef _WIN32
681	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	728	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
682	#endif	729	#endif
683	exit (1);	730	_exit (1);
		731
		732	void
		733	_exit (int retval)
		734	CODE:
		735	_exit (retval);
684		736
685	MODULE = CFClient PACKAGE = CFClient::Font	737	MODULE = CFClient PACKAGE = CFClient::Font
686		738
687	CFClient::Font	739	CFClient::Font
688	new_from_file (SV class, char path, int id = 0)	740	new_from_file (SV class, char path, int id = 0)
…		…
709	MODULE = CFClient PACKAGE = CFClient::Layout	761	MODULE = CFClient PACKAGE = CFClient::Layout
710		762
711	CFClient::Layout	763	CFClient::Layout
712	new (SV *class, int rgba = 0)	764	new (SV *class, int rgba = 0)
713	CODE:	765	CODE:
714	#if _WIN32
715	//rgba = 0;//D make stext nicer, breaks TextView
716	#endif
717	New (0, RETVAL, 1, struct cf_layout);	766	New (0, RETVAL, 1, struct cf_layout);
718		767
719	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	768	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
720	RETVAL->rgba = rgba;	769	RETVAL->rgba = rgba;
721	RETVAL->r = 1.;	770	RETVAL->r = 1.;
…		…
765		814
766	SV *	815	SV *
767	get_text (CFClient::Layout self)	816	get_text (CFClient::Layout self)
768	CODE:	817	CODE:
769	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	818	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
770	SvUTF8_on (RETVAL);	819	sv_utf8_decode (RETVAL);
771	OUTPUT:	820	OUTPUT:
772	RETVAL	821	RETVAL
773		822
774	void	823	void
775	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.)
…		…
956	}	1005	}
957		1006
958	MODULE = CFClient PACKAGE = CFClient::Texture	1007	MODULE = CFClient PACKAGE = CFClient::Texture
959		1008
960	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
961	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.)
962	PROTOTYPE: $$$;$$	1048	PROTOTYPE: $$$;$$
963	ALIAS:	1049	ALIAS:
964	draw_quad_alpha = 1	1050	draw_quad_alpha = 1
965	draw_quad_alpha_premultiplied = 2	1051	draw_quad_alpha_premultiplied = 2
966	CODE:	1052	CODE:
…		…
977	}	1063	}
978		1064
979	if (ix)	1065	if (ix)
980	{	1066	{
981	glEnable (GL_BLEND);	1067	glEnable (GL_BLEND);
		1068
		1069	if (ix == 2)
982	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1070	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1071	else
		1072	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1073	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1074
983	glEnable (GL_ALPHA_TEST);	1075	glEnable (GL_ALPHA_TEST);
984	glAlphaFunc (GL_GREATER, 0.01f);	1076	glAlphaFunc (GL_GREATER, 0.01f);
985	}	1077	}
986		1078
987	glBindTexture (GL_TEXTURE_2D, name);	1079	glBindTexture (GL_TEXTURE_2D, name);
…		…
1025	DESTROY (CFClient::Map self)	1117	DESTROY (CFClient::Map self)
1026	CODE:	1118	CODE:
1027	{	1119	{
1028	map_clear (self);	1120	map_clear (self);
1029	Safefree (self->face);	1121	Safefree (self->face);
		1122	Safefree (self->tex);
1030	Safefree (self);	1123	Safefree (self);
1031	}	1124	}
1032		1125
1033	void	1126	void
1034	clear (CFClient::Map self)	1127	clear (CFClient::Map self)
…		…
1084		1177
1085	int	1178	int
1086	ox (CFClient::Map self)	1179	ox (CFClient::Map self)
1087	ALIAS:	1180	ALIAS:
1088	oy = 1	1181	oy = 1
		1182	x = 2
		1183	y = 3
		1184	w = 4
		1185	h = 5
1089	CODE:	1186	CODE:
1090	switch (ix)	1187	switch (ix)
1091	{	1188	{
1092	case 0: RETVAL = self->ox; break;	1189	case 0: RETVAL = self->ox; break;
1093	case 1: RETVAL = self->oy; break;	1190	case 1: RETVAL = self->oy; break;
		1191	case 2: RETVAL = self->x; break;
		1192	case 3: RETVAL = self->y; break;
		1193	case 4: RETVAL = self->w; break;
		1194	case 5: RETVAL = self->h; break;
1094	}	1195	}
1095	OUTPUT:	1196	OUTPUT:
1096	RETVAL	1197	RETVAL
1097		1198
1098	void	1199	void
…		…
1233	OUTPUT:	1334	OUTPUT:
1234	RETVAL	1335	RETVAL
1235		1336
1236	void	1337	void
1237	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)
1238	PPCODE:	1339	CODE:
1239	{	1340	{
1240	int vx, vy;	1341	int vx, vy;
1241	int x, y, z;	1342	int x, y, z;
1242	int last_name;	1343	int last_name;
1243	mapface face;	1344	mapface face;
1244	int sw4 = (sw + 3) & ~3;
1245	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1246	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1247		1345
1248	memset (darkness, 255, sw4 * sh);
1249	SvPOK_only (darkness_sv);
1250	SvCUR_set (darkness_sv, sw4 * sh);
1251
1252	vx = self->x + (self->w - sw) / 2 - shift_x;	1346	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1253	vy = self->y + (self->h - sh) / 2 - shift_y;	1347	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1254		1348
1255	/*	1349	/*
1256	int vx = self->vx = self->w >= sw	1350	int vx = self->vx = self->w >= sw
1257	? self->x + (self->w - sw) / 2	1351	? self->x + (self->w - sw) / 2
1258	: 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));
…		…
1262	: 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));
1263	*/	1357	*/
1264		1358
1265	glColor4ub (255, 255, 255, 255);	1359	glColor4ub (255, 255, 255, 255);
1266		1360
		1361	glEnable (GL_BLEND);
1267	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1362	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1268	glEnable (GL_BLEND);
1269	glEnable (GL_TEXTURE_2D);	1363	glEnable (GL_TEXTURE_2D);
1270	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1364	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1271		1365
1272	glBegin (GL_QUADS);	1366	glBegin (GL_QUADS);
1273		1367
…		…
1281		1375
1282	for (x = 0; x < sw; x++)	1376	for (x = 0; x < sw; x++)
1283	if (row->c0 <= x + vx && x + vx < row->c1)	1377	if (row->c0 <= x + vx && x + vx < row->c1)
1284	{	1378	{
1285	mapcell *cell = row->col + (x + vx - row->c0);	1379	mapcell *cell = row->col + (x + vx - row->c0);
1286
1287	darkness[y * sw4 + x] = cell->darkness < 0
1288	? 255 - FOW_DARKNESS
1289	: 255 - cell->darkness;
1290		1380
1291	face = cell->face [z];	1381	face = cell->face [z];
1292		1382
1293	if (face)	1383	if (face)
1294	{	1384	{
…		…
1315		1405
1316	glEnd ();	1406	glEnd ();
1317		1407
1318	glDisable (GL_TEXTURE_2D);	1408	glDisable (GL_TEXTURE_2D);
1319	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	}
1320		1504
1321	EXTEND (SP, 3);	1505	EXTEND (SP, 3);
1322	PUSHs (sv_2mortal (newSViv (sw4)));	1506	PUSHs (sv_2mortal (newSViv (sw4)));
1323	PUSHs (sv_2mortal (newSViv (sh)));	1507	PUSHs (sv_2mortal (newSViv (sh)));
1324	PUSHs (darkness_sv);	1508	PUSHs (darkness_sv);
…		…
1535	const_iv (GL_RESCALE_NORMAL),	1719	const_iv (GL_RESCALE_NORMAL),
1536	const_iv (GL_AND),	1720	const_iv (GL_AND),
1537	const_iv (GL_ONE),	1721	const_iv (GL_ONE),
1538	const_iv (GL_ZERO),	1722	const_iv (GL_ZERO),
1539	const_iv (GL_SRC_ALPHA),	1723	const_iv (GL_SRC_ALPHA),
1540	const_iv (GL_SRC_ALPHA_SATURATE),	1724	const_iv (GL_DST_ALPHA),
1541	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1725	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1542	const_iv (GL_ONE_MINUS_DST_ALPHA),	1726	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1727	const_iv (GL_SRC_ALPHA_SATURATE),
1543	const_iv (GL_RGB),	1728	const_iv (GL_RGB),
1544	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),
1545	const_iv (GL_UNSIGNED_BYTE),	1733	const_iv (GL_UNSIGNED_BYTE),
1546	const_iv (GL_UNSIGNED_SHORT),	1734	const_iv (GL_UNSIGNED_SHORT),
1547	const_iv (GL_UNSIGNED_INT),	1735	const_iv (GL_UNSIGNED_INT),
1548	const_iv (GL_ALPHA),	1736	const_iv (GL_ALPHA),
1549	const_iv (GL_INTENSITY),	1737	const_iv (GL_INTENSITY),
…		…
1623	OUTPUT:	1811	OUTPUT:
1624	RETVAL	1812	RETVAL
1625		1813
1626	int glGetError ()	1814	int glGetError ()
1627		1815
		1816	void glFinish ()
		1817
1628	void glClear (int mask)	1818	void glClear (int mask)
1629		1819
1630	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)
1631	PROTOTYPE: @	1821	PROTOTYPE: @
1632		1822
…		…
1637	void glShadeModel (int mode)	1827	void glShadeModel (int mode)
1638		1828
1639	void glHint (int target, int mode)	1829	void glHint (int target, int mode)
1640		1830
1641	void glBlendFunc (int sfactor, int dfactor)	1831	void glBlendFunc (int sfactor, int dfactor)
		1832
		1833	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1834	CODE:
		1835	gl_BlendFuncSeparate (sa, da, saa, daa);
1642		1836
1643	void glDepthMask (int flag)	1837	void glDepthMask (int flag)
1644		1838
1645	void glLogicOp (int opcode)	1839	void glLogicOp (int opcode)
1646		1840
…		…
1680		1874
1681	void glEnd ()	1875	void glEnd ()
1682		1876
1683	void glColor (float r, float g, float b, float a = 1.0)	1877	void glColor (float r, float g, float b, float a = 1.0)
1684	PROTOTYPE: @	1878	PROTOTYPE: @
		1879	ALIAS:
		1880	glColor_premultiply = 1
1685	CODE:	1881	CODE:
		1882	if (ix)
		1883	{
		1884	r *= a;
		1885	g *= a;
		1886	b *= a;
		1887	}
1686	// microsoft visual "c" rounds instead of truncating...	1888	// microsoft visual "c" rounds instead of truncating...
1687	glColor4ub (MIN ((int)(r * 256.f), 255),	1889	glColor4ub (MIN ((int)(r * 256.f), 255),
1688	MIN ((int)(g * 256.f), 255),	1890	MIN ((int)(g * 256.f), 255),
1689	MIN ((int)(b * 256.f), 255),	1891	MIN ((int)(b * 256.f), 255),
1690	MIN ((int)(a * 256.f), 255));	1892	MIN ((int)(a * 256.f), 255));
…		…
1718		1920
1719	void glBindTexture (int target, int name)	1921	void glBindTexture (int target, int name)
1720		1922
1721	void glConvolutionParameter (int target, int pname, float params)	1923	void glConvolutionParameter (int target, int pname, float params)
1722	CODE:	1924	CODE:
1723	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1925	if (gl.ConvolutionParameterf)
		1926	gl.ConvolutionParameterf (target, pname, params);
1724		1927
1725	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1928	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1726	CODE:	1929	CODE:
1727	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1930	if (gl.ConvolutionFilter2D)
1728	(target, internalformat, width, height, format, type, data));	1931	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1729		1932
1730	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1933	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1731	CODE:	1934	CODE:
1732	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1935	if (gl.SeparableFilter2D)
1733	(target, internalformat, width, height, format, type, row, column));	1936	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1734		1937
1735	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1938	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1736		1939
1737	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1940	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1738		1941

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.100 by root, Wed May 31 17:16:47 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.100 by root, Wed May 31 17:16:47 2006 UTC vs.
Revision 1.118 by root, Thu Jun 15 15:47:35 2006 UTC