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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.81 by root, Sun May 14 23:19:14 2006 UTC vs.
Revision 1.129 by root, Wed Jul 12 17:20:04 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);
		123	#ifdef FC_HINT_STYLE
		124	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		125	#endif
89	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	126	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
90	}	127	}
91		128
92	static void	129	static void
93	layout_update_font (CFClient__Layout self)	130	layout_update_font (CFClient__Layout self)
94	{	131	{
…		…
290	ev.code = 1;	327	ev.code = 1;
291	ev.data1 = (void *)(long)channel;	328	ev.data1 = (void *)(long)channel;
292	ev.data2 = 0;	329	ev.data2 = 0;
293		330
294	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;
295	}	349	}
296		350
297	MODULE = CFClient PACKAGE = CFClient	351	MODULE = CFClient PACKAGE = CFClient
298		352
299	PROTOTYPES: ENABLE	353	PROTOTYPES: ENABLE
…		…
409		463
410	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; )
411	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	465	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
412	}	466	}
413		467
		468	int
		469	in_destruct ()
		470	CODE:
		471	RETVAL = PL_main_cv == Nullcv;
		472	OUTPUT:
		473	RETVAL
		474
		475	NV floor (NV x)
		476
		477	NV ceil (NV x)
		478
414	void	479	void
415	pango_init ()	480	pango_init ()
416	CODE:	481	CODE:
417	{	482	{
418	// delayed, so it can pick up new fonts added by AddFontResourceEx
419	ft2_fontmap = pango_ft2_font_map_new ();	483	opengl_fontmap = pango_opengl_font_map_new ();
420	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	484	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
421	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	485	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
422
423	cairo_fontmap = pango_cairo_font_map_get_default ();
424	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
425	}	486	}
426		487
427	int	488	int
428	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	489	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
429		490
430	void	491	void
431	SDL_Quit ()	492	SDL_Quit ()
432		493
433	void	494	void
…		…
439	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	500	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
440	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	501	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
441	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	502	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
442	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	503	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
443		504
		505	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		506	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		507
444	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	508	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
445	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	509	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
446	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	510	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
447	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	511	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
448		512
449	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	513	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
450	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
452		514
453	SDL_EnableUNICODE (1);	515	SDL_EnableUNICODE (1);
454	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	516	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
455		517
456	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	518	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
465		527
466	++m;	528	++m;
467	}	529	}
468	}	530	}
469		531
		532	char *
		533	SDL_GetError ()
		534
470	int	535	int
471	SDL_SetVideoMode (int w, int h, int fullscreen)	536	SDL_SetVideoMode (int w, int h, int fullscreen)
472	CODE:	537	CODE:
473	RETVAL = !!SDL_SetVideoMode (	538	RETVAL = !!SDL_SetVideoMode (
474	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	539	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
475	);	540	);
		541	if (RETVAL)
		542	{
476	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	543	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		544	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		545	# include "glfunc.h"
		546	# undef GL_FUNC
		547	}
477	OUTPUT:	548	OUTPUT:
478	RETVAL	549	RETVAL
479		550
480	void	551	void
481	SDL_GL_SwapBuffers ()	552	SDL_GL_SwapBuffers ()
		553
		554	char *
		555	SDL_GetKeyName (int sym)
482		556
483	void	557	void
484	SDL_PollEvent ()	558	SDL_PollEvent ()
485	PPCODE:	559	PPCODE:
486	{	560	{
…		…
505	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	579	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
506	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	580	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
507	break;	581	break;
508		582
509	case SDL_MOUSEMOTION:	583	case SDL_MOUSEMOTION:
		584	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		585
510	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	586	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
511	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	587	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
512	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	588	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
513	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	589	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
514	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	590	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
515	break;	591	break;
516		592
517	case SDL_MOUSEBUTTONDOWN:	593	case SDL_MOUSEBUTTONDOWN:
518	case SDL_MOUSEBUTTONUP:	594	case SDL_MOUSEBUTTONUP:
		595	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		596
519	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	597	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
520	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	598	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
521	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	599	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
522	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	600	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
523	break;	601	break;
…		…
550	CODE:	628	CODE:
551	#ifndef _WIN32	629	#ifndef _WIN32
552	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	630	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
553	#endif	631	#endif
554		632
555	char *
556	gl_version ()
557	CODE:
558	RETVAL = (char *)glGetString (GL_VERSION);
559	OUTPUT:
560	RETVAL
561
562	char *
563	gl_extensions ()
564	CODE:
565	RETVAL = (char *)glGetString (GL_EXTENSIONS);
566	OUTPUT:
567	RETVAL
568
569	void	633	void
570	add_font (char *file)	634	add_font (char *file)
571	CODE:	635	CODE:
572	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	636	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
573	#ifdef _WIN32
574	// cairo... sigh... requires win2000
575	AddFontResourceEx (file, FR_PRIVATE, 0);
576	#endif
577		637
578	void	638	void
579	load_image_inline (SV *image_)	639	load_image_inline (SV *image_)
580	ALIAS:	640	ALIAS:
581	load_image_file = 1	641	load_image_file = 1
…		…
623		683
624	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	684	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
625		685
626	assert (surface2->pitch == surface2->w * 4);	686	assert (surface2->pitch == surface2->w * 4);
627		687
		688	SDL_LockSurface (surface2);
628	EXTEND (SP, 5);	689	EXTEND (SP, 6);
629	PUSHs (sv_2mortal (newSViv (surface2->w)));	690	PUSHs (sv_2mortal (newSViv (surface2->w)));
630	PUSHs (sv_2mortal (newSViv (surface2->h)));	691	PUSHs (sv_2mortal (newSViv (surface2->h)));
631	SDL_LockSurface (surface2);
632	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	692	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
633	SDL_UnlockSurface (surface2);
634	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	693	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
635	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	694	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
636	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	695	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		696	SDL_UnlockSurface (surface2);
637		697
638	SDL_FreeSurface (surface);	698	SDL_FreeSurface (surface);
639	SDL_FreeSurface (surface2);	699	SDL_FreeSurface (surface2);
640	}	700	}
641		701
…		…
665	}	725	}
666		726
667	void	727	void
668	error (char *message)	728	error (char *message)
669	CODE:	729	CODE:
		730	fprintf (stderr, "ERROR: %s\n", message);
670	#ifdef _WIN32	731	#ifdef _WIN32
671	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	732	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
672	#else
673	fprintf (stderr, "ERROR: %s\n", message);
674	#endif	733	#endif
675		734
676	void	735	void
677	fatal (char *message)	736	fatal (char *message)
678	CODE:	737	CODE:
		738	fprintf (stderr, "FATAL: %s\n", message);
679	#ifdef _WIN32	739	#ifdef _WIN32
680	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	740	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
681	#else
682	fprintf (stderr, "FATAL: %s\n", message);
683	#endif	741	#endif
684	exit (1);	742	_exit (1);
		743
		744	void
		745	_exit (int retval)
		746	CODE:
		747	_exit (retval);
685		748
686	MODULE = CFClient PACKAGE = CFClient::Font	749	MODULE = CFClient PACKAGE = CFClient::Font
687		750
688	CFClient::Font	751	CFClient::Font
689	new_from_file (SV class, char path, int id = 0)	752	new_from_file (SV class, char path, int id = 0)
…		…
707	CODE:	770	CODE:
708	default_font = self;	771	default_font = self;
709		772
710	MODULE = CFClient PACKAGE = CFClient::Layout	773	MODULE = CFClient PACKAGE = CFClient::Layout
711		774
		775	void
		776	reset_glyph_cache ()
		777	CODE:
		778	tc_clear ();
		779
712	CFClient::Layout	780	CFClient::Layout
713	new (SV *class, int rgba = 0)	781	new (SV *class)
714	CODE:	782	CODE:
715	New (0, RETVAL, 1, struct cf_layout);	783	New (0, RETVAL, 1, struct cf_layout);
716		784
717	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	785	RETVAL->pl = pango_layout_new (opengl_context);
718	RETVAL->rgba = rgba;
719	RETVAL->r = 1.;	786	RETVAL->r = 1.;
720	RETVAL->g = 1.;	787	RETVAL->g = 1.;
721	RETVAL->b = 1.;	788	RETVAL->b = 1.;
722	RETVAL->a = 1.;	789	RETVAL->a = 1.;
723	RETVAL->base_height = MIN_FONT_HEIGHT;	790	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
732	DESTROY (CFClient::Layout self)	799	DESTROY (CFClient::Layout self)
733	CODE:	800	CODE:
734	g_object_unref (self->pl);	801	g_object_unref (self->pl);
735	Safefree (self);	802	Safefree (self);
736		803
737	int
738	is_rgba (CFClient::Layout self)
739	CODE:
740	RETVAL = self->rgba;
741	OUTPUT:
742	RETVAL
743
744	void	804	void
745	set_text (CFClient::Layout self, SV *text_)	805	set_text (CFClient::Layout self, SV *text_)
746	CODE:	806	CODE:
747	{	807	{
748	STRLEN textlen;	808	STRLEN textlen;
…		…
759	char *text = SvPVutf8 (text_, textlen);	819	char *text = SvPVutf8 (text_, textlen);
760		820
761	pango_layout_set_markup (self->pl, text, textlen);	821	pango_layout_set_markup (self->pl, text, textlen);
762	}	822	}
763		823
		824	void
		825	set_shapes (CFClient::Layout self, ...)
		826	CODE:
		827	{
		828	PangoAttrList *attrs = 0;
		829	const char *text = pango_layout_get_text (self->pl);
		830	const char *pos = text;
		831	int arg = 4;
		832
		833	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		834	{
		835	PangoRectangle inkrect, rect;
		836	PangoAttribute *attr;
		837
		838	int x = SvIV (ST (arg - 3));
		839	int y = SvIV (ST (arg - 2));
		840	int w = SvIV (ST (arg - 1));
		841	int h = SvIV (ST (arg ));
		842
		843	inkrect.x = 0;
		844	inkrect.y = 0;
		845	inkrect.width = 0;
		846	inkrect.height = 0;
		847
		848	rect.x = x * PANGO_SCALE;
		849	rect.y = y * PANGO_SCALE;
		850	rect.width = w * PANGO_SCALE;
		851	rect.height = h * PANGO_SCALE;
		852
		853	if (!attrs)
		854	attrs = pango_layout_get_attributes (self->pl);
		855
		856	attr = pango_attr_shape_new (&inkrect, &rect);
		857	attr->start_index = pos - text;
		858	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		859	pango_attr_list_insert (attrs, attr);
		860
		861	arg += 4;
		862	pos += sizeof (OBJ_STR) - 1;
		863	}
		864
		865	if (attrs)
		866	pango_layout_set_attributes (self->pl, attrs);
		867	}
		868
		869	void
		870	get_shapes (CFClient::Layout self)
		871	PPCODE:
		872	{
		873	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		874
		875	do
		876	{
		877	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		878
		879	if (run && shape_attr_p (run))
		880	{
		881	PangoRectangle extents;
		882	pango_layout_iter_get_run_extents (iter, 0, &extents);
		883
		884	EXTEND (SP, 2);
		885	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		886	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		887	}
		888	}
		889	while (pango_layout_iter_next_run (iter));
		890
		891	pango_layout_iter_free (iter);
		892	}
		893
		894	int
		895	has_wrapped (CFClient::Layout self)
		896	CODE:
		897	{
		898	int lines = 1;
		899	const char *text = pango_layout_get_text (self->pl);
		900
		901	while (*text)
		902	lines += *text++ == '\n';
		903
		904	RETVAL = lines < pango_layout_get_line_count (self->pl);
		905	}
		906	OUTPUT:
		907	RETVAL
		908
764	SV *	909	SV *
765	get_text (CFClient::Layout self)	910	get_text (CFClient::Layout self)
766	CODE:	911	CODE:
767	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	912	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
768	SvUTF8_on (RETVAL);	913	sv_utf8_decode (RETVAL);
769	OUTPUT:	914	OUTPUT:
770	RETVAL	915	RETVAL
771		916
772	void	917	void
773	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	918	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
…		…
799	set_width (CFClient::Layout self, int max_width = -1)	944	set_width (CFClient::Layout self, int max_width = -1)
800	CODE:	945	CODE:
801	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	946	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
802		947
803	void	948	void
		949	set_indent (CFClient::Layout self, int indent)
		950	CODE:
		951	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		952
		953	void
		954	set_spacing (CFClient::Layout self, int spacing)
		955	CODE:
		956	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		957
		958	void
		959	set_ellipsise (CFClient::Layout self, int ellipsise)
		960	CODE:
		961	pango_layout_set_ellipsize (self->pl,
		962	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		963	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		964	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		965	: PANGO_ELLIPSIZE_NONE
		966	);
		967
		968	void
		969	set_single_paragraph_mode (CFClient::Layout self, int spm)
		970	CODE:
		971	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		972
		973	void
804	size (CFClient::Layout self)	974	size (CFClient::Layout self)
805	PPCODE:	975	PPCODE:
806	{	976	{
807	int w, h;	977	int w, h;
808		978
…		…
810		980
811	EXTEND (SP, 2);	981	EXTEND (SP, 2);
812	PUSHs (sv_2mortal (newSViv (w)));	982	PUSHs (sv_2mortal (newSViv (w)));
813	PUSHs (sv_2mortal (newSViv (h)));	983	PUSHs (sv_2mortal (newSViv (h)));
814	}	984	}
		985
		986	int
		987	descent (CFClient::Layout self)
		988	CODE:
		989	{
		990	PangoRectangle rect;
		991	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		992	pango_layout_line_get_pixel_extents (line, 0, &rect);
		993	RETVAL = PANGO_DESCENT (rect);
		994	}
		995	OUTPUT:
		996	RETVAL
815		997
816	int	998	int
817	xy_to_index (CFClient::Layout self, int x, int y)	999	xy_to_index (CFClient::Layout self, int x, int y)
818	CODE:	1000	CODE:
819	{	1001	{
…		…
836	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1018	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
837	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1019	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
838	}	1020	}
839		1021
840	void	1022	void
841	render (CFClient::Layout self)	1023	render (CFClient::Layout self, float x, float y)
842	PPCODE:	1024	PPCODE:
843	{	1025	pango_opengl_render_layout_subpixel (
844	SV *retval;	1026	self->pl,
845	int w, h;	1027	x * PANGO_SCALE, y * PANGO_SCALE,
		1028	self->r, self->g, self->b, self->a
		1029	);
846		1030
847	layout_get_pixel_size (self, &w, &h);	1031	MODULE = CFClient PACKAGE = CFClient::Texture
848		1032
849	if (self->rgba)	1033	void
		1034	pad2pot (SV data_, SV w_, SV *h_)
		1035	CODE:
		1036	{
		1037	int ow = SvIV (w_);
		1038	int oh = SvIV (h_);
		1039
		1040	if (ow && oh)
850	{	1041	{
851	cairo_surface_t *surface;	1042	int nw = minpot (ow);
852	cairo_t *cairo;	1043	int nh = minpot (oh);
853		1044
854	retval = newSV (w * h * 4);	1045	if (nw != ow \|\| nh != oh)
855	SvPOK_only (retval);
856	SvCUR_set (retval, w * h * 4);
857
858	memset (SvPVX (retval), 0, w * h * 4);
859
860	surface = cairo_image_surface_create_for_data (
861	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
862	cairo = cairo_create (surface);
863	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
864
865	pango_cairo_show_layout (cairo, self->pl);
866
867	cairo_destroy (cairo);
868	cairo_surface_destroy (surface);
869
870	// what a mess, and its premultiplied, too :(
871	{	1046	{
872	uint32_t p = (uint32_t )SvPVX (retval);	1047	if (SvOK (data_))
873	uint32_t e = p + w h;
874
875	while (p < e)
876	{	1048	{
877	uint32_t rgba = *p;	1049	STRLEN datalen;
878	rgba = (rgba >> 24) \| (rgba << 8);	1050	char *data = SvPVbyte (data_, datalen);
879	rgba = SDL_SwapBE32 (rgba);	1051	int bpp = datalen / (ow * oh);
880	*p++ = rgba;	1052	SV result_ = sv_2mortal (newSV (nw nh * bpp));
		1053
		1054	SvPOK_only (result_);
		1055	SvCUR_set (result_, nw * nh * bpp);
		1056
		1057	memset (SvPVX (result_), 0, nw * nh * bpp);
		1058	while (oh--)
		1059	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1060
		1061	sv_setsv (data_, result_);
881	}	1062	}
		1063
		1064	sv_setiv (w_, nw);
		1065	sv_setiv (h_, nh);
882	}	1066	}
883
884	EXTEND (SP, 5);
885	PUSHs (sv_2mortal (newSViv (w)));
886	PUSHs (sv_2mortal (newSViv (h)));
887	PUSHs (sv_2mortal (retval));
888	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
889	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
890	}	1067	}
891	else
892	{
893	FT_Bitmap bitmap;
894
895	retval = newSV (w * h);
896	SvPOK_only (retval);
897	SvCUR_set (retval, w * h);
898
899	bitmap.rows = h;
900	bitmap.width = w;
901	bitmap.pitch = w;
902	bitmap.buffer = (unsigned char*)SvPVX (retval);
903	bitmap.num_grays = 256;
904	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
905
906	memset (bitmap.buffer, 0, w * h);
907
908	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
909
910	EXTEND (SP, 5);
911	PUSHs (sv_2mortal (newSViv (w)));
912	PUSHs (sv_2mortal (newSViv (h)));
913	PUSHs (sv_2mortal (retval));
914	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
915	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
916	}
917	}	1068	}
918		1069
919	MODULE = CFClient PACKAGE = CFClient::Texture
920
921	void	1070	void
922	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1071	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
923	PROTOTYPE: $$$;$$	1072	PROTOTYPE: $$$;$$
924	ALIAS:	1073	ALIAS:
925	draw_quad_alpha = 1	1074	draw_quad_alpha = 1
926	draw_quad_alpha_premultiplied = 2	1075	draw_quad_alpha_premultiplied = 2
927	CODE:	1076	CODE:
928	{	1077	{
929	HV hv = (HV )SvRV (self);	1078	HV hv = (HV )SvRV (self);
930	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1079	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
931	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1080	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
932	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1081	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
933	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
934		1082
935	if (items < 5)	1083	if (items < 5)
936	{	1084	{
937	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1085	w = SvNV (*hv_fetch (hv, "w", 1, 1));
938	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1086	h = SvNV (*hv_fetch (hv, "h", 1, 1));
939	}	1087	}
940		1088
941	if (ix)	1089	if (ix)
942	{	1090	{
943	glEnable (GL_BLEND);	1091	glEnable (GL_BLEND);
		1092
		1093	if (ix == 2)
944	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1094	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1095	else
		1096	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1097	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1098
		1099	glEnable (GL_ALPHA_TEST);
		1100	glAlphaFunc (GL_GREATER, 0.01f);
945	}	1101	}
946		1102
947	glBindTexture (GL_TEXTURE_2D, name);	1103	glBindTexture (GL_TEXTURE_2D, name);
948
949	if (wrap_mode)
950	{
951	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
952	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
953	}
954		1104
955	glBegin (GL_QUADS);	1105	glBegin (GL_QUADS);
956	glTexCoord2f (0, 0); glVertex2f (x , y );	1106	glTexCoord2f (0, 0); glVertex2f (x , y );
957	glTexCoord2f (0, t); glVertex2f (x , y + h);	1107	glTexCoord2f (0, t); glVertex2f (x , y + h);
958	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1108	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
959	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1109	glTexCoord2f (s, 0); glVertex2f (x + w, y );
960	glEnd ();	1110	glEnd ();
961		1111
962	if (ix)	1112	if (ix)
		1113	{
		1114	glDisable (GL_ALPHA_TEST);
963	glDisable (GL_BLEND);	1115	glDisable (GL_BLEND);
		1116	}
964	}	1117	}
965		1118
966	MODULE = CFClient PACKAGE = CFClient::Map	1119	MODULE = CFClient PACKAGE = CFClient::Map
967		1120
968	CFClient::Map	1121	CFClient::Map
…		…
988	DESTROY (CFClient::Map self)	1141	DESTROY (CFClient::Map self)
989	CODE:	1142	CODE:
990	{	1143	{
991	map_clear (self);	1144	map_clear (self);
992	Safefree (self->face);	1145	Safefree (self->face);
		1146	Safefree (self->tex);
993	Safefree (self);	1147	Safefree (self);
994	}	1148	}
995		1149
996	void	1150	void
997	clear (CFClient::Map self)	1151	clear (CFClient::Map self)
…		…
1032	tex->r = r;	1186	tex->r = r;
1033	tex->g = g;	1187	tex->g = g;
1034	tex->b = b;	1188	tex->b = b;
1035	tex->a = a;	1189	tex->a = a;
1036	}	1190	}
		1191
		1192	// somewhat hackish, but for textures that require it, it really
		1193	// improves the look, and most others don't suffer.
		1194	glBindTexture (GL_TEXTURE_2D, name);
		1195	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1196	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1197	// use uglier nearest interpolation because linear suffers
		1198	// from transparent color bleeding and ugly wrapping effects.
		1199	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1037	}	1200	}
1038		1201
1039	int	1202	int
1040	ox (CFClient::Map self)	1203	ox (CFClient::Map self)
1041	ALIAS:	1204	ALIAS:
1042	oy = 1	1205	oy = 1
		1206	x = 2
		1207	y = 3
		1208	w = 4
		1209	h = 5
1043	CODE:	1210	CODE:
1044	switch (ix)	1211	switch (ix)
1045	{	1212	{
1046	case 0: RETVAL = self->ox; break;	1213	case 0: RETVAL = self->ox; break;
1047	case 1: RETVAL = self->oy; break;	1214	case 1: RETVAL = self->oy; break;
		1215	case 2: RETVAL = self->x; break;
		1216	case 3: RETVAL = self->y; break;
		1217	case 4: RETVAL = self->w; break;
		1218	case 5: RETVAL = self->h; break;
1048	}	1219	}
1049	OUTPUT:	1220	OUTPUT:
1050	RETVAL	1221	RETVAL
1051		1222
1052	void	1223	void
…		…
1086		1257
1087	while (data < data_end)	1258	while (data < data_end)
1088	{	1259	{
1089	flags = (data [0] << 8) + data [1]; data += 2;	1260	flags = (data [0] << 8) + data [1]; data += 2;
1090		1261
1091	x = ((flags >> 10) & 63) + self->x;	1262	x = self->x + ((flags >> 10) & 63);
1092	y = ((flags >> 4) & 63) + self->y;	1263	y = self->y + ((flags >> 4) & 63);
1093		1264
1094	cell = map_get_cell (self, x, y);	1265	cell = map_get_cell (self, x, y);
1095		1266
1096	if (flags & 15)	1267	if (flags & 15)
1097	{	1268	{
…		…
1187	OUTPUT:	1358	OUTPUT:
1188	RETVAL	1359	RETVAL
1189		1360
1190	void	1361	void
1191	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1362	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1192	PPCODE:	1363	CODE:
1193	{	1364	{
1194	int vx, vy;	1365	int vx, vy;
1195	int x, y, z;	1366	int x, y, z;
1196	int last_name;	1367	int last_name;
1197	mapface face;	1368	mapface face;
1198	int sw4 = (sw + 3) & ~3;
1199	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1200	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1201		1369
1202	memset (darkness, 255, sw4 * sh);
1203	SvPOK_only (darkness_sv);
1204	SvCUR_set (darkness_sv, sw4 * sh);
1205
1206	vx = self->x + (self->w - sw) / 2 - shift_x;	1370	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1207	vy = self->y + (self->h - sh) / 2 - shift_y;	1371	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1208		1372
1209	/*	1373	/*
1210	int vx = self->vx = self->w >= sw	1374	int vx = self->vx = self->w >= sw
1211	? self->x + (self->w - sw) / 2	1375	? self->x + (self->w - sw) / 2
1212	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1376	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1216	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1380	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1217	*/	1381	*/
1218		1382
1219	glColor4ub (255, 255, 255, 255);	1383	glColor4ub (255, 255, 255, 255);
1220		1384
		1385	glEnable (GL_BLEND);
1221	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1386	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1222	glEnable (GL_BLEND);
1223	glEnable (GL_TEXTURE_2D);	1387	glEnable (GL_TEXTURE_2D);
1224	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1388	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1225		1389
1226	glBegin (GL_QUADS);	1390	glBegin (GL_QUADS);
1227		1391
…		…
1235		1399
1236	for (x = 0; x < sw; x++)	1400	for (x = 0; x < sw; x++)
1237	if (row->c0 <= x + vx && x + vx < row->c1)	1401	if (row->c0 <= x + vx && x + vx < row->c1)
1238	{	1402	{
1239	mapcell *cell = row->col + (x + vx - row->c0);	1403	mapcell *cell = row->col + (x + vx - row->c0);
1240
1241	darkness[y * sw4 + x] = cell->darkness < 0
1242	? 255 - FOW_DARKNESS
1243	: 255 - cell->darkness;
1244		1404
1245	face = cell->face [z];	1405	face = cell->face [z];
1246		1406
1247	if (face)	1407	if (face)
1248	{	1408	{
…		…
1269		1429
1270	glEnd ();	1430	glEnd ();
1271		1431
1272	glDisable (GL_TEXTURE_2D);	1432	glDisable (GL_TEXTURE_2D);
1273	glDisable (GL_BLEND);	1433	glDisable (GL_BLEND);
		1434	}
		1435
		1436	void
		1437	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1438	CODE:
		1439	{
		1440	static float color[16][3] = {
		1441	{ 0.00F, 0.00F, 0.00F },
		1442	{ 1.00F, 1.00F, 1.00F },
		1443	{ 0.00F, 0.00F, 0.55F },
		1444	{ 1.00F, 0.00F, 0.00F },
		1445
		1446	{ 1.00F, 0.54F, 0.00F },
		1447	{ 0.11F, 0.56F, 1.00F },
		1448	{ 0.93F, 0.46F, 0.00F },
		1449	{ 0.18F, 0.54F, 0.34F },
		1450
		1451	{ 0.56F, 0.73F, 0.56F },
		1452	{ 0.80F, 0.80F, 0.80F },
		1453	{ 0.55F, 0.41F, 0.13F },
		1454	{ 0.99F, 0.77F, 0.26F },
		1455
		1456	{ 0.74F, 0.65F, 0.41F },
		1457
		1458	{ 0.00F, 1.00F, 1.00F },
		1459	{ 1.00F, 0.00F, 1.00F },
		1460	{ 1.00F, 1.00F, 0.00F },
		1461	};
		1462
		1463	int x, y;
		1464
		1465	glEnable (GL_TEXTURE_2D);
		1466	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1467	glEnable (GL_BLEND);
		1468	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1469	glBegin (GL_QUADS);
		1470
		1471	for (y = 0; y < h; y++)
		1472	for (x = 0; x < w; x++)
		1473	{
		1474	unsigned char m = data [x + y * w];
		1475
		1476	if (m)
		1477	{
		1478	float *c = color [m & 15];
		1479
		1480	float tx1 = m & 0x40 ? 0.5 : 0.;
		1481	float tx2 = tx1 + 0.5;
		1482
		1483	glColor4f (c[0], c[1], c[2], 0.75);
		1484	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1485	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1486	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1487	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1488	}
		1489	}
		1490
		1491	glEnd ();
		1492	glDisable (GL_BLEND);
		1493	glDisable (GL_TEXTURE_2D);
		1494	}
		1495
		1496	void
		1497	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1498	PPCODE:
		1499	{
		1500	int vx, vy;
		1501	int x, y;
		1502	int sw4 = (sw + 3) & ~3;
		1503	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1504	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1505
		1506	memset (darkness, 255, sw4 * sh);
		1507	SvPOK_only (darkness_sv);
		1508	SvCUR_set (darkness_sv, sw4 * sh);
		1509
		1510	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1511	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1512
		1513	for (y = 0; y < sh; y++)
		1514	if (0 <= y + vy && y + vy < self->rows)
		1515	{
		1516	maprow *row = self->row + (y + vy);
		1517
		1518	for (x = 0; x < sw; x++)
		1519	if (row->c0 <= x + vx && x + vx < row->c1)
		1520	{
		1521	mapcell *cell = row->col + (x + vx - row->c0);
		1522
		1523	darkness[y * sw4 + x] = cell->darkness < 0
		1524	? 255 - FOW_DARKNESS
		1525	: 255 - cell->darkness;
		1526	}
		1527	}
1274		1528
1275	EXTEND (SP, 3);	1529	EXTEND (SP, 3);
1276	PUSHs (sv_2mortal (newSViv (sw4)));	1530	PUSHs (sv_2mortal (newSViv (sw4)));
1277	PUSHs (sv_2mortal (newSViv (sh)));	1531	PUSHs (sv_2mortal (newSViv (sh)));
1278	PUSHs (darkness_sv);	1532	PUSHs (darkness_sv);
…		…
1479	const_iv (GL_COLOR_MATERIAL),	1733	const_iv (GL_COLOR_MATERIAL),
1480	const_iv (GL_SMOOTH),	1734	const_iv (GL_SMOOTH),
1481	const_iv (GL_FLAT),	1735	const_iv (GL_FLAT),
1482	const_iv (GL_DITHER),	1736	const_iv (GL_DITHER),
1483	const_iv (GL_BLEND),	1737	const_iv (GL_BLEND),
		1738	const_iv (GL_CULL_FACE),
1484	const_iv (GL_SCISSOR_TEST),	1739	const_iv (GL_SCISSOR_TEST),
		1740	const_iv (GL_DEPTH_TEST),
		1741	const_iv (GL_ALPHA_TEST),
		1742	const_iv (GL_NORMALIZE),
		1743	const_iv (GL_RESCALE_NORMAL),
		1744	const_iv (GL_FRONT),
		1745	const_iv (GL_BACK),
1485	const_iv (GL_AND),	1746	const_iv (GL_AND),
1486	const_iv (GL_ONE),	1747	const_iv (GL_ONE),
1487	const_iv (GL_ZERO),	1748	const_iv (GL_ZERO),
1488	const_iv (GL_SRC_ALPHA),	1749	const_iv (GL_SRC_ALPHA),
1489	const_iv (GL_SRC_ALPHA_SATURATE),	1750	const_iv (GL_DST_ALPHA),
1490	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1751	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1491	const_iv (GL_ONE_MINUS_DST_ALPHA),	1752	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1753	const_iv (GL_SRC_ALPHA_SATURATE),
1492	const_iv (GL_RGB),	1754	const_iv (GL_RGB),
1493	const_iv (GL_RGBA),	1755	const_iv (GL_RGBA),
		1756	const_iv (GL_RGBA4),
		1757	const_iv (GL_RGBA8),
		1758	const_iv (GL_RGB5_A1),
1494	const_iv (GL_UNSIGNED_BYTE),	1759	const_iv (GL_UNSIGNED_BYTE),
		1760	const_iv (GL_UNSIGNED_SHORT),
		1761	const_iv (GL_UNSIGNED_INT),
1495	const_iv (GL_ALPHA),	1762	const_iv (GL_ALPHA),
		1763	const_iv (GL_INTENSITY),
1496	const_iv (GL_LUMINANCE),	1764	const_iv (GL_LUMINANCE),
		1765	const_iv (GL_LUMINANCE_ALPHA),
1497	const_iv (GL_FLOAT),	1766	const_iv (GL_FLOAT),
1498	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1767	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1499	const_iv (GL_COMPILE),	1768	const_iv (GL_COMPILE),
1500	const_iv (GL_TEXTURE_1D),	1769	const_iv (GL_TEXTURE_1D),
1501	const_iv (GL_TEXTURE_2D),	1770	const_iv (GL_TEXTURE_2D),
…		…
1503	const_iv (GL_TEXTURE_MAG_FILTER),	1772	const_iv (GL_TEXTURE_MAG_FILTER),
1504	const_iv (GL_TEXTURE_MIN_FILTER),	1773	const_iv (GL_TEXTURE_MIN_FILTER),
1505	const_iv (GL_TEXTURE_ENV_MODE),	1774	const_iv (GL_TEXTURE_ENV_MODE),
1506	const_iv (GL_TEXTURE_WRAP_S),	1775	const_iv (GL_TEXTURE_WRAP_S),
1507	const_iv (GL_TEXTURE_WRAP_T),	1776	const_iv (GL_TEXTURE_WRAP_T),
		1777	const_iv (GL_REPEAT),
1508	const_iv (GL_CLAMP),	1778	const_iv (GL_CLAMP),
1509	const_iv (GL_REPEAT),	1779	const_iv (GL_CLAMP_TO_EDGE),
1510	const_iv (GL_NEAREST),	1780	const_iv (GL_NEAREST),
1511	const_iv (GL_LINEAR),	1781	const_iv (GL_LINEAR),
1512	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1782	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1513	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1783	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1514	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1784	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1515	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1785	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1516	const_iv (GL_GENERATE_MIPMAP),	1786	const_iv (GL_GENERATE_MIPMAP),
1517	const_iv (GL_MODULATE),	1787	const_iv (GL_MODULATE),
1518	const_iv (GL_DECAL),	1788	const_iv (GL_DECAL),
1519	const_iv (GL_REPLACE),	1789	const_iv (GL_REPLACE),
		1790	const_iv (GL_DEPTH_BUFFER_BIT),
1520	const_iv (GL_COLOR_BUFFER_BIT),	1791	const_iv (GL_COLOR_BUFFER_BIT),
1521	const_iv (GL_PROJECTION),	1792	const_iv (GL_PROJECTION),
1522	const_iv (GL_MODELVIEW),	1793	const_iv (GL_MODELVIEW),
1523	const_iv (GL_COLOR_LOGIC_OP),	1794	const_iv (GL_COLOR_LOGIC_OP),
1524	const_iv (GL_SEPARABLE_2D),	1795	const_iv (GL_SEPARABLE_2D),
1525	const_iv (GL_CONVOLUTION_2D),	1796	const_iv (GL_CONVOLUTION_2D),
1526	const_iv (GL_CONVOLUTION_BORDER_MODE),	1797	const_iv (GL_CONVOLUTION_BORDER_MODE),
1527	const_iv (GL_CONSTANT_BORDER),	1798	const_iv (GL_CONSTANT_BORDER),
1528	const_iv (GL_LINES),	1799	const_iv (GL_LINES),
		1800	const_iv (GL_LINE_LOOP),
1529	const_iv (GL_QUADS),	1801	const_iv (GL_QUADS),
1530	const_iv (GL_LINE_LOOP),	1802	const_iv (GL_QUAD_STRIP),
		1803	const_iv (GL_TRIANGLES),
		1804	const_iv (GL_TRIANGLE_STRIP),
		1805	const_iv (GL_TRIANGLE_FAN),
1531	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1806	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1532	const_iv (GL_FASTEST),	1807	const_iv (GL_FASTEST),
		1808	const_iv (GL_V2F),
		1809	const_iv (GL_V3F),
		1810	const_iv (GL_T2F_V3F),
		1811	const_iv (GL_T2F_N3F_V3F),
1533	# undef const_iv	1812	# undef const_iv
1534	};	1813	};
1535		1814
1536	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1815	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1537	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1816	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1538	}	1817	}
1539		1818
		1819	char *
		1820	gl_vendor ()
		1821	CODE:
		1822	RETVAL = (char *)glGetString (GL_VENDOR);
		1823	OUTPUT:
		1824	RETVAL
		1825
		1826	char *
		1827	gl_version ()
		1828	CODE:
		1829	RETVAL = (char *)glGetString (GL_VERSION);
		1830	OUTPUT:
		1831	RETVAL
		1832
		1833	char *
		1834	gl_extensions ()
		1835	CODE:
		1836	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1837	OUTPUT:
		1838	RETVAL
		1839
1540	int glGetError ()	1840	int glGetError ()
		1841
		1842	void glFinish ()
1541		1843
1542	void glClear (int mask)	1844	void glClear (int mask)
1543		1845
1544	void glClearColor (float r, float g, float b, float a = 1.0)	1846	void glClearColor (float r, float g, float b, float a = 1.0)
1545	PROTOTYPE: @	1847	PROTOTYPE: @
…		…
1552		1854
1553	void glHint (int target, int mode)	1855	void glHint (int target, int mode)
1554		1856
1555	void glBlendFunc (int sfactor, int dfactor)	1857	void glBlendFunc (int sfactor, int dfactor)
1556		1858
		1859	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1860	CODE:
		1861	gl_BlendFuncSeparate (sa, da, saa, daa);
		1862
		1863	void glDepthMask (int flag)
		1864
1557	void glLogicOp (int opcode)	1865	void glLogicOp (int opcode)
1558		1866
1559	void glColorMask (int red, int green, int blue, int alpha)	1867	void glColorMask (int red, int green, int blue, int alpha)
1560		1868
1561	void glMatrixMode (int mode)	1869	void glMatrixMode (int mode)
…		…
1564		1872
1565	void glPopMatrix ()	1873	void glPopMatrix ()
1566		1874
1567	void glLoadIdentity ()	1875	void glLoadIdentity ()
1568		1876
		1877	void glDrawBuffer (int buffer)
		1878
		1879	void glReadBuffer (int buffer)
		1880
1569	# near and far are due to microsofts buggy c compiler	1881	# near_ and far_ are due to microsofts buggy "c" compiler
		1882	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1883
		1884	# near_ and far_ are due to microsofts buggy "c" compiler
1570	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1885	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1571		1886
1572	void glViewport (int x, int y, int width, int height)	1887	void glViewport (int x, int y, int width, int height)
1573		1888
1574	void glScissor (int x, int y, int width, int height)	1889	void glScissor (int x, int y, int width, int height)
…		…
1589		1904
1590	void glEnd ()	1905	void glEnd ()
1591		1906
1592	void glColor (float r, float g, float b, float a = 1.0)	1907	void glColor (float r, float g, float b, float a = 1.0)
1593	PROTOTYPE: @	1908	PROTOTYPE: @
		1909	ALIAS:
		1910	glColor_premultiply = 1
1594	CODE:	1911	CODE:
		1912	if (ix)
		1913	{
		1914	r *= a;
		1915	g *= a;
		1916	b *= a;
		1917	}
		1918	// microsoft visual "c" rounds instead of truncating...
1595	glColor4ub (MIN ((int)(r * 255.f), 255),	1919	glColor4ub (MIN ((int)(r * 256.f), 255),
1596	MIN ((int)(g * 255.f), 255),	1920	MIN ((int)(g * 256.f), 255),
1597	MIN ((int)(b * 255.f), 255),	1921	MIN ((int)(b * 256.f), 255),
1598	MIN ((int)(a * 255.f), 255));	1922	MIN ((int)(a * 256.f), 255));
		1923
		1924	void glInterleavedArrays (int format, int stride, char *data)
		1925
		1926	void glDrawElements (int mode, int count, int type, char *indices)
		1927
		1928	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1929
		1930	void glRasterPos (float x, float y, float z = 0.)
		1931	CODE:
		1932	glRasterPos3f (0, 0, z);
		1933	glBitmap (0, 0, 0, 0, x, y, 0);
1599		1934
1600	void glVertex (float x, float y, float z = 0.)	1935	void glVertex (float x, float y, float z = 0.)
1601	CODE:	1936	CODE:
1602	glVertex3f (x, y, z);	1937	glVertex3f (x, y, z);
1603		1938
…		…
1615		1950
1616	void glBindTexture (int target, int name)	1951	void glBindTexture (int target, int name)
1617		1952
1618	void glConvolutionParameter (int target, int pname, float params)	1953	void glConvolutionParameter (int target, int pname, float params)
1619	CODE:	1954	CODE:
1620	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1955	if (gl.ConvolutionParameterf)
		1956	gl.ConvolutionParameterf (target, pname, params);
1621		1957
1622	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1958	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1623	CODE:	1959	CODE:
1624	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1960	if (gl.ConvolutionFilter2D)
1625	(target, internalformat, width, height, format, type, data));	1961	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1626		1962
1627	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1963	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1628	CODE:	1964	CODE:
1629	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1965	if (gl.SeparableFilter2D)
1630	(target, internalformat, width, height, format, type, row, column));	1966	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1631		1967
1632	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1968	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1633		1969
1634	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1970	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1635		1971
1636	void glRasterPos (int x, int y)	1972	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1637	CODE:
1638	glRasterPos2i (x, y);
1639		1973
1640	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1974	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1641		1975
1642	int glGenTexture ()	1976	int glGenTexture ()
1643	CODE:	1977	CODE:
…		…
1670		2004
1671	void glEndList ()	2005	void glEndList ()
1672		2006
1673	void glCallList (int list)	2007	void glCallList (int list)
1674		2008
		2009

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.81 by root, Sun May 14 23:19:14 2006 UTC vs. Revision 1.129 by root, Wed Jul 12 17:20:04 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.81 by root, Sun May 14 23:19:14 2006 UTC vs.
Revision 1.129 by root, Wed Jul 12 17:20:04 2006 UTC