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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.94 by root, Tue May 23 18:57:35 2006 UTC vs.
Revision 1.124 by root, Tue Jul 4 23:23:31 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>
20	#include <SDL_opengl.h>	21	#include <SDL_opengl.h>
21		22
		23	#define PANGO_ENABLE_BACKEND
		24	#define G_DISABLE_CAST_CHECKS
		25
22	#include <glib/gmacros.h>	26	#include <glib/gmacros.h>
23		27
24	#include <pango/pango.h>	28	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		29
29	#ifndef _WIN32	30	#ifndef _WIN32
30	# include <sys/types.h>	31	# include <sys/types.h>
31	# include <sys/socket.h>	32	# include <sys/socket.h>
32	# include <netinet/in.h>	33	# include <netinet/in.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	#if 1
54	{ \	57	# define PARACHUTE SDL_INIT_NOPARACHUTE
55	static int init_; \	58	#else
56	static type fptr_; \	59	# define PARACHUTE 0
57	\	60	#endif
58	if (!init_) \	61
59	{ \	62	static struct
60	init_ = 1; \	63	{
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \	64	#define GL_FUNC(ptr,name) ptr name;
62	} \	65	#include "glfunc.h"
63	\	66	#undef GL_FUNC
64	if (fptr_) \	67	} gl;
65	fptr_ args; \	68
66	}	69	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
		70	{
		71	if (gl.BlendFuncSeparate)
		72	gl.BlendFuncSeparate (sa, da, saa, daa);
		73	else if (gl.BlendFuncSeparateEXT)
		74	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
		75	else
		76	glBlendFunc (sa, da);
		77	}
		78
		79	#include "texcache.c"
		80
		81	#include "pango-font.c"
		82	#include "pango-fontmap.c"
		83	#include "pango-render.c"
67		84
68	typedef Mix_Chunk *CFClient__MixChunk;	85	typedef Mix_Chunk *CFClient__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	86	typedef Mix_Music *CFClient__MixMusic;
70		87
71	typedef PangoFontDescription *CFClient__Font;	88	typedef PangoFontDescription *CFClient__Font;
72		89
		90	static int
		91	shape_attr_p (PangoLayoutRun *run)
		92	{
		93	GSList *attrs = run->item->analysis.extra_attrs;
		94
		95	while (attrs)
		96	{
		97	PangoAttribute *attr = attrs->data;
		98
		99	if (attr->klass->type == PANGO_ATTR_SHAPE)
		100	return 1;
		101
		102	attrs = attrs->next;
		103	}
		104
		105	return 0;
		106	}
		107
73	typedef struct cf_layout {	108	typedef struct cf_layout {
74	PangoLayout *pl; // either derived from a cairo or ft2 context	109	PangoLayout *pl;
75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76	float r, g, b, a; // default color for rgba mode	110	float r, g, b, a; // default color for rgba mode
77	int base_height;	111	int base_height;
78	CFClient__Font font;	112	CFClient__Font font;
79	} *CFClient__Layout;	113	} *CFClient__Layout;
80		114
81	static CFClient__Font default_font;	115	static CFClient__Font default_font;
82	static PangoContext ft2_context, cairo_context;	116	static PangoContext *opengl_context;
83	static PangoFontMap ft2_fontmap, cairo_fontmap;	117	static PangoFontMap *opengl_fontmap;
84		118
85	static void	119	static void
86	substitute_func (FcPattern *pattern, gpointer data)	120	substitute_func (FcPattern *pattern, gpointer data)
87	{	121	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	122	FcPatternAddBool (pattern, FC_HINTING, 1);
		123	#ifdef FC_HINT_STYLE
		124	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		125	#endif
89	#ifdef _WIN32	126	#ifdef _WIN32
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	127	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91	#else	128	#else
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif	130	#endif
…		…
294	ev.code = 1;	331	ev.code = 1;
295	ev.data1 = (void *)(long)channel;	332	ev.data1 = (void *)(long)channel;
296	ev.data2 = 0;	333	ev.data2 = 0;
297		334
298	SDL_PushEvent ((SDL_Event *)&ev);	335	SDL_PushEvent ((SDL_Event *)&ev);
		336	}
		337
		338	static unsigned int
		339	minpot (unsigned int n)
		340	{
		341	if (!n)
		342	return 0;
		343
		344	--n;
		345
		346	n \|= n >> 1;
		347	n \|= n >> 2;
		348	n \|= n >> 4;
		349	n \|= n >> 8;
		350	n \|= n >> 16;
		351
		352	return n + 1;
299	}	353	}
300		354
301	MODULE = CFClient PACKAGE = CFClient	355	MODULE = CFClient PACKAGE = CFClient
302		356
303	PROTOTYPES: ENABLE	357	PROTOTYPES: ENABLE
…		…
413		467
414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	468	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	469	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416	}	470	}
417		471
		472	NV floor (NV x)
		473
		474	NV ceil (NV x)
		475
418	void	476	void
419	pango_init ()	477	pango_init ()
420	CODE:	478	CODE:
421	{	479	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx
423	ft2_fontmap = pango_ft2_font_map_new ();	480	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	481	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	482	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426
427	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
429	}	483	}
430		484
431	int	485	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	486	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
433		487
434	void	488	void
435	SDL_Quit ()	489	SDL_Quit ()
436		490
437	void	491	void
…		…
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	498	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	499	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	500	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		501
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	502	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	503	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450		504
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	505	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	506	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	507	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	508	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	533	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	534	CODE:
481	RETVAL = !!SDL_SetVideoMode (	535	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	536	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	537	);
		538	if (RETVAL)
		539	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	540	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		541	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		542	# include "glfunc.h"
		543	# undef GL_FUNC
		544	}
485	OUTPUT:	545	OUTPUT:
486	RETVAL	546	RETVAL
487		547
488	void	548	void
489	SDL_GL_SwapBuffers ()	549	SDL_GL_SwapBuffers ()
…		…
565	CODE:	625	CODE:
566	#ifndef _WIN32	626	#ifndef _WIN32
567	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	627	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
568	#endif	628	#endif
569		629
570	char *
571	gl_vendor ()
572	CODE:
573	RETVAL = (char *)glGetString (GL_VENDOR);
574	OUTPUT:
575	RETVAL
576
577	char *
578	gl_version ()
579	CODE:
580	RETVAL = (char *)glGetString (GL_VERSION);
581	OUTPUT:
582	RETVAL
583
584	char *
585	gl_extensions ()
586	CODE:
587	RETVAL = (char *)glGetString (GL_EXTENSIONS);
588	OUTPUT:
589	RETVAL
590
591	void	630	void
592	add_font (char *file)	631	add_font (char *file)
593	CODE:	632	CODE:
594	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	633	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
595	#ifdef _WIN32
596	// cairo... sigh... requires win2000
597	AddFontResourceEx (file, FR_PRIVATE, 0);
598	#endif
599		634
600	void	635	void
601	load_image_inline (SV *image_)	636	load_image_inline (SV *image_)
602	ALIAS:	637	ALIAS:
603	load_image_file = 1	638	load_image_file = 1
…		…
699	CODE:	734	CODE:
700	fprintf (stderr, "FATAL: %s\n", message);	735	fprintf (stderr, "FATAL: %s\n", message);
701	#ifdef _WIN32	736	#ifdef _WIN32
702	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	737	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
703	#endif	738	#endif
704	exit (1);	739	_exit (1);
		740
		741	void
		742	_exit (int retval)
		743	CODE:
		744	_exit (retval);
705		745
706	MODULE = CFClient PACKAGE = CFClient::Font	746	MODULE = CFClient PACKAGE = CFClient::Font
707		747
708	CFClient::Font	748	CFClient::Font
709	new_from_file (SV class, char path, int id = 0)	749	new_from_file (SV class, char path, int id = 0)
…		…
727	CODE:	767	CODE:
728	default_font = self;	768	default_font = self;
729		769
730	MODULE = CFClient PACKAGE = CFClient::Layout	770	MODULE = CFClient PACKAGE = CFClient::Layout
731		771
		772	void
		773	clear_font_cache ()
		774	CODE:
		775	pango_fc_font_map_cache_clear ((PangoFcFontMap *)opengl_fontmap);
		776	tc_clear ();
		777
732	CFClient::Layout	778	CFClient::Layout
733	new (SV *class, int rgba = 0)	779	new (SV *class, int type = 0)
734	CODE:	780	CODE:
735	#if _WIN32
736	rgba = 0;//D
737	#endif
738	New (0, RETVAL, 1, struct cf_layout);	781	New (0, RETVAL, 1, struct cf_layout);
739		782
740	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	783	RETVAL->pl = pango_layout_new (opengl_context);
741	RETVAL->rgba = rgba;
742	RETVAL->r = 1.;	784	RETVAL->r = 1.;
743	RETVAL->g = 1.;	785	RETVAL->g = 1.;
744	RETVAL->b = 1.;	786	RETVAL->b = 1.;
745	RETVAL->a = 1.;	787	RETVAL->a = 1.;
746	RETVAL->base_height = MIN_FONT_HEIGHT;	788	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
755	DESTROY (CFClient::Layout self)	797	DESTROY (CFClient::Layout self)
756	CODE:	798	CODE:
757	g_object_unref (self->pl);	799	g_object_unref (self->pl);
758	Safefree (self);	800	Safefree (self);
759		801
760	int
761	is_rgba (CFClient::Layout self)
762	CODE:
763	RETVAL = self->rgba;
764	OUTPUT:
765	RETVAL
766
767	void	802	void
768	set_text (CFClient::Layout self, SV *text_)	803	set_text (CFClient::Layout self, SV *text_)
769	CODE:	804	CODE:
770	{	805	{
771	STRLEN textlen;	806	STRLEN textlen;
…		…
782	char *text = SvPVutf8 (text_, textlen);	817	char *text = SvPVutf8 (text_, textlen);
783		818
784	pango_layout_set_markup (self->pl, text, textlen);	819	pango_layout_set_markup (self->pl, text, textlen);
785	}	820	}
786		821
		822	void
		823	set_shapes (CFClient::Layout self, ...)
		824	CODE:
		825	{
		826	PangoAttrList *attrs = 0;
		827	const char *text = pango_layout_get_text (self->pl);
		828	const char *pos = text;
		829	int arg = 4;
		830
		831	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		832	{
		833	PangoRectangle inkrect, rect;
		834	PangoAttribute *attr;
		835
		836	int x = SvIV (ST (arg - 3));
		837	int y = SvIV (ST (arg - 2));
		838	int w = SvIV (ST (arg - 1));
		839	int h = SvIV (ST (arg ));
		840
		841	inkrect.x = 0;
		842	inkrect.y = 0;
		843	inkrect.width = 0;
		844	inkrect.height = 0;
		845
		846	rect.x = x * PANGO_SCALE;
		847	rect.y = y * PANGO_SCALE;
		848	rect.width = w * PANGO_SCALE;
		849	rect.height = h * PANGO_SCALE;
		850
		851	if (!attrs)
		852	attrs = pango_layout_get_attributes (self->pl);
		853
		854	attr = pango_attr_shape_new (&inkrect, &rect);
		855	attr->start_index = pos - text;
		856	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		857	pango_attr_list_insert (attrs, attr);
		858
		859	arg += 4;
		860	pos += sizeof (OBJ_STR) - 1;
		861	}
		862
		863	if (attrs)
		864	pango_layout_set_attributes (self->pl, attrs);
		865	}
		866
		867	void
		868	get_shapes (CFClient::Layout self)
		869	PPCODE:
		870	{
		871	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		872
		873	do
		874	{
		875	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		876
		877	if (run && shape_attr_p (run))
		878	{
		879	PangoRectangle extents;
		880	pango_layout_iter_get_run_extents (iter, 0, &extents);
		881
		882	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		883	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		884	}
		885	}
		886	while (pango_layout_iter_next_run (iter));
		887
		888	pango_layout_iter_free (iter);
		889	}
		890
		891	int
		892	has_wrapped (CFClient::Layout self)
		893	CODE:
		894	{
		895	int lines = 1;
		896	const char *text = pango_layout_get_text (self->pl);
		897
		898	while (*text)
		899	lines += *text++ == '\n';
		900
		901	RETVAL = lines < pango_layout_get_line_count (self->pl);
		902	}
		903	OUTPUT:
		904	RETVAL
		905
787	SV *	906	SV *
788	get_text (CFClient::Layout self)	907	get_text (CFClient::Layout self)
789	CODE:	908	CODE:
790	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	909	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
791	SvUTF8_on (RETVAL);	910	sv_utf8_decode (RETVAL);
792	OUTPUT:	911	OUTPUT:
793	RETVAL	912	RETVAL
794		913
795	void	914	void
796	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	915	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
…		…
860	PUSHs (sv_2mortal (newSViv (w)));	979	PUSHs (sv_2mortal (newSViv (w)));
861	PUSHs (sv_2mortal (newSViv (h)));	980	PUSHs (sv_2mortal (newSViv (h)));
862	}	981	}
863		982
864	int	983	int
		984	descent (CFClient::Layout self)
		985	CODE:
		986	{
		987	PangoRectangle rect;
		988	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		989	pango_layout_line_get_pixel_extents (line, 0, &rect);
		990	RETVAL = PANGO_DESCENT (rect);
		991	}
		992	OUTPUT:
		993	RETVAL
		994
		995	int
865	xy_to_index (CFClient::Layout self, int x, int y)	996	xy_to_index (CFClient::Layout self, int x, int y)
866	CODE:	997	CODE:
867	{	998	{
868	int index, trailing;	999	int index, trailing;
869	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1000	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
…		…
884	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1015	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
885	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1016	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
886	}	1017	}
887		1018
888	void	1019	void
889	render (CFClient::Layout self)	1020	render (CFClient::Layout self, float x, float y)
890	PPCODE:	1021	PPCODE:
891	{	1022	pango_opengl_render_layout_subpixel (
892	SV *retval;	1023	self->pl,
893	int w, h;	1024	x * PANGO_SCALE, y * PANGO_SCALE,
		1025	self->r, self->g, self->b, self->a
		1026	);
894		1027
895	layout_get_pixel_size (self, &w, &h);	1028	MODULE = CFClient PACKAGE = CFClient::Texture
896		1029
897	if (self->rgba)	1030	void
		1031	pad2pot (SV data_, SV w_, SV *h_)
		1032	CODE:
		1033	{
		1034	int ow = SvIV (w_);
		1035	int oh = SvIV (h_);
		1036
		1037	if (ow && oh)
898	{	1038	{
899	cairo_surface_t *surface;	1039	int nw = minpot (ow);
900	cairo_t *cairo;	1040	int nh = minpot (oh);
901		1041
902	retval = newSV (w * h * 4);	1042	if (nw != ow \|\| nh != oh)
903	SvPOK_only (retval);
904	SvCUR_set (retval, w * h * 4);
905
906	memset (SvPVX (retval), 0, w * h * 4);
907
908	surface = cairo_image_surface_create_for_data (
909	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
910	cairo = cairo_create (surface);
911	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
912
913	pango_cairo_show_layout (cairo, self->pl);
914
915	cairo_destroy (cairo);
916	cairo_surface_destroy (surface);
917
918	// what a mess, and its premultiplied, too :(
919	{	1043	{
920	uint32_t p = (uint32_t )SvPVX (retval);	1044	if (SvOK (data_))
921	uint32_t e = p + w h;
922
923	while (p < e)
924	{	1045	{
925	uint32_t rgba = *p;	1046	STRLEN datalen;
926	rgba = (rgba >> 24) \| (rgba << 8);	1047	char *data = SvPVbyte (data_, datalen);
927	#if 0	1048	int bpp = datalen / (ow * oh);
928	#ifdef _WIN32	1049	SV result_ = sv_2mortal (newSV (nw nh * bpp));
929	{//D
930	uint8_t r = rgba >> 24;
931	uint8_t g = rgba >> 16;
932	uint8_t b = rgba >> 8;
933	uint8_t a = rgba >> 0;
934		1050
935	rgba = (rgba & 0xffffff00) \| a;	1051	SvPOK_only (result_);
		1052	SvCUR_set (result_, nw * nh * bpp);
		1053
		1054	memset (SvPVX (result_), 0, nw * nh * bpp);
		1055	while (oh--)
		1056	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1057
		1058	sv_setsv (data_, result_);
936	}	1059	}
937	#endif	1060
938	#endif	1061	sv_setiv (w_, nw);
939	rgba = SDL_SwapBE32 (rgba);	1062	sv_setiv (h_, nh);
940	*p++ = rgba;
941	}	1063	}
942	}
943
944	EXTEND (SP, 5);
945	PUSHs (sv_2mortal (newSViv (w)));
946	PUSHs (sv_2mortal (newSViv (h)));
947	PUSHs (sv_2mortal (retval));
948	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
949	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
950	}	1064	}
951	else
952	{
953	FT_Bitmap bitmap;
954
955	retval = newSV (w * h);
956	SvPOK_only (retval);
957	SvCUR_set (retval, w * h);
958
959	bitmap.rows = h;
960	bitmap.width = w;
961	bitmap.pitch = w;
962	bitmap.buffer = (unsigned char*)SvPVX (retval);
963	bitmap.num_grays = 256;
964	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
965
966	memset (bitmap.buffer, 0, w * h);
967
968	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
969
970	EXTEND (SP, 5);
971	PUSHs (sv_2mortal (newSViv (w)));
972	PUSHs (sv_2mortal (newSViv (h)));
973	PUSHs (sv_2mortal (retval));
974	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
975	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
976	}
977	}	1065	}
978		1066
979	MODULE = CFClient PACKAGE = CFClient::Texture
980
981	void	1067	void
982	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1068	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
983	PROTOTYPE: $$$;$$	1069	PROTOTYPE: $$$;$$
984	ALIAS:	1070	ALIAS:
985	draw_quad_alpha = 1	1071	draw_quad_alpha = 1
986	draw_quad_alpha_premultiplied = 2	1072	draw_quad_alpha_premultiplied = 2
987	CODE:	1073	CODE:
988	{	1074	{
989	HV hv = (HV )SvRV (self);	1075	HV hv = (HV )SvRV (self);
990	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1076	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
991	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1077	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
992	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1078	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
993	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
994		1079
995	if (items < 5)	1080	if (items < 5)
996	{	1081	{
997	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1082	w = SvNV (*hv_fetch (hv, "w", 1, 1));
998	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1083	h = SvNV (*hv_fetch (hv, "h", 1, 1));
999	}	1084	}
1000		1085
1001	if (ix)	1086	if (ix)
1002	{	1087	{
1003	glEnable (GL_BLEND);	1088	glEnable (GL_BLEND);
		1089
		1090	if (ix == 2)
1004	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1091	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1092	else
		1093	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1094	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1095
1005	glEnable (GL_ALPHA_TEST);	1096	glEnable (GL_ALPHA_TEST);
1006	glAlphaFunc (GL_GREATER, 0.01f);	1097	glAlphaFunc (GL_GREATER, 0.01f);
1007	}	1098	}
1008		1099
1009	glBindTexture (GL_TEXTURE_2D, name);	1100	glBindTexture (GL_TEXTURE_2D, name);
1010
1011	if (wrap_mode)
1012	{
1013	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1014	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1015	}
1016		1101
1017	glBegin (GL_QUADS);	1102	glBegin (GL_QUADS);
1018	glTexCoord2f (0, 0); glVertex2f (x , y );	1103	glTexCoord2f (0, 0); glVertex2f (x , y );
1019	glTexCoord2f (0, t); glVertex2f (x , y + h);	1104	glTexCoord2f (0, t); glVertex2f (x , y + h);
1020	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1105	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1053	DESTROY (CFClient::Map self)	1138	DESTROY (CFClient::Map self)
1054	CODE:	1139	CODE:
1055	{	1140	{
1056	map_clear (self);	1141	map_clear (self);
1057	Safefree (self->face);	1142	Safefree (self->face);
		1143	Safefree (self->tex);
1058	Safefree (self);	1144	Safefree (self);
1059	}	1145	}
1060		1146
1061	void	1147	void
1062	clear (CFClient::Map self)	1148	clear (CFClient::Map self)
…		…
1097	tex->r = r;	1183	tex->r = r;
1098	tex->g = g;	1184	tex->g = g;
1099	tex->b = b;	1185	tex->b = b;
1100	tex->a = a;	1186	tex->a = a;
1101	}	1187	}
		1188
		1189	// somewhat hackish, but for textures that require it, it really
		1190	// improves the look, and most others don't suffer.
		1191	glBindTexture (GL_TEXTURE_2D, name);
		1192	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1193	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1194	// use uglier nearest interpolation because linear suffers
		1195	// from transparent color bleeding and ugly wrapping effects.
		1196	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1102	}	1197	}
1103		1198
1104	int	1199	int
1105	ox (CFClient::Map self)	1200	ox (CFClient::Map self)
1106	ALIAS:	1201	ALIAS:
1107	oy = 1	1202	oy = 1
		1203	x = 2
		1204	y = 3
		1205	w = 4
		1206	h = 5
1108	CODE:	1207	CODE:
1109	switch (ix)	1208	switch (ix)
1110	{	1209	{
1111	case 0: RETVAL = self->ox; break;	1210	case 0: RETVAL = self->ox; break;
1112	case 1: RETVAL = self->oy; break;	1211	case 1: RETVAL = self->oy; break;
		1212	case 2: RETVAL = self->x; break;
		1213	case 3: RETVAL = self->y; break;
		1214	case 4: RETVAL = self->w; break;
		1215	case 5: RETVAL = self->h; break;
1113	}	1216	}
1114	OUTPUT:	1217	OUTPUT:
1115	RETVAL	1218	RETVAL
1116		1219
1117	void	1220	void
…		…
1151		1254
1152	while (data < data_end)	1255	while (data < data_end)
1153	{	1256	{
1154	flags = (data [0] << 8) + data [1]; data += 2;	1257	flags = (data [0] << 8) + data [1]; data += 2;
1155		1258
1156	x = ((flags >> 10) & 63) + self->x;	1259	x = self->x + ((flags >> 10) & 63);
1157	y = ((flags >> 4) & 63) + self->y;	1260	y = self->y + ((flags >> 4) & 63);
1158		1261
1159	cell = map_get_cell (self, x, y);	1262	cell = map_get_cell (self, x, y);
1160		1263
1161	if (flags & 15)	1264	if (flags & 15)
1162	{	1265	{
…		…
1252	OUTPUT:	1355	OUTPUT:
1253	RETVAL	1356	RETVAL
1254		1357
1255	void	1358	void
1256	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1359	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1257	PPCODE:	1360	CODE:
1258	{	1361	{
1259	int vx, vy;	1362	int vx, vy;
1260	int x, y, z;	1363	int x, y, z;
1261	int last_name;	1364	int last_name;
1262	mapface face;	1365	mapface face;
1263	int sw4 = (sw + 3) & ~3;
1264	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1265	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1266		1366
1267	memset (darkness, 255, sw4 * sh);
1268	SvPOK_only (darkness_sv);
1269	SvCUR_set (darkness_sv, sw4 * sh);
1270
1271	vx = self->x + (self->w - sw) / 2 - shift_x;	1367	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1272	vy = self->y + (self->h - sh) / 2 - shift_y;	1368	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1273		1369
1274	/*	1370	/*
1275	int vx = self->vx = self->w >= sw	1371	int vx = self->vx = self->w >= sw
1276	? self->x + (self->w - sw) / 2	1372	? self->x + (self->w - sw) / 2
1277	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1373	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1281	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1377	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1282	*/	1378	*/
1283		1379
1284	glColor4ub (255, 255, 255, 255);	1380	glColor4ub (255, 255, 255, 255);
1285		1381
		1382	glEnable (GL_BLEND);
1286	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1383	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1287	glEnable (GL_BLEND);
1288	glEnable (GL_TEXTURE_2D);	1384	glEnable (GL_TEXTURE_2D);
1289	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1385	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1290		1386
1291	glBegin (GL_QUADS);	1387	glBegin (GL_QUADS);
1292		1388
…		…
1300		1396
1301	for (x = 0; x < sw; x++)	1397	for (x = 0; x < sw; x++)
1302	if (row->c0 <= x + vx && x + vx < row->c1)	1398	if (row->c0 <= x + vx && x + vx < row->c1)
1303	{	1399	{
1304	mapcell *cell = row->col + (x + vx - row->c0);	1400	mapcell *cell = row->col + (x + vx - row->c0);
1305
1306	darkness[y * sw4 + x] = cell->darkness < 0
1307	? 255 - FOW_DARKNESS
1308	: 255 - cell->darkness;
1309		1401
1310	face = cell->face [z];	1402	face = cell->face [z];
1311		1403
1312	if (face)	1404	if (face)
1313	{	1405	{
…		…
1334		1426
1335	glEnd ();	1427	glEnd ();
1336		1428
1337	glDisable (GL_TEXTURE_2D);	1429	glDisable (GL_TEXTURE_2D);
1338	glDisable (GL_BLEND);	1430	glDisable (GL_BLEND);
		1431	}
		1432
		1433	void
		1434	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1435	CODE:
		1436	{
		1437	static float color[16][3] = {
		1438	{ 0.00F, 0.00F, 0.00F },
		1439	{ 1.00F, 1.00F, 1.00F },
		1440	{ 0.00F, 0.00F, 0.55F },
		1441	{ 1.00F, 0.00F, 0.00F },
		1442
		1443	{ 1.00F, 0.54F, 0.00F },
		1444	{ 0.11F, 0.56F, 1.00F },
		1445	{ 0.93F, 0.46F, 0.00F },
		1446	{ 0.18F, 0.54F, 0.34F },
		1447
		1448	{ 0.56F, 0.73F, 0.56F },
		1449	{ 0.80F, 0.80F, 0.80F },
		1450	{ 0.55F, 0.41F, 0.13F },
		1451	{ 0.99F, 0.77F, 0.26F },
		1452
		1453	{ 0.74F, 0.65F, 0.41F },
		1454
		1455	{ 0.00F, 1.00F, 1.00F },
		1456	{ 1.00F, 0.00F, 1.00F },
		1457	{ 1.00F, 1.00F, 0.00F },
		1458	};
		1459
		1460	int x, y;
		1461
		1462	glEnable (GL_TEXTURE_2D);
		1463	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1464	glEnable (GL_BLEND);
		1465	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1466	glBegin (GL_QUADS);
		1467
		1468	for (y = 0; y < h; y++)
		1469	for (x = 0; x < w; x++)
		1470	{
		1471	unsigned char m = data [x + y * w];
		1472
		1473	if (m)
		1474	{
		1475	float *c = color [m & 15];
		1476
		1477	float tx1 = m & 0x40 ? 0.5 : 0.;
		1478	float tx2 = tx1 + 0.5;
		1479
		1480	glColor4f (c[0], c[1], c[2], 0.75);
		1481	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1482	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1483	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1484	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1485	}
		1486	}
		1487
		1488	glEnd ();
		1489	glDisable (GL_BLEND);
		1490	glDisable (GL_TEXTURE_2D);
		1491	}
		1492
		1493	void
		1494	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1495	PPCODE:
		1496	{
		1497	int vx, vy;
		1498	int x, y;
		1499	int sw4 = (sw + 3) & ~3;
		1500	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1501	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1502
		1503	memset (darkness, 255, sw4 * sh);
		1504	SvPOK_only (darkness_sv);
		1505	SvCUR_set (darkness_sv, sw4 * sh);
		1506
		1507	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1508	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1509
		1510	for (y = 0; y < sh; y++)
		1511	if (0 <= y + vy && y + vy < self->rows)
		1512	{
		1513	maprow *row = self->row + (y + vy);
		1514
		1515	for (x = 0; x < sw; x++)
		1516	if (row->c0 <= x + vx && x + vx < row->c1)
		1517	{
		1518	mapcell *cell = row->col + (x + vx - row->c0);
		1519
		1520	darkness[y * sw4 + x] = cell->darkness < 0
		1521	? 255 - FOW_DARKNESS
		1522	: 255 - cell->darkness;
		1523	}
		1524	}
1339		1525
1340	EXTEND (SP, 3);	1526	EXTEND (SP, 3);
1341	PUSHs (sv_2mortal (newSViv (sw4)));	1527	PUSHs (sv_2mortal (newSViv (sw4)));
1342	PUSHs (sv_2mortal (newSViv (sh)));	1528	PUSHs (sv_2mortal (newSViv (sh)));
1343	PUSHs (darkness_sv);	1529	PUSHs (darkness_sv);
…		…
1550	const_iv (GL_SCISSOR_TEST),	1736	const_iv (GL_SCISSOR_TEST),
1551	const_iv (GL_DEPTH_TEST),	1737	const_iv (GL_DEPTH_TEST),
1552	const_iv (GL_ALPHA_TEST),	1738	const_iv (GL_ALPHA_TEST),
1553	const_iv (GL_NORMALIZE),	1739	const_iv (GL_NORMALIZE),
1554	const_iv (GL_RESCALE_NORMAL),	1740	const_iv (GL_RESCALE_NORMAL),
		1741	const_iv (GL_FRONT),
		1742	const_iv (GL_BACK),
1555	const_iv (GL_AND),	1743	const_iv (GL_AND),
1556	const_iv (GL_ONE),	1744	const_iv (GL_ONE),
1557	const_iv (GL_ZERO),	1745	const_iv (GL_ZERO),
1558	const_iv (GL_SRC_ALPHA),	1746	const_iv (GL_SRC_ALPHA),
1559	const_iv (GL_SRC_ALPHA_SATURATE),	1747	const_iv (GL_DST_ALPHA),
1560	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1748	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1561	const_iv (GL_ONE_MINUS_DST_ALPHA),	1749	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1750	const_iv (GL_SRC_ALPHA_SATURATE),
1562	const_iv (GL_RGB),	1751	const_iv (GL_RGB),
1563	const_iv (GL_RGBA),	1752	const_iv (GL_RGBA),
		1753	const_iv (GL_RGBA4),
		1754	const_iv (GL_RGBA8),
		1755	const_iv (GL_RGB5_A1),
1564	const_iv (GL_UNSIGNED_BYTE),	1756	const_iv (GL_UNSIGNED_BYTE),
1565	const_iv (GL_UNSIGNED_SHORT),	1757	const_iv (GL_UNSIGNED_SHORT),
1566	const_iv (GL_UNSIGNED_INT),	1758	const_iv (GL_UNSIGNED_INT),
1567	const_iv (GL_ALPHA),	1759	const_iv (GL_ALPHA),
1568	const_iv (GL_INTENSITY),	1760	const_iv (GL_INTENSITY),
…		…
1577	const_iv (GL_TEXTURE_MAG_FILTER),	1769	const_iv (GL_TEXTURE_MAG_FILTER),
1578	const_iv (GL_TEXTURE_MIN_FILTER),	1770	const_iv (GL_TEXTURE_MIN_FILTER),
1579	const_iv (GL_TEXTURE_ENV_MODE),	1771	const_iv (GL_TEXTURE_ENV_MODE),
1580	const_iv (GL_TEXTURE_WRAP_S),	1772	const_iv (GL_TEXTURE_WRAP_S),
1581	const_iv (GL_TEXTURE_WRAP_T),	1773	const_iv (GL_TEXTURE_WRAP_T),
		1774	const_iv (GL_REPEAT),
1582	const_iv (GL_CLAMP),	1775	const_iv (GL_CLAMP),
1583	const_iv (GL_REPEAT),	1776	const_iv (GL_CLAMP_TO_EDGE),
1584	const_iv (GL_NEAREST),	1777	const_iv (GL_NEAREST),
1585	const_iv (GL_LINEAR),	1778	const_iv (GL_LINEAR),
1586	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1779	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1587	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1780	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1588	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1781	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1618		1811
1619	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1812	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1620	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1813	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1621	}	1814	}
1622		1815
		1816	char *
		1817	gl_vendor ()
		1818	CODE:
		1819	RETVAL = (char *)glGetString (GL_VENDOR);
		1820	OUTPUT:
		1821	RETVAL
		1822
		1823	char *
		1824	gl_version ()
		1825	CODE:
		1826	RETVAL = (char *)glGetString (GL_VERSION);
		1827	OUTPUT:
		1828	RETVAL
		1829
		1830	char *
		1831	gl_extensions ()
		1832	CODE:
		1833	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1834	OUTPUT:
		1835	RETVAL
		1836
1623	int glGetError ()	1837	int glGetError ()
		1838
		1839	void glFinish ()
1624		1840
1625	void glClear (int mask)	1841	void glClear (int mask)
1626		1842
1627	void glClearColor (float r, float g, float b, float a = 1.0)	1843	void glClearColor (float r, float g, float b, float a = 1.0)
1628	PROTOTYPE: @	1844	PROTOTYPE: @
…		…
1635		1851
1636	void glHint (int target, int mode)	1852	void glHint (int target, int mode)
1637		1853
1638	void glBlendFunc (int sfactor, int dfactor)	1854	void glBlendFunc (int sfactor, int dfactor)
1639		1855
		1856	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1857	CODE:
		1858	gl_BlendFuncSeparate (sa, da, saa, daa);
		1859
1640	void glDepthMask (int flag)	1860	void glDepthMask (int flag)
1641		1861
1642	void glLogicOp (int opcode)	1862	void glLogicOp (int opcode)
1643		1863
1644	void glColorMask (int red, int green, int blue, int alpha)	1864	void glColorMask (int red, int green, int blue, int alpha)
…		…
1648	void glPushMatrix ()	1868	void glPushMatrix ()
1649		1869
1650	void glPopMatrix ()	1870	void glPopMatrix ()
1651		1871
1652	void glLoadIdentity ()	1872	void glLoadIdentity ()
		1873
		1874	void glDrawBuffer (int buffer)
		1875
		1876	void glReadBuffer (int buffer)
1653		1877
1654	# near_ and far_ are due to microsofts buggy "c" compiler	1878	# near_ and far_ are due to microsofts buggy "c" compiler
1655	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1879	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1656		1880
1657	# near_ and far_ are due to microsofts buggy "c" compiler	1881	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1677		1901
1678	void glEnd ()	1902	void glEnd ()
1679		1903
1680	void glColor (float r, float g, float b, float a = 1.0)	1904	void glColor (float r, float g, float b, float a = 1.0)
1681	PROTOTYPE: @	1905	PROTOTYPE: @
		1906	ALIAS:
		1907	glColor_premultiply = 1
1682	CODE:	1908	CODE:
		1909	if (ix)
		1910	{
		1911	r *= a;
		1912	g *= a;
		1913	b *= a;
		1914	}
1683	// microsoft visual "c" rounds instead of truncating...	1915	// microsoft visual "c" rounds instead of truncating...
1684	glColor4ub (MIN ((int)(r * 255.f), 255),	1916	glColor4ub (MIN ((int)(r * 256.f), 255),
1685	MIN ((int)(g * 255.f), 255),	1917	MIN ((int)(g * 256.f), 255),
1686	MIN ((int)(b * 255.f), 255),	1918	MIN ((int)(b * 256.f), 255),
1687	MIN ((int)(a * 255.f), 255));	1919	MIN ((int)(a * 256.f), 255));
1688		1920
1689	void glInterleavedArrays (int format, int stride, char *data)	1921	void glInterleavedArrays (int format, int stride, char *data)
1690		1922
1691	void glDrawElements (int mode, int count, int type, char *indices)	1923	void glDrawElements (int mode, int count, int type, char *indices)
1692		1924
…		…
1715		1947
1716	void glBindTexture (int target, int name)	1948	void glBindTexture (int target, int name)
1717		1949
1718	void glConvolutionParameter (int target, int pname, float params)	1950	void glConvolutionParameter (int target, int pname, float params)
1719	CODE:	1951	CODE:
1720	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1952	if (gl.ConvolutionParameterf)
		1953	gl.ConvolutionParameterf (target, pname, params);
1721		1954
1722	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1955	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1723	CODE:	1956	CODE:
1724	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1957	if (gl.ConvolutionFilter2D)
1725	(target, internalformat, width, height, format, type, data));	1958	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1726		1959
1727	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1960	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1728	CODE:	1961	CODE:
1729	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1962	if (gl.SeparableFilter2D)
1730	(target, internalformat, width, height, format, type, row, column));	1963	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1731		1964
1732	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1965	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1733		1966
1734	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1967	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1735		1968

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.94 by root, Tue May 23 18:57:35 2006 UTC vs. Revision 1.124 by root, Tue Jul 4 23:23:31 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.94 by root, Tue May 23 18:57:35 2006 UTC vs.
Revision 1.124 by root, Tue Jul 4 23:23:31 2006 UTC