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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.97 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.111 by root, Mon Jun 12 13:26:14 2006 UTC

…		…
10	#include "XSUB.h"	10	#include "XSUB.h"
11		11
12	#include <math.h>	12	#include <math.h>
13	#include <string.h>	13	#include <string.h>
14	#include <stdio.h>	14	#include <stdio.h>
		15	#include <stdlib.h>
15		16
16	#include <SDL.h>	17	#include <SDL.h>
17	#include <SDL_endian.h>	18	#include <SDL_endian.h>
18	#include <SDL_image.h>	19	#include <SDL_image.h>
19	#include <SDL_mixer.h>	20	#include <SDL_mixer.h>
…		…
48	#define MAP_EXTEND_X 32	49	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	50	#define MAP_EXTEND_Y 512
50		51
51	#define MIN_FONT_HEIGHT 10	52	#define MIN_FONT_HEIGHT 10
52		53
53	#define GL_CALL(type,func,args) \	54	static struct
54	{ \	55	{
55	static int init_; \	56	#define GL_FUNC(ptr,name) ptr name;
56	static type fptr_; \	57	#include "glfunc.h"
57	\	58	#undef GL_FUNC
58	if (!init_) \	59	} gl;
59	{ \	60
60	init_ = 1; \	61	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \	62	{
62	} \	63	if (gl.BlendFuncSeparate)
63	\	64	gl.BlendFuncSeparate (sa, da, saa, daa);
64	if (fptr_) \	65	else if (gl.BlendFuncSeparateEXT)
65	fptr_ args; \	66	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	}	67	else
		68	glBlendFunc (sa, da);
		69	}
67		70
68	typedef Mix_Chunk *CFClient__MixChunk;	71	typedef Mix_Chunk *CFClient__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	72	typedef Mix_Music *CFClient__MixMusic;
70		73
71	typedef PangoFontDescription *CFClient__Font;	74	typedef PangoFontDescription *CFClient__Font;
…		…
83	static PangoFontMap ft2_fontmap, cairo_fontmap;	86	static PangoFontMap ft2_fontmap, cairo_fontmap;
84		87
85	static void	88	static void
86	substitute_func (FcPattern *pattern, gpointer data)	89	substitute_func (FcPattern *pattern, gpointer data)
87	{	90	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	91	FcPatternAddBool (pattern, FC_HINTING, 1);
		92	#ifdef FC_HINT_STYLE
		93	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		94	#endif
89	#ifdef _WIN32	95	#ifdef _WIN32
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91	#else	97	#else
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif	99	#endif
…		…
416	}	422	}
417		423
418	void	424	void
419	pango_init ()	425	pango_init ()
420	CODE:	426	CODE:
421	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx	427	// delayed, so it can pick up new fonts added by AddFontResourceEx
		428	{
		429	{
423	ft2_fontmap = pango_ft2_font_map_new ();	430	ft2_fontmap = pango_ft2_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	431	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	432	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426		433	}
		434	{
		435	cairo_font_options_t *fopt = cairo_font_options_create ();
427	cairo_fontmap = pango_cairo_font_map_get_default ();	436	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);	437	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
		438	#ifdef _WIN32
		439	// cairo looks like shit eaten twice on windows
		440	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
		441	#else
		442	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
		443	#endif
		444	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
		445	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
		446	pango_cairo_context_set_font_options (cairo_context, fopt);
		447	cairo_font_options_destroy (fopt);
		448	}
429	}	449	}
430		450
431	int	451	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	452	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
433		453
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	499	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	500	CODE:
481	RETVAL = !!SDL_SetVideoMode (	501	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	502	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	503	);
		504	if (RETVAL)
		505	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	506	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		507	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		508	# include "glfunc.h"
		509	# undef GL_FUNC
		510	}
485	OUTPUT:	511	OUTPUT:
486	RETVAL	512	RETVAL
487		513
488	void	514	void
489	SDL_GL_SwapBuffers ()	515	SDL_GL_SwapBuffers ()
…		…
678	CODE:	704	CODE:
679	fprintf (stderr, "FATAL: %s\n", message);	705	fprintf (stderr, "FATAL: %s\n", message);
680	#ifdef _WIN32	706	#ifdef _WIN32
681	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	707	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
682	#endif	708	#endif
683	exit (1);	709	_Exit (1);
		710
		711	void
		712	_exit (int retval)
		713	CODE:
		714	_Exit (retval);
684		715
685	MODULE = CFClient PACKAGE = CFClient::Font	716	MODULE = CFClient PACKAGE = CFClient::Font
686		717
687	CFClient::Font	718	CFClient::Font
688	new_from_file (SV class, char path, int id = 0)	719	new_from_file (SV class, char path, int id = 0)
…		…
709	MODULE = CFClient PACKAGE = CFClient::Layout	740	MODULE = CFClient PACKAGE = CFClient::Layout
710		741
711	CFClient::Layout	742	CFClient::Layout
712	new (SV *class, int rgba = 0)	743	new (SV *class, int rgba = 0)
713	CODE:	744	CODE:
714	#if _WIN32
715	//rgba = 0;//D make stext nicer, breaks TextView
716	#endif
717	New (0, RETVAL, 1, struct cf_layout);	745	New (0, RETVAL, 1, struct cf_layout);
718		746
719	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	747	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
720	RETVAL->rgba = rgba;	748	RETVAL->rgba = rgba;
721	RETVAL->r = 1.;	749	RETVAL->r = 1.;
…		…
765		793
766	SV *	794	SV *
767	get_text (CFClient::Layout self)	795	get_text (CFClient::Layout self)
768	CODE:	796	CODE:
769	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	797	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
770	SvUTF8_on (RETVAL);	798	sv_utf8_decode (RETVAL);
771	OUTPUT:	799	OUTPUT:
772	RETVAL	800	RETVAL
773		801
774	void	802	void
775	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	803	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
…		…
967	{	995	{
968	HV hv = (HV )SvRV (self);	996	HV hv = (HV )SvRV (self);
969	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	997	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
970	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	998	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
971	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	999	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
972	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
973		1000
974	if (items < 5)	1001	if (items < 5)
975	{	1002	{
976	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1003	w = SvNV (*hv_fetch (hv, "w", 1, 1));
977	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1004	h = SvNV (*hv_fetch (hv, "h", 1, 1));
978	}	1005	}
979		1006
980	if (ix)	1007	if (ix)
981	{	1008	{
982	glEnable (GL_BLEND);	1009	glEnable (GL_BLEND);
		1010
		1011	if (ix == 2)
983	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1012	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1013	else
		1014	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1015	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1016
984	glEnable (GL_ALPHA_TEST);	1017	glEnable (GL_ALPHA_TEST);
985	glAlphaFunc (GL_GREATER, 0.01f);	1018	glAlphaFunc (GL_GREATER, 0.01f);
986	}	1019	}
987		1020
988	glBindTexture (GL_TEXTURE_2D, name);	1021	glBindTexture (GL_TEXTURE_2D, name);
989
990	if (wrap_mode)
991	{
992	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
993	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
994	}
995		1022
996	glBegin (GL_QUADS);	1023	glBegin (GL_QUADS);
997	glTexCoord2f (0, 0); glVertex2f (x , y );	1024	glTexCoord2f (0, 0); glVertex2f (x , y );
998	glTexCoord2f (0, t); glVertex2f (x , y + h);	1025	glTexCoord2f (0, t); glVertex2f (x , y + h);
999	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1026	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1032	DESTROY (CFClient::Map self)	1059	DESTROY (CFClient::Map self)
1033	CODE:	1060	CODE:
1034	{	1061	{
1035	map_clear (self);	1062	map_clear (self);
1036	Safefree (self->face);	1063	Safefree (self->face);
		1064	Safefree (self->tex);
1037	Safefree (self);	1065	Safefree (self);
1038	}	1066	}
1039		1067
1040	void	1068	void
1041	clear (CFClient::Map self)	1069	clear (CFClient::Map self)
…		…
1080	}	1108	}
1081		1109
1082	// somewhat hackish, but for textures that require it, it really	1110	// somewhat hackish, but for textures that require it, it really
1083	// improves the look, and most others don't suffer.	1111	// improves the look, and most others don't suffer.
1084	glBindTexture (GL_TEXTURE_2D, name);	1112	glBindTexture (GL_TEXTURE_2D, name);
1085	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	1113	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1086	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	1114	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1115	// use uglier nearest interpolation because linear suffers
		1116	// from transparent color bleeding and ugly wrapping effects.
		1117	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1087	}	1118	}
1088		1119
1089	int	1120	int
1090	ox (CFClient::Map self)	1121	ox (CFClient::Map self)
1091	ALIAS:	1122	ALIAS:
1092	oy = 1	1123	oy = 1
		1124	x = 2
		1125	y = 3
		1126	w = 4
		1127	h = 5
1093	CODE:	1128	CODE:
1094	switch (ix)	1129	switch (ix)
1095	{	1130	{
1096	case 0: RETVAL = self->ox; break;	1131	case 0: RETVAL = self->ox; break;
1097	case 1: RETVAL = self->oy; break;	1132	case 1: RETVAL = self->oy; break;
		1133	case 2: RETVAL = self->x; break;
		1134	case 3: RETVAL = self->y; break;
		1135	case 4: RETVAL = self->w; break;
		1136	case 5: RETVAL = self->h; break;
1098	}	1137	}
1099	OUTPUT:	1138	OUTPUT:
1100	RETVAL	1139	RETVAL
1101		1140
1102	void	1141	void
…		…
1539	const_iv (GL_RESCALE_NORMAL),	1578	const_iv (GL_RESCALE_NORMAL),
1540	const_iv (GL_AND),	1579	const_iv (GL_AND),
1541	const_iv (GL_ONE),	1580	const_iv (GL_ONE),
1542	const_iv (GL_ZERO),	1581	const_iv (GL_ZERO),
1543	const_iv (GL_SRC_ALPHA),	1582	const_iv (GL_SRC_ALPHA),
1544	const_iv (GL_SRC_ALPHA_SATURATE),	1583	const_iv (GL_DST_ALPHA),
1545	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1584	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1546	const_iv (GL_ONE_MINUS_DST_ALPHA),	1585	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1586	const_iv (GL_SRC_ALPHA_SATURATE),
1547	const_iv (GL_RGB),	1587	const_iv (GL_RGB),
1548	const_iv (GL_RGBA),	1588	const_iv (GL_RGBA),
1549	const_iv (GL_UNSIGNED_BYTE),	1589	const_iv (GL_UNSIGNED_BYTE),
1550	const_iv (GL_UNSIGNED_SHORT),	1590	const_iv (GL_UNSIGNED_SHORT),
1551	const_iv (GL_UNSIGNED_INT),	1591	const_iv (GL_UNSIGNED_INT),
…		…
1562	const_iv (GL_TEXTURE_MAG_FILTER),	1602	const_iv (GL_TEXTURE_MAG_FILTER),
1563	const_iv (GL_TEXTURE_MIN_FILTER),	1603	const_iv (GL_TEXTURE_MIN_FILTER),
1564	const_iv (GL_TEXTURE_ENV_MODE),	1604	const_iv (GL_TEXTURE_ENV_MODE),
1565	const_iv (GL_TEXTURE_WRAP_S),	1605	const_iv (GL_TEXTURE_WRAP_S),
1566	const_iv (GL_TEXTURE_WRAP_T),	1606	const_iv (GL_TEXTURE_WRAP_T),
		1607	const_iv (GL_REPEAT),
1567	const_iv (GL_CLAMP),	1608	const_iv (GL_CLAMP),
1568	const_iv (GL_REPEAT),	1609	const_iv (GL_CLAMP_TO_EDGE),
1569	const_iv (GL_NEAREST),	1610	const_iv (GL_NEAREST),
1570	const_iv (GL_LINEAR),	1611	const_iv (GL_LINEAR),
1571	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1612	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1572	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1613	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1573	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1614	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1641		1682
1642	void glHint (int target, int mode)	1683	void glHint (int target, int mode)
1643		1684
1644	void glBlendFunc (int sfactor, int dfactor)	1685	void glBlendFunc (int sfactor, int dfactor)
1645		1686
		1687	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1688	CODE:
		1689	gl_BlendFuncSeparate (sa, da, saa, daa);
		1690
1646	void glDepthMask (int flag)	1691	void glDepthMask (int flag)
1647		1692
1648	void glLogicOp (int opcode)	1693	void glLogicOp (int opcode)
1649		1694
1650	void glColorMask (int red, int green, int blue, int alpha)	1695	void glColorMask (int red, int green, int blue, int alpha)
…		…
1683		1728
1684	void glEnd ()	1729	void glEnd ()
1685		1730
1686	void glColor (float r, float g, float b, float a = 1.0)	1731	void glColor (float r, float g, float b, float a = 1.0)
1687	PROTOTYPE: @	1732	PROTOTYPE: @
		1733	ALIAS:
		1734	glColor_premultiply = 1
1688	CODE:	1735	CODE:
		1736	if (ix)
		1737	{
		1738	r *= a;
		1739	g *= a;
		1740	b *= a;
		1741	}
1689	// microsoft visual "c" rounds instead of truncating...	1742	// microsoft visual "c" rounds instead of truncating...
1690	glColor4ub (MIN ((int)(r * 255.f), 255),	1743	glColor4ub (MIN ((int)(r * 256.f), 255),
1691	MIN ((int)(g * 255.f), 255),	1744	MIN ((int)(g * 256.f), 255),
1692	MIN ((int)(b * 255.f), 255),	1745	MIN ((int)(b * 256.f), 255),
1693	MIN ((int)(a * 255.f), 255));	1746	MIN ((int)(a * 256.f), 255));
1694		1747
1695	void glInterleavedArrays (int format, int stride, char *data)	1748	void glInterleavedArrays (int format, int stride, char *data)
1696		1749
1697	void glDrawElements (int mode, int count, int type, char *indices)	1750	void glDrawElements (int mode, int count, int type, char *indices)
1698		1751
…		…
1721		1774
1722	void glBindTexture (int target, int name)	1775	void glBindTexture (int target, int name)
1723		1776
1724	void glConvolutionParameter (int target, int pname, float params)	1777	void glConvolutionParameter (int target, int pname, float params)
1725	CODE:	1778	CODE:
1726	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1779	if (gl.ConvolutionParameterf)
		1780	gl.ConvolutionParameterf (target, pname, params);
1727		1781
1728	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1782	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1729	CODE:	1783	CODE:
1730	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1784	if (gl.ConvolutionFilter2D)
1731	(target, internalformat, width, height, format, type, data));	1785	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1732		1786
1733	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1787	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1734	CODE:	1788	CODE:
1735	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1789	if (gl.SeparableFilter2D)
1736	(target, internalformat, width, height, format, type, row, column));	1790	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1737		1791
1738	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1792	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1739		1793
1740	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1794	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1741		1795

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.97 by root, Fri May 26 18:28:23 2006 UTC vs. Revision 1.111 by root, Mon Jun 12 13:26:14 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.97 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.111 by root, Mon Jun 12 13:26:14 2006 UTC