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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.85 by root, Fri May 19 03:49:47 2006 UTC vs.
Revision 1.123 by root, Wed Jun 28 23:41:11 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
…		…
470		531
471	++m;	532	++m;
472	}	533	}
473	}	534	}
474		535
		536	char *
		537	SDL_GetError ()
		538
475	int	539	int
476	SDL_SetVideoMode (int w, int h, int fullscreen)	540	SDL_SetVideoMode (int w, int h, int fullscreen)
477	CODE:	541	CODE:
478	RETVAL = !!SDL_SetVideoMode (	542	RETVAL = !!SDL_SetVideoMode (
479	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	543	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
480	);	544	);
		545	if (RETVAL)
		546	{
481	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	}
482	OUTPUT:	552	OUTPUT:
483	RETVAL	553	RETVAL
484		554
485	void	555	void
486	SDL_GL_SwapBuffers ()	556	SDL_GL_SwapBuffers ()
		557
		558	char *
		559	SDL_GetKeyName (int sym)
487		560
488	void	561	void
489	SDL_PollEvent ()	562	SDL_PollEvent ()
490	PPCODE:	563	PPCODE:
491	{	564	{
…		…
510	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	583	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
511	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	584	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
512	break;	585	break;
513		586
514	case SDL_MOUSEMOTION:	587	case SDL_MOUSEMOTION:
		588	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		589
515	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	590	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
516	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	591	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
517	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	592	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
518	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	593	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
519	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	594	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
520	break;	595	break;
521		596
522	case SDL_MOUSEBUTTONDOWN:	597	case SDL_MOUSEBUTTONDOWN:
523	case SDL_MOUSEBUTTONUP:	598	case SDL_MOUSEBUTTONUP:
		599	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		600
524	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	601	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
525	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	602	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
526	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	603	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
527	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	604	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
528	break;	605	break;
…		…
554	lowdelay (int fd, int val = 1)	631	lowdelay (int fd, int val = 1)
555	CODE:	632	CODE:
556	#ifndef _WIN32	633	#ifndef _WIN32
557	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	634	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
558	#endif	635	#endif
559
560	char *
561	gl_version ()
562	CODE:
563	RETVAL = (char *)glGetString (GL_VERSION);
564	OUTPUT:
565	RETVAL
566
567	char *
568	gl_extensions ()
569	CODE:
570	RETVAL = (char *)glGetString (GL_EXTENSIONS);
571	OUTPUT:
572	RETVAL
573		636
574	void	637	void
575	add_font (char *file)	638	add_font (char *file)
576	CODE:	639	CODE:
577	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	640	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
670	}	733	}
671		734
672	void	735	void
673	error (char *message)	736	error (char *message)
674	CODE:	737	CODE:
		738	fprintf (stderr, "ERROR: %s\n", message);
675	#ifdef _WIN32	739	#ifdef _WIN32
676	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	740	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
677	#else
678	fprintf (stderr, "ERROR: %s\n", message);
679	#endif	741	#endif
680		742
681	void	743	void
682	fatal (char *message)	744	fatal (char *message)
683	CODE:	745	CODE:
		746	fprintf (stderr, "FATAL: %s\n", message);
684	#ifdef _WIN32	747	#ifdef _WIN32
685	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	748	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
686	#else
687	fprintf (stderr, "FATAL: %s\n", message);
688	#endif	749	#endif
689	exit (1);	750	_exit (1);
		751
		752	void
		753	_exit (int retval)
		754	CODE:
		755	_exit (retval);
690		756
691	MODULE = CFClient PACKAGE = CFClient::Font	757	MODULE = CFClient PACKAGE = CFClient::Font
692		758
693	CFClient::Font	759	CFClient::Font
694	new_from_file (SV class, char path, int id = 0)	760	new_from_file (SV class, char path, int id = 0)
…		…
764	char *text = SvPVutf8 (text_, textlen);	830	char *text = SvPVutf8 (text_, textlen);
765		831
766	pango_layout_set_markup (self->pl, text, textlen);	832	pango_layout_set_markup (self->pl, text, textlen);
767	}	833	}
768		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 = 4;
		843
		844	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		845	{
		846	PangoRectangle inkrect, rect;
		847	PangoAttribute *attr;
		848
		849	int x = SvIV (ST (arg - 3));
		850	int y = SvIV (ST (arg - 2));
		851	int w = SvIV (ST (arg - 1));
		852	int h = SvIV (ST (arg ));
		853
		854	inkrect.x = 0;
		855	inkrect.y = 0;
		856	inkrect.width = 0;
		857	inkrect.height = 0;
		858
		859	rect.x = x * PANGO_SCALE;
		860	rect.y = y * PANGO_SCALE;
		861	rect.width = w * PANGO_SCALE;
		862	rect.height = h * PANGO_SCALE;
		863
		864	if (!attrs)
		865	attrs = pango_layout_get_attributes (self->pl);
		866
		867	attr = pango_attr_shape_new (&inkrect, &rect);
		868	attr->start_index = pos - text;
		869	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		870	pango_attr_list_insert (attrs, attr);
		871
		872	arg += 4;
		873	pos += sizeof (OBJ_STR) - 1;
		874	}
		875
		876	if (attrs)
		877	pango_layout_set_attributes (self->pl, attrs);
		878	}
		879
		880	void
		881	get_shapes (CFClient::Layout self)
		882	PPCODE:
		883	{
		884	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		885
		886	do
		887	{
		888	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		889
		890	if (run && shape_attr_p (run))
		891	{
		892	PangoRectangle extents;
		893	pango_layout_iter_get_run_extents (iter, 0, &extents);
		894
		895	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		896	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		897	}
		898	}
		899	while (pango_layout_iter_next_run (iter));
		900
		901	pango_layout_iter_free (iter);
		902	}
		903
		904	int
		905	has_wrapped (CFClient::Layout self)
		906	CODE:
		907	{
		908	int lines = 1;
		909	const char *text = pango_layout_get_text (self->pl);
		910
		911	while (*text)
		912	lines += *text++ == '\n';
		913
		914	RETVAL = lines < pango_layout_get_line_count (self->pl);
		915	}
		916	OUTPUT:
		917	RETVAL
		918
769	SV *	919	SV *
770	get_text (CFClient::Layout self)	920	get_text (CFClient::Layout self)
771	CODE:	921	CODE:
772	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	922	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
773	SvUTF8_on (RETVAL);	923	sv_utf8_decode (RETVAL);
774	OUTPUT:	924	OUTPUT:
775	RETVAL	925	RETVAL
776		926
777	void	927	void
778	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	928	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
…		…
842	PUSHs (sv_2mortal (newSViv (w)));	992	PUSHs (sv_2mortal (newSViv (w)));
843	PUSHs (sv_2mortal (newSViv (h)));	993	PUSHs (sv_2mortal (newSViv (h)));
844	}	994	}
845		995
846	int	996	int
		997	descent (CFClient::Layout self)
		998	CODE:
		999	{
		1000	PangoRectangle rect;
		1001	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1002	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1003	RETVAL = PANGO_DESCENT (rect);
		1004	}
		1005	OUTPUT:
		1006	RETVAL
		1007
		1008	int
847	xy_to_index (CFClient::Layout self, int x, int y)	1009	xy_to_index (CFClient::Layout self, int x, int y)
848	CODE:	1010	CODE:
849	{	1011	{
850	int index, trailing;	1012	int index, trailing;
851	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1013	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
…		…
904		1066
905	while (p < e)	1067	while (p < e)
906	{	1068	{
907	uint32_t rgba = *p;	1069	uint32_t rgba = *p;
908	rgba = (rgba >> 24) \| (rgba << 8);	1070	rgba = (rgba >> 24) \| (rgba << 8);
		1071	#if 0
		1072	#ifdef _WIN32
		1073	{//D
		1074	uint8_t r = rgba >> 24;
		1075	uint8_t g = rgba >> 16;
		1076	uint8_t b = rgba >> 8;
		1077	uint8_t a = rgba >> 0;
		1078
		1079	rgba = (rgba & 0xffffff00) \| a;
		1080	}
		1081	#endif
		1082	#endif
909	rgba = SDL_SwapBE32 (rgba);	1083	rgba = SDL_SwapBE32 (rgba);
910	*p++ = rgba;	1084	*p++ = rgba;
911	}	1085	}
912	}	1086	}
913		1087
…		…
947	}	1121	}
948		1122
949	MODULE = CFClient PACKAGE = CFClient::Texture	1123	MODULE = CFClient PACKAGE = CFClient::Texture
950		1124
951	void	1125	void
		1126	pad2pot (SV data_, SV w_, SV *h_)
		1127	CODE:
		1128	{
		1129	int ow = SvIV (w_);
		1130	int oh = SvIV (h_);
		1131
		1132	if (ow && oh)
		1133	{
		1134	int nw = minpot (ow);
		1135	int nh = minpot (oh);
		1136
		1137	if (nw != ow \|\| nh != oh)
		1138	{
		1139	if (SvOK (data_))
		1140	{
		1141	STRLEN datalen;
		1142	char *data = SvPVbyte (data_, datalen);
		1143	int bpp = datalen / (ow * oh);
		1144	SV result_ = sv_2mortal (newSV (nw nh * bpp));
		1145
		1146	SvPOK_only (result_);
		1147	SvCUR_set (result_, nw * nh * bpp);
		1148
		1149	memset (SvPVX (result_), 0, nw * nh * bpp);
		1150	while (oh--)
		1151	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1152
		1153	sv_setsv (data_, result_);
		1154	}
		1155
		1156	sv_setiv (w_, nw);
		1157	sv_setiv (h_, nh);
		1158	}
		1159	}
		1160	}
		1161
		1162	void
952	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1163	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
953	PROTOTYPE: $$$;$$	1164	PROTOTYPE: $$$;$$
954	ALIAS:	1165	ALIAS:
955	draw_quad_alpha = 1	1166	draw_quad_alpha = 1
956	draw_quad_alpha_premultiplied = 2	1167	draw_quad_alpha_premultiplied = 2
957	CODE:	1168	CODE:
958	{	1169	{
959	HV hv = (HV )SvRV (self);	1170	HV hv = (HV )SvRV (self);
960	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1171	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
961	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1172	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
962	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1173	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
963	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
964		1174
965	if (items < 5)	1175	if (items < 5)
966	{	1176	{
967	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1177	w = SvNV (*hv_fetch (hv, "w", 1, 1));
968	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1178	h = SvNV (*hv_fetch (hv, "h", 1, 1));
969	}	1179	}
970		1180
971	if (ix)	1181	if (ix)
972	{	1182	{
973	glEnable (GL_BLEND);	1183	glEnable (GL_BLEND);
		1184
		1185	if (ix == 2)
974	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1186	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1187	else
		1188	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1189	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1190
		1191	glEnable (GL_ALPHA_TEST);
		1192	glAlphaFunc (GL_GREATER, 0.01f);
975	}	1193	}
976		1194
977	glBindTexture (GL_TEXTURE_2D, name);	1195	glBindTexture (GL_TEXTURE_2D, name);
978
979	if (wrap_mode)
980	{
981	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
982	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
983	}
984		1196
985	glBegin (GL_QUADS);	1197	glBegin (GL_QUADS);
986	glTexCoord2f (0, 0); glVertex2f (x , y );	1198	glTexCoord2f (0, 0); glVertex2f (x , y );
987	glTexCoord2f (0, t); glVertex2f (x , y + h);	1199	glTexCoord2f (0, t); glVertex2f (x , y + h);
988	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1200	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
989	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1201	glTexCoord2f (s, 0); glVertex2f (x + w, y );
990	glEnd ();	1202	glEnd ();
991		1203
992	if (ix)	1204	if (ix)
		1205	{
		1206	glDisable (GL_ALPHA_TEST);
993	glDisable (GL_BLEND);	1207	glDisable (GL_BLEND);
		1208	}
994	}	1209	}
995		1210
996	MODULE = CFClient PACKAGE = CFClient::Map	1211	MODULE = CFClient PACKAGE = CFClient::Map
997		1212
998	CFClient::Map	1213	CFClient::Map
…		…
1018	DESTROY (CFClient::Map self)	1233	DESTROY (CFClient::Map self)
1019	CODE:	1234	CODE:
1020	{	1235	{
1021	map_clear (self);	1236	map_clear (self);
1022	Safefree (self->face);	1237	Safefree (self->face);
		1238	Safefree (self->tex);
1023	Safefree (self);	1239	Safefree (self);
1024	}	1240	}
1025		1241
1026	void	1242	void
1027	clear (CFClient::Map self)	1243	clear (CFClient::Map self)
…		…
1062	tex->r = r;	1278	tex->r = r;
1063	tex->g = g;	1279	tex->g = g;
1064	tex->b = b;	1280	tex->b = b;
1065	tex->a = a;	1281	tex->a = a;
1066	}	1282	}
		1283
		1284	// somewhat hackish, but for textures that require it, it really
		1285	// improves the look, and most others don't suffer.
		1286	glBindTexture (GL_TEXTURE_2D, name);
		1287	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1288	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1289	// use uglier nearest interpolation because linear suffers
		1290	// from transparent color bleeding and ugly wrapping effects.
		1291	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1067	}	1292	}
1068		1293
1069	int	1294	int
1070	ox (CFClient::Map self)	1295	ox (CFClient::Map self)
1071	ALIAS:	1296	ALIAS:
1072	oy = 1	1297	oy = 1
		1298	x = 2
		1299	y = 3
		1300	w = 4
		1301	h = 5
1073	CODE:	1302	CODE:
1074	switch (ix)	1303	switch (ix)
1075	{	1304	{
1076	case 0: RETVAL = self->ox; break;	1305	case 0: RETVAL = self->ox; break;
1077	case 1: RETVAL = self->oy; break;	1306	case 1: RETVAL = self->oy; break;
		1307	case 2: RETVAL = self->x; break;
		1308	case 3: RETVAL = self->y; break;
		1309	case 4: RETVAL = self->w; break;
		1310	case 5: RETVAL = self->h; break;
1078	}	1311	}
1079	OUTPUT:	1312	OUTPUT:
1080	RETVAL	1313	RETVAL
1081		1314
1082	void	1315	void
…		…
1116		1349
1117	while (data < data_end)	1350	while (data < data_end)
1118	{	1351	{
1119	flags = (data [0] << 8) + data [1]; data += 2;	1352	flags = (data [0] << 8) + data [1]; data += 2;
1120		1353
1121	x = ((flags >> 10) & 63) + self->x;	1354	x = self->x + ((flags >> 10) & 63);
1122	y = ((flags >> 4) & 63) + self->y;	1355	y = self->y + ((flags >> 4) & 63);
1123		1356
1124	cell = map_get_cell (self, x, y);	1357	cell = map_get_cell (self, x, y);
1125		1358
1126	if (flags & 15)	1359	if (flags & 15)
1127	{	1360	{
…		…
1217	OUTPUT:	1450	OUTPUT:
1218	RETVAL	1451	RETVAL
1219		1452
1220	void	1453	void
1221	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1454	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1222	PPCODE:	1455	CODE:
1223	{	1456	{
1224	int vx, vy;	1457	int vx, vy;
1225	int x, y, z;	1458	int x, y, z;
1226	int last_name;	1459	int last_name;
1227	mapface face;	1460	mapface face;
1228	int sw4 = (sw + 3) & ~3;
1229	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1230	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1231		1461
1232	memset (darkness, 255, sw4 * sh);
1233	SvPOK_only (darkness_sv);
1234	SvCUR_set (darkness_sv, sw4 * sh);
1235
1236	vx = self->x + (self->w - sw) / 2 - shift_x;	1462	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1237	vy = self->y + (self->h - sh) / 2 - shift_y;	1463	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1238		1464
1239	/*	1465	/*
1240	int vx = self->vx = self->w >= sw	1466	int vx = self->vx = self->w >= sw
1241	? self->x + (self->w - sw) / 2	1467	? self->x + (self->w - sw) / 2
1242	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1468	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1246	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1472	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1247	*/	1473	*/
1248		1474
1249	glColor4ub (255, 255, 255, 255);	1475	glColor4ub (255, 255, 255, 255);
1250		1476
		1477	glEnable (GL_BLEND);
1251	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1478	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1252	glEnable (GL_BLEND);
1253	glEnable (GL_TEXTURE_2D);	1479	glEnable (GL_TEXTURE_2D);
1254	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1480	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1255		1481
1256	glBegin (GL_QUADS);	1482	glBegin (GL_QUADS);
1257		1483
…		…
1265		1491
1266	for (x = 0; x < sw; x++)	1492	for (x = 0; x < sw; x++)
1267	if (row->c0 <= x + vx && x + vx < row->c1)	1493	if (row->c0 <= x + vx && x + vx < row->c1)
1268	{	1494	{
1269	mapcell *cell = row->col + (x + vx - row->c0);	1495	mapcell *cell = row->col + (x + vx - row->c0);
1270
1271	darkness[y * sw4 + x] = cell->darkness < 0
1272	? 255 - FOW_DARKNESS
1273	: 255 - cell->darkness;
1274		1496
1275	face = cell->face [z];	1497	face = cell->face [z];
1276		1498
1277	if (face)	1499	if (face)
1278	{	1500	{
…		…
1299		1521
1300	glEnd ();	1522	glEnd ();
1301		1523
1302	glDisable (GL_TEXTURE_2D);	1524	glDisable (GL_TEXTURE_2D);
1303	glDisable (GL_BLEND);	1525	glDisable (GL_BLEND);
		1526	}
		1527
		1528	void
		1529	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1530	CODE:
		1531	{
		1532	static float color[16][3] = {
		1533	{ 0.00F, 0.00F, 0.00F },
		1534	{ 1.00F, 1.00F, 1.00F },
		1535	{ 0.00F, 0.00F, 0.55F },
		1536	{ 1.00F, 0.00F, 0.00F },
		1537
		1538	{ 1.00F, 0.54F, 0.00F },
		1539	{ 0.11F, 0.56F, 1.00F },
		1540	{ 0.93F, 0.46F, 0.00F },
		1541	{ 0.18F, 0.54F, 0.34F },
		1542
		1543	{ 0.56F, 0.73F, 0.56F },
		1544	{ 0.80F, 0.80F, 0.80F },
		1545	{ 0.55F, 0.41F, 0.13F },
		1546	{ 0.99F, 0.77F, 0.26F },
		1547
		1548	{ 0.74F, 0.65F, 0.41F },
		1549
		1550	{ 0.00F, 1.00F, 1.00F },
		1551	{ 1.00F, 0.00F, 1.00F },
		1552	{ 1.00F, 1.00F, 0.00F },
		1553	};
		1554
		1555	int x, y;
		1556
		1557	glEnable (GL_TEXTURE_2D);
		1558	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1559	glEnable (GL_BLEND);
		1560	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1561	glBegin (GL_QUADS);
		1562
		1563	for (y = 0; y < h; y++)
		1564	for (x = 0; x < w; x++)
		1565	{
		1566	unsigned char m = data [x + y * w];
		1567
		1568	if (m)
		1569	{
		1570	float *c = color [m & 15];
		1571
		1572	float tx1 = m & 0x40 ? 0.5 : 0.;
		1573	float tx2 = tx1 + 0.5;
		1574
		1575	glColor4f (c[0], c[1], c[2], 0.75);
		1576	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1577	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1578	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1579	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1580	}
		1581	}
		1582
		1583	glEnd ();
		1584	glDisable (GL_BLEND);
		1585	glDisable (GL_TEXTURE_2D);
		1586	}
		1587
		1588	void
		1589	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1590	PPCODE:
		1591	{
		1592	int vx, vy;
		1593	int x, y;
		1594	int sw4 = (sw + 3) & ~3;
		1595	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1596	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1597
		1598	memset (darkness, 255, sw4 * sh);
		1599	SvPOK_only (darkness_sv);
		1600	SvCUR_set (darkness_sv, sw4 * sh);
		1601
		1602	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1603	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1604
		1605	for (y = 0; y < sh; y++)
		1606	if (0 <= y + vy && y + vy < self->rows)
		1607	{
		1608	maprow *row = self->row + (y + vy);
		1609
		1610	for (x = 0; x < sw; x++)
		1611	if (row->c0 <= x + vx && x + vx < row->c1)
		1612	{
		1613	mapcell *cell = row->col + (x + vx - row->c0);
		1614
		1615	darkness[y * sw4 + x] = cell->darkness < 0
		1616	? 255 - FOW_DARKNESS
		1617	: 255 - cell->darkness;
		1618	}
		1619	}
1304		1620
1305	EXTEND (SP, 3);	1621	EXTEND (SP, 3);
1306	PUSHs (sv_2mortal (newSViv (sw4)));	1622	PUSHs (sv_2mortal (newSViv (sw4)));
1307	PUSHs (sv_2mortal (newSViv (sh)));	1623	PUSHs (sv_2mortal (newSViv (sh)));
1308	PUSHs (darkness_sv);	1624	PUSHs (darkness_sv);
…		…
1509	const_iv (GL_COLOR_MATERIAL),	1825	const_iv (GL_COLOR_MATERIAL),
1510	const_iv (GL_SMOOTH),	1826	const_iv (GL_SMOOTH),
1511	const_iv (GL_FLAT),	1827	const_iv (GL_FLAT),
1512	const_iv (GL_DITHER),	1828	const_iv (GL_DITHER),
1513	const_iv (GL_BLEND),	1829	const_iv (GL_BLEND),
		1830	const_iv (GL_CULL_FACE),
1514	const_iv (GL_SCISSOR_TEST),	1831	const_iv (GL_SCISSOR_TEST),
		1832	const_iv (GL_DEPTH_TEST),
		1833	const_iv (GL_ALPHA_TEST),
		1834	const_iv (GL_NORMALIZE),
		1835	const_iv (GL_RESCALE_NORMAL),
		1836	const_iv (GL_FRONT),
		1837	const_iv (GL_BACK),
1515	const_iv (GL_AND),	1838	const_iv (GL_AND),
1516	const_iv (GL_ONE),	1839	const_iv (GL_ONE),
1517	const_iv (GL_ZERO),	1840	const_iv (GL_ZERO),
1518	const_iv (GL_SRC_ALPHA),	1841	const_iv (GL_SRC_ALPHA),
1519	const_iv (GL_SRC_ALPHA_SATURATE),	1842	const_iv (GL_DST_ALPHA),
1520	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1843	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1521	const_iv (GL_ONE_MINUS_DST_ALPHA),	1844	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1845	const_iv (GL_SRC_ALPHA_SATURATE),
1522	const_iv (GL_RGB),	1846	const_iv (GL_RGB),
1523	const_iv (GL_RGBA),	1847	const_iv (GL_RGBA),
		1848	const_iv (GL_RGBA4),
		1849	const_iv (GL_RGBA8),
		1850	const_iv (GL_RGB5_A1),
1524	const_iv (GL_UNSIGNED_BYTE),	1851	const_iv (GL_UNSIGNED_BYTE),
		1852	const_iv (GL_UNSIGNED_SHORT),
		1853	const_iv (GL_UNSIGNED_INT),
1525	const_iv (GL_ALPHA),	1854	const_iv (GL_ALPHA),
		1855	const_iv (GL_INTENSITY),
1526	const_iv (GL_LUMINANCE),	1856	const_iv (GL_LUMINANCE),
		1857	const_iv (GL_LUMINANCE_ALPHA),
1527	const_iv (GL_FLOAT),	1858	const_iv (GL_FLOAT),
1528	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1859	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1529	const_iv (GL_COMPILE),	1860	const_iv (GL_COMPILE),
1530	const_iv (GL_TEXTURE_1D),	1861	const_iv (GL_TEXTURE_1D),
1531	const_iv (GL_TEXTURE_2D),	1862	const_iv (GL_TEXTURE_2D),
…		…
1533	const_iv (GL_TEXTURE_MAG_FILTER),	1864	const_iv (GL_TEXTURE_MAG_FILTER),
1534	const_iv (GL_TEXTURE_MIN_FILTER),	1865	const_iv (GL_TEXTURE_MIN_FILTER),
1535	const_iv (GL_TEXTURE_ENV_MODE),	1866	const_iv (GL_TEXTURE_ENV_MODE),
1536	const_iv (GL_TEXTURE_WRAP_S),	1867	const_iv (GL_TEXTURE_WRAP_S),
1537	const_iv (GL_TEXTURE_WRAP_T),	1868	const_iv (GL_TEXTURE_WRAP_T),
		1869	const_iv (GL_REPEAT),
1538	const_iv (GL_CLAMP),	1870	const_iv (GL_CLAMP),
1539	const_iv (GL_REPEAT),	1871	const_iv (GL_CLAMP_TO_EDGE),
1540	const_iv (GL_NEAREST),	1872	const_iv (GL_NEAREST),
1541	const_iv (GL_LINEAR),	1873	const_iv (GL_LINEAR),
1542	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1874	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1543	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1875	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1544	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1876	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1545	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1877	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1546	const_iv (GL_GENERATE_MIPMAP),	1878	const_iv (GL_GENERATE_MIPMAP),
1547	const_iv (GL_MODULATE),	1879	const_iv (GL_MODULATE),
1548	const_iv (GL_DECAL),	1880	const_iv (GL_DECAL),
1549	const_iv (GL_REPLACE),	1881	const_iv (GL_REPLACE),
		1882	const_iv (GL_DEPTH_BUFFER_BIT),
1550	const_iv (GL_COLOR_BUFFER_BIT),	1883	const_iv (GL_COLOR_BUFFER_BIT),
1551	const_iv (GL_PROJECTION),	1884	const_iv (GL_PROJECTION),
1552	const_iv (GL_MODELVIEW),	1885	const_iv (GL_MODELVIEW),
1553	const_iv (GL_COLOR_LOGIC_OP),	1886	const_iv (GL_COLOR_LOGIC_OP),
1554	const_iv (GL_SEPARABLE_2D),	1887	const_iv (GL_SEPARABLE_2D),
1555	const_iv (GL_CONVOLUTION_2D),	1888	const_iv (GL_CONVOLUTION_2D),
1556	const_iv (GL_CONVOLUTION_BORDER_MODE),	1889	const_iv (GL_CONVOLUTION_BORDER_MODE),
1557	const_iv (GL_CONSTANT_BORDER),	1890	const_iv (GL_CONSTANT_BORDER),
1558	const_iv (GL_LINES),	1891	const_iv (GL_LINES),
		1892	const_iv (GL_LINE_LOOP),
1559	const_iv (GL_QUADS),	1893	const_iv (GL_QUADS),
1560	const_iv (GL_LINE_LOOP),	1894	const_iv (GL_QUAD_STRIP),
		1895	const_iv (GL_TRIANGLES),
		1896	const_iv (GL_TRIANGLE_STRIP),
		1897	const_iv (GL_TRIANGLE_FAN),
1561	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1898	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1562	const_iv (GL_FASTEST),	1899	const_iv (GL_FASTEST),
		1900	const_iv (GL_V2F),
		1901	const_iv (GL_V3F),
		1902	const_iv (GL_T2F_V3F),
		1903	const_iv (GL_T2F_N3F_V3F),
1563	# undef const_iv	1904	# undef const_iv
1564	};	1905	};
1565		1906
1566	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1907	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1567	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1908	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1568	}	1909	}
1569		1910
		1911	char *
		1912	gl_vendor ()
		1913	CODE:
		1914	RETVAL = (char *)glGetString (GL_VENDOR);
		1915	OUTPUT:
		1916	RETVAL
		1917
		1918	char *
		1919	gl_version ()
		1920	CODE:
		1921	RETVAL = (char *)glGetString (GL_VERSION);
		1922	OUTPUT:
		1923	RETVAL
		1924
		1925	char *
		1926	gl_extensions ()
		1927	CODE:
		1928	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1929	OUTPUT:
		1930	RETVAL
		1931
1570	int glGetError ()	1932	int glGetError ()
		1933
		1934	void glFinish ()
1571		1935
1572	void glClear (int mask)	1936	void glClear (int mask)
1573		1937
1574	void glClearColor (float r, float g, float b, float a = 1.0)	1938	void glClearColor (float r, float g, float b, float a = 1.0)
1575	PROTOTYPE: @	1939	PROTOTYPE: @
…		…
1582		1946
1583	void glHint (int target, int mode)	1947	void glHint (int target, int mode)
1584		1948
1585	void glBlendFunc (int sfactor, int dfactor)	1949	void glBlendFunc (int sfactor, int dfactor)
1586		1950
		1951	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1952	CODE:
		1953	gl_BlendFuncSeparate (sa, da, saa, daa);
		1954
		1955	void glDepthMask (int flag)
		1956
1587	void glLogicOp (int opcode)	1957	void glLogicOp (int opcode)
1588		1958
1589	void glColorMask (int red, int green, int blue, int alpha)	1959	void glColorMask (int red, int green, int blue, int alpha)
1590		1960
1591	void glMatrixMode (int mode)	1961	void glMatrixMode (int mode)
…		…
1594		1964
1595	void glPopMatrix ()	1965	void glPopMatrix ()
1596		1966
1597	void glLoadIdentity ()	1967	void glLoadIdentity ()
1598		1968
		1969	void glDrawBuffer (int buffer)
		1970
		1971	void glReadBuffer (int buffer)
		1972
1599	# near and far are due to microsofts buggy c compiler	1973	# near_ and far_ are due to microsofts buggy "c" compiler
		1974	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1975
		1976	# near_ and far_ are due to microsofts buggy "c" compiler
1600	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1977	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1601		1978
1602	void glViewport (int x, int y, int width, int height)	1979	void glViewport (int x, int y, int width, int height)
1603		1980
1604	void glScissor (int x, int y, int width, int height)	1981	void glScissor (int x, int y, int width, int height)
…		…
1619		1996
1620	void glEnd ()	1997	void glEnd ()
1621		1998
1622	void glColor (float r, float g, float b, float a = 1.0)	1999	void glColor (float r, float g, float b, float a = 1.0)
1623	PROTOTYPE: @	2000	PROTOTYPE: @
		2001	ALIAS:
		2002	glColor_premultiply = 1
1624	CODE:	2003	CODE:
		2004	if (ix)
		2005	{
		2006	r *= a;
		2007	g *= a;
		2008	b *= a;
		2009	}
		2010	// microsoft visual "c" rounds instead of truncating...
1625	glColor4ub (MIN ((int)(r * 255.f), 255),	2011	glColor4ub (MIN ((int)(r * 256.f), 255),
1626	MIN ((int)(g * 255.f), 255),	2012	MIN ((int)(g * 256.f), 255),
1627	MIN ((int)(b * 255.f), 255),	2013	MIN ((int)(b * 256.f), 255),
1628	MIN ((int)(a * 255.f), 255));	2014	MIN ((int)(a * 256.f), 255));
		2015
		2016	void glInterleavedArrays (int format, int stride, char *data)
		2017
		2018	void glDrawElements (int mode, int count, int type, char *indices)
		2019
		2020	# 1.2 void glDrawRangeElements (int mode, int start, int end
		2021
		2022	void glRasterPos (float x, float y, float z = 0.)
		2023	CODE:
		2024	glRasterPos3f (0, 0, z);
		2025	glBitmap (0, 0, 0, 0, x, y, 0);
1629		2026
1630	void glVertex (float x, float y, float z = 0.)	2027	void glVertex (float x, float y, float z = 0.)
1631	CODE:	2028	CODE:
1632	glVertex3f (x, y, z);	2029	glVertex3f (x, y, z);
1633		2030
…		…
1645		2042
1646	void glBindTexture (int target, int name)	2043	void glBindTexture (int target, int name)
1647		2044
1648	void glConvolutionParameter (int target, int pname, float params)	2045	void glConvolutionParameter (int target, int pname, float params)
1649	CODE:	2046	CODE:
1650	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2047	if (gl.ConvolutionParameterf)
		2048	gl.ConvolutionParameterf (target, pname, params);
1651		2049
1652	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2050	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1653	CODE:	2051	CODE:
1654	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2052	if (gl.ConvolutionFilter2D)
1655	(target, internalformat, width, height, format, type, data));	2053	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1656		2054
1657	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2055	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1658	CODE:	2056	CODE:
1659	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2057	if (gl.SeparableFilter2D)
1660	(target, internalformat, width, height, format, type, row, column));	2058	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1661		2059
1662	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2060	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1663		2061
1664	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2062	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1665		2063
1666	void glRasterPos (int x, int y)	2064	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1667	CODE:
1668	glRasterPos2i (x, y);
1669		2065
1670	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2066	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1671		2067
1672	int glGenTexture ()	2068	int glGenTexture ()
1673	CODE:	2069	CODE:
…		…
1700		2096
1701	void glEndList ()	2097	void glEndList ()
1702		2098
1703	void glCallList (int list)	2099	void glCallList (int list)
1704		2100
		2101

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.85 by root, Fri May 19 03:49:47 2006 UTC vs. Revision 1.123 by root, Wed Jun 28 23:41:11 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.85 by root, Fri May 19 03:49:47 2006 UTC vs.
Revision 1.123 by root, Wed Jun 28 23:41:11 2006 UTC