[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.95 by root, Wed May 24 01:46:53 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
…		…
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 *	570	char *
		571	gl_vendor ()
		572	CODE:
		573	RETVAL = (char *)glGetString (GL_VENDOR);
		574	OUTPUT:
		575	RETVAL
		576
		577	char *
518	gl_version ()	578	gl_version ()
519	CODE:	579	CODE:
520	RETVAL = (char *)glGetString (GL_VERSION);	580	RETVAL = (char *)glGetString (GL_VERSION);
521	OUTPUT:	581	OUTPUT:
522	RETVAL	582	RETVAL
…		…
530		590
531	void	591	void
532	add_font (char *file)	592	add_font (char *file)
533	CODE:	593	CODE:
534	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	594	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
		595	#ifdef _WIN32
		596	// cairo... sigh... requires win2000
		597	AddFontResourceEx (file, FR_PRIVATE, 0);
		598	#endif
535		599
536	void	600	void
537	load_image_inline (SV *image_)	601	load_image_inline (SV *image_)
538	ALIAS:	602	ALIAS:
539	load_image_file = 1	603	load_image_file = 1
…		…
623	}	687	}
624		688
625	void	689	void
626	error (char *message)	690	error (char *message)
627	CODE:	691	CODE:
		692	fprintf (stderr, "ERROR: %s\n", message);
628	#ifdef _WIN32	693	#ifdef _WIN32
629	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	694	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
630	#else
631	fprintf (stderr, "ERROR: %s\n", message);
632	#endif	695	#endif
633		696
634	void	697	void
635	fatal (char *message)	698	fatal (char *message)
636	CODE:	699	CODE:
		700	fprintf (stderr, "FATAL: %s\n", message);
637	#ifdef _WIN32	701	#ifdef _WIN32
638	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	702	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
639	#else
640	fprintf (stderr, "FATAL: %s\n", message);
641	#endif	703	#endif
642	exit (1);	704	exit (1);
643		705
644	MODULE = CFClient PACKAGE = CFClient::Font	706	MODULE = CFClient PACKAGE = CFClient::Font
645		707
…		…
666	default_font = self;	728	default_font = self;
667		729
668	MODULE = CFClient PACKAGE = CFClient::Layout	730	MODULE = CFClient PACKAGE = CFClient::Layout
669		731
670	CFClient::Layout	732	CFClient::Layout
671	new (SV *class, int base_height = MIN_FONT_HEIGHT)	733	new (SV *class, int rgba = 0)
672	CODE:	734	CODE:
		735	#if _WIN32
		736	rgba = 0;//D
		737	#endif
673	New (0, RETVAL, 1, struct cf_layout);	738	New (0, RETVAL, 1, struct cf_layout);
674	RETVAL->pl = pango_layout_new (context);	739
675	RETVAL->base_height = base_height;	740	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
		741	RETVAL->rgba = rgba;
		742	RETVAL->r = 1.;
		743	RETVAL->g = 1.;
		744	RETVAL->b = 1.;
		745	RETVAL->a = 1.;
		746	RETVAL->base_height = MIN_FONT_HEIGHT;
676	RETVAL->font = 0;	747	RETVAL->font = 0;
		748
677	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	749	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
678	pango_layout_set_font_description (RETVAL->pl, default_font);	750	layout_update_font (RETVAL);
679	OUTPUT:	751	OUTPUT:
680	RETVAL	752	RETVAL
681		753
682	void	754	void
683	DESTROY (CFClient::Layout self)	755	DESTROY (CFClient::Layout self)
684	CODE:	756	CODE:
685	g_object_unref (self->pl);	757	g_object_unref (self->pl);
686	Safefree (self);	758	Safefree (self);
687		759
		760	int
		761	is_rgba (CFClient::Layout self)
		762	CODE:
		763	RETVAL = self->rgba;
		764	OUTPUT:
		765	RETVAL
		766
688	void	767	void
689	set_text (CFClient::Layout self, SV *text_)	768	set_text (CFClient::Layout self, SV *text_)
690	CODE:	769	CODE:
691	{	770	{
692	STRLEN textlen;	771	STRLEN textlen;
…		…
710	CODE:	789	CODE:
711	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	790	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
712	SvUTF8_on (RETVAL);	791	SvUTF8_on (RETVAL);
713	OUTPUT:	792	OUTPUT:
714	RETVAL	793	RETVAL
		794
		795	void
		796	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
		797	CODE:
		798	self->r = r;
		799	self->g = g;
		800	self->b = b;
		801	self->a = a;
715		802
716	void	803	void
717	set_font (CFClient::Layout self, CFClient::Font font = 0)	804	set_font (CFClient::Layout self, CFClient::Font font = 0)
718	CODE:	805	CODE:
719	if (self->font != font)	806	if (self->font != font)
…		…
735	set_width (CFClient::Layout self, int max_width = -1)	822	set_width (CFClient::Layout self, int max_width = -1)
736	CODE:	823	CODE:
737	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	824	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
738		825
739	void	826	void
		827	set_indent (CFClient::Layout self, int indent)
		828	CODE:
		829	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		830
		831	void
		832	set_spacing (CFClient::Layout self, int spacing)
		833	CODE:
		834	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		835
		836	void
		837	set_ellipsise (CFClient::Layout self, int ellipsise)
		838	CODE:
		839	pango_layout_set_ellipsize (self->pl,
		840	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		841	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		842	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		843	: PANGO_ELLIPSIZE_NONE
		844	);
		845
		846	void
		847	set_single_paragraph_mode (CFClient::Layout self, int spm)
		848	CODE:
		849	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		850
		851	void
740	size (CFClient::Layout self)	852	size (CFClient::Layout self)
741	PPCODE:	853	PPCODE:
742	{	854	{
743	int w, h;	855	int w, h;
744		856
…		…
777	render (CFClient::Layout self)	889	render (CFClient::Layout self)
778	PPCODE:	890	PPCODE:
779	{	891	{
780	SV *retval;	892	SV *retval;
781	int w, h;	893	int w, h;
782	FT_Bitmap bitmap;
783		894
784	layout_get_pixel_size (self, &w, &h);	895	layout_get_pixel_size (self, &w, &h);
785		896
		897	if (self->rgba)
		898	{
		899	cairo_surface_t *surface;
		900	cairo_t *cairo;
		901
		902	retval = newSV (w * h * 4);
		903	SvPOK_only (retval);
		904	SvCUR_set (retval, w * h * 4);
		905
		906	memset (SvPVX (retval), 0, w * h * 4);
		907
		908	surface = cairo_image_surface_create_for_data (
		909	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		910	cairo = cairo_create (surface);
		911	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		912
		913	pango_cairo_show_layout (cairo, self->pl);
		914
		915	cairo_destroy (cairo);
		916	cairo_surface_destroy (surface);
		917
		918	// what a mess, and its premultiplied, too :(
		919	{
		920	uint32_t p = (uint32_t )SvPVX (retval);
		921	uint32_t e = p + w h;
		922
		923	while (p < e)
		924	{
		925	uint32_t rgba = *p;
		926	rgba = (rgba >> 24) \| (rgba << 8);
		927	#if 0
		928	#ifdef _WIN32
		929	{//D
		930	uint8_t r = rgba >> 24;
		931	uint8_t g = rgba >> 16;
		932	uint8_t b = rgba >> 8;
		933	uint8_t a = rgba >> 0;
		934
		935	rgba = (rgba & 0xffffff00) \| a;
		936	}
		937	#endif
		938	#endif
		939	rgba = SDL_SwapBE32 (rgba);
		940	*p++ = rgba;
		941	}
		942	}
		943
		944	EXTEND (SP, 5);
		945	PUSHs (sv_2mortal (newSViv (w)));
		946	PUSHs (sv_2mortal (newSViv (h)));
		947	PUSHs (sv_2mortal (retval));
		948	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		949	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		950	}
		951	else
		952	{
		953	FT_Bitmap bitmap;
		954
786	retval = newSV (w * h);	955	retval = newSV (w * h);
787	SvPOK_only (retval);	956	SvPOK_only (retval);
788	SvCUR_set (retval, w * h);	957	SvCUR_set (retval, w * h);
789		958
790	bitmap.rows = h;	959	bitmap.rows = h;
791	bitmap.width = w;	960	bitmap.width = w;
792	bitmap.pitch = w;	961	bitmap.pitch = w;
793	bitmap.buffer = (unsigned char*)SvPVX (retval);	962	bitmap.buffer = (unsigned char*)SvPVX (retval);
794	bitmap.num_grays = 256;	963	bitmap.num_grays = 256;
795	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	964	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
796		965
797	memset (bitmap.buffer, 0, w * h);	966	memset (bitmap.buffer, 0, w * h);
798		967
799	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	968	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
800		969
801	EXTEND (SP, 3);	970	EXTEND (SP, 5);
802	PUSHs (sv_2mortal (newSViv (w)));	971	PUSHs (sv_2mortal (newSViv (w)));
803	PUSHs (sv_2mortal (newSViv (h)));	972	PUSHs (sv_2mortal (newSViv (h)));
804	PUSHs (sv_2mortal (retval));	973	PUSHs (sv_2mortal (retval));
		974	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		975	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		976	}
805	}	977	}
806		978
807	MODULE = CFClient PACKAGE = CFClient::Texture	979	MODULE = CFClient PACKAGE = CFClient::Texture
808		980
809	void	981	void
810	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	982	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
811	PROTOTYPE: $$$;$$	983	PROTOTYPE: $$$;$$
		984	ALIAS:
		985	draw_quad_alpha = 1
		986	draw_quad_alpha_premultiplied = 2
812	CODE:	987	CODE:
813	{	988	{
814	HV hv = (HV )SvRV (self);	989	HV hv = (HV )SvRV (self);
815	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	990	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
816	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	991	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
821	{	996	{
822	w = SvNV (*hv_fetch (hv, "w", 1, 1));	997	w = SvNV (*hv_fetch (hv, "w", 1, 1));
823	h = SvNV (*hv_fetch (hv, "h", 1, 1));	998	h = SvNV (*hv_fetch (hv, "h", 1, 1));
824	}	999	}
825		1000
		1001	if (ix)
		1002	{
		1003	glEnable (GL_BLEND);
		1004	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1005	glEnable (GL_ALPHA_TEST);
		1006	glAlphaFunc (GL_GREATER, 0.01f);
		1007	}
		1008
826	glBindTexture (GL_TEXTURE_2D, name);	1009	glBindTexture (GL_TEXTURE_2D, name);
		1010
827	if (wrap_mode) {	1011	if (wrap_mode)
		1012	{
828	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	1013	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
829	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	1014	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
830	}	1015	}
		1016
831	glBegin (GL_QUADS);	1017	glBegin (GL_QUADS);
832	glTexCoord2f (0, 0); glVertex2f (x , y );	1018	glTexCoord2f (0, 0); glVertex2f (x , y );
833	glTexCoord2f (0, t); glVertex2f (x , y + h);	1019	glTexCoord2f (0, t); glVertex2f (x , y + h);
834	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1020	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
835	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1021	glTexCoord2f (s, 0); glVertex2f (x + w, y );
836	glEnd ();	1022	glEnd ();
		1023
		1024	if (ix)
		1025	{
		1026	glDisable (GL_ALPHA_TEST);
		1027	glDisable (GL_BLEND);
		1028	}
837	}	1029	}
838		1030
839	MODULE = CFClient PACKAGE = CFClient::Map	1031	MODULE = CFClient PACKAGE = CFClient::Map
840		1032
841	CFClient::Map	1033	CFClient::Map
…		…
905	tex->r = r;	1097	tex->r = r;
906	tex->g = g;	1098	tex->g = g;
907	tex->b = b;	1099	tex->b = b;
908	tex->a = a;	1100	tex->a = a;
909	}	1101	}
		1102
		1103	// somewhat hackish, but for textures that require it, it really
		1104	// improves the look, and most others don't suffer.
		1105	glBindTexture (GL_TEXTURE_2D, name);
		1106	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
		1107	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
910	}	1108	}
911		1109
912	int	1110	int
913	ox (CFClient::Map self)	1111	ox (CFClient::Map self)
914	ALIAS:	1112	ALIAS:
…		…
1352	const_iv (GL_COLOR_MATERIAL),	1550	const_iv (GL_COLOR_MATERIAL),
1353	const_iv (GL_SMOOTH),	1551	const_iv (GL_SMOOTH),
1354	const_iv (GL_FLAT),	1552	const_iv (GL_FLAT),
1355	const_iv (GL_DITHER),	1553	const_iv (GL_DITHER),
1356	const_iv (GL_BLEND),	1554	const_iv (GL_BLEND),
		1555	const_iv (GL_CULL_FACE),
1357	const_iv (GL_SCISSOR_TEST),	1556	const_iv (GL_SCISSOR_TEST),
		1557	const_iv (GL_DEPTH_TEST),
		1558	const_iv (GL_ALPHA_TEST),
		1559	const_iv (GL_NORMALIZE),
		1560	const_iv (GL_RESCALE_NORMAL),
1358	const_iv (GL_AND),	1561	const_iv (GL_AND),
1359	const_iv (GL_ONE),	1562	const_iv (GL_ONE),
1360	const_iv (GL_ZERO),	1563	const_iv (GL_ZERO),
1361	const_iv (GL_SRC_ALPHA),	1564	const_iv (GL_SRC_ALPHA),
1362	const_iv (GL_SRC_ALPHA_SATURATE),	1565	const_iv (GL_SRC_ALPHA_SATURATE),
1363	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1566	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1364	const_iv (GL_ONE_MINUS_DST_ALPHA),	1567	const_iv (GL_ONE_MINUS_DST_ALPHA),
1365	const_iv (GL_RGB),	1568	const_iv (GL_RGB),
1366	const_iv (GL_RGBA),	1569	const_iv (GL_RGBA),
1367	const_iv (GL_UNSIGNED_BYTE),	1570	const_iv (GL_UNSIGNED_BYTE),
		1571	const_iv (GL_UNSIGNED_SHORT),
		1572	const_iv (GL_UNSIGNED_INT),
1368	const_iv (GL_ALPHA),	1573	const_iv (GL_ALPHA),
		1574	const_iv (GL_INTENSITY),
		1575	const_iv (GL_LUMINANCE),
		1576	const_iv (GL_LUMINANCE_ALPHA),
1369	const_iv (GL_FLOAT),	1577	const_iv (GL_FLOAT),
1370	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1578	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1371	const_iv (GL_COMPILE),	1579	const_iv (GL_COMPILE),
1372	const_iv (GL_TEXTURE_1D),	1580	const_iv (GL_TEXTURE_1D),
1373	const_iv (GL_TEXTURE_2D),	1581	const_iv (GL_TEXTURE_2D),
…		…
1387	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1595	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1388	const_iv (GL_GENERATE_MIPMAP),	1596	const_iv (GL_GENERATE_MIPMAP),
1389	const_iv (GL_MODULATE),	1597	const_iv (GL_MODULATE),
1390	const_iv (GL_DECAL),	1598	const_iv (GL_DECAL),
1391	const_iv (GL_REPLACE),	1599	const_iv (GL_REPLACE),
		1600	const_iv (GL_DEPTH_BUFFER_BIT),
1392	const_iv (GL_COLOR_BUFFER_BIT),	1601	const_iv (GL_COLOR_BUFFER_BIT),
1393	const_iv (GL_PROJECTION),	1602	const_iv (GL_PROJECTION),
1394	const_iv (GL_MODELVIEW),	1603	const_iv (GL_MODELVIEW),
1395	const_iv (GL_COLOR_LOGIC_OP),	1604	const_iv (GL_COLOR_LOGIC_OP),
1396	const_iv (GL_SEPARABLE_2D),	1605	const_iv (GL_SEPARABLE_2D),
1397	const_iv (GL_CONVOLUTION_2D),	1606	const_iv (GL_CONVOLUTION_2D),
1398	const_iv (GL_CONVOLUTION_BORDER_MODE),	1607	const_iv (GL_CONVOLUTION_BORDER_MODE),
1399	const_iv (GL_CONSTANT_BORDER),	1608	const_iv (GL_CONSTANT_BORDER),
1400	const_iv (GL_LINES),	1609	const_iv (GL_LINES),
		1610	const_iv (GL_LINE_LOOP),
1401	const_iv (GL_QUADS),	1611	const_iv (GL_QUADS),
1402	const_iv (GL_LINE_LOOP),	1612	const_iv (GL_QUAD_STRIP),
		1613	const_iv (GL_TRIANGLES),
		1614	const_iv (GL_TRIANGLE_STRIP),
		1615	const_iv (GL_TRIANGLE_FAN),
1403	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1616	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1404	const_iv (GL_FASTEST),	1617	const_iv (GL_FASTEST),
		1618	const_iv (GL_V2F),
		1619	const_iv (GL_V3F),
		1620	const_iv (GL_T2F_V3F),
		1621	const_iv (GL_T2F_N3F_V3F),
1405	# undef const_iv	1622	# undef const_iv
1406	};	1623	};
1407		1624
1408	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1625	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1409	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1626	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
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.95 by root, Wed May 24 01:46:53 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.95 by root, Wed May 24 01:46:53 2006 UTC