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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.80 by root, Sun May 14 22:58:24 2006 UTC vs. Revision 1.108 by root, Wed Jun 7 23:28:12 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.80 by root, Sun May 14 22:58:24 2006 UTC vs.
Revision 1.108 by root, Wed Jun 7 23:28:12 2006 UTC