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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.75 by root, Mon May 8 18:28:40 2006 UTC vs.
Revision 1.82 by root, Mon May 15 00:15:08 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>
3	# pragma warning(disable:4244)	5	# pragma warning(disable:4244)
4	#endif	6	#endif
5		7
6	#include "EXTERN.h"	8	#include "EXTERN.h"
7	#include "perl.h"	9	#include "perl.h"
8	#include "XSUB.h"	10	#include "XSUB.h"
9		11
		12	#include <math.h>
10	#include <string.h>	13	#include <string.h>
11	#include <stdio.h>	14	#include <stdio.h>
12		15
13	#include <SDL.h>	16	#include <SDL.h>
		17	#include <SDL_endian.h>
14	#include <SDL_image.h>	18	#include <SDL_image.h>
15	#include <SDL_mixer.h>	19	#include <SDL_mixer.h>
16	#include <SDL_opengl.h>	20	#include <SDL_opengl.h>
17		21
18	#include <glib/gmacros.h>	22	#include <glib/gmacros.h>
19		23
20	#include <pango/pango.h>	24	#include <pango/pango.h>
21	#include <pango/pangofc-fontmap.h>	25	#include <pango/pangofc-fontmap.h>
22	#include <pango/pangoft2.h>	26	#include <pango/pangoft2.h>
		27	#include <pango/pangocairo.h>
23		28
24	#ifndef _WIN32	29	#ifndef _WIN32
25	# include <sys/types.h>	30	# include <sys/types.h>
26	# include <sys/socket.h>	31	# include <sys/socket.h>
27	# include <netinet/in.h>	32	# include <netinet/in.h>
64	typedef Mix_Music *CFClient__MixMusic;	69	typedef Mix_Music *CFClient__MixMusic;
65		70
66	typedef PangoFontDescription *CFClient__Font;	71	typedef PangoFontDescription *CFClient__Font;
67		72
68	typedef struct cf_layout {	73	typedef struct cf_layout {
69	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
70	int base_height;	77	int base_height;
71	CFClient__Font font;	78	CFClient__Font font;
72	} *CFClient__Layout;	79	} *CFClient__Layout;
73		80
74	static CFClient__Font default_font;	81	static CFClient__Font default_font;
75	static PangoContext *context;	82	static PangoContext ft2_context, cairo_context;
76	static PangoFontMap *fontmap;	83	static PangoFontMap ft2_fontmap, cairo_fontmap;
77		84
78	static void	85	static void
79	substitute_func (FcPattern *pattern, gpointer data)	86	substitute_func (FcPattern *pattern, gpointer data)
80	{	87	{
81	FcPatternAddBool (pattern, FC_HINTING , 1);	88	FcPatternAddBool (pattern, FC_HINTING , 1);
		89	#ifndef _WIN32
82	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	90	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
		91	#endif
83	}	92	}
84		93
85	static void	94	static void
86	layout_update_font (CFClient__Layout self)	95	layout_update_font (CFClient__Layout self)
87	{	96	{
…		…
99	static void	108	static void
100	layout_get_pixel_size (CFClient__Layout self, int w, int h)	109	layout_get_pixel_size (CFClient__Layout self, int w, int h)
101	{	110	{
102	pango_layout_get_pixel_size (self->pl, w, h);	111	pango_layout_get_pixel_size (self->pl, w, h);
103		112
104	w = (w + 3) & ~3;
105	if (!w) w = 1;	113	if (!w) w = 1;
106	if (!h) h = 1;	114	if (!h) h = 1;
		115
		116	w = (w + 3) & ~3;
107	}	117	}
108		118
109	typedef uint16_t mapface;	119	typedef uint16_t mapface;
110		120
111	typedef struct {	121	typedef struct {
…		…
399	# undef const_iv	409	# undef const_iv
400	};	410	};
401		411
402	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	412	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
403	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	413	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		414	}
404		415
		416	void
		417	pango_init ()
		418	CODE:
		419	{
		420	// delayed, so it can pick up new fonts added by AddFontResourceEx
405	fontmap = pango_ft2_font_map_new ();	421	ft2_fontmap = pango_ft2_font_map_new ();
406	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);	422	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
407	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);	423	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
		424
		425	cairo_fontmap = pango_cairo_font_map_get_default ();
		426	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
408	}	427	}
409		428
410	int	429	int
411	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	430	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
412		431
…		…
551		570
552	void	571	void
553	add_font (char *file)	572	add_font (char *file)
554	CODE:	573	CODE:
555	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	574	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
		575	#ifdef _WIN32
		576	// cairo... sigh... requires win2000
		577	AddFontResourceEx (file, FR_PRIVATE, 0);
		578	#endif
556		579
557	void	580	void
558	load_image_inline (SV *image_)	581	load_image_inline (SV *image_)
559	ALIAS:	582	ALIAS:
560	load_image_file = 1	583	load_image_file = 1
…		…
687	default_font = self;	710	default_font = self;
688		711
689	MODULE = CFClient PACKAGE = CFClient::Layout	712	MODULE = CFClient PACKAGE = CFClient::Layout
690		713
691	CFClient::Layout	714	CFClient::Layout
692	new (SV *class, int base_height = MIN_FONT_HEIGHT)	715	new (SV *class, int rgba = 0)
693	CODE:	716	CODE:
694	New (0, RETVAL, 1, struct cf_layout);	717	New (0, RETVAL, 1, struct cf_layout);
695	RETVAL->pl = pango_layout_new (context);	718
696	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;
697	RETVAL->font = 0;	726	RETVAL->font = 0;
		727
698	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	728	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
699	pango_layout_set_font_description (RETVAL->pl, default_font);	729	layout_update_font (RETVAL);
700	OUTPUT:	730	OUTPUT:
701	RETVAL	731	RETVAL
702		732
703	void	733	void
704	DESTROY (CFClient::Layout self)	734	DESTROY (CFClient::Layout self)
705	CODE:	735	CODE:
706	g_object_unref (self->pl);	736	g_object_unref (self->pl);
707	Safefree (self);	737	Safefree (self);
708		738
		739	int
		740	is_rgba (CFClient::Layout self)
		741	CODE:
		742	RETVAL = self->rgba;
		743	OUTPUT:
		744	RETVAL
		745
709	void	746	void
710	set_text (CFClient::Layout self, SV *text_)	747	set_text (CFClient::Layout self, SV *text_)
711	CODE:	748	CODE:
712	{	749	{
713	STRLEN textlen;	750	STRLEN textlen;
…		…
731	CODE:	768	CODE:
732	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	769	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
733	SvUTF8_on (RETVAL);	770	SvUTF8_on (RETVAL);
734	OUTPUT:	771	OUTPUT:
735	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;
736		781
737	void	782	void
738	set_font (CFClient::Layout self, CFClient::Font font = 0)	783	set_font (CFClient::Layout self, CFClient::Font font = 0)
739	CODE:	784	CODE:
740	if (self->font != font)	785	if (self->font != font)
…		…
798	render (CFClient::Layout self)	843	render (CFClient::Layout self)
799	PPCODE:	844	PPCODE:
800	{	845	{
801	SV *retval;	846	SV *retval;
802	int w, h;	847	int w, h;
803	FT_Bitmap bitmap;
804		848
805	layout_get_pixel_size (self, &w, &h);	849	layout_get_pixel_size (self, &w, &h);
806		850
		851	if (self->rgba)
		852	{
		853	cairo_surface_t *surface;
		854	cairo_t *cairo;
		855
		856	retval = newSV (w * h * 4);
		857	SvPOK_only (retval);
		858	SvCUR_set (retval, w * h * 4);
		859
		860	memset (SvPVX (retval), 0, w * h * 4);
		861
		862	surface = cairo_image_surface_create_for_data (
		863	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		864	cairo = cairo_create (surface);
		865	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		866
		867	pango_cairo_show_layout (cairo, self->pl);
		868
		869	cairo_destroy (cairo);
		870	cairo_surface_destroy (surface);
		871
		872	// what a mess, and its premultiplied, too :(
		873	{
		874	uint32_t p = (uint32_t )SvPVX (retval);
		875	uint32_t e = p + w h;
		876
		877	while (p < e)
		878	{
		879	uint32_t rgba = *p;
		880	rgba = (rgba >> 24) \| (rgba << 8);
		881	rgba = SDL_SwapBE32 (rgba);
		882	*p++ = rgba;
		883	}
		884	}
		885
		886	EXTEND (SP, 5);
		887	PUSHs (sv_2mortal (newSViv (w)));
		888	PUSHs (sv_2mortal (newSViv (h)));
		889	PUSHs (sv_2mortal (retval));
		890	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		891	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		892	}
		893	else
		894	{
		895	FT_Bitmap bitmap;
		896
807	retval = newSV (w * h);	897	retval = newSV (w * h);
808	SvPOK_only (retval);	898	SvPOK_only (retval);
809	SvCUR_set (retval, w * h);	899	SvCUR_set (retval, w * h);
810		900
811	bitmap.rows = h;	901	bitmap.rows = h;
812	bitmap.width = w;	902	bitmap.width = w;
813	bitmap.pitch = w;	903	bitmap.pitch = w;
814	bitmap.buffer = (unsigned char*)SvPVX (retval);	904	bitmap.buffer = (unsigned char*)SvPVX (retval);
815	bitmap.num_grays = 256;	905	bitmap.num_grays = 256;
816	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	906	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
817		907
818	memset (bitmap.buffer, 0, w * h);	908	memset (bitmap.buffer, 0, w * h);
819		909
820	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	910	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
821		911
822	EXTEND (SP, 3);	912	EXTEND (SP, 5);
823	PUSHs (sv_2mortal (newSViv (w)));	913	PUSHs (sv_2mortal (newSViv (w)));
824	PUSHs (sv_2mortal (newSViv (h)));	914	PUSHs (sv_2mortal (newSViv (h)));
825	PUSHs (sv_2mortal (retval));	915	PUSHs (sv_2mortal (retval));
		916	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		917	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		918	}
826	}	919	}
827		920
828	MODULE = CFClient PACKAGE = CFClient::Texture	921	MODULE = CFClient PACKAGE = CFClient::Texture
829		922
830	void	923	void
831	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	924	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
832	PROTOTYPE: $$$;$$	925	PROTOTYPE: $$$;$$
		926	ALIAS:
		927	draw_quad_alpha = 1
		928	draw_quad_alpha_premultiplied = 2
833	CODE:	929	CODE:
834	{	930	{
835	HV hv = (HV )SvRV (self);	931	HV hv = (HV )SvRV (self);
836	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	932	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
837	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	933	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
842	{	938	{
843	w = SvNV (*hv_fetch (hv, "w", 1, 1));	939	w = SvNV (*hv_fetch (hv, "w", 1, 1));
844	h = SvNV (*hv_fetch (hv, "h", 1, 1));	940	h = SvNV (*hv_fetch (hv, "h", 1, 1));
845	}	941	}
846		942
		943	if (ix)
		944	{
		945	glEnable (GL_BLEND);
		946	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		947	}
		948
847	glBindTexture (GL_TEXTURE_2D, name);	949	glBindTexture (GL_TEXTURE_2D, name);
		950
848	if (wrap_mode) {	951	if (wrap_mode)
		952	{
849	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	953	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
850	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	954	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
851	}	955	}
		956
852	glBegin (GL_QUADS);	957	glBegin (GL_QUADS);
853	glTexCoord2f (0, 0); glVertex2f (x , y );	958	glTexCoord2f (0, 0); glVertex2f (x , y );
854	glTexCoord2f (0, t); glVertex2f (x , y + h);	959	glTexCoord2f (0, t); glVertex2f (x , y + h);
855	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	960	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
856	glTexCoord2f (s, 0); glVertex2f (x + w, y );	961	glTexCoord2f (s, 0); glVertex2f (x + w, y );
857	glEnd ();	962	glEnd ();
		963
		964	if (ix)
		965	glDisable (GL_BLEND);
858	}	966	}
859		967
860	MODULE = CFClient PACKAGE = CFClient::Map	968	MODULE = CFClient PACKAGE = CFClient::Map
861		969
862	CFClient::Map	970	CFClient::Map
…		…
1385	const_iv (GL_ONE_MINUS_DST_ALPHA),	1493	const_iv (GL_ONE_MINUS_DST_ALPHA),
1386	const_iv (GL_RGB),	1494	const_iv (GL_RGB),
1387	const_iv (GL_RGBA),	1495	const_iv (GL_RGBA),
1388	const_iv (GL_UNSIGNED_BYTE),	1496	const_iv (GL_UNSIGNED_BYTE),
1389	const_iv (GL_ALPHA),	1497	const_iv (GL_ALPHA),
		1498	const_iv (GL_LUMINANCE),
1390	const_iv (GL_FLOAT),	1499	const_iv (GL_FLOAT),
1391	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1500	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1392	const_iv (GL_COMPILE),	1501	const_iv (GL_COMPILE),
1393	const_iv (GL_TEXTURE_1D),	1502	const_iv (GL_TEXTURE_1D),
1394	const_iv (GL_TEXTURE_2D),	1503	const_iv (GL_TEXTURE_2D),
…		…
1483	void glEnd ()	1592	void glEnd ()
1484		1593
1485	void glColor (float r, float g, float b, float a = 1.0)	1594	void glColor (float r, float g, float b, float a = 1.0)
1486	PROTOTYPE: @	1595	PROTOTYPE: @
1487	CODE:	1596	CODE:
1488	glColor4ub (r * 255., g * 255., b * 255., a * 255.);	1597	glColor4ub (MIN ((int)(r * 255.f), 255),
		1598	MIN ((int)(g * 255.f), 255),
		1599	MIN ((int)(b * 255.f), 255),
		1600	MIN ((int)(a * 255.f), 255));
1489		1601
1490	void glVertex (float x, float y, float z = 0.)	1602	void glVertex (float x, float y, float z = 0.)
1491	CODE:	1603	CODE:
1492	glVertex3f (x, y, z);	1604	glVertex3f (x, y, z);
1493		1605

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.75 by root, Mon May 8 18:28:40 2006 UTC vs. Revision 1.82 by root, Mon May 15 00:15:08 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.75 by root, Mon May 8 18:28:40 2006 UTC vs.
Revision 1.82 by root, Mon May 15 00:15:08 2006 UTC