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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.54 by root, Wed Apr 19 23:37:48 2006 UTC vs.
Revision 1.64 by root, Mon Apr 24 08:11:31 2006 UTC

…		…
33	typedef signed char int8_t;	33	typedef signed char int8_t;
34	typedef signed short int16_t;	34	typedef signed short int16_t;
35	typedef signed int int32_t;	35	typedef signed int int32_t;
36	#endif	36	#endif
37		37
		38	#include "glext.h"
		39
38	#define FOW_DARKNESS 32	40	#define FOW_DARKNESS 32
39		41
40	#define MAP_EXTEND_X 32	42	#define MAP_EXTEND_X 32
41	#define MAP_EXTEND_Y 512	43	#define MAP_EXTEND_Y 512
42		44
		45	#define MIN_FONT_HEIGHT 10
		46
		47	#define GL_CALL(type,func,args) \
		48	{ \
		49	static int init_; \
		50	static type fptr_; \
		51	\
		52	if (!init_) \
		53	{ \
		54	init_ = 1; \
		55	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
		56	} \
		57	\
		58	if (fptr_) \
		59	fptr_ args; \
		60	}
		61
43	typedef Mix_Chunk *CFClient__MixChunk;	62	typedef Mix_Chunk *CFClient__MixChunk;
44	typedef Mix_Music *CFClient__MixMusic;	63	typedef Mix_Music *CFClient__MixMusic;
45		64
46	static PangoContext *context;	65	typedef PangoFontDescription *CFClient__Font;
47	static PangoFontMap *fontmap;
48		66
49	typedef struct cf_layout {	67	typedef struct cf_layout {
50	PangoLayout *pl;	68	PangoLayout *pl;
51	int base_height;	69	int base_height;
		70	CFClient__Font font;
52	} *CFClient__Layout;	71	} *CFClient__Layout;
		72
		73	static CFClient__Font default_font;
		74	static PangoContext *context;
		75	static PangoFontMap *fontmap;
53		76
54	static void	77	static void
55	substitute_func (FcPattern *pattern, gpointer data)	78	substitute_func (FcPattern *pattern, gpointer data)
56	{	79	{
57	FcPatternAddBool (pattern, FC_HINTING , 1);	80	FcPatternAddBool (pattern, FC_HINTING , 1);
58	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	81	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
59	}	82	}
60		83
61	static void	84	static void
62	layout_update (CFClient__Layout self)	85	layout_update_font (CFClient__Layout self)
63	{	86	{
64	/* use a random scale factor to account for unknown descenders, 0.8 works	87	/* use a random scale factor to account for unknown descenders, 0.8 works
65	* reasonably well with bitstream vera	88	* reasonably well with bitstream vera
66	*/	89	*/
67	PangoFontDescription *font = pango_context_get_font_description (context);	90	PangoFontDescription *font = self->font ? self->font : default_font;
68		91
69	int height = self->base_height * (PANGO_SCALE * 8 / 10);
70
71	if (pango_font_description_get_size (font) != height)
72	{
73	pango_font_description_set_absolute_size (font, height);	92	pango_font_description_set_absolute_size (font,
74	pango_layout_context_changed (self->pl);	93	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
75	}	94
		95	pango_layout_set_font_description (self->pl, font);
76	}	96	}
77		97
78	static void	98	static void
79	layout_get_pixel_size (CFClient__Layout self, int w, int h)	99	layout_get_pixel_size (CFClient__Layout self, int w, int h)
80	{	100	{
81	layout_update (self);
82
83	pango_layout_get_pixel_size (self->pl, w, h);	101	pango_layout_get_pixel_size (self->pl, w, h);
84		102
85	w = (w + 3) & ~3;	103	w = (w + 3) & ~3;
86	if (!w) w = 1;	104	if (!w) w = 1;
87	if (!h) h = 1;	105	if (!h) h = 1;
…		…
237	break;	255	break;
238		256
239	row->col[x - row->c0].darkness = -1;	257	row->col[x - row->c0].darkness = -1;
240	}	258	}
241	}	259	}
		260	}
		261
		262	static void
		263	music_finished ()
		264	{
		265	SDL_UserEvent ev;
		266
		267	ev.type = SDL_USEREVENT;
		268	ev.code = 0;
		269	ev.data1 = 0;
		270	ev.data2 = 0;
		271
		272	SDL_PushEvent ((SDL_Event *)&ev);
242	}	273	}
243		274
244	MODULE = CFClient PACKAGE = CFClient	275	MODULE = CFClient PACKAGE = CFClient
245		276
246	PROTOTYPES: ENABLE	277	PROTOTYPES: ENABLE
…		…
463	}	494	}
464	}	495	}
465		496
466	int	497	int
467	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	498	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)
		499	POSTCALL:
		500	Mix_HookMusicFinished (music_finished);
468		501
469	void	502	void
470	Mix_CloseAudio ()	503	Mix_CloseAudio ()
471		504
472	int	505	int
…		…
495		528
496	void	529	void
497	add_font (char *file)	530	add_font (char *file)
498	CODE:	531	CODE:
499	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	532	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
500
501	void
502	set_font (char *file)
503	CODE:
504	{
505	int count;
506	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )file, 0, 0, &count);
507	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
508	FcPatternDestroy (pattern);
509	pango_context_set_font_description (context, font);
510	}
511		533
512	void	534	void
513	load_image_inline (SV *image_)	535	load_image_inline (SV *image_)
514	ALIAS:	536	ALIAS:
515	load_image_file = 1	537	load_image_file = 1
…		…
606	#else	628	#else
607	fprintf (stderr, "FATAL: %s\n", message);	629	fprintf (stderr, "FATAL: %s\n", message);
608	#endif	630	#endif
609	exit (1);	631	exit (1);
610		632
		633	MODULE = CFClient PACKAGE = CFClient::Font
		634
		635	CFClient::Font
		636	new_from_file (SV class, char path)
		637	CODE:
		638	{
		639	int count;
		640	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, 0, 0, &count);
		641	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
		642	FcPatternDestroy (pattern);
		643	}
		644	OUTPUT:
		645	RETVAL
		646
		647	void
		648	DESTROY (CFClient::Font self)
		649	CODE:
		650	pango_font_description_free (self);
		651
		652	void
		653	make_default (CFClient::Font self)
		654	CODE:
		655	default_font = self;
		656
611	MODULE = CFClient PACKAGE = CFClient::Layout	657	MODULE = CFClient PACKAGE = CFClient::Layout
612		658
613	CFClient::Layout	659	CFClient::Layout
614	new (SV *class, int base_height = 10)	660	new (SV *class, int base_height = MIN_FONT_HEIGHT)
615	CODE:	661	CODE:
616	New (0, RETVAL, 1, struct cf_layout);	662	New (0, RETVAL, 1, struct cf_layout);
		663	RETVAL->pl = pango_layout_new (context);
617	RETVAL->base_height = base_height;	664	RETVAL->base_height = base_height;
618	RETVAL->pl = pango_layout_new (context);	665	RETVAL->font = 0;
619	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	666	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
		667	pango_layout_set_font_description (RETVAL->pl, default_font);
620	OUTPUT:	668	OUTPUT:
621	RETVAL	669	RETVAL
622		670
623	void	671	void
624	DESTROY (CFClient::Layout self)	672	DESTROY (CFClient::Layout self)
…		…
653	SvUTF8_on (RETVAL);	701	SvUTF8_on (RETVAL);
654	OUTPUT:	702	OUTPUT:
655	RETVAL	703	RETVAL
656		704
657	void	705	void
		706	set_font (CFClient::Layout self, CFClient::Font font = 0)
		707	CODE:
		708	if (self->font != font)
		709	{
		710	self->font = font;
		711	layout_update_font (self);
		712	}
		713
		714	void
658	set_height (CFClient::Layout self, int base_height)	715	set_height (CFClient::Layout self, int base_height)
659	CODE:	716	CODE:
		717	if (self->base_height != base_height)
		718	{
660	self->base_height = base_height;	719	self->base_height = base_height;
		720	layout_update_font (self);
		721	}
661		722
662	void	723	void
663	set_width (CFClient::Layout self, int max_width = -1)	724	set_width (CFClient::Layout self, int max_width = -1)
664	CODE:	725	CODE:
665	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	726	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
…		…
668	size (CFClient::Layout self)	729	size (CFClient::Layout self)
669	PPCODE:	730	PPCODE:
670	{	731	{
671	int w, h;	732	int w, h;
672		733
673	layout_update (self);
674	layout_get_pixel_size (self, &w, &h);	734	layout_get_pixel_size (self, &w, &h);
675		735
676	EXTEND (SP, 2);	736	EXTEND (SP, 2);
677	PUSHs (sv_2mortal (newSViv (w)));	737	PUSHs (sv_2mortal (newSViv (w)));
678	PUSHs (sv_2mortal (newSViv (h)));	738	PUSHs (sv_2mortal (newSViv (h)));
…		…
681	int	741	int
682	xy_to_index (CFClient::Layout self, int x, int y)	742	xy_to_index (CFClient::Layout self, int x, int y)
683	CODE:	743	CODE:
684	{	744	{
685	int index, trailing;	745	int index, trailing;
686
687	layout_update (self);
688	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	746	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
689
690	RETVAL = index;	747	RETVAL = index;
691	}	748	}
692	OUTPUT:	749	OUTPUT:
693	RETVAL	750	RETVAL
694		751
695	void	752	void
696	cursor_pos (CFClient::Layout self, int index)	753	cursor_pos (CFClient::Layout self, int index)
697	PPCODE:	754	PPCODE:
698	{	755	{
699	PangoRectangle strong_pos;	756	PangoRectangle strong_pos;
700	layout_update (self);
701	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	757	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
702		758
703	EXTEND (SP, 3);	759	EXTEND (SP, 3);
704	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	760	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
705	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	761	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
…		…
712	{	768	{
713	SV *retval;	769	SV *retval;
714	int w, h;	770	int w, h;
715	FT_Bitmap bitmap;	771	FT_Bitmap bitmap;
716		772
717	layout_update (self);
718	layout_get_pixel_size (self, &w, &h);	773	layout_get_pixel_size (self, &w, &h);
719		774
720	retval = newSV (w * h);	775	retval = newSV (w * h);
721	SvPOK_only (retval);	776	SvPOK_only (retval);
722	SvCUR_set (retval, w * h);	777	SvCUR_set (retval, w * h);
…		…
933	cell->darkness = -1;	988	cell->darkness = -1;
934	}	989	}
935	}	990	}
936		991
937	SV *	992	SV *
938	mapmap (CFClient::Map self, int w, int h)	993	mapmap (CFClient::Map self, int x0, int y0, int w, int h)
939	CODE:	994	CODE:
940	{	995	{
941	int x0, x1, x;	996	int x1, x;
942	int y0, y1, y;	997	int y1, y;
943	int z;	998	int z;
944	SV map_sv = newSV (w h * sizeof (uint32_t));	999	SV map_sv = newSV (w h * sizeof (uint32_t));
945	uint32_t map = (uint32_t )SvPVX (map_sv);	1000	uint32_t map = (uint32_t )SvPVX (map_sv);
946		1001
947	SvPOK_only (map_sv);	1002	SvPOK_only (map_sv);
948	SvCUR_set (map_sv, w * h * sizeof (uint32_t));	1003	SvCUR_set (map_sv, w * h * sizeof (uint32_t));
949		1004
950	x0 = self->x - w / 2; x1 = x0 + w;	1005	x0 += self->x; x1 = x0 + w;
951	y0 = self->y - h / 2; y1 = y0 + h;	1006	y0 += self->y; y1 = y0 + h;
952		1007
953	for (y = y0; y < y1; y++)	1008	for (y = y0; y < y1; y++)
954	{	1009	{
955	maprow *row = 0 <= y && y < self->rows	1010	maprow *row = 0 <= y && y < self->rows
956	? self->row + y	1011	? self->row + y
…		…
1096	data++ = 0; / version 0 format */	1151	data++ = 0; / version 0 format */
1097	data++ = w >> 8; data++ = w;	1152	data++ = w >> 8; data++ = w;
1098	data++ = h >> 8; data++ = h;	1153	data++ = h >> 8; data++ = h;
1099		1154
1100	// we need to do this 'cause we don't keep an absolute coord system for rows	1155	// we need to do this 'cause we don't keep an absolute coord system for rows
1101	// TODO: treat rows as we treat	1156	// TODO: treat rows as we treat columns
1102	map_get_row (self, y0 + self->y - self->oy);//D	1157	map_get_row (self, y0 + self->y - self->oy);//D
1103	map_get_row (self, y0 + self->y - self->oy + h - 1);//D	1158	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1104		1159
1105	x0 += self->x - self->ox;	1160	x0 += self->x - self->ox;
1106	y0 += self->y - self->oy;	1161	y0 += self->y - self->oy;
…		…
1170		1225
1171	w = data++ << 8; w \|= data++;	1226	w = data++ << 8; w \|= data++;
1172	h = data++ << 8; h \|= data++;	1227	h = data++ << 8; h \|= data++;
1173		1228
1174	// we need to do this 'cause we don't keep an absolute coord system for rows	1229	// we need to do this 'cause we don't keep an absolute coord system for rows
1175	// TODO: treat rows as we treat	1230	// TODO: treat rows as we treat columns
1176	map_get_row (self, y0 + self->y - self->oy);//D	1231	map_get_row (self, y0 + self->y - self->oy);//D
1177	map_get_row (self, y0 + self->y - self->oy + h - 1);//D	1232	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1178		1233
1179	x0 += self->x - self->ox;	1234	x0 += self->x - self->ox;
1180	y0 += self->y - self->oy;	1235	y0 += self->y - self->oy;
…		…
1308	const_iv (GL_TEXTURE_WRAP_T),	1363	const_iv (GL_TEXTURE_WRAP_T),
1309	const_iv (GL_CLAMP),	1364	const_iv (GL_CLAMP),
1310	const_iv (GL_REPEAT),	1365	const_iv (GL_REPEAT),
1311	const_iv (GL_NEAREST),	1366	const_iv (GL_NEAREST),
1312	const_iv (GL_LINEAR),	1367	const_iv (GL_LINEAR),
		1368	const_iv (GL_NEAREST_MIPMAP_NEAREST),
		1369	const_iv (GL_LINEAR_MIPMAP_NEAREST),
		1370	const_iv (GL_NEAREST_MIPMAP_LINEAR),
		1371	const_iv (GL_LINEAR_MIPMAP_LINEAR),
		1372	const_iv (GL_GENERATE_MIPMAP),
		1373	const_iv (GL_LINEAR),
1313	const_iv (GL_MODULATE),	1374	const_iv (GL_MODULATE),
1314	const_iv (GL_REPLACE),	1375	const_iv (GL_REPLACE),
1315	const_iv (GL_COLOR_BUFFER_BIT),	1376	const_iv (GL_COLOR_BUFFER_BIT),
1316	const_iv (GL_PROJECTION),	1377	const_iv (GL_PROJECTION),
1317	const_iv (GL_MODELVIEW),	1378	const_iv (GL_MODELVIEW),
…		…
1319	const_iv (GL_CONVOLUTION_2D),	1380	const_iv (GL_CONVOLUTION_2D),
1320	const_iv (GL_CONVOLUTION_BORDER_MODE),	1381	const_iv (GL_CONVOLUTION_BORDER_MODE),
1321	const_iv (GL_CONSTANT_BORDER),	1382	const_iv (GL_CONSTANT_BORDER),
1322	const_iv (GL_LINES),	1383	const_iv (GL_LINES),
1323	const_iv (GL_QUADS),	1384	const_iv (GL_QUADS),
		1385	const_iv (GL_LINE_LOOP),
1324	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1386	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1325	const_iv (GL_FASTEST),	1387	const_iv (GL_FASTEST),
1326	# undef const_iv	1388	# undef const_iv
1327	};	1389	};
1328		1390
…		…
1355		1417
1356	void glPopMatrix ()	1418	void glPopMatrix ()
1357		1419
1358	void glLoadIdentity ()	1420	void glLoadIdentity ()
1359		1421
		1422	# near and far are due to microsofts buggy c compiler
1360	void glOrtho (double left, double right, double bottom, double top, double near, double far)	1423	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1361		1424
1362	void glViewport (int x, int y, int width, int height)	1425	void glViewport (int x, int y, int width, int height)
1363		1426
1364	void glTranslate (float x, float y, float z = 0.)	1427	void glTranslate (float x, float y, float z = 0.)
1365	CODE:	1428	CODE:
1366	glTranslatef (x, y, z);	1429	glTranslatef (x, y, z);
1367		1430
1368	void glScale (float x, float y, float z)	1431	void glScale (float x, float y, float z = 1.)
1369	CODE:	1432	CODE:
1370	glScalef (x, y, z);	1433	glScalef (x, y, z);
1371		1434
1372	void glRotate (float angle, float x, float y, float z)	1435	void glRotate (float angle, float x, float y, float z)
1373	CODE:	1436	CODE:
…		…
1400		1463
1401	void glBindTexture (int target, int name)	1464	void glBindTexture (int target, int name)
1402		1465
1403	void glConvolutionParameter (int target, int pname, float params)	1466	void glConvolutionParameter (int target, int pname, float params)
1404	CODE:	1467	CODE:
1405	glConvolutionParameterf (target, pname, params);	1468	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1406		1469
1407	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1470	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1471	CODE:
		1472	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
		1473	(target, internalformat, width, height, format, type, data));
1408		1474
1409	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1475	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1410		1476
1411	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1477	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1412		1478

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.54 by root, Wed Apr 19 23:37:48 2006 UTC vs. Revision 1.64 by root, Mon Apr 24 08:11:31 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.54 by root, Wed Apr 19 23:37:48 2006 UTC vs.
Revision 1.64 by root, Mon Apr 24 08:11:31 2006 UTC