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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.84 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.121 by root, Fri Jun 23 20:28:19 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>
…		…
41	typedef signed int int32_t;	42	typedef signed int int32_t;
42	#endif	43	#endif
43		44
44	#include "glext.h"	45	#include "glext.h"
45		46
		47	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
		48
46	#define FOW_DARKNESS 32	49	#define FOW_DARKNESS 32
47		50
48	#define MAP_EXTEND_X 32	51	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	52	#define MAP_EXTEND_Y 512
50		53
51	#define MIN_FONT_HEIGHT 10	54	#define MIN_FONT_HEIGHT 10
52		55
53	#define GL_CALL(type,func,args) \	56	static struct
54	{ \	57	{
55	static int init_; \	58	#define GL_FUNC(ptr,name) ptr name;
56	static type fptr_; \	59	#include "glfunc.h"
57	\	60	#undef GL_FUNC
58	if (!init_) \	61	} gl;
59	{ \	62
60	init_ = 1; \	63	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \	64	{
62	} \	65	if (gl.BlendFuncSeparate)
63	\	66	gl.BlendFuncSeparate (sa, da, saa, daa);
64	if (fptr_) \	67	else if (gl.BlendFuncSeparateEXT)
65	fptr_ args; \	68	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	}	69	else
		70	glBlendFunc (sa, da);
		71	}
67		72
68	typedef Mix_Chunk *CFClient__MixChunk;	73	typedef Mix_Chunk *CFClient__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	74	typedef Mix_Music *CFClient__MixMusic;
70		75
71	typedef PangoFontDescription *CFClient__Font;	76	typedef PangoFontDescription *CFClient__Font;
		77
		78	static int
		79	shape_attr_p (PangoLayoutRun *run)
		80	{
		81	GSList *attrs = run->item->analysis.extra_attrs;
		82
		83	while (attrs)
		84	{
		85	PangoAttribute *attr = attrs->data;
		86
		87	if (attr->klass->type == PANGO_ATTR_SHAPE)
		88	return 1;
		89
		90	attrs = attrs->next;
		91	}
		92
		93	return 0;
		94	}
72		95
73	typedef struct cf_layout {	96	typedef struct cf_layout {
74	PangoLayout *pl; // either derived from a cairo or ft2 context	97	PangoLayout *pl; // either derived from a cairo or ft2 context
75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)	98	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76	float r, g, b, a; // default color for rgba mode	99	float r, g, b, a; // default color for rgba mode
…		…
83	static PangoFontMap ft2_fontmap, cairo_fontmap;	106	static PangoFontMap ft2_fontmap, cairo_fontmap;
84		107
85	static void	108	static void
86	substitute_func (FcPattern *pattern, gpointer data)	109	substitute_func (FcPattern *pattern, gpointer data)
87	{	110	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	111	FcPatternAddBool (pattern, FC_HINTING, 1);
		112	#ifdef FC_HINT_STYLE
		113	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		114	#endif
89	#ifdef _WIN32	115	#ifdef _WIN32
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	116	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91	#else	117	#else
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	118	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif	119	#endif
…		…
294	ev.code = 1;	320	ev.code = 1;
295	ev.data1 = (void *)(long)channel;	321	ev.data1 = (void *)(long)channel;
296	ev.data2 = 0;	322	ev.data2 = 0;
297		323
298	SDL_PushEvent ((SDL_Event *)&ev);	324	SDL_PushEvent ((SDL_Event *)&ev);
		325	}
		326
		327	static unsigned int
		328	minpot (unsigned int n)
		329	{
		330	if (!n)
		331	return 0;
		332
		333	--n;
		334
		335	n \|= n >> 1;
		336	n \|= n >> 2;
		337	n \|= n >> 4;
		338	n \|= n >> 8;
		339	n \|= n >> 16;
		340
		341	return n + 1;
299	}	342	}
300		343
301	MODULE = CFClient PACKAGE = CFClient	344	MODULE = CFClient PACKAGE = CFClient
302		345
303	PROTOTYPES: ENABLE	346	PROTOTYPES: ENABLE
…		…
413		456
414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	457	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	458	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416	}	459	}
417		460
		461	NV floor (NV x)
		462
		463	NV ceil (NV x)
		464
418	void	465	void
419	pango_init ()	466	pango_init ()
420	CODE:	467	CODE:
421	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx	468	// delayed, so it can pick up new fonts added by AddFontResourceEx
		469	{
		470	{
423	ft2_fontmap = pango_ft2_font_map_new ();	471	ft2_fontmap = pango_ft2_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	472	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);	473	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426		474	}
		475	{
		476	cairo_font_options_t *fopt = cairo_font_options_create ();
427	cairo_fontmap = pango_cairo_font_map_get_default ();	477	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);	478	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
		479	#ifdef _WIN32
		480	// cairo looks like shit eaten twice on windows
		481	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
		482	#else
		483	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
		484	#endif
		485	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
		486	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
		487	pango_cairo_context_set_font_options (cairo_context, fopt);
		488	cairo_font_options_destroy (fopt);
		489	}
429	}	490	}
430		491
431	int	492	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	493	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
433		494
…		…
443	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	504	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	505	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	506	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	507	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		508
		509	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		510	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		511
448	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	512	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
449	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	513	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
450	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	514	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	515	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
452		516
453	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	517	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
454	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
455	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
456		518
457	SDL_EnableUNICODE (1);	519	SDL_EnableUNICODE (1);
458	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	520	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
459		521
460	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	522	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
469		531
470	++m;	532	++m;
471	}	533	}
472	}	534	}
473		535
		536	char *
		537	SDL_GetError ()
		538
474	int	539	int
475	SDL_SetVideoMode (int w, int h, int fullscreen)	540	SDL_SetVideoMode (int w, int h, int fullscreen)
476	CODE:	541	CODE:
477	RETVAL = !!SDL_SetVideoMode (	542	RETVAL = !!SDL_SetVideoMode (
478	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	543	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
479	);	544	);
		545	if (RETVAL)
		546	{
480	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	547	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		548	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		549	# include "glfunc.h"
		550	# undef GL_FUNC
		551	}
481	OUTPUT:	552	OUTPUT:
482	RETVAL	553	RETVAL
483		554
484	void	555	void
485	SDL_GL_SwapBuffers ()	556	SDL_GL_SwapBuffers ()
		557
		558	char *
		559	SDL_GetKeyName (int sym)
486		560
487	void	561	void
488	SDL_PollEvent ()	562	SDL_PollEvent ()
489	PPCODE:	563	PPCODE:
490	{	564	{
…		…
509	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	583	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
510	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	584	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
511	break;	585	break;
512		586
513	case SDL_MOUSEMOTION:	587	case SDL_MOUSEMOTION:
		588	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		589
514	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	590	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
515	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	591	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
516	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	592	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
517	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	593	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
518	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	594	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
519	break;	595	break;
520		596
521	case SDL_MOUSEBUTTONDOWN:	597	case SDL_MOUSEBUTTONDOWN:
522	case SDL_MOUSEBUTTONUP:	598	case SDL_MOUSEBUTTONUP:
		599	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		600
523	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	601	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
524	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	602	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
525	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	603	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
526	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	604	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
527	break;	605	break;
…		…
553	lowdelay (int fd, int val = 1)	631	lowdelay (int fd, int val = 1)
554	CODE:	632	CODE:
555	#ifndef _WIN32	633	#ifndef _WIN32
556	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	634	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
557	#endif	635	#endif
558
559	char *
560	gl_version ()
561	CODE:
562	RETVAL = (char *)glGetString (GL_VERSION);
563	OUTPUT:
564	RETVAL
565
566	char *
567	gl_extensions ()
568	CODE:
569	RETVAL = (char *)glGetString (GL_EXTENSIONS);
570	OUTPUT:
571	RETVAL
572		636
573	void	637	void
574	add_font (char *file)	638	add_font (char *file)
575	CODE:	639	CODE:
576	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	640	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
669	}	733	}
670		734
671	void	735	void
672	error (char *message)	736	error (char *message)
673	CODE:	737	CODE:
		738	fprintf (stderr, "ERROR: %s\n", message);
674	#ifdef _WIN32	739	#ifdef _WIN32
675	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	740	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
676	#else
677	fprintf (stderr, "ERROR: %s\n", message);
678	#endif	741	#endif
679		742
680	void	743	void
681	fatal (char *message)	744	fatal (char *message)
682	CODE:	745	CODE:
		746	fprintf (stderr, "FATAL: %s\n", message);
683	#ifdef _WIN32	747	#ifdef _WIN32
684	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	748	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
685	#else
686	fprintf (stderr, "FATAL: %s\n", message);
687	#endif	749	#endif
688	exit (1);	750	_exit (1);
		751
		752	void
		753	_exit (int retval)
		754	CODE:
		755	_exit (retval);
689		756
690	MODULE = CFClient PACKAGE = CFClient::Font	757	MODULE = CFClient PACKAGE = CFClient::Font
691		758
692	CFClient::Font	759	CFClient::Font
693	new_from_file (SV class, char path, int id = 0)	760	new_from_file (SV class, char path, int id = 0)
…		…
763	char *text = SvPVutf8 (text_, textlen);	830	char *text = SvPVutf8 (text_, textlen);
764		831
765	pango_layout_set_markup (self->pl, text, textlen);	832	pango_layout_set_markup (self->pl, text, textlen);
766	}	833	}
767		834
		835	void
		836	set_shapes (CFClient::Layout self, ...)
		837	CODE:
		838	{
		839	PangoAttrList *attrs = 0;
		840	const char *text = pango_layout_get_text (self->pl);
		841	const char *pos = text;
		842	int arg = 2;
		843
		844	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		845	{
		846	PangoRectangle rect;
		847	PangoAttribute *attr;
		848
		849	int w = SvIV (ST (arg - 1));
		850	int h = SvIV (ST (arg));
		851
		852	arg += 2;
		853
		854	rect.x = 0;
		855	rect.y = -h * PANGO_SCALE;
		856	rect.width = w * PANGO_SCALE;
		857	rect.height = h * PANGO_SCALE;
		858
		859	if (!attrs)
		860	attrs = pango_layout_get_attributes (self->pl);
		861
		862	attr = pango_attr_shape_new (&rect, &rect);
		863	attr->start_index = pos - text;
		864	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		865	pango_attr_list_insert (attrs, attr);
		866
		867	pos += sizeof (OBJ_STR) - 1;
		868	}
		869
		870	if (attrs)
		871	pango_layout_set_attributes (self->pl, attrs);
		872	}
		873
		874	void
		875	get_shapes (CFClient::Layout self)
		876	PPCODE:
		877	{
		878	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		879
		880	do
		881	{
		882	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		883
		884	if (run && shape_attr_p (run))
		885	{
		886	PangoRectangle extents;
		887	pango_layout_iter_get_run_extents (iter, 0, &extents);
		888
		889	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		890	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		891	}
		892	}
		893	while (pango_layout_iter_next_run (iter));
		894
		895	pango_layout_iter_free (iter);
		896	}
		897
		898	int
		899	has_wrapped (CFClient::Layout self)
		900	CODE:
		901	{
		902	int lines = 1;
		903	const char *text = pango_layout_get_text (self->pl);
		904
		905	while (*text)
		906	lines += *text++ == '\n';
		907
		908	RETVAL = lines < pango_layout_get_line_count (self->pl);
		909	}
		910	OUTPUT:
		911	RETVAL
		912
768	SV *	913	SV *
769	get_text (CFClient::Layout self)	914	get_text (CFClient::Layout self)
770	CODE:	915	CODE:
771	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	916	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
772	SvUTF8_on (RETVAL);	917	sv_utf8_decode (RETVAL);
773	OUTPUT:	918	OUTPUT:
774	RETVAL	919	RETVAL
775		920
776	void	921	void
777	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	922	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
…		…
903		1048
904	while (p < e)	1049	while (p < e)
905	{	1050	{
906	uint32_t rgba = *p;	1051	uint32_t rgba = *p;
907	rgba = (rgba >> 24) \| (rgba << 8);	1052	rgba = (rgba >> 24) \| (rgba << 8);
		1053	#if 0
		1054	#ifdef _WIN32
		1055	{//D
		1056	uint8_t r = rgba >> 24;
		1057	uint8_t g = rgba >> 16;
		1058	uint8_t b = rgba >> 8;
		1059	uint8_t a = rgba >> 0;
		1060
		1061	rgba = (rgba & 0xffffff00) \| a;
		1062	}
		1063	#endif
		1064	#endif
908	rgba = SDL_SwapBE32 (rgba);	1065	rgba = SDL_SwapBE32 (rgba);
909	*p++ = rgba;	1066	*p++ = rgba;
910	}	1067	}
911	}	1068	}
912		1069
…		…
946	}	1103	}
947		1104
948	MODULE = CFClient PACKAGE = CFClient::Texture	1105	MODULE = CFClient PACKAGE = CFClient::Texture
949		1106
950	void	1107	void
		1108	pad2pot (SV data_, SV w_, SV *h_)
		1109	CODE:
		1110	{
		1111	int ow = SvIV (w_);
		1112	int oh = SvIV (h_);
		1113
		1114	if (ow && oh)
		1115	{
		1116	int nw = minpot (ow);
		1117	int nh = minpot (oh);
		1118
		1119	if (nw != ow \|\| nh != oh)
		1120	{
		1121	if (SvOK (data_))
		1122	{
		1123	STRLEN datalen;
		1124	char *data = SvPVbyte (data_, datalen);
		1125	int bpp = datalen / (ow * oh);
		1126	SV result_ = sv_2mortal (newSV (nw nh * bpp));
		1127
		1128	SvPOK_only (result_);
		1129	SvCUR_set (result_, nw * nh * bpp);
		1130
		1131	memset (SvPVX (result_), 0, nw * nh * bpp);
		1132	while (oh--)
		1133	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1134
		1135	sv_setsv (data_, result_);
		1136	}
		1137
		1138	sv_setiv (w_, nw);
		1139	sv_setiv (h_, nh);
		1140	}
		1141	}
		1142	}
		1143
		1144	void
951	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1145	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
952	PROTOTYPE: $$$;$$	1146	PROTOTYPE: $$$;$$
953	ALIAS:	1147	ALIAS:
954	draw_quad_alpha = 1	1148	draw_quad_alpha = 1
955	draw_quad_alpha_premultiplied = 2	1149	draw_quad_alpha_premultiplied = 2
956	CODE:	1150	CODE:
957	{	1151	{
958	HV hv = (HV )SvRV (self);	1152	HV hv = (HV )SvRV (self);
959	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1153	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
960	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1154	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
961	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1155	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
962	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
963		1156
964	if (items < 5)	1157	if (items < 5)
965	{	1158	{
966	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1159	w = SvNV (*hv_fetch (hv, "w", 1, 1));
967	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1160	h = SvNV (*hv_fetch (hv, "h", 1, 1));
968	}	1161	}
969		1162
970	if (ix)	1163	if (ix)
971	{	1164	{
972	glEnable (GL_BLEND);	1165	glEnable (GL_BLEND);
		1166
		1167	if (ix == 2)
973	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1168	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1169	else
		1170	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1171	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1172
		1173	glEnable (GL_ALPHA_TEST);
		1174	glAlphaFunc (GL_GREATER, 0.01f);
974	}	1175	}
975		1176
976	glBindTexture (GL_TEXTURE_2D, name);	1177	glBindTexture (GL_TEXTURE_2D, name);
977
978	if (wrap_mode)
979	{
980	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
981	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
982	}
983		1178
984	glBegin (GL_QUADS);	1179	glBegin (GL_QUADS);
985	glTexCoord2f (0, 0); glVertex2f (x , y );	1180	glTexCoord2f (0, 0); glVertex2f (x , y );
986	glTexCoord2f (0, t); glVertex2f (x , y + h);	1181	glTexCoord2f (0, t); glVertex2f (x , y + h);
987	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1182	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
988	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1183	glTexCoord2f (s, 0); glVertex2f (x + w, y );
989	glEnd ();	1184	glEnd ();
990		1185
991	if (ix)	1186	if (ix)
		1187	{
		1188	glDisable (GL_ALPHA_TEST);
992	glDisable (GL_BLEND);	1189	glDisable (GL_BLEND);
		1190	}
993	}	1191	}
994		1192
995	MODULE = CFClient PACKAGE = CFClient::Map	1193	MODULE = CFClient PACKAGE = CFClient::Map
996		1194
997	CFClient::Map	1195	CFClient::Map
…		…
1017	DESTROY (CFClient::Map self)	1215	DESTROY (CFClient::Map self)
1018	CODE:	1216	CODE:
1019	{	1217	{
1020	map_clear (self);	1218	map_clear (self);
1021	Safefree (self->face);	1219	Safefree (self->face);
		1220	Safefree (self->tex);
1022	Safefree (self);	1221	Safefree (self);
1023	}	1222	}
1024		1223
1025	void	1224	void
1026	clear (CFClient::Map self)	1225	clear (CFClient::Map self)
…		…
1061	tex->r = r;	1260	tex->r = r;
1062	tex->g = g;	1261	tex->g = g;
1063	tex->b = b;	1262	tex->b = b;
1064	tex->a = a;	1263	tex->a = a;
1065	}	1264	}
		1265
		1266	// somewhat hackish, but for textures that require it, it really
		1267	// improves the look, and most others don't suffer.
		1268	glBindTexture (GL_TEXTURE_2D, name);
		1269	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1270	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1271	// use uglier nearest interpolation because linear suffers
		1272	// from transparent color bleeding and ugly wrapping effects.
		1273	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1066	}	1274	}
1067		1275
1068	int	1276	int
1069	ox (CFClient::Map self)	1277	ox (CFClient::Map self)
1070	ALIAS:	1278	ALIAS:
1071	oy = 1	1279	oy = 1
		1280	x = 2
		1281	y = 3
		1282	w = 4
		1283	h = 5
1072	CODE:	1284	CODE:
1073	switch (ix)	1285	switch (ix)
1074	{	1286	{
1075	case 0: RETVAL = self->ox; break;	1287	case 0: RETVAL = self->ox; break;
1076	case 1: RETVAL = self->oy; break;	1288	case 1: RETVAL = self->oy; break;
		1289	case 2: RETVAL = self->x; break;
		1290	case 3: RETVAL = self->y; break;
		1291	case 4: RETVAL = self->w; break;
		1292	case 5: RETVAL = self->h; break;
1077	}	1293	}
1078	OUTPUT:	1294	OUTPUT:
1079	RETVAL	1295	RETVAL
1080		1296
1081	void	1297	void
…		…
1115		1331
1116	while (data < data_end)	1332	while (data < data_end)
1117	{	1333	{
1118	flags = (data [0] << 8) + data [1]; data += 2;	1334	flags = (data [0] << 8) + data [1]; data += 2;
1119		1335
1120	x = ((flags >> 10) & 63) + self->x;	1336	x = self->x + ((flags >> 10) & 63);
1121	y = ((flags >> 4) & 63) + self->y;	1337	y = self->y + ((flags >> 4) & 63);
1122		1338
1123	cell = map_get_cell (self, x, y);	1339	cell = map_get_cell (self, x, y);
1124		1340
1125	if (flags & 15)	1341	if (flags & 15)
1126	{	1342	{
…		…
1216	OUTPUT:	1432	OUTPUT:
1217	RETVAL	1433	RETVAL
1218		1434
1219	void	1435	void
1220	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1436	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1221	PPCODE:	1437	CODE:
1222	{	1438	{
1223	int vx, vy;	1439	int vx, vy;
1224	int x, y, z;	1440	int x, y, z;
1225	int last_name;	1441	int last_name;
1226	mapface face;	1442	mapface face;
1227	int sw4 = (sw + 3) & ~3;
1228	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1229	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1230		1443
1231	memset (darkness, 255, sw4 * sh);
1232	SvPOK_only (darkness_sv);
1233	SvCUR_set (darkness_sv, sw4 * sh);
1234
1235	vx = self->x + (self->w - sw) / 2 - shift_x;	1444	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1236	vy = self->y + (self->h - sh) / 2 - shift_y;	1445	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1237		1446
1238	/*	1447	/*
1239	int vx = self->vx = self->w >= sw	1448	int vx = self->vx = self->w >= sw
1240	? self->x + (self->w - sw) / 2	1449	? self->x + (self->w - sw) / 2
1241	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1450	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1245	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1454	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1246	*/	1455	*/
1247		1456
1248	glColor4ub (255, 255, 255, 255);	1457	glColor4ub (255, 255, 255, 255);
1249		1458
		1459	glEnable (GL_BLEND);
1250	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1460	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1251	glEnable (GL_BLEND);
1252	glEnable (GL_TEXTURE_2D);	1461	glEnable (GL_TEXTURE_2D);
1253	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1462	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1254		1463
1255	glBegin (GL_QUADS);	1464	glBegin (GL_QUADS);
1256		1465
…		…
1264		1473
1265	for (x = 0; x < sw; x++)	1474	for (x = 0; x < sw; x++)
1266	if (row->c0 <= x + vx && x + vx < row->c1)	1475	if (row->c0 <= x + vx && x + vx < row->c1)
1267	{	1476	{
1268	mapcell *cell = row->col + (x + vx - row->c0);	1477	mapcell *cell = row->col + (x + vx - row->c0);
1269
1270	darkness[y * sw4 + x] = cell->darkness < 0
1271	? 255 - FOW_DARKNESS
1272	: 255 - cell->darkness;
1273		1478
1274	face = cell->face [z];	1479	face = cell->face [z];
1275		1480
1276	if (face)	1481	if (face)
1277	{	1482	{
…		…
1298		1503
1299	glEnd ();	1504	glEnd ();
1300		1505
1301	glDisable (GL_TEXTURE_2D);	1506	glDisable (GL_TEXTURE_2D);
1302	glDisable (GL_BLEND);	1507	glDisable (GL_BLEND);
		1508	}
		1509
		1510	void
		1511	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1512	CODE:
		1513	{
		1514	static float color[16][3] = {
		1515	{ 0.00, 0.00, 0.00 },
		1516	{ 1.00, 1.00, 1.00 },
		1517	{ 0.00, 0.00, 0.55 },
		1518	{ 1.00, 0.00, 0.00 },
		1519
		1520	{ 1.00, 0.54, 0.00 },
		1521	{ 0.11, 0.56, 1.00 },
		1522	{ 0.93, 0.46, 0.00 },
		1523	{ 0.18, 0.54, 0.34 },
		1524
		1525	{ 0.56, 0.73, 0.56 },
		1526	{ 0.80, 0.80, 0.80 },
		1527	{ 0.55, 0.41, 0.13 },
		1528	{ 0.99, 0.77, 0.26 },
		1529
		1530	{ 0.74, 0.65, 0.41 },
		1531
		1532	{ 0.00, 1.00, 1.00 },
		1533	{ 1.00, 0.00, 1.00 },
		1534	{ 1.00, 1.00, 0.00 },
		1535	};
		1536
		1537	int x, y;
		1538
		1539	glEnable (GL_TEXTURE_2D);
		1540	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1541	glEnable (GL_BLEND);
		1542	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1543	glBegin (GL_QUADS);
		1544
		1545	for (y = 0; y < h; y++)
		1546	for (x = 0; x < w; x++)
		1547	{
		1548	unsigned char m = data [x + y * w];
		1549
		1550	if (m)
		1551	{
		1552	float *c = color [m & 15];
		1553
		1554	float tx1 = m & 0x40 ? 0.5 : 0.;
		1555	float tx2 = tx1 + 0.5;
		1556
		1557	glColor4f (c[0], c[1], c[2], 0.75);
		1558	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1559	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1560	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1561	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1562	}
		1563	}
		1564
		1565	glEnd ();
		1566	glDisable (GL_BLEND);
		1567	glDisable (GL_TEXTURE_2D);
		1568	}
		1569
		1570	void
		1571	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1572	PPCODE:
		1573	{
		1574	int vx, vy;
		1575	int x, y;
		1576	int sw4 = (sw + 3) & ~3;
		1577	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1578	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1579
		1580	memset (darkness, 255, sw4 * sh);
		1581	SvPOK_only (darkness_sv);
		1582	SvCUR_set (darkness_sv, sw4 * sh);
		1583
		1584	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1585	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1586
		1587	for (y = 0; y < sh; y++)
		1588	if (0 <= y + vy && y + vy < self->rows)
		1589	{
		1590	maprow *row = self->row + (y + vy);
		1591
		1592	for (x = 0; x < sw; x++)
		1593	if (row->c0 <= x + vx && x + vx < row->c1)
		1594	{
		1595	mapcell *cell = row->col + (x + vx - row->c0);
		1596
		1597	darkness[y * sw4 + x] = cell->darkness < 0
		1598	? 255 - FOW_DARKNESS
		1599	: 255 - cell->darkness;
		1600	}
		1601	}
1303		1602
1304	EXTEND (SP, 3);	1603	EXTEND (SP, 3);
1305	PUSHs (sv_2mortal (newSViv (sw4)));	1604	PUSHs (sv_2mortal (newSViv (sw4)));
1306	PUSHs (sv_2mortal (newSViv (sh)));	1605	PUSHs (sv_2mortal (newSViv (sh)));
1307	PUSHs (darkness_sv);	1606	PUSHs (darkness_sv);
…		…
1508	const_iv (GL_COLOR_MATERIAL),	1807	const_iv (GL_COLOR_MATERIAL),
1509	const_iv (GL_SMOOTH),	1808	const_iv (GL_SMOOTH),
1510	const_iv (GL_FLAT),	1809	const_iv (GL_FLAT),
1511	const_iv (GL_DITHER),	1810	const_iv (GL_DITHER),
1512	const_iv (GL_BLEND),	1811	const_iv (GL_BLEND),
		1812	const_iv (GL_CULL_FACE),
1513	const_iv (GL_SCISSOR_TEST),	1813	const_iv (GL_SCISSOR_TEST),
		1814	const_iv (GL_DEPTH_TEST),
		1815	const_iv (GL_ALPHA_TEST),
		1816	const_iv (GL_NORMALIZE),
		1817	const_iv (GL_RESCALE_NORMAL),
		1818	const_iv (GL_FRONT),
		1819	const_iv (GL_BACK),
1514	const_iv (GL_AND),	1820	const_iv (GL_AND),
1515	const_iv (GL_ONE),	1821	const_iv (GL_ONE),
1516	const_iv (GL_ZERO),	1822	const_iv (GL_ZERO),
1517	const_iv (GL_SRC_ALPHA),	1823	const_iv (GL_SRC_ALPHA),
1518	const_iv (GL_SRC_ALPHA_SATURATE),	1824	const_iv (GL_DST_ALPHA),
1519	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1825	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1520	const_iv (GL_ONE_MINUS_DST_ALPHA),	1826	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1827	const_iv (GL_SRC_ALPHA_SATURATE),
1521	const_iv (GL_RGB),	1828	const_iv (GL_RGB),
1522	const_iv (GL_RGBA),	1829	const_iv (GL_RGBA),
		1830	const_iv (GL_RGBA4),
		1831	const_iv (GL_RGBA8),
		1832	const_iv (GL_RGB5_A1),
1523	const_iv (GL_UNSIGNED_BYTE),	1833	const_iv (GL_UNSIGNED_BYTE),
		1834	const_iv (GL_UNSIGNED_SHORT),
		1835	const_iv (GL_UNSIGNED_INT),
1524	const_iv (GL_ALPHA),	1836	const_iv (GL_ALPHA),
		1837	const_iv (GL_INTENSITY),
1525	const_iv (GL_LUMINANCE),	1838	const_iv (GL_LUMINANCE),
		1839	const_iv (GL_LUMINANCE_ALPHA),
1526	const_iv (GL_FLOAT),	1840	const_iv (GL_FLOAT),
1527	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1841	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1528	const_iv (GL_COMPILE),	1842	const_iv (GL_COMPILE),
1529	const_iv (GL_TEXTURE_1D),	1843	const_iv (GL_TEXTURE_1D),
1530	const_iv (GL_TEXTURE_2D),	1844	const_iv (GL_TEXTURE_2D),
…		…
1532	const_iv (GL_TEXTURE_MAG_FILTER),	1846	const_iv (GL_TEXTURE_MAG_FILTER),
1533	const_iv (GL_TEXTURE_MIN_FILTER),	1847	const_iv (GL_TEXTURE_MIN_FILTER),
1534	const_iv (GL_TEXTURE_ENV_MODE),	1848	const_iv (GL_TEXTURE_ENV_MODE),
1535	const_iv (GL_TEXTURE_WRAP_S),	1849	const_iv (GL_TEXTURE_WRAP_S),
1536	const_iv (GL_TEXTURE_WRAP_T),	1850	const_iv (GL_TEXTURE_WRAP_T),
		1851	const_iv (GL_REPEAT),
1537	const_iv (GL_CLAMP),	1852	const_iv (GL_CLAMP),
1538	const_iv (GL_REPEAT),	1853	const_iv (GL_CLAMP_TO_EDGE),
1539	const_iv (GL_NEAREST),	1854	const_iv (GL_NEAREST),
1540	const_iv (GL_LINEAR),	1855	const_iv (GL_LINEAR),
1541	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1856	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1542	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1857	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1543	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1858	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1544	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1859	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1545	const_iv (GL_GENERATE_MIPMAP),	1860	const_iv (GL_GENERATE_MIPMAP),
1546	const_iv (GL_MODULATE),	1861	const_iv (GL_MODULATE),
1547	const_iv (GL_DECAL),	1862	const_iv (GL_DECAL),
1548	const_iv (GL_REPLACE),	1863	const_iv (GL_REPLACE),
		1864	const_iv (GL_DEPTH_BUFFER_BIT),
1549	const_iv (GL_COLOR_BUFFER_BIT),	1865	const_iv (GL_COLOR_BUFFER_BIT),
1550	const_iv (GL_PROJECTION),	1866	const_iv (GL_PROJECTION),
1551	const_iv (GL_MODELVIEW),	1867	const_iv (GL_MODELVIEW),
1552	const_iv (GL_COLOR_LOGIC_OP),	1868	const_iv (GL_COLOR_LOGIC_OP),
1553	const_iv (GL_SEPARABLE_2D),	1869	const_iv (GL_SEPARABLE_2D),
1554	const_iv (GL_CONVOLUTION_2D),	1870	const_iv (GL_CONVOLUTION_2D),
1555	const_iv (GL_CONVOLUTION_BORDER_MODE),	1871	const_iv (GL_CONVOLUTION_BORDER_MODE),
1556	const_iv (GL_CONSTANT_BORDER),	1872	const_iv (GL_CONSTANT_BORDER),
1557	const_iv (GL_LINES),	1873	const_iv (GL_LINES),
		1874	const_iv (GL_LINE_LOOP),
1558	const_iv (GL_QUADS),	1875	const_iv (GL_QUADS),
1559	const_iv (GL_LINE_LOOP),	1876	const_iv (GL_QUAD_STRIP),
		1877	const_iv (GL_TRIANGLES),
		1878	const_iv (GL_TRIANGLE_STRIP),
		1879	const_iv (GL_TRIANGLE_FAN),
1560	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1880	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1561	const_iv (GL_FASTEST),	1881	const_iv (GL_FASTEST),
		1882	const_iv (GL_V2F),
		1883	const_iv (GL_V3F),
		1884	const_iv (GL_T2F_V3F),
		1885	const_iv (GL_T2F_N3F_V3F),
1562	# undef const_iv	1886	# undef const_iv
1563	};	1887	};
1564		1888
1565	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1889	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1566	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1890	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1567	}	1891	}
1568		1892
		1893	char *
		1894	gl_vendor ()
		1895	CODE:
		1896	RETVAL = (char *)glGetString (GL_VENDOR);
		1897	OUTPUT:
		1898	RETVAL
		1899
		1900	char *
		1901	gl_version ()
		1902	CODE:
		1903	RETVAL = (char *)glGetString (GL_VERSION);
		1904	OUTPUT:
		1905	RETVAL
		1906
		1907	char *
		1908	gl_extensions ()
		1909	CODE:
		1910	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1911	OUTPUT:
		1912	RETVAL
		1913
1569	int glGetError ()	1914	int glGetError ()
		1915
		1916	void glFinish ()
1570		1917
1571	void glClear (int mask)	1918	void glClear (int mask)
1572		1919
1573	void glClearColor (float r, float g, float b, float a = 1.0)	1920	void glClearColor (float r, float g, float b, float a = 1.0)
1574	PROTOTYPE: @	1921	PROTOTYPE: @
…		…
1581		1928
1582	void glHint (int target, int mode)	1929	void glHint (int target, int mode)
1583		1930
1584	void glBlendFunc (int sfactor, int dfactor)	1931	void glBlendFunc (int sfactor, int dfactor)
1585		1932
		1933	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1934	CODE:
		1935	gl_BlendFuncSeparate (sa, da, saa, daa);
		1936
		1937	void glDepthMask (int flag)
		1938
1586	void glLogicOp (int opcode)	1939	void glLogicOp (int opcode)
1587		1940
1588	void glColorMask (int red, int green, int blue, int alpha)	1941	void glColorMask (int red, int green, int blue, int alpha)
1589		1942
1590	void glMatrixMode (int mode)	1943	void glMatrixMode (int mode)
…		…
1593		1946
1594	void glPopMatrix ()	1947	void glPopMatrix ()
1595		1948
1596	void glLoadIdentity ()	1949	void glLoadIdentity ()
1597		1950
		1951	void glDrawBuffer (int buffer)
		1952
		1953	void glReadBuffer (int buffer)
		1954
1598	# near and far are due to microsofts buggy c compiler	1955	# near_ and far_ are due to microsofts buggy "c" compiler
		1956	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1957
		1958	# near_ and far_ are due to microsofts buggy "c" compiler
1599	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1959	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1600		1960
1601	void glViewport (int x, int y, int width, int height)	1961	void glViewport (int x, int y, int width, int height)
1602		1962
1603	void glScissor (int x, int y, int width, int height)	1963	void glScissor (int x, int y, int width, int height)
…		…
1618		1978
1619	void glEnd ()	1979	void glEnd ()
1620		1980
1621	void glColor (float r, float g, float b, float a = 1.0)	1981	void glColor (float r, float g, float b, float a = 1.0)
1622	PROTOTYPE: @	1982	PROTOTYPE: @
		1983	ALIAS:
		1984	glColor_premultiply = 1
1623	CODE:	1985	CODE:
		1986	if (ix)
		1987	{
		1988	r *= a;
		1989	g *= a;
		1990	b *= a;
		1991	}
		1992	// microsoft visual "c" rounds instead of truncating...
1624	glColor4ub (MIN ((int)(r * 255.f), 255),	1993	glColor4ub (MIN ((int)(r * 256.f), 255),
1625	MIN ((int)(g * 255.f), 255),	1994	MIN ((int)(g * 256.f), 255),
1626	MIN ((int)(b * 255.f), 255),	1995	MIN ((int)(b * 256.f), 255),
1627	MIN ((int)(a * 255.f), 255));	1996	MIN ((int)(a * 256.f), 255));
		1997
		1998	void glInterleavedArrays (int format, int stride, char *data)
		1999
		2000	void glDrawElements (int mode, int count, int type, char *indices)
		2001
		2002	# 1.2 void glDrawRangeElements (int mode, int start, int end
		2003
		2004	void glRasterPos (float x, float y, float z = 0.)
		2005	CODE:
		2006	glRasterPos3f (0, 0, z);
		2007	glBitmap (0, 0, 0, 0, x, y, 0);
1628		2008
1629	void glVertex (float x, float y, float z = 0.)	2009	void glVertex (float x, float y, float z = 0.)
1630	CODE:	2010	CODE:
1631	glVertex3f (x, y, z);	2011	glVertex3f (x, y, z);
1632		2012
…		…
1644		2024
1645	void glBindTexture (int target, int name)	2025	void glBindTexture (int target, int name)
1646		2026
1647	void glConvolutionParameter (int target, int pname, float params)	2027	void glConvolutionParameter (int target, int pname, float params)
1648	CODE:	2028	CODE:
1649	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2029	if (gl.ConvolutionParameterf)
		2030	gl.ConvolutionParameterf (target, pname, params);
1650		2031
1651	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2032	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1652	CODE:	2033	CODE:
1653	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2034	if (gl.ConvolutionFilter2D)
1654	(target, internalformat, width, height, format, type, data));	2035	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1655		2036
1656	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2037	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1657	CODE:	2038	CODE:
1658	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2039	if (gl.SeparableFilter2D)
1659	(target, internalformat, width, height, format, type, row, column));	2040	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1660		2041
1661	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2042	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1662		2043
1663	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2044	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1664		2045
1665	void glRasterPos (int x, int y)	2046	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1666	CODE:
1667	glRasterPos2i (x, y);
1668		2047
1669	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2048	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1670		2049
1671	int glGenTexture ()	2050	int glGenTexture ()
1672	CODE:	2051	CODE:
…		…
1699		2078
1700	void glEndList ()	2079	void glEndList ()
1701		2080
1702	void glCallList (int list)	2081	void glCallList (int list)
1703		2082
		2083

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.84 by root, Wed May 17 15:18:57 2006 UTC vs. Revision 1.121 by root, Fri Jun 23 20:28:19 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.84 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.121 by root, Fri Jun 23 20:28:19 2006 UTC