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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.65 by root, Mon Apr 24 08:22:21 2006 UTC vs.
Revision 1.86 by root, Fri May 19 16:43:56 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>
11		15
12	#include <SDL.h>	16	#include <SDL.h>
		17	#include <SDL_endian.h>
13	#include <SDL_image.h>	18	#include <SDL_image.h>
14	#include <SDL_mixer.h>	19	#include <SDL_mixer.h>
15	#include <SDL_opengl.h>	20	#include <SDL_opengl.h>
16		21
17	#include <glib/gmacros.h>	22	#include <glib/gmacros.h>
18		23
19	#include <pango/pango.h>	24	#include <pango/pango.h>
20	#include <pango/pangofc-fontmap.h>	25	#include <pango/pangofc-fontmap.h>
21	#include <pango/pangoft2.h>	26	#include <pango/pangoft2.h>
		27	#include <pango/pangocairo.h>
22		28
23	#ifndef _WIN32	29	#ifndef _WIN32
24	# include <sys/types.h>	30	# include <sys/types.h>
25	# include <sys/socket.h>	31	# include <sys/socket.h>
26	# include <netinet/in.h>	32	# include <netinet/in.h>
63	typedef Mix_Music *CFClient__MixMusic;	69	typedef Mix_Music *CFClient__MixMusic;
64		70
65	typedef PangoFontDescription *CFClient__Font;	71	typedef PangoFontDescription *CFClient__Font;
66		72
67	typedef struct cf_layout {	73	typedef struct cf_layout {
68	PangoLayout *pl;	74	PangoLayout *pl; // either derived from a cairo or ft2 context
		75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
		76	float r, g, b, a; // default color for rgba mode
69	int base_height;	77	int base_height;
70	CFClient__Font font;	78	CFClient__Font font;
71	} *CFClient__Layout;	79	} *CFClient__Layout;
72		80
73	static CFClient__Font default_font;	81	static CFClient__Font default_font;
74	static PangoContext *context;	82	static PangoContext ft2_context, cairo_context;
75	static PangoFontMap *fontmap;	83	static PangoFontMap ft2_fontmap, cairo_fontmap;
76		84
77	static void	85	static void
78	substitute_func (FcPattern *pattern, gpointer data)	86	substitute_func (FcPattern *pattern, gpointer data)
79	{	87	{
80	FcPatternAddBool (pattern, FC_HINTING , 1);	88	FcPatternAddBool (pattern, FC_HINTING , 1);
		89	#ifdef _WIN32
		90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
		91	#else
81	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
		93	#endif
82	}	94	}
83		95
84	static void	96	static void
85	layout_update_font (CFClient__Layout self)	97	layout_update_font (CFClient__Layout self)
86	{	98	{
…		…
98	static void	110	static void
99	layout_get_pixel_size (CFClient__Layout self, int w, int h)	111	layout_get_pixel_size (CFClient__Layout self, int w, int h)
100	{	112	{
101	pango_layout_get_pixel_size (self->pl, w, h);	113	pango_layout_get_pixel_size (self->pl, w, h);
102		114
103	w = (w + 3) & ~3;
104	if (!w) w = 1;	115	if (!w) w = 1;
105	if (!h) h = 1;	116	if (!h) h = 1;
		117
		118	w = (w + 3) & ~3;
106	}	119	}
107		120
108	typedef uint16_t mapface;	121	typedef uint16_t mapface;
109		122
110	typedef struct {	123	typedef struct {
…		…
258	}	271	}
259	}	272	}
260	}	273	}
261		274
262	static void	275	static void
263	music_finished ()	276	music_finished (void)
264	{	277	{
265	SDL_UserEvent ev;	278	SDL_UserEvent ev;
266		279
267	ev.type = SDL_USEREVENT;	280	ev.type = SDL_USEREVENT;
268	ev.code = 0;	281	ev.code = 0;
269	ev.data1 = 0;	282	ev.data1 = 0;
		283	ev.data2 = 0;
		284
		285	SDL_PushEvent ((SDL_Event *)&ev);
		286	}
		287
		288	static void
		289	channel_finished (int channel)
		290	{
		291	SDL_UserEvent ev;
		292
		293	ev.type = SDL_USEREVENT;
		294	ev.code = 1;
		295	ev.data1 = (void *)(long)channel;
270	ev.data2 = 0;	296	ev.data2 = 0;
271		297
272	SDL_PushEvent ((SDL_Event *)&ev);	298	SDL_PushEvent ((SDL_Event *)&ev);
273	}	299	}
274		300
…		…
385	# undef const_iv	411	# undef const_iv
386	};	412	};
387		413
388	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
389	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		416	}
390		417
		418	void
		419	pango_init ()
		420	CODE:
		421	{
		422	// delayed, so it can pick up new fonts added by AddFontResourceEx
391	fontmap = pango_ft2_font_map_new ();	423	ft2_fontmap = pango_ft2_font_map_new ();
392	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);	424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
393	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);	425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
		426
		427	cairo_fontmap = pango_cairo_font_map_get_default ();
		428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
394	}	429	}
395		430
396	int	431	int
397	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
398		433
…		…
406	SDL_Rect **m;	441	SDL_Rect **m;
407		442
408	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	443	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
409	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
410	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
411	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 16);
		447
		448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 64);
		449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
412		450
413	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
414	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
415	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
416	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
417		455
418	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	456	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		457
422	SDL_EnableUNICODE (1);	458	SDL_EnableUNICODE (1);
423	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
424		460
425	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	461	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
457		493
458	while (SDL_PollEvent (&ev))	494	while (SDL_PollEvent (&ev))
459	{	495	{
460	HV *hv = newHV ();	496	HV *hv = newHV ();
461	hv_store (hv, "type", 4, newSViv (ev.type), 0);	497	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		498
462	switch (ev.type)	499	switch (ev.type)
463	{	500	{
464	case SDL_KEYDOWN:	501	case SDL_KEYDOWN:
465	case SDL_KEYUP:	502	case SDL_KEYUP:
466	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	503	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
486	case SDL_MOUSEBUTTONUP:	523	case SDL_MOUSEBUTTONUP:
487	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	524	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
488	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	525	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
489	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	526	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
490	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	527	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		528	break;
		529
		530	case SDL_USEREVENT:
		531	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		532	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		533	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		534	break;
491	}	535	}
492		536
493	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	537	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
494	}	538	}
495	}	539	}
496		540
497	int	541	int
498	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	542	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
499	POSTCALL:	543	POSTCALL:
500	Mix_HookMusicFinished (music_finished);	544	Mix_HookMusicFinished (music_finished);
		545	Mix_ChannelFinished (channel_finished);
501		546
502	void	547	void
503	Mix_CloseAudio ()	548	Mix_CloseAudio ()
504		549
505	int	550	int
…		…
528		573
529	void	574	void
530	add_font (char *file)	575	add_font (char *file)
531	CODE:	576	CODE:
532	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	577	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
		578	#ifdef _WIN32
		579	// cairo... sigh... requires win2000
		580	AddFontResourceEx (file, FR_PRIVATE, 0);
		581	#endif
533		582
534	void	583	void
535	load_image_inline (SV *image_)	584	load_image_inline (SV *image_)
536	ALIAS:	585	ALIAS:
537	load_image_file = 1	586	load_image_file = 1
…		…
619	PUSHs (sv_2mortal (newSViv (b / y)));	668	PUSHs (sv_2mortal (newSViv (b / y)));
620	PUSHs (sv_2mortal (newSViv (a / y)));	669	PUSHs (sv_2mortal (newSViv (a / y)));
621	}	670	}
622		671
623	void	672	void
		673	error (char *message)
		674	CODE:
		675	fprintf (stderr, "ERROR: %s\n", message);
		676	#ifdef _WIN32
		677	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
		678	#endif
		679
		680	void
624	fatal (char *message)	681	fatal (char *message)
625	CODE:	682	CODE:
		683	fprintf (stderr, "FATAL: %s\n", message);
626	#ifdef _WIN32	684	#ifdef _WIN32
627	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	685	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
628	#else
629	fprintf (stderr, "FATAL: %s\n", message);
630	#endif	686	#endif
631	exit (1);	687	exit (1);
632		688
633	MODULE = CFClient PACKAGE = CFClient::Font	689	MODULE = CFClient PACKAGE = CFClient::Font
634		690
635	CFClient::Font	691	CFClient::Font
636	new_from_file (SV class, char path)	692	new_from_file (SV class, char path, int id = 0)
637	CODE:	693	CODE:
638	{	694	{
639	int count;	695	int count;
640	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, 0, 0, &count);	696	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
641	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	697	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
642	FcPatternDestroy (pattern);	698	FcPatternDestroy (pattern);
643	}	699	}
644	OUTPUT:	700	OUTPUT:
645	RETVAL	701	RETVAL
…		…
655	default_font = self;	711	default_font = self;
656		712
657	MODULE = CFClient PACKAGE = CFClient::Layout	713	MODULE = CFClient PACKAGE = CFClient::Layout
658		714
659	CFClient::Layout	715	CFClient::Layout
660	new (SV *class, int base_height = MIN_FONT_HEIGHT)	716	new (SV *class, int rgba = 0)
661	CODE:	717	CODE:
662	New (0, RETVAL, 1, struct cf_layout);	718	New (0, RETVAL, 1, struct cf_layout);
663	RETVAL->pl = pango_layout_new (context);	719
664	RETVAL->base_height = base_height;	720	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
		721	RETVAL->rgba = rgba;
		722	RETVAL->r = 1.;
		723	RETVAL->g = 1.;
		724	RETVAL->b = 1.;
		725	RETVAL->a = 1.;
		726	RETVAL->base_height = MIN_FONT_HEIGHT;
665	RETVAL->font = 0;	727	RETVAL->font = 0;
		728
666	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	729	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
667	pango_layout_set_font_description (RETVAL->pl, default_font);	730	layout_update_font (RETVAL);
668	OUTPUT:	731	OUTPUT:
669	RETVAL	732	RETVAL
670		733
671	void	734	void
672	DESTROY (CFClient::Layout self)	735	DESTROY (CFClient::Layout self)
673	CODE:	736	CODE:
674	g_object_unref (self->pl);	737	g_object_unref (self->pl);
675	Safefree (self);	738	Safefree (self);
676		739
		740	int
		741	is_rgba (CFClient::Layout self)
		742	CODE:
		743	RETVAL = self->rgba;
		744	OUTPUT:
		745	RETVAL
		746
677	void	747	void
678	set_text (CFClient::Layout self, SV *text_)	748	set_text (CFClient::Layout self, SV *text_)
679	CODE:	749	CODE:
680	{	750	{
681	STRLEN textlen;	751	STRLEN textlen;
…		…
699	CODE:	769	CODE:
700	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	770	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
701	SvUTF8_on (RETVAL);	771	SvUTF8_on (RETVAL);
702	OUTPUT:	772	OUTPUT:
703	RETVAL	773	RETVAL
		774
		775	void
		776	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
		777	CODE:
		778	self->r = r;
		779	self->g = g;
		780	self->b = b;
		781	self->a = a;
704		782
705	void	783	void
706	set_font (CFClient::Layout self, CFClient::Font font = 0)	784	set_font (CFClient::Layout self, CFClient::Font font = 0)
707	CODE:	785	CODE:
708	if (self->font != font)	786	if (self->font != font)
…		…
724	set_width (CFClient::Layout self, int max_width = -1)	802	set_width (CFClient::Layout self, int max_width = -1)
725	CODE:	803	CODE:
726	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	804	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
727		805
728	void	806	void
		807	set_indent (CFClient::Layout self, int indent)
		808	CODE:
		809	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		810
		811	void
		812	set_spacing (CFClient::Layout self, int spacing)
		813	CODE:
		814	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		815
		816	void
		817	set_ellipsise (CFClient::Layout self, int ellipsise)
		818	CODE:
		819	pango_layout_set_ellipsize (self->pl,
		820	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		821	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		822	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		823	: PANGO_ELLIPSIZE_NONE
		824	);
		825
		826	void
		827	set_single_paragraph_mode (CFClient::Layout self, int spm)
		828	CODE:
		829	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		830
		831	void
729	size (CFClient::Layout self)	832	size (CFClient::Layout self)
730	PPCODE:	833	PPCODE:
731	{	834	{
732	int w, h;	835	int w, h;
733		836
…		…
766	render (CFClient::Layout self)	869	render (CFClient::Layout self)
767	PPCODE:	870	PPCODE:
768	{	871	{
769	SV *retval;	872	SV *retval;
770	int w, h;	873	int w, h;
771	FT_Bitmap bitmap;
772		874
773	layout_get_pixel_size (self, &w, &h);	875	layout_get_pixel_size (self, &w, &h);
774		876
		877	if (self->rgba)
		878	{
		879	cairo_surface_t *surface;
		880	cairo_t *cairo;
		881
		882	retval = newSV (w * h * 4);
		883	SvPOK_only (retval);
		884	SvCUR_set (retval, w * h * 4);
		885
		886	memset (SvPVX (retval), 0, w * h * 4);
		887
		888	surface = cairo_image_surface_create_for_data (
		889	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		890	cairo = cairo_create (surface);
		891	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		892
		893	pango_cairo_show_layout (cairo, self->pl);
		894
		895	cairo_destroy (cairo);
		896	cairo_surface_destroy (surface);
		897
		898	// what a mess, and its premultiplied, too :(
		899	{
		900	uint32_t p = (uint32_t )SvPVX (retval);
		901	uint32_t e = p + w h;
		902
		903	while (p < e)
		904	{
		905	uint32_t rgba = *p;
		906	rgba = (rgba >> 24) \| (rgba << 8);
		907	rgba = SDL_SwapBE32 (rgba);
		908	*p++ = rgba;
		909	}
		910	}
		911
		912	EXTEND (SP, 5);
		913	PUSHs (sv_2mortal (newSViv (w)));
		914	PUSHs (sv_2mortal (newSViv (h)));
		915	PUSHs (sv_2mortal (retval));
		916	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		917	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		918	}
		919	else
		920	{
		921	FT_Bitmap bitmap;
		922
775	retval = newSV (w * h);	923	retval = newSV (w * h);
776	SvPOK_only (retval);	924	SvPOK_only (retval);
777	SvCUR_set (retval, w * h);	925	SvCUR_set (retval, w * h);
778		926
779	bitmap.rows = h;	927	bitmap.rows = h;
780	bitmap.width = w;	928	bitmap.width = w;
781	bitmap.pitch = w;	929	bitmap.pitch = w;
782	bitmap.buffer = (unsigned char*)SvPVX (retval);	930	bitmap.buffer = (unsigned char*)SvPVX (retval);
783	bitmap.num_grays = 256;	931	bitmap.num_grays = 256;
784	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	932	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
785		933
786	memset (bitmap.buffer, 0, w * h);	934	memset (bitmap.buffer, 0, w * h);
787		935
788	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	936	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
789		937
790	EXTEND (SP, 3);	938	EXTEND (SP, 5);
791	PUSHs (sv_2mortal (newSViv (w)));	939	PUSHs (sv_2mortal (newSViv (w)));
792	PUSHs (sv_2mortal (newSViv (h)));	940	PUSHs (sv_2mortal (newSViv (h)));
793	PUSHs (sv_2mortal (retval));	941	PUSHs (sv_2mortal (retval));
		942	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		943	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		944	}
794	}	945	}
795		946
796	MODULE = CFClient PACKAGE = CFClient::Texture	947	MODULE = CFClient PACKAGE = CFClient::Texture
797		948
798	void	949	void
799	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	950	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
800	PROTOTYPE: $$$;$$	951	PROTOTYPE: $$$;$$
		952	ALIAS:
		953	draw_quad_alpha = 1
		954	draw_quad_alpha_premultiplied = 2
801	CODE:	955	CODE:
802	{	956	{
803	HV hv = (HV )SvRV (self);	957	HV hv = (HV )SvRV (self);
804	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	958	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
805	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	959	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
810	{	964	{
811	w = SvNV (*hv_fetch (hv, "w", 1, 1));	965	w = SvNV (*hv_fetch (hv, "w", 1, 1));
812	h = SvNV (*hv_fetch (hv, "h", 1, 1));	966	h = SvNV (*hv_fetch (hv, "h", 1, 1));
813	}	967	}
814		968
		969	if (ix)
		970	{
		971	glEnable (GL_BLEND);
		972	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		973	glEnable (GL_ALPHA_TEST);
		974	glAlphaFunc (GL_GREATER, 0.01f);
		975	}
		976
815	glBindTexture (GL_TEXTURE_2D, name);	977	glBindTexture (GL_TEXTURE_2D, name);
		978
816	if (wrap_mode) {	979	if (wrap_mode)
		980	{
817	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	981	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
818	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	982	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
819	}	983	}
		984
820	glBegin (GL_QUADS);	985	glBegin (GL_QUADS);
821	glTexCoord2f (0, 0); glVertex2f (x , y );	986	glTexCoord2f (0, 0); glVertex2f (x , y );
822	glTexCoord2f (0, t); glVertex2f (x , y + h);	987	glTexCoord2f (0, t); glVertex2f (x , y + h);
823	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	988	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
824	glTexCoord2f (s, 0); glVertex2f (x + w, y );	989	glTexCoord2f (s, 0); glVertex2f (x + w, y );
825	glEnd ();	990	glEnd ();
		991
		992	if (ix)
		993	{
		994	glDisable (GL_ALPHA_TEST);
		995	glDisable (GL_BLEND);
		996	}
826	}	997	}
827		998
828	MODULE = CFClient PACKAGE = CFClient::Map	999	MODULE = CFClient PACKAGE = CFClient::Map
829		1000
830	CFClient::Map	1001	CFClient::Map
…		…
1339	} *civ, const_iv[] = {	1510	} *civ, const_iv[] = {
1340	# define const_iv(name) { # name, (IV)name }	1511	# define const_iv(name) { # name, (IV)name }
1341	const_iv (GL_COLOR_MATERIAL),	1512	const_iv (GL_COLOR_MATERIAL),
1342	const_iv (GL_SMOOTH),	1513	const_iv (GL_SMOOTH),
1343	const_iv (GL_FLAT),	1514	const_iv (GL_FLAT),
		1515	const_iv (GL_DITHER),
1344	const_iv (GL_BLEND),	1516	const_iv (GL_BLEND),
		1517	const_iv (GL_SCISSOR_TEST),
1345	const_iv (GL_AND),	1518	const_iv (GL_AND),
		1519	const_iv (GL_ONE),
		1520	const_iv (GL_ZERO),
1346	const_iv (GL_SRC_ALPHA),	1521	const_iv (GL_SRC_ALPHA),
		1522	const_iv (GL_SRC_ALPHA_SATURATE),
1347	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1523	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1524	const_iv (GL_ONE_MINUS_DST_ALPHA),
1348	const_iv (GL_RGB),	1525	const_iv (GL_RGB),
1349	const_iv (GL_RGBA),	1526	const_iv (GL_RGBA),
1350	const_iv (GL_UNSIGNED_BYTE),	1527	const_iv (GL_UNSIGNED_BYTE),
1351	const_iv (GL_ALPHA),	1528	const_iv (GL_ALPHA),
		1529	const_iv (GL_INTENSITY),
		1530	const_iv (GL_LUMINANCE),
		1531	const_iv (GL_LUMINANCE_ALPHA),
1352	const_iv (GL_FLOAT),	1532	const_iv (GL_FLOAT),
1353	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1533	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1354	const_iv (GL_COMPILE),	1534	const_iv (GL_COMPILE),
1355	const_iv (GL_TEXTURE_1D),	1535	const_iv (GL_TEXTURE_1D),
1356	const_iv (GL_TEXTURE_2D),	1536	const_iv (GL_TEXTURE_2D),
…		…
1367	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1547	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1368	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1548	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1369	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1549	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1370	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1550	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1371	const_iv (GL_GENERATE_MIPMAP),	1551	const_iv (GL_GENERATE_MIPMAP),
1372	const_iv (GL_LINEAR),
1373	const_iv (GL_MODULATE),	1552	const_iv (GL_MODULATE),
		1553	const_iv (GL_DECAL),
1374	const_iv (GL_REPLACE),	1554	const_iv (GL_REPLACE),
1375	const_iv (GL_COLOR_BUFFER_BIT),	1555	const_iv (GL_COLOR_BUFFER_BIT),
1376	const_iv (GL_PROJECTION),	1556	const_iv (GL_PROJECTION),
1377	const_iv (GL_MODELVIEW),	1557	const_iv (GL_MODELVIEW),
1378	const_iv (GL_COLOR_LOGIC_OP),	1558	const_iv (GL_COLOR_LOGIC_OP),
		1559	const_iv (GL_SEPARABLE_2D),
1379	const_iv (GL_CONVOLUTION_2D),	1560	const_iv (GL_CONVOLUTION_2D),
1380	const_iv (GL_CONVOLUTION_BORDER_MODE),	1561	const_iv (GL_CONVOLUTION_BORDER_MODE),
1381	const_iv (GL_CONSTANT_BORDER),	1562	const_iv (GL_CONSTANT_BORDER),
1382	const_iv (GL_LINES),	1563	const_iv (GL_LINES),
1383	const_iv (GL_QUADS),	1564	const_iv (GL_QUADS),
…		…
1408		1589
1409	void glBlendFunc (int sfactor, int dfactor)	1590	void glBlendFunc (int sfactor, int dfactor)
1410		1591
1411	void glLogicOp (int opcode)	1592	void glLogicOp (int opcode)
1412		1593
		1594	void glColorMask (int red, int green, int blue, int alpha)
		1595
1413	void glMatrixMode (int mode)	1596	void glMatrixMode (int mode)
1414		1597
1415	void glPushMatrix ()	1598	void glPushMatrix ()
1416		1599
1417	void glPopMatrix ()	1600	void glPopMatrix ()
…		…
1420		1603
1421	# near and far are due to microsofts buggy c compiler	1604	# near and far are due to microsofts buggy c compiler
1422	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1605	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1423		1606
1424	void glViewport (int x, int y, int width, int height)	1607	void glViewport (int x, int y, int width, int height)
		1608
		1609	void glScissor (int x, int y, int width, int height)
1425		1610
1426	void glTranslate (float x, float y, float z = 0.)	1611	void glTranslate (float x, float y, float z = 0.)
1427	CODE:	1612	CODE:
1428	glTranslatef (x, y, z);	1613	glTranslatef (x, y, z);
1429		1614
…		…
1440	void glEnd ()	1625	void glEnd ()
1441		1626
1442	void glColor (float r, float g, float b, float a = 1.0)	1627	void glColor (float r, float g, float b, float a = 1.0)
1443	PROTOTYPE: @	1628	PROTOTYPE: @
1444	CODE:	1629	CODE:
1445	glColor4f (r, g, b, a);	1630	glColor4ub (MIN ((int)(r * 255.f), 255),
		1631	MIN ((int)(g * 255.f), 255),
		1632	MIN ((int)(b * 255.f), 255),
		1633	MIN ((int)(a * 255.f), 255));
1446		1634
1447	void glVertex (float x, float y, float z = 0.)	1635	void glVertex (float x, float y, float z = 0.)
1448	CODE:	1636	CODE:
1449	glVertex3f (x, y, z);	1637	glVertex3f (x, y, z);
1450		1638
…		…
1469	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1657	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1470	CODE:	1658	CODE:
1471	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1659	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1472	(target, internalformat, width, height, format, type, data));	1660	(target, internalformat, width, height, format, type, data));
1473		1661
		1662	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		1663	CODE:
		1664	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
		1665	(target, internalformat, width, height, format, type, row, column));
		1666
1474	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1667	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1475		1668
1476	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1669	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1670
		1671	void glRasterPos (int x, int y)
		1672	CODE:
		1673	glRasterPos2i (x, y);
		1674
		1675	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1477		1676
1478	int glGenTexture ()	1677	int glGenTexture ()
1479	CODE:	1678	CODE:
1480	{	1679	{
1481	GLuint name;	1680	GLuint name;

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.65 by root, Mon Apr 24 08:22:21 2006 UTC vs. Revision 1.86 by root, Fri May 19 16:43:56 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.65 by root, Mon Apr 24 08:22:21 2006 UTC vs.
Revision 1.86 by root, Fri May 19 16:43:56 2006 UTC