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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.61 by root, Sun Apr 23 21:47:30 2006 UTC vs.
Revision 1.89 by root, Sun May 21 00:02: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>
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>
40	#define FOW_DARKNESS 32	46	#define FOW_DARKNESS 32
41		47
42	#define MAP_EXTEND_X 32	48	#define MAP_EXTEND_X 32
43	#define MAP_EXTEND_Y 512	49	#define MAP_EXTEND_Y 512
44		50
45	#define MIN_FONT_HEIGHT 8	51	#define MIN_FONT_HEIGHT 10
		52
		53	#define GL_CALL(type,func,args) \
		54	{ \
		55	static int init_; \
		56	static type fptr_; \
		57	\
		58	if (!init_) \
		59	{ \
		60	init_ = 1; \
		61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
		62	} \
		63	\
		64	if (fptr_) \
		65	fptr_ args; \
		66	}
46		67
47	typedef Mix_Chunk *CFClient__MixChunk;	68	typedef Mix_Chunk *CFClient__MixChunk;
48	typedef Mix_Music *CFClient__MixMusic;	69	typedef Mix_Music *CFClient__MixMusic;
49		70
50	typedef PangoFontDescription *CFClient__Font;	71	typedef PangoFontDescription *CFClient__Font;
51		72
52	typedef struct cf_layout {	73	typedef struct cf_layout {
53	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
54	int base_height;	77	int base_height;
55	CFClient__Font font;	78	CFClient__Font font;
56	} *CFClient__Layout;	79	} *CFClient__Layout;
57		80
58	static CFClient__Font default_font;	81	static CFClient__Font default_font;
59	static PangoContext *context;	82	static PangoContext ft2_context, cairo_context;
60	static PangoFontMap *fontmap;	83	static PangoFontMap ft2_fontmap, cairo_fontmap;
61		84
62	static void	85	static void
63	substitute_func (FcPattern *pattern, gpointer data)	86	substitute_func (FcPattern *pattern, gpointer data)
64	{	87	{
65	FcPatternAddBool (pattern, FC_HINTING , 1);	88	FcPatternAddBool (pattern, FC_HINTING , 1);
		89	#ifdef _WIN32
		90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
		91	#else
66	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
		93	#endif
67	}	94	}
68		95
69	static void	96	static void
70	layout_update_font (CFClient__Layout self)	97	layout_update_font (CFClient__Layout self)
71	{	98	{
…		…
83	static void	110	static void
84	layout_get_pixel_size (CFClient__Layout self, int w, int h)	111	layout_get_pixel_size (CFClient__Layout self, int w, int h)
85	{	112	{
86	pango_layout_get_pixel_size (self->pl, w, h);	113	pango_layout_get_pixel_size (self->pl, w, h);
87		114
88	w = (w + 3) & ~3;
89	if (!w) w = 1;	115	if (!w) w = 1;
90	if (!h) h = 1;	116	if (!h) h = 1;
		117
		118	w = (w + 3) & ~3;
91	}	119	}
92		120
93	typedef uint16_t mapface;	121	typedef uint16_t mapface;
94		122
95	typedef struct {	123	typedef struct {
…		…
243	}	271	}
244	}	272	}
245	}	273	}
246		274
247	static void	275	static void
248	music_finished ()	276	music_finished (void)
249	{	277	{
250	SDL_UserEvent ev;	278	SDL_UserEvent ev;
251		279
252	ev.type = SDL_USEREVENT;	280	ev.type = SDL_USEREVENT;
253	ev.code = 0;	281	ev.code = 0;
254	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;
255	ev.data2 = 0;	296	ev.data2 = 0;
256		297
257	SDL_PushEvent ((SDL_Event *)&ev);	298	SDL_PushEvent ((SDL_Event *)&ev);
258	}	299	}
259		300
…		…
370	# undef const_iv	411	# undef const_iv
371	};	412	};
372		413
373	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; )
374	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		416	}
375		417
		418	void
		419	pango_init ()
		420	CODE:
		421	{
		422	// delayed, so it can pick up new fonts added by AddFontResourceEx
376	fontmap = pango_ft2_font_map_new ();	423	ft2_fontmap = pango_ft2_font_map_new ();
377	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);
378	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);
379	}	429	}
380		430
381	int	431	int
382	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
383		433
…		…
393	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	443	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
394	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
395	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
396	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
397		447
		448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
		450
398	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
399	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
400	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
401	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
402		455
403	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
404	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
405	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
406		457
407	SDL_EnableUNICODE (1);	458	SDL_EnableUNICODE (1);
408	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
409		460
410	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	461	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
419		470
420	++m;	471	++m;
421	}	472	}
422	}	473	}
423		474
		475	char *
		476	SDL_GetError ()
		477
424	int	478	int
425	SDL_SetVideoMode (int w, int h, int fullscreen)	479	SDL_SetVideoMode (int w, int h, int fullscreen)
426	CODE:	480	CODE:
427	RETVAL = !!SDL_SetVideoMode (	481	RETVAL = !!SDL_SetVideoMode (
428	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
…		…
442		496
443	while (SDL_PollEvent (&ev))	497	while (SDL_PollEvent (&ev))
444	{	498	{
445	HV *hv = newHV ();	499	HV *hv = newHV ();
446	hv_store (hv, "type", 4, newSViv (ev.type), 0);	500	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		501
447	switch (ev.type)	502	switch (ev.type)
448	{	503	{
449	case SDL_KEYDOWN:	504	case SDL_KEYDOWN:
450	case SDL_KEYUP:	505	case SDL_KEYUP:
451	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	506	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
471	case SDL_MOUSEBUTTONUP:	526	case SDL_MOUSEBUTTONUP:
472	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	527	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
473	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	528	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
474	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	529	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
475	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	530	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		531	break;
		532
		533	case SDL_USEREVENT:
		534	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		535	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		536	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		537	break;
476	}	538	}
477		539
478	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	540	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
479	}	541	}
480	}	542	}
481		543
482	int	544	int
483	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	545	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
484	POSTCALL:	546	POSTCALL:
485	Mix_HookMusicFinished (music_finished);	547	Mix_HookMusicFinished (music_finished);
		548	Mix_ChannelFinished (channel_finished);
486		549
487	void	550	void
488	Mix_CloseAudio ()	551	Mix_CloseAudio ()
489		552
490	int	553	int
…		…
513		576
514	void	577	void
515	add_font (char *file)	578	add_font (char *file)
516	CODE:	579	CODE:
517	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	580	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
		581	#ifdef _WIN32
		582	// cairo... sigh... requires win2000
		583	AddFontResourceEx (file, FR_PRIVATE, 0);
		584	#endif
518		585
519	void	586	void
520	load_image_inline (SV *image_)	587	load_image_inline (SV *image_)
521	ALIAS:	588	ALIAS:
522	load_image_file = 1	589	load_image_file = 1
…		…
604	PUSHs (sv_2mortal (newSViv (b / y)));	671	PUSHs (sv_2mortal (newSViv (b / y)));
605	PUSHs (sv_2mortal (newSViv (a / y)));	672	PUSHs (sv_2mortal (newSViv (a / y)));
606	}	673	}
607		674
608	void	675	void
		676	error (char *message)
		677	CODE:
		678	fprintf (stderr, "ERROR: %s\n", message);
		679	#ifdef _WIN32
		680	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
		681	#endif
		682
		683	void
609	fatal (char *message)	684	fatal (char *message)
610	CODE:	685	CODE:
		686	fprintf (stderr, "FATAL: %s\n", message);
611	#ifdef _WIN32	687	#ifdef _WIN32
612	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	688	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
613	#else
614	fprintf (stderr, "FATAL: %s\n", message);
615	#endif	689	#endif
616	exit (1);	690	exit (1);
617		691
618	MODULE = CFClient PACKAGE = CFClient::Font	692	MODULE = CFClient PACKAGE = CFClient::Font
619		693
620	CFClient::Font	694	CFClient::Font
621	new_from_file (SV class, char path)	695	new_from_file (SV class, char path, int id = 0)
622	CODE:	696	CODE:
623	{	697	{
624	int count;	698	int count;
625	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, 0, 0, &count);	699	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
626	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	700	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
627	FcPatternDestroy (pattern);	701	FcPatternDestroy (pattern);
628	}	702	}
629	OUTPUT:	703	OUTPUT:
630	RETVAL	704	RETVAL
…		…
640	default_font = self;	714	default_font = self;
641		715
642	MODULE = CFClient PACKAGE = CFClient::Layout	716	MODULE = CFClient PACKAGE = CFClient::Layout
643		717
644	CFClient::Layout	718	CFClient::Layout
645	new (SV *class, int base_height = MIN_FONT_HEIGHT)	719	new (SV *class, int rgba = 0)
646	CODE:	720	CODE:
		721	#if _WIN32
		722	rgba = 0;//D
		723	#endif
647	New (0, RETVAL, 1, struct cf_layout);	724	New (0, RETVAL, 1, struct cf_layout);
648	RETVAL->pl = pango_layout_new (context);	725
649	RETVAL->base_height = base_height;	726	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
		727	RETVAL->rgba = rgba;
		728	RETVAL->r = 1.;
		729	RETVAL->g = 1.;
		730	RETVAL->b = 1.;
		731	RETVAL->a = 1.;
		732	RETVAL->base_height = MIN_FONT_HEIGHT;
650	RETVAL->font = 0;	733	RETVAL->font = 0;
		734
651	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	735	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
652	pango_layout_set_font_description (RETVAL->pl, default_font);	736	layout_update_font (RETVAL);
653	OUTPUT:	737	OUTPUT:
654	RETVAL	738	RETVAL
655		739
656	void	740	void
657	DESTROY (CFClient::Layout self)	741	DESTROY (CFClient::Layout self)
658	CODE:	742	CODE:
659	g_object_unref (self->pl);	743	g_object_unref (self->pl);
660	Safefree (self);	744	Safefree (self);
661		745
		746	int
		747	is_rgba (CFClient::Layout self)
		748	CODE:
		749	RETVAL = self->rgba;
		750	OUTPUT:
		751	RETVAL
		752
662	void	753	void
663	set_text (CFClient::Layout self, SV *text_)	754	set_text (CFClient::Layout self, SV *text_)
664	CODE:	755	CODE:
665	{	756	{
666	STRLEN textlen;	757	STRLEN textlen;
…		…
684	CODE:	775	CODE:
685	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	776	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
686	SvUTF8_on (RETVAL);	777	SvUTF8_on (RETVAL);
687	OUTPUT:	778	OUTPUT:
688	RETVAL	779	RETVAL
		780
		781	void
		782	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
		783	CODE:
		784	self->r = r;
		785	self->g = g;
		786	self->b = b;
		787	self->a = a;
689		788
690	void	789	void
691	set_font (CFClient::Layout self, CFClient::Font font = 0)	790	set_font (CFClient::Layout self, CFClient::Font font = 0)
692	CODE:	791	CODE:
693	if (self->font != font)	792	if (self->font != font)
…		…
709	set_width (CFClient::Layout self, int max_width = -1)	808	set_width (CFClient::Layout self, int max_width = -1)
710	CODE:	809	CODE:
711	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	810	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
712		811
713	void	812	void
		813	set_indent (CFClient::Layout self, int indent)
		814	CODE:
		815	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		816
		817	void
		818	set_spacing (CFClient::Layout self, int spacing)
		819	CODE:
		820	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		821
		822	void
		823	set_ellipsise (CFClient::Layout self, int ellipsise)
		824	CODE:
		825	pango_layout_set_ellipsize (self->pl,
		826	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		827	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		828	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		829	: PANGO_ELLIPSIZE_NONE
		830	);
		831
		832	void
		833	set_single_paragraph_mode (CFClient::Layout self, int spm)
		834	CODE:
		835	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		836
		837	void
714	size (CFClient::Layout self)	838	size (CFClient::Layout self)
715	PPCODE:	839	PPCODE:
716	{	840	{
717	int w, h;	841	int w, h;
718		842
…		…
751	render (CFClient::Layout self)	875	render (CFClient::Layout self)
752	PPCODE:	876	PPCODE:
753	{	877	{
754	SV *retval;	878	SV *retval;
755	int w, h;	879	int w, h;
756	FT_Bitmap bitmap;
757		880
758	layout_get_pixel_size (self, &w, &h);	881	layout_get_pixel_size (self, &w, &h);
759		882
		883	if (self->rgba)
		884	{
		885	cairo_surface_t *surface;
		886	cairo_t *cairo;
		887
		888	retval = newSV (w * h * 4);
		889	SvPOK_only (retval);
		890	SvCUR_set (retval, w * h * 4);
		891
		892	memset (SvPVX (retval), 0, w * h * 4);
		893
		894	surface = cairo_image_surface_create_for_data (
		895	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		896	cairo = cairo_create (surface);
		897	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		898
		899	pango_cairo_show_layout (cairo, self->pl);
		900
		901	cairo_destroy (cairo);
		902	cairo_surface_destroy (surface);
		903
		904	// what a mess, and its premultiplied, too :(
		905	{
		906	uint32_t p = (uint32_t )SvPVX (retval);
		907	uint32_t e = p + w h;
		908
		909	while (p < e)
		910	{
		911	uint32_t rgba = *p;
		912	rgba = (rgba >> 24) \| (rgba << 8);
		913	#if 0
		914	#ifdef _WIN32
		915	{//D
		916	uint8_t r = rgba >> 24;
		917	uint8_t g = rgba >> 16;
		918	uint8_t b = rgba >> 8;
		919	uint8_t a = rgba >> 0;
		920
		921	rgba = (rgba & 0xffffff00) \| a;
		922	}
		923	#endif
		924	#endif
		925	rgba = SDL_SwapBE32 (rgba);
		926	*p++ = rgba;
		927	}
		928	}
		929
		930	EXTEND (SP, 5);
		931	PUSHs (sv_2mortal (newSViv (w)));
		932	PUSHs (sv_2mortal (newSViv (h)));
		933	PUSHs (sv_2mortal (retval));
		934	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		935	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		936	}
		937	else
		938	{
		939	FT_Bitmap bitmap;
		940
760	retval = newSV (w * h);	941	retval = newSV (w * h);
761	SvPOK_only (retval);	942	SvPOK_only (retval);
762	SvCUR_set (retval, w * h);	943	SvCUR_set (retval, w * h);
763		944
764	bitmap.rows = h;	945	bitmap.rows = h;
765	bitmap.width = w;	946	bitmap.width = w;
766	bitmap.pitch = w;	947	bitmap.pitch = w;
767	bitmap.buffer = (unsigned char*)SvPVX (retval);	948	bitmap.buffer = (unsigned char*)SvPVX (retval);
768	bitmap.num_grays = 256;	949	bitmap.num_grays = 256;
769	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	950	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
770		951
771	memset (bitmap.buffer, 0, w * h);	952	memset (bitmap.buffer, 0, w * h);
772		953
773	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	954	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
774		955
775	EXTEND (SP, 3);	956	EXTEND (SP, 5);
776	PUSHs (sv_2mortal (newSViv (w)));	957	PUSHs (sv_2mortal (newSViv (w)));
777	PUSHs (sv_2mortal (newSViv (h)));	958	PUSHs (sv_2mortal (newSViv (h)));
778	PUSHs (sv_2mortal (retval));	959	PUSHs (sv_2mortal (retval));
		960	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		961	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		962	}
779	}	963	}
780		964
781	MODULE = CFClient PACKAGE = CFClient::Texture	965	MODULE = CFClient PACKAGE = CFClient::Texture
782		966
783	void	967	void
784	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	968	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
785	PROTOTYPE: $$$;$$	969	PROTOTYPE: $$$;$$
		970	ALIAS:
		971	draw_quad_alpha = 1
		972	draw_quad_alpha_premultiplied = 2
786	CODE:	973	CODE:
787	{	974	{
788	HV hv = (HV )SvRV (self);	975	HV hv = (HV )SvRV (self);
789	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	976	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
790	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	977	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
795	{	982	{
796	w = SvNV (*hv_fetch (hv, "w", 1, 1));	983	w = SvNV (*hv_fetch (hv, "w", 1, 1));
797	h = SvNV (*hv_fetch (hv, "h", 1, 1));	984	h = SvNV (*hv_fetch (hv, "h", 1, 1));
798	}	985	}
799		986
		987	if (ix)
		988	{
		989	glEnable (GL_BLEND);
		990	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		991	glEnable (GL_ALPHA_TEST);
		992	glAlphaFunc (GL_GREATER, 0.01f);
		993	}
		994
800	glBindTexture (GL_TEXTURE_2D, name);	995	glBindTexture (GL_TEXTURE_2D, name);
		996
801	if (wrap_mode) {	997	if (wrap_mode)
		998	{
802	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	999	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
803	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	1000	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
804	}	1001	}
		1002
805	glBegin (GL_QUADS);	1003	glBegin (GL_QUADS);
806	glTexCoord2f (0, 0); glVertex2f (x , y );	1004	glTexCoord2f (0, 0); glVertex2f (x , y );
807	glTexCoord2f (0, t); glVertex2f (x , y + h);	1005	glTexCoord2f (0, t); glVertex2f (x , y + h);
808	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1006	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
809	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1007	glTexCoord2f (s, 0); glVertex2f (x + w, y );
810	glEnd ();	1008	glEnd ();
		1009
		1010	if (ix)
		1011	{
		1012	glDisable (GL_ALPHA_TEST);
		1013	glDisable (GL_BLEND);
		1014	}
811	}	1015	}
812		1016
813	MODULE = CFClient PACKAGE = CFClient::Map	1017	MODULE = CFClient PACKAGE = CFClient::Map
814		1018
815	CFClient::Map	1019	CFClient::Map
…		…
1324	} *civ, const_iv[] = {	1528	} *civ, const_iv[] = {
1325	# define const_iv(name) { # name, (IV)name }	1529	# define const_iv(name) { # name, (IV)name }
1326	const_iv (GL_COLOR_MATERIAL),	1530	const_iv (GL_COLOR_MATERIAL),
1327	const_iv (GL_SMOOTH),	1531	const_iv (GL_SMOOTH),
1328	const_iv (GL_FLAT),	1532	const_iv (GL_FLAT),
		1533	const_iv (GL_DITHER),
1329	const_iv (GL_BLEND),	1534	const_iv (GL_BLEND),
		1535	const_iv (GL_CULL_FACE),
		1536	const_iv (GL_SCISSOR_TEST),
		1537	const_iv (GL_DEPTH_TEST),
		1538	const_iv (GL_ALPHA_TEST),
		1539	const_iv (GL_NORMALIZE),
		1540	const_iv (GL_RESCALE_NORMAL),
1330	const_iv (GL_AND),	1541	const_iv (GL_AND),
		1542	const_iv (GL_ONE),
		1543	const_iv (GL_ZERO),
1331	const_iv (GL_SRC_ALPHA),	1544	const_iv (GL_SRC_ALPHA),
		1545	const_iv (GL_SRC_ALPHA_SATURATE),
1332	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1546	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1547	const_iv (GL_ONE_MINUS_DST_ALPHA),
1333	const_iv (GL_RGB),	1548	const_iv (GL_RGB),
1334	const_iv (GL_RGBA),	1549	const_iv (GL_RGBA),
1335	const_iv (GL_UNSIGNED_BYTE),	1550	const_iv (GL_UNSIGNED_BYTE),
1336	const_iv (GL_ALPHA4),	1551	const_iv (GL_UNSIGNED_SHORT),
		1552	const_iv (GL_UNSIGNED_INT),
1337	const_iv (GL_ALPHA),	1553	const_iv (GL_ALPHA),
		1554	const_iv (GL_INTENSITY),
		1555	const_iv (GL_LUMINANCE),
		1556	const_iv (GL_LUMINANCE_ALPHA),
1338	const_iv (GL_FLOAT),	1557	const_iv (GL_FLOAT),
1339	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1558	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1340	const_iv (GL_COMPILE),	1559	const_iv (GL_COMPILE),
1341	const_iv (GL_TEXTURE_1D),	1560	const_iv (GL_TEXTURE_1D),
1342	const_iv (GL_TEXTURE_2D),	1561	const_iv (GL_TEXTURE_2D),
…		…
1353	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1572	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1354	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1573	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1355	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1574	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1356	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1575	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1357	const_iv (GL_GENERATE_MIPMAP),	1576	const_iv (GL_GENERATE_MIPMAP),
1358	const_iv (GL_LINEAR),
1359	const_iv (GL_MODULATE),	1577	const_iv (GL_MODULATE),
		1578	const_iv (GL_DECAL),
1360	const_iv (GL_REPLACE),	1579	const_iv (GL_REPLACE),
		1580	const_iv (GL_DEPTH_BUFFER_BIT),
1361	const_iv (GL_COLOR_BUFFER_BIT),	1581	const_iv (GL_COLOR_BUFFER_BIT),
1362	const_iv (GL_PROJECTION),	1582	const_iv (GL_PROJECTION),
1363	const_iv (GL_MODELVIEW),	1583	const_iv (GL_MODELVIEW),
1364	const_iv (GL_COLOR_LOGIC_OP),	1584	const_iv (GL_COLOR_LOGIC_OP),
		1585	const_iv (GL_SEPARABLE_2D),
1365	const_iv (GL_CONVOLUTION_2D),	1586	const_iv (GL_CONVOLUTION_2D),
1366	const_iv (GL_CONVOLUTION_BORDER_MODE),	1587	const_iv (GL_CONVOLUTION_BORDER_MODE),
1367	const_iv (GL_CONSTANT_BORDER),	1588	const_iv (GL_CONSTANT_BORDER),
1368	const_iv (GL_LINES),	1589	const_iv (GL_LINES),
		1590	const_iv (GL_LINE_LOOP),
1369	const_iv (GL_QUADS),	1591	const_iv (GL_QUADS),
1370	const_iv (GL_LINE_LOOP),	1592	const_iv (GL_QUAD_STRIP),
		1593	const_iv (GL_TRIANGLES),
		1594	const_iv (GL_TRIANGLE_STRIP),
		1595	const_iv (GL_TRIANGLE_FAN),
1371	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1596	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1372	const_iv (GL_FASTEST),	1597	const_iv (GL_FASTEST),
		1598	const_iv (GL_V2F),
		1599	const_iv (GL_V3F),
		1600	const_iv (GL_T2F_V3F),
		1601	const_iv (GL_T2F_N3F_V3F),
1373	# undef const_iv	1602	# undef const_iv
1374	};	1603	};
1375		1604
1376	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1605	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1377	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1606	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
1392		1621
1393	void glHint (int target, int mode)	1622	void glHint (int target, int mode)
1394		1623
1395	void glBlendFunc (int sfactor, int dfactor)	1624	void glBlendFunc (int sfactor, int dfactor)
1396		1625
		1626	void glDepthMask (int flag)
		1627
1397	void glLogicOp (int opcode)	1628	void glLogicOp (int opcode)
1398		1629
		1630	void glColorMask (int red, int green, int blue, int alpha)
		1631
1399	void glMatrixMode (int mode)	1632	void glMatrixMode (int mode)
1400		1633
1401	void glPushMatrix ()	1634	void glPushMatrix ()
1402		1635
1403	void glPopMatrix ()	1636	void glPopMatrix ()
1404		1637
1405	void glLoadIdentity ()	1638	void glLoadIdentity ()
1406		1639
		1640	# near and far are due to microsofts buggy c compiler
1407	void glOrtho (double left, double right, double bottom, double top, double near, double far)	1641	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1408		1642
1409	void glViewport (int x, int y, int width, int height)	1643	void glViewport (int x, int y, int width, int height)
		1644
		1645	void glScissor (int x, int y, int width, int height)
1410		1646
1411	void glTranslate (float x, float y, float z = 0.)	1647	void glTranslate (float x, float y, float z = 0.)
1412	CODE:	1648	CODE:
1413	glTranslatef (x, y, z);	1649	glTranslatef (x, y, z);
1414		1650
1415	void glScale (float x, float y, float z)	1651	void glScale (float x, float y, float z = 1.)
1416	CODE:	1652	CODE:
1417	glScalef (x, y, z);	1653	glScalef (x, y, z);
1418		1654
1419	void glRotate (float angle, float x, float y, float z)	1655	void glRotate (float angle, float x, float y, float z)
1420	CODE:	1656	CODE:
…		…
1425	void glEnd ()	1661	void glEnd ()
1426		1662
1427	void glColor (float r, float g, float b, float a = 1.0)	1663	void glColor (float r, float g, float b, float a = 1.0)
1428	PROTOTYPE: @	1664	PROTOTYPE: @
1429	CODE:	1665	CODE:
1430	glColor4f (r, g, b, a);	1666	glColor4ub (MIN ((int)(r * 255.f), 255),
		1667	MIN ((int)(g * 255.f), 255),
		1668	MIN ((int)(b * 255.f), 255),
		1669	MIN ((int)(a * 255.f), 255));
		1670
		1671	void glInterleavedArrays (int format, int stride, char *data)
		1672
		1673	void glDrawElements (int mode, int count, int type, char *indices)
		1674
		1675	# 1.2 void glDrawRangeElements (int mode, int start, int end
1431		1676
1432	void glVertex (float x, float y, float z = 0.)	1677	void glVertex (float x, float y, float z = 0.)
1433	CODE:	1678	CODE:
1434	glVertex3f (x, y, z);	1679	glVertex3f (x, y, z);
1435		1680
…		…
1447		1692
1448	void glBindTexture (int target, int name)	1693	void glBindTexture (int target, int name)
1449		1694
1450	void glConvolutionParameter (int target, int pname, float params)	1695	void glConvolutionParameter (int target, int pname, float params)
1451	CODE:	1696	CODE:
1452	glConvolutionParameterf (target, pname, params);	1697	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1453		1698
1454	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1699	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1700	CODE:
		1701	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
		1702	(target, internalformat, width, height, format, type, data));
		1703
		1704	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		1705	CODE:
		1706	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
		1707	(target, internalformat, width, height, format, type, row, column));
1455		1708
1456	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1709	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1457		1710
1458	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1711	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1712
		1713	void glRasterPos (int x, int y)
		1714	CODE:
		1715	glRasterPos2i (x, y);
		1716
		1717	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1459		1718
1460	int glGenTexture ()	1719	int glGenTexture ()
1461	CODE:	1720	CODE:
1462	{	1721	{
1463	GLuint name;	1722	GLuint name;
…		…
1488		1747
1489	void glEndList ()	1748	void glEndList ()
1490		1749
1491	void glCallList (int list)	1750	void glCallList (int list)
1492		1751
		1752

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.61 by root, Sun Apr 23 21:47:30 2006 UTC vs. Revision 1.89 by root, Sun May 21 00:02:01 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.61 by root, Sun Apr 23 21:47:30 2006 UTC vs.
Revision 1.89 by root, Sun May 21 00:02:01 2006 UTC