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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.65 by root, Mon Apr 24 08:22:21 2006 UTC vs.
Revision 1.76 by root, Thu May 11 23:41:45 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
2	# include <malloc.h>	2	# include <malloc.h>
		3	# pragma warning(disable:4244)
3	#endif	4	#endif
4		5
5	#include "EXTERN.h"	6	#include "EXTERN.h"
6	#include "perl.h"	7	#include "perl.h"
7	#include "XSUB.h"	8	#include "XSUB.h"
8		9
9	#include <string.h>	10	#include <string.h>
10	#include <stdio.h>	11	#include <stdio.h>
11		12
12	#include <SDL.h>	13	#include <SDL.h>
		14	#include <SDL_endian.h>
13	#include <SDL_image.h>	15	#include <SDL_image.h>
14	#include <SDL_mixer.h>	16	#include <SDL_mixer.h>
15	#include <SDL_opengl.h>	17	#include <SDL_opengl.h>
16		18
17	#include <glib/gmacros.h>	19	#include <glib/gmacros.h>
18		20
19	#include <pango/pango.h>	21	#include <pango/pango.h>
20	#include <pango/pangofc-fontmap.h>	22	#include <pango/pangofc-fontmap.h>
21	#include <pango/pangoft2.h>	23	#include <pango/pangoft2.h>
		24	#include <pango/pangocairo.h>
22		25
23	#ifndef _WIN32	26	#ifndef _WIN32
24	# include <sys/types.h>	27	# include <sys/types.h>
25	# include <sys/socket.h>	28	# include <sys/socket.h>
26	# include <netinet/in.h>	29	# include <netinet/in.h>
63	typedef Mix_Music *CFClient__MixMusic;	66	typedef Mix_Music *CFClient__MixMusic;
64		67
65	typedef PangoFontDescription *CFClient__Font;	68	typedef PangoFontDescription *CFClient__Font;
66		69
67	typedef struct cf_layout {	70	typedef struct cf_layout {
68	PangoLayout *pl;	71	PangoLayout *pl; // either derived from a cairo or ft2 context
		72	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
		73	float r, g, b, a; // default color for rgba mode
69	int base_height;	74	int base_height;
70	CFClient__Font font;	75	CFClient__Font font;
71	} *CFClient__Layout;	76	} *CFClient__Layout;
72		77
73	static CFClient__Font default_font;	78	static CFClient__Font default_font;
74	static PangoContext *context;	79	static PangoContext ft2_context, cairo_context;
75	static PangoFontMap *fontmap;	80	static PangoFontMap ft2_fontmap, cairo_fontmap;
76		81
77	static void	82	static void
78	substitute_func (FcPattern *pattern, gpointer data)	83	substitute_func (FcPattern *pattern, gpointer data)
79	{	84	{
80	FcPatternAddBool (pattern, FC_HINTING , 1);	85	FcPatternAddBool (pattern, FC_HINTING , 1);
…		…
98	static void	103	static void
99	layout_get_pixel_size (CFClient__Layout self, int w, int h)	104	layout_get_pixel_size (CFClient__Layout self, int w, int h)
100	{	105	{
101	pango_layout_get_pixel_size (self->pl, w, h);	106	pango_layout_get_pixel_size (self->pl, w, h);
102		107
103	w = (w + 3) & ~3;
104	if (!w) w = 1;	108	if (!w) w = 1;
105	if (!h) h = 1;	109	if (!h) h = 1;
		110
		111	w = (w + 3) & ~3;
106	}	112	}
107		113
108	typedef uint16_t mapface;	114	typedef uint16_t mapface;
109		115
110	typedef struct {	116	typedef struct {
…		…
258	}	264	}
259	}	265	}
260	}	266	}
261		267
262	static void	268	static void
263	music_finished ()	269	music_finished (void)
264	{	270	{
265	SDL_UserEvent ev;	271	SDL_UserEvent ev;
266		272
267	ev.type = SDL_USEREVENT;	273	ev.type = SDL_USEREVENT;
268	ev.code = 0;	274	ev.code = 0;
269	ev.data1 = 0;	275	ev.data1 = 0;
		276	ev.data2 = 0;
		277
		278	SDL_PushEvent ((SDL_Event *)&ev);
		279	}
		280
		281	static void
		282	channel_finished (int channel)
		283	{
		284	SDL_UserEvent ev;
		285
		286	ev.type = SDL_USEREVENT;
		287	ev.code = 1;
		288	ev.data1 = (void *)(long)channel;
270	ev.data2 = 0;	289	ev.data2 = 0;
271		290
272	SDL_PushEvent ((SDL_Event *)&ev);	291	SDL_PushEvent ((SDL_Event *)&ev);
273	}	292	}
274		293
…		…
386	};	405	};
387		406
388	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	407	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
389	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	408	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
390		409
391	fontmap = pango_ft2_font_map_new ();	410	ft2_fontmap = pango_ft2_font_map_new ();
392	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);	411	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
393	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);	412	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
		413
		414	cairo_fontmap = pango_cairo_font_map_get_default ();
		415	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
394	}	416	}
395		417
396	int	418	int
397	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	419	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
398		420
…		…
457		479
458	while (SDL_PollEvent (&ev))	480	while (SDL_PollEvent (&ev))
459	{	481	{
460	HV *hv = newHV ();	482	HV *hv = newHV ();
461	hv_store (hv, "type", 4, newSViv (ev.type), 0);	483	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		484
462	switch (ev.type)	485	switch (ev.type)
463	{	486	{
464	case SDL_KEYDOWN:	487	case SDL_KEYDOWN:
465	case SDL_KEYUP:	488	case SDL_KEYUP:
466	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	489	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
486	case SDL_MOUSEBUTTONUP:	509	case SDL_MOUSEBUTTONUP:
487	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	510	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
488	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	511	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
489	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	512	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
490	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	513	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		514	break;
		515
		516	case SDL_USEREVENT:
		517	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		518	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		519	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		520	break;
491	}	521	}
492		522
493	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	523	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
494	}	524	}
495	}	525	}
496		526
497	int	527	int
498	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	528	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
499	POSTCALL:	529	POSTCALL:
500	Mix_HookMusicFinished (music_finished);	530	Mix_HookMusicFinished (music_finished);
		531	Mix_ChannelFinished (channel_finished);
501		532
502	void	533	void
503	Mix_CloseAudio ()	534	Mix_CloseAudio ()
504		535
505	int	536	int
…		…
619	PUSHs (sv_2mortal (newSViv (b / y)));	650	PUSHs (sv_2mortal (newSViv (b / y)));
620	PUSHs (sv_2mortal (newSViv (a / y)));	651	PUSHs (sv_2mortal (newSViv (a / y)));
621	}	652	}
622		653
623	void	654	void
		655	error (char *message)
		656	CODE:
		657	#ifdef _WIN32
		658	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
		659	#else
		660	fprintf (stderr, "ERROR: %s\n", message);
		661	#endif
		662
		663	void
624	fatal (char *message)	664	fatal (char *message)
625	CODE:	665	CODE:
626	#ifdef _WIN32	666	#ifdef _WIN32
627	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	667	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
628	#else	668	#else
…		…
631	exit (1);	671	exit (1);
632		672
633	MODULE = CFClient PACKAGE = CFClient::Font	673	MODULE = CFClient PACKAGE = CFClient::Font
634		674
635	CFClient::Font	675	CFClient::Font
636	new_from_file (SV class, char path)	676	new_from_file (SV class, char path, int id = 0)
637	CODE:	677	CODE:
638	{	678	{
639	int count;	679	int count;
640	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, 0, 0, &count);	680	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
641	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	681	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
642	FcPatternDestroy (pattern);	682	FcPatternDestroy (pattern);
643	}	683	}
644	OUTPUT:	684	OUTPUT:
645	RETVAL	685	RETVAL
…		…
655	default_font = self;	695	default_font = self;
656		696
657	MODULE = CFClient PACKAGE = CFClient::Layout	697	MODULE = CFClient PACKAGE = CFClient::Layout
658		698
659	CFClient::Layout	699	CFClient::Layout
660	new (SV *class, int base_height = MIN_FONT_HEIGHT)	700	new (SV *class, int rgba = 0)
661	CODE:	701	CODE:
662	New (0, RETVAL, 1, struct cf_layout);	702	New (0, RETVAL, 1, struct cf_layout);
663	RETVAL->pl = pango_layout_new (context);	703
664	RETVAL->base_height = base_height;	704	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
		705	RETVAL->rgba = rgba;
		706	RETVAL->r = 1.;
		707	RETVAL->g = 1.;
		708	RETVAL->b = 1.;
		709	RETVAL->a = 1.;
		710	RETVAL->base_height = MIN_FONT_HEIGHT;
665	RETVAL->font = 0;	711	RETVAL->font = 0;
		712
666	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	713	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
667	pango_layout_set_font_description (RETVAL->pl, default_font);	714	layout_update_font (RETVAL);
668	OUTPUT:	715	OUTPUT:
669	RETVAL	716	RETVAL
670		717
671	void	718	void
672	DESTROY (CFClient::Layout self)	719	DESTROY (CFClient::Layout self)
673	CODE:	720	CODE:
674	g_object_unref (self->pl);	721	g_object_unref (self->pl);
675	Safefree (self);	722	Safefree (self);
676		723
		724	int
		725	is_rgba (CFClient::Layout self)
		726	CODE:
		727	RETVAL = self->rgba;
		728	OUTPUT:
		729	RETVAL
		730
677	void	731	void
678	set_text (CFClient::Layout self, SV *text_)	732	set_text (CFClient::Layout self, SV *text_)
679	CODE:	733	CODE:
680	{	734	{
681	STRLEN textlen;	735	STRLEN textlen;
…		…
699	CODE:	753	CODE:
700	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	754	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
701	SvUTF8_on (RETVAL);	755	SvUTF8_on (RETVAL);
702	OUTPUT:	756	OUTPUT:
703	RETVAL	757	RETVAL
		758
		759	void
		760	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
		761	CODE:
		762	self->r = r;
		763	self->g = g;
		764	self->b = b;
		765	self->a = a;
704		766
705	void	767	void
706	set_font (CFClient::Layout self, CFClient::Font font = 0)	768	set_font (CFClient::Layout self, CFClient::Font font = 0)
707	CODE:	769	CODE:
708	if (self->font != font)	770	if (self->font != font)
…		…
766	render (CFClient::Layout self)	828	render (CFClient::Layout self)
767	PPCODE:	829	PPCODE:
768	{	830	{
769	SV *retval;	831	SV *retval;
770	int w, h;	832	int w, h;
771	FT_Bitmap bitmap;
772		833
773	layout_get_pixel_size (self, &w, &h);	834	layout_get_pixel_size (self, &w, &h);
774		835
		836	if (self->rgba)
		837	{
		838	cairo_surface_t *surface;
		839	cairo_t *cairo;
		840
		841	retval = newSV (w * h * 4);
		842	SvPOK_only (retval);
		843	SvCUR_set (retval, w * h * 4);
		844
		845	memset (SvPVX (retval), 0, w * h * 4);
		846
		847	surface = cairo_image_surface_create_for_data (
		848	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		849	cairo = cairo_create (surface);
		850	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		851
		852	pango_cairo_show_layout (cairo, self->pl);
		853
		854	cairo_destroy (cairo);
		855	cairo_surface_destroy (surface);
		856
		857	// what a mess, and its premultiplied, too :(
		858	{
		859	uint32_t p = (uint32_t )SvPVX (retval);
		860	uint32_t e = p + w h;
		861
		862	while (p < e)
		863	{
		864	uint32_t rgba = *p;
		865	rgba = (rgba >> 24) \| (rgba << 8);
		866	rgba = SDL_SwapBE32 (rgba);
		867	*p++ = rgba;
		868	}
		869	}
		870
		871	EXTEND (SP, 5);
		872	PUSHs (sv_2mortal (newSViv (w)));
		873	PUSHs (sv_2mortal (newSViv (h)));
		874	PUSHs (sv_2mortal (retval));
		875	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		876	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		877	}
		878	else
		879	{
		880	FT_Bitmap bitmap;
		881
775	retval = newSV (w * h);	882	retval = newSV (w * h);
776	SvPOK_only (retval);	883	SvPOK_only (retval);
777	SvCUR_set (retval, w * h);	884	SvCUR_set (retval, w * h);
778		885
779	bitmap.rows = h;	886	bitmap.rows = h;
780	bitmap.width = w;	887	bitmap.width = w;
781	bitmap.pitch = w;	888	bitmap.pitch = w;
782	bitmap.buffer = (unsigned char*)SvPVX (retval);	889	bitmap.buffer = (unsigned char*)SvPVX (retval);
783	bitmap.num_grays = 256;	890	bitmap.num_grays = 256;
784	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	891	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
785		892
786	memset (bitmap.buffer, 0, w * h);	893	memset (bitmap.buffer, 0, w * h);
787		894
788	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	895	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
789		896
790	EXTEND (SP, 3);	897	EXTEND (SP, 5);
791	PUSHs (sv_2mortal (newSViv (w)));	898	PUSHs (sv_2mortal (newSViv (w)));
792	PUSHs (sv_2mortal (newSViv (h)));	899	PUSHs (sv_2mortal (newSViv (h)));
793	PUSHs (sv_2mortal (retval));	900	PUSHs (sv_2mortal (retval));
		901	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		902	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		903	}
794	}	904	}
795		905
796	MODULE = CFClient PACKAGE = CFClient::Texture	906	MODULE = CFClient PACKAGE = CFClient::Texture
797		907
798	void	908	void
799	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	909	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
800	PROTOTYPE: $$$;$$	910	PROTOTYPE: $$$;$$
		911	ALIAS:
		912	draw_quad_alpha = 1
		913	draw_quad_alpha_premultiplied = 2
801	CODE:	914	CODE:
802	{	915	{
803	HV hv = (HV )SvRV (self);	916	HV hv = (HV )SvRV (self);
804	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	917	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
805	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	918	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
810	{	923	{
811	w = SvNV (*hv_fetch (hv, "w", 1, 1));	924	w = SvNV (*hv_fetch (hv, "w", 1, 1));
812	h = SvNV (*hv_fetch (hv, "h", 1, 1));	925	h = SvNV (*hv_fetch (hv, "h", 1, 1));
813	}	926	}
814		927
		928	if (ix)
		929	{
		930	glEnable (GL_BLEND);
		931	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		932	}
		933
815	glBindTexture (GL_TEXTURE_2D, name);	934	glBindTexture (GL_TEXTURE_2D, name);
		935
816	if (wrap_mode) {	936	if (wrap_mode)
		937	{
817	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	938	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
818	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	939	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
819	}	940	}
		941
820	glBegin (GL_QUADS);	942	glBegin (GL_QUADS);
821	glTexCoord2f (0, 0); glVertex2f (x , y );	943	glTexCoord2f (0, 0); glVertex2f (x , y );
822	glTexCoord2f (0, t); glVertex2f (x , y + h);	944	glTexCoord2f (0, t); glVertex2f (x , y + h);
823	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	945	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
824	glTexCoord2f (s, 0); glVertex2f (x + w, y );	946	glTexCoord2f (s, 0); glVertex2f (x + w, y );
825	glEnd ();	947	glEnd ();
		948
		949	if (ix)
		950	glDisable (GL_BLEND);
826	}	951	}
827		952
828	MODULE = CFClient PACKAGE = CFClient::Map	953	MODULE = CFClient PACKAGE = CFClient::Map
829		954
830	CFClient::Map	955	CFClient::Map
…		…
1339	} *civ, const_iv[] = {	1464	} *civ, const_iv[] = {
1340	# define const_iv(name) { # name, (IV)name }	1465	# define const_iv(name) { # name, (IV)name }
1341	const_iv (GL_COLOR_MATERIAL),	1466	const_iv (GL_COLOR_MATERIAL),
1342	const_iv (GL_SMOOTH),	1467	const_iv (GL_SMOOTH),
1343	const_iv (GL_FLAT),	1468	const_iv (GL_FLAT),
		1469	const_iv (GL_DITHER),
1344	const_iv (GL_BLEND),	1470	const_iv (GL_BLEND),
		1471	const_iv (GL_SCISSOR_TEST),
1345	const_iv (GL_AND),	1472	const_iv (GL_AND),
		1473	const_iv (GL_ONE),
		1474	const_iv (GL_ZERO),
1346	const_iv (GL_SRC_ALPHA),	1475	const_iv (GL_SRC_ALPHA),
		1476	const_iv (GL_SRC_ALPHA_SATURATE),
1347	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1477	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1478	const_iv (GL_ONE_MINUS_DST_ALPHA),
1348	const_iv (GL_RGB),	1479	const_iv (GL_RGB),
1349	const_iv (GL_RGBA),	1480	const_iv (GL_RGBA),
1350	const_iv (GL_UNSIGNED_BYTE),	1481	const_iv (GL_UNSIGNED_BYTE),
1351	const_iv (GL_ALPHA),	1482	const_iv (GL_ALPHA),
		1483	const_iv (GL_LUMINANCE),
1352	const_iv (GL_FLOAT),	1484	const_iv (GL_FLOAT),
1353	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1485	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1354	const_iv (GL_COMPILE),	1486	const_iv (GL_COMPILE),
1355	const_iv (GL_TEXTURE_1D),	1487	const_iv (GL_TEXTURE_1D),
1356	const_iv (GL_TEXTURE_2D),	1488	const_iv (GL_TEXTURE_2D),
…		…
1367	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1499	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1368	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1500	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1369	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1501	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1370	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1502	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1371	const_iv (GL_GENERATE_MIPMAP),	1503	const_iv (GL_GENERATE_MIPMAP),
1372	const_iv (GL_LINEAR),
1373	const_iv (GL_MODULATE),	1504	const_iv (GL_MODULATE),
		1505	const_iv (GL_DECAL),
1374	const_iv (GL_REPLACE),	1506	const_iv (GL_REPLACE),
1375	const_iv (GL_COLOR_BUFFER_BIT),	1507	const_iv (GL_COLOR_BUFFER_BIT),
1376	const_iv (GL_PROJECTION),	1508	const_iv (GL_PROJECTION),
1377	const_iv (GL_MODELVIEW),	1509	const_iv (GL_MODELVIEW),
1378	const_iv (GL_COLOR_LOGIC_OP),	1510	const_iv (GL_COLOR_LOGIC_OP),
		1511	const_iv (GL_SEPARABLE_2D),
1379	const_iv (GL_CONVOLUTION_2D),	1512	const_iv (GL_CONVOLUTION_2D),
1380	const_iv (GL_CONVOLUTION_BORDER_MODE),	1513	const_iv (GL_CONVOLUTION_BORDER_MODE),
1381	const_iv (GL_CONSTANT_BORDER),	1514	const_iv (GL_CONSTANT_BORDER),
1382	const_iv (GL_LINES),	1515	const_iv (GL_LINES),
1383	const_iv (GL_QUADS),	1516	const_iv (GL_QUADS),
…		…
1408		1541
1409	void glBlendFunc (int sfactor, int dfactor)	1542	void glBlendFunc (int sfactor, int dfactor)
1410		1543
1411	void glLogicOp (int opcode)	1544	void glLogicOp (int opcode)
1412		1545
		1546	void glColorMask (int red, int green, int blue, int alpha)
		1547
1413	void glMatrixMode (int mode)	1548	void glMatrixMode (int mode)
1414		1549
1415	void glPushMatrix ()	1550	void glPushMatrix ()
1416		1551
1417	void glPopMatrix ()	1552	void glPopMatrix ()
…		…
1420		1555
1421	# near and far are due to microsofts buggy c compiler	1556	# near and far are due to microsofts buggy c compiler
1422	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1557	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1423		1558
1424	void glViewport (int x, int y, int width, int height)	1559	void glViewport (int x, int y, int width, int height)
		1560
		1561	void glScissor (int x, int y, int width, int height)
1425		1562
1426	void glTranslate (float x, float y, float z = 0.)	1563	void glTranslate (float x, float y, float z = 0.)
1427	CODE:	1564	CODE:
1428	glTranslatef (x, y, z);	1565	glTranslatef (x, y, z);
1429		1566
…		…
1440	void glEnd ()	1577	void glEnd ()
1441		1578
1442	void glColor (float r, float g, float b, float a = 1.0)	1579	void glColor (float r, float g, float b, float a = 1.0)
1443	PROTOTYPE: @	1580	PROTOTYPE: @
1444	CODE:	1581	CODE:
1445	glColor4f (r, g, b, a);	1582	glColor4ub (r * 255., g * 255., b * 255., a * 255.);
1446		1583
1447	void glVertex (float x, float y, float z = 0.)	1584	void glVertex (float x, float y, float z = 0.)
1448	CODE:	1585	CODE:
1449	glVertex3f (x, y, z);	1586	glVertex3f (x, y, z);
1450		1587
…		…
1469	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1606	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1470	CODE:	1607	CODE:
1471	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1608	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1472	(target, internalformat, width, height, format, type, data));	1609	(target, internalformat, width, height, format, type, data));
1473		1610
		1611	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		1612	CODE:
		1613	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
		1614	(target, internalformat, width, height, format, type, row, column));
		1615
1474	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1616	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1475		1617
1476	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1618	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1619
		1620	void glRasterPos (int x, int y)
		1621	CODE:
		1622	glRasterPos2i (x, y);
		1623
		1624	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1477		1625
1478	int glGenTexture ()	1626	int glGenTexture ()
1479	CODE:	1627	CODE:
1480	{	1628	{
1481	GLuint name;	1629	GLuint name;

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.65 by root, Mon Apr 24 08:22:21 2006 UTC vs. Revision 1.76 by root, Thu May 11 23:41:45 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.65 by root, Mon Apr 24 08:22:21 2006 UTC vs.
Revision 1.76 by root, Thu May 11 23:41:45 2006 UTC