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

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.79 by root, Sun May 14 22:24:14 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.79 by root, Sun May 14 22:24:14 2006 UTC