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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.62 by root, Mon Apr 24 02:41:47 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>
40	#define FOW_DARKNESS 32	46	#define FOW_DARKNESS 32
41		47
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 8	51	#define MIN_FONT_HEIGHT 10
		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	}
46		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	#ifndef _WIN32
66	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	90	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
		91	#endif
67	}	92	}
68		93
69	static void	94	static void
70	layout_update_font (CFClient__Layout self)	95	layout_update_font (CFClient__Layout self)
71	{	96	{
…		…
83	static void	108	static void
84	layout_get_pixel_size (CFClient__Layout self, int w, int h)	109	layout_get_pixel_size (CFClient__Layout self, int w, int h)
85	{	110	{
86	pango_layout_get_pixel_size (self->pl, w, h);	111	pango_layout_get_pixel_size (self->pl, w, h);
87		112
88	w = (w + 3) & ~3;
89	if (!w) w = 1;	113	if (!w) w = 1;
90	if (!h) h = 1;	114	if (!h) h = 1;
		115
		116	w = (w + 3) & ~3;
91	}	117	}
92		118
93	typedef uint16_t mapface;	119	typedef uint16_t mapface;
94		120
95	typedef struct {	121	typedef struct {
…		…
243	}	269	}
244	}	270	}
245	}	271	}
246		272
247	static void	273	static void
248	music_finished ()	274	music_finished (void)
249	{	275	{
250	SDL_UserEvent ev;	276	SDL_UserEvent ev;
251		277
252	ev.type = SDL_USEREVENT;	278	ev.type = SDL_USEREVENT;
253	ev.code = 0;	279	ev.code = 0;
254	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;
255	ev.data2 = 0;	294	ev.data2 = 0;
256		295
257	SDL_PushEvent ((SDL_Event *)&ev);	296	SDL_PushEvent ((SDL_Event *)&ev);
258	}	297	}
259		298
…		…
370	# undef const_iv	409	# undef const_iv
371	};	410	};
372		411
373	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; )
374	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	413	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		414	}
375		415
		416	void
		417	pango_init ()
		418	CODE:
		419	{
		420	// delayed, so it can pick up new fonts added by AddFontResourceEx
376	fontmap = pango_ft2_font_map_new ();	421	ft2_fontmap = pango_ft2_font_map_new ();
377	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);
378	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);
379	}	427	}
380		428
381	int	429	int
382	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	430	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
383		431
…		…
442		490
443	while (SDL_PollEvent (&ev))	491	while (SDL_PollEvent (&ev))
444	{	492	{
445	HV *hv = newHV ();	493	HV *hv = newHV ();
446	hv_store (hv, "type", 4, newSViv (ev.type), 0);	494	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		495
447	switch (ev.type)	496	switch (ev.type)
448	{	497	{
449	case SDL_KEYDOWN:	498	case SDL_KEYDOWN:
450	case SDL_KEYUP:	499	case SDL_KEYUP:
451	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	500	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
471	case SDL_MOUSEBUTTONUP:	520	case SDL_MOUSEBUTTONUP:
472	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	521	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
473	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	522	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
474	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	523	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
475	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;
476	}	532	}
477		533
478	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	534	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
479	}	535	}
480	}	536	}
481		537
482	int	538	int
483	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)
484	POSTCALL:	540	POSTCALL:
485	Mix_HookMusicFinished (music_finished);	541	Mix_HookMusicFinished (music_finished);
		542	Mix_ChannelFinished (channel_finished);
486		543
487	void	544	void
488	Mix_CloseAudio ()	545	Mix_CloseAudio ()
489		546
490	int	547	int
…		…
513		570
514	void	571	void
515	add_font (char *file)	572	add_font (char *file)
516	CODE:	573	CODE:
517	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
518		579
519	void	580	void
520	load_image_inline (SV *image_)	581	load_image_inline (SV *image_)
521	ALIAS:	582	ALIAS:
522	load_image_file = 1	583	load_image_file = 1
…		…
604	PUSHs (sv_2mortal (newSViv (b / y)));	665	PUSHs (sv_2mortal (newSViv (b / y)));
605	PUSHs (sv_2mortal (newSViv (a / y)));	666	PUSHs (sv_2mortal (newSViv (a / y)));
606	}	667	}
607		668
608	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
609	fatal (char *message)	679	fatal (char *message)
610	CODE:	680	CODE:
611	#ifdef _WIN32	681	#ifdef _WIN32
612	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);
613	#else	683	#else
…		…
616	exit (1);	686	exit (1);
617		687
618	MODULE = CFClient PACKAGE = CFClient::Font	688	MODULE = CFClient PACKAGE = CFClient::Font
619		689
620	CFClient::Font	690	CFClient::Font
621	new_from_file (SV class, char path)	691	new_from_file (SV class, char path, int id = 0)
622	CODE:	692	CODE:
623	{	693	{
624	int count;	694	int count;
625	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, 0, 0, &count);	695	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
626	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	696	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
627	FcPatternDestroy (pattern);	697	FcPatternDestroy (pattern);
628	}	698	}
629	OUTPUT:	699	OUTPUT:
630	RETVAL	700	RETVAL
…		…
640	default_font = self;	710	default_font = self;
641		711
642	MODULE = CFClient PACKAGE = CFClient::Layout	712	MODULE = CFClient PACKAGE = CFClient::Layout
643		713
644	CFClient::Layout	714	CFClient::Layout
645	new (SV *class, int base_height = MIN_FONT_HEIGHT)	715	new (SV *class, int rgba = 0)
646	CODE:	716	CODE:
647	New (0, RETVAL, 1, struct cf_layout);	717	New (0, RETVAL, 1, struct cf_layout);
648	RETVAL->pl = pango_layout_new (context);	718
649	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;
650	RETVAL->font = 0;	726	RETVAL->font = 0;
		727
651	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	728	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
652	pango_layout_set_font_description (RETVAL->pl, default_font);	729	layout_update_font (RETVAL);
653	OUTPUT:	730	OUTPUT:
654	RETVAL	731	RETVAL
655		732
656	void	733	void
657	DESTROY (CFClient::Layout self)	734	DESTROY (CFClient::Layout self)
658	CODE:	735	CODE:
659	g_object_unref (self->pl);	736	g_object_unref (self->pl);
660	Safefree (self);	737	Safefree (self);
661		738
		739	int
		740	is_rgba (CFClient::Layout self)
		741	CODE:
		742	RETVAL = self->rgba;
		743	OUTPUT:
		744	RETVAL
		745
662	void	746	void
663	set_text (CFClient::Layout self, SV *text_)	747	set_text (CFClient::Layout self, SV *text_)
664	CODE:	748	CODE:
665	{	749	{
666	STRLEN textlen;	750	STRLEN textlen;
…		…
684	CODE:	768	CODE:
685	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	769	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
686	SvUTF8_on (RETVAL);	770	SvUTF8_on (RETVAL);
687	OUTPUT:	771	OUTPUT:
688	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;
689		781
690	void	782	void
691	set_font (CFClient::Layout self, CFClient::Font font = 0)	783	set_font (CFClient::Layout self, CFClient::Font font = 0)
692	CODE:	784	CODE:
693	if (self->font != font)	785	if (self->font != font)
…		…
751	render (CFClient::Layout self)	843	render (CFClient::Layout self)
752	PPCODE:	844	PPCODE:
753	{	845	{
754	SV *retval;	846	SV *retval;
755	int w, h;	847	int w, h;
756	FT_Bitmap bitmap;
757		848
758	layout_get_pixel_size (self, &w, &h);	849	layout_get_pixel_size (self, &w, &h);
759		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
760	retval = newSV (w * h);	897	retval = newSV (w * h);
761	SvPOK_only (retval);	898	SvPOK_only (retval);
762	SvCUR_set (retval, w * h);	899	SvCUR_set (retval, w * h);
763		900
764	bitmap.rows = h;	901	bitmap.rows = h;
765	bitmap.width = w;	902	bitmap.width = w;
766	bitmap.pitch = w;	903	bitmap.pitch = w;
767	bitmap.buffer = (unsigned char*)SvPVX (retval);	904	bitmap.buffer = (unsigned char*)SvPVX (retval);
768	bitmap.num_grays = 256;	905	bitmap.num_grays = 256;
769	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	906	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
770		907
771	memset (bitmap.buffer, 0, w * h);	908	memset (bitmap.buffer, 0, w * h);
772		909
773	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);
774		911
775	EXTEND (SP, 3);	912	EXTEND (SP, 5);
776	PUSHs (sv_2mortal (newSViv (w)));	913	PUSHs (sv_2mortal (newSViv (w)));
777	PUSHs (sv_2mortal (newSViv (h)));	914	PUSHs (sv_2mortal (newSViv (h)));
778	PUSHs (sv_2mortal (retval));	915	PUSHs (sv_2mortal (retval));
		916	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		917	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		918	}
779	}	919	}
780		920
781	MODULE = CFClient PACKAGE = CFClient::Texture	921	MODULE = CFClient PACKAGE = CFClient::Texture
782		922
783	void	923	void
784	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)
785	PROTOTYPE: $$$;$$	925	PROTOTYPE: $$$;$$
		926	ALIAS:
		927	draw_quad_alpha = 1
		928	draw_quad_alpha_premultiplied = 2
786	CODE:	929	CODE:
787	{	930	{
788	HV hv = (HV )SvRV (self);	931	HV hv = (HV )SvRV (self);
789	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	932	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
790	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	933	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
795	{	938	{
796	w = SvNV (*hv_fetch (hv, "w", 1, 1));	939	w = SvNV (*hv_fetch (hv, "w", 1, 1));
797	h = SvNV (*hv_fetch (hv, "h", 1, 1));	940	h = SvNV (*hv_fetch (hv, "h", 1, 1));
798	}	941	}
799		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
800	glBindTexture (GL_TEXTURE_2D, name);	949	glBindTexture (GL_TEXTURE_2D, name);
		950
801	if (wrap_mode) {	951	if (wrap_mode)
		952	{
802	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	953	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
803	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	954	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
804	}	955	}
		956
805	glBegin (GL_QUADS);	957	glBegin (GL_QUADS);
806	glTexCoord2f (0, 0); glVertex2f (x , y );	958	glTexCoord2f (0, 0); glVertex2f (x , y );
807	glTexCoord2f (0, t); glVertex2f (x , y + h);	959	glTexCoord2f (0, t); glVertex2f (x , y + h);
808	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	960	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
809	glTexCoord2f (s, 0); glVertex2f (x + w, y );	961	glTexCoord2f (s, 0); glVertex2f (x + w, y );
810	glEnd ();	962	glEnd ();
		963
		964	if (ix)
		965	glDisable (GL_BLEND);
811	}	966	}
812		967
813	MODULE = CFClient PACKAGE = CFClient::Map	968	MODULE = CFClient PACKAGE = CFClient::Map
814		969
815	CFClient::Map	970	CFClient::Map
…		…
1324	} *civ, const_iv[] = {	1479	} *civ, const_iv[] = {
1325	# define const_iv(name) { # name, (IV)name }	1480	# define const_iv(name) { # name, (IV)name }
1326	const_iv (GL_COLOR_MATERIAL),	1481	const_iv (GL_COLOR_MATERIAL),
1327	const_iv (GL_SMOOTH),	1482	const_iv (GL_SMOOTH),
1328	const_iv (GL_FLAT),	1483	const_iv (GL_FLAT),
		1484	const_iv (GL_DITHER),
1329	const_iv (GL_BLEND),	1485	const_iv (GL_BLEND),
		1486	const_iv (GL_SCISSOR_TEST),
1330	const_iv (GL_AND),	1487	const_iv (GL_AND),
		1488	const_iv (GL_ONE),
		1489	const_iv (GL_ZERO),
1331	const_iv (GL_SRC_ALPHA),	1490	const_iv (GL_SRC_ALPHA),
		1491	const_iv (GL_SRC_ALPHA_SATURATE),
1332	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1492	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1493	const_iv (GL_ONE_MINUS_DST_ALPHA),
1333	const_iv (GL_RGB),	1494	const_iv (GL_RGB),
1334	const_iv (GL_RGBA),	1495	const_iv (GL_RGBA),
1335	const_iv (GL_UNSIGNED_BYTE),	1496	const_iv (GL_UNSIGNED_BYTE),
1336	const_iv (GL_ALPHA4),
1337	const_iv (GL_ALPHA),	1497	const_iv (GL_ALPHA),
		1498	const_iv (GL_LUMINANCE),
1338	const_iv (GL_FLOAT),	1499	const_iv (GL_FLOAT),
1339	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1500	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1340	const_iv (GL_COMPILE),	1501	const_iv (GL_COMPILE),
1341	const_iv (GL_TEXTURE_1D),	1502	const_iv (GL_TEXTURE_1D),
1342	const_iv (GL_TEXTURE_2D),	1503	const_iv (GL_TEXTURE_2D),
…		…
1353	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1514	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1354	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1515	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1355	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1516	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1356	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1517	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1357	const_iv (GL_GENERATE_MIPMAP),	1518	const_iv (GL_GENERATE_MIPMAP),
1358	const_iv (GL_LINEAR),
1359	const_iv (GL_MODULATE),	1519	const_iv (GL_MODULATE),
		1520	const_iv (GL_DECAL),
1360	const_iv (GL_REPLACE),	1521	const_iv (GL_REPLACE),
1361	const_iv (GL_COLOR_BUFFER_BIT),	1522	const_iv (GL_COLOR_BUFFER_BIT),
1362	const_iv (GL_PROJECTION),	1523	const_iv (GL_PROJECTION),
1363	const_iv (GL_MODELVIEW),	1524	const_iv (GL_MODELVIEW),
1364	const_iv (GL_COLOR_LOGIC_OP),	1525	const_iv (GL_COLOR_LOGIC_OP),
		1526	const_iv (GL_SEPARABLE_2D),
1365	const_iv (GL_CONVOLUTION_2D),	1527	const_iv (GL_CONVOLUTION_2D),
1366	const_iv (GL_CONVOLUTION_BORDER_MODE),	1528	const_iv (GL_CONVOLUTION_BORDER_MODE),
1367	const_iv (GL_CONSTANT_BORDER),	1529	const_iv (GL_CONSTANT_BORDER),
1368	const_iv (GL_LINES),	1530	const_iv (GL_LINES),
1369	const_iv (GL_QUADS),	1531	const_iv (GL_QUADS),
…		…
1394		1556
1395	void glBlendFunc (int sfactor, int dfactor)	1557	void glBlendFunc (int sfactor, int dfactor)
1396		1558
1397	void glLogicOp (int opcode)	1559	void glLogicOp (int opcode)
1398		1560
		1561	void glColorMask (int red, int green, int blue, int alpha)
		1562
1399	void glMatrixMode (int mode)	1563	void glMatrixMode (int mode)
1400		1564
1401	void glPushMatrix ()	1565	void glPushMatrix ()
1402		1566
1403	void glPopMatrix ()	1567	void glPopMatrix ()
1404		1568
1405	void glLoadIdentity ()	1569	void glLoadIdentity ()
1406		1570
		1571	# 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)	1572	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1408		1573
1409	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)
1410		1577
1411	void glTranslate (float x, float y, float z = 0.)	1578	void glTranslate (float x, float y, float z = 0.)
1412	CODE:	1579	CODE:
1413	glTranslatef (x, y, z);	1580	glTranslatef (x, y, z);
1414		1581
…		…
1425	void glEnd ()	1592	void glEnd ()
1426		1593
1427	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)
1428	PROTOTYPE: @	1595	PROTOTYPE: @
1429	CODE:	1596	CODE:
1430	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));
1431		1601
1432	void glVertex (float x, float y, float z = 0.)	1602	void glVertex (float x, float y, float z = 0.)
1433	CODE:	1603	CODE:
1434	glVertex3f (x, y, z);	1604	glVertex3f (x, y, z);
1435		1605
…		…
1447		1617
1448	void glBindTexture (int target, int name)	1618	void glBindTexture (int target, int name)
1449		1619
1450	void glConvolutionParameter (int target, int pname, float params)	1620	void glConvolutionParameter (int target, int pname, float params)
1451	CODE:	1621	CODE:
1452	glConvolutionParameterf (target, pname, params);	1622	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1453		1623
1454	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)
		1625	CODE:
		1626	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
		1627	(target, internalformat, width, height, format, type, data));
		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));
1455		1633
1456	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)
1457		1635
1458	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)
1459		1643
1460	int glGenTexture ()	1644	int glGenTexture ()
1461	CODE:	1645	CODE:
1462	{	1646	{
1463	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.62 by root, Mon Apr 24 02:41:47 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.62 by root, Mon Apr 24 02:41:47 2006 UTC vs.
Revision 1.82 by root, Mon May 15 00:15:08 2006 UTC