[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.74 by root, Sat May 6 20:14:57 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);
		273	}
		274
		275	static void
		276	channel_finished (int channel)
		277	{
		278	SDL_UserEvent ev;
		279
		280	ev.type = SDL_USEREVENT;
		281	ev.code = 1;
		282	ev.data1 = (void *)(long)channel;
		283	ev.data2 = 0;
		284
		285	SDL_PushEvent ((SDL_Event *)&ev);
242	}	286	}
243		287
244	MODULE = CFClient PACKAGE = CFClient	288	MODULE = CFClient PACKAGE = CFClient
245		289
246	PROTOTYPES: ENABLE	290	PROTOTYPES: ENABLE
…		…
426		470
427	while (SDL_PollEvent (&ev))	471	while (SDL_PollEvent (&ev))
428	{	472	{
429	HV *hv = newHV ();	473	HV *hv = newHV ();
430	hv_store (hv, "type", 4, newSViv (ev.type), 0);	474	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		475
431	switch (ev.type)	476	switch (ev.type)
432	{	477	{
433	case SDL_KEYDOWN:	478	case SDL_KEYDOWN:
434	case SDL_KEYUP:	479	case SDL_KEYUP:
435	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	480	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
455	case SDL_MOUSEBUTTONUP:	500	case SDL_MOUSEBUTTONUP:
456	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	501	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
457	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	502	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
458	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	503	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
459	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	504	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		505	break;
		506
		507	case SDL_USEREVENT:
		508	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		509	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		510	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		511	break;
460	}	512	}
461		513
462	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	514	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
463	}	515	}
464	}	516	}
465		517
466	int	518	int
467	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	519	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
		520	POSTCALL:
		521	Mix_HookMusicFinished (music_finished);
		522	Mix_ChannelFinished (channel_finished);
468		523
469	void	524	void
470	Mix_CloseAudio ()	525	Mix_CloseAudio ()
471		526
472	int	527	int
…		…
495		550
496	void	551	void
497	add_font (char *file)	552	add_font (char *file)
498	CODE:	553	CODE:
499	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	554	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		555
512	void	556	void
513	load_image_inline (SV *image_)	557	load_image_inline (SV *image_)
514	ALIAS:	558	ALIAS:
515	load_image_file = 1	559	load_image_file = 1
…		…
597	PUSHs (sv_2mortal (newSViv (b / y)));	641	PUSHs (sv_2mortal (newSViv (b / y)));
598	PUSHs (sv_2mortal (newSViv (a / y)));	642	PUSHs (sv_2mortal (newSViv (a / y)));
599	}	643	}
600		644
601	void	645	void
		646	error (char *message)
		647	CODE:
		648	#ifdef _WIN32
		649	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
		650	#else
		651	fprintf (stderr, "ERROR: %s\n", message);
		652	#endif
		653
		654	void
602	fatal (char *message)	655	fatal (char *message)
603	CODE:	656	CODE:
604	#ifdef _WIN32	657	#ifdef _WIN32
605	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	658	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
606	#else	659	#else
607	fprintf (stderr, "FATAL: %s\n", message);	660	fprintf (stderr, "FATAL: %s\n", message);
608	#endif	661	#endif
609	exit (1);	662	exit (1);
610		663
		664	MODULE = CFClient PACKAGE = CFClient::Font
		665
		666	CFClient::Font
		667	new_from_file (SV class, char path, int id = 0)
		668	CODE:
		669	{
		670	int count;
		671	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
		672	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
		673	FcPatternDestroy (pattern);
		674	}
		675	OUTPUT:
		676	RETVAL
		677
		678	void
		679	DESTROY (CFClient::Font self)
		680	CODE:
		681	pango_font_description_free (self);
		682
		683	void
		684	make_default (CFClient::Font self)
		685	CODE:
		686	default_font = self;
		687
611	MODULE = CFClient PACKAGE = CFClient::Layout	688	MODULE = CFClient PACKAGE = CFClient::Layout
612		689
613	CFClient::Layout	690	CFClient::Layout
614	new (SV *class, int base_height = 10)	691	new (SV *class, int base_height = MIN_FONT_HEIGHT)
615	CODE:	692	CODE:
616	New (0, RETVAL, 1, struct cf_layout);	693	New (0, RETVAL, 1, struct cf_layout);
		694	RETVAL->pl = pango_layout_new (context);
617	RETVAL->base_height = base_height;	695	RETVAL->base_height = base_height;
618	RETVAL->pl = pango_layout_new (context);	696	RETVAL->font = 0;
619	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	697	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
		698	pango_layout_set_font_description (RETVAL->pl, default_font);
620	OUTPUT:	699	OUTPUT:
621	RETVAL	700	RETVAL
622		701
623	void	702	void
624	DESTROY (CFClient::Layout self)	703	DESTROY (CFClient::Layout self)
…		…
653	SvUTF8_on (RETVAL);	732	SvUTF8_on (RETVAL);
654	OUTPUT:	733	OUTPUT:
655	RETVAL	734	RETVAL
656		735
657	void	736	void
		737	set_font (CFClient::Layout self, CFClient::Font font = 0)
		738	CODE:
		739	if (self->font != font)
		740	{
		741	self->font = font;
		742	layout_update_font (self);
		743	}
		744
		745	void
658	set_height (CFClient::Layout self, int base_height)	746	set_height (CFClient::Layout self, int base_height)
659	CODE:	747	CODE:
		748	if (self->base_height != base_height)
		749	{
660	self->base_height = base_height;	750	self->base_height = base_height;
		751	layout_update_font (self);
		752	}
661		753
662	void	754	void
663	set_width (CFClient::Layout self, int max_width = -1)	755	set_width (CFClient::Layout self, int max_width = -1)
664	CODE:	756	CODE:
665	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	757	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
…		…
668	size (CFClient::Layout self)	760	size (CFClient::Layout self)
669	PPCODE:	761	PPCODE:
670	{	762	{
671	int w, h;	763	int w, h;
672		764
673	layout_update (self);
674	layout_get_pixel_size (self, &w, &h);	765	layout_get_pixel_size (self, &w, &h);
675		766
676	EXTEND (SP, 2);	767	EXTEND (SP, 2);
677	PUSHs (sv_2mortal (newSViv (w)));	768	PUSHs (sv_2mortal (newSViv (w)));
678	PUSHs (sv_2mortal (newSViv (h)));	769	PUSHs (sv_2mortal (newSViv (h)));
…		…
681	int	772	int
682	xy_to_index (CFClient::Layout self, int x, int y)	773	xy_to_index (CFClient::Layout self, int x, int y)
683	CODE:	774	CODE:
684	{	775	{
685	int index, trailing;	776	int index, trailing;
686
687	layout_update (self);
688	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	777	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
689
690	RETVAL = index;	778	RETVAL = index;
691	}	779	}
692	OUTPUT:	780	OUTPUT:
693	RETVAL	781	RETVAL
694		782
695	void	783	void
696	cursor_pos (CFClient::Layout self, int index)	784	cursor_pos (CFClient::Layout self, int index)
697	PPCODE:	785	PPCODE:
698	{	786	{
699	PangoRectangle strong_pos;	787	PangoRectangle strong_pos;
700	layout_update (self);
701	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	788	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
702		789
703	EXTEND (SP, 3);	790	EXTEND (SP, 3);
704	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	791	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
705	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	792	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
…		…
712	{	799	{
713	SV *retval;	800	SV *retval;
714	int w, h;	801	int w, h;
715	FT_Bitmap bitmap;	802	FT_Bitmap bitmap;
716		803
717	layout_update (self);
718	layout_get_pixel_size (self, &w, &h);	804	layout_get_pixel_size (self, &w, &h);
719		805
720	retval = newSV (w * h);	806	retval = newSV (w * h);
721	SvPOK_only (retval);	807	SvPOK_only (retval);
722	SvCUR_set (retval, w * h);	808	SvCUR_set (retval, w * h);
…		…
933	cell->darkness = -1;	1019	cell->darkness = -1;
934	}	1020	}
935	}	1021	}
936		1022
937	SV *	1023	SV *
938	mapmap (CFClient::Map self, int w, int h)	1024	mapmap (CFClient::Map self, int x0, int y0, int w, int h)
939	CODE:	1025	CODE:
940	{	1026	{
941	int x0, x1, x;	1027	int x1, x;
942	int y0, y1, y;	1028	int y1, y;
943	int z;	1029	int z;
944	SV map_sv = newSV (w h * sizeof (uint32_t));	1030	SV map_sv = newSV (w h * sizeof (uint32_t));
945	uint32_t map = (uint32_t )SvPVX (map_sv);	1031	uint32_t map = (uint32_t )SvPVX (map_sv);
946		1032
947	SvPOK_only (map_sv);	1033	SvPOK_only (map_sv);
948	SvCUR_set (map_sv, w * h * sizeof (uint32_t));	1034	SvCUR_set (map_sv, w * h * sizeof (uint32_t));
949		1035
950	x0 = self->x - w / 2; x1 = x0 + w;	1036	x0 += self->x; x1 = x0 + w;
951	y0 = self->y - h / 2; y1 = y0 + h;	1037	y0 += self->y; y1 = y0 + h;
952		1038
953	for (y = y0; y < y1; y++)	1039	for (y = y0; y < y1; y++)
954	{	1040	{
955	maprow *row = 0 <= y && y < self->rows	1041	maprow *row = 0 <= y && y < self->rows
956	? self->row + y	1042	? self->row + y
…		…
1096	data++ = 0; / version 0 format */	1182	data++ = 0; / version 0 format */
1097	data++ = w >> 8; data++ = w;	1183	data++ = w >> 8; data++ = w;
1098	data++ = h >> 8; data++ = h;	1184	data++ = h >> 8; data++ = h;
1099		1185
1100	// we need to do this 'cause we don't keep an absolute coord system for rows	1186	// we need to do this 'cause we don't keep an absolute coord system for rows
1101	// TODO: treat rows as we treat	1187	// TODO: treat rows as we treat columns
1102	map_get_row (self, y0 + self->y - self->oy);//D	1188	map_get_row (self, y0 + self->y - self->oy);//D
1103	map_get_row (self, y0 + self->y - self->oy + h - 1);//D	1189	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1104		1190
1105	x0 += self->x - self->ox;	1191	x0 += self->x - self->ox;
1106	y0 += self->y - self->oy;	1192	y0 += self->y - self->oy;
…		…
1170		1256
1171	w = data++ << 8; w \|= data++;	1257	w = data++ << 8; w \|= data++;
1172	h = data++ << 8; h \|= data++;	1258	h = data++ << 8; h \|= data++;
1173		1259
1174	// we need to do this 'cause we don't keep an absolute coord system for rows	1260	// we need to do this 'cause we don't keep an absolute coord system for rows
1175	// TODO: treat rows as we treat	1261	// TODO: treat rows as we treat columns
1176	map_get_row (self, y0 + self->y - self->oy);//D	1262	map_get_row (self, y0 + self->y - self->oy);//D
1177	map_get_row (self, y0 + self->y - self->oy + h - 1);//D	1263	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1178		1264
1179	x0 += self->x - self->ox;	1265	x0 += self->x - self->ox;
1180	y0 += self->y - self->oy;	1266	y0 += self->y - self->oy;
…		…
1284	} *civ, const_iv[] = {	1370	} *civ, const_iv[] = {
1285	# define const_iv(name) { # name, (IV)name }	1371	# define const_iv(name) { # name, (IV)name }
1286	const_iv (GL_COLOR_MATERIAL),	1372	const_iv (GL_COLOR_MATERIAL),
1287	const_iv (GL_SMOOTH),	1373	const_iv (GL_SMOOTH),
1288	const_iv (GL_FLAT),	1374	const_iv (GL_FLAT),
		1375	const_iv (GL_DITHER),
1289	const_iv (GL_BLEND),	1376	const_iv (GL_BLEND),
		1377	const_iv (GL_SCISSOR_TEST),
1290	const_iv (GL_AND),	1378	const_iv (GL_AND),
		1379	const_iv (GL_ONE),
		1380	const_iv (GL_ZERO),
1291	const_iv (GL_SRC_ALPHA),	1381	const_iv (GL_SRC_ALPHA),
		1382	const_iv (GL_SRC_ALPHA_SATURATE),
1292	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1383	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1384	const_iv (GL_ONE_MINUS_DST_ALPHA),
1293	const_iv (GL_RGB),	1385	const_iv (GL_RGB),
1294	const_iv (GL_RGBA),	1386	const_iv (GL_RGBA),
1295	const_iv (GL_UNSIGNED_BYTE),	1387	const_iv (GL_UNSIGNED_BYTE),
1296	const_iv (GL_ALPHA4),
1297	const_iv (GL_ALPHA),	1388	const_iv (GL_ALPHA),
1298	const_iv (GL_FLOAT),	1389	const_iv (GL_FLOAT),
1299	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1390	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1300	const_iv (GL_COMPILE),	1391	const_iv (GL_COMPILE),
1301	const_iv (GL_TEXTURE_1D),	1392	const_iv (GL_TEXTURE_1D),
…		…
1308	const_iv (GL_TEXTURE_WRAP_T),	1399	const_iv (GL_TEXTURE_WRAP_T),
1309	const_iv (GL_CLAMP),	1400	const_iv (GL_CLAMP),
1310	const_iv (GL_REPEAT),	1401	const_iv (GL_REPEAT),
1311	const_iv (GL_NEAREST),	1402	const_iv (GL_NEAREST),
1312	const_iv (GL_LINEAR),	1403	const_iv (GL_LINEAR),
		1404	const_iv (GL_NEAREST_MIPMAP_NEAREST),
		1405	const_iv (GL_LINEAR_MIPMAP_NEAREST),
		1406	const_iv (GL_NEAREST_MIPMAP_LINEAR),
		1407	const_iv (GL_LINEAR_MIPMAP_LINEAR),
		1408	const_iv (GL_GENERATE_MIPMAP),
1313	const_iv (GL_MODULATE),	1409	const_iv (GL_MODULATE),
		1410	const_iv (GL_DECAL),
1314	const_iv (GL_REPLACE),	1411	const_iv (GL_REPLACE),
1315	const_iv (GL_COLOR_BUFFER_BIT),	1412	const_iv (GL_COLOR_BUFFER_BIT),
1316	const_iv (GL_PROJECTION),	1413	const_iv (GL_PROJECTION),
1317	const_iv (GL_MODELVIEW),	1414	const_iv (GL_MODELVIEW),
1318	const_iv (GL_COLOR_LOGIC_OP),	1415	const_iv (GL_COLOR_LOGIC_OP),
		1416	const_iv (GL_SEPARABLE_2D),
1319	const_iv (GL_CONVOLUTION_2D),	1417	const_iv (GL_CONVOLUTION_2D),
1320	const_iv (GL_CONVOLUTION_BORDER_MODE),	1418	const_iv (GL_CONVOLUTION_BORDER_MODE),
1321	const_iv (GL_CONSTANT_BORDER),	1419	const_iv (GL_CONSTANT_BORDER),
1322	const_iv (GL_LINES),	1420	const_iv (GL_LINES),
1323	const_iv (GL_QUADS),	1421	const_iv (GL_QUADS),
		1422	const_iv (GL_LINE_LOOP),
1324	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1423	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1325	const_iv (GL_FASTEST),	1424	const_iv (GL_FASTEST),
1326	# undef const_iv	1425	# undef const_iv
1327	};	1426	};
1328		1427
…		…
1347		1446
1348	void glBlendFunc (int sfactor, int dfactor)	1447	void glBlendFunc (int sfactor, int dfactor)
1349		1448
1350	void glLogicOp (int opcode)	1449	void glLogicOp (int opcode)
1351		1450
		1451	void glColorMask (int red, int green, int blue, int alpha)
		1452
1352	void glMatrixMode (int mode)	1453	void glMatrixMode (int mode)
1353		1454
1354	void glPushMatrix ()	1455	void glPushMatrix ()
1355		1456
1356	void glPopMatrix ()	1457	void glPopMatrix ()
1357		1458
1358	void glLoadIdentity ()	1459	void glLoadIdentity ()
1359		1460
		1461	# 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)	1462	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1361		1463
1362	void glViewport (int x, int y, int width, int height)	1464	void glViewport (int x, int y, int width, int height)
		1465
		1466	void glScissor (int x, int y, int width, int height)
1363		1467
1364	void glTranslate (float x, float y, float z = 0.)	1468	void glTranslate (float x, float y, float z = 0.)
1365	CODE:	1469	CODE:
1366	glTranslatef (x, y, z);	1470	glTranslatef (x, y, z);
1367		1471
1368	void glScale (float x, float y, float z)	1472	void glScale (float x, float y, float z = 1.)
1369	CODE:	1473	CODE:
1370	glScalef (x, y, z);	1474	glScalef (x, y, z);
1371		1475
1372	void glRotate (float angle, float x, float y, float z)	1476	void glRotate (float angle, float x, float y, float z)
1373	CODE:	1477	CODE:
…		…
1378	void glEnd ()	1482	void glEnd ()
1379		1483
1380	void glColor (float r, float g, float b, float a = 1.0)	1484	void glColor (float r, float g, float b, float a = 1.0)
1381	PROTOTYPE: @	1485	PROTOTYPE: @
1382	CODE:	1486	CODE:
1383	glColor4f (r, g, b, a);	1487	glColor4ub (r * 255., g * 255., b * 255., a * 255.);
1384		1488
1385	void glVertex (float x, float y, float z = 0.)	1489	void glVertex (float x, float y, float z = 0.)
1386	CODE:	1490	CODE:
1387	glVertex3f (x, y, z);	1491	glVertex3f (x, y, z);
1388		1492
…		…
1400		1504
1401	void glBindTexture (int target, int name)	1505	void glBindTexture (int target, int name)
1402		1506
1403	void glConvolutionParameter (int target, int pname, float params)	1507	void glConvolutionParameter (int target, int pname, float params)
1404	CODE:	1508	CODE:
1405	glConvolutionParameterf (target, pname, params);	1509	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1406		1510
1407	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1511	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1512	CODE:
		1513	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
		1514	(target, internalformat, width, height, format, type, data));
		1515
		1516	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		1517	CODE:
		1518	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
		1519	(target, internalformat, width, height, format, type, row, column));
1408		1520
1409	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1521	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1410		1522
1411	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1523	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1524
		1525	void glRasterPos (int x, int y)
		1526	CODE:
		1527	glRasterPos2i (x, y);
		1528
		1529	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1412		1530
1413	int glGenTexture ()	1531	int glGenTexture ()
1414	CODE:	1532	CODE:
1415	{	1533	{
1416	GLuint name;	1534	GLuint name;

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.74 by root, Sat May 6 20:14:57 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.74 by root, Sat May 6 20:14:57 2006 UTC