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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.63 by root, Mon Apr 24 06:05:33 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>
42	#define MAP_EXTEND_X 32	48	#define MAP_EXTEND_X 32
43	#define MAP_EXTEND_Y 512	49	#define MAP_EXTEND_Y 512
44		50
45	#define MIN_FONT_HEIGHT 10	51	#define MIN_FONT_HEIGHT 10
46		52
		53	#define GL_CALL(type,func,args) \
		54	{ \
		55	static int init_; \
		56	static type fptr_; \
		57	\
		58	if (!init_) \
		59	{ \
		60	init_ = 1; \
		61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
		62	} \
		63	\
		64	if (fptr_) \
		65	fptr_ args; \
		66	}
		67
47	typedef Mix_Chunk *CFClient__MixChunk;	68	typedef Mix_Chunk *CFClient__MixChunk;
48	typedef Mix_Music *CFClient__MixMusic;	69	typedef Mix_Music *CFClient__MixMusic;
49		70
50	typedef PangoFontDescription *CFClient__Font;	71	typedef PangoFontDescription *CFClient__Font;
51		72
52	typedef struct cf_layout {	73	typedef struct cf_layout {
53	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
54	int base_height;	77	int base_height;
55	CFClient__Font font;	78	CFClient__Font font;
56	} *CFClient__Layout;	79	} *CFClient__Layout;
57		80
58	static CFClient__Font default_font;	81	static CFClient__Font default_font;
59	static PangoContext *context;	82	static PangoContext ft2_context, cairo_context;
60	static PangoFontMap *fontmap;	83	static PangoFontMap ft2_fontmap, cairo_fontmap;
61		84
62	static void	85	static void
63	substitute_func (FcPattern *pattern, gpointer data)	86	substitute_func (FcPattern *pattern, gpointer data)
64	{	87	{
65	FcPatternAddBool (pattern, FC_HINTING , 1);	88	FcPatternAddBool (pattern, FC_HINTING , 1);
		89	#ifdef _WIN32
		90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
		91	#else
66	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
		93	#endif
67	}	94	}
68		95
69	static void	96	static void
70	layout_update_font (CFClient__Layout self)	97	layout_update_font (CFClient__Layout self)
71	{	98	{
…		…
83	static void	110	static void
84	layout_get_pixel_size (CFClient__Layout self, int w, int h)	111	layout_get_pixel_size (CFClient__Layout self, int w, int h)
85	{	112	{
86	pango_layout_get_pixel_size (self->pl, w, h);	113	pango_layout_get_pixel_size (self->pl, w, h);
87		114
88	w = (w + 3) & ~3;
89	if (!w) w = 1;	115	if (!w) w = 1;
90	if (!h) h = 1;	116	if (!h) h = 1;
		117
		118	w = (w + 3) & ~3;
91	}	119	}
92		120
93	typedef uint16_t mapface;	121	typedef uint16_t mapface;
94		122
95	typedef struct {	123	typedef struct {
…		…
243	}	271	}
244	}	272	}
245	}	273	}
246		274
247	static void	275	static void
248	music_finished ()	276	music_finished (void)
249	{	277	{
250	SDL_UserEvent ev;	278	SDL_UserEvent ev;
251		279
252	ev.type = SDL_USEREVENT;	280	ev.type = SDL_USEREVENT;
253	ev.code = 0;	281	ev.code = 0;
254	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;
255	ev.data2 = 0;	296	ev.data2 = 0;
256		297
257	SDL_PushEvent ((SDL_Event *)&ev);	298	SDL_PushEvent ((SDL_Event *)&ev);
258	}	299	}
259		300
…		…
370	# undef const_iv	411	# undef const_iv
371	};	412	};
372		413
373	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; )
374	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		416	}
375		417
		418	void
		419	pango_init ()
		420	CODE:
		421	{
		422	// delayed, so it can pick up new fonts added by AddFontResourceEx
376	fontmap = pango_ft2_font_map_new ();	423	ft2_fontmap = pango_ft2_font_map_new ();
377	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);
378	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);
379	}	429	}
380		430
381	int	431	int
382	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
383		433
…		…
442		492
443	while (SDL_PollEvent (&ev))	493	while (SDL_PollEvent (&ev))
444	{	494	{
445	HV *hv = newHV ();	495	HV *hv = newHV ();
446	hv_store (hv, "type", 4, newSViv (ev.type), 0);	496	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		497
447	switch (ev.type)	498	switch (ev.type)
448	{	499	{
449	case SDL_KEYDOWN:	500	case SDL_KEYDOWN:
450	case SDL_KEYUP:	501	case SDL_KEYUP:
451	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	502	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
471	case SDL_MOUSEBUTTONUP:	522	case SDL_MOUSEBUTTONUP:
472	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	523	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
473	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	524	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
474	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	525	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
475	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;
476	}	534	}
477		535
478	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	536	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
479	}	537	}
480	}	538	}
481		539
482	int	540	int
483	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)
484	POSTCALL:	542	POSTCALL:
485	Mix_HookMusicFinished (music_finished);	543	Mix_HookMusicFinished (music_finished);
		544	Mix_ChannelFinished (channel_finished);
486		545
487	void	546	void
488	Mix_CloseAudio ()	547	Mix_CloseAudio ()
489		548
490	int	549	int
…		…
513		572
514	void	573	void
515	add_font (char *file)	574	add_font (char *file)
516	CODE:	575	CODE:
517	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
518		581
519	void	582	void
520	load_image_inline (SV *image_)	583	load_image_inline (SV *image_)
521	ALIAS:	584	ALIAS:
522	load_image_file = 1	585	load_image_file = 1
…		…
604	PUSHs (sv_2mortal (newSViv (b / y)));	667	PUSHs (sv_2mortal (newSViv (b / y)));
605	PUSHs (sv_2mortal (newSViv (a / y)));	668	PUSHs (sv_2mortal (newSViv (a / y)));
606	}	669	}
607		670
608	void	671	void
		672	error (char *message)
		673	CODE:
		674	#ifdef _WIN32
		675	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
		676	#else
		677	fprintf (stderr, "ERROR: %s\n", message);
		678	#endif
		679
		680	void
609	fatal (char *message)	681	fatal (char *message)
610	CODE:	682	CODE:
611	#ifdef _WIN32	683	#ifdef _WIN32
612	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	684	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
613	#else	685	#else
…		…
616	exit (1);	688	exit (1);
617		689
618	MODULE = CFClient PACKAGE = CFClient::Font	690	MODULE = CFClient PACKAGE = CFClient::Font
619		691
620	CFClient::Font	692	CFClient::Font
621	new_from_file (SV class, char path)	693	new_from_file (SV class, char path, int id = 0)
622	CODE:	694	CODE:
623	{	695	{
624	int count;	696	int count;
625	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, 0, 0, &count);	697	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
626	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	698	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
627	FcPatternDestroy (pattern);	699	FcPatternDestroy (pattern);
628	}	700	}
629	OUTPUT:	701	OUTPUT:
630	RETVAL	702	RETVAL
…		…
640	default_font = self;	712	default_font = self;
641		713
642	MODULE = CFClient PACKAGE = CFClient::Layout	714	MODULE = CFClient PACKAGE = CFClient::Layout
643		715
644	CFClient::Layout	716	CFClient::Layout
645	new (SV *class, int base_height = MIN_FONT_HEIGHT)	717	new (SV *class, int rgba = 0)
646	CODE:	718	CODE:
647	New (0, RETVAL, 1, struct cf_layout);	719	New (0, RETVAL, 1, struct cf_layout);
648	RETVAL->pl = pango_layout_new (context);	720
649	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;
650	RETVAL->font = 0;	728	RETVAL->font = 0;
		729
651	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	730	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
652	pango_layout_set_font_description (RETVAL->pl, default_font);	731	layout_update_font (RETVAL);
653	OUTPUT:	732	OUTPUT:
654	RETVAL	733	RETVAL
655		734
656	void	735	void
657	DESTROY (CFClient::Layout self)	736	DESTROY (CFClient::Layout self)
658	CODE:	737	CODE:
659	g_object_unref (self->pl);	738	g_object_unref (self->pl);
660	Safefree (self);	739	Safefree (self);
661		740
		741	int
		742	is_rgba (CFClient::Layout self)
		743	CODE:
		744	RETVAL = self->rgba;
		745	OUTPUT:
		746	RETVAL
		747
662	void	748	void
663	set_text (CFClient::Layout self, SV *text_)	749	set_text (CFClient::Layout self, SV *text_)
664	CODE:	750	CODE:
665	{	751	{
666	STRLEN textlen;	752	STRLEN textlen;
…		…
684	CODE:	770	CODE:
685	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	771	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
686	SvUTF8_on (RETVAL);	772	SvUTF8_on (RETVAL);
687	OUTPUT:	773	OUTPUT:
688	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;
689		783
690	void	784	void
691	set_font (CFClient::Layout self, CFClient::Font font = 0)	785	set_font (CFClient::Layout self, CFClient::Font font = 0)
692	CODE:	786	CODE:
693	if (self->font != font)	787	if (self->font != font)
…		…
751	render (CFClient::Layout self)	845	render (CFClient::Layout self)
752	PPCODE:	846	PPCODE:
753	{	847	{
754	SV *retval;	848	SV *retval;
755	int w, h;	849	int w, h;
756	FT_Bitmap bitmap;
757		850
758	layout_get_pixel_size (self, &w, &h);	851	layout_get_pixel_size (self, &w, &h);
759		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
760	retval = newSV (w * h);	899	retval = newSV (w * h);
761	SvPOK_only (retval);	900	SvPOK_only (retval);
762	SvCUR_set (retval, w * h);	901	SvCUR_set (retval, w * h);
763		902
764	bitmap.rows = h;	903	bitmap.rows = h;
765	bitmap.width = w;	904	bitmap.width = w;
766	bitmap.pitch = w;	905	bitmap.pitch = w;
767	bitmap.buffer = (unsigned char*)SvPVX (retval);	906	bitmap.buffer = (unsigned char*)SvPVX (retval);
768	bitmap.num_grays = 256;	907	bitmap.num_grays = 256;
769	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	908	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
770		909
771	memset (bitmap.buffer, 0, w * h);	910	memset (bitmap.buffer, 0, w * h);
772		911
773	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);
774		913
775	EXTEND (SP, 3);	914	EXTEND (SP, 5);
776	PUSHs (sv_2mortal (newSViv (w)));	915	PUSHs (sv_2mortal (newSViv (w)));
777	PUSHs (sv_2mortal (newSViv (h)));	916	PUSHs (sv_2mortal (newSViv (h)));
778	PUSHs (sv_2mortal (retval));	917	PUSHs (sv_2mortal (retval));
		918	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		919	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		920	}
779	}	921	}
780		922
781	MODULE = CFClient PACKAGE = CFClient::Texture	923	MODULE = CFClient PACKAGE = CFClient::Texture
782		924
783	void	925	void
784	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)
785	PROTOTYPE: $$$;$$	927	PROTOTYPE: $$$;$$
		928	ALIAS:
		929	draw_quad_alpha = 1
		930	draw_quad_alpha_premultiplied = 2
786	CODE:	931	CODE:
787	{	932	{
788	HV hv = (HV )SvRV (self);	933	HV hv = (HV )SvRV (self);
789	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	934	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
790	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	935	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
795	{	940	{
796	w = SvNV (*hv_fetch (hv, "w", 1, 1));	941	w = SvNV (*hv_fetch (hv, "w", 1, 1));
797	h = SvNV (*hv_fetch (hv, "h", 1, 1));	942	h = SvNV (*hv_fetch (hv, "h", 1, 1));
798	}	943	}
799		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
800	glBindTexture (GL_TEXTURE_2D, name);	951	glBindTexture (GL_TEXTURE_2D, name);
		952
801	if (wrap_mode) {	953	if (wrap_mode)
		954	{
802	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	955	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
803	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	956	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
804	}	957	}
		958
805	glBegin (GL_QUADS);	959	glBegin (GL_QUADS);
806	glTexCoord2f (0, 0); glVertex2f (x , y );	960	glTexCoord2f (0, 0); glVertex2f (x , y );
807	glTexCoord2f (0, t); glVertex2f (x , y + h);	961	glTexCoord2f (0, t); glVertex2f (x , y + h);
808	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	962	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
809	glTexCoord2f (s, 0); glVertex2f (x + w, y );	963	glTexCoord2f (s, 0); glVertex2f (x + w, y );
810	glEnd ();	964	glEnd ();
		965
		966	if (ix)
		967	glDisable (GL_BLEND);
811	}	968	}
812		969
813	MODULE = CFClient PACKAGE = CFClient::Map	970	MODULE = CFClient PACKAGE = CFClient::Map
814		971
815	CFClient::Map	972	CFClient::Map
…		…
1324	} *civ, const_iv[] = {	1481	} *civ, const_iv[] = {
1325	# define const_iv(name) { # name, (IV)name }	1482	# define const_iv(name) { # name, (IV)name }
1326	const_iv (GL_COLOR_MATERIAL),	1483	const_iv (GL_COLOR_MATERIAL),
1327	const_iv (GL_SMOOTH),	1484	const_iv (GL_SMOOTH),
1328	const_iv (GL_FLAT),	1485	const_iv (GL_FLAT),
		1486	const_iv (GL_DITHER),
1329	const_iv (GL_BLEND),	1487	const_iv (GL_BLEND),
		1488	const_iv (GL_SCISSOR_TEST),
1330	const_iv (GL_AND),	1489	const_iv (GL_AND),
		1490	const_iv (GL_ONE),
		1491	const_iv (GL_ZERO),
1331	const_iv (GL_SRC_ALPHA),	1492	const_iv (GL_SRC_ALPHA),
		1493	const_iv (GL_SRC_ALPHA_SATURATE),
1332	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1494	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1495	const_iv (GL_ONE_MINUS_DST_ALPHA),
1333	const_iv (GL_RGB),	1496	const_iv (GL_RGB),
1334	const_iv (GL_RGBA),	1497	const_iv (GL_RGBA),
1335	const_iv (GL_UNSIGNED_BYTE),	1498	const_iv (GL_UNSIGNED_BYTE),
1336	const_iv (GL_ALPHA4),
1337	const_iv (GL_ALPHA),	1499	const_iv (GL_ALPHA),
		1500	const_iv (GL_LUMINANCE),
1338	const_iv (GL_FLOAT),	1501	const_iv (GL_FLOAT),
1339	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1502	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1340	const_iv (GL_COMPILE),	1503	const_iv (GL_COMPILE),
1341	const_iv (GL_TEXTURE_1D),	1504	const_iv (GL_TEXTURE_1D),
1342	const_iv (GL_TEXTURE_2D),	1505	const_iv (GL_TEXTURE_2D),
…		…
1353	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1516	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1354	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1517	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1355	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1518	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1356	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1519	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1357	const_iv (GL_GENERATE_MIPMAP),	1520	const_iv (GL_GENERATE_MIPMAP),
1358	const_iv (GL_LINEAR),
1359	const_iv (GL_MODULATE),	1521	const_iv (GL_MODULATE),
		1522	const_iv (GL_DECAL),
1360	const_iv (GL_REPLACE),	1523	const_iv (GL_REPLACE),
1361	const_iv (GL_COLOR_BUFFER_BIT),	1524	const_iv (GL_COLOR_BUFFER_BIT),
1362	const_iv (GL_PROJECTION),	1525	const_iv (GL_PROJECTION),
1363	const_iv (GL_MODELVIEW),	1526	const_iv (GL_MODELVIEW),
1364	const_iv (GL_COLOR_LOGIC_OP),	1527	const_iv (GL_COLOR_LOGIC_OP),
		1528	const_iv (GL_SEPARABLE_2D),
1365	const_iv (GL_CONVOLUTION_2D),	1529	const_iv (GL_CONVOLUTION_2D),
1366	const_iv (GL_CONVOLUTION_BORDER_MODE),	1530	const_iv (GL_CONVOLUTION_BORDER_MODE),
1367	const_iv (GL_CONSTANT_BORDER),	1531	const_iv (GL_CONSTANT_BORDER),
1368	const_iv (GL_LINES),	1532	const_iv (GL_LINES),
1369	const_iv (GL_QUADS),	1533	const_iv (GL_QUADS),
…		…
1394		1558
1395	void glBlendFunc (int sfactor, int dfactor)	1559	void glBlendFunc (int sfactor, int dfactor)
1396		1560
1397	void glLogicOp (int opcode)	1561	void glLogicOp (int opcode)
1398		1562
		1563	void glColorMask (int red, int green, int blue, int alpha)
		1564
1399	void glMatrixMode (int mode)	1565	void glMatrixMode (int mode)
1400		1566
1401	void glPushMatrix ()	1567	void glPushMatrix ()
1402		1568
1403	void glPopMatrix ()	1569	void glPopMatrix ()
1404		1570
1405	void glLoadIdentity ()	1571	void glLoadIdentity ()
1406		1572
		1573	# near and far are due to microsofts buggy c compiler
1407	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_)
1408		1575
1409	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)
1410		1579
1411	void glTranslate (float x, float y, float z = 0.)	1580	void glTranslate (float x, float y, float z = 0.)
1412	CODE:	1581	CODE:
1413	glTranslatef (x, y, z);	1582	glTranslatef (x, y, z);
1414		1583
…		…
1425	void glEnd ()	1594	void glEnd ()
1426		1595
1427	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)
1428	PROTOTYPE: @	1597	PROTOTYPE: @
1429	CODE:	1598	CODE:
1430	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));
1431		1603
1432	void glVertex (float x, float y, float z = 0.)	1604	void glVertex (float x, float y, float z = 0.)
1433	CODE:	1605	CODE:
1434	glVertex3f (x, y, z);	1606	glVertex3f (x, y, z);
1435		1607
…		…
1447		1619
1448	void glBindTexture (int target, int name)	1620	void glBindTexture (int target, int name)
1449		1621
1450	void glConvolutionParameter (int target, int pname, float params)	1622	void glConvolutionParameter (int target, int pname, float params)
1451	CODE:	1623	CODE:
1452	glConvolutionParameterf (target, pname, params);	1624	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1453		1625
1454	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)
		1627	CODE:
		1628	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
		1629	(target, internalformat, width, height, format, type, data));
		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));
1455		1635
1456	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)
1457		1637
1458	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)
1459		1645
1460	int glGenTexture ()	1646	int glGenTexture ()
1461	CODE:	1647	CODE:
1462	{	1648	{
1463	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.63 by root, Mon Apr 24 06:05:33 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.63 by root, Mon Apr 24 06:05:33 2006 UTC vs.
Revision 1.83 by root, Mon May 15 00:25:14 2006 UTC