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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.66 by root, Mon Apr 24 11:45:16 2006 UTC vs.
Revision 1.83 by root, Mon May 15 00:25:14 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	#ifdef _WIN32
		90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
		91	#else
81	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
		93	#endif
82	}	94	}
83		95
84	static void	96	static void
85	layout_update_font (CFClient__Layout self)	97	layout_update_font (CFClient__Layout self)
86	{	98	{
…		…
98	static void	110	static void
99	layout_get_pixel_size (CFClient__Layout self, int w, int h)	111	layout_get_pixel_size (CFClient__Layout self, int w, int h)
100	{	112	{
101	pango_layout_get_pixel_size (self->pl, w, h);	113	pango_layout_get_pixel_size (self->pl, w, h);
102		114
103	w = (w + 3) & ~3;
104	if (!w) w = 1;	115	if (!w) w = 1;
105	if (!h) h = 1;	116	if (!h) h = 1;
		117
		118	w = (w + 3) & ~3;
106	}	119	}
107		120
108	typedef uint16_t mapface;	121	typedef uint16_t mapface;
109		122
110	typedef struct {	123	typedef struct {
…		…
258	}	271	}
259	}	272	}
260	}	273	}
261		274
262	static void	275	static void
263	music_finished ()	276	music_finished (void)
264	{	277	{
265	SDL_UserEvent ev;	278	SDL_UserEvent ev;
266		279
267	ev.type = SDL_USEREVENT;	280	ev.type = SDL_USEREVENT;
268	ev.code = 0;	281	ev.code = 0;
269	ev.data1 = 0;	282	ev.data1 = 0;
		283	ev.data2 = 0;
		284
		285	SDL_PushEvent ((SDL_Event *)&ev);
		286	}
		287
		288	static void
		289	channel_finished (int channel)
		290	{
		291	SDL_UserEvent ev;
		292
		293	ev.type = SDL_USEREVENT;
		294	ev.code = 1;
		295	ev.data1 = (void *)(long)channel;
270	ev.data2 = 0;	296	ev.data2 = 0;
271		297
272	SDL_PushEvent ((SDL_Event *)&ev);	298	SDL_PushEvent ((SDL_Event *)&ev);
273	}	299	}
274		300
…		…
385	# undef const_iv	411	# undef const_iv
386	};	412	};
387		413
388	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
389	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		416	}
390		417
		418	void
		419	pango_init ()
		420	CODE:
		421	{
		422	// delayed, so it can pick up new fonts added by AddFontResourceEx
391	fontmap = pango_ft2_font_map_new ();	423	ft2_fontmap = pango_ft2_font_map_new ();
392	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);	424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
393	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);	425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
		426
		427	cairo_fontmap = pango_cairo_font_map_get_default ();
		428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
394	}	429	}
395		430
396	int	431	int
397	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
398		433
…		…
457		492
458	while (SDL_PollEvent (&ev))	493	while (SDL_PollEvent (&ev))
459	{	494	{
460	HV *hv = newHV ();	495	HV *hv = newHV ();
461	hv_store (hv, "type", 4, newSViv (ev.type), 0);	496	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		497
462	switch (ev.type)	498	switch (ev.type)
463	{	499	{
464	case SDL_KEYDOWN:	500	case SDL_KEYDOWN:
465	case SDL_KEYUP:	501	case SDL_KEYUP:
466	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	502	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
486	case SDL_MOUSEBUTTONUP:	522	case SDL_MOUSEBUTTONUP:
487	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	523	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
488	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	524	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
489	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	525	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
490	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	526	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		527	break;
		528
		529	case SDL_USEREVENT:
		530	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		531	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		532	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		533	break;
491	}	534	}
492		535
493	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	536	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
494	}	537	}
495	}	538	}
496		539
497	int	540	int
498	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	541	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
499	POSTCALL:	542	POSTCALL:
500	Mix_HookMusicFinished (music_finished);	543	Mix_HookMusicFinished (music_finished);
		544	Mix_ChannelFinished (channel_finished);
501		545
502	void	546	void
503	Mix_CloseAudio ()	547	Mix_CloseAudio ()
504		548
505	int	549	int
…		…
528		572
529	void	573	void
530	add_font (char *file)	574	add_font (char *file)
531	CODE:	575	CODE:
532	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	576	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
		577	#ifdef _WIN32
		578	// cairo... sigh... requires win2000
		579	AddFontResourceEx (file, FR_PRIVATE, 0);
		580	#endif
533		581
534	void	582	void
535	load_image_inline (SV *image_)	583	load_image_inline (SV *image_)
536	ALIAS:	584	ALIAS:
537	load_image_file = 1	585	load_image_file = 1
…		…
640	exit (1);	688	exit (1);
641		689
642	MODULE = CFClient PACKAGE = CFClient::Font	690	MODULE = CFClient PACKAGE = CFClient::Font
643		691
644	CFClient::Font	692	CFClient::Font
645	new_from_file (SV class, char path)	693	new_from_file (SV class, char path, int id = 0)
646	CODE:	694	CODE:
647	{	695	{
648	int count;	696	int count;
649	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, 0, 0, &count);	697	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
650	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	698	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
651	FcPatternDestroy (pattern);	699	FcPatternDestroy (pattern);
652	}	700	}
653	OUTPUT:	701	OUTPUT:
654	RETVAL	702	RETVAL
…		…
664	default_font = self;	712	default_font = self;
665		713
666	MODULE = CFClient PACKAGE = CFClient::Layout	714	MODULE = CFClient PACKAGE = CFClient::Layout
667		715
668	CFClient::Layout	716	CFClient::Layout
669	new (SV *class, int base_height = MIN_FONT_HEIGHT)	717	new (SV *class, int rgba = 0)
670	CODE:	718	CODE:
671	New (0, RETVAL, 1, struct cf_layout);	719	New (0, RETVAL, 1, struct cf_layout);
672	RETVAL->pl = pango_layout_new (context);	720
673	RETVAL->base_height = base_height;	721	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
		722	RETVAL->rgba = rgba;
		723	RETVAL->r = 1.;
		724	RETVAL->g = 1.;
		725	RETVAL->b = 1.;
		726	RETVAL->a = 1.;
		727	RETVAL->base_height = MIN_FONT_HEIGHT;
674	RETVAL->font = 0;	728	RETVAL->font = 0;
		729
675	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	730	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
676	pango_layout_set_font_description (RETVAL->pl, default_font);	731	layout_update_font (RETVAL);
677	OUTPUT:	732	OUTPUT:
678	RETVAL	733	RETVAL
679		734
680	void	735	void
681	DESTROY (CFClient::Layout self)	736	DESTROY (CFClient::Layout self)
682	CODE:	737	CODE:
683	g_object_unref (self->pl);	738	g_object_unref (self->pl);
684	Safefree (self);	739	Safefree (self);
685		740
		741	int
		742	is_rgba (CFClient::Layout self)
		743	CODE:
		744	RETVAL = self->rgba;
		745	OUTPUT:
		746	RETVAL
		747
686	void	748	void
687	set_text (CFClient::Layout self, SV *text_)	749	set_text (CFClient::Layout self, SV *text_)
688	CODE:	750	CODE:
689	{	751	{
690	STRLEN textlen;	752	STRLEN textlen;
…		…
708	CODE:	770	CODE:
709	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	771	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
710	SvUTF8_on (RETVAL);	772	SvUTF8_on (RETVAL);
711	OUTPUT:	773	OUTPUT:
712	RETVAL	774	RETVAL
		775
		776	void
		777	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
		778	CODE:
		779	self->r = r;
		780	self->g = g;
		781	self->b = b;
		782	self->a = a;
713		783
714	void	784	void
715	set_font (CFClient::Layout self, CFClient::Font font = 0)	785	set_font (CFClient::Layout self, CFClient::Font font = 0)
716	CODE:	786	CODE:
717	if (self->font != font)	787	if (self->font != font)
…		…
775	render (CFClient::Layout self)	845	render (CFClient::Layout self)
776	PPCODE:	846	PPCODE:
777	{	847	{
778	SV *retval;	848	SV *retval;
779	int w, h;	849	int w, h;
780	FT_Bitmap bitmap;
781		850
782	layout_get_pixel_size (self, &w, &h);	851	layout_get_pixel_size (self, &w, &h);
783		852
		853	if (self->rgba)
		854	{
		855	cairo_surface_t *surface;
		856	cairo_t *cairo;
		857
		858	retval = newSV (w * h * 4);
		859	SvPOK_only (retval);
		860	SvCUR_set (retval, w * h * 4);
		861
		862	memset (SvPVX (retval), 0, w * h * 4);
		863
		864	surface = cairo_image_surface_create_for_data (
		865	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		866	cairo = cairo_create (surface);
		867	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		868
		869	pango_cairo_show_layout (cairo, self->pl);
		870
		871	cairo_destroy (cairo);
		872	cairo_surface_destroy (surface);
		873
		874	// what a mess, and its premultiplied, too :(
		875	{
		876	uint32_t p = (uint32_t )SvPVX (retval);
		877	uint32_t e = p + w h;
		878
		879	while (p < e)
		880	{
		881	uint32_t rgba = *p;
		882	rgba = (rgba >> 24) \| (rgba << 8);
		883	rgba = SDL_SwapBE32 (rgba);
		884	*p++ = rgba;
		885	}
		886	}
		887
		888	EXTEND (SP, 5);
		889	PUSHs (sv_2mortal (newSViv (w)));
		890	PUSHs (sv_2mortal (newSViv (h)));
		891	PUSHs (sv_2mortal (retval));
		892	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		893	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		894	}
		895	else
		896	{
		897	FT_Bitmap bitmap;
		898
784	retval = newSV (w * h);	899	retval = newSV (w * h);
785	SvPOK_only (retval);	900	SvPOK_only (retval);
786	SvCUR_set (retval, w * h);	901	SvCUR_set (retval, w * h);
787		902
788	bitmap.rows = h;	903	bitmap.rows = h;
789	bitmap.width = w;	904	bitmap.width = w;
790	bitmap.pitch = w;	905	bitmap.pitch = w;
791	bitmap.buffer = (unsigned char*)SvPVX (retval);	906	bitmap.buffer = (unsigned char*)SvPVX (retval);
792	bitmap.num_grays = 256;	907	bitmap.num_grays = 256;
793	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	908	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
794		909
795	memset (bitmap.buffer, 0, w * h);	910	memset (bitmap.buffer, 0, w * h);
796		911
797	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	912	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
798		913
799	EXTEND (SP, 3);	914	EXTEND (SP, 5);
800	PUSHs (sv_2mortal (newSViv (w)));	915	PUSHs (sv_2mortal (newSViv (w)));
801	PUSHs (sv_2mortal (newSViv (h)));	916	PUSHs (sv_2mortal (newSViv (h)));
802	PUSHs (sv_2mortal (retval));	917	PUSHs (sv_2mortal (retval));
		918	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		919	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		920	}
803	}	921	}
804		922
805	MODULE = CFClient PACKAGE = CFClient::Texture	923	MODULE = CFClient PACKAGE = CFClient::Texture
806		924
807	void	925	void
808	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	926	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
809	PROTOTYPE: $$$;$$	927	PROTOTYPE: $$$;$$
		928	ALIAS:
		929	draw_quad_alpha = 1
		930	draw_quad_alpha_premultiplied = 2
810	CODE:	931	CODE:
811	{	932	{
812	HV hv = (HV )SvRV (self);	933	HV hv = (HV )SvRV (self);
813	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	934	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
814	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	935	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
819	{	940	{
820	w = SvNV (*hv_fetch (hv, "w", 1, 1));	941	w = SvNV (*hv_fetch (hv, "w", 1, 1));
821	h = SvNV (*hv_fetch (hv, "h", 1, 1));	942	h = SvNV (*hv_fetch (hv, "h", 1, 1));
822	}	943	}
823		944
		945	if (ix)
		946	{
		947	glEnable (GL_BLEND);
		948	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		949	}
		950
824	glBindTexture (GL_TEXTURE_2D, name);	951	glBindTexture (GL_TEXTURE_2D, name);
		952
825	if (wrap_mode) {	953	if (wrap_mode)
		954	{
826	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	955	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
827	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	956	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
828	}	957	}
		958
829	glBegin (GL_QUADS);	959	glBegin (GL_QUADS);
830	glTexCoord2f (0, 0); glVertex2f (x , y );	960	glTexCoord2f (0, 0); glVertex2f (x , y );
831	glTexCoord2f (0, t); glVertex2f (x , y + h);	961	glTexCoord2f (0, t); glVertex2f (x , y + h);
832	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	962	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
833	glTexCoord2f (s, 0); glVertex2f (x + w, y );	963	glTexCoord2f (s, 0); glVertex2f (x + w, y );
834	glEnd ();	964	glEnd ();
		965
		966	if (ix)
		967	glDisable (GL_BLEND);
835	}	968	}
836		969
837	MODULE = CFClient PACKAGE = CFClient::Map	970	MODULE = CFClient PACKAGE = CFClient::Map
838		971
839	CFClient::Map	972	CFClient::Map
…		…
1348	} *civ, const_iv[] = {	1481	} *civ, const_iv[] = {
1349	# define const_iv(name) { # name, (IV)name }	1482	# define const_iv(name) { # name, (IV)name }
1350	const_iv (GL_COLOR_MATERIAL),	1483	const_iv (GL_COLOR_MATERIAL),
1351	const_iv (GL_SMOOTH),	1484	const_iv (GL_SMOOTH),
1352	const_iv (GL_FLAT),	1485	const_iv (GL_FLAT),
		1486	const_iv (GL_DITHER),
1353	const_iv (GL_BLEND),	1487	const_iv (GL_BLEND),
		1488	const_iv (GL_SCISSOR_TEST),
1354	const_iv (GL_AND),	1489	const_iv (GL_AND),
		1490	const_iv (GL_ONE),
		1491	const_iv (GL_ZERO),
1355	const_iv (GL_SRC_ALPHA),	1492	const_iv (GL_SRC_ALPHA),
		1493	const_iv (GL_SRC_ALPHA_SATURATE),
1356	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1494	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1495	const_iv (GL_ONE_MINUS_DST_ALPHA),
1357	const_iv (GL_RGB),	1496	const_iv (GL_RGB),
1358	const_iv (GL_RGBA),	1497	const_iv (GL_RGBA),
1359	const_iv (GL_UNSIGNED_BYTE),	1498	const_iv (GL_UNSIGNED_BYTE),
1360	const_iv (GL_ALPHA),	1499	const_iv (GL_ALPHA),
		1500	const_iv (GL_LUMINANCE),
1361	const_iv (GL_FLOAT),	1501	const_iv (GL_FLOAT),
1362	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1502	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1363	const_iv (GL_COMPILE),	1503	const_iv (GL_COMPILE),
1364	const_iv (GL_TEXTURE_1D),	1504	const_iv (GL_TEXTURE_1D),
1365	const_iv (GL_TEXTURE_2D),	1505	const_iv (GL_TEXTURE_2D),
…		…
1376	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1516	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1377	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1517	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1378	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1518	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1379	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1519	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1380	const_iv (GL_GENERATE_MIPMAP),	1520	const_iv (GL_GENERATE_MIPMAP),
1381	const_iv (GL_LINEAR),
1382	const_iv (GL_MODULATE),	1521	const_iv (GL_MODULATE),
		1522	const_iv (GL_DECAL),
1383	const_iv (GL_REPLACE),	1523	const_iv (GL_REPLACE),
1384	const_iv (GL_COLOR_BUFFER_BIT),	1524	const_iv (GL_COLOR_BUFFER_BIT),
1385	const_iv (GL_PROJECTION),	1525	const_iv (GL_PROJECTION),
1386	const_iv (GL_MODELVIEW),	1526	const_iv (GL_MODELVIEW),
1387	const_iv (GL_COLOR_LOGIC_OP),	1527	const_iv (GL_COLOR_LOGIC_OP),
		1528	const_iv (GL_SEPARABLE_2D),
1388	const_iv (GL_CONVOLUTION_2D),	1529	const_iv (GL_CONVOLUTION_2D),
1389	const_iv (GL_CONVOLUTION_BORDER_MODE),	1530	const_iv (GL_CONVOLUTION_BORDER_MODE),
1390	const_iv (GL_CONSTANT_BORDER),	1531	const_iv (GL_CONSTANT_BORDER),
1391	const_iv (GL_LINES),	1532	const_iv (GL_LINES),
1392	const_iv (GL_QUADS),	1533	const_iv (GL_QUADS),
…		…
1417		1558
1418	void glBlendFunc (int sfactor, int dfactor)	1559	void glBlendFunc (int sfactor, int dfactor)
1419		1560
1420	void glLogicOp (int opcode)	1561	void glLogicOp (int opcode)
1421		1562
		1563	void glColorMask (int red, int green, int blue, int alpha)
		1564
1422	void glMatrixMode (int mode)	1565	void glMatrixMode (int mode)
1423		1566
1424	void glPushMatrix ()	1567	void glPushMatrix ()
1425		1568
1426	void glPopMatrix ()	1569	void glPopMatrix ()
…		…
1429		1572
1430	# near and far are due to microsofts buggy c compiler	1573	# near and far are due to microsofts buggy c compiler
1431	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1574	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1432		1575
1433	void glViewport (int x, int y, int width, int height)	1576	void glViewport (int x, int y, int width, int height)
		1577
		1578	void glScissor (int x, int y, int width, int height)
1434		1579
1435	void glTranslate (float x, float y, float z = 0.)	1580	void glTranslate (float x, float y, float z = 0.)
1436	CODE:	1581	CODE:
1437	glTranslatef (x, y, z);	1582	glTranslatef (x, y, z);
1438		1583
…		…
1449	void glEnd ()	1594	void glEnd ()
1450		1595
1451	void glColor (float r, float g, float b, float a = 1.0)	1596	void glColor (float r, float g, float b, float a = 1.0)
1452	PROTOTYPE: @	1597	PROTOTYPE: @
1453	CODE:	1598	CODE:
1454	glColor4f (r, g, b, a);	1599	glColor4ub (MIN ((int)(r * 255.f), 255),
		1600	MIN ((int)(g * 255.f), 255),
		1601	MIN ((int)(b * 255.f), 255),
		1602	MIN ((int)(a * 255.f), 255));
1455		1603
1456	void glVertex (float x, float y, float z = 0.)	1604	void glVertex (float x, float y, float z = 0.)
1457	CODE:	1605	CODE:
1458	glVertex3f (x, y, z);	1606	glVertex3f (x, y, z);
1459		1607
…		…
1478	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1626	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1479	CODE:	1627	CODE:
1480	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1628	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1481	(target, internalformat, width, height, format, type, data));	1629	(target, internalformat, width, height, format, type, data));
1482		1630
		1631	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		1632	CODE:
		1633	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
		1634	(target, internalformat, width, height, format, type, row, column));
		1635
1483	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1636	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1484		1637
1485	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1638	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1639
		1640	void glRasterPos (int x, int y)
		1641	CODE:
		1642	glRasterPos2i (x, y);
		1643
		1644	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1486		1645
1487	int glGenTexture ()	1646	int glGenTexture ()
1488	CODE:	1647	CODE:
1489	{	1648	{
1490	GLuint name;	1649	GLuint name;

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.66 by root, Mon Apr 24 11:45:16 2006 UTC vs. Revision 1.83 by root, Mon May 15 00:25:14 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.66 by root, Mon Apr 24 11:45:16 2006 UTC vs.
Revision 1.83 by root, Mon May 15 00:25:14 2006 UTC