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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.70 by root, Sun Apr 30 09:21:47 2006 UTC vs.
Revision 1.97 by root, Fri May 26 18:28:23 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
…		…
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, 1);
412		447
		448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
		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);
…		…
434		470
435	++m;	471	++m;
436	}	472	}
437	}	473	}
438		474
		475	char *
		476	SDL_GetError ()
		477
439	int	478	int
440	SDL_SetVideoMode (int w, int h, int fullscreen)	479	SDL_SetVideoMode (int w, int h, int fullscreen)
441	CODE:	480	CODE:
442	RETVAL = !!SDL_SetVideoMode (	481	RETVAL = !!SDL_SetVideoMode (
443	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
…		…
446	OUTPUT:	485	OUTPUT:
447	RETVAL	486	RETVAL
448		487
449	void	488	void
450	SDL_GL_SwapBuffers ()	489	SDL_GL_SwapBuffers ()
		490
		491	char *
		492	SDL_GetKeyName (int sym)
451		493
452	void	494	void
453	SDL_PollEvent ()	495	SDL_PollEvent ()
454	PPCODE:	496	PPCODE:
455	{	497	{
…		…
474	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	516	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
475	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	517	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
476	break;	518	break;
477		519
478	case SDL_MOUSEMOTION:	520	case SDL_MOUSEMOTION:
		521	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		522
479	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	523	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
480	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	524	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
481	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	525	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
482	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	526	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
483	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	527	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
484	break;	528	break;
485		529
486	case SDL_MOUSEBUTTONDOWN:	530	case SDL_MOUSEBUTTONDOWN:
487	case SDL_MOUSEBUTTONUP:	531	case SDL_MOUSEBUTTONUP:
		532	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		533
488	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	534	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
489	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	535	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
490	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	536	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
491	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	537	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
492	break;	538	break;
		539
		540	case SDL_USEREVENT:
		541	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		542	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		543	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		544	break;
493	}	545	}
494		546
495	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	547	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
496	}	548	}
497	}	549	}
498		550
499	int	551	int
500	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	552	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
501	POSTCALL:	553	POSTCALL:
502	Mix_HookMusicFinished (music_finished);	554	Mix_HookMusicFinished (music_finished);
		555	Mix_ChannelFinished (channel_finished);
503		556
504	void	557	void
505	Mix_CloseAudio ()	558	Mix_CloseAudio ()
506		559
507	int	560	int
…		…
512	CODE:	565	CODE:
513	#ifndef _WIN32	566	#ifndef _WIN32
514	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	567	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
515	#endif	568	#endif
516		569
517	char *
518	gl_version ()
519	CODE:
520	RETVAL = (char *)glGetString (GL_VERSION);
521	OUTPUT:
522	RETVAL
523
524	char *
525	gl_extensions ()
526	CODE:
527	RETVAL = (char *)glGetString (GL_EXTENSIONS);
528	OUTPUT:
529	RETVAL
530
531	void	570	void
532	add_font (char *file)	571	add_font (char *file)
533	CODE:	572	CODE:
534	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	573	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
		574	#ifdef _WIN32
		575	// cairo... sigh... requires win2000
		576	AddFontResourceEx (file, FR_PRIVATE, 0);
		577	#endif
535		578
536	void	579	void
537	load_image_inline (SV *image_)	580	load_image_inline (SV *image_)
538	ALIAS:	581	ALIAS:
539	load_image_file = 1	582	load_image_file = 1
…		…
623	}	666	}
624		667
625	void	668	void
626	error (char *message)	669	error (char *message)
627	CODE:	670	CODE:
		671	fprintf (stderr, "ERROR: %s\n", message);
628	#ifdef _WIN32	672	#ifdef _WIN32
629	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	673	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
630	#else
631	fprintf (stderr, "ERROR: %s\n", message);
632	#endif	674	#endif
633		675
634	void	676	void
635	fatal (char *message)	677	fatal (char *message)
636	CODE:	678	CODE:
		679	fprintf (stderr, "FATAL: %s\n", message);
637	#ifdef _WIN32	680	#ifdef _WIN32
638	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	681	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
639	#else
640	fprintf (stderr, "FATAL: %s\n", message);
641	#endif	682	#endif
642	exit (1);	683	exit (1);
643		684
644	MODULE = CFClient PACKAGE = CFClient::Font	685	MODULE = CFClient PACKAGE = CFClient::Font
645		686
…		…
666	default_font = self;	707	default_font = self;
667		708
668	MODULE = CFClient PACKAGE = CFClient::Layout	709	MODULE = CFClient PACKAGE = CFClient::Layout
669		710
670	CFClient::Layout	711	CFClient::Layout
671	new (SV *class, int base_height = MIN_FONT_HEIGHT)	712	new (SV *class, int rgba = 0)
672	CODE:	713	CODE:
		714	#if _WIN32
		715	//rgba = 0;//D make stext nicer, breaks TextView
		716	#endif
673	New (0, RETVAL, 1, struct cf_layout);	717	New (0, RETVAL, 1, struct cf_layout);
674	RETVAL->pl = pango_layout_new (context);	718
675	RETVAL->base_height = base_height;	719	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
		720	RETVAL->rgba = rgba;
		721	RETVAL->r = 1.;
		722	RETVAL->g = 1.;
		723	RETVAL->b = 1.;
		724	RETVAL->a = 1.;
		725	RETVAL->base_height = MIN_FONT_HEIGHT;
676	RETVAL->font = 0;	726	RETVAL->font = 0;
		727
677	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	728	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
678	pango_layout_set_font_description (RETVAL->pl, default_font);	729	layout_update_font (RETVAL);
679	OUTPUT:	730	OUTPUT:
680	RETVAL	731	RETVAL
681		732
682	void	733	void
683	DESTROY (CFClient::Layout self)	734	DESTROY (CFClient::Layout self)
684	CODE:	735	CODE:
685	g_object_unref (self->pl);	736	g_object_unref (self->pl);
686	Safefree (self);	737	Safefree (self);
687		738
		739	int
		740	is_rgba (CFClient::Layout self)
		741	CODE:
		742	RETVAL = self->rgba;
		743	OUTPUT:
		744	RETVAL
		745
688	void	746	void
689	set_text (CFClient::Layout self, SV *text_)	747	set_text (CFClient::Layout self, SV *text_)
690	CODE:	748	CODE:
691	{	749	{
692	STRLEN textlen;	750	STRLEN textlen;
…		…
710	CODE:	768	CODE:
711	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	769	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
712	SvUTF8_on (RETVAL);	770	SvUTF8_on (RETVAL);
713	OUTPUT:	771	OUTPUT:
714	RETVAL	772	RETVAL
		773
		774	void
		775	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
		776	CODE:
		777	self->r = r;
		778	self->g = g;
		779	self->b = b;
		780	self->a = a;
715		781
716	void	782	void
717	set_font (CFClient::Layout self, CFClient::Font font = 0)	783	set_font (CFClient::Layout self, CFClient::Font font = 0)
718	CODE:	784	CODE:
719	if (self->font != font)	785	if (self->font != font)
…		…
735	set_width (CFClient::Layout self, int max_width = -1)	801	set_width (CFClient::Layout self, int max_width = -1)
736	CODE:	802	CODE:
737	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	803	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
738		804
739	void	805	void
		806	set_indent (CFClient::Layout self, int indent)
		807	CODE:
		808	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		809
		810	void
		811	set_spacing (CFClient::Layout self, int spacing)
		812	CODE:
		813	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		814
		815	void
		816	set_ellipsise (CFClient::Layout self, int ellipsise)
		817	CODE:
		818	pango_layout_set_ellipsize (self->pl,
		819	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		820	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		821	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		822	: PANGO_ELLIPSIZE_NONE
		823	);
		824
		825	void
		826	set_single_paragraph_mode (CFClient::Layout self, int spm)
		827	CODE:
		828	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		829
		830	void
740	size (CFClient::Layout self)	831	size (CFClient::Layout self)
741	PPCODE:	832	PPCODE:
742	{	833	{
743	int w, h;	834	int w, h;
744		835
…		…
777	render (CFClient::Layout self)	868	render (CFClient::Layout self)
778	PPCODE:	869	PPCODE:
779	{	870	{
780	SV *retval;	871	SV *retval;
781	int w, h;	872	int w, h;
782	FT_Bitmap bitmap;
783		873
784	layout_get_pixel_size (self, &w, &h);	874	layout_get_pixel_size (self, &w, &h);
785		875
		876	if (self->rgba)
		877	{
		878	cairo_surface_t *surface;
		879	cairo_t *cairo;
		880
		881	retval = newSV (w * h * 4);
		882	SvPOK_only (retval);
		883	SvCUR_set (retval, w * h * 4);
		884
		885	memset (SvPVX (retval), 0, w * h * 4);
		886
		887	surface = cairo_image_surface_create_for_data (
		888	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		889	cairo = cairo_create (surface);
		890	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		891
		892	pango_cairo_show_layout (cairo, self->pl);
		893
		894	cairo_destroy (cairo);
		895	cairo_surface_destroy (surface);
		896
		897	// what a mess, and its premultiplied, too :(
		898	{
		899	uint32_t p = (uint32_t )SvPVX (retval);
		900	uint32_t e = p + w h;
		901
		902	while (p < e)
		903	{
		904	uint32_t rgba = *p;
		905	rgba = (rgba >> 24) \| (rgba << 8);
		906	#if 0
		907	#ifdef _WIN32
		908	{//D
		909	uint8_t r = rgba >> 24;
		910	uint8_t g = rgba >> 16;
		911	uint8_t b = rgba >> 8;
		912	uint8_t a = rgba >> 0;
		913
		914	rgba = (rgba & 0xffffff00) \| a;
		915	}
		916	#endif
		917	#endif
		918	rgba = SDL_SwapBE32 (rgba);
		919	*p++ = rgba;
		920	}
		921	}
		922
		923	EXTEND (SP, 5);
		924	PUSHs (sv_2mortal (newSViv (w)));
		925	PUSHs (sv_2mortal (newSViv (h)));
		926	PUSHs (sv_2mortal (retval));
		927	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		928	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		929	}
		930	else
		931	{
		932	FT_Bitmap bitmap;
		933
786	retval = newSV (w * h);	934	retval = newSV (w * h);
787	SvPOK_only (retval);	935	SvPOK_only (retval);
788	SvCUR_set (retval, w * h);	936	SvCUR_set (retval, w * h);
789		937
790	bitmap.rows = h;	938	bitmap.rows = h;
791	bitmap.width = w;	939	bitmap.width = w;
792	bitmap.pitch = w;	940	bitmap.pitch = w;
793	bitmap.buffer = (unsigned char*)SvPVX (retval);	941	bitmap.buffer = (unsigned char*)SvPVX (retval);
794	bitmap.num_grays = 256;	942	bitmap.num_grays = 256;
795	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	943	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
796		944
797	memset (bitmap.buffer, 0, w * h);	945	memset (bitmap.buffer, 0, w * h);
798		946
799	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	947	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
800		948
801	EXTEND (SP, 3);	949	EXTEND (SP, 5);
802	PUSHs (sv_2mortal (newSViv (w)));	950	PUSHs (sv_2mortal (newSViv (w)));
803	PUSHs (sv_2mortal (newSViv (h)));	951	PUSHs (sv_2mortal (newSViv (h)));
804	PUSHs (sv_2mortal (retval));	952	PUSHs (sv_2mortal (retval));
		953	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		954	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		955	}
805	}	956	}
806		957
807	MODULE = CFClient PACKAGE = CFClient::Texture	958	MODULE = CFClient PACKAGE = CFClient::Texture
808		959
809	void	960	void
810	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	961	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
811	PROTOTYPE: $$$;$$	962	PROTOTYPE: $$$;$$
		963	ALIAS:
		964	draw_quad_alpha = 1
		965	draw_quad_alpha_premultiplied = 2
812	CODE:	966	CODE:
813	{	967	{
814	HV hv = (HV )SvRV (self);	968	HV hv = (HV )SvRV (self);
815	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	969	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
816	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	970	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
821	{	975	{
822	w = SvNV (*hv_fetch (hv, "w", 1, 1));	976	w = SvNV (*hv_fetch (hv, "w", 1, 1));
823	h = SvNV (*hv_fetch (hv, "h", 1, 1));	977	h = SvNV (*hv_fetch (hv, "h", 1, 1));
824	}	978	}
825		979
		980	if (ix)
		981	{
		982	glEnable (GL_BLEND);
		983	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		984	glEnable (GL_ALPHA_TEST);
		985	glAlphaFunc (GL_GREATER, 0.01f);
		986	}
		987
826	glBindTexture (GL_TEXTURE_2D, name);	988	glBindTexture (GL_TEXTURE_2D, name);
		989
827	if (wrap_mode) {	990	if (wrap_mode)
		991	{
828	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	992	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
829	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	993	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
830	}	994	}
		995
831	glBegin (GL_QUADS);	996	glBegin (GL_QUADS);
832	glTexCoord2f (0, 0); glVertex2f (x , y );	997	glTexCoord2f (0, 0); glVertex2f (x , y );
833	glTexCoord2f (0, t); glVertex2f (x , y + h);	998	glTexCoord2f (0, t); glVertex2f (x , y + h);
834	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	999	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
835	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1000	glTexCoord2f (s, 0); glVertex2f (x + w, y );
836	glEnd ();	1001	glEnd ();
		1002
		1003	if (ix)
		1004	{
		1005	glDisable (GL_ALPHA_TEST);
		1006	glDisable (GL_BLEND);
		1007	}
837	}	1008	}
838		1009
839	MODULE = CFClient PACKAGE = CFClient::Map	1010	MODULE = CFClient PACKAGE = CFClient::Map
840		1011
841	CFClient::Map	1012	CFClient::Map
…		…
905	tex->r = r;	1076	tex->r = r;
906	tex->g = g;	1077	tex->g = g;
907	tex->b = b;	1078	tex->b = b;
908	tex->a = a;	1079	tex->a = a;
909	}	1080	}
		1081
		1082	// somewhat hackish, but for textures that require it, it really
		1083	// improves the look, and most others don't suffer.
		1084	glBindTexture (GL_TEXTURE_2D, name);
		1085	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
		1086	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
910	}	1087	}
911		1088
912	int	1089	int
913	ox (CFClient::Map self)	1090	ox (CFClient::Map self)
914	ALIAS:	1091	ALIAS:
…		…
1352	const_iv (GL_COLOR_MATERIAL),	1529	const_iv (GL_COLOR_MATERIAL),
1353	const_iv (GL_SMOOTH),	1530	const_iv (GL_SMOOTH),
1354	const_iv (GL_FLAT),	1531	const_iv (GL_FLAT),
1355	const_iv (GL_DITHER),	1532	const_iv (GL_DITHER),
1356	const_iv (GL_BLEND),	1533	const_iv (GL_BLEND),
		1534	const_iv (GL_CULL_FACE),
1357	const_iv (GL_SCISSOR_TEST),	1535	const_iv (GL_SCISSOR_TEST),
		1536	const_iv (GL_DEPTH_TEST),
		1537	const_iv (GL_ALPHA_TEST),
		1538	const_iv (GL_NORMALIZE),
		1539	const_iv (GL_RESCALE_NORMAL),
1358	const_iv (GL_AND),	1540	const_iv (GL_AND),
1359	const_iv (GL_ONE),	1541	const_iv (GL_ONE),
1360	const_iv (GL_ZERO),	1542	const_iv (GL_ZERO),
1361	const_iv (GL_SRC_ALPHA),	1543	const_iv (GL_SRC_ALPHA),
1362	const_iv (GL_SRC_ALPHA_SATURATE),	1544	const_iv (GL_SRC_ALPHA_SATURATE),
1363	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1545	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1364	const_iv (GL_ONE_MINUS_DST_ALPHA),	1546	const_iv (GL_ONE_MINUS_DST_ALPHA),
1365	const_iv (GL_RGB),	1547	const_iv (GL_RGB),
1366	const_iv (GL_RGBA),	1548	const_iv (GL_RGBA),
1367	const_iv (GL_UNSIGNED_BYTE),	1549	const_iv (GL_UNSIGNED_BYTE),
		1550	const_iv (GL_UNSIGNED_SHORT),
		1551	const_iv (GL_UNSIGNED_INT),
1368	const_iv (GL_ALPHA),	1552	const_iv (GL_ALPHA),
		1553	const_iv (GL_INTENSITY),
		1554	const_iv (GL_LUMINANCE),
		1555	const_iv (GL_LUMINANCE_ALPHA),
1369	const_iv (GL_FLOAT),	1556	const_iv (GL_FLOAT),
1370	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1557	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1371	const_iv (GL_COMPILE),	1558	const_iv (GL_COMPILE),
1372	const_iv (GL_TEXTURE_1D),	1559	const_iv (GL_TEXTURE_1D),
1373	const_iv (GL_TEXTURE_2D),	1560	const_iv (GL_TEXTURE_2D),
…		…
1387	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1574	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1388	const_iv (GL_GENERATE_MIPMAP),	1575	const_iv (GL_GENERATE_MIPMAP),
1389	const_iv (GL_MODULATE),	1576	const_iv (GL_MODULATE),
1390	const_iv (GL_DECAL),	1577	const_iv (GL_DECAL),
1391	const_iv (GL_REPLACE),	1578	const_iv (GL_REPLACE),
		1579	const_iv (GL_DEPTH_BUFFER_BIT),
1392	const_iv (GL_COLOR_BUFFER_BIT),	1580	const_iv (GL_COLOR_BUFFER_BIT),
1393	const_iv (GL_PROJECTION),	1581	const_iv (GL_PROJECTION),
1394	const_iv (GL_MODELVIEW),	1582	const_iv (GL_MODELVIEW),
1395	const_iv (GL_COLOR_LOGIC_OP),	1583	const_iv (GL_COLOR_LOGIC_OP),
1396	const_iv (GL_SEPARABLE_2D),	1584	const_iv (GL_SEPARABLE_2D),
1397	const_iv (GL_CONVOLUTION_2D),	1585	const_iv (GL_CONVOLUTION_2D),
1398	const_iv (GL_CONVOLUTION_BORDER_MODE),	1586	const_iv (GL_CONVOLUTION_BORDER_MODE),
1399	const_iv (GL_CONSTANT_BORDER),	1587	const_iv (GL_CONSTANT_BORDER),
1400	const_iv (GL_LINES),	1588	const_iv (GL_LINES),
		1589	const_iv (GL_LINE_LOOP),
1401	const_iv (GL_QUADS),	1590	const_iv (GL_QUADS),
1402	const_iv (GL_LINE_LOOP),	1591	const_iv (GL_QUAD_STRIP),
		1592	const_iv (GL_TRIANGLES),
		1593	const_iv (GL_TRIANGLE_STRIP),
		1594	const_iv (GL_TRIANGLE_FAN),
1403	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1595	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1404	const_iv (GL_FASTEST),	1596	const_iv (GL_FASTEST),
		1597	const_iv (GL_V2F),
		1598	const_iv (GL_V3F),
		1599	const_iv (GL_T2F_V3F),
		1600	const_iv (GL_T2F_N3F_V3F),
1405	# undef const_iv	1601	# undef const_iv
1406	};	1602	};
1407		1603
1408	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1604	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1409	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1605	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1410	}	1606	}
1411		1607
		1608	char *
		1609	gl_vendor ()
		1610	CODE:
		1611	RETVAL = (char *)glGetString (GL_VENDOR);
		1612	OUTPUT:
		1613	RETVAL
		1614
		1615	char *
		1616	gl_version ()
		1617	CODE:
		1618	RETVAL = (char *)glGetString (GL_VERSION);
		1619	OUTPUT:
		1620	RETVAL
		1621
		1622	char *
		1623	gl_extensions ()
		1624	CODE:
		1625	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1626	OUTPUT:
		1627	RETVAL
		1628
1412	int glGetError ()	1629	int glGetError ()
1413		1630
1414	void glClear (int mask)	1631	void glClear (int mask)
1415		1632
1416	void glClearColor (float r, float g, float b, float a = 1.0)	1633	void glClearColor (float r, float g, float b, float a = 1.0)
…		…
1424		1641
1425	void glHint (int target, int mode)	1642	void glHint (int target, int mode)
1426		1643
1427	void glBlendFunc (int sfactor, int dfactor)	1644	void glBlendFunc (int sfactor, int dfactor)
1428		1645
		1646	void glDepthMask (int flag)
		1647
1429	void glLogicOp (int opcode)	1648	void glLogicOp (int opcode)
1430		1649
1431	void glColorMask (int red, int green, int blue, int alpha)	1650	void glColorMask (int red, int green, int blue, int alpha)
1432		1651
1433	void glMatrixMode (int mode)	1652	void glMatrixMode (int mode)
…		…
1436		1655
1437	void glPopMatrix ()	1656	void glPopMatrix ()
1438		1657
1439	void glLoadIdentity ()	1658	void glLoadIdentity ()
1440		1659
1441	# near and far are due to microsofts buggy c compiler	1660	# near_ and far_ are due to microsofts buggy "c" compiler
		1661	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1662
		1663	# near_ and far_ are due to microsofts buggy "c" compiler
1442	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1664	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1443		1665
1444	void glViewport (int x, int y, int width, int height)	1666	void glViewport (int x, int y, int width, int height)
1445		1667
1446	void glScissor (int x, int y, int width, int height)	1668	void glScissor (int x, int y, int width, int height)
…		…
1462	void glEnd ()	1684	void glEnd ()
1463		1685
1464	void glColor (float r, float g, float b, float a = 1.0)	1686	void glColor (float r, float g, float b, float a = 1.0)
1465	PROTOTYPE: @	1687	PROTOTYPE: @
1466	CODE:	1688	CODE:
1467	glColor4ub (r * 255., g * 255., b * 255., a * 255.);	1689	// microsoft visual "c" rounds instead of truncating...
		1690	glColor4ub (MIN ((int)(r * 255.f), 255),
		1691	MIN ((int)(g * 255.f), 255),
		1692	MIN ((int)(b * 255.f), 255),
		1693	MIN ((int)(a * 255.f), 255));
		1694
		1695	void glInterleavedArrays (int format, int stride, char *data)
		1696
		1697	void glDrawElements (int mode, int count, int type, char *indices)
		1698
		1699	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1700
		1701	void glRasterPos (float x, float y, float z = 0.)
		1702	CODE:
		1703	glRasterPos3f (0, 0, z);
		1704	glBitmap (0, 0, 0, 0, x, y, 0);
1468		1705
1469	void glVertex (float x, float y, float z = 0.)	1706	void glVertex (float x, float y, float z = 0.)
1470	CODE:	1707	CODE:
1471	glVertex3f (x, y, z);	1708	glVertex3f (x, y, z);
1472		1709
…		…
1500		1737
1501	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1738	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1502		1739
1503	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1740	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1504		1741
1505	void glRasterPos (int x, int y)	1742	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1506	CODE:
1507	glRasterPos2i (x, y);
1508		1743
1509	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1744	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1510		1745
1511	int glGenTexture ()	1746	int glGenTexture ()
1512	CODE:	1747	CODE:
…		…
1539		1774
1540	void glEndList ()	1775	void glEndList ()
1541		1776
1542	void glCallList (int list)	1777	void glCallList (int list)
1543		1778
		1779

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.70 by root, Sun Apr 30 09:21:47 2006 UTC vs. Revision 1.97 by root, Fri May 26 18:28:23 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.70 by root, Sun Apr 30 09:21:47 2006 UTC vs.
Revision 1.97 by root, Fri May 26 18:28:23 2006 UTC