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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.94 by root, Tue May 23 18:57:35 2006 UTC vs.
Revision 1.135 by root, Sun Aug 13 15:14:17 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3	# include <malloc.h>	4	# include <malloc.h>
4	# include <windows.h>	5	# include <windows.h>
5	# pragma warning(disable:4244)	6	# pragma warning(disable:4244)
6	#endif	7	#endif
7		8
8	#include "EXTERN.h"	9	#include "EXTERN.h"
9	#include "perl.h"	10	#include "perl.h"
10	#include "XSUB.h"	11	#include "XSUB.h"
11		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
12	#include <math.h>	17	#include <math.h>
13	#include <string.h>	18	#include <string.h>
14	#include <stdio.h>	19	#include <stdio.h>
		20	#include <stdlib.h>
15		21
16	#include <SDL.h>	22	#include <SDL.h>
17	#include <SDL_endian.h>	23	#include <SDL_endian.h>
18	#include <SDL_image.h>	24	#include <SDL_image.h>
19	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
21		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
22	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
23		32
24	#include <pango/pango.h>	33	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		34
29	#ifndef _WIN32	35	#ifndef _WIN32
30	# include <sys/types.h>	36	# include <sys/types.h>
31	# include <sys/socket.h>	37	# include <sys/socket.h>
32	# include <netinet/in.h>	38	# include <netinet/in.h>
39	typedef signed char int8_t;	45	typedef signed char int8_t;
40	typedef signed short int16_t;	46	typedef signed short int16_t;
41	typedef signed int int32_t;	47	typedef signed int int32_t;
42	#endif	48	#endif
43		49
44	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45		51
46	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
47		53
48	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
50		56
51	#define MIN_FONT_HEIGHT 10	57	#define MIN_FONT_HEIGHT 10
52		58
53	#define GL_CALL(type,func,args) \	59	#if 0
54	{ \	60	# define PARACHUTE SDL_INIT_NOPARACHUTE
55	static int init_; \	61	#else
56	static type fptr_; \	62	# define PARACHUTE 0
57	\	63	#endif
58	if (!init_) \
59	{ \
60	init_ = 1; \
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62	} \
63	\
64	if (fptr_) \
65	fptr_ args; \
66	}
67		64
		65	static struct
		66	{
		67	#define GL_FUNC(ptr,name) ptr name;
		68	#include "glfunc.h"
		69	#undef GL_FUNC
		70	} gl;
		71
		72	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
		73	{
		74	if (gl.BlendFuncSeparate)
		75	gl.BlendFuncSeparate (sa, da, saa, daa);
		76	else if (gl.BlendFuncSeparateEXT)
		77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
		78	else
		79	glBlendFunc (sa, da);
		80	}
		81
		82	#include "texcache.c"
		83
		84	#include "pango-font.c"
		85	#include "pango-fontmap.c"
		86	#include "pango-render.c"
		87
68	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
70		90
71	typedef PangoFontDescription *CFClient__Font;	91	typedef PangoFontDescription *CFPlus__Font;
		92
		93	static int
		94	shape_attr_p (PangoLayoutRun *run)
		95	{
		96	GSList *attrs = run->item->analysis.extra_attrs;
		97
		98	while (attrs)
		99	{
		100	PangoAttribute *attr = attrs->data;
		101
		102	if (attr->klass->type == PANGO_ATTR_SHAPE)
		103	return 1;
		104
		105	attrs = attrs->next;
		106	}
		107
		108	return 0;
		109	}
72		110
73	typedef struct cf_layout {	111	typedef struct cf_layout {
74	PangoLayout *pl; // either derived from a cairo or ft2 context	112	PangoLayout *pl;
75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
77	int base_height;	114	int base_height;
78	CFClient__Font font;	115	CFPlus__Font font;
79	} *CFClient__Layout;	116	} *CFPlus__Layout;
80		117
81	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
82	static PangoContext ft2_context, cairo_context;	119	static PangoContext *opengl_context;
83	static PangoFontMap ft2_fontmap, cairo_fontmap;	120	static PangoFontMap *opengl_fontmap;
84		121
85	static void	122	static void
86	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
87	{	124	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
89	#ifdef _WIN32	126	#ifdef FC_HINT_STYLE
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91	#else	128	#endif
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif
94	}	130	}
95		131
96	static void	132	static void
97	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
98	{	134	{
99	/* use a random scale factor to account for unknown descenders, 0.8 works	135	/* use a random scale factor to account for unknown descenders, 0.8 works
100	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
101	*/	137	*/
102	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
106		142
107	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
108	}	144	}
109		145
110	static void	146	static void
111	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
112	{	148	{
113	pango_layout_get_pixel_size (self->pl, w, h);	149	pango_layout_get_pixel_size (self->pl, w, h);
114		150
115	if (!w) w = 1;	151	if (!w) w = 1;
116	if (!h) h = 1;	152	if (!h) h = 1;
…		…
146	int texs;	182	int texs;
147	maptex *tex;	183	maptex *tex;
148		184
149	int32_t rows;	185	int32_t rows;
150	maprow *row;	186	maprow *row;
151	} *CFClient__Map;	187	} *CFPlus__Map;
152		188
153	static char *	189	static char *
154	prepend (char *ptr, int sze, int inc)	190	prepend (char *ptr, int sze, int inc)
155	{	191	{
156	char *p;	192	char *p;
…		…
174		210
175	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	211	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
176	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	212	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
177		213
178	static maprow *	214	static maprow *
179	map_get_row (CFClient__Map self, int y)	215	map_get_row (CFPlus__Map self, int y)
180	{	216	{
181	if (0 > y)	217	if (0 > y)
182	{	218	{
183	int extend = - y + MAP_EXTEND_Y;	219	int extend = - y + MAP_EXTEND_Y;
184	Prepend (maprow, self->row, self->rows, extend);	220	Prepend (maprow, self->row, self->rows, extend);
…		…
222		258
223	return row->col + (x - row->c0);	259	return row->col + (x - row->c0);
224	}	260	}
225		261
226	static mapcell *	262	static mapcell *
227	map_get_cell (CFClient__Map self, int x, int y)	263	map_get_cell (CFPlus__Map self, int x, int y)
228	{	264	{
229	return row_get_cell (map_get_row (self, y), x);	265	return row_get_cell (map_get_row (self, y), x);
230	}	266	}
231		267
232	static void	268	static void
233	map_clear (CFClient__Map self)	269	map_clear (CFPlus__Map self)
234	{	270	{
235	int r;	271	int r;
236		272
237	for (r = 0; r < self->rows; r++)	273	for (r = 0; r < self->rows; r++)
238	Safefree (self->row[r].col);	274	Safefree (self->row[r].col);
…		…
246	self->row = 0;	282	self->row = 0;
247	self->rows = 0;	283	self->rows = 0;
248	}	284	}
249		285
250	static void	286	static void
251	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	287	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
252	{	288	{
253	int x, y;	289	int x, y;
254	maprow *row;	290	maprow *row;
255		291
256	for (y = y0; y < y0 + h; y++)	292	for (y = y0; y < y0 + h; y++)
…		…
296	ev.data2 = 0;	332	ev.data2 = 0;
297		333
298	SDL_PushEvent ((SDL_Event *)&ev);	334	SDL_PushEvent ((SDL_Event *)&ev);
299	}	335	}
300		336
		337	static unsigned int
		338	minpot (unsigned int n)
		339	{
		340	if (!n)
		341	return 0;
		342
		343	--n;
		344
		345	n \|= n >> 1;
		346	n \|= n >> 2;
		347	n \|= n >> 4;
		348	n \|= n >> 8;
		349	n \|= n >> 16;
		350
		351	return n + 1;
		352	}
		353
301	MODULE = CFClient PACKAGE = CFClient	354	MODULE = CFPlus PACKAGE = CFPlus
302		355
303	PROTOTYPES: ENABLE	356	PROTOTYPES: ENABLE
304		357
305	BOOT:	358	BOOT:
306	{	359	{
307	HV *stash = gv_stashpv ("CFClient", 1);	360	HV *stash = gv_stashpv ("CFPlus", 1);
308	static const struct {	361	static const struct {
309	const char *name;	362	const char *name;
310	IV iv;	363	IV iv;
311	} *civ, const_iv[] = {	364	} *civ, const_iv[] = {
312	# define const_iv(name) { # name, (IV)name }	365	# define const_iv(name) { # name, (IV)name }
…		…
413		466
414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	467	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	468	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416	}	469	}
417		470
		471	int
		472	in_destruct ()
		473	CODE:
		474	RETVAL = PL_main_cv == Nullcv;
		475	OUTPUT:
		476	RETVAL
		477
		478	NV floor (NV x)
		479
		480	NV ceil (NV x)
		481
418	void	482	void
419	pango_init ()	483	pango_init ()
420	CODE:	484	CODE:
421	{	485	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx
423	ft2_fontmap = pango_ft2_font_map_new ();	486	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	487	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);	488	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	}	489	}
430		490
431	int	491	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	492	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
433		493
434	void	494	void
435	SDL_Quit ()	495	SDL_Quit ()
436		496
437	void	497	void
…		…
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	504	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	505	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	506	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		507
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	508	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	509	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450		510
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	511	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	512	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	513	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	514	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455		515
456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	516	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		517	#if SDL_VERSION_ATLEAST(1,2,10)
		518	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		519	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		520	#endif
457		521
458	SDL_EnableUNICODE (1);	522	SDL_EnableUNICODE (1);
459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	523	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460		524
461	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	525	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	543	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	544	CODE:
481	RETVAL = !!SDL_SetVideoMode (	545	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	546	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	547	);
		548	if (RETVAL)
		549	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	550	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		551	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		552	# include "glfunc.h"
		553	# undef GL_FUNC
		554	}
485	OUTPUT:	555	OUTPUT:
486	RETVAL	556	RETVAL
487		557
488	void	558	void
489	SDL_GL_SwapBuffers ()	559	SDL_GL_SwapBuffers ()
…		…
542	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	612	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
543	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	613	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
544	break;	614	break;
545	}	615	}
546		616
547	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	617	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
548	}	618	}
549	}	619	}
550		620
551	int	621	int
552	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	622	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
565	CODE:	635	CODE:
566	#ifndef _WIN32	636	#ifndef _WIN32
567	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	637	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
568	#endif	638	#endif
569		639
570	char *
571	gl_vendor ()
572	CODE:
573	RETVAL = (char *)glGetString (GL_VENDOR);
574	OUTPUT:
575	RETVAL
576
577	char *
578	gl_version ()
579	CODE:
580	RETVAL = (char *)glGetString (GL_VERSION);
581	OUTPUT:
582	RETVAL
583
584	char *
585	gl_extensions ()
586	CODE:
587	RETVAL = (char *)glGetString (GL_EXTENSIONS);
588	OUTPUT:
589	RETVAL
590
591	void	640	void
592	add_font (char *file)	641	add_font (char *file)
593	CODE:	642	CODE:
594	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	643	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
595	#ifdef _WIN32
596	// cairo... sigh... requires win2000
597	AddFontResourceEx (file, FR_PRIVATE, 0);
598	#endif
599		644
600	void	645	void
601	load_image_inline (SV *image_)	646	load_image_inline (SV *image_)
602	ALIAS:	647	ALIAS:
603	load_image_file = 1	648	load_image_file = 1
…		…
645		690
646	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	691	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
647		692
648	assert (surface2->pitch == surface2->w * 4);	693	assert (surface2->pitch == surface2->w * 4);
649		694
		695	SDL_LockSurface (surface2);
650	EXTEND (SP, 5);	696	EXTEND (SP, 6);
651	PUSHs (sv_2mortal (newSViv (surface2->w)));	697	PUSHs (sv_2mortal (newSViv (surface2->w)));
652	PUSHs (sv_2mortal (newSViv (surface2->h)));	698	PUSHs (sv_2mortal (newSViv (surface2->h)));
653	SDL_LockSurface (surface2);
654	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	699	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
655	SDL_UnlockSurface (surface2);
656	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	700	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
657	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	701	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
658	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	702	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		703	SDL_UnlockSurface (surface2);
659		704
660	SDL_FreeSurface (surface);	705	SDL_FreeSurface (surface);
661	SDL_FreeSurface (surface2);	706	SDL_FreeSurface (surface2);
662	}	707	}
663		708
…		…
699	CODE:	744	CODE:
700	fprintf (stderr, "FATAL: %s\n", message);	745	fprintf (stderr, "FATAL: %s\n", message);
701	#ifdef _WIN32	746	#ifdef _WIN32
702	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	747	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
703	#endif	748	#endif
704	exit (1);	749	_exit (1);
705		750
		751	void
		752	_exit (int retval)
		753	CODE:
		754	_exit (retval);
		755
706	MODULE = CFClient PACKAGE = CFClient::Font	756	MODULE = CFPlus PACKAGE = CFPlus::Font
707		757
708	CFClient::Font	758	CFPlus::Font
709	new_from_file (SV class, char path, int id = 0)	759	new_from_file (SV class, char path, int id = 0)
710	CODE:	760	CODE:
711	{	761	{
712	int count;	762	int count;
713	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	763	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
716	}	766	}
717	OUTPUT:	767	OUTPUT:
718	RETVAL	768	RETVAL
719		769
720	void	770	void
721	DESTROY (CFClient::Font self)	771	DESTROY (CFPlus::Font self)
722	CODE:	772	CODE:
723	pango_font_description_free (self);	773	pango_font_description_free (self);
724		774
725	void	775	void
726	make_default (CFClient::Font self)	776	make_default (CFPlus::Font self)
727	CODE:	777	CODE:
728	default_font = self;	778	default_font = self;
729		779
730	MODULE = CFClient PACKAGE = CFClient::Layout	780	MODULE = CFPlus PACKAGE = CFPlus::Layout
731		781
732	CFClient::Layout	782	void
733	new (SV *class, int rgba = 0)	783	reset_glyph_cache ()
734	CODE:	784	CODE:
735	#if _WIN32	785	tc_clear ();
736	rgba = 0;//D	786
737	#endif	787	CFPlus::Layout
		788	new (SV *class)
		789	CODE:
738	New (0, RETVAL, 1, struct cf_layout);	790	New (0, RETVAL, 1, struct cf_layout);
739		791
740	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	792	RETVAL->pl = pango_layout_new (opengl_context);
741	RETVAL->rgba = rgba;
742	RETVAL->r = 1.;	793	RETVAL->r = 1.;
743	RETVAL->g = 1.;	794	RETVAL->g = 1.;
744	RETVAL->b = 1.;	795	RETVAL->b = 1.;
745	RETVAL->a = 1.;	796	RETVAL->a = 1.;
746	RETVAL->base_height = MIN_FONT_HEIGHT;	797	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
750	layout_update_font (RETVAL);	801	layout_update_font (RETVAL);
751	OUTPUT:	802	OUTPUT:
752	RETVAL	803	RETVAL
753		804
754	void	805	void
755	DESTROY (CFClient::Layout self)	806	DESTROY (CFPlus::Layout self)
756	CODE:	807	CODE:
757	g_object_unref (self->pl);	808	g_object_unref (self->pl);
758	Safefree (self);	809	Safefree (self);
759		810
760	int
761	is_rgba (CFClient::Layout self)
762	CODE:
763	RETVAL = self->rgba;
764	OUTPUT:
765	RETVAL
766
767	void	811	void
768	set_text (CFClient::Layout self, SV *text_)	812	set_text (CFPlus::Layout self, SV *text_)
769	CODE:	813	CODE:
770	{	814	{
771	STRLEN textlen;	815	STRLEN textlen;
772	char *text = SvPVutf8 (text_, textlen);	816	char *text = SvPVutf8 (text_, textlen);
773		817
774	pango_layout_set_text (self->pl, text, textlen);	818	pango_layout_set_text (self->pl, text, textlen);
775	}	819	}
776		820
777	void	821	void
778	set_markup (CFClient::Layout self, SV *text_)	822	set_markup (CFPlus::Layout self, SV *text_)
779	CODE:	823	CODE:
780	{	824	{
781	STRLEN textlen;	825	STRLEN textlen;
782	char *text = SvPVutf8 (text_, textlen);	826	char *text = SvPVutf8 (text_, textlen);
783		827
784	pango_layout_set_markup (self->pl, text, textlen);	828	pango_layout_set_markup (self->pl, text, textlen);
785	}	829	}
786		830
		831	void
		832	set_shapes (CFPlus::Layout self, ...)
		833	CODE:
		834	{
		835	PangoAttrList *attrs = 0;
		836	const char *text = pango_layout_get_text (self->pl);
		837	const char *pos = text;
		838	int arg = 4;
		839
		840	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		841	{
		842	PangoRectangle inkrect, rect;
		843	PangoAttribute *attr;
		844
		845	int x = SvIV (ST (arg - 3));
		846	int y = SvIV (ST (arg - 2));
		847	int w = SvIV (ST (arg - 1));
		848	int h = SvIV (ST (arg ));
		849
		850	inkrect.x = 0;
		851	inkrect.y = 0;
		852	inkrect.width = 0;
		853	inkrect.height = 0;
		854
		855	rect.x = x * PANGO_SCALE;
		856	rect.y = y * PANGO_SCALE;
		857	rect.width = w * PANGO_SCALE;
		858	rect.height = h * PANGO_SCALE;
		859
		860	if (!attrs)
		861	attrs = pango_layout_get_attributes (self->pl);
		862
		863	attr = pango_attr_shape_new (&inkrect, &rect);
		864	attr->start_index = pos - text;
		865	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		866	pango_attr_list_insert (attrs, attr);
		867
		868	arg += 4;
		869	pos += sizeof (OBJ_STR) - 1;
		870	}
		871
		872	if (attrs)
		873	pango_layout_set_attributes (self->pl, attrs);
		874	}
		875
		876	void
		877	get_shapes (CFPlus::Layout self)
		878	PPCODE:
		879	{
		880	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		881
		882	do
		883	{
		884	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		885
		886	if (run && shape_attr_p (run))
		887	{
		888	PangoRectangle extents;
		889	pango_layout_iter_get_run_extents (iter, 0, &extents);
		890
		891	EXTEND (SP, 2);
		892	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		893	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		894	}
		895	}
		896	while (pango_layout_iter_next_run (iter));
		897
		898	pango_layout_iter_free (iter);
		899	}
		900
		901	int
		902	has_wrapped (CFPlus::Layout self)
		903	CODE:
		904	{
		905	int lines = 1;
		906	const char *text = pango_layout_get_text (self->pl);
		907
		908	while (*text)
		909	lines += *text++ == '\n';
		910
		911	RETVAL = lines < pango_layout_get_line_count (self->pl);
		912	}
		913	OUTPUT:
		914	RETVAL
		915
787	SV *	916	SV *
788	get_text (CFClient::Layout self)	917	get_text (CFPlus::Layout self)
789	CODE:	918	CODE:
790	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	919	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
791	SvUTF8_on (RETVAL);	920	sv_utf8_decode (RETVAL);
792	OUTPUT:	921	OUTPUT:
793	RETVAL	922	RETVAL
794		923
795	void	924	void
796	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	925	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
797	CODE:	926	CODE:
798	self->r = r;	927	self->r = r;
799	self->g = g;	928	self->g = g;
800	self->b = b;	929	self->b = b;
801	self->a = a;	930	self->a = a;
802		931
803	void	932	void
804	set_font (CFClient::Layout self, CFClient::Font font = 0)	933	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
805	CODE:	934	CODE:
806	if (self->font != font)	935	if (self->font != font)
807	{	936	{
808	self->font = font;	937	self->font = font;
809	layout_update_font (self);	938	layout_update_font (self);
810	}	939	}
811		940
812	void	941	void
813	set_height (CFClient::Layout self, int base_height)	942	set_height (CFPlus::Layout self, int base_height)
814	CODE:	943	CODE:
815	if (self->base_height != base_height)	944	if (self->base_height != base_height)
816	{	945	{
817	self->base_height = base_height;	946	self->base_height = base_height;
818	layout_update_font (self);	947	layout_update_font (self);
819	}	948	}
820		949
821	void	950	void
822	set_width (CFClient::Layout self, int max_width = -1)	951	set_width (CFPlus::Layout self, int max_width = -1)
823	CODE:	952	CODE:
824	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	953	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
825		954
826	void	955	void
827	set_indent (CFClient::Layout self, int indent)	956	set_indent (CFPlus::Layout self, int indent)
828	CODE:	957	CODE:
829	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	958	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
830		959
831	void	960	void
832	set_spacing (CFClient::Layout self, int spacing)	961	set_spacing (CFPlus::Layout self, int spacing)
833	CODE:	962	CODE:
834	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	963	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
835		964
836	void	965	void
837	set_ellipsise (CFClient::Layout self, int ellipsise)	966	set_ellipsise (CFPlus::Layout self, int ellipsise)
838	CODE:	967	CODE:
839	pango_layout_set_ellipsize (self->pl,	968	pango_layout_set_ellipsize (self->pl,
840	ellipsise == 1 ? PANGO_ELLIPSIZE_START	969	ellipsise == 1 ? PANGO_ELLIPSIZE_START
841	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	970	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
842	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	971	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
843	: PANGO_ELLIPSIZE_NONE	972	: PANGO_ELLIPSIZE_NONE
844	);	973	);
845		974
846	void	975	void
847	set_single_paragraph_mode (CFClient::Layout self, int spm)	976	set_single_paragraph_mode (CFPlus::Layout self, int spm)
848	CODE:	977	CODE:
849	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	978	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
850		979
851	void	980	void
852	size (CFClient::Layout self)	981	size (CFPlus::Layout self)
853	PPCODE:	982	PPCODE:
854	{	983	{
855	int w, h;	984	int w, h;
856		985
857	layout_get_pixel_size (self, &w, &h);	986	layout_get_pixel_size (self, &w, &h);
…		…
860	PUSHs (sv_2mortal (newSViv (w)));	989	PUSHs (sv_2mortal (newSViv (w)));
861	PUSHs (sv_2mortal (newSViv (h)));	990	PUSHs (sv_2mortal (newSViv (h)));
862	}	991	}
863		992
864	int	993	int
		994	descent (CFPlus::Layout self)
		995	CODE:
		996	{
		997	PangoRectangle rect;
		998	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		999	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1000	RETVAL = PANGO_DESCENT (rect);
		1001	}
		1002	OUTPUT:
		1003	RETVAL
		1004
		1005	int
865	xy_to_index (CFClient::Layout self, int x, int y)	1006	xy_to_index (CFPlus::Layout self, int x, int y)
866	CODE:	1007	CODE:
867	{	1008	{
868	int index, trailing;	1009	int index, trailing;
869	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1010	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
870	RETVAL = index;	1011	RETVAL = index;
871	}	1012	}
872	OUTPUT:	1013	OUTPUT:
873	RETVAL	1014	RETVAL
874		1015
875	void	1016	void
876	cursor_pos (CFClient::Layout self, int index)	1017	cursor_pos (CFPlus::Layout self, int index)
877	PPCODE:	1018	PPCODE:
878	{	1019	{
879	PangoRectangle strong_pos;	1020	PangoRectangle strong_pos;
880	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1021	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
881		1022
…		…
884	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1025	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
885	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1026	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
886	}	1027	}
887		1028
888	void	1029	void
889	render (CFClient::Layout self)	1030	render (CFPlus::Layout self, float x, float y, int flags = 0)
890	PPCODE:	1031	PPCODE:
891	{	1032	pango_opengl_render_layout_subpixel (
892	SV *retval;	1033	self->pl,
893	int w, h;	1034	x * PANGO_SCALE, y * PANGO_SCALE,
		1035	self->r, self->g, self->b, self->a,
		1036	flags
		1037	);
894		1038
895	layout_get_pixel_size (self, &w, &h);	1039	MODULE = CFPlus PACKAGE = CFPlus::Texture
896		1040
897	if (self->rgba)	1041	void
		1042	pad2pot (SV data_, SV w_, SV *h_)
		1043	CODE:
		1044	{
		1045	int ow = SvIV (w_);
		1046	int oh = SvIV (h_);
		1047
		1048	if (ow && oh)
898	{	1049	{
899	cairo_surface_t *surface;	1050	int nw = minpot (ow);
900	cairo_t *cairo;	1051	int nh = minpot (oh);
901		1052
902	retval = newSV (w * h * 4);	1053	if (nw != ow \|\| nh != oh)
903	SvPOK_only (retval);
904	SvCUR_set (retval, w * h * 4);
905
906	memset (SvPVX (retval), 0, w * h * 4);
907
908	surface = cairo_image_surface_create_for_data (
909	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
910	cairo = cairo_create (surface);
911	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
912
913	pango_cairo_show_layout (cairo, self->pl);
914
915	cairo_destroy (cairo);
916	cairo_surface_destroy (surface);
917
918	// what a mess, and its premultiplied, too :(
919	{	1054	{
920	uint32_t p = (uint32_t )SvPVX (retval);	1055	if (SvOK (data_))
921	uint32_t e = p + w h;
922
923	while (p < e)
924	{	1056	{
925	uint32_t rgba = *p;	1057	STRLEN datalen;
926	rgba = (rgba >> 24) \| (rgba << 8);	1058	char *data = SvPVbyte (data_, datalen);
927	#if 0	1059	int bpp = datalen / (ow * oh);
928	#ifdef _WIN32	1060	SV result_ = sv_2mortal (newSV (nw nh * bpp));
929	{//D
930	uint8_t r = rgba >> 24;
931	uint8_t g = rgba >> 16;
932	uint8_t b = rgba >> 8;
933	uint8_t a = rgba >> 0;
934		1061
935	rgba = (rgba & 0xffffff00) \| a;	1062	SvPOK_only (result_);
		1063	SvCUR_set (result_, nw * nh * bpp);
		1064
		1065	memset (SvPVX (result_), 0, nw * nh * bpp);
		1066	while (oh--)
		1067	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1068
		1069	sv_setsv (data_, result_);
936	}	1070	}
937	#endif	1071
938	#endif	1072	sv_setiv (w_, nw);
939	rgba = SDL_SwapBE32 (rgba);	1073	sv_setiv (h_, nh);
940	*p++ = rgba;
941	}	1074	}
942	}
943
944	EXTEND (SP, 5);
945	PUSHs (sv_2mortal (newSViv (w)));
946	PUSHs (sv_2mortal (newSViv (h)));
947	PUSHs (sv_2mortal (retval));
948	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
949	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
950	}	1075	}
951	else
952	{
953	FT_Bitmap bitmap;
954
955	retval = newSV (w * h);
956	SvPOK_only (retval);
957	SvCUR_set (retval, w * h);
958
959	bitmap.rows = h;
960	bitmap.width = w;
961	bitmap.pitch = w;
962	bitmap.buffer = (unsigned char*)SvPVX (retval);
963	bitmap.num_grays = 256;
964	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
965
966	memset (bitmap.buffer, 0, w * h);
967
968	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
969
970	EXTEND (SP, 5);
971	PUSHs (sv_2mortal (newSViv (w)));
972	PUSHs (sv_2mortal (newSViv (h)));
973	PUSHs (sv_2mortal (retval));
974	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
975	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
976	}
977	}	1076	}
978		1077
979	MODULE = CFClient PACKAGE = CFClient::Texture
980
981	void	1078	void
982	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1079	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
983	PROTOTYPE: $$$;$$	1080	PROTOTYPE: $$$;$$
984	ALIAS:	1081	ALIAS:
985	draw_quad_alpha = 1	1082	draw_quad_alpha = 1
986	draw_quad_alpha_premultiplied = 2	1083	draw_quad_alpha_premultiplied = 2
987	CODE:	1084	CODE:
988	{	1085	{
989	HV hv = (HV )SvRV (self);	1086	HV hv = (HV )SvRV (self);
990	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1087	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
991	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1088	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
992	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1089	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
993	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
994		1090
995	if (items < 5)	1091	if (items < 5)
996	{	1092	{
997	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1093	w = SvNV (*hv_fetch (hv, "w", 1, 1));
998	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1094	h = SvNV (*hv_fetch (hv, "h", 1, 1));
999	}	1095	}
1000		1096
1001	if (ix)	1097	if (ix)
1002	{	1098	{
1003	glEnable (GL_BLEND);	1099	glEnable (GL_BLEND);
		1100
		1101	if (ix == 2)
1004	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1102	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1103	else
		1104	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1105	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1106
1005	glEnable (GL_ALPHA_TEST);	1107	glEnable (GL_ALPHA_TEST);
1006	glAlphaFunc (GL_GREATER, 0.01f);	1108	glAlphaFunc (GL_GREATER, 0.01f);
1007	}	1109	}
1008		1110
1009	glBindTexture (GL_TEXTURE_2D, name);	1111	glBindTexture (GL_TEXTURE_2D, name);
1010
1011	if (wrap_mode)
1012	{
1013	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1014	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1015	}
1016		1112
1017	glBegin (GL_QUADS);	1113	glBegin (GL_QUADS);
1018	glTexCoord2f (0, 0); glVertex2f (x , y );	1114	glTexCoord2f (0, 0); glVertex2f (x , y );
1019	glTexCoord2f (0, t); glVertex2f (x , y + h);	1115	glTexCoord2f (0, t); glVertex2f (x , y + h);
1020	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1116	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1026	glDisable (GL_ALPHA_TEST);	1122	glDisable (GL_ALPHA_TEST);
1027	glDisable (GL_BLEND);	1123	glDisable (GL_BLEND);
1028	}	1124	}
1029	}	1125	}
1030		1126
1031	MODULE = CFClient PACKAGE = CFClient::Map	1127	MODULE = CFPlus PACKAGE = CFPlus::Map
1032		1128
1033	CFClient::Map	1129	CFPlus::Map
1034	new (SV *class, int map_width, int map_height)	1130	new (SV *class, int map_width, int map_height)
1035	CODE:	1131	CODE:
1036	New (0, RETVAL, 1, struct map);	1132	New (0, RETVAL, 1, struct map);
1037	RETVAL->x = 0;	1133	RETVAL->x = 0;
1038	RETVAL->y = 0;	1134	RETVAL->y = 0;
…		…
1048	RETVAL->row = 0;	1144	RETVAL->row = 0;
1049	OUTPUT:	1145	OUTPUT:
1050	RETVAL	1146	RETVAL
1051		1147
1052	void	1148	void
1053	DESTROY (CFClient::Map self)	1149	DESTROY (CFPlus::Map self)
1054	CODE:	1150	CODE:
1055	{	1151	{
1056	map_clear (self);	1152	map_clear (self);
1057	Safefree (self->face);	1153	Safefree (self->face);
		1154	Safefree (self->tex);
1058	Safefree (self);	1155	Safefree (self);
1059	}	1156	}
1060		1157
1061	void	1158	void
1062	clear (CFClient::Map self)	1159	clear (CFPlus::Map self)
1063	CODE:	1160	CODE:
1064	map_clear (self);	1161	map_clear (self);
1065		1162
1066	void	1163	void
1067	set_face (CFClient::Map self, int face, int texid)	1164	set_face (CFPlus::Map self, int face, int texid)
1068	CODE:	1165	CODE:
1069	{	1166	{
1070	while (self->faces <= face)	1167	while (self->faces <= face)
1071	{	1168	{
1072	Append (mapface, self->face, self->faces, self->faces);	1169	Append (mapface, self->face, self->faces, self->faces);
…		…
1075		1172
1076	self->face [face] = texid;	1173	self->face [face] = texid;
1077	}	1174	}
1078		1175
1079	void	1176	void
1080	set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1177	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1081	CODE:	1178	CODE:
1082	{	1179	{
1083	while (self->texs <= texid)	1180	while (self->texs <= texid)
1084	{	1181	{
1085	Append (maptex, self->tex, self->texs, self->texs);	1182	Append (maptex, self->tex, self->texs, self->texs);
…		…
1097	tex->r = r;	1194	tex->r = r;
1098	tex->g = g;	1195	tex->g = g;
1099	tex->b = b;	1196	tex->b = b;
1100	tex->a = a;	1197	tex->a = a;
1101	}	1198	}
		1199
		1200	// somewhat hackish, but for textures that require it, it really
		1201	// improves the look, and most others don't suffer.
		1202	glBindTexture (GL_TEXTURE_2D, name);
		1203	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1204	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1205	// use uglier nearest interpolation because linear suffers
		1206	// from transparent color bleeding and ugly wrapping effects.
		1207	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1102	}	1208	}
1103		1209
1104	int	1210	int
1105	ox (CFClient::Map self)	1211	ox (CFPlus::Map self)
1106	ALIAS:	1212	ALIAS:
1107	oy = 1	1213	oy = 1
		1214	x = 2
		1215	y = 3
		1216	w = 4
		1217	h = 5
1108	CODE:	1218	CODE:
1109	switch (ix)	1219	switch (ix)
1110	{	1220	{
1111	case 0: RETVAL = self->ox; break;	1221	case 0: RETVAL = self->ox; break;
1112	case 1: RETVAL = self->oy; break;	1222	case 1: RETVAL = self->oy; break;
		1223	case 2: RETVAL = self->x; break;
		1224	case 3: RETVAL = self->y; break;
		1225	case 4: RETVAL = self->w; break;
		1226	case 5: RETVAL = self->h; break;
1113	}	1227	}
1114	OUTPUT:	1228	OUTPUT:
1115	RETVAL	1229	RETVAL
1116		1230
1117	void	1231	void
1118	scroll (CFClient::Map self, int dx, int dy)	1232	scroll (CFPlus::Map self, int dx, int dy)
1119	CODE:	1233	CODE:
1120	{	1234	{
1121	if (dx > 0)	1235	if (dx > 0)
1122	map_blank (self, self->x, self->y, dx - 1, self->h);	1236	map_blank (self, self->x, self->y, dx - 1, self->h);
1123	else if (dx < 0)	1237	else if (dx < 0)
…		…
1139	self->y += MAP_EXTEND_Y;	1253	self->y += MAP_EXTEND_Y;
1140	}	1254	}
1141	}	1255	}
1142		1256
1143	void	1257	void
1144	map1a_update (CFClient::Map self, SV *data_)	1258	map1a_update (CFPlus::Map self, SV *data_)
1145	CODE:	1259	CODE:
1146	{	1260	{
1147	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1261	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1148	uint8_t data_end = (uint8_t )SvEND (data_);	1262	uint8_t data_end = (uint8_t )SvEND (data_);
1149	mapcell *cell;	1263	mapcell *cell;
…		…
1151		1265
1152	while (data < data_end)	1266	while (data < data_end)
1153	{	1267	{
1154	flags = (data [0] << 8) + data [1]; data += 2;	1268	flags = (data [0] << 8) + data [1]; data += 2;
1155		1269
1156	x = ((flags >> 10) & 63) + self->x;	1270	x = self->x + ((flags >> 10) & 63);
1157	y = ((flags >> 4) & 63) + self->y;	1271	y = self->y + ((flags >> 4) & 63);
1158		1272
1159	cell = map_get_cell (self, x, y);	1273	cell = map_get_cell (self, x, y);
1160		1274
1161	if (flags & 15)	1275	if (flags & 15)
1162	{	1276	{
…		…
1191	cell->darkness = -1;	1305	cell->darkness = -1;
1192	}	1306	}
1193	}	1307	}
1194		1308
1195	SV *	1309	SV *
1196	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1310	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1197	CODE:	1311	CODE:
1198	{	1312	{
1199	int x1, x;	1313	int x1, x;
1200	int y1, y;	1314	int y1, y;
1201	int z;	1315	int z;
…		…
1251	}	1365	}
1252	OUTPUT:	1366	OUTPUT:
1253	RETVAL	1367	RETVAL
1254		1368
1255	void	1369	void
1256	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1370	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1257	PPCODE:	1371	CODE:
1258	{	1372	{
1259	int vx, vy;	1373	int vx, vy;
1260	int x, y, z;	1374	int x, y, z;
1261	int last_name;	1375	int last_name;
1262	mapface face;	1376	mapface face;
1263	int sw4 = (sw + 3) & ~3;
1264	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1265	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1266		1377
1267	memset (darkness, 255, sw4 * sh);
1268	SvPOK_only (darkness_sv);
1269	SvCUR_set (darkness_sv, sw4 * sh);
1270
1271	vx = self->x + (self->w - sw) / 2 - shift_x;	1378	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1272	vy = self->y + (self->h - sh) / 2 - shift_y;	1379	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1273		1380
1274	/*	1381	/*
1275	int vx = self->vx = self->w >= sw	1382	int vx = self->vx = self->w >= sw
1276	? self->x + (self->w - sw) / 2	1383	? self->x + (self->w - sw) / 2
1277	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1384	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1281	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1388	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1282	*/	1389	*/
1283		1390
1284	glColor4ub (255, 255, 255, 255);	1391	glColor4ub (255, 255, 255, 255);
1285		1392
		1393	glEnable (GL_BLEND);
1286	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1394	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1287	glEnable (GL_BLEND);
1288	glEnable (GL_TEXTURE_2D);	1395	glEnable (GL_TEXTURE_2D);
1289	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1396	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1290		1397
1291	glBegin (GL_QUADS);	1398	glBegin (GL_QUADS);
1292		1399
…		…
1300		1407
1301	for (x = 0; x < sw; x++)	1408	for (x = 0; x < sw; x++)
1302	if (row->c0 <= x + vx && x + vx < row->c1)	1409	if (row->c0 <= x + vx && x + vx < row->c1)
1303	{	1410	{
1304	mapcell *cell = row->col + (x + vx - row->c0);	1411	mapcell *cell = row->col + (x + vx - row->c0);
1305
1306	darkness[y * sw4 + x] = cell->darkness < 0
1307	? 255 - FOW_DARKNESS
1308	: 255 - cell->darkness;
1309		1412
1310	face = cell->face [z];	1413	face = cell->face [z];
1311		1414
1312	if (face)	1415	if (face)
1313	{	1416	{
…		…
1334		1437
1335	glEnd ();	1438	glEnd ();
1336		1439
1337	glDisable (GL_TEXTURE_2D);	1440	glDisable (GL_TEXTURE_2D);
1338	glDisable (GL_BLEND);	1441	glDisable (GL_BLEND);
		1442	}
		1443
		1444	void
		1445	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1446	CODE:
		1447	{
		1448	static float color[16][3] = {
		1449	{ 0.00F, 0.00F, 0.00F },
		1450	{ 1.00F, 1.00F, 1.00F },
		1451	{ 0.00F, 0.00F, 0.55F },
		1452	{ 1.00F, 0.00F, 0.00F },
		1453
		1454	{ 1.00F, 0.54F, 0.00F },
		1455	{ 0.11F, 0.56F, 1.00F },
		1456	{ 0.93F, 0.46F, 0.00F },
		1457	{ 0.18F, 0.54F, 0.34F },
		1458
		1459	{ 0.56F, 0.73F, 0.56F },
		1460	{ 0.80F, 0.80F, 0.80F },
		1461	{ 0.55F, 0.41F, 0.13F },
		1462	{ 0.99F, 0.77F, 0.26F },
		1463
		1464	{ 0.74F, 0.65F, 0.41F },
		1465
		1466	{ 0.00F, 1.00F, 1.00F },
		1467	{ 1.00F, 0.00F, 1.00F },
		1468	{ 1.00F, 1.00F, 0.00F },
		1469	};
		1470
		1471	int x, y;
		1472
		1473	glEnable (GL_TEXTURE_2D);
		1474	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1475	glEnable (GL_BLEND);
		1476	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1477	glBegin (GL_QUADS);
		1478
		1479	for (y = 0; y < h; y++)
		1480	for (x = 0; x < w; x++)
		1481	{
		1482	unsigned char m = data [x + y * w];
		1483
		1484	if (m)
		1485	{
		1486	float *c = color [m & 15];
		1487
		1488	float tx1 = m & 0x40 ? 0.5 : 0.;
		1489	float tx2 = tx1 + 0.5;
		1490
		1491	glColor4f (c[0], c[1], c[2], 0.75);
		1492	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1493	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1494	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1495	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1496	}
		1497	}
		1498
		1499	glEnd ();
		1500	glDisable (GL_BLEND);
		1501	glDisable (GL_TEXTURE_2D);
		1502	}
		1503
		1504	void
		1505	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1506	PPCODE:
		1507	{
		1508	int vx, vy;
		1509	int x, y;
		1510	int sw4 = (sw + 3) & ~3;
		1511	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1512	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1513
		1514	memset (darkness, 255, sw4 * sh);
		1515	SvPOK_only (darkness_sv);
		1516	SvCUR_set (darkness_sv, sw4 * sh);
		1517
		1518	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1519	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1520
		1521	for (y = 0; y < sh; y++)
		1522	if (0 <= y + vy && y + vy < self->rows)
		1523	{
		1524	maprow *row = self->row + (y + vy);
		1525
		1526	for (x = 0; x < sw; x++)
		1527	if (row->c0 <= x + vx && x + vx < row->c1)
		1528	{
		1529	mapcell *cell = row->col + (x + vx - row->c0);
		1530
		1531	darkness[y * sw4 + x] = cell->darkness < 0
		1532	? 255 - FOW_DARKNESS
		1533	: 255 - cell->darkness;
		1534	}
		1535	}
1339		1536
1340	EXTEND (SP, 3);	1537	EXTEND (SP, 3);
1341	PUSHs (sv_2mortal (newSViv (sw4)));	1538	PUSHs (sv_2mortal (newSViv (sw4)));
1342	PUSHs (sv_2mortal (newSViv (sh)));	1539	PUSHs (sv_2mortal (newSViv (sh)));
1343	PUSHs (darkness_sv);	1540	PUSHs (darkness_sv);
1344	}	1541	}
1345		1542
1346	SV *	1543	SV *
1347	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1544	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1348	CODE:	1545	CODE:
1349	{	1546	{
1350	int x, y, x1, y1;	1547	int x, y, x1, y1;
1351	SV data_sv = newSV (w h * 7 + 5);	1548	SV data_sv = newSV (w h * 7 + 5);
1352	uint8_t data = (uint8_t )SvPVX (data_sv);	1549	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1414	}	1611	}
1415	OUTPUT:	1612	OUTPUT:
1416	RETVAL	1613	RETVAL
1417		1614
1418	void	1615	void
1419	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1616	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1420	PPCODE:	1617	PPCODE:
1421	{	1618	{
1422	int x, y, z;	1619	int x, y, z;
1423	int w, h;	1620	int w, h;
1424	int x1, y1;	1621	int x1, y1;
…		…
1473	}	1670	}
1474	}	1671	}
1475	}	1672	}
1476	}	1673	}
1477		1674
1478	MODULE = CFClient PACKAGE = CFClient::MixChunk	1675	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1479		1676
1480	CFClient::MixChunk	1677	CFPlus::MixChunk
1481	new_from_file (SV class, char path)	1678	new_from_file (SV class, char path)
1482	CODE:	1679	CODE:
1483	RETVAL = Mix_LoadWAV (path);	1680	RETVAL = Mix_LoadWAV (path);
1484	OUTPUT:	1681	OUTPUT:
1485	RETVAL	1682	RETVAL
1486		1683
1487	void	1684	void
1488	DESTROY (CFClient::MixChunk self)	1685	DESTROY (CFPlus::MixChunk self)
1489	CODE:	1686	CODE:
1490	Mix_FreeChunk (self);	1687	Mix_FreeChunk (self);
1491		1688
1492	int	1689	int
1493	volume (CFClient::MixChunk self, int volume = -1)	1690	volume (CFPlus::MixChunk self, int volume = -1)
1494	CODE:	1691	CODE:
1495	RETVAL = Mix_VolumeChunk (self, volume);	1692	RETVAL = Mix_VolumeChunk (self, volume);
1496	OUTPUT:	1693	OUTPUT:
1497	RETVAL	1694	RETVAL
1498		1695
1499	int	1696	int
1500	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1697	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1501	CODE:	1698	CODE:
1502	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1699	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1503	OUTPUT:	1700	OUTPUT:
1504	RETVAL	1701	RETVAL
1505		1702
1506	MODULE = CFClient PACKAGE = CFClient::MixMusic	1703	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1507		1704
1508	int	1705	int
1509	volume (int volume = -1)	1706	volume (int volume = -1)
1510	CODE:	1707	CODE:
1511	RETVAL = Mix_VolumeMusic (volume);	1708	RETVAL = Mix_VolumeMusic (volume);
1512	OUTPUT:	1709	OUTPUT:
1513	RETVAL	1710	RETVAL
1514		1711
1515	CFClient::MixMusic	1712	CFPlus::MixMusic
1516	new_from_file (SV class, char path)	1713	new_from_file (SV class, char path)
1517	CODE:	1714	CODE:
1518	RETVAL = Mix_LoadMUS (path);	1715	RETVAL = Mix_LoadMUS (path);
1519	OUTPUT:	1716	OUTPUT:
1520	RETVAL	1717	RETVAL
1521		1718
1522	void	1719	void
1523	DESTROY (CFClient::MixMusic self)	1720	DESTROY (CFPlus::MixMusic self)
1524	CODE:	1721	CODE:
1525	Mix_FreeMusic (self);	1722	Mix_FreeMusic (self);
1526		1723
1527	int	1724	int
1528	play (CFClient::MixMusic self, int loops = -1)	1725	play (CFPlus::MixMusic self, int loops = -1)
1529	CODE:	1726	CODE:
1530	RETVAL = Mix_PlayMusic (self, loops);	1727	RETVAL = Mix_PlayMusic (self, loops);
1531	OUTPUT:	1728	OUTPUT:
1532	RETVAL	1729	RETVAL
1533		1730
1534	MODULE = CFClient PACKAGE = CFClient::OpenGL	1731	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1535		1732
1536	BOOT:	1733	BOOT:
1537	{	1734	{
1538	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1735	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1539	static const struct {	1736	static const struct {
1540	const char *name;	1737	const char *name;
1541	IV iv;	1738	IV iv;
1542	} *civ, const_iv[] = {	1739	} *civ, const_iv[] = {
1543	# define const_iv(name) { # name, (IV)name }	1740	# define const_iv(name) { # name, (IV)name }
…		…
1550	const_iv (GL_SCISSOR_TEST),	1747	const_iv (GL_SCISSOR_TEST),
1551	const_iv (GL_DEPTH_TEST),	1748	const_iv (GL_DEPTH_TEST),
1552	const_iv (GL_ALPHA_TEST),	1749	const_iv (GL_ALPHA_TEST),
1553	const_iv (GL_NORMALIZE),	1750	const_iv (GL_NORMALIZE),
1554	const_iv (GL_RESCALE_NORMAL),	1751	const_iv (GL_RESCALE_NORMAL),
		1752	const_iv (GL_FRONT),
		1753	const_iv (GL_BACK),
1555	const_iv (GL_AND),	1754	const_iv (GL_AND),
1556	const_iv (GL_ONE),	1755	const_iv (GL_ONE),
1557	const_iv (GL_ZERO),	1756	const_iv (GL_ZERO),
1558	const_iv (GL_SRC_ALPHA),	1757	const_iv (GL_SRC_ALPHA),
1559	const_iv (GL_SRC_ALPHA_SATURATE),	1758	const_iv (GL_DST_ALPHA),
1560	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1759	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1561	const_iv (GL_ONE_MINUS_DST_ALPHA),	1760	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1761	const_iv (GL_SRC_ALPHA_SATURATE),
1562	const_iv (GL_RGB),	1762	const_iv (GL_RGB),
1563	const_iv (GL_RGBA),	1763	const_iv (GL_RGBA),
		1764	const_iv (GL_RGBA4),
		1765	const_iv (GL_RGBA8),
		1766	const_iv (GL_RGB5_A1),
1564	const_iv (GL_UNSIGNED_BYTE),	1767	const_iv (GL_UNSIGNED_BYTE),
1565	const_iv (GL_UNSIGNED_SHORT),	1768	const_iv (GL_UNSIGNED_SHORT),
1566	const_iv (GL_UNSIGNED_INT),	1769	const_iv (GL_UNSIGNED_INT),
1567	const_iv (GL_ALPHA),	1770	const_iv (GL_ALPHA),
1568	const_iv (GL_INTENSITY),	1771	const_iv (GL_INTENSITY),
…		…
1577	const_iv (GL_TEXTURE_MAG_FILTER),	1780	const_iv (GL_TEXTURE_MAG_FILTER),
1578	const_iv (GL_TEXTURE_MIN_FILTER),	1781	const_iv (GL_TEXTURE_MIN_FILTER),
1579	const_iv (GL_TEXTURE_ENV_MODE),	1782	const_iv (GL_TEXTURE_ENV_MODE),
1580	const_iv (GL_TEXTURE_WRAP_S),	1783	const_iv (GL_TEXTURE_WRAP_S),
1581	const_iv (GL_TEXTURE_WRAP_T),	1784	const_iv (GL_TEXTURE_WRAP_T),
		1785	const_iv (GL_REPEAT),
1582	const_iv (GL_CLAMP),	1786	const_iv (GL_CLAMP),
1583	const_iv (GL_REPEAT),	1787	const_iv (GL_CLAMP_TO_EDGE),
1584	const_iv (GL_NEAREST),	1788	const_iv (GL_NEAREST),
1585	const_iv (GL_LINEAR),	1789	const_iv (GL_LINEAR),
1586	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1790	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1587	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1791	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1588	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1792	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1618		1822
1619	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1823	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1620	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1824	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1621	}	1825	}
1622		1826
		1827	char *
		1828	gl_vendor ()
		1829	CODE:
		1830	RETVAL = (char *)glGetString (GL_VENDOR);
		1831	OUTPUT:
		1832	RETVAL
		1833
		1834	char *
		1835	gl_version ()
		1836	CODE:
		1837	RETVAL = (char *)glGetString (GL_VERSION);
		1838	OUTPUT:
		1839	RETVAL
		1840
		1841	char *
		1842	gl_extensions ()
		1843	CODE:
		1844	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1845	OUTPUT:
		1846	RETVAL
		1847
1623	int glGetError ()	1848	int glGetError ()
		1849
		1850	void glFinish ()
1624		1851
1625	void glClear (int mask)	1852	void glClear (int mask)
1626		1853
1627	void glClearColor (float r, float g, float b, float a = 1.0)	1854	void glClearColor (float r, float g, float b, float a = 1.0)
1628	PROTOTYPE: @	1855	PROTOTYPE: @
…		…
1635		1862
1636	void glHint (int target, int mode)	1863	void glHint (int target, int mode)
1637		1864
1638	void glBlendFunc (int sfactor, int dfactor)	1865	void glBlendFunc (int sfactor, int dfactor)
1639		1866
		1867	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1868	CODE:
		1869	gl_BlendFuncSeparate (sa, da, saa, daa);
		1870
1640	void glDepthMask (int flag)	1871	void glDepthMask (int flag)
1641		1872
1642	void glLogicOp (int opcode)	1873	void glLogicOp (int opcode)
1643		1874
1644	void glColorMask (int red, int green, int blue, int alpha)	1875	void glColorMask (int red, int green, int blue, int alpha)
…		…
1648	void glPushMatrix ()	1879	void glPushMatrix ()
1649		1880
1650	void glPopMatrix ()	1881	void glPopMatrix ()
1651		1882
1652	void glLoadIdentity ()	1883	void glLoadIdentity ()
		1884
		1885	void glDrawBuffer (int buffer)
		1886
		1887	void glReadBuffer (int buffer)
1653		1888
1654	# near_ and far_ are due to microsofts buggy "c" compiler	1889	# near_ and far_ are due to microsofts buggy "c" compiler
1655	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1890	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1656		1891
1657	# near_ and far_ are due to microsofts buggy "c" compiler	1892	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1677		1912
1678	void glEnd ()	1913	void glEnd ()
1679		1914
1680	void glColor (float r, float g, float b, float a = 1.0)	1915	void glColor (float r, float g, float b, float a = 1.0)
1681	PROTOTYPE: @	1916	PROTOTYPE: @
		1917	ALIAS:
		1918	glColor_premultiply = 1
1682	CODE:	1919	CODE:
		1920	if (ix)
		1921	{
		1922	r *= a;
		1923	g *= a;
		1924	b *= a;
		1925	}
1683	// microsoft visual "c" rounds instead of truncating...	1926	// microsoft visual "c" rounds instead of truncating...
1684	glColor4ub (MIN ((int)(r * 255.f), 255),	1927	glColor4f (r, g, b, a);
1685	MIN ((int)(g * 255.f), 255),
1686	MIN ((int)(b * 255.f), 255),
1687	MIN ((int)(a * 255.f), 255));
1688		1928
1689	void glInterleavedArrays (int format, int stride, char *data)	1929	void glInterleavedArrays (int format, int stride, char *data)
1690		1930
1691	void glDrawElements (int mode, int count, int type, char *indices)	1931	void glDrawElements (int mode, int count, int type, char *indices)
1692		1932
…		…
1715		1955
1716	void glBindTexture (int target, int name)	1956	void glBindTexture (int target, int name)
1717		1957
1718	void glConvolutionParameter (int target, int pname, float params)	1958	void glConvolutionParameter (int target, int pname, float params)
1719	CODE:	1959	CODE:
1720	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1960	if (gl.ConvolutionParameterf)
		1961	gl.ConvolutionParameterf (target, pname, params);
1721		1962
1722	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1963	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1723	CODE:	1964	CODE:
1724	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1965	if (gl.ConvolutionFilter2D)
1725	(target, internalformat, width, height, format, type, data));	1966	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1726		1967
1727	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1968	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1728	CODE:	1969	CODE:
1729	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1970	if (gl.SeparableFilter2D)
1730	(target, internalformat, width, height, format, type, row, column));	1971	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1731		1972
1732	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1973	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1733		1974
1734	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1975	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1735		1976

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.94 by root, Tue May 23 18:57:35 2006 UTC vs. Revision 1.135 by root, Sun Aug 13 15:14:17 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.94 by root, Tue May 23 18:57:35 2006 UTC vs.
Revision 1.135 by root, Sun Aug 13 15:14:17 2006 UTC