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

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.110 by root, Sat Jun 10 02:22:33 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.110 by root, Sat Jun 10 02:22:33 2006 UTC