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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.53 by root, Wed Apr 19 21:38:04 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
…		…
414	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	445	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
415	OUTPUT:	446	OUTPUT:
416	RETVAL	447	RETVAL
417		448
418	void	449	void
		450	SDL_GL_SwapBuffers ()
		451
		452	void
419	SDL_PollEvent ()	453	SDL_PollEvent ()
420	PPCODE:	454	PPCODE:
421	{	455	{
422	SDL_Event ev;	456	SDL_Event ev;
423		457
…		…
460	}	494	}
461	}	495	}
462		496
463	int	497	int
464	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);
465		501
466	void	502	void
467	Mix_CloseAudio ()	503	Mix_CloseAudio ()
468		504
469	int	505	int
…		…
492		528
493	void	529	void
494	add_font (char *file)	530	add_font (char *file)
495	CODE:	531	CODE:
496	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	532	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
497
498	void
499	set_font (char *file)
500	CODE:
501	{
502	int count;
503	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )file, 0, 0, &count);
504	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
505	FcPatternDestroy (pattern);
506	pango_context_set_font_description (context, font);
507	}
508		533
509	void	534	void
510	load_image_inline (SV *image_)	535	load_image_inline (SV *image_)
511	ALIAS:	536	ALIAS:
512	load_image_file = 1	537	load_image_file = 1
…		…
603	#else	628	#else
604	fprintf (stderr, "FATAL: %s\n", message);	629	fprintf (stderr, "FATAL: %s\n", message);
605	#endif	630	#endif
606	exit (1);	631	exit (1);
607		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
608	MODULE = CFClient PACKAGE = CFClient::Layout	657	MODULE = CFClient PACKAGE = CFClient::Layout
609		658
610	CFClient::Layout	659	CFClient::Layout
611	new (SV *class, int base_height = 10)	660	new (SV *class, int base_height = MIN_FONT_HEIGHT)
612	CODE:	661	CODE:
613	New (0, RETVAL, 1, struct cf_layout);	662	New (0, RETVAL, 1, struct cf_layout);
		663	RETVAL->pl = pango_layout_new (context);
614	RETVAL->base_height = base_height;	664	RETVAL->base_height = base_height;
615	RETVAL->pl = pango_layout_new (context);	665	RETVAL->font = 0;
616	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);
617	OUTPUT:	668	OUTPUT:
618	RETVAL	669	RETVAL
619		670
620	void	671	void
621	DESTROY (CFClient::Layout self)	672	DESTROY (CFClient::Layout self)
…		…
650	SvUTF8_on (RETVAL);	701	SvUTF8_on (RETVAL);
651	OUTPUT:	702	OUTPUT:
652	RETVAL	703	RETVAL
653		704
654	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
655	set_height (CFClient::Layout self, int base_height)	715	set_height (CFClient::Layout self, int base_height)
656	CODE:	716	CODE:
		717	if (self->base_height != base_height)
		718	{
657	self->base_height = base_height;	719	self->base_height = base_height;
		720	layout_update_font (self);
		721	}
658		722
659	void	723	void
660	set_width (CFClient::Layout self, int max_width = -1)	724	set_width (CFClient::Layout self, int max_width = -1)
661	CODE:	725	CODE:
662	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);
…		…
665	size (CFClient::Layout self)	729	size (CFClient::Layout self)
666	PPCODE:	730	PPCODE:
667	{	731	{
668	int w, h;	732	int w, h;
669		733
670	layout_update (self);
671	layout_get_pixel_size (self, &w, &h);	734	layout_get_pixel_size (self, &w, &h);
672		735
673	EXTEND (SP, 2);	736	EXTEND (SP, 2);
674	PUSHs (sv_2mortal (newSViv (w)));	737	PUSHs (sv_2mortal (newSViv (w)));
675	PUSHs (sv_2mortal (newSViv (h)));	738	PUSHs (sv_2mortal (newSViv (h)));
…		…
678	int	741	int
679	xy_to_index (CFClient::Layout self, int x, int y)	742	xy_to_index (CFClient::Layout self, int x, int y)
680	CODE:	743	CODE:
681	{	744	{
682	int index, trailing;	745	int index, trailing;
683
684	layout_update (self);
685	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);
686
687	RETVAL = index;	747	RETVAL = index;
688	}	748	}
689	OUTPUT:	749	OUTPUT:
690	RETVAL	750	RETVAL
691		751
692	void	752	void
693	cursor_pos (CFClient::Layout self, int index)	753	cursor_pos (CFClient::Layout self, int index)
694	PPCODE:	754	PPCODE:
695	{	755	{
696	PangoRectangle strong_pos;	756	PangoRectangle strong_pos;
697	layout_update (self);
698	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	757	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
699		758
700	EXTEND (SP, 3);	759	EXTEND (SP, 3);
701	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	760	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
702	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	761	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
…		…
709	{	768	{
710	SV *retval;	769	SV *retval;
711	int w, h;	770	int w, h;
712	FT_Bitmap bitmap;	771	FT_Bitmap bitmap;
713		772
714	layout_update (self);
715	layout_get_pixel_size (self, &w, &h);	773	layout_get_pixel_size (self, &w, &h);
716		774
717	retval = newSV (w * h);	775	retval = newSV (w * h);
718	SvPOK_only (retval);	776	SvPOK_only (retval);
719	SvCUR_set (retval, w * h);	777	SvCUR_set (retval, w * h);
…		…
930	cell->darkness = -1;	988	cell->darkness = -1;
931	}	989	}
932	}	990	}
933		991
934	SV *	992	SV *
935	mapmap (CFClient::Map self, int w, int h)	993	mapmap (CFClient::Map self, int x0, int y0, int w, int h)
936	CODE:	994	CODE:
937	{	995	{
938	int x0, x1, x;	996	int x1, x;
939	int y0, y1, y;	997	int y1, y;
940	int z;	998	int z;
941	SV map_sv = newSV (w h * sizeof (uint32_t));	999	SV map_sv = newSV (w h * sizeof (uint32_t));
942	uint32_t map = (uint32_t )SvPVX (map_sv);	1000	uint32_t map = (uint32_t )SvPVX (map_sv);
943		1001
944	SvPOK_only (map_sv);	1002	SvPOK_only (map_sv);
945	SvCUR_set (map_sv, w * h * sizeof (uint32_t));	1003	SvCUR_set (map_sv, w * h * sizeof (uint32_t));
946		1004
947	x0 = self->x - w / 2; x1 = x0 + w;	1005	x0 += self->x; x1 = x0 + w;
948	y0 = self->y - h / 2; y1 = y0 + h;	1006	y0 += self->y; y1 = y0 + h;
949		1007
950	for (y = y0; y < y1; y++)	1008	for (y = y0; y < y1; y++)
951	{	1009	{
952	maprow *row = 0 <= y && y < self->rows	1010	maprow *row = 0 <= y && y < self->rows
953	? self->row + y	1011	? self->row + y
…		…
1093	data++ = 0; / version 0 format */	1151	data++ = 0; / version 0 format */
1094	data++ = w >> 8; data++ = w;	1152	data++ = w >> 8; data++ = w;
1095	data++ = h >> 8; data++ = h;	1153	data++ = h >> 8; data++ = h;
1096		1154
1097	// 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
1098	// TODO: treat rows as we treat	1156	// TODO: treat rows as we treat columns
1099	map_get_row (self, y0 + self->y - self->oy);//D	1157	map_get_row (self, y0 + self->y - self->oy);//D
1100	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
1101		1159
1102	x0 += self->x - self->ox;	1160	x0 += self->x - self->ox;
1103	y0 += self->y - self->oy;	1161	y0 += self->y - self->oy;
…		…
1167		1225
1168	w = data++ << 8; w \|= data++;	1226	w = data++ << 8; w \|= data++;
1169	h = data++ << 8; h \|= data++;	1227	h = data++ << 8; h \|= data++;
1170		1228
1171	// 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
1172	// TODO: treat rows as we treat	1230	// TODO: treat rows as we treat columns
1173	map_get_row (self, y0 + self->y - self->oy);//D	1231	map_get_row (self, y0 + self->y - self->oy);//D
1174	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
1175		1233
1176	x0 += self->x - self->ox;	1234	x0 += self->x - self->ox;
1177	y0 += self->y - self->oy;	1235	y0 += self->y - self->oy;
…		…
1268	CODE:	1326	CODE:
1269	RETVAL = Mix_PlayMusic (self, loops);	1327	RETVAL = Mix_PlayMusic (self, loops);
1270	OUTPUT:	1328	OUTPUT:
1271	RETVAL	1329	RETVAL
1272		1330
		1331	MODULE = CFClient PACKAGE = CFClient::OpenGL
		1332
		1333	BOOT:
		1334	{
		1335	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);
		1336	static const struct {
		1337	const char *name;
		1338	IV iv;
		1339	} *civ, const_iv[] = {
		1340	# define const_iv(name) { # name, (IV)name }
		1341	const_iv (GL_COLOR_MATERIAL),
		1342	const_iv (GL_SMOOTH),
		1343	const_iv (GL_FLAT),
		1344	const_iv (GL_BLEND),
		1345	const_iv (GL_AND),
		1346	const_iv (GL_SRC_ALPHA),
		1347	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1348	const_iv (GL_RGB),
		1349	const_iv (GL_RGBA),
		1350	const_iv (GL_UNSIGNED_BYTE),
		1351	const_iv (GL_ALPHA4),
		1352	const_iv (GL_ALPHA),
		1353	const_iv (GL_FLOAT),
		1354	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		1355	const_iv (GL_COMPILE),
		1356	const_iv (GL_TEXTURE_1D),
		1357	const_iv (GL_TEXTURE_2D),
		1358	const_iv (GL_TEXTURE_ENV),
		1359	const_iv (GL_TEXTURE_MAG_FILTER),
		1360	const_iv (GL_TEXTURE_MIN_FILTER),
		1361	const_iv (GL_TEXTURE_ENV_MODE),
		1362	const_iv (GL_TEXTURE_WRAP_S),
		1363	const_iv (GL_TEXTURE_WRAP_T),
		1364	const_iv (GL_CLAMP),
		1365	const_iv (GL_REPEAT),
		1366	const_iv (GL_NEAREST),
		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),
		1374	const_iv (GL_MODULATE),
		1375	const_iv (GL_REPLACE),
		1376	const_iv (GL_COLOR_BUFFER_BIT),
		1377	const_iv (GL_PROJECTION),
		1378	const_iv (GL_MODELVIEW),
		1379	const_iv (GL_COLOR_LOGIC_OP),
		1380	const_iv (GL_CONVOLUTION_2D),
		1381	const_iv (GL_CONVOLUTION_BORDER_MODE),
		1382	const_iv (GL_CONSTANT_BORDER),
		1383	const_iv (GL_LINES),
		1384	const_iv (GL_QUADS),
		1385	const_iv (GL_LINE_LOOP),
		1386	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
		1387	const_iv (GL_FASTEST),
		1388	# undef const_iv
		1389	};
		1390
		1391	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
		1392	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		1393	}
		1394
		1395	int glGetError ()
		1396
		1397	void glClear (int mask)
		1398
		1399	void glClearColor (float r, float g, float b, float a = 1.0)
		1400	PROTOTYPE: @
		1401
		1402	void glEnable (int cap)
		1403
		1404	void glDisable (int cap)
		1405
		1406	void glShadeModel (int mode)
		1407
		1408	void glHint (int target, int mode)
		1409
		1410	void glBlendFunc (int sfactor, int dfactor)
		1411
		1412	void glLogicOp (int opcode)
		1413
		1414	void glMatrixMode (int mode)
		1415
		1416	void glPushMatrix ()
		1417
		1418	void glPopMatrix ()
		1419
		1420	void glLoadIdentity ()
		1421
		1422	# near and far are due to microsofts buggy c compiler
		1423	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
		1424
		1425	void glViewport (int x, int y, int width, int height)
		1426
		1427	void glTranslate (float x, float y, float z = 0.)
		1428	CODE:
		1429	glTranslatef (x, y, z);
		1430
		1431	void glScale (float x, float y, float z = 1.)
		1432	CODE:
		1433	glScalef (x, y, z);
		1434
		1435	void glRotate (float angle, float x, float y, float z)
		1436	CODE:
		1437	glRotatef (angle, x, y, z);
		1438
		1439	void glBegin (int mode)
		1440
		1441	void glEnd ()
		1442
		1443	void glColor (float r, float g, float b, float a = 1.0)
		1444	PROTOTYPE: @
		1445	CODE:
		1446	glColor4f (r, g, b, a);
		1447
		1448	void glVertex (float x, float y, float z = 0.)
		1449	CODE:
		1450	glVertex3f (x, y, z);
		1451
		1452	void glTexCoord (float s, float t)
		1453	CODE:
		1454	glTexCoord2f (s, t);
		1455
		1456	void glTexEnv (int target, int pname, float param)
		1457	CODE:
		1458	glTexEnvf (target, pname, param);
		1459
		1460	void glTexParameter (int target, int pname, float param)
		1461	CODE:
		1462	glTexParameterf (target, pname, param);
		1463
		1464	void glBindTexture (int target, int name)
		1465
		1466	void glConvolutionParameter (int target, int pname, float params)
		1467	CODE:
		1468	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
		1469
		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));
		1474
		1475	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
		1476
		1477	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1478
		1479	int glGenTexture ()
		1480	CODE:
		1481	{
		1482	GLuint name;
		1483	glGenTextures (1, &name);
		1484	RETVAL = name;
		1485	}
		1486	OUTPUT:
		1487	RETVAL
		1488
		1489	void glDeleteTexture (int name)
		1490	CODE:
		1491	{
		1492	GLuint name_ = name;
		1493	glDeleteTextures (1, &name_);
		1494	}
		1495
		1496	int glGenList ()
		1497	CODE:
		1498	RETVAL = glGenLists (1);
		1499	OUTPUT:
		1500	RETVAL
		1501
		1502	void glDeleteList (int list)
		1503	CODE:
		1504	glDeleteLists (list, 1);
		1505
		1506	void glNewList (int list, int mode = GL_COMPILE)
		1507
		1508	void glEndList ()
		1509
		1510	void glCallList (int list)
		1511

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.53 by root, Wed Apr 19 21:38:04 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.53 by root, Wed Apr 19 21:38:04 2006 UTC vs.
Revision 1.64 by root, Mon Apr 24 08:11:31 2006 UTC