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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.81 by root, Sun May 14 23:19:14 2006 UTC vs.
Revision 1.107 by root, Mon Jun 5 05:23:19 2006 UTC

…		…
48	#define MAP_EXTEND_X 32	48	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	49	#define MAP_EXTEND_Y 512
50		50
51	#define MIN_FONT_HEIGHT 10	51	#define MIN_FONT_HEIGHT 10
52		52
53	#define GL_CALL(type,func,args) \	53	static struct
54	{ \	54	{
55	static int init_; \	55	#define GL_FUNC(ptr,name) ptr name;
56	static type fptr_; \	56	#include "glfunc.h"
57	\	57	#undef GL_FUNC
58	if (!init_) \	58	} gl;
59	{ \	59
60	init_ = 1; \	60	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \	61	{
62	} \	62	if (gl.BlendFuncSeparate)
63	\	63	gl.BlendFuncSeparate (sa, da, saa, daa);
64	if (fptr_) \	64	else if (gl.BlendFuncSeparateEXT)
65	fptr_ args; \	65	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	}	66	else
		67	glBlendFunc (sa, da);
		68	}
67		69
68	typedef Mix_Chunk *CFClient__MixChunk;	70	typedef Mix_Chunk *CFClient__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	71	typedef Mix_Music *CFClient__MixMusic;
70		72
71	typedef PangoFontDescription *CFClient__Font;	73	typedef PangoFontDescription *CFClient__Font;
…		…
84		86
85	static void	87	static void
86	substitute_func (FcPattern *pattern, gpointer data)	88	substitute_func (FcPattern *pattern, gpointer data)
87	{	89	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	90	FcPatternAddBool (pattern, FC_HINTING , 1);
		91	#ifdef _WIN32
89	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	92	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
		93	#else
		94	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
		95	#endif
90	}	96	}
91		97
92	static void	98	static void
93	layout_update_font (CFClient__Layout self)	99	layout_update_font (CFClient__Layout self)
94	{	100	{
…		…
412	}	418	}
413		419
414	void	420	void
415	pango_init ()	421	pango_init ()
416	CODE:	422	CODE:
417	{
418	// delayed, so it can pick up new fonts added by AddFontResourceEx	423	// delayed, so it can pick up new fonts added by AddFontResourceEx
		424	{
		425	{
419	ft2_fontmap = pango_ft2_font_map_new ();	426	ft2_fontmap = pango_ft2_font_map_new ();
420	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	427	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
421	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	428	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
422		429	}
		430	{
		431	cairo_font_options_t *fopt = cairo_font_options_create ();
423	cairo_fontmap = pango_cairo_font_map_get_default ();	432	cairo_fontmap = pango_cairo_font_map_get_default ();
424	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);	433	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
		434	#ifdef _WIN32
		435	// cairo looks like shit eaten twice on windows
		436	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
		437	#else
		438	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
		439	#endif
		440	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
		441	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
		442	pango_cairo_context_set_font_options (cairo_context, fopt);
		443	cairo_font_options_destroy (fopt);
		444	}
425	}	445	}
426		446
427	int	447	int
428	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	448	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
429		449
…		…
439	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	459	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
440	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	460	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
441	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	461	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
442	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	462	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
443		463
		464	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		465	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
		466
444	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	467	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
445	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	468	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
446	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	469	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
447	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	470	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
448		471
449	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	472	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
450	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
452		473
453	SDL_EnableUNICODE (1);	474	SDL_EnableUNICODE (1);
454	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	475	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
455		476
456	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	477	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
465		486
466	++m;	487	++m;
467	}	488	}
468	}	489	}
469		490
		491	char *
		492	SDL_GetError ()
		493
470	int	494	int
471	SDL_SetVideoMode (int w, int h, int fullscreen)	495	SDL_SetVideoMode (int w, int h, int fullscreen)
472	CODE:	496	CODE:
473	RETVAL = !!SDL_SetVideoMode (	497	RETVAL = !!SDL_SetVideoMode (
474	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	498	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
475	);	499	);
		500	if (RETVAL)
		501	{
476	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	502	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		503	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		504	# include "glfunc.h"
		505	# undef GL_FUNC
		506	}
477	OUTPUT:	507	OUTPUT:
478	RETVAL	508	RETVAL
479		509
480	void	510	void
481	SDL_GL_SwapBuffers ()	511	SDL_GL_SwapBuffers ()
		512
		513	char *
		514	SDL_GetKeyName (int sym)
482		515
483	void	516	void
484	SDL_PollEvent ()	517	SDL_PollEvent ()
485	PPCODE:	518	PPCODE:
486	{	519	{
…		…
505	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	538	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
506	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	539	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
507	break;	540	break;
508		541
509	case SDL_MOUSEMOTION:	542	case SDL_MOUSEMOTION:
		543	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		544
510	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	545	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
511	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	546	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
512	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	547	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
513	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	548	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
514	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	549	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
515	break;	550	break;
516		551
517	case SDL_MOUSEBUTTONDOWN:	552	case SDL_MOUSEBUTTONDOWN:
518	case SDL_MOUSEBUTTONUP:	553	case SDL_MOUSEBUTTONUP:
		554	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		555
519	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	556	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
520	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	557	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
521	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	558	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
522	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	559	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
523	break;	560	break;
…		…
549	lowdelay (int fd, int val = 1)	586	lowdelay (int fd, int val = 1)
550	CODE:	587	CODE:
551	#ifndef _WIN32	588	#ifndef _WIN32
552	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	589	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
553	#endif	590	#endif
554
555	char *
556	gl_version ()
557	CODE:
558	RETVAL = (char *)glGetString (GL_VERSION);
559	OUTPUT:
560	RETVAL
561
562	char *
563	gl_extensions ()
564	CODE:
565	RETVAL = (char *)glGetString (GL_EXTENSIONS);
566	OUTPUT:
567	RETVAL
568		591
569	void	592	void
570	add_font (char *file)	593	add_font (char *file)
571	CODE:	594	CODE:
572	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	595	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
665	}	688	}
666		689
667	void	690	void
668	error (char *message)	691	error (char *message)
669	CODE:	692	CODE:
		693	fprintf (stderr, "ERROR: %s\n", message);
670	#ifdef _WIN32	694	#ifdef _WIN32
671	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	695	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
672	#else
673	fprintf (stderr, "ERROR: %s\n", message);
674	#endif	696	#endif
675		697
676	void	698	void
677	fatal (char *message)	699	fatal (char *message)
678	CODE:	700	CODE:
		701	fprintf (stderr, "FATAL: %s\n", message);
679	#ifdef _WIN32	702	#ifdef _WIN32
680	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	703	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
681	#else
682	fprintf (stderr, "FATAL: %s\n", message);
683	#endif	704	#endif
684	exit (1);	705	exit (1);
685		706
686	MODULE = CFClient PACKAGE = CFClient::Font	707	MODULE = CFClient PACKAGE = CFClient::Font
687		708
…		…
763		784
764	SV *	785	SV *
765	get_text (CFClient::Layout self)	786	get_text (CFClient::Layout self)
766	CODE:	787	CODE:
767	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	788	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
768	SvUTF8_on (RETVAL);	789	sv_utf8_decode (RETVAL);
769	OUTPUT:	790	OUTPUT:
770	RETVAL	791	RETVAL
771		792
772	void	793	void
773	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	794	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
…		…
799	set_width (CFClient::Layout self, int max_width = -1)	820	set_width (CFClient::Layout self, int max_width = -1)
800	CODE:	821	CODE:
801	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	822	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
802		823
803	void	824	void
		825	set_indent (CFClient::Layout self, int indent)
		826	CODE:
		827	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		828
		829	void
		830	set_spacing (CFClient::Layout self, int spacing)
		831	CODE:
		832	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		833
		834	void
		835	set_ellipsise (CFClient::Layout self, int ellipsise)
		836	CODE:
		837	pango_layout_set_ellipsize (self->pl,
		838	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		839	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		840	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		841	: PANGO_ELLIPSIZE_NONE
		842	);
		843
		844	void
		845	set_single_paragraph_mode (CFClient::Layout self, int spm)
		846	CODE:
		847	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		848
		849	void
804	size (CFClient::Layout self)	850	size (CFClient::Layout self)
805	PPCODE:	851	PPCODE:
806	{	852	{
807	int w, h;	853	int w, h;
808		854
…		…
874		920
875	while (p < e)	921	while (p < e)
876	{	922	{
877	uint32_t rgba = *p;	923	uint32_t rgba = *p;
878	rgba = (rgba >> 24) \| (rgba << 8);	924	rgba = (rgba >> 24) \| (rgba << 8);
		925	#if 0
		926	#ifdef _WIN32
		927	{//D
		928	uint8_t r = rgba >> 24;
		929	uint8_t g = rgba >> 16;
		930	uint8_t b = rgba >> 8;
		931	uint8_t a = rgba >> 0;
		932
		933	rgba = (rgba & 0xffffff00) \| a;
		934	}
		935	#endif
		936	#endif
879	rgba = SDL_SwapBE32 (rgba);	937	rgba = SDL_SwapBE32 (rgba);
880	*p++ = rgba;	938	*p++ = rgba;
881	}	939	}
882	}	940	}
883		941
…		…
928	{	986	{
929	HV hv = (HV )SvRV (self);	987	HV hv = (HV )SvRV (self);
930	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	988	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
931	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	989	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
932	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	990	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
933	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
934		991
935	if (items < 5)	992	if (items < 5)
936	{	993	{
937	w = SvNV (*hv_fetch (hv, "w", 1, 1));	994	w = SvNV (*hv_fetch (hv, "w", 1, 1));
938	h = SvNV (*hv_fetch (hv, "h", 1, 1));	995	h = SvNV (*hv_fetch (hv, "h", 1, 1));
939	}	996	}
940		997
941	if (ix)	998	if (ix)
942	{	999	{
943	glEnable (GL_BLEND);	1000	glEnable (GL_BLEND);
		1001
		1002	if (ix == 2)
944	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1003	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1004	else
		1005	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1006	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1007
		1008	glEnable (GL_ALPHA_TEST);
		1009	glAlphaFunc (GL_GREATER, 0.01f);
945	}	1010	}
946		1011
947	glBindTexture (GL_TEXTURE_2D, name);	1012	glBindTexture (GL_TEXTURE_2D, name);
948
949	if (wrap_mode)
950	{
951	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
952	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
953	}
954		1013
955	glBegin (GL_QUADS);	1014	glBegin (GL_QUADS);
956	glTexCoord2f (0, 0); glVertex2f (x , y );	1015	glTexCoord2f (0, 0); glVertex2f (x , y );
957	glTexCoord2f (0, t); glVertex2f (x , y + h);	1016	glTexCoord2f (0, t); glVertex2f (x , y + h);
958	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1017	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
959	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1018	glTexCoord2f (s, 0); glVertex2f (x + w, y );
960	glEnd ();	1019	glEnd ();
961		1020
962	if (ix)	1021	if (ix)
		1022	{
		1023	glDisable (GL_ALPHA_TEST);
963	glDisable (GL_BLEND);	1024	glDisable (GL_BLEND);
		1025	}
964	}	1026	}
965		1027
966	MODULE = CFClient PACKAGE = CFClient::Map	1028	MODULE = CFClient PACKAGE = CFClient::Map
967		1029
968	CFClient::Map	1030	CFClient::Map
…		…
1032	tex->r = r;	1094	tex->r = r;
1033	tex->g = g;	1095	tex->g = g;
1034	tex->b = b;	1096	tex->b = b;
1035	tex->a = a;	1097	tex->a = a;
1036	}	1098	}
		1099
		1100	// somewhat hackish, but for textures that require it, it really
		1101	// improves the look, and most others don't suffer.
		1102	glBindTexture (GL_TEXTURE_2D, name);
		1103	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1104	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1105	// use uglier nearest interpolation because linear suffers
		1106	// from transparent color bleeding and ugly wrapping effects.
		1107	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1037	}	1108	}
1038		1109
1039	int	1110	int
1040	ox (CFClient::Map self)	1111	ox (CFClient::Map self)
1041	ALIAS:	1112	ALIAS:
1042	oy = 1	1113	oy = 1
		1114	x = 2
		1115	y = 3
		1116	w = 4
		1117	h = 5
1043	CODE:	1118	CODE:
1044	switch (ix)	1119	switch (ix)
1045	{	1120	{
1046	case 0: RETVAL = self->ox; break;	1121	case 0: RETVAL = self->ox; break;
1047	case 1: RETVAL = self->oy; break;	1122	case 1: RETVAL = self->oy; break;
		1123	case 2: RETVAL = self->x; break;
		1124	case 3: RETVAL = self->y; break;
		1125	case 4: RETVAL = self->w; break;
		1126	case 5: RETVAL = self->h; break;
1048	}	1127	}
1049	OUTPUT:	1128	OUTPUT:
1050	RETVAL	1129	RETVAL
1051		1130
1052	void	1131	void
…		…
1479	const_iv (GL_COLOR_MATERIAL),	1558	const_iv (GL_COLOR_MATERIAL),
1480	const_iv (GL_SMOOTH),	1559	const_iv (GL_SMOOTH),
1481	const_iv (GL_FLAT),	1560	const_iv (GL_FLAT),
1482	const_iv (GL_DITHER),	1561	const_iv (GL_DITHER),
1483	const_iv (GL_BLEND),	1562	const_iv (GL_BLEND),
		1563	const_iv (GL_CULL_FACE),
1484	const_iv (GL_SCISSOR_TEST),	1564	const_iv (GL_SCISSOR_TEST),
		1565	const_iv (GL_DEPTH_TEST),
		1566	const_iv (GL_ALPHA_TEST),
		1567	const_iv (GL_NORMALIZE),
		1568	const_iv (GL_RESCALE_NORMAL),
1485	const_iv (GL_AND),	1569	const_iv (GL_AND),
1486	const_iv (GL_ONE),	1570	const_iv (GL_ONE),
1487	const_iv (GL_ZERO),	1571	const_iv (GL_ZERO),
1488	const_iv (GL_SRC_ALPHA),	1572	const_iv (GL_SRC_ALPHA),
1489	const_iv (GL_SRC_ALPHA_SATURATE),	1573	const_iv (GL_DST_ALPHA),
1490	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1574	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1491	const_iv (GL_ONE_MINUS_DST_ALPHA),	1575	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1576	const_iv (GL_SRC_ALPHA_SATURATE),
1492	const_iv (GL_RGB),	1577	const_iv (GL_RGB),
1493	const_iv (GL_RGBA),	1578	const_iv (GL_RGBA),
1494	const_iv (GL_UNSIGNED_BYTE),	1579	const_iv (GL_UNSIGNED_BYTE),
		1580	const_iv (GL_UNSIGNED_SHORT),
		1581	const_iv (GL_UNSIGNED_INT),
1495	const_iv (GL_ALPHA),	1582	const_iv (GL_ALPHA),
		1583	const_iv (GL_INTENSITY),
1496	const_iv (GL_LUMINANCE),	1584	const_iv (GL_LUMINANCE),
		1585	const_iv (GL_LUMINANCE_ALPHA),
1497	const_iv (GL_FLOAT),	1586	const_iv (GL_FLOAT),
1498	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1587	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1499	const_iv (GL_COMPILE),	1588	const_iv (GL_COMPILE),
1500	const_iv (GL_TEXTURE_1D),	1589	const_iv (GL_TEXTURE_1D),
1501	const_iv (GL_TEXTURE_2D),	1590	const_iv (GL_TEXTURE_2D),
…		…
1503	const_iv (GL_TEXTURE_MAG_FILTER),	1592	const_iv (GL_TEXTURE_MAG_FILTER),
1504	const_iv (GL_TEXTURE_MIN_FILTER),	1593	const_iv (GL_TEXTURE_MIN_FILTER),
1505	const_iv (GL_TEXTURE_ENV_MODE),	1594	const_iv (GL_TEXTURE_ENV_MODE),
1506	const_iv (GL_TEXTURE_WRAP_S),	1595	const_iv (GL_TEXTURE_WRAP_S),
1507	const_iv (GL_TEXTURE_WRAP_T),	1596	const_iv (GL_TEXTURE_WRAP_T),
		1597	const_iv (GL_REPEAT),
1508	const_iv (GL_CLAMP),	1598	const_iv (GL_CLAMP),
1509	const_iv (GL_REPEAT),	1599	const_iv (GL_CLAMP_TO_EDGE),
1510	const_iv (GL_NEAREST),	1600	const_iv (GL_NEAREST),
1511	const_iv (GL_LINEAR),	1601	const_iv (GL_LINEAR),
1512	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1602	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1513	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1603	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1514	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1604	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1515	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1605	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1516	const_iv (GL_GENERATE_MIPMAP),	1606	const_iv (GL_GENERATE_MIPMAP),
1517	const_iv (GL_MODULATE),	1607	const_iv (GL_MODULATE),
1518	const_iv (GL_DECAL),	1608	const_iv (GL_DECAL),
1519	const_iv (GL_REPLACE),	1609	const_iv (GL_REPLACE),
		1610	const_iv (GL_DEPTH_BUFFER_BIT),
1520	const_iv (GL_COLOR_BUFFER_BIT),	1611	const_iv (GL_COLOR_BUFFER_BIT),
1521	const_iv (GL_PROJECTION),	1612	const_iv (GL_PROJECTION),
1522	const_iv (GL_MODELVIEW),	1613	const_iv (GL_MODELVIEW),
1523	const_iv (GL_COLOR_LOGIC_OP),	1614	const_iv (GL_COLOR_LOGIC_OP),
1524	const_iv (GL_SEPARABLE_2D),	1615	const_iv (GL_SEPARABLE_2D),
1525	const_iv (GL_CONVOLUTION_2D),	1616	const_iv (GL_CONVOLUTION_2D),
1526	const_iv (GL_CONVOLUTION_BORDER_MODE),	1617	const_iv (GL_CONVOLUTION_BORDER_MODE),
1527	const_iv (GL_CONSTANT_BORDER),	1618	const_iv (GL_CONSTANT_BORDER),
1528	const_iv (GL_LINES),	1619	const_iv (GL_LINES),
		1620	const_iv (GL_LINE_LOOP),
1529	const_iv (GL_QUADS),	1621	const_iv (GL_QUADS),
1530	const_iv (GL_LINE_LOOP),	1622	const_iv (GL_QUAD_STRIP),
		1623	const_iv (GL_TRIANGLES),
		1624	const_iv (GL_TRIANGLE_STRIP),
		1625	const_iv (GL_TRIANGLE_FAN),
1531	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1626	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1532	const_iv (GL_FASTEST),	1627	const_iv (GL_FASTEST),
		1628	const_iv (GL_V2F),
		1629	const_iv (GL_V3F),
		1630	const_iv (GL_T2F_V3F),
		1631	const_iv (GL_T2F_N3F_V3F),
1533	# undef const_iv	1632	# undef const_iv
1534	};	1633	};
1535		1634
1536	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1635	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1537	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1636	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1538	}	1637	}
1539		1638
		1639	char *
		1640	gl_vendor ()
		1641	CODE:
		1642	RETVAL = (char *)glGetString (GL_VENDOR);
		1643	OUTPUT:
		1644	RETVAL
		1645
		1646	char *
		1647	gl_version ()
		1648	CODE:
		1649	RETVAL = (char *)glGetString (GL_VERSION);
		1650	OUTPUT:
		1651	RETVAL
		1652
		1653	char *
		1654	gl_extensions ()
		1655	CODE:
		1656	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1657	OUTPUT:
		1658	RETVAL
		1659
1540	int glGetError ()	1660	int glGetError ()
1541		1661
1542	void glClear (int mask)	1662	void glClear (int mask)
1543		1663
1544	void glClearColor (float r, float g, float b, float a = 1.0)	1664	void glClearColor (float r, float g, float b, float a = 1.0)
…		…
1552		1672
1553	void glHint (int target, int mode)	1673	void glHint (int target, int mode)
1554		1674
1555	void glBlendFunc (int sfactor, int dfactor)	1675	void glBlendFunc (int sfactor, int dfactor)
1556		1676
		1677	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1678	CODE:
		1679	gl_BlendFuncSeparate (sa, da, saa, daa);
		1680
		1681	void glDepthMask (int flag)
		1682
1557	void glLogicOp (int opcode)	1683	void glLogicOp (int opcode)
1558		1684
1559	void glColorMask (int red, int green, int blue, int alpha)	1685	void glColorMask (int red, int green, int blue, int alpha)
1560		1686
1561	void glMatrixMode (int mode)	1687	void glMatrixMode (int mode)
…		…
1564		1690
1565	void glPopMatrix ()	1691	void glPopMatrix ()
1566		1692
1567	void glLoadIdentity ()	1693	void glLoadIdentity ()
1568		1694
1569	# near and far are due to microsofts buggy c compiler	1695	# near_ and far_ are due to microsofts buggy "c" compiler
		1696	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1697
		1698	# near_ and far_ are due to microsofts buggy "c" compiler
1570	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1699	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1571		1700
1572	void glViewport (int x, int y, int width, int height)	1701	void glViewport (int x, int y, int width, int height)
1573		1702
1574	void glScissor (int x, int y, int width, int height)	1703	void glScissor (int x, int y, int width, int height)
…		…
1589		1718
1590	void glEnd ()	1719	void glEnd ()
1591		1720
1592	void glColor (float r, float g, float b, float a = 1.0)	1721	void glColor (float r, float g, float b, float a = 1.0)
1593	PROTOTYPE: @	1722	PROTOTYPE: @
		1723	ALIAS:
		1724	glColor_premultiply = 1
1594	CODE:	1725	CODE:
		1726	if (ix)
		1727	{
		1728	r *= a;
		1729	g *= a;
		1730	b *= a;
		1731	}
		1732	// microsoft visual "c" rounds instead of truncating...
1595	glColor4ub (MIN ((int)(r * 255.f), 255),	1733	glColor4ub (MIN ((int)(r * 256.f), 255),
1596	MIN ((int)(g * 255.f), 255),	1734	MIN ((int)(g * 256.f), 255),
1597	MIN ((int)(b * 255.f), 255),	1735	MIN ((int)(b * 256.f), 255),
1598	MIN ((int)(a * 255.f), 255));	1736	MIN ((int)(a * 256.f), 255));
		1737
		1738	void glInterleavedArrays (int format, int stride, char *data)
		1739
		1740	void glDrawElements (int mode, int count, int type, char *indices)
		1741
		1742	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1743
		1744	void glRasterPos (float x, float y, float z = 0.)
		1745	CODE:
		1746	glRasterPos3f (0, 0, z);
		1747	glBitmap (0, 0, 0, 0, x, y, 0);
1599		1748
1600	void glVertex (float x, float y, float z = 0.)	1749	void glVertex (float x, float y, float z = 0.)
1601	CODE:	1750	CODE:
1602	glVertex3f (x, y, z);	1751	glVertex3f (x, y, z);
1603		1752
…		…
1615		1764
1616	void glBindTexture (int target, int name)	1765	void glBindTexture (int target, int name)
1617		1766
1618	void glConvolutionParameter (int target, int pname, float params)	1767	void glConvolutionParameter (int target, int pname, float params)
1619	CODE:	1768	CODE:
1620	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1769	if (gl.ConvolutionParameterf)
		1770	gl.ConvolutionParameterf (target, pname, params);
1621		1771
1622	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1772	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1623	CODE:	1773	CODE:
1624	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1774	if (gl.ConvolutionFilter2D)
1625	(target, internalformat, width, height, format, type, data));	1775	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1626		1776
1627	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1777	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1628	CODE:	1778	CODE:
1629	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1779	if (gl.SeparableFilter2D)
1630	(target, internalformat, width, height, format, type, row, column));	1780	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1631		1781
1632	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1782	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1633		1783
1634	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1784	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1635		1785
1636	void glRasterPos (int x, int y)	1786	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1637	CODE:
1638	glRasterPos2i (x, y);
1639		1787
1640	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1788	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1641		1789
1642	int glGenTexture ()	1790	int glGenTexture ()
1643	CODE:	1791	CODE:
…		…
1670		1818
1671	void glEndList ()	1819	void glEndList ()
1672		1820
1673	void glCallList (int list)	1821	void glCallList (int list)
1674		1822
		1823

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.81 by root, Sun May 14 23:19:14 2006 UTC vs. Revision 1.107 by root, Mon Jun 5 05:23:19 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.81 by root, Sun May 14 23:19:14 2006 UTC vs.
Revision 1.107 by root, Mon Jun 5 05:23:19 2006 UTC