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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.70 by root, Sun Apr 30 09:21:47 2006 UTC vs.
Revision 1.130 by root, Wed Jul 12 17:21:01 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2	# include <malloc.h>	3	# include <malloc.h>
		4	# include <windows.h>
		5	# pragma warning(disable:4244)
3	#endif	6	#endif
4		7
5	#include "EXTERN.h"	8	#include "EXTERN.h"
6	#include "perl.h"	9	#include "perl.h"
7	#include "XSUB.h"	10	#include "XSUB.h"
8		11
		12	#include <math.h>
9	#include <string.h>	13	#include <string.h>
10	#include <stdio.h>	14	#include <stdio.h>
		15	#include <stdlib.h>
11		16
12	#include <SDL.h>	17	#include <SDL.h>
		18	#include <SDL_endian.h>
13	#include <SDL_image.h>	19	#include <SDL_image.h>
14	#include <SDL_mixer.h>	20	#include <SDL_mixer.h>
15	#include <SDL_opengl.h>	21	#include <SDL_opengl.h>
16		22
		23	#define PANGO_ENABLE_BACKEND
		24	#define G_DISABLE_CAST_CHECKS
		25
17	#include <glib/gmacros.h>	26	#include <glib/gmacros.h>
18		27
19	#include <pango/pango.h>	28	#include <pango/pango.h>
20	#include <pango/pangofc-fontmap.h>
21	#include <pango/pangoft2.h>
22		29
23	#ifndef _WIN32	30	#ifndef _WIN32
24	# include <sys/types.h>	31	# include <sys/types.h>
25	# include <sys/socket.h>	32	# include <sys/socket.h>
26	# include <netinet/in.h>	33	# include <netinet/in.h>
35	typedef signed int int32_t;	42	typedef signed int int32_t;
36	#endif	43	#endif
37		44
38	#include "glext.h"	45	#include "glext.h"
39		46
		47	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
		48
40	#define FOW_DARKNESS 32	49	#define FOW_DARKNESS 32
41		50
42	#define MAP_EXTEND_X 32	51	#define MAP_EXTEND_X 32
43	#define MAP_EXTEND_Y 512	52	#define MAP_EXTEND_Y 512
44		53
45	#define MIN_FONT_HEIGHT 10	54	#define MIN_FONT_HEIGHT 10
46		55
47	#define GL_CALL(type,func,args) \	56	#if 0
48	{ \	57	# define PARACHUTE SDL_INIT_NOPARACHUTE
49	static int init_; \	58	#else
50	static type fptr_; \	59	# define PARACHUTE 0
51	\	60	#endif
52	if (!init_) \	61
53	{ \	62	static struct
54	init_ = 1; \	63	{
55	fptr_ = (type)SDL_GL_GetProcAddress (# func); \	64	#define GL_FUNC(ptr,name) ptr name;
56	} \	65	#include "glfunc.h"
57	\	66	#undef GL_FUNC
58	if (fptr_) \	67	} gl;
59	fptr_ args; \	68
60	}	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"
61		84
62	typedef Mix_Chunk *CFClient__MixChunk;	85	typedef Mix_Chunk *CFClient__MixChunk;
63	typedef Mix_Music *CFClient__MixMusic;	86	typedef Mix_Music *CFClient__MixMusic;
64		87
65	typedef PangoFontDescription *CFClient__Font;	88	typedef PangoFontDescription *CFClient__Font;
66		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
67	typedef struct cf_layout {	108	typedef struct cf_layout {
68	PangoLayout *pl;	109	PangoLayout *pl;
		110	float r, g, b, a; // default color for rgba mode
69	int base_height;	111	int base_height;
70	CFClient__Font font;	112	CFClient__Font font;
71	} *CFClient__Layout;	113	} *CFClient__Layout;
72		114
73	static CFClient__Font default_font;	115	static CFClient__Font default_font;
74	static PangoContext *context;	116	static PangoContext *opengl_context;
75	static PangoFontMap *fontmap;	117	static PangoFontMap *opengl_fontmap;
76		118
77	static void	119	static void
78	substitute_func (FcPattern *pattern, gpointer data)	120	substitute_func (FcPattern *pattern, gpointer data)
79	{	121	{
80	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
81	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	126	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
82	}	127	}
83		128
84	static void	129	static void
85	layout_update_font (CFClient__Layout self)	130	layout_update_font (CFClient__Layout self)
…		…
98	static void	143	static void
99	layout_get_pixel_size (CFClient__Layout self, int w, int h)	144	layout_get_pixel_size (CFClient__Layout self, int w, int h)
100	{	145	{
101	pango_layout_get_pixel_size (self->pl, w, h);	146	pango_layout_get_pixel_size (self->pl, w, h);
102		147
103	w = (w + 3) & ~3;
104	if (!w) w = 1;	148	if (!w) w = 1;
105	if (!h) h = 1;	149	if (!h) h = 1;
		150
		151	w = (w + 3) & ~3;
106	}	152	}
107		153
108	typedef uint16_t mapface;	154	typedef uint16_t mapface;
109		155
110	typedef struct {	156	typedef struct {
…		…
258	}	304	}
259	}	305	}
260	}	306	}
261		307
262	static void	308	static void
263	music_finished ()	309	music_finished (void)
264	{	310	{
265	SDL_UserEvent ev;	311	SDL_UserEvent ev;
266		312
267	ev.type = SDL_USEREVENT;	313	ev.type = SDL_USEREVENT;
268	ev.code = 0;	314	ev.code = 0;
269	ev.data1 = 0;	315	ev.data1 = 0;
270	ev.data2 = 0;	316	ev.data2 = 0;
271		317
272	SDL_PushEvent ((SDL_Event *)&ev);	318	SDL_PushEvent ((SDL_Event *)&ev);
		319	}
		320
		321	static void
		322	channel_finished (int channel)
		323	{
		324	SDL_UserEvent ev;
		325
		326	ev.type = SDL_USEREVENT;
		327	ev.code = 1;
		328	ev.data1 = (void *)(long)channel;
		329	ev.data2 = 0;
		330
		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;
273	}	349	}
274		350
275	MODULE = CFClient PACKAGE = CFClient	351	MODULE = CFClient PACKAGE = CFClient
276		352
277	PROTOTYPES: ENABLE	353	PROTOTYPES: ENABLE
…		…
385	# undef const_iv	461	# undef const_iv
386	};	462	};
387		463
388	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; )
389	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	465	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
390
391	fontmap = pango_ft2_font_map_new ();
392	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
393	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
394	}	466	}
395		467
396	int	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
		479	void
		480	pango_init ()
		481	CODE:
		482	{
		483	opengl_fontmap = pango_opengl_font_map_new ();
		484	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
		485	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		486	}
		487
		488	int
397	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	489	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
398		490
399	void	491	void
400	SDL_Quit ()	492	SDL_Quit ()
401		493
402	void	494	void
…		…
408	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	500	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
409	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	501	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
410	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	502	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
411	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	503	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
412		504
		505	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		506	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		507
413	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	508	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
414	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	509	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
415	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	510	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
416	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	511	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
417		512
418	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	513	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
419	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
420	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
421		514
422	SDL_EnableUNICODE (1);	515	SDL_EnableUNICODE (1);
423	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	516	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
424		517
425	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	518	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
434		527
435	++m;	528	++m;
436	}	529	}
437	}	530	}
438		531
		532	char *
		533	SDL_GetError ()
		534
439	int	535	int
440	SDL_SetVideoMode (int w, int h, int fullscreen)	536	SDL_SetVideoMode (int w, int h, int fullscreen)
441	CODE:	537	CODE:
442	RETVAL = !!SDL_SetVideoMode (	538	RETVAL = !!SDL_SetVideoMode (
443	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	539	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
444	);	540	);
		541	if (RETVAL)
		542	{
445	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	}
446	OUTPUT:	548	OUTPUT:
447	RETVAL	549	RETVAL
448		550
449	void	551	void
450	SDL_GL_SwapBuffers ()	552	SDL_GL_SwapBuffers ()
		553
		554	char *
		555	SDL_GetKeyName (int sym)
451		556
452	void	557	void
453	SDL_PollEvent ()	558	SDL_PollEvent ()
454	PPCODE:	559	PPCODE:
455	{	560	{
…		…
474	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	579	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
475	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	580	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
476	break;	581	break;
477		582
478	case SDL_MOUSEMOTION:	583	case SDL_MOUSEMOTION:
		584	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		585
479	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	586	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
480	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	587	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
481	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	588	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
482	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	589	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
483	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	590	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
484	break;	591	break;
485		592
486	case SDL_MOUSEBUTTONDOWN:	593	case SDL_MOUSEBUTTONDOWN:
487	case SDL_MOUSEBUTTONUP:	594	case SDL_MOUSEBUTTONUP:
		595	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		596
488	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	597	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
489	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	598	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
490	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	599	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
491	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	600	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
492	break;	601	break;
		602
		603	case SDL_USEREVENT:
		604	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		605	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		606	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		607	break;
493	}	608	}
494		609
495	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	610	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
496	}	611	}
497	}	612	}
498		613
499	int	614	int
500	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	615	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
501	POSTCALL:	616	POSTCALL:
502	Mix_HookMusicFinished (music_finished);	617	Mix_HookMusicFinished (music_finished);
		618	Mix_ChannelFinished (channel_finished);
503		619
504	void	620	void
505	Mix_CloseAudio ()	621	Mix_CloseAudio ()
506		622
507	int	623	int
…		…
512	CODE:	628	CODE:
513	#ifndef _WIN32	629	#ifndef _WIN32
514	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	630	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
515	#endif	631	#endif
516		632
517	char *
518	gl_version ()
519	CODE:
520	RETVAL = (char *)glGetString (GL_VERSION);
521	OUTPUT:
522	RETVAL
523
524	char *
525	gl_extensions ()
526	CODE:
527	RETVAL = (char *)glGetString (GL_EXTENSIONS);
528	OUTPUT:
529	RETVAL
530
531	void	633	void
532	add_font (char *file)	634	add_font (char *file)
533	CODE:	635	CODE:
534	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	636	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
535		637
536	void	638	void
537	load_image_inline (SV *image_)	639	load_image_inline (SV *image_)
538	ALIAS:	640	ALIAS:
539	load_image_file = 1	641	load_image_file = 1
…		…
581		683
582	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	684	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
583		685
584	assert (surface2->pitch == surface2->w * 4);	686	assert (surface2->pitch == surface2->w * 4);
585		687
		688	SDL_LockSurface (surface2);
586	EXTEND (SP, 5);	689	EXTEND (SP, 6);
587	PUSHs (sv_2mortal (newSViv (surface2->w)));	690	PUSHs (sv_2mortal (newSViv (surface2->w)));
588	PUSHs (sv_2mortal (newSViv (surface2->h)));	691	PUSHs (sv_2mortal (newSViv (surface2->h)));
589	SDL_LockSurface (surface2);
590	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	692	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
591	SDL_UnlockSurface (surface2);
592	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)));
593	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	694	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
594	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	695	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		696	SDL_UnlockSurface (surface2);
595		697
596	SDL_FreeSurface (surface);	698	SDL_FreeSurface (surface);
597	SDL_FreeSurface (surface2);	699	SDL_FreeSurface (surface2);
598	}	700	}
599		701
…		…
623	}	725	}
624		726
625	void	727	void
626	error (char *message)	728	error (char *message)
627	CODE:	729	CODE:
		730	fprintf (stderr, "ERROR: %s\n", message);
628	#ifdef _WIN32	731	#ifdef _WIN32
629	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	732	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
630	#else
631	fprintf (stderr, "ERROR: %s\n", message);
632	#endif	733	#endif
633		734
634	void	735	void
635	fatal (char *message)	736	fatal (char *message)
636	CODE:	737	CODE:
		738	fprintf (stderr, "FATAL: %s\n", message);
637	#ifdef _WIN32	739	#ifdef _WIN32
638	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	740	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
639	#else
640	fprintf (stderr, "FATAL: %s\n", message);
641	#endif	741	#endif
642	exit (1);	742	_exit (1);
		743
		744	void
		745	_exit (int retval)
		746	CODE:
		747	_exit (retval);
643		748
644	MODULE = CFClient PACKAGE = CFClient::Font	749	MODULE = CFClient PACKAGE = CFClient::Font
645		750
646	CFClient::Font	751	CFClient::Font
647	new_from_file (SV class, char path, int id = 0)	752	new_from_file (SV class, char path, int id = 0)
…		…
665	CODE:	770	CODE:
666	default_font = self;	771	default_font = self;
667		772
668	MODULE = CFClient PACKAGE = CFClient::Layout	773	MODULE = CFClient PACKAGE = CFClient::Layout
669		774
		775	void
		776	reset_glyph_cache ()
		777	CODE:
		778	tc_clear ();
		779
670	CFClient::Layout	780	CFClient::Layout
671	new (SV *class, int base_height = MIN_FONT_HEIGHT)	781	new (SV *class)
672	CODE:	782	CODE:
673	New (0, RETVAL, 1, struct cf_layout);	783	New (0, RETVAL, 1, struct cf_layout);
		784
674	RETVAL->pl = pango_layout_new (context);	785	RETVAL->pl = pango_layout_new (opengl_context);
675	RETVAL->base_height = base_height;	786	RETVAL->r = 1.;
		787	RETVAL->g = 1.;
		788	RETVAL->b = 1.;
		789	RETVAL->a = 1.;
		790	RETVAL->base_height = MIN_FONT_HEIGHT;
676	RETVAL->font = 0;	791	RETVAL->font = 0;
		792
677	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	793	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
678	pango_layout_set_font_description (RETVAL->pl, default_font);	794	layout_update_font (RETVAL);
679	OUTPUT:	795	OUTPUT:
680	RETVAL	796	RETVAL
681		797
682	void	798	void
683	DESTROY (CFClient::Layout self)	799	DESTROY (CFClient::Layout self)
…		…
703	char *text = SvPVutf8 (text_, textlen);	819	char *text = SvPVutf8 (text_, textlen);
704		820
705	pango_layout_set_markup (self->pl, text, textlen);	821	pango_layout_set_markup (self->pl, text, textlen);
706	}	822	}
707		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
708	SV *	909	SV *
709	get_text (CFClient::Layout self)	910	get_text (CFClient::Layout self)
710	CODE:	911	CODE:
711	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	912	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
712	SvUTF8_on (RETVAL);	913	sv_utf8_decode (RETVAL);
713	OUTPUT:	914	OUTPUT:
714	RETVAL	915	RETVAL
		916
		917	void
		918	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
		919	CODE:
		920	self->r = r;
		921	self->g = g;
		922	self->b = b;
		923	self->a = a;
715		924
716	void	925	void
717	set_font (CFClient::Layout self, CFClient::Font font = 0)	926	set_font (CFClient::Layout self, CFClient::Font font = 0)
718	CODE:	927	CODE:
719	if (self->font != font)	928	if (self->font != font)
…		…
735	set_width (CFClient::Layout self, int max_width = -1)	944	set_width (CFClient::Layout self, int max_width = -1)
736	CODE:	945	CODE:
737	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);
738		947
739	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
740	size (CFClient::Layout self)	974	size (CFClient::Layout self)
741	PPCODE:	975	PPCODE:
742	{	976	{
743	int w, h;	977	int w, h;
744		978
…		…
746		980
747	EXTEND (SP, 2);	981	EXTEND (SP, 2);
748	PUSHs (sv_2mortal (newSViv (w)));	982	PUSHs (sv_2mortal (newSViv (w)));
749	PUSHs (sv_2mortal (newSViv (h)));	983	PUSHs (sv_2mortal (newSViv (h)));
750	}	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
751		997
752	int	998	int
753	xy_to_index (CFClient::Layout self, int x, int y)	999	xy_to_index (CFClient::Layout self, int x, int y)
754	CODE:	1000	CODE:
755	{	1001	{
…		…
772	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1018	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
773	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1019	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
774	}	1020	}
775		1021
776	void	1022	void
777	render (CFClient::Layout self)	1023	render (CFClient::Layout self, float x, float y)
778	PPCODE:	1024	PPCODE:
779	{	1025	pango_opengl_render_layout_subpixel (
780	SV *retval;	1026	self->pl,
781	int w, h;	1027	x * PANGO_SCALE, y * PANGO_SCALE,
782	FT_Bitmap bitmap;	1028	self->r, self->g, self->b, self->a
783		1029	);
784	layout_get_pixel_size (self, &w, &h);
785
786	retval = newSV (w * h);
787	SvPOK_only (retval);
788	SvCUR_set (retval, w * h);
789
790	bitmap.rows = h;
791	bitmap.width = w;
792	bitmap.pitch = w;
793	bitmap.buffer = (unsigned char*)SvPVX (retval);
794	bitmap.num_grays = 256;
795	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
796
797	memset (bitmap.buffer, 0, w * h);
798
799	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
800
801	EXTEND (SP, 3);
802	PUSHs (sv_2mortal (newSViv (w)));
803	PUSHs (sv_2mortal (newSViv (h)));
804	PUSHs (sv_2mortal (retval));
805	}
806		1030
807	MODULE = CFClient PACKAGE = CFClient::Texture	1031	MODULE = CFClient PACKAGE = CFClient::Texture
808		1032
809	void	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)
		1041	{
		1042	int nw = minpot (ow);
		1043	int nh = minpot (oh);
		1044
		1045	if (nw != ow \|\| nh != oh)
		1046	{
		1047	if (SvOK (data_))
		1048	{
		1049	STRLEN datalen;
		1050	char *data = SvPVbyte (data_, datalen);
		1051	int bpp = datalen / (ow * oh);
		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_);
		1062	}
		1063
		1064	sv_setiv (w_, nw);
		1065	sv_setiv (h_, nh);
		1066	}
		1067	}
		1068	}
		1069
		1070	void
810	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.)
811	PROTOTYPE: $$$;$$	1072	PROTOTYPE: $$$;$$
		1073	ALIAS:
		1074	draw_quad_alpha = 1
		1075	draw_quad_alpha_premultiplied = 2
812	CODE:	1076	CODE:
813	{	1077	{
814	HV hv = (HV )SvRV (self);	1078	HV hv = (HV )SvRV (self);
815	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1079	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
816	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1080	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
817	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1081	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
818	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
819		1082
820	if (items < 5)	1083	if (items < 5)
821	{	1084	{
822	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1085	w = SvNV (*hv_fetch (hv, "w", 1, 1));
823	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1086	h = SvNV (*hv_fetch (hv, "h", 1, 1));
824	}	1087	}
825		1088
		1089	if (ix)
		1090	{
		1091	glEnable (GL_BLEND);
		1092
		1093	if (ix == 2)
		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);
		1101	}
		1102
826	glBindTexture (GL_TEXTURE_2D, name);	1103	glBindTexture (GL_TEXTURE_2D, name);
827	if (wrap_mode) {	1104
828	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
829	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
830	}
831	glBegin (GL_QUADS);	1105	glBegin (GL_QUADS);
832	glTexCoord2f (0, 0); glVertex2f (x , y );	1106	glTexCoord2f (0, 0); glVertex2f (x , y );
833	glTexCoord2f (0, t); glVertex2f (x , y + h);	1107	glTexCoord2f (0, t); glVertex2f (x , y + h);
834	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1108	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
835	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1109	glTexCoord2f (s, 0); glVertex2f (x + w, y );
836	glEnd ();	1110	glEnd ();
		1111
		1112	if (ix)
		1113	{
		1114	glDisable (GL_ALPHA_TEST);
		1115	glDisable (GL_BLEND);
		1116	}
837	}	1117	}
838		1118
839	MODULE = CFClient PACKAGE = CFClient::Map	1119	MODULE = CFClient PACKAGE = CFClient::Map
840		1120
841	CFClient::Map	1121	CFClient::Map
…		…
861	DESTROY (CFClient::Map self)	1141	DESTROY (CFClient::Map self)
862	CODE:	1142	CODE:
863	{	1143	{
864	map_clear (self);	1144	map_clear (self);
865	Safefree (self->face);	1145	Safefree (self->face);
		1146	Safefree (self->tex);
866	Safefree (self);	1147	Safefree (self);
867	}	1148	}
868		1149
869	void	1150	void
870	clear (CFClient::Map self)	1151	clear (CFClient::Map self)
…		…
905	tex->r = r;	1186	tex->r = r;
906	tex->g = g;	1187	tex->g = g;
907	tex->b = b;	1188	tex->b = b;
908	tex->a = a;	1189	tex->a = a;
909	}	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);
910	}	1200	}
911		1201
912	int	1202	int
913	ox (CFClient::Map self)	1203	ox (CFClient::Map self)
914	ALIAS:	1204	ALIAS:
915	oy = 1	1205	oy = 1
		1206	x = 2
		1207	y = 3
		1208	w = 4
		1209	h = 5
916	CODE:	1210	CODE:
917	switch (ix)	1211	switch (ix)
918	{	1212	{
919	case 0: RETVAL = self->ox; break;	1213	case 0: RETVAL = self->ox; break;
920	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;
921	}	1219	}
922	OUTPUT:	1220	OUTPUT:
923	RETVAL	1221	RETVAL
924		1222
925	void	1223	void
…		…
959		1257
960	while (data < data_end)	1258	while (data < data_end)
961	{	1259	{
962	flags = (data [0] << 8) + data [1]; data += 2;	1260	flags = (data [0] << 8) + data [1]; data += 2;
963		1261
964	x = ((flags >> 10) & 63) + self->x;	1262	x = self->x + ((flags >> 10) & 63);
965	y = ((flags >> 4) & 63) + self->y;	1263	y = self->y + ((flags >> 4) & 63);
966		1264
967	cell = map_get_cell (self, x, y);	1265	cell = map_get_cell (self, x, y);
968		1266
969	if (flags & 15)	1267	if (flags & 15)
970	{	1268	{
…		…
1060	OUTPUT:	1358	OUTPUT:
1061	RETVAL	1359	RETVAL
1062		1360
1063	void	1361	void
1064	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)
1065	PPCODE:	1363	CODE:
1066	{	1364	{
1067	int vx, vy;	1365	int vx, vy;
1068	int x, y, z;	1366	int x, y, z;
1069	int last_name;	1367	int last_name;
1070	mapface face;	1368	mapface face;
1071	int sw4 = (sw + 3) & ~3;
1072	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1073	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1074		1369
1075	memset (darkness, 255, sw4 * sh);
1076	SvPOK_only (darkness_sv);
1077	SvCUR_set (darkness_sv, sw4 * sh);
1078
1079	vx = self->x + (self->w - sw) / 2 - shift_x;	1370	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1080	vy = self->y + (self->h - sh) / 2 - shift_y;	1371	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1081		1372
1082	/*	1373	/*
1083	int vx = self->vx = self->w >= sw	1374	int vx = self->vx = self->w >= sw
1084	? self->x + (self->w - sw) / 2	1375	? self->x + (self->w - sw) / 2
1085	: 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));
…		…
1089	: 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));
1090	*/	1381	*/
1091		1382
1092	glColor4ub (255, 255, 255, 255);	1383	glColor4ub (255, 255, 255, 255);
1093		1384
		1385	glEnable (GL_BLEND);
1094	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1386	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1095	glEnable (GL_BLEND);
1096	glEnable (GL_TEXTURE_2D);	1387	glEnable (GL_TEXTURE_2D);
1097	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1388	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1098		1389
1099	glBegin (GL_QUADS);	1390	glBegin (GL_QUADS);
1100		1391
…		…
1108		1399
1109	for (x = 0; x < sw; x++)	1400	for (x = 0; x < sw; x++)
1110	if (row->c0 <= x + vx && x + vx < row->c1)	1401	if (row->c0 <= x + vx && x + vx < row->c1)
1111	{	1402	{
1112	mapcell *cell = row->col + (x + vx - row->c0);	1403	mapcell *cell = row->col + (x + vx - row->c0);
1113
1114	darkness[y * sw4 + x] = cell->darkness < 0
1115	? 255 - FOW_DARKNESS
1116	: 255 - cell->darkness;
1117		1404
1118	face = cell->face [z];	1405	face = cell->face [z];
1119		1406
1120	if (face)	1407	if (face)
1121	{	1408	{
…		…
1142		1429
1143	glEnd ();	1430	glEnd ();
1144		1431
1145	glDisable (GL_TEXTURE_2D);	1432	glDisable (GL_TEXTURE_2D);
1146	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	}
1147		1528
1148	EXTEND (SP, 3);	1529	EXTEND (SP, 3);
1149	PUSHs (sv_2mortal (newSViv (sw4)));	1530	PUSHs (sv_2mortal (newSViv (sw4)));
1150	PUSHs (sv_2mortal (newSViv (sh)));	1531	PUSHs (sv_2mortal (newSViv (sh)));
1151	PUSHs (darkness_sv);	1532	PUSHs (darkness_sv);
…		…
1352	const_iv (GL_COLOR_MATERIAL),	1733	const_iv (GL_COLOR_MATERIAL),
1353	const_iv (GL_SMOOTH),	1734	const_iv (GL_SMOOTH),
1354	const_iv (GL_FLAT),	1735	const_iv (GL_FLAT),
1355	const_iv (GL_DITHER),	1736	const_iv (GL_DITHER),
1356	const_iv (GL_BLEND),	1737	const_iv (GL_BLEND),
		1738	const_iv (GL_CULL_FACE),
1357	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),
1358	const_iv (GL_AND),	1746	const_iv (GL_AND),
1359	const_iv (GL_ONE),	1747	const_iv (GL_ONE),
1360	const_iv (GL_ZERO),	1748	const_iv (GL_ZERO),
1361	const_iv (GL_SRC_ALPHA),	1749	const_iv (GL_SRC_ALPHA),
1362	const_iv (GL_SRC_ALPHA_SATURATE),	1750	const_iv (GL_DST_ALPHA),
1363	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1751	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1364	const_iv (GL_ONE_MINUS_DST_ALPHA),	1752	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1753	const_iv (GL_SRC_ALPHA_SATURATE),
1365	const_iv (GL_RGB),	1754	const_iv (GL_RGB),
1366	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),
1367	const_iv (GL_UNSIGNED_BYTE),	1759	const_iv (GL_UNSIGNED_BYTE),
		1760	const_iv (GL_UNSIGNED_SHORT),
		1761	const_iv (GL_UNSIGNED_INT),
1368	const_iv (GL_ALPHA),	1762	const_iv (GL_ALPHA),
		1763	const_iv (GL_INTENSITY),
		1764	const_iv (GL_LUMINANCE),
		1765	const_iv (GL_LUMINANCE_ALPHA),
1369	const_iv (GL_FLOAT),	1766	const_iv (GL_FLOAT),
1370	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1767	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1371	const_iv (GL_COMPILE),	1768	const_iv (GL_COMPILE),
1372	const_iv (GL_TEXTURE_1D),	1769	const_iv (GL_TEXTURE_1D),
1373	const_iv (GL_TEXTURE_2D),	1770	const_iv (GL_TEXTURE_2D),
…		…
1375	const_iv (GL_TEXTURE_MAG_FILTER),	1772	const_iv (GL_TEXTURE_MAG_FILTER),
1376	const_iv (GL_TEXTURE_MIN_FILTER),	1773	const_iv (GL_TEXTURE_MIN_FILTER),
1377	const_iv (GL_TEXTURE_ENV_MODE),	1774	const_iv (GL_TEXTURE_ENV_MODE),
1378	const_iv (GL_TEXTURE_WRAP_S),	1775	const_iv (GL_TEXTURE_WRAP_S),
1379	const_iv (GL_TEXTURE_WRAP_T),	1776	const_iv (GL_TEXTURE_WRAP_T),
		1777	const_iv (GL_REPEAT),
1380	const_iv (GL_CLAMP),	1778	const_iv (GL_CLAMP),
1381	const_iv (GL_REPEAT),	1779	const_iv (GL_CLAMP_TO_EDGE),
1382	const_iv (GL_NEAREST),	1780	const_iv (GL_NEAREST),
1383	const_iv (GL_LINEAR),	1781	const_iv (GL_LINEAR),
1384	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1782	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1385	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1783	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1386	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1784	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1387	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1785	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1388	const_iv (GL_GENERATE_MIPMAP),	1786	const_iv (GL_GENERATE_MIPMAP),
1389	const_iv (GL_MODULATE),	1787	const_iv (GL_MODULATE),
1390	const_iv (GL_DECAL),	1788	const_iv (GL_DECAL),
1391	const_iv (GL_REPLACE),	1789	const_iv (GL_REPLACE),
		1790	const_iv (GL_DEPTH_BUFFER_BIT),
1392	const_iv (GL_COLOR_BUFFER_BIT),	1791	const_iv (GL_COLOR_BUFFER_BIT),
1393	const_iv (GL_PROJECTION),	1792	const_iv (GL_PROJECTION),
1394	const_iv (GL_MODELVIEW),	1793	const_iv (GL_MODELVIEW),
1395	const_iv (GL_COLOR_LOGIC_OP),	1794	const_iv (GL_COLOR_LOGIC_OP),
1396	const_iv (GL_SEPARABLE_2D),	1795	const_iv (GL_SEPARABLE_2D),
1397	const_iv (GL_CONVOLUTION_2D),	1796	const_iv (GL_CONVOLUTION_2D),
1398	const_iv (GL_CONVOLUTION_BORDER_MODE),	1797	const_iv (GL_CONVOLUTION_BORDER_MODE),
1399	const_iv (GL_CONSTANT_BORDER),	1798	const_iv (GL_CONSTANT_BORDER),
1400	const_iv (GL_LINES),	1799	const_iv (GL_LINES),
		1800	const_iv (GL_LINE_LOOP),
1401	const_iv (GL_QUADS),	1801	const_iv (GL_QUADS),
1402	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),
1403	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1806	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1404	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),
1405	# undef const_iv	1812	# undef const_iv
1406	};	1813	};
1407		1814
1408	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; )
1409	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1816	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1410	}	1817	}
1411		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
1412	int glGetError ()	1840	int glGetError ()
		1841
		1842	void glFinish ()
1413		1843
1414	void glClear (int mask)	1844	void glClear (int mask)
1415		1845
1416	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)
1417	PROTOTYPE: @	1847	PROTOTYPE: @
…		…
1424		1854
1425	void glHint (int target, int mode)	1855	void glHint (int target, int mode)
1426		1856
1427	void glBlendFunc (int sfactor, int dfactor)	1857	void glBlendFunc (int sfactor, int dfactor)
1428		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
1429	void glLogicOp (int opcode)	1865	void glLogicOp (int opcode)
1430		1866
1431	void glColorMask (int red, int green, int blue, int alpha)	1867	void glColorMask (int red, int green, int blue, int alpha)
1432		1868
1433	void glMatrixMode (int mode)	1869	void glMatrixMode (int mode)
…		…
1436		1872
1437	void glPopMatrix ()	1873	void glPopMatrix ()
1438		1874
1439	void glLoadIdentity ()	1875	void glLoadIdentity ()
1440		1876
		1877	void glDrawBuffer (int buffer)
		1878
		1879	void glReadBuffer (int buffer)
		1880
1441	# 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
1442	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_)
1443		1886
1444	void glViewport (int x, int y, int width, int height)	1887	void glViewport (int x, int y, int width, int height)
1445		1888
1446	void glScissor (int x, int y, int width, int height)	1889	void glScissor (int x, int y, int width, int height)
…		…
1461		1904
1462	void glEnd ()	1905	void glEnd ()
1463		1906
1464	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)
1465	PROTOTYPE: @	1908	PROTOTYPE: @
		1909	ALIAS:
		1910	glColor_premultiply = 1
1466	CODE:	1911	CODE:
1467	glColor4ub (r * 255., g * 255., b * 255., a * 255.);	1912	if (ix)
		1913	{
		1914	r *= a;
		1915	g *= a;
		1916	b *= a;
		1917	}
		1918	// microsoft visual "c" rounds instead of truncating...
		1919	glColor4f (r, g, b, a);
		1920
		1921	void glInterleavedArrays (int format, int stride, char *data)
		1922
		1923	void glDrawElements (int mode, int count, int type, char *indices)
		1924
		1925	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1926
		1927	void glRasterPos (float x, float y, float z = 0.)
		1928	CODE:
		1929	glRasterPos3f (0, 0, z);
		1930	glBitmap (0, 0, 0, 0, x, y, 0);
1468		1931
1469	void glVertex (float x, float y, float z = 0.)	1932	void glVertex (float x, float y, float z = 0.)
1470	CODE:	1933	CODE:
1471	glVertex3f (x, y, z);	1934	glVertex3f (x, y, z);
1472		1935
…		…
1484		1947
1485	void glBindTexture (int target, int name)	1948	void glBindTexture (int target, int name)
1486		1949
1487	void glConvolutionParameter (int target, int pname, float params)	1950	void glConvolutionParameter (int target, int pname, float params)
1488	CODE:	1951	CODE:
1489	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1952	if (gl.ConvolutionParameterf)
		1953	gl.ConvolutionParameterf (target, pname, params);
1490		1954
1491	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1955	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1492	CODE:	1956	CODE:
1493	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1957	if (gl.ConvolutionFilter2D)
1494	(target, internalformat, width, height, format, type, data));	1958	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1495		1959
1496	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1960	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1497	CODE:	1961	CODE:
1498	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1962	if (gl.SeparableFilter2D)
1499	(target, internalformat, width, height, format, type, row, column));	1963	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1500		1964
1501	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1965	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1502		1966
1503	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1967	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1504		1968
1505	void glRasterPos (int x, int y)	1969	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1506	CODE:
1507	glRasterPos2i (x, y);
1508		1970
1509	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1971	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1510		1972
1511	int glGenTexture ()	1973	int glGenTexture ()
1512	CODE:	1974	CODE:
…		…
1539		2001
1540	void glEndList ()	2002	void glEndList ()
1541		2003
1542	void glCallList (int list)	2004	void glCallList (int list)
1543		2005
		2006

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.70 by root, Sun Apr 30 09:21:47 2006 UTC vs. Revision 1.130 by root, Wed Jul 12 17:21:01 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.70 by root, Sun Apr 30 09:21:47 2006 UTC vs.
Revision 1.130 by root, Wed Jul 12 17:21:01 2006 UTC