[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.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>
42	#define MAP_EXTEND_X 32	45	#define MAP_EXTEND_X 32
43	#define MAP_EXTEND_Y 512	46	#define MAP_EXTEND_Y 512
44		47
45	#define MIN_FONT_HEIGHT 10	48	#define MIN_FONT_HEIGHT 10
46		49
		50	#define GL_CALL(type,func,args) \
		51	{ \
		52	static int init_; \
		53	static type fptr_; \
		54	\
		55	if (!init_) \
		56	{ \
		57	init_ = 1; \
		58	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
		59	} \
		60	\
		61	if (fptr_) \
		62	fptr_ args; \
		63	}
		64
47	typedef Mix_Chunk *CFClient__MixChunk;	65	typedef Mix_Chunk *CFClient__MixChunk;
48	typedef Mix_Music *CFClient__MixMusic;	66	typedef Mix_Music *CFClient__MixMusic;
49		67
50	typedef PangoFontDescription *CFClient__Font;	68	typedef PangoFontDescription *CFClient__Font;
51		69
52	typedef struct cf_layout {	70	typedef struct cf_layout {
53	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
54	int base_height;	74	int base_height;
55	CFClient__Font font;	75	CFClient__Font font;
56	} *CFClient__Layout;	76	} *CFClient__Layout;
57		77
58	static CFClient__Font default_font;	78	static CFClient__Font default_font;
59	static PangoContext *context;	79	static PangoContext ft2_context, cairo_context;
60	static PangoFontMap *fontmap;	80	static PangoFontMap ft2_fontmap, cairo_fontmap;
61		81
62	static void	82	static void
63	substitute_func (FcPattern *pattern, gpointer data)	83	substitute_func (FcPattern *pattern, gpointer data)
64	{	84	{
65	FcPatternAddBool (pattern, FC_HINTING , 1);	85	FcPatternAddBool (pattern, FC_HINTING , 1);
…		…
83	static void	103	static void
84	layout_get_pixel_size (CFClient__Layout self, int w, int h)	104	layout_get_pixel_size (CFClient__Layout self, int w, int h)
85	{	105	{
86	pango_layout_get_pixel_size (self->pl, w, h);	106	pango_layout_get_pixel_size (self->pl, w, h);
87		107
88	w = (w + 3) & ~3;
89	if (!w) w = 1;	108	if (!w) w = 1;
90	if (!h) h = 1;	109	if (!h) h = 1;
		110
		111	w = (w + 3) & ~3;
91	}	112	}
92		113
93	typedef uint16_t mapface;	114	typedef uint16_t mapface;
94		115
95	typedef struct {	116	typedef struct {
…		…
243	}	264	}
244	}	265	}
245	}	266	}
246		267
247	static void	268	static void
248	music_finished ()	269	music_finished (void)
249	{	270	{
250	SDL_UserEvent ev;	271	SDL_UserEvent ev;
251		272
252	ev.type = SDL_USEREVENT;	273	ev.type = SDL_USEREVENT;
253	ev.code = 0;	274	ev.code = 0;
254	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;
255	ev.data2 = 0;	289	ev.data2 = 0;
256		290
257	SDL_PushEvent ((SDL_Event *)&ev);	291	SDL_PushEvent ((SDL_Event *)&ev);
258	}	292	}
259		293
…		…
371	};	405	};
372		406
373	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; )
374	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	408	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
375		409
376	fontmap = pango_ft2_font_map_new ();	410	ft2_fontmap = pango_ft2_font_map_new ();
377	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);
378	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);
379	}	416	}
380		417
381	int	418	int
382	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	419	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
383		420
…		…
442		479
443	while (SDL_PollEvent (&ev))	480	while (SDL_PollEvent (&ev))
444	{	481	{
445	HV *hv = newHV ();	482	HV *hv = newHV ();
446	hv_store (hv, "type", 4, newSViv (ev.type), 0);	483	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		484
447	switch (ev.type)	485	switch (ev.type)
448	{	486	{
449	case SDL_KEYDOWN:	487	case SDL_KEYDOWN:
450	case SDL_KEYUP:	488	case SDL_KEYUP:
451	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	489	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
471	case SDL_MOUSEBUTTONUP:	509	case SDL_MOUSEBUTTONUP:
472	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	510	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
473	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	511	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
474	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	512	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
475	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;
476	}	521	}
477		522
478	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	523	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
479	}	524	}
480	}	525	}
481		526
482	int	527	int
483	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)
484	POSTCALL:	529	POSTCALL:
485	Mix_HookMusicFinished (music_finished);	530	Mix_HookMusicFinished (music_finished);
		531	Mix_ChannelFinished (channel_finished);
486		532
487	void	533	void
488	Mix_CloseAudio ()	534	Mix_CloseAudio ()
489		535
490	int	536	int
…		…
604	PUSHs (sv_2mortal (newSViv (b / y)));	650	PUSHs (sv_2mortal (newSViv (b / y)));
605	PUSHs (sv_2mortal (newSViv (a / y)));	651	PUSHs (sv_2mortal (newSViv (a / y)));
606	}	652	}
607		653
608	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
609	fatal (char *message)	664	fatal (char *message)
610	CODE:	665	CODE:
611	#ifdef _WIN32	666	#ifdef _WIN32
612	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);
613	#else	668	#else
…		…
616	exit (1);	671	exit (1);
617		672
618	MODULE = CFClient PACKAGE = CFClient::Font	673	MODULE = CFClient PACKAGE = CFClient::Font
619		674
620	CFClient::Font	675	CFClient::Font
621	new_from_file (SV class, char path)	676	new_from_file (SV class, char path, int id = 0)
622	CODE:	677	CODE:
623	{	678	{
624	int count;	679	int count;
625	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, 0, 0, &count);	680	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
626	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	681	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
627	FcPatternDestroy (pattern);	682	FcPatternDestroy (pattern);
628	}	683	}
629	OUTPUT:	684	OUTPUT:
630	RETVAL	685	RETVAL
…		…
640	default_font = self;	695	default_font = self;
641		696
642	MODULE = CFClient PACKAGE = CFClient::Layout	697	MODULE = CFClient PACKAGE = CFClient::Layout
643		698
644	CFClient::Layout	699	CFClient::Layout
645	new (SV *class, int base_height = MIN_FONT_HEIGHT)	700	new (SV *class, int rgba = 0)
646	CODE:	701	CODE:
647	New (0, RETVAL, 1, struct cf_layout);	702	New (0, RETVAL, 1, struct cf_layout);
648	RETVAL->pl = pango_layout_new (context);	703
649	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;
650	RETVAL->font = 0;	711	RETVAL->font = 0;
		712
651	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	713	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
652	pango_layout_set_font_description (RETVAL->pl, default_font);	714	layout_update_font (RETVAL);
653	OUTPUT:	715	OUTPUT:
654	RETVAL	716	RETVAL
655		717
656	void	718	void
657	DESTROY (CFClient::Layout self)	719	DESTROY (CFClient::Layout self)
658	CODE:	720	CODE:
659	g_object_unref (self->pl);	721	g_object_unref (self->pl);
660	Safefree (self);	722	Safefree (self);
661		723
		724	int
		725	is_rgba (CFClient::Layout self)
		726	CODE:
		727	RETVAL = self->rgba;
		728	OUTPUT:
		729	RETVAL
		730
662	void	731	void
663	set_text (CFClient::Layout self, SV *text_)	732	set_text (CFClient::Layout self, SV *text_)
664	CODE:	733	CODE:
665	{	734	{
666	STRLEN textlen;	735	STRLEN textlen;
…		…
684	CODE:	753	CODE:
685	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	754	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
686	SvUTF8_on (RETVAL);	755	SvUTF8_on (RETVAL);
687	OUTPUT:	756	OUTPUT:
688	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;
689		766
690	void	767	void
691	set_font (CFClient::Layout self, CFClient::Font font = 0)	768	set_font (CFClient::Layout self, CFClient::Font font = 0)
692	CODE:	769	CODE:
693	if (self->font != font)	770	if (self->font != font)
…		…
751	render (CFClient::Layout self)	828	render (CFClient::Layout self)
752	PPCODE:	829	PPCODE:
753	{	830	{
754	SV *retval;	831	SV *retval;
755	int w, h;	832	int w, h;
756	FT_Bitmap bitmap;
757		833
758	layout_get_pixel_size (self, &w, &h);	834	layout_get_pixel_size (self, &w, &h);
759		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
760	retval = newSV (w * h);	882	retval = newSV (w * h);
761	SvPOK_only (retval);	883	SvPOK_only (retval);
762	SvCUR_set (retval, w * h);	884	SvCUR_set (retval, w * h);
763		885
764	bitmap.rows = h;	886	bitmap.rows = h;
765	bitmap.width = w;	887	bitmap.width = w;
766	bitmap.pitch = w;	888	bitmap.pitch = w;
767	bitmap.buffer = (unsigned char*)SvPVX (retval);	889	bitmap.buffer = (unsigned char*)SvPVX (retval);
768	bitmap.num_grays = 256;	890	bitmap.num_grays = 256;
769	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	891	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
770		892
771	memset (bitmap.buffer, 0, w * h);	893	memset (bitmap.buffer, 0, w * h);
772		894
773	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);
774		896
775	EXTEND (SP, 3);	897	EXTEND (SP, 5);
776	PUSHs (sv_2mortal (newSViv (w)));	898	PUSHs (sv_2mortal (newSViv (w)));
777	PUSHs (sv_2mortal (newSViv (h)));	899	PUSHs (sv_2mortal (newSViv (h)));
778	PUSHs (sv_2mortal (retval));	900	PUSHs (sv_2mortal (retval));
		901	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		902	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		903	}
779	}	904	}
780		905
781	MODULE = CFClient PACKAGE = CFClient::Texture	906	MODULE = CFClient PACKAGE = CFClient::Texture
782		907
783	void	908	void
784	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)
785	PROTOTYPE: $$$;$$	910	PROTOTYPE: $$$;$$
		911	ALIAS:
		912	draw_quad_alpha = 1
		913	draw_quad_alpha_premultiplied = 2
786	CODE:	914	CODE:
787	{	915	{
788	HV hv = (HV )SvRV (self);	916	HV hv = (HV )SvRV (self);
789	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	917	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
790	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	918	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
795	{	923	{
796	w = SvNV (*hv_fetch (hv, "w", 1, 1));	924	w = SvNV (*hv_fetch (hv, "w", 1, 1));
797	h = SvNV (*hv_fetch (hv, "h", 1, 1));	925	h = SvNV (*hv_fetch (hv, "h", 1, 1));
798	}	926	}
799		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
800	glBindTexture (GL_TEXTURE_2D, name);	934	glBindTexture (GL_TEXTURE_2D, name);
		935
801	if (wrap_mode) {	936	if (wrap_mode)
		937	{
802	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	938	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
803	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	939	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
804	}	940	}
		941
805	glBegin (GL_QUADS);	942	glBegin (GL_QUADS);
806	glTexCoord2f (0, 0); glVertex2f (x , y );	943	glTexCoord2f (0, 0); glVertex2f (x , y );
807	glTexCoord2f (0, t); glVertex2f (x , y + h);	944	glTexCoord2f (0, t); glVertex2f (x , y + h);
808	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	945	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
809	glTexCoord2f (s, 0); glVertex2f (x + w, y );	946	glTexCoord2f (s, 0); glVertex2f (x + w, y );
810	glEnd ();	947	glEnd ();
		948
		949	if (ix)
		950	glDisable (GL_BLEND);
811	}	951	}
812		952
813	MODULE = CFClient PACKAGE = CFClient::Map	953	MODULE = CFClient PACKAGE = CFClient::Map
814		954
815	CFClient::Map	955	CFClient::Map
…		…
1324	} *civ, const_iv[] = {	1464	} *civ, const_iv[] = {
1325	# define const_iv(name) { # name, (IV)name }	1465	# define const_iv(name) { # name, (IV)name }
1326	const_iv (GL_COLOR_MATERIAL),	1466	const_iv (GL_COLOR_MATERIAL),
1327	const_iv (GL_SMOOTH),	1467	const_iv (GL_SMOOTH),
1328	const_iv (GL_FLAT),	1468	const_iv (GL_FLAT),
		1469	const_iv (GL_DITHER),
1329	const_iv (GL_BLEND),	1470	const_iv (GL_BLEND),
		1471	const_iv (GL_SCISSOR_TEST),
1330	const_iv (GL_AND),	1472	const_iv (GL_AND),
		1473	const_iv (GL_ONE),
		1474	const_iv (GL_ZERO),
1331	const_iv (GL_SRC_ALPHA),	1475	const_iv (GL_SRC_ALPHA),
		1476	const_iv (GL_SRC_ALPHA_SATURATE),
1332	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1477	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1478	const_iv (GL_ONE_MINUS_DST_ALPHA),
1333	const_iv (GL_RGB),	1479	const_iv (GL_RGB),
1334	const_iv (GL_RGBA),	1480	const_iv (GL_RGBA),
1335	const_iv (GL_UNSIGNED_BYTE),	1481	const_iv (GL_UNSIGNED_BYTE),
1336	const_iv (GL_ALPHA4),
1337	const_iv (GL_ALPHA),	1482	const_iv (GL_ALPHA),
		1483	const_iv (GL_LUMINANCE),
1338	const_iv (GL_FLOAT),	1484	const_iv (GL_FLOAT),
1339	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1485	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1340	const_iv (GL_COMPILE),	1486	const_iv (GL_COMPILE),
1341	const_iv (GL_TEXTURE_1D),	1487	const_iv (GL_TEXTURE_1D),
1342	const_iv (GL_TEXTURE_2D),	1488	const_iv (GL_TEXTURE_2D),
…		…
1353	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1499	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1354	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1500	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1355	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1501	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1356	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1502	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1357	const_iv (GL_GENERATE_MIPMAP),	1503	const_iv (GL_GENERATE_MIPMAP),
1358	const_iv (GL_LINEAR),
1359	const_iv (GL_MODULATE),	1504	const_iv (GL_MODULATE),
		1505	const_iv (GL_DECAL),
1360	const_iv (GL_REPLACE),	1506	const_iv (GL_REPLACE),
1361	const_iv (GL_COLOR_BUFFER_BIT),	1507	const_iv (GL_COLOR_BUFFER_BIT),
1362	const_iv (GL_PROJECTION),	1508	const_iv (GL_PROJECTION),
1363	const_iv (GL_MODELVIEW),	1509	const_iv (GL_MODELVIEW),
1364	const_iv (GL_COLOR_LOGIC_OP),	1510	const_iv (GL_COLOR_LOGIC_OP),
		1511	const_iv (GL_SEPARABLE_2D),
1365	const_iv (GL_CONVOLUTION_2D),	1512	const_iv (GL_CONVOLUTION_2D),
1366	const_iv (GL_CONVOLUTION_BORDER_MODE),	1513	const_iv (GL_CONVOLUTION_BORDER_MODE),
1367	const_iv (GL_CONSTANT_BORDER),	1514	const_iv (GL_CONSTANT_BORDER),
1368	const_iv (GL_LINES),	1515	const_iv (GL_LINES),
1369	const_iv (GL_QUADS),	1516	const_iv (GL_QUADS),
…		…
1394		1541
1395	void glBlendFunc (int sfactor, int dfactor)	1542	void glBlendFunc (int sfactor, int dfactor)
1396		1543
1397	void glLogicOp (int opcode)	1544	void glLogicOp (int opcode)
1398		1545
		1546	void glColorMask (int red, int green, int blue, int alpha)
		1547
1399	void glMatrixMode (int mode)	1548	void glMatrixMode (int mode)
1400		1549
1401	void glPushMatrix ()	1550	void glPushMatrix ()
1402		1551
1403	void glPopMatrix ()	1552	void glPopMatrix ()
1404		1553
1405	void glLoadIdentity ()	1554	void glLoadIdentity ()
1406		1555
		1556	# 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)	1557	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1408		1558
1409	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)
1410		1562
1411	void glTranslate (float x, float y, float z = 0.)	1563	void glTranslate (float x, float y, float z = 0.)
1412	CODE:	1564	CODE:
1413	glTranslatef (x, y, z);	1565	glTranslatef (x, y, z);
1414		1566
…		…
1425	void glEnd ()	1577	void glEnd ()
1426		1578
1427	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)
1428	PROTOTYPE: @	1580	PROTOTYPE: @
1429	CODE:	1581	CODE:
1430	glColor4f (r, g, b, a);	1582	glColor4ub (r * 255., g * 255., b * 255., a * 255.);
1431		1583
1432	void glVertex (float x, float y, float z = 0.)	1584	void glVertex (float x, float y, float z = 0.)
1433	CODE:	1585	CODE:
1434	glVertex3f (x, y, z);	1586	glVertex3f (x, y, z);
1435		1587
…		…
1447		1599
1448	void glBindTexture (int target, int name)	1600	void glBindTexture (int target, int name)
1449		1601
1450	void glConvolutionParameter (int target, int pname, float params)	1602	void glConvolutionParameter (int target, int pname, float params)
1451	CODE:	1603	CODE:
1452	glConvolutionParameterf (target, pname, params);	1604	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1453		1605
1454	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)
		1607	CODE:
		1608	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
		1609	(target, internalformat, width, height, format, type, data));
		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));
1455		1615
1456	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)
1457		1617
1458	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)
1459		1625
1460	int glGenTexture ()	1626	int glGenTexture ()
1461	CODE:	1627	CODE:
1462	{	1628	{
1463	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.63 by root, Mon Apr 24 06:05:33 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.63 by root, Mon Apr 24 06:05:33 2006 UTC vs.
Revision 1.76 by root, Thu May 11 23:41:45 2006 UTC