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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.64 by root, Mon Apr 24 08:11:31 2006 UTC vs.
Revision 1.82 by root, Mon May 15 00:15:08 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>
		5	# pragma warning(disable:4244)
3	#endif	6	#endif
4		7
5	#include "EXTERN.h"	8	#include "EXTERN.h"
6	#include "perl.h"	9	#include "perl.h"
7	#include "XSUB.h"	10	#include "XSUB.h"
8		11
		12	#include <math.h>
9	#include <string.h>	13	#include <string.h>
10	#include <stdio.h>	14	#include <stdio.h>
11		15
12	#include <SDL.h>	16	#include <SDL.h>
		17	#include <SDL_endian.h>
13	#include <SDL_image.h>	18	#include <SDL_image.h>
14	#include <SDL_mixer.h>	19	#include <SDL_mixer.h>
15	#include <SDL_opengl.h>	20	#include <SDL_opengl.h>
16		21
17	#include <glib/gmacros.h>	22	#include <glib/gmacros.h>
18		23
19	#include <pango/pango.h>	24	#include <pango/pango.h>
20	#include <pango/pangofc-fontmap.h>	25	#include <pango/pangofc-fontmap.h>
21	#include <pango/pangoft2.h>	26	#include <pango/pangoft2.h>
		27	#include <pango/pangocairo.h>
22		28
23	#ifndef _WIN32	29	#ifndef _WIN32
24	# include <sys/types.h>	30	# include <sys/types.h>
25	# include <sys/socket.h>	31	# include <sys/socket.h>
26	# include <netinet/in.h>	32	# include <netinet/in.h>
63	typedef Mix_Music *CFClient__MixMusic;	69	typedef Mix_Music *CFClient__MixMusic;
64		70
65	typedef PangoFontDescription *CFClient__Font;	71	typedef PangoFontDescription *CFClient__Font;
66		72
67	typedef struct cf_layout {	73	typedef struct cf_layout {
68	PangoLayout *pl;	74	PangoLayout *pl; // either derived from a cairo or ft2 context
		75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
		76	float r, g, b, a; // default color for rgba mode
69	int base_height;	77	int base_height;
70	CFClient__Font font;	78	CFClient__Font font;
71	} *CFClient__Layout;	79	} *CFClient__Layout;
72		80
73	static CFClient__Font default_font;	81	static CFClient__Font default_font;
74	static PangoContext *context;	82	static PangoContext ft2_context, cairo_context;
75	static PangoFontMap *fontmap;	83	static PangoFontMap ft2_fontmap, cairo_fontmap;
76		84
77	static void	85	static void
78	substitute_func (FcPattern *pattern, gpointer data)	86	substitute_func (FcPattern *pattern, gpointer data)
79	{	87	{
80	FcPatternAddBool (pattern, FC_HINTING , 1);	88	FcPatternAddBool (pattern, FC_HINTING , 1);
		89	#ifndef _WIN32
81	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	90	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
		91	#endif
82	}	92	}
83		93
84	static void	94	static void
85	layout_update_font (CFClient__Layout self)	95	layout_update_font (CFClient__Layout self)
86	{	96	{
…		…
98	static void	108	static void
99	layout_get_pixel_size (CFClient__Layout self, int w, int h)	109	layout_get_pixel_size (CFClient__Layout self, int w, int h)
100	{	110	{
101	pango_layout_get_pixel_size (self->pl, w, h);	111	pango_layout_get_pixel_size (self->pl, w, h);
102		112
103	w = (w + 3) & ~3;
104	if (!w) w = 1;	113	if (!w) w = 1;
105	if (!h) h = 1;	114	if (!h) h = 1;
		115
		116	w = (w + 3) & ~3;
106	}	117	}
107		118
108	typedef uint16_t mapface;	119	typedef uint16_t mapface;
109		120
110	typedef struct {	121	typedef struct {
…		…
258	}	269	}
259	}	270	}
260	}	271	}
261		272
262	static void	273	static void
263	music_finished ()	274	music_finished (void)
264	{	275	{
265	SDL_UserEvent ev;	276	SDL_UserEvent ev;
266		277
267	ev.type = SDL_USEREVENT;	278	ev.type = SDL_USEREVENT;
268	ev.code = 0;	279	ev.code = 0;
269	ev.data1 = 0;	280	ev.data1 = 0;
		281	ev.data2 = 0;
		282
		283	SDL_PushEvent ((SDL_Event *)&ev);
		284	}
		285
		286	static void
		287	channel_finished (int channel)
		288	{
		289	SDL_UserEvent ev;
		290
		291	ev.type = SDL_USEREVENT;
		292	ev.code = 1;
		293	ev.data1 = (void *)(long)channel;
270	ev.data2 = 0;	294	ev.data2 = 0;
271		295
272	SDL_PushEvent ((SDL_Event *)&ev);	296	SDL_PushEvent ((SDL_Event *)&ev);
273	}	297	}
274		298
…		…
385	# undef const_iv	409	# undef const_iv
386	};	410	};
387		411
388	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	412	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
389	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	413	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		414	}
390		415
		416	void
		417	pango_init ()
		418	CODE:
		419	{
		420	// delayed, so it can pick up new fonts added by AddFontResourceEx
391	fontmap = pango_ft2_font_map_new ();	421	ft2_fontmap = pango_ft2_font_map_new ();
392	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);	422	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
393	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);	423	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
		424
		425	cairo_fontmap = pango_cairo_font_map_get_default ();
		426	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
394	}	427	}
395		428
396	int	429	int
397	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	430	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
398		431
…		…
457		490
458	while (SDL_PollEvent (&ev))	491	while (SDL_PollEvent (&ev))
459	{	492	{
460	HV *hv = newHV ();	493	HV *hv = newHV ();
461	hv_store (hv, "type", 4, newSViv (ev.type), 0);	494	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		495
462	switch (ev.type)	496	switch (ev.type)
463	{	497	{
464	case SDL_KEYDOWN:	498	case SDL_KEYDOWN:
465	case SDL_KEYUP:	499	case SDL_KEYUP:
466	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	500	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
486	case SDL_MOUSEBUTTONUP:	520	case SDL_MOUSEBUTTONUP:
487	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	521	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
488	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	522	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
489	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	523	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
490	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	524	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		525	break;
		526
		527	case SDL_USEREVENT:
		528	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		529	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		530	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		531	break;
491	}	532	}
492		533
493	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	534	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
494	}	535	}
495	}	536	}
496		537
497	int	538	int
498	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	539	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
499	POSTCALL:	540	POSTCALL:
500	Mix_HookMusicFinished (music_finished);	541	Mix_HookMusicFinished (music_finished);
		542	Mix_ChannelFinished (channel_finished);
501		543
502	void	544	void
503	Mix_CloseAudio ()	545	Mix_CloseAudio ()
504		546
505	int	547	int
…		…
528		570
529	void	571	void
530	add_font (char *file)	572	add_font (char *file)
531	CODE:	573	CODE:
532	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	574	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
		575	#ifdef _WIN32
		576	// cairo... sigh... requires win2000
		577	AddFontResourceEx (file, FR_PRIVATE, 0);
		578	#endif
533		579
534	void	580	void
535	load_image_inline (SV *image_)	581	load_image_inline (SV *image_)
536	ALIAS:	582	ALIAS:
537	load_image_file = 1	583	load_image_file = 1
…		…
619	PUSHs (sv_2mortal (newSViv (b / y)));	665	PUSHs (sv_2mortal (newSViv (b / y)));
620	PUSHs (sv_2mortal (newSViv (a / y)));	666	PUSHs (sv_2mortal (newSViv (a / y)));
621	}	667	}
622		668
623	void	669	void
		670	error (char *message)
		671	CODE:
		672	#ifdef _WIN32
		673	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
		674	#else
		675	fprintf (stderr, "ERROR: %s\n", message);
		676	#endif
		677
		678	void
624	fatal (char *message)	679	fatal (char *message)
625	CODE:	680	CODE:
626	#ifdef _WIN32	681	#ifdef _WIN32
627	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	682	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
628	#else	683	#else
…		…
631	exit (1);	686	exit (1);
632		687
633	MODULE = CFClient PACKAGE = CFClient::Font	688	MODULE = CFClient PACKAGE = CFClient::Font
634		689
635	CFClient::Font	690	CFClient::Font
636	new_from_file (SV class, char path)	691	new_from_file (SV class, char path, int id = 0)
637	CODE:	692	CODE:
638	{	693	{
639	int count;	694	int count;
640	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, 0, 0, &count);	695	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
641	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	696	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
642	FcPatternDestroy (pattern);	697	FcPatternDestroy (pattern);
643	}	698	}
644	OUTPUT:	699	OUTPUT:
645	RETVAL	700	RETVAL
…		…
655	default_font = self;	710	default_font = self;
656		711
657	MODULE = CFClient PACKAGE = CFClient::Layout	712	MODULE = CFClient PACKAGE = CFClient::Layout
658		713
659	CFClient::Layout	714	CFClient::Layout
660	new (SV *class, int base_height = MIN_FONT_HEIGHT)	715	new (SV *class, int rgba = 0)
661	CODE:	716	CODE:
662	New (0, RETVAL, 1, struct cf_layout);	717	New (0, RETVAL, 1, struct cf_layout);
663	RETVAL->pl = pango_layout_new (context);	718
664	RETVAL->base_height = base_height;	719	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
		720	RETVAL->rgba = rgba;
		721	RETVAL->r = 1.;
		722	RETVAL->g = 1.;
		723	RETVAL->b = 1.;
		724	RETVAL->a = 1.;
		725	RETVAL->base_height = MIN_FONT_HEIGHT;
665	RETVAL->font = 0;	726	RETVAL->font = 0;
		727
666	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	728	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
667	pango_layout_set_font_description (RETVAL->pl, default_font);	729	layout_update_font (RETVAL);
668	OUTPUT:	730	OUTPUT:
669	RETVAL	731	RETVAL
670		732
671	void	733	void
672	DESTROY (CFClient::Layout self)	734	DESTROY (CFClient::Layout self)
673	CODE:	735	CODE:
674	g_object_unref (self->pl);	736	g_object_unref (self->pl);
675	Safefree (self);	737	Safefree (self);
676		738
		739	int
		740	is_rgba (CFClient::Layout self)
		741	CODE:
		742	RETVAL = self->rgba;
		743	OUTPUT:
		744	RETVAL
		745
677	void	746	void
678	set_text (CFClient::Layout self, SV *text_)	747	set_text (CFClient::Layout self, SV *text_)
679	CODE:	748	CODE:
680	{	749	{
681	STRLEN textlen;	750	STRLEN textlen;
…		…
699	CODE:	768	CODE:
700	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	769	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
701	SvUTF8_on (RETVAL);	770	SvUTF8_on (RETVAL);
702	OUTPUT:	771	OUTPUT:
703	RETVAL	772	RETVAL
		773
		774	void
		775	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
		776	CODE:
		777	self->r = r;
		778	self->g = g;
		779	self->b = b;
		780	self->a = a;
704		781
705	void	782	void
706	set_font (CFClient::Layout self, CFClient::Font font = 0)	783	set_font (CFClient::Layout self, CFClient::Font font = 0)
707	CODE:	784	CODE:
708	if (self->font != font)	785	if (self->font != font)
…		…
766	render (CFClient::Layout self)	843	render (CFClient::Layout self)
767	PPCODE:	844	PPCODE:
768	{	845	{
769	SV *retval;	846	SV *retval;
770	int w, h;	847	int w, h;
771	FT_Bitmap bitmap;
772		848
773	layout_get_pixel_size (self, &w, &h);	849	layout_get_pixel_size (self, &w, &h);
774		850
		851	if (self->rgba)
		852	{
		853	cairo_surface_t *surface;
		854	cairo_t *cairo;
		855
		856	retval = newSV (w * h * 4);
		857	SvPOK_only (retval);
		858	SvCUR_set (retval, w * h * 4);
		859
		860	memset (SvPVX (retval), 0, w * h * 4);
		861
		862	surface = cairo_image_surface_create_for_data (
		863	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		864	cairo = cairo_create (surface);
		865	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		866
		867	pango_cairo_show_layout (cairo, self->pl);
		868
		869	cairo_destroy (cairo);
		870	cairo_surface_destroy (surface);
		871
		872	// what a mess, and its premultiplied, too :(
		873	{
		874	uint32_t p = (uint32_t )SvPVX (retval);
		875	uint32_t e = p + w h;
		876
		877	while (p < e)
		878	{
		879	uint32_t rgba = *p;
		880	rgba = (rgba >> 24) \| (rgba << 8);
		881	rgba = SDL_SwapBE32 (rgba);
		882	*p++ = rgba;
		883	}
		884	}
		885
		886	EXTEND (SP, 5);
		887	PUSHs (sv_2mortal (newSViv (w)));
		888	PUSHs (sv_2mortal (newSViv (h)));
		889	PUSHs (sv_2mortal (retval));
		890	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		891	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		892	}
		893	else
		894	{
		895	FT_Bitmap bitmap;
		896
775	retval = newSV (w * h);	897	retval = newSV (w * h);
776	SvPOK_only (retval);	898	SvPOK_only (retval);
777	SvCUR_set (retval, w * h);	899	SvCUR_set (retval, w * h);
778		900
779	bitmap.rows = h;	901	bitmap.rows = h;
780	bitmap.width = w;	902	bitmap.width = w;
781	bitmap.pitch = w;	903	bitmap.pitch = w;
782	bitmap.buffer = (unsigned char*)SvPVX (retval);	904	bitmap.buffer = (unsigned char*)SvPVX (retval);
783	bitmap.num_grays = 256;	905	bitmap.num_grays = 256;
784	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	906	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
785		907
786	memset (bitmap.buffer, 0, w * h);	908	memset (bitmap.buffer, 0, w * h);
787		909
788	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	910	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
789		911
790	EXTEND (SP, 3);	912	EXTEND (SP, 5);
791	PUSHs (sv_2mortal (newSViv (w)));	913	PUSHs (sv_2mortal (newSViv (w)));
792	PUSHs (sv_2mortal (newSViv (h)));	914	PUSHs (sv_2mortal (newSViv (h)));
793	PUSHs (sv_2mortal (retval));	915	PUSHs (sv_2mortal (retval));
		916	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		917	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		918	}
794	}	919	}
795		920
796	MODULE = CFClient PACKAGE = CFClient::Texture	921	MODULE = CFClient PACKAGE = CFClient::Texture
797		922
798	void	923	void
799	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	924	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
800	PROTOTYPE: $$$;$$	925	PROTOTYPE: $$$;$$
		926	ALIAS:
		927	draw_quad_alpha = 1
		928	draw_quad_alpha_premultiplied = 2
801	CODE:	929	CODE:
802	{	930	{
803	HV hv = (HV )SvRV (self);	931	HV hv = (HV )SvRV (self);
804	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	932	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
805	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	933	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
810	{	938	{
811	w = SvNV (*hv_fetch (hv, "w", 1, 1));	939	w = SvNV (*hv_fetch (hv, "w", 1, 1));
812	h = SvNV (*hv_fetch (hv, "h", 1, 1));	940	h = SvNV (*hv_fetch (hv, "h", 1, 1));
813	}	941	}
814		942
		943	if (ix)
		944	{
		945	glEnable (GL_BLEND);
		946	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		947	}
		948
815	glBindTexture (GL_TEXTURE_2D, name);	949	glBindTexture (GL_TEXTURE_2D, name);
		950
816	if (wrap_mode) {	951	if (wrap_mode)
		952	{
817	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	953	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
818	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	954	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
819	}	955	}
		956
820	glBegin (GL_QUADS);	957	glBegin (GL_QUADS);
821	glTexCoord2f (0, 0); glVertex2f (x , y );	958	glTexCoord2f (0, 0); glVertex2f (x , y );
822	glTexCoord2f (0, t); glVertex2f (x , y + h);	959	glTexCoord2f (0, t); glVertex2f (x , y + h);
823	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	960	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
824	glTexCoord2f (s, 0); glVertex2f (x + w, y );	961	glTexCoord2f (s, 0); glVertex2f (x + w, y );
825	glEnd ();	962	glEnd ();
		963
		964	if (ix)
		965	glDisable (GL_BLEND);
826	}	966	}
827		967
828	MODULE = CFClient PACKAGE = CFClient::Map	968	MODULE = CFClient PACKAGE = CFClient::Map
829		969
830	CFClient::Map	970	CFClient::Map
…		…
1339	} *civ, const_iv[] = {	1479	} *civ, const_iv[] = {
1340	# define const_iv(name) { # name, (IV)name }	1480	# define const_iv(name) { # name, (IV)name }
1341	const_iv (GL_COLOR_MATERIAL),	1481	const_iv (GL_COLOR_MATERIAL),
1342	const_iv (GL_SMOOTH),	1482	const_iv (GL_SMOOTH),
1343	const_iv (GL_FLAT),	1483	const_iv (GL_FLAT),
		1484	const_iv (GL_DITHER),
1344	const_iv (GL_BLEND),	1485	const_iv (GL_BLEND),
		1486	const_iv (GL_SCISSOR_TEST),
1345	const_iv (GL_AND),	1487	const_iv (GL_AND),
		1488	const_iv (GL_ONE),
		1489	const_iv (GL_ZERO),
1346	const_iv (GL_SRC_ALPHA),	1490	const_iv (GL_SRC_ALPHA),
		1491	const_iv (GL_SRC_ALPHA_SATURATE),
1347	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1492	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1493	const_iv (GL_ONE_MINUS_DST_ALPHA),
1348	const_iv (GL_RGB),	1494	const_iv (GL_RGB),
1349	const_iv (GL_RGBA),	1495	const_iv (GL_RGBA),
1350	const_iv (GL_UNSIGNED_BYTE),	1496	const_iv (GL_UNSIGNED_BYTE),
1351	const_iv (GL_ALPHA4),
1352	const_iv (GL_ALPHA),	1497	const_iv (GL_ALPHA),
		1498	const_iv (GL_LUMINANCE),
1353	const_iv (GL_FLOAT),	1499	const_iv (GL_FLOAT),
1354	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1500	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1355	const_iv (GL_COMPILE),	1501	const_iv (GL_COMPILE),
1356	const_iv (GL_TEXTURE_1D),	1502	const_iv (GL_TEXTURE_1D),
1357	const_iv (GL_TEXTURE_2D),	1503	const_iv (GL_TEXTURE_2D),
…		…
1368	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1514	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1369	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1515	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1370	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1516	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1371	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1517	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1372	const_iv (GL_GENERATE_MIPMAP),	1518	const_iv (GL_GENERATE_MIPMAP),
1373	const_iv (GL_LINEAR),
1374	const_iv (GL_MODULATE),	1519	const_iv (GL_MODULATE),
		1520	const_iv (GL_DECAL),
1375	const_iv (GL_REPLACE),	1521	const_iv (GL_REPLACE),
1376	const_iv (GL_COLOR_BUFFER_BIT),	1522	const_iv (GL_COLOR_BUFFER_BIT),
1377	const_iv (GL_PROJECTION),	1523	const_iv (GL_PROJECTION),
1378	const_iv (GL_MODELVIEW),	1524	const_iv (GL_MODELVIEW),
1379	const_iv (GL_COLOR_LOGIC_OP),	1525	const_iv (GL_COLOR_LOGIC_OP),
		1526	const_iv (GL_SEPARABLE_2D),
1380	const_iv (GL_CONVOLUTION_2D),	1527	const_iv (GL_CONVOLUTION_2D),
1381	const_iv (GL_CONVOLUTION_BORDER_MODE),	1528	const_iv (GL_CONVOLUTION_BORDER_MODE),
1382	const_iv (GL_CONSTANT_BORDER),	1529	const_iv (GL_CONSTANT_BORDER),
1383	const_iv (GL_LINES),	1530	const_iv (GL_LINES),
1384	const_iv (GL_QUADS),	1531	const_iv (GL_QUADS),
…		…
1409		1556
1410	void glBlendFunc (int sfactor, int dfactor)	1557	void glBlendFunc (int sfactor, int dfactor)
1411		1558
1412	void glLogicOp (int opcode)	1559	void glLogicOp (int opcode)
1413		1560
		1561	void glColorMask (int red, int green, int blue, int alpha)
		1562
1414	void glMatrixMode (int mode)	1563	void glMatrixMode (int mode)
1415		1564
1416	void glPushMatrix ()	1565	void glPushMatrix ()
1417		1566
1418	void glPopMatrix ()	1567	void glPopMatrix ()
…		…
1421		1570
1422	# near and far are due to microsofts buggy c compiler	1571	# 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_)	1572	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1424		1573
1425	void glViewport (int x, int y, int width, int height)	1574	void glViewport (int x, int y, int width, int height)
		1575
		1576	void glScissor (int x, int y, int width, int height)
1426		1577
1427	void glTranslate (float x, float y, float z = 0.)	1578	void glTranslate (float x, float y, float z = 0.)
1428	CODE:	1579	CODE:
1429	glTranslatef (x, y, z);	1580	glTranslatef (x, y, z);
1430		1581
…		…
1441	void glEnd ()	1592	void glEnd ()
1442		1593
1443	void glColor (float r, float g, float b, float a = 1.0)	1594	void glColor (float r, float g, float b, float a = 1.0)
1444	PROTOTYPE: @	1595	PROTOTYPE: @
1445	CODE:	1596	CODE:
1446	glColor4f (r, g, b, a);	1597	glColor4ub (MIN ((int)(r * 255.f), 255),
		1598	MIN ((int)(g * 255.f), 255),
		1599	MIN ((int)(b * 255.f), 255),
		1600	MIN ((int)(a * 255.f), 255));
1447		1601
1448	void glVertex (float x, float y, float z = 0.)	1602	void glVertex (float x, float y, float z = 0.)
1449	CODE:	1603	CODE:
1450	glVertex3f (x, y, z);	1604	glVertex3f (x, y, z);
1451		1605
…		…
1470	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1624	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1471	CODE:	1625	CODE:
1472	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1626	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1473	(target, internalformat, width, height, format, type, data));	1627	(target, internalformat, width, height, format, type, data));
1474		1628
		1629	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		1630	CODE:
		1631	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
		1632	(target, internalformat, width, height, format, type, row, column));
		1633
1475	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1634	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1476		1635
1477	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1636	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1637
		1638	void glRasterPos (int x, int y)
		1639	CODE:
		1640	glRasterPos2i (x, y);
		1641
		1642	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1478		1643
1479	int glGenTexture ()	1644	int glGenTexture ()
1480	CODE:	1645	CODE:
1481	{	1646	{
1482	GLuint name;	1647	GLuint name;

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.64 by root, Mon Apr 24 08:11:31 2006 UTC vs. Revision 1.82 by root, Mon May 15 00:15:08 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.64 by root, Mon Apr 24 08:11:31 2006 UTC vs.
Revision 1.82 by root, Mon May 15 00:15:08 2006 UTC