[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.127 by root, Wed Jul 5 00:16:44 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 0
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);
89	#ifdef _WIN32	123	#ifdef FC_HINT_STYLE
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	124	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91	#else	125	#endif
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	126	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif
94	}	127	}
95		128
96	static void	129	static void
97	layout_update_font (CFClient__Layout self)	130	layout_update_font (CFClient__Layout self)
98	{	131	{
…		…
294	ev.code = 1;	327	ev.code = 1;
295	ev.data1 = (void *)(long)channel;	328	ev.data1 = (void *)(long)channel;
296	ev.data2 = 0;	329	ev.data2 = 0;
297		330
298	SDL_PushEvent ((SDL_Event *)&ev);	331	SDL_PushEvent ((SDL_Event *)&ev);
		332	}
		333
		334	static unsigned int
		335	minpot (unsigned int n)
		336	{
		337	if (!n)
		338	return 0;
		339
		340	--n;
		341
		342	n \|= n >> 1;
		343	n \|= n >> 2;
		344	n \|= n >> 4;
		345	n \|= n >> 8;
		346	n \|= n >> 16;
		347
		348	return n + 1;
299	}	349	}
300		350
301	MODULE = CFClient PACKAGE = CFClient	351	MODULE = CFClient PACKAGE = CFClient
302		352
303	PROTOTYPES: ENABLE	353	PROTOTYPES: ENABLE
…		…
413		463
414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	464	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	465	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416	}	466	}
417		467
		468	NV floor (NV x)
		469
		470	NV ceil (NV x)
		471
418	void	472	void
419	pango_init ()	473	pango_init ()
420	CODE:	474	CODE:
421	{	475	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx
423	ft2_fontmap = pango_ft2_font_map_new ();	476	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	477	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);	478	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	}	479	}
430		480
431	int	481	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	482	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
433		483
434	void	484	void
435	SDL_Quit ()	485	SDL_Quit ()
436		486
437	void	487	void
…		…
470		520
471	++m;	521	++m;
472	}	522	}
473	}	523	}
474		524
		525	char *
		526	SDL_GetError ()
		527
475	int	528	int
476	SDL_SetVideoMode (int w, int h, int fullscreen)	529	SDL_SetVideoMode (int w, int h, int fullscreen)
477	CODE:	530	CODE:
478	RETVAL = !!SDL_SetVideoMode (	531	RETVAL = !!SDL_SetVideoMode (
479	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	532	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
480	);	533	);
		534	if (RETVAL)
		535	{
481	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	536	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		537	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		538	# include "glfunc.h"
		539	# undef GL_FUNC
		540	}
482	OUTPUT:	541	OUTPUT:
483	RETVAL	542	RETVAL
484		543
485	void	544	void
486	SDL_GL_SwapBuffers ()	545	SDL_GL_SwapBuffers ()
		546
		547	char *
		548	SDL_GetKeyName (int sym)
487		549
488	void	550	void
489	SDL_PollEvent ()	551	SDL_PollEvent ()
490	PPCODE:	552	PPCODE:
491	{	553	{
…		…
510	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	572	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
511	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	573	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
512	break;	574	break;
513		575
514	case SDL_MOUSEMOTION:	576	case SDL_MOUSEMOTION:
		577	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		578
515	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	579	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
516	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	580	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
517	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	581	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
518	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	582	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
519	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	583	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
520	break;	584	break;
521		585
522	case SDL_MOUSEBUTTONDOWN:	586	case SDL_MOUSEBUTTONDOWN:
523	case SDL_MOUSEBUTTONUP:	587	case SDL_MOUSEBUTTONUP:
		588	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		589
524	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	590	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
525	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	591	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
526	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	592	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
527	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	593	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
528	break;	594	break;
…		…
555	CODE:	621	CODE:
556	#ifndef _WIN32	622	#ifndef _WIN32
557	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	623	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
558	#endif	624	#endif
559		625
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
574	void	626	void
575	add_font (char *file)	627	add_font (char *file)
576	CODE:	628	CODE:
577	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	629	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
578	#ifdef _WIN32
579	// cairo... sigh... requires win2000
580	AddFontResourceEx (file, FR_PRIVATE, 0);
581	#endif
582		630
583	void	631	void
584	load_image_inline (SV *image_)	632	load_image_inline (SV *image_)
585	ALIAS:	633	ALIAS:
586	load_image_file = 1	634	load_image_file = 1
…		…
670	}	718	}
671		719
672	void	720	void
673	error (char *message)	721	error (char *message)
674	CODE:	722	CODE:
		723	fprintf (stderr, "ERROR: %s\n", message);
675	#ifdef _WIN32	724	#ifdef _WIN32
676	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	725	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
677	#else
678	fprintf (stderr, "ERROR: %s\n", message);
679	#endif	726	#endif
680		727
681	void	728	void
682	fatal (char *message)	729	fatal (char *message)
683	CODE:	730	CODE:
		731	fprintf (stderr, "FATAL: %s\n", message);
684	#ifdef _WIN32	732	#ifdef _WIN32
685	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	733	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
686	#else
687	fprintf (stderr, "FATAL: %s\n", message);
688	#endif	734	#endif
689	exit (1);	735	_exit (1);
		736
		737	void
		738	_exit (int retval)
		739	CODE:
		740	_exit (retval);
690		741
691	MODULE = CFClient PACKAGE = CFClient::Font	742	MODULE = CFClient PACKAGE = CFClient::Font
692		743
693	CFClient::Font	744	CFClient::Font
694	new_from_file (SV class, char path, int id = 0)	745	new_from_file (SV class, char path, int id = 0)
…		…
712	CODE:	763	CODE:
713	default_font = self;	764	default_font = self;
714		765
715	MODULE = CFClient PACKAGE = CFClient::Layout	766	MODULE = CFClient PACKAGE = CFClient::Layout
716		767
		768	void
		769	clear_font_cache ()
		770	CODE:
		771	tc_clear ();
		772
717	CFClient::Layout	773	CFClient::Layout
718	new (SV *class, int rgba = 0)	774	new (SV *class, int type = 0)
719	CODE:	775	CODE:
720	New (0, RETVAL, 1, struct cf_layout);	776	New (0, RETVAL, 1, struct cf_layout);
721		777
722	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	778	RETVAL->pl = pango_layout_new (opengl_context);
723	RETVAL->rgba = rgba;
724	RETVAL->r = 1.;	779	RETVAL->r = 1.;
725	RETVAL->g = 1.;	780	RETVAL->g = 1.;
726	RETVAL->b = 1.;	781	RETVAL->b = 1.;
727	RETVAL->a = 1.;	782	RETVAL->a = 1.;
728	RETVAL->base_height = MIN_FONT_HEIGHT;	783	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
737	DESTROY (CFClient::Layout self)	792	DESTROY (CFClient::Layout self)
738	CODE:	793	CODE:
739	g_object_unref (self->pl);	794	g_object_unref (self->pl);
740	Safefree (self);	795	Safefree (self);
741		796
742	int
743	is_rgba (CFClient::Layout self)
744	CODE:
745	RETVAL = self->rgba;
746	OUTPUT:
747	RETVAL
748
749	void	797	void
750	set_text (CFClient::Layout self, SV *text_)	798	set_text (CFClient::Layout self, SV *text_)
751	CODE:	799	CODE:
752	{	800	{
753	STRLEN textlen;	801	STRLEN textlen;
…		…
764	char *text = SvPVutf8 (text_, textlen);	812	char *text = SvPVutf8 (text_, textlen);
765		813
766	pango_layout_set_markup (self->pl, text, textlen);	814	pango_layout_set_markup (self->pl, text, textlen);
767	}	815	}
768		816
		817	void
		818	set_shapes (CFClient::Layout self, ...)
		819	CODE:
		820	{
		821	PangoAttrList *attrs = 0;
		822	const char *text = pango_layout_get_text (self->pl);
		823	const char *pos = text;
		824	int arg = 4;
		825
		826	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		827	{
		828	PangoRectangle inkrect, rect;
		829	PangoAttribute *attr;
		830
		831	int x = SvIV (ST (arg - 3));
		832	int y = SvIV (ST (arg - 2));
		833	int w = SvIV (ST (arg - 1));
		834	int h = SvIV (ST (arg ));
		835
		836	inkrect.x = 0;
		837	inkrect.y = 0;
		838	inkrect.width = 0;
		839	inkrect.height = 0;
		840
		841	rect.x = x * PANGO_SCALE;
		842	rect.y = y * PANGO_SCALE;
		843	rect.width = w * PANGO_SCALE;
		844	rect.height = h * PANGO_SCALE;
		845
		846	if (!attrs)
		847	attrs = pango_layout_get_attributes (self->pl);
		848
		849	attr = pango_attr_shape_new (&inkrect, &rect);
		850	attr->start_index = pos - text;
		851	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		852	pango_attr_list_insert (attrs, attr);
		853
		854	arg += 4;
		855	pos += sizeof (OBJ_STR) - 1;
		856	}
		857
		858	if (attrs)
		859	pango_layout_set_attributes (self->pl, attrs);
		860	}
		861
		862	void
		863	get_shapes (CFClient::Layout self)
		864	PPCODE:
		865	{
		866	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		867
		868	do
		869	{
		870	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		871
		872	if (run && shape_attr_p (run))
		873	{
		874	PangoRectangle extents;
		875	pango_layout_iter_get_run_extents (iter, 0, &extents);
		876
		877	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		878	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		879	}
		880	}
		881	while (pango_layout_iter_next_run (iter));
		882
		883	pango_layout_iter_free (iter);
		884	}
		885
		886	int
		887	has_wrapped (CFClient::Layout self)
		888	CODE:
		889	{
		890	int lines = 1;
		891	const char *text = pango_layout_get_text (self->pl);
		892
		893	while (*text)
		894	lines += *text++ == '\n';
		895
		896	RETVAL = lines < pango_layout_get_line_count (self->pl);
		897	}
		898	OUTPUT:
		899	RETVAL
		900
769	SV *	901	SV *
770	get_text (CFClient::Layout self)	902	get_text (CFClient::Layout self)
771	CODE:	903	CODE:
772	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	904	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
773	SvUTF8_on (RETVAL);	905	sv_utf8_decode (RETVAL);
774	OUTPUT:	906	OUTPUT:
775	RETVAL	907	RETVAL
776		908
777	void	909	void
778	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	910	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
…		…
842	PUSHs (sv_2mortal (newSViv (w)));	974	PUSHs (sv_2mortal (newSViv (w)));
843	PUSHs (sv_2mortal (newSViv (h)));	975	PUSHs (sv_2mortal (newSViv (h)));
844	}	976	}
845		977
846	int	978	int
		979	descent (CFClient::Layout self)
		980	CODE:
		981	{
		982	PangoRectangle rect;
		983	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		984	pango_layout_line_get_pixel_extents (line, 0, &rect);
		985	RETVAL = PANGO_DESCENT (rect);
		986	}
		987	OUTPUT:
		988	RETVAL
		989
		990	int
847	xy_to_index (CFClient::Layout self, int x, int y)	991	xy_to_index (CFClient::Layout self, int x, int y)
848	CODE:	992	CODE:
849	{	993	{
850	int index, trailing;	994	int index, trailing;
851	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	995	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
…		…
866	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1010	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
867	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1011	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
868	}	1012	}
869		1013
870	void	1014	void
871	render (CFClient::Layout self)	1015	render (CFClient::Layout self, float x, float y)
872	PPCODE:	1016	PPCODE:
873	{	1017	pango_opengl_render_layout_subpixel (
874	SV *retval;	1018	self->pl,
875	int w, h;	1019	x * PANGO_SCALE, y * PANGO_SCALE,
		1020	self->r, self->g, self->b, self->a
		1021	);
876		1022
877	layout_get_pixel_size (self, &w, &h);	1023	MODULE = CFClient PACKAGE = CFClient::Texture
878		1024
879	if (self->rgba)	1025	void
		1026	pad2pot (SV data_, SV w_, SV *h_)
		1027	CODE:
		1028	{
		1029	int ow = SvIV (w_);
		1030	int oh = SvIV (h_);
		1031
		1032	if (ow && oh)
880	{	1033	{
881	cairo_surface_t *surface;	1034	int nw = minpot (ow);
882	cairo_t *cairo;	1035	int nh = minpot (oh);
883		1036
884	retval = newSV (w * h * 4);	1037	if (nw != ow \|\| nh != oh)
885	SvPOK_only (retval);
886	SvCUR_set (retval, w * h * 4);
887
888	memset (SvPVX (retval), 0, w * h * 4);
889
890	surface = cairo_image_surface_create_for_data (
891	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
892	cairo = cairo_create (surface);
893	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
894
895	pango_cairo_show_layout (cairo, self->pl);
896
897	cairo_destroy (cairo);
898	cairo_surface_destroy (surface);
899
900	// what a mess, and its premultiplied, too :(
901	{	1038	{
902	uint32_t p = (uint32_t )SvPVX (retval);	1039	if (SvOK (data_))
903	uint32_t e = p + w h;
904
905	while (p < e)
906	{	1040	{
907	uint32_t rgba = *p;	1041	STRLEN datalen;
908	rgba = (rgba >> 24) \| (rgba << 8);	1042	char *data = SvPVbyte (data_, datalen);
909	rgba = SDL_SwapBE32 (rgba);	1043	int bpp = datalen / (ow * oh);
910	*p++ = rgba;	1044	SV result_ = sv_2mortal (newSV (nw nh * bpp));
		1045
		1046	SvPOK_only (result_);
		1047	SvCUR_set (result_, nw * nh * bpp);
		1048
		1049	memset (SvPVX (result_), 0, nw * nh * bpp);
		1050	while (oh--)
		1051	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1052
		1053	sv_setsv (data_, result_);
911	}	1054	}
		1055
		1056	sv_setiv (w_, nw);
		1057	sv_setiv (h_, nh);
912	}	1058	}
913
914	EXTEND (SP, 5);
915	PUSHs (sv_2mortal (newSViv (w)));
916	PUSHs (sv_2mortal (newSViv (h)));
917	PUSHs (sv_2mortal (retval));
918	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
919	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
920	}	1059	}
921	else
922	{
923	FT_Bitmap bitmap;
924
925	retval = newSV (w * h);
926	SvPOK_only (retval);
927	SvCUR_set (retval, w * h);
928
929	bitmap.rows = h;
930	bitmap.width = w;
931	bitmap.pitch = w;
932	bitmap.buffer = (unsigned char*)SvPVX (retval);
933	bitmap.num_grays = 256;
934	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
935
936	memset (bitmap.buffer, 0, w * h);
937
938	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
939
940	EXTEND (SP, 5);
941	PUSHs (sv_2mortal (newSViv (w)));
942	PUSHs (sv_2mortal (newSViv (h)));
943	PUSHs (sv_2mortal (retval));
944	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
945	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
946	}
947	}	1060	}
948		1061
949	MODULE = CFClient PACKAGE = CFClient::Texture
950
951	void	1062	void
952	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1063	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
953	PROTOTYPE: $$$;$$	1064	PROTOTYPE: $$$;$$
954	ALIAS:	1065	ALIAS:
955	draw_quad_alpha = 1	1066	draw_quad_alpha = 1
956	draw_quad_alpha_premultiplied = 2	1067	draw_quad_alpha_premultiplied = 2
957	CODE:	1068	CODE:
958	{	1069	{
959	HV hv = (HV )SvRV (self);	1070	HV hv = (HV )SvRV (self);
960	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1071	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
961	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1072	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
962	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1073	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
963	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
964		1074
965	if (items < 5)	1075	if (items < 5)
966	{	1076	{
967	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1077	w = SvNV (*hv_fetch (hv, "w", 1, 1));
968	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1078	h = SvNV (*hv_fetch (hv, "h", 1, 1));
969	}	1079	}
970		1080
971	if (ix)	1081	if (ix)
972	{	1082	{
973	glEnable (GL_BLEND);	1083	glEnable (GL_BLEND);
		1084
		1085	if (ix == 2)
974	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1086	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1087	else
		1088	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1089	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1090
		1091	glEnable (GL_ALPHA_TEST);
		1092	glAlphaFunc (GL_GREATER, 0.01f);
975	}	1093	}
976		1094
977	glBindTexture (GL_TEXTURE_2D, name);	1095	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		1096
985	glBegin (GL_QUADS);	1097	glBegin (GL_QUADS);
986	glTexCoord2f (0, 0); glVertex2f (x , y );	1098	glTexCoord2f (0, 0); glVertex2f (x , y );
987	glTexCoord2f (0, t); glVertex2f (x , y + h);	1099	glTexCoord2f (0, t); glVertex2f (x , y + h);
988	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1100	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
989	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1101	glTexCoord2f (s, 0); glVertex2f (x + w, y );
990	glEnd ();	1102	glEnd ();
991		1103
992	if (ix)	1104	if (ix)
		1105	{
		1106	glDisable (GL_ALPHA_TEST);
993	glDisable (GL_BLEND);	1107	glDisable (GL_BLEND);
		1108	}
994	}	1109	}
995		1110
996	MODULE = CFClient PACKAGE = CFClient::Map	1111	MODULE = CFClient PACKAGE = CFClient::Map
997		1112
998	CFClient::Map	1113	CFClient::Map
…		…
1018	DESTROY (CFClient::Map self)	1133	DESTROY (CFClient::Map self)
1019	CODE:	1134	CODE:
1020	{	1135	{
1021	map_clear (self);	1136	map_clear (self);
1022	Safefree (self->face);	1137	Safefree (self->face);
		1138	Safefree (self->tex);
1023	Safefree (self);	1139	Safefree (self);
1024	}	1140	}
1025		1141
1026	void	1142	void
1027	clear (CFClient::Map self)	1143	clear (CFClient::Map self)
…		…
1062	tex->r = r;	1178	tex->r = r;
1063	tex->g = g;	1179	tex->g = g;
1064	tex->b = b;	1180	tex->b = b;
1065	tex->a = a;	1181	tex->a = a;
1066	}	1182	}
		1183
		1184	// somewhat hackish, but for textures that require it, it really
		1185	// improves the look, and most others don't suffer.
		1186	glBindTexture (GL_TEXTURE_2D, name);
		1187	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1188	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1189	// use uglier nearest interpolation because linear suffers
		1190	// from transparent color bleeding and ugly wrapping effects.
		1191	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1067	}	1192	}
1068		1193
1069	int	1194	int
1070	ox (CFClient::Map self)	1195	ox (CFClient::Map self)
1071	ALIAS:	1196	ALIAS:
1072	oy = 1	1197	oy = 1
		1198	x = 2
		1199	y = 3
		1200	w = 4
		1201	h = 5
1073	CODE:	1202	CODE:
1074	switch (ix)	1203	switch (ix)
1075	{	1204	{
1076	case 0: RETVAL = self->ox; break;	1205	case 0: RETVAL = self->ox; break;
1077	case 1: RETVAL = self->oy; break;	1206	case 1: RETVAL = self->oy; break;
		1207	case 2: RETVAL = self->x; break;
		1208	case 3: RETVAL = self->y; break;
		1209	case 4: RETVAL = self->w; break;
		1210	case 5: RETVAL = self->h; break;
1078	}	1211	}
1079	OUTPUT:	1212	OUTPUT:
1080	RETVAL	1213	RETVAL
1081		1214
1082	void	1215	void
…		…
1116		1249
1117	while (data < data_end)	1250	while (data < data_end)
1118	{	1251	{
1119	flags = (data [0] << 8) + data [1]; data += 2;	1252	flags = (data [0] << 8) + data [1]; data += 2;
1120		1253
1121	x = ((flags >> 10) & 63) + self->x;	1254	x = self->x + ((flags >> 10) & 63);
1122	y = ((flags >> 4) & 63) + self->y;	1255	y = self->y + ((flags >> 4) & 63);
1123		1256
1124	cell = map_get_cell (self, x, y);	1257	cell = map_get_cell (self, x, y);
1125		1258
1126	if (flags & 15)	1259	if (flags & 15)
1127	{	1260	{
…		…
1217	OUTPUT:	1350	OUTPUT:
1218	RETVAL	1351	RETVAL
1219		1352
1220	void	1353	void
1221	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1354	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1222	PPCODE:	1355	CODE:
1223	{	1356	{
1224	int vx, vy;	1357	int vx, vy;
1225	int x, y, z;	1358	int x, y, z;
1226	int last_name;	1359	int last_name;
1227	mapface face;	1360	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		1361
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;	1362	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1237	vy = self->y + (self->h - sh) / 2 - shift_y;	1363	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1238		1364
1239	/*	1365	/*
1240	int vx = self->vx = self->w >= sw	1366	int vx = self->vx = self->w >= sw
1241	? self->x + (self->w - sw) / 2	1367	? self->x + (self->w - sw) / 2
1242	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1368	: 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));	1372	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1247	*/	1373	*/
1248		1374
1249	glColor4ub (255, 255, 255, 255);	1375	glColor4ub (255, 255, 255, 255);
1250		1376
		1377	glEnable (GL_BLEND);
1251	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1378	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1252	glEnable (GL_BLEND);
1253	glEnable (GL_TEXTURE_2D);	1379	glEnable (GL_TEXTURE_2D);
1254	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1380	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1255		1381
1256	glBegin (GL_QUADS);	1382	glBegin (GL_QUADS);
1257		1383
…		…
1265		1391
1266	for (x = 0; x < sw; x++)	1392	for (x = 0; x < sw; x++)
1267	if (row->c0 <= x + vx && x + vx < row->c1)	1393	if (row->c0 <= x + vx && x + vx < row->c1)
1268	{	1394	{
1269	mapcell *cell = row->col + (x + vx - row->c0);	1395	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		1396
1275	face = cell->face [z];	1397	face = cell->face [z];
1276		1398
1277	if (face)	1399	if (face)
1278	{	1400	{
…		…
1299		1421
1300	glEnd ();	1422	glEnd ();
1301		1423
1302	glDisable (GL_TEXTURE_2D);	1424	glDisable (GL_TEXTURE_2D);
1303	glDisable (GL_BLEND);	1425	glDisable (GL_BLEND);
		1426	}
		1427
		1428	void
		1429	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1430	CODE:
		1431	{
		1432	static float color[16][3] = {
		1433	{ 0.00F, 0.00F, 0.00F },
		1434	{ 1.00F, 1.00F, 1.00F },
		1435	{ 0.00F, 0.00F, 0.55F },
		1436	{ 1.00F, 0.00F, 0.00F },
		1437
		1438	{ 1.00F, 0.54F, 0.00F },
		1439	{ 0.11F, 0.56F, 1.00F },
		1440	{ 0.93F, 0.46F, 0.00F },
		1441	{ 0.18F, 0.54F, 0.34F },
		1442
		1443	{ 0.56F, 0.73F, 0.56F },
		1444	{ 0.80F, 0.80F, 0.80F },
		1445	{ 0.55F, 0.41F, 0.13F },
		1446	{ 0.99F, 0.77F, 0.26F },
		1447
		1448	{ 0.74F, 0.65F, 0.41F },
		1449
		1450	{ 0.00F, 1.00F, 1.00F },
		1451	{ 1.00F, 0.00F, 1.00F },
		1452	{ 1.00F, 1.00F, 0.00F },
		1453	};
		1454
		1455	int x, y;
		1456
		1457	glEnable (GL_TEXTURE_2D);
		1458	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1459	glEnable (GL_BLEND);
		1460	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1461	glBegin (GL_QUADS);
		1462
		1463	for (y = 0; y < h; y++)
		1464	for (x = 0; x < w; x++)
		1465	{
		1466	unsigned char m = data [x + y * w];
		1467
		1468	if (m)
		1469	{
		1470	float *c = color [m & 15];
		1471
		1472	float tx1 = m & 0x40 ? 0.5 : 0.;
		1473	float tx2 = tx1 + 0.5;
		1474
		1475	glColor4f (c[0], c[1], c[2], 0.75);
		1476	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1477	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1478	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1479	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1480	}
		1481	}
		1482
		1483	glEnd ();
		1484	glDisable (GL_BLEND);
		1485	glDisable (GL_TEXTURE_2D);
		1486	}
		1487
		1488	void
		1489	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1490	PPCODE:
		1491	{
		1492	int vx, vy;
		1493	int x, y;
		1494	int sw4 = (sw + 3) & ~3;
		1495	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1496	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1497
		1498	memset (darkness, 255, sw4 * sh);
		1499	SvPOK_only (darkness_sv);
		1500	SvCUR_set (darkness_sv, sw4 * sh);
		1501
		1502	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1503	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1504
		1505	for (y = 0; y < sh; y++)
		1506	if (0 <= y + vy && y + vy < self->rows)
		1507	{
		1508	maprow *row = self->row + (y + vy);
		1509
		1510	for (x = 0; x < sw; x++)
		1511	if (row->c0 <= x + vx && x + vx < row->c1)
		1512	{
		1513	mapcell *cell = row->col + (x + vx - row->c0);
		1514
		1515	darkness[y * sw4 + x] = cell->darkness < 0
		1516	? 255 - FOW_DARKNESS
		1517	: 255 - cell->darkness;
		1518	}
		1519	}
1304		1520
1305	EXTEND (SP, 3);	1521	EXTEND (SP, 3);
1306	PUSHs (sv_2mortal (newSViv (sw4)));	1522	PUSHs (sv_2mortal (newSViv (sw4)));
1307	PUSHs (sv_2mortal (newSViv (sh)));	1523	PUSHs (sv_2mortal (newSViv (sh)));
1308	PUSHs (darkness_sv);	1524	PUSHs (darkness_sv);
…		…
1509	const_iv (GL_COLOR_MATERIAL),	1725	const_iv (GL_COLOR_MATERIAL),
1510	const_iv (GL_SMOOTH),	1726	const_iv (GL_SMOOTH),
1511	const_iv (GL_FLAT),	1727	const_iv (GL_FLAT),
1512	const_iv (GL_DITHER),	1728	const_iv (GL_DITHER),
1513	const_iv (GL_BLEND),	1729	const_iv (GL_BLEND),
		1730	const_iv (GL_CULL_FACE),
1514	const_iv (GL_SCISSOR_TEST),	1731	const_iv (GL_SCISSOR_TEST),
		1732	const_iv (GL_DEPTH_TEST),
		1733	const_iv (GL_ALPHA_TEST),
		1734	const_iv (GL_NORMALIZE),
		1735	const_iv (GL_RESCALE_NORMAL),
		1736	const_iv (GL_FRONT),
		1737	const_iv (GL_BACK),
1515	const_iv (GL_AND),	1738	const_iv (GL_AND),
1516	const_iv (GL_ONE),	1739	const_iv (GL_ONE),
1517	const_iv (GL_ZERO),	1740	const_iv (GL_ZERO),
1518	const_iv (GL_SRC_ALPHA),	1741	const_iv (GL_SRC_ALPHA),
1519	const_iv (GL_SRC_ALPHA_SATURATE),	1742	const_iv (GL_DST_ALPHA),
1520	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1743	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1521	const_iv (GL_ONE_MINUS_DST_ALPHA),	1744	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1745	const_iv (GL_SRC_ALPHA_SATURATE),
1522	const_iv (GL_RGB),	1746	const_iv (GL_RGB),
1523	const_iv (GL_RGBA),	1747	const_iv (GL_RGBA),
		1748	const_iv (GL_RGBA4),
		1749	const_iv (GL_RGBA8),
		1750	const_iv (GL_RGB5_A1),
1524	const_iv (GL_UNSIGNED_BYTE),	1751	const_iv (GL_UNSIGNED_BYTE),
		1752	const_iv (GL_UNSIGNED_SHORT),
		1753	const_iv (GL_UNSIGNED_INT),
1525	const_iv (GL_ALPHA),	1754	const_iv (GL_ALPHA),
		1755	const_iv (GL_INTENSITY),
1526	const_iv (GL_LUMINANCE),	1756	const_iv (GL_LUMINANCE),
		1757	const_iv (GL_LUMINANCE_ALPHA),
1527	const_iv (GL_FLOAT),	1758	const_iv (GL_FLOAT),
1528	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1759	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1529	const_iv (GL_COMPILE),	1760	const_iv (GL_COMPILE),
1530	const_iv (GL_TEXTURE_1D),	1761	const_iv (GL_TEXTURE_1D),
1531	const_iv (GL_TEXTURE_2D),	1762	const_iv (GL_TEXTURE_2D),
…		…
1533	const_iv (GL_TEXTURE_MAG_FILTER),	1764	const_iv (GL_TEXTURE_MAG_FILTER),
1534	const_iv (GL_TEXTURE_MIN_FILTER),	1765	const_iv (GL_TEXTURE_MIN_FILTER),
1535	const_iv (GL_TEXTURE_ENV_MODE),	1766	const_iv (GL_TEXTURE_ENV_MODE),
1536	const_iv (GL_TEXTURE_WRAP_S),	1767	const_iv (GL_TEXTURE_WRAP_S),
1537	const_iv (GL_TEXTURE_WRAP_T),	1768	const_iv (GL_TEXTURE_WRAP_T),
		1769	const_iv (GL_REPEAT),
1538	const_iv (GL_CLAMP),	1770	const_iv (GL_CLAMP),
1539	const_iv (GL_REPEAT),	1771	const_iv (GL_CLAMP_TO_EDGE),
1540	const_iv (GL_NEAREST),	1772	const_iv (GL_NEAREST),
1541	const_iv (GL_LINEAR),	1773	const_iv (GL_LINEAR),
1542	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1774	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1543	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1775	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1544	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1776	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1545	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1777	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1546	const_iv (GL_GENERATE_MIPMAP),	1778	const_iv (GL_GENERATE_MIPMAP),
1547	const_iv (GL_MODULATE),	1779	const_iv (GL_MODULATE),
1548	const_iv (GL_DECAL),	1780	const_iv (GL_DECAL),
1549	const_iv (GL_REPLACE),	1781	const_iv (GL_REPLACE),
		1782	const_iv (GL_DEPTH_BUFFER_BIT),
1550	const_iv (GL_COLOR_BUFFER_BIT),	1783	const_iv (GL_COLOR_BUFFER_BIT),
1551	const_iv (GL_PROJECTION),	1784	const_iv (GL_PROJECTION),
1552	const_iv (GL_MODELVIEW),	1785	const_iv (GL_MODELVIEW),
1553	const_iv (GL_COLOR_LOGIC_OP),	1786	const_iv (GL_COLOR_LOGIC_OP),
1554	const_iv (GL_SEPARABLE_2D),	1787	const_iv (GL_SEPARABLE_2D),
1555	const_iv (GL_CONVOLUTION_2D),	1788	const_iv (GL_CONVOLUTION_2D),
1556	const_iv (GL_CONVOLUTION_BORDER_MODE),	1789	const_iv (GL_CONVOLUTION_BORDER_MODE),
1557	const_iv (GL_CONSTANT_BORDER),	1790	const_iv (GL_CONSTANT_BORDER),
1558	const_iv (GL_LINES),	1791	const_iv (GL_LINES),
		1792	const_iv (GL_LINE_LOOP),
1559	const_iv (GL_QUADS),	1793	const_iv (GL_QUADS),
1560	const_iv (GL_LINE_LOOP),	1794	const_iv (GL_QUAD_STRIP),
		1795	const_iv (GL_TRIANGLES),
		1796	const_iv (GL_TRIANGLE_STRIP),
		1797	const_iv (GL_TRIANGLE_FAN),
1561	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1798	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1562	const_iv (GL_FASTEST),	1799	const_iv (GL_FASTEST),
		1800	const_iv (GL_V2F),
		1801	const_iv (GL_V3F),
		1802	const_iv (GL_T2F_V3F),
		1803	const_iv (GL_T2F_N3F_V3F),
1563	# undef const_iv	1804	# undef const_iv
1564	};	1805	};
1565		1806
1566	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1807	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1567	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1808	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1568	}	1809	}
1569		1810
		1811	char *
		1812	gl_vendor ()
		1813	CODE:
		1814	RETVAL = (char *)glGetString (GL_VENDOR);
		1815	OUTPUT:
		1816	RETVAL
		1817
		1818	char *
		1819	gl_version ()
		1820	CODE:
		1821	RETVAL = (char *)glGetString (GL_VERSION);
		1822	OUTPUT:
		1823	RETVAL
		1824
		1825	char *
		1826	gl_extensions ()
		1827	CODE:
		1828	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1829	OUTPUT:
		1830	RETVAL
		1831
1570	int glGetError ()	1832	int glGetError ()
		1833
		1834	void glFinish ()
1571		1835
1572	void glClear (int mask)	1836	void glClear (int mask)
1573		1837
1574	void glClearColor (float r, float g, float b, float a = 1.0)	1838	void glClearColor (float r, float g, float b, float a = 1.0)
1575	PROTOTYPE: @	1839	PROTOTYPE: @
…		…
1582		1846
1583	void glHint (int target, int mode)	1847	void glHint (int target, int mode)
1584		1848
1585	void glBlendFunc (int sfactor, int dfactor)	1849	void glBlendFunc (int sfactor, int dfactor)
1586		1850
		1851	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1852	CODE:
		1853	gl_BlendFuncSeparate (sa, da, saa, daa);
		1854
		1855	void glDepthMask (int flag)
		1856
1587	void glLogicOp (int opcode)	1857	void glLogicOp (int opcode)
1588		1858
1589	void glColorMask (int red, int green, int blue, int alpha)	1859	void glColorMask (int red, int green, int blue, int alpha)
1590		1860
1591	void glMatrixMode (int mode)	1861	void glMatrixMode (int mode)
…		…
1594		1864
1595	void glPopMatrix ()	1865	void glPopMatrix ()
1596		1866
1597	void glLoadIdentity ()	1867	void glLoadIdentity ()
1598		1868
		1869	void glDrawBuffer (int buffer)
		1870
		1871	void glReadBuffer (int buffer)
		1872
1599	# near and far are due to microsofts buggy c compiler	1873	# near_ and far_ are due to microsofts buggy "c" compiler
		1874	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1875
		1876	# 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_)	1877	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1601		1878
1602	void glViewport (int x, int y, int width, int height)	1879	void glViewport (int x, int y, int width, int height)
1603		1880
1604	void glScissor (int x, int y, int width, int height)	1881	void glScissor (int x, int y, int width, int height)
…		…
1619		1896
1620	void glEnd ()	1897	void glEnd ()
1621		1898
1622	void glColor (float r, float g, float b, float a = 1.0)	1899	void glColor (float r, float g, float b, float a = 1.0)
1623	PROTOTYPE: @	1900	PROTOTYPE: @
		1901	ALIAS:
		1902	glColor_premultiply = 1
1624	CODE:	1903	CODE:
		1904	if (ix)
		1905	{
		1906	r *= a;
		1907	g *= a;
		1908	b *= a;
		1909	}
		1910	// microsoft visual "c" rounds instead of truncating...
1625	glColor4ub (MIN ((int)(r * 255.f), 255),	1911	glColor4ub (MIN ((int)(r * 256.f), 255),
1626	MIN ((int)(g * 255.f), 255),	1912	MIN ((int)(g * 256.f), 255),
1627	MIN ((int)(b * 255.f), 255),	1913	MIN ((int)(b * 256.f), 255),
1628	MIN ((int)(a * 255.f), 255));	1914	MIN ((int)(a * 256.f), 255));
		1915
		1916	void glInterleavedArrays (int format, int stride, char *data)
		1917
		1918	void glDrawElements (int mode, int count, int type, char *indices)
		1919
		1920	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1921
		1922	void glRasterPos (float x, float y, float z = 0.)
		1923	CODE:
		1924	glRasterPos3f (0, 0, z);
		1925	glBitmap (0, 0, 0, 0, x, y, 0);
1629		1926
1630	void glVertex (float x, float y, float z = 0.)	1927	void glVertex (float x, float y, float z = 0.)
1631	CODE:	1928	CODE:
1632	glVertex3f (x, y, z);	1929	glVertex3f (x, y, z);
1633		1930
…		…
1645		1942
1646	void glBindTexture (int target, int name)	1943	void glBindTexture (int target, int name)
1647		1944
1648	void glConvolutionParameter (int target, int pname, float params)	1945	void glConvolutionParameter (int target, int pname, float params)
1649	CODE:	1946	CODE:
1650	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1947	if (gl.ConvolutionParameterf)
		1948	gl.ConvolutionParameterf (target, pname, params);
1651		1949
1652	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1950	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1653	CODE:	1951	CODE:
1654	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1952	if (gl.ConvolutionFilter2D)
1655	(target, internalformat, width, height, format, type, data));	1953	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1656		1954
1657	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1955	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1658	CODE:	1956	CODE:
1659	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1957	if (gl.SeparableFilter2D)
1660	(target, internalformat, width, height, format, type, row, column));	1958	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1661		1959
1662	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1960	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1663		1961
1664	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1962	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1665		1963
1666	void glRasterPos (int x, int y)	1964	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1667	CODE:
1668	glRasterPos2i (x, y);
1669		1965
1670	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1966	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1671		1967
1672	int glGenTexture ()	1968	int glGenTexture ()
1673	CODE:	1969	CODE:
…		…
1700		1996
1701	void glEndList ()	1997	void glEndList ()
1702		1998
1703	void glCallList (int list)	1999	void glCallList (int list)
1704		2000
		2001

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.127 by root, Wed Jul 5 00:16:44 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.127 by root, Wed Jul 5 00:16:44 2006 UTC