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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.93 by root, Tue May 23 18:54:37 2006 UTC vs.
Revision 1.130 by root, Wed Jul 12 17:21:01 2006 UTC

…		…
10	#include "XSUB.h"	10	#include "XSUB.h"
11		11
12	#include <math.h>	12	#include <math.h>
13	#include <string.h>	13	#include <string.h>
14	#include <stdio.h>	14	#include <stdio.h>
		15	#include <stdlib.h>
15		16
16	#include <SDL.h>	17	#include <SDL.h>
17	#include <SDL_endian.h>	18	#include <SDL_endian.h>
18	#include <SDL_image.h>	19	#include <SDL_image.h>
19	#include <SDL_mixer.h>	20	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	21	#include <SDL_opengl.h>
21		22
		23	#define PANGO_ENABLE_BACKEND
		24	#define G_DISABLE_CAST_CHECKS
		25
22	#include <glib/gmacros.h>	26	#include <glib/gmacros.h>
23		27
24	#include <pango/pango.h>	28	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		29
29	#ifndef _WIN32	30	#ifndef _WIN32
30	# include <sys/types.h>	31	# include <sys/types.h>
31	# include <sys/socket.h>	32	# include <sys/socket.h>
32	# include <netinet/in.h>	33	# include <netinet/in.h>
…		…
41	typedef signed int int32_t;	42	typedef signed int int32_t;
42	#endif	43	#endif
43		44
44	#include "glext.h"	45	#include "glext.h"
45		46
		47	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
		48
46	#define FOW_DARKNESS 32	49	#define FOW_DARKNESS 32
47		50
48	#define MAP_EXTEND_X 32	51	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	52	#define MAP_EXTEND_Y 512
50		53
51	#define MIN_FONT_HEIGHT 10	54	#define MIN_FONT_HEIGHT 10
52		55
53	#define GL_CALL(type,func,args) \	56	#if 0
54	{ \	57	# define PARACHUTE SDL_INIT_NOPARACHUTE
55	static int init_; \	58	#else
56	static type fptr_; \	59	# define PARACHUTE 0
57	\	60	#endif
58	if (!init_) \	61
59	{ \	62	static struct
60	init_ = 1; \	63	{
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \	64	#define GL_FUNC(ptr,name) ptr name;
62	} \	65	#include "glfunc.h"
63	\	66	#undef GL_FUNC
64	if (fptr_) \	67	} gl;
65	fptr_ args; \	68
66	}	69	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
		70	{
		71	if (gl.BlendFuncSeparate)
		72	gl.BlendFuncSeparate (sa, da, saa, daa);
		73	else if (gl.BlendFuncSeparateEXT)
		74	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
		75	else
		76	glBlendFunc (sa, da);
		77	}
		78
		79	#include "texcache.c"
		80
		81	#include "pango-font.c"
		82	#include "pango-fontmap.c"
		83	#include "pango-render.c"
67		84
68	typedef Mix_Chunk *CFClient__MixChunk;	85	typedef Mix_Chunk *CFClient__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	86	typedef Mix_Music *CFClient__MixMusic;
70		87
71	typedef PangoFontDescription *CFClient__Font;	88	typedef PangoFontDescription *CFClient__Font;
72		89
		90	static int
		91	shape_attr_p (PangoLayoutRun *run)
		92	{
		93	GSList *attrs = run->item->analysis.extra_attrs;
		94
		95	while (attrs)
		96	{
		97	PangoAttribute *attr = attrs->data;
		98
		99	if (attr->klass->type == PANGO_ATTR_SHAPE)
		100	return 1;
		101
		102	attrs = attrs->next;
		103	}
		104
		105	return 0;
		106	}
		107
73	typedef struct cf_layout {	108	typedef struct cf_layout {
74	PangoLayout *pl; // either derived from a cairo or ft2 context	109	PangoLayout *pl;
75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76	float r, g, b, a; // default color for rgba mode	110	float r, g, b, a; // default color for rgba mode
77	int base_height;	111	int base_height;
78	CFClient__Font font;	112	CFClient__Font font;
79	} *CFClient__Layout;	113	} *CFClient__Layout;
80		114
81	static CFClient__Font default_font;	115	static CFClient__Font default_font;
82	static PangoContext ft2_context, cairo_context;	116	static PangoContext *opengl_context;
83	static PangoFontMap ft2_fontmap, cairo_fontmap;	117	static PangoFontMap *opengl_fontmap;
84		118
85	static void	119	static void
86	substitute_func (FcPattern *pattern, gpointer data)	120	substitute_func (FcPattern *pattern, gpointer data)
87	{	121	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	122	FcPatternAddBool (pattern, FC_HINTING, 1);
89	#ifdef _WIN32	123	#ifdef FC_HINT_STYLE
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	124	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91	#else	125	#endif
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	126	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif
94	}	127	}
95		128
96	static void	129	static void
97	layout_update_font (CFClient__Layout self)	130	layout_update_font (CFClient__Layout self)
98	{	131	{
…		…
294	ev.code = 1;	327	ev.code = 1;
295	ev.data1 = (void *)(long)channel;	328	ev.data1 = (void *)(long)channel;
296	ev.data2 = 0;	329	ev.data2 = 0;
297		330
298	SDL_PushEvent ((SDL_Event *)&ev);	331	SDL_PushEvent ((SDL_Event *)&ev);
		332	}
		333
		334	static unsigned int
		335	minpot (unsigned int n)
		336	{
		337	if (!n)
		338	return 0;
		339
		340	--n;
		341
		342	n \|= n >> 1;
		343	n \|= n >> 2;
		344	n \|= n >> 4;
		345	n \|= n >> 8;
		346	n \|= n >> 16;
		347
		348	return n + 1;
299	}	349	}
300		350
301	MODULE = CFClient PACKAGE = CFClient	351	MODULE = CFClient PACKAGE = CFClient
302		352
303	PROTOTYPES: ENABLE	353	PROTOTYPES: ENABLE
…		…
413		463
414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	464	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	465	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416	}	466	}
417		467
		468	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
418	void	479	void
419	pango_init ()	480	pango_init ()
420	CODE:	481	CODE:
421	{	482	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx
423	ft2_fontmap = pango_ft2_font_map_new ();	483	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	484	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	485	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	}	486	}
430		487
431	int	488	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	489	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
433		490
434	void	491	void
435	SDL_Quit ()	492	SDL_Quit ()
436		493
437	void	494	void
…		…
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	501	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	502	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	503	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		504
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	505	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	506	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450		507
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	508	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	509	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	510	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	511	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	536	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	537	CODE:
481	RETVAL = !!SDL_SetVideoMode (	538	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	539	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	540	);
		541	if (RETVAL)
		542	{
484	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	}
485	OUTPUT:	548	OUTPUT:
486	RETVAL	549	RETVAL
487		550
488	void	551	void
489	SDL_GL_SwapBuffers ()	552	SDL_GL_SwapBuffers ()
		553
		554	char *
		555	SDL_GetKeyName (int sym)
490		556
491	void	557	void
492	SDL_PollEvent ()	558	SDL_PollEvent ()
493	PPCODE:	559	PPCODE:
494	{	560	{
495	SDL_Event ev;	561	SDL_Event ev;
496	int i;
497	static int modifier;
498	static int modkey[] = {
499	SDLK_RSHIFT, KMOD_RSHIFT,
500	SDLK_LSHIFT, KMOD_LSHIFT,
501	SDLK_RCTRL, KMOD_RCTRL,
502	SDLK_LCTRL, KMOD_LCTRL,
503	SDLK_RALT, KMOD_RALT,
504	SDLK_LALT, KMOD_LALT,
505	SDLK_RMETA, KMOD_RMETA,
506	SDLK_LMETA, KMOD_LMETA,
507	};
508		562
509	while (SDL_PollEvent (&ev))	563	while (SDL_PollEvent (&ev))
510	{	564	{
511	HV *hv = newHV ();	565	HV *hv = newHV ();
512	hv_store (hv, "type", 4, newSViv (ev.type), 0);	566	hv_store (hv, "type", 4, newSViv (ev.type), 0);
513		567
514	switch (ev.type)	568	switch (ev.type)
515	{	569	{
516	case SDL_KEYDOWN:	570	case SDL_KEYDOWN:
517	case SDL_KEYUP:	571	case SDL_KEYUP:
518
519	for (i = 0; i < sizeof (modkey) / (sizeof (int) * 2); i++)
520	if (modkey [i * 2] == ev.key.keysym.sym)
521	{
522	if (ev.type == SDL_KEYDOWN)
523	modifier \|= modkey [i * 2 + 1];
524	else
525	modifier &= ~modkey [i * 2 + 1];
526	break;
527	}
528
529	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	572	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
530	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	573	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
531	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	574	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
532	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	575	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
533	break;	576	break;
…		…
536	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	579	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
537	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	580	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
538	break;	581	break;
539		582
540	case SDL_MOUSEMOTION:	583	case SDL_MOUSEMOTION:
541	hv_store (hv, "mod", 3, newSViv (modifier), 0);	584	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
542		585
543	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	586	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
544	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	587	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
545	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	588	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
546	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	589	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
547	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	590	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
548	break;	591	break;
549		592
550	case SDL_MOUSEBUTTONDOWN:	593	case SDL_MOUSEBUTTONDOWN:
551	case SDL_MOUSEBUTTONUP:	594	case SDL_MOUSEBUTTONUP:
552	hv_store (hv, "mod", 3, newSViv (modifier), 0);	595	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
553		596
554	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	597	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
555	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	598	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
556	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	599	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
557	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	600	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
585	CODE:	628	CODE:
586	#ifndef _WIN32	629	#ifndef _WIN32
587	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	630	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
588	#endif	631	#endif
589		632
590	char *
591	gl_vendor ()
592	CODE:
593	RETVAL = (char *)glGetString (GL_VENDOR);
594	OUTPUT:
595	RETVAL
596
597	char *
598	gl_version ()
599	CODE:
600	RETVAL = (char *)glGetString (GL_VERSION);
601	OUTPUT:
602	RETVAL
603
604	char *
605	gl_extensions ()
606	CODE:
607	RETVAL = (char *)glGetString (GL_EXTENSIONS);
608	OUTPUT:
609	RETVAL
610
611	void	633	void
612	add_font (char *file)	634	add_font (char *file)
613	CODE:	635	CODE:
614	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	636	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
615	#ifdef _WIN32
616	// cairo... sigh... requires win2000
617	AddFontResourceEx (file, FR_PRIVATE, 0);
618	#endif
619		637
620	void	638	void
621	load_image_inline (SV *image_)	639	load_image_inline (SV *image_)
622	ALIAS:	640	ALIAS:
623	load_image_file = 1	641	load_image_file = 1
…		…
665		683
666	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	684	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
667		685
668	assert (surface2->pitch == surface2->w * 4);	686	assert (surface2->pitch == surface2->w * 4);
669		687
		688	SDL_LockSurface (surface2);
670	EXTEND (SP, 5);	689	EXTEND (SP, 6);
671	PUSHs (sv_2mortal (newSViv (surface2->w)));	690	PUSHs (sv_2mortal (newSViv (surface2->w)));
672	PUSHs (sv_2mortal (newSViv (surface2->h)));	691	PUSHs (sv_2mortal (newSViv (surface2->h)));
673	SDL_LockSurface (surface2);
674	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	692	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
675	SDL_UnlockSurface (surface2);
676	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)));
677	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	694	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
678	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	695	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		696	SDL_UnlockSurface (surface2);
679		697
680	SDL_FreeSurface (surface);	698	SDL_FreeSurface (surface);
681	SDL_FreeSurface (surface2);	699	SDL_FreeSurface (surface2);
682	}	700	}
683		701
…		…
719	CODE:	737	CODE:
720	fprintf (stderr, "FATAL: %s\n", message);	738	fprintf (stderr, "FATAL: %s\n", message);
721	#ifdef _WIN32	739	#ifdef _WIN32
722	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	740	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
723	#endif	741	#endif
724	exit (1);	742	_exit (1);
		743
		744	void
		745	_exit (int retval)
		746	CODE:
		747	_exit (retval);
725		748
726	MODULE = CFClient PACKAGE = CFClient::Font	749	MODULE = CFClient PACKAGE = CFClient::Font
727		750
728	CFClient::Font	751	CFClient::Font
729	new_from_file (SV class, char path, int id = 0)	752	new_from_file (SV class, char path, int id = 0)
…		…
747	CODE:	770	CODE:
748	default_font = self;	771	default_font = self;
749		772
750	MODULE = CFClient PACKAGE = CFClient::Layout	773	MODULE = CFClient PACKAGE = CFClient::Layout
751		774
		775	void
		776	reset_glyph_cache ()
		777	CODE:
		778	tc_clear ();
		779
752	CFClient::Layout	780	CFClient::Layout
753	new (SV *class, int rgba = 0)	781	new (SV *class)
754	CODE:	782	CODE:
755	#if _WIN32
756	rgba = 0;//D
757	#endif
758	New (0, RETVAL, 1, struct cf_layout);	783	New (0, RETVAL, 1, struct cf_layout);
759		784
760	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	785	RETVAL->pl = pango_layout_new (opengl_context);
761	RETVAL->rgba = rgba;
762	RETVAL->r = 1.;	786	RETVAL->r = 1.;
763	RETVAL->g = 1.;	787	RETVAL->g = 1.;
764	RETVAL->b = 1.;	788	RETVAL->b = 1.;
765	RETVAL->a = 1.;	789	RETVAL->a = 1.;
766	RETVAL->base_height = MIN_FONT_HEIGHT;	790	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
775	DESTROY (CFClient::Layout self)	799	DESTROY (CFClient::Layout self)
776	CODE:	800	CODE:
777	g_object_unref (self->pl);	801	g_object_unref (self->pl);
778	Safefree (self);	802	Safefree (self);
779		803
780	int
781	is_rgba (CFClient::Layout self)
782	CODE:
783	RETVAL = self->rgba;
784	OUTPUT:
785	RETVAL
786
787	void	804	void
788	set_text (CFClient::Layout self, SV *text_)	805	set_text (CFClient::Layout self, SV *text_)
789	CODE:	806	CODE:
790	{	807	{
791	STRLEN textlen;	808	STRLEN textlen;
…		…
802	char *text = SvPVutf8 (text_, textlen);	819	char *text = SvPVutf8 (text_, textlen);
803		820
804	pango_layout_set_markup (self->pl, text, textlen);	821	pango_layout_set_markup (self->pl, text, textlen);
805	}	822	}
806		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
807	SV *	909	SV *
808	get_text (CFClient::Layout self)	910	get_text (CFClient::Layout self)
809	CODE:	911	CODE:
810	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	912	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
811	SvUTF8_on (RETVAL);	913	sv_utf8_decode (RETVAL);
812	OUTPUT:	914	OUTPUT:
813	RETVAL	915	RETVAL
814		916
815	void	917	void
816	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	918	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
…		…
880	PUSHs (sv_2mortal (newSViv (w)));	982	PUSHs (sv_2mortal (newSViv (w)));
881	PUSHs (sv_2mortal (newSViv (h)));	983	PUSHs (sv_2mortal (newSViv (h)));
882	}	984	}
883		985
884	int	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
		997
		998	int
885	xy_to_index (CFClient::Layout self, int x, int y)	999	xy_to_index (CFClient::Layout self, int x, int y)
886	CODE:	1000	CODE:
887	{	1001	{
888	int index, trailing;	1002	int index, trailing;
889	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1003	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
…		…
904	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1018	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
905	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1019	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
906	}	1020	}
907		1021
908	void	1022	void
909	render (CFClient::Layout self)	1023	render (CFClient::Layout self, float x, float y)
910	PPCODE:	1024	PPCODE:
911	{	1025	pango_opengl_render_layout_subpixel (
912	SV *retval;	1026	self->pl,
913	int w, h;	1027	x * PANGO_SCALE, y * PANGO_SCALE,
		1028	self->r, self->g, self->b, self->a
		1029	);
914		1030
915	layout_get_pixel_size (self, &w, &h);	1031	MODULE = CFClient PACKAGE = CFClient::Texture
916		1032
917	if (self->rgba)	1033	void
		1034	pad2pot (SV data_, SV w_, SV *h_)
		1035	CODE:
		1036	{
		1037	int ow = SvIV (w_);
		1038	int oh = SvIV (h_);
		1039
		1040	if (ow && oh)
918	{	1041	{
919	cairo_surface_t *surface;	1042	int nw = minpot (ow);
920	cairo_t *cairo;	1043	int nh = minpot (oh);
921		1044
922	retval = newSV (w * h * 4);	1045	if (nw != ow \|\| nh != oh)
923	SvPOK_only (retval);
924	SvCUR_set (retval, w * h * 4);
925
926	memset (SvPVX (retval), 0, w * h * 4);
927
928	surface = cairo_image_surface_create_for_data (
929	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
930	cairo = cairo_create (surface);
931	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
932
933	pango_cairo_show_layout (cairo, self->pl);
934
935	cairo_destroy (cairo);
936	cairo_surface_destroy (surface);
937
938	// what a mess, and its premultiplied, too :(
939	{	1046	{
940	uint32_t p = (uint32_t )SvPVX (retval);	1047	if (SvOK (data_))
941	uint32_t e = p + w h;
942
943	while (p < e)
944	{	1048	{
945	uint32_t rgba = *p;	1049	STRLEN datalen;
946	rgba = (rgba >> 24) \| (rgba << 8);	1050	char *data = SvPVbyte (data_, datalen);
947	#if 0	1051	int bpp = datalen / (ow * oh);
948	#ifdef _WIN32	1052	SV result_ = sv_2mortal (newSV (nw nh * bpp));
949	{//D
950	uint8_t r = rgba >> 24;
951	uint8_t g = rgba >> 16;
952	uint8_t b = rgba >> 8;
953	uint8_t a = rgba >> 0;
954		1053
955	rgba = (rgba & 0xffffff00) \| a;	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_);
956	}	1062	}
957	#endif	1063
958	#endif	1064	sv_setiv (w_, nw);
959	rgba = SDL_SwapBE32 (rgba);	1065	sv_setiv (h_, nh);
960	*p++ = rgba;
961	}	1066	}
962	}
963
964	EXTEND (SP, 5);
965	PUSHs (sv_2mortal (newSViv (w)));
966	PUSHs (sv_2mortal (newSViv (h)));
967	PUSHs (sv_2mortal (retval));
968	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
969	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
970	}	1067	}
971	else
972	{
973	FT_Bitmap bitmap;
974
975	retval = newSV (w * h);
976	SvPOK_only (retval);
977	SvCUR_set (retval, w * h);
978
979	bitmap.rows = h;
980	bitmap.width = w;
981	bitmap.pitch = w;
982	bitmap.buffer = (unsigned char*)SvPVX (retval);
983	bitmap.num_grays = 256;
984	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
985
986	memset (bitmap.buffer, 0, w * h);
987
988	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
989
990	EXTEND (SP, 5);
991	PUSHs (sv_2mortal (newSViv (w)));
992	PUSHs (sv_2mortal (newSViv (h)));
993	PUSHs (sv_2mortal (retval));
994	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
995	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
996	}
997	}	1068	}
998		1069
999	MODULE = CFClient PACKAGE = CFClient::Texture
1000
1001	void	1070	void
1002	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.)
1003	PROTOTYPE: $$$;$$	1072	PROTOTYPE: $$$;$$
1004	ALIAS:	1073	ALIAS:
1005	draw_quad_alpha = 1	1074	draw_quad_alpha = 1
1006	draw_quad_alpha_premultiplied = 2	1075	draw_quad_alpha_premultiplied = 2
1007	CODE:	1076	CODE:
1008	{	1077	{
1009	HV hv = (HV )SvRV (self);	1078	HV hv = (HV )SvRV (self);
1010	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1079	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1011	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1080	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1012	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1081	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1013	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
1014		1082
1015	if (items < 5)	1083	if (items < 5)
1016	{	1084	{
1017	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1085	w = SvNV (*hv_fetch (hv, "w", 1, 1));
1018	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1086	h = SvNV (*hv_fetch (hv, "h", 1, 1));
1019	}	1087	}
1020		1088
1021	if (ix)	1089	if (ix)
1022	{	1090	{
1023	glEnable (GL_BLEND);	1091	glEnable (GL_BLEND);
		1092
		1093	if (ix == 2)
1024	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1094	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1095	else
		1096	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1097	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1098
1025	glEnable (GL_ALPHA_TEST);	1099	glEnable (GL_ALPHA_TEST);
1026	glAlphaFunc (GL_GREATER, 0.01f);	1100	glAlphaFunc (GL_GREATER, 0.01f);
1027	}	1101	}
1028		1102
1029	glBindTexture (GL_TEXTURE_2D, name);	1103	glBindTexture (GL_TEXTURE_2D, name);
1030
1031	if (wrap_mode)
1032	{
1033	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1034	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1035	}
1036		1104
1037	glBegin (GL_QUADS);	1105	glBegin (GL_QUADS);
1038	glTexCoord2f (0, 0); glVertex2f (x , y );	1106	glTexCoord2f (0, 0); glVertex2f (x , y );
1039	glTexCoord2f (0, t); glVertex2f (x , y + h);	1107	glTexCoord2f (0, t); glVertex2f (x , y + h);
1040	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1108	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1073	DESTROY (CFClient::Map self)	1141	DESTROY (CFClient::Map self)
1074	CODE:	1142	CODE:
1075	{	1143	{
1076	map_clear (self);	1144	map_clear (self);
1077	Safefree (self->face);	1145	Safefree (self->face);
		1146	Safefree (self->tex);
1078	Safefree (self);	1147	Safefree (self);
1079	}	1148	}
1080		1149
1081	void	1150	void
1082	clear (CFClient::Map self)	1151	clear (CFClient::Map self)
…		…
1117	tex->r = r;	1186	tex->r = r;
1118	tex->g = g;	1187	tex->g = g;
1119	tex->b = b;	1188	tex->b = b;
1120	tex->a = a;	1189	tex->a = a;
1121	}	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);
1122	}	1200	}
1123		1201
1124	int	1202	int
1125	ox (CFClient::Map self)	1203	ox (CFClient::Map self)
1126	ALIAS:	1204	ALIAS:
1127	oy = 1	1205	oy = 1
		1206	x = 2
		1207	y = 3
		1208	w = 4
		1209	h = 5
1128	CODE:	1210	CODE:
1129	switch (ix)	1211	switch (ix)
1130	{	1212	{
1131	case 0: RETVAL = self->ox; break;	1213	case 0: RETVAL = self->ox; break;
1132	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;
1133	}	1219	}
1134	OUTPUT:	1220	OUTPUT:
1135	RETVAL	1221	RETVAL
1136		1222
1137	void	1223	void
…		…
1171		1257
1172	while (data < data_end)	1258	while (data < data_end)
1173	{	1259	{
1174	flags = (data [0] << 8) + data [1]; data += 2;	1260	flags = (data [0] << 8) + data [1]; data += 2;
1175		1261
1176	x = ((flags >> 10) & 63) + self->x;	1262	x = self->x + ((flags >> 10) & 63);
1177	y = ((flags >> 4) & 63) + self->y;	1263	y = self->y + ((flags >> 4) & 63);
1178		1264
1179	cell = map_get_cell (self, x, y);	1265	cell = map_get_cell (self, x, y);
1180		1266
1181	if (flags & 15)	1267	if (flags & 15)
1182	{	1268	{
…		…
1272	OUTPUT:	1358	OUTPUT:
1273	RETVAL	1359	RETVAL
1274		1360
1275	void	1361	void
1276	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)
1277	PPCODE:	1363	CODE:
1278	{	1364	{
1279	int vx, vy;	1365	int vx, vy;
1280	int x, y, z;	1366	int x, y, z;
1281	int last_name;	1367	int last_name;
1282	mapface face;	1368	mapface face;
1283	int sw4 = (sw + 3) & ~3;
1284	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1285	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1286		1369
1287	memset (darkness, 255, sw4 * sh);
1288	SvPOK_only (darkness_sv);
1289	SvCUR_set (darkness_sv, sw4 * sh);
1290
1291	vx = self->x + (self->w - sw) / 2 - shift_x;	1370	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1292	vy = self->y + (self->h - sh) / 2 - shift_y;	1371	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1293		1372
1294	/*	1373	/*
1295	int vx = self->vx = self->w >= sw	1374	int vx = self->vx = self->w >= sw
1296	? self->x + (self->w - sw) / 2	1375	? self->x + (self->w - sw) / 2
1297	: 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));
…		…
1301	: 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));
1302	*/	1381	*/
1303		1382
1304	glColor4ub (255, 255, 255, 255);	1383	glColor4ub (255, 255, 255, 255);
1305		1384
		1385	glEnable (GL_BLEND);
1306	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1386	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1307	glEnable (GL_BLEND);
1308	glEnable (GL_TEXTURE_2D);	1387	glEnable (GL_TEXTURE_2D);
1309	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1388	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1310		1389
1311	glBegin (GL_QUADS);	1390	glBegin (GL_QUADS);
1312		1391
…		…
1320		1399
1321	for (x = 0; x < sw; x++)	1400	for (x = 0; x < sw; x++)
1322	if (row->c0 <= x + vx && x + vx < row->c1)	1401	if (row->c0 <= x + vx && x + vx < row->c1)
1323	{	1402	{
1324	mapcell *cell = row->col + (x + vx - row->c0);	1403	mapcell *cell = row->col + (x + vx - row->c0);
1325
1326	darkness[y * sw4 + x] = cell->darkness < 0
1327	? 255 - FOW_DARKNESS
1328	: 255 - cell->darkness;
1329		1404
1330	face = cell->face [z];	1405	face = cell->face [z];
1331		1406
1332	if (face)	1407	if (face)
1333	{	1408	{
…		…
1354		1429
1355	glEnd ();	1430	glEnd ();
1356		1431
1357	glDisable (GL_TEXTURE_2D);	1432	glDisable (GL_TEXTURE_2D);
1358	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	}
1359		1528
1360	EXTEND (SP, 3);	1529	EXTEND (SP, 3);
1361	PUSHs (sv_2mortal (newSViv (sw4)));	1530	PUSHs (sv_2mortal (newSViv (sw4)));
1362	PUSHs (sv_2mortal (newSViv (sh)));	1531	PUSHs (sv_2mortal (newSViv (sh)));
1363	PUSHs (darkness_sv);	1532	PUSHs (darkness_sv);
…		…
1570	const_iv (GL_SCISSOR_TEST),	1739	const_iv (GL_SCISSOR_TEST),
1571	const_iv (GL_DEPTH_TEST),	1740	const_iv (GL_DEPTH_TEST),
1572	const_iv (GL_ALPHA_TEST),	1741	const_iv (GL_ALPHA_TEST),
1573	const_iv (GL_NORMALIZE),	1742	const_iv (GL_NORMALIZE),
1574	const_iv (GL_RESCALE_NORMAL),	1743	const_iv (GL_RESCALE_NORMAL),
		1744	const_iv (GL_FRONT),
		1745	const_iv (GL_BACK),
1575	const_iv (GL_AND),	1746	const_iv (GL_AND),
1576	const_iv (GL_ONE),	1747	const_iv (GL_ONE),
1577	const_iv (GL_ZERO),	1748	const_iv (GL_ZERO),
1578	const_iv (GL_SRC_ALPHA),	1749	const_iv (GL_SRC_ALPHA),
1579	const_iv (GL_SRC_ALPHA_SATURATE),	1750	const_iv (GL_DST_ALPHA),
1580	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1751	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1581	const_iv (GL_ONE_MINUS_DST_ALPHA),	1752	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1753	const_iv (GL_SRC_ALPHA_SATURATE),
1582	const_iv (GL_RGB),	1754	const_iv (GL_RGB),
1583	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),
1584	const_iv (GL_UNSIGNED_BYTE),	1759	const_iv (GL_UNSIGNED_BYTE),
1585	const_iv (GL_UNSIGNED_SHORT),	1760	const_iv (GL_UNSIGNED_SHORT),
1586	const_iv (GL_UNSIGNED_INT),	1761	const_iv (GL_UNSIGNED_INT),
1587	const_iv (GL_ALPHA),	1762	const_iv (GL_ALPHA),
1588	const_iv (GL_INTENSITY),	1763	const_iv (GL_INTENSITY),
…		…
1597	const_iv (GL_TEXTURE_MAG_FILTER),	1772	const_iv (GL_TEXTURE_MAG_FILTER),
1598	const_iv (GL_TEXTURE_MIN_FILTER),	1773	const_iv (GL_TEXTURE_MIN_FILTER),
1599	const_iv (GL_TEXTURE_ENV_MODE),	1774	const_iv (GL_TEXTURE_ENV_MODE),
1600	const_iv (GL_TEXTURE_WRAP_S),	1775	const_iv (GL_TEXTURE_WRAP_S),
1601	const_iv (GL_TEXTURE_WRAP_T),	1776	const_iv (GL_TEXTURE_WRAP_T),
		1777	const_iv (GL_REPEAT),
1602	const_iv (GL_CLAMP),	1778	const_iv (GL_CLAMP),
1603	const_iv (GL_REPEAT),	1779	const_iv (GL_CLAMP_TO_EDGE),
1604	const_iv (GL_NEAREST),	1780	const_iv (GL_NEAREST),
1605	const_iv (GL_LINEAR),	1781	const_iv (GL_LINEAR),
1606	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1782	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1607	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1783	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1608	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1784	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1638		1814
1639	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; )
1640	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1816	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1641	}	1817	}
1642		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
1643	int glGetError ()	1840	int glGetError ()
		1841
		1842	void glFinish ()
1644		1843
1645	void glClear (int mask)	1844	void glClear (int mask)
1646		1845
1647	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)
1648	PROTOTYPE: @	1847	PROTOTYPE: @
…		…
1655		1854
1656	void glHint (int target, int mode)	1855	void glHint (int target, int mode)
1657		1856
1658	void glBlendFunc (int sfactor, int dfactor)	1857	void glBlendFunc (int sfactor, int dfactor)
1659		1858
		1859	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1860	CODE:
		1861	gl_BlendFuncSeparate (sa, da, saa, daa);
		1862
1660	void glDepthMask (int flag)	1863	void glDepthMask (int flag)
1661		1864
1662	void glLogicOp (int opcode)	1865	void glLogicOp (int opcode)
1663		1866
1664	void glColorMask (int red, int green, int blue, int alpha)	1867	void glColorMask (int red, int green, int blue, int alpha)
…		…
1668	void glPushMatrix ()	1871	void glPushMatrix ()
1669		1872
1670	void glPopMatrix ()	1873	void glPopMatrix ()
1671		1874
1672	void glLoadIdentity ()	1875	void glLoadIdentity ()
		1876
		1877	void glDrawBuffer (int buffer)
		1878
		1879	void glReadBuffer (int buffer)
1673		1880
1674	# near_ and far_ are due to microsofts buggy "c" compiler	1881	# near_ and far_ are due to microsofts buggy "c" compiler
1675	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1882	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1676		1883
1677	# near_ and far_ are due to microsofts buggy "c" compiler	1884	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1697		1904
1698	void glEnd ()	1905	void glEnd ()
1699		1906
1700	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)
1701	PROTOTYPE: @	1908	PROTOTYPE: @
		1909	ALIAS:
		1910	glColor_premultiply = 1
1702	CODE:	1911	CODE:
		1912	if (ix)
		1913	{
		1914	r *= a;
		1915	g *= a;
		1916	b *= a;
		1917	}
1703	// microsoft visual "c" rounds instead of truncating...	1918	// microsoft visual "c" rounds instead of truncating...
1704	glColor4ub (MIN ((int)(r * 255.f), 255),	1919	glColor4f (r, g, b, a);
1705	MIN ((int)(g * 255.f), 255),
1706	MIN ((int)(b * 255.f), 255),
1707	MIN ((int)(a * 255.f), 255));
1708		1920
1709	void glInterleavedArrays (int format, int stride, char *data)	1921	void glInterleavedArrays (int format, int stride, char *data)
1710		1922
1711	void glDrawElements (int mode, int count, int type, char *indices)	1923	void glDrawElements (int mode, int count, int type, char *indices)
1712		1924
…		…
1735		1947
1736	void glBindTexture (int target, int name)	1948	void glBindTexture (int target, int name)
1737		1949
1738	void glConvolutionParameter (int target, int pname, float params)	1950	void glConvolutionParameter (int target, int pname, float params)
1739	CODE:	1951	CODE:
1740	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1952	if (gl.ConvolutionParameterf)
		1953	gl.ConvolutionParameterf (target, pname, params);
1741		1954
1742	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)
1743	CODE:	1956	CODE:
1744	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1957	if (gl.ConvolutionFilter2D)
1745	(target, internalformat, width, height, format, type, data));	1958	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1746		1959
1747	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)
1748	CODE:	1961	CODE:
1749	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1962	if (gl.SeparableFilter2D)
1750	(target, internalformat, width, height, format, type, row, column));	1963	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1751		1964
1752	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)
1753		1966
1754	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)
1755		1968

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.93 by root, Tue May 23 18:54:37 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.93 by root, Tue May 23 18:54:37 2006 UTC vs.
Revision 1.130 by root, Wed Jul 12 17:21:01 2006 UTC