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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.84 by root, Wed May 17 15:18:57 2006 UTC vs. Revision 1.125 by root, Tue Jul 4 23:44:23 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.84 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.125 by root, Tue Jul 4 23:44:23 2006 UTC