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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.82 by root, Mon May 15 00:15:08 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
89	#ifndef _WIN32	94	#ifdef _WIN32
		95	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
		96	#else
90	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	97	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
91	#endif	98	#endif
92	}	99	}
93		100
94	static void	101	static void
…		…
414	}	421	}
415		422
416	void	423	void
417	pango_init ()	424	pango_init ()
418	CODE:	425	CODE:
419	{
420	// 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	{
421	ft2_fontmap = pango_ft2_font_map_new ();	429	ft2_fontmap = pango_ft2_font_map_new ();
422	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);
423	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	431	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
424		432	}
		433	{
		434	cairo_font_options_t *fopt = cairo_font_options_create ();
425	cairo_fontmap = pango_cairo_font_map_get_default ();	435	cairo_fontmap = pango_cairo_font_map_get_default ();
426	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	}
427	}	448	}
428		449
429	int	450	int
430	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	451	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
431		452
…		…
441	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	462	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
442	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	463	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
443	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	464	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
444	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	465	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
445		466
		467	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		468	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
		469
446	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	470	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
447	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	471	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
448	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	472	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
449	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	473	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
450		474
451	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	475	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
452	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
453	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
454		476
455	SDL_EnableUNICODE (1);	477	SDL_EnableUNICODE (1);
456	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	478	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
457		479
458	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	480	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
467		489
468	++m;	490	++m;
469	}	491	}
470	}	492	}
471		493
		494	char *
		495	SDL_GetError ()
		496
472	int	497	int
473	SDL_SetVideoMode (int w, int h, int fullscreen)	498	SDL_SetVideoMode (int w, int h, int fullscreen)
474	CODE:	499	CODE:
475	RETVAL = !!SDL_SetVideoMode (	500	RETVAL = !!SDL_SetVideoMode (
476	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	501	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
477	);	502	);
		503	if (RETVAL)
		504	{
478	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	}
479	OUTPUT:	510	OUTPUT:
480	RETVAL	511	RETVAL
481		512
482	void	513	void
483	SDL_GL_SwapBuffers ()	514	SDL_GL_SwapBuffers ()
		515
		516	char *
		517	SDL_GetKeyName (int sym)
484		518
485	void	519	void
486	SDL_PollEvent ()	520	SDL_PollEvent ()
487	PPCODE:	521	PPCODE:
488	{	522	{
…		…
507	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	541	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
508	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	542	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
509	break;	543	break;
510		544
511	case SDL_MOUSEMOTION:	545	case SDL_MOUSEMOTION:
		546	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		547
512	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	548	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
513	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	549	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
514	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	550	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
515	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	551	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
516	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	552	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
517	break;	553	break;
518		554
519	case SDL_MOUSEBUTTONDOWN:	555	case SDL_MOUSEBUTTONDOWN:
520	case SDL_MOUSEBUTTONUP:	556	case SDL_MOUSEBUTTONUP:
		557	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		558
521	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	559	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
522	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	560	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
523	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	561	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
524	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	562	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
525	break;	563	break;
…		…
551	lowdelay (int fd, int val = 1)	589	lowdelay (int fd, int val = 1)
552	CODE:	590	CODE:
553	#ifndef _WIN32	591	#ifndef _WIN32
554	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	592	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
555	#endif	593	#endif
556
557	char *
558	gl_version ()
559	CODE:
560	RETVAL = (char *)glGetString (GL_VERSION);
561	OUTPUT:
562	RETVAL
563
564	char *
565	gl_extensions ()
566	CODE:
567	RETVAL = (char *)glGetString (GL_EXTENSIONS);
568	OUTPUT:
569	RETVAL
570		594
571	void	595	void
572	add_font (char *file)	596	add_font (char *file)
573	CODE:	597	CODE:
574	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	598	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
667	}	691	}
668		692
669	void	693	void
670	error (char *message)	694	error (char *message)
671	CODE:	695	CODE:
		696	fprintf (stderr, "ERROR: %s\n", message);
672	#ifdef _WIN32	697	#ifdef _WIN32
673	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	698	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
674	#else
675	fprintf (stderr, "ERROR: %s\n", message);
676	#endif	699	#endif
677		700
678	void	701	void
679	fatal (char *message)	702	fatal (char *message)
680	CODE:	703	CODE:
		704	fprintf (stderr, "FATAL: %s\n", message);
681	#ifdef _WIN32	705	#ifdef _WIN32
682	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	706	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
683	#else
684	fprintf (stderr, "FATAL: %s\n", message);
685	#endif	707	#endif
686	exit (1);	708	exit (1);
687		709
688	MODULE = CFClient PACKAGE = CFClient::Font	710	MODULE = CFClient PACKAGE = CFClient::Font
689		711
…		…
765		787
766	SV *	788	SV *
767	get_text (CFClient::Layout self)	789	get_text (CFClient::Layout self)
768	CODE:	790	CODE:
769	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	791	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
770	SvUTF8_on (RETVAL);	792	sv_utf8_decode (RETVAL);
771	OUTPUT:	793	OUTPUT:
772	RETVAL	794	RETVAL
773		795
774	void	796	void
775	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.)
…		…
801	set_width (CFClient::Layout self, int max_width = -1)	823	set_width (CFClient::Layout self, int max_width = -1)
802	CODE:	824	CODE:
803	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);
804		826
805	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
806	size (CFClient::Layout self)	853	size (CFClient::Layout self)
807	PPCODE:	854	PPCODE:
808	{	855	{
809	int w, h;	856	int w, h;
810		857
…		…
876		923
877	while (p < e)	924	while (p < e)
878	{	925	{
879	uint32_t rgba = *p;	926	uint32_t rgba = *p;
880	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
881	rgba = SDL_SwapBE32 (rgba);	940	rgba = SDL_SwapBE32 (rgba);
882	*p++ = rgba;	941	*p++ = rgba;
883	}	942	}
884	}	943	}
885		944
…		…
930	{	989	{
931	HV hv = (HV )SvRV (self);	990	HV hv = (HV )SvRV (self);
932	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	991	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
933	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	992	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
934	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	993	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
935	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
936		994
937	if (items < 5)	995	if (items < 5)
938	{	996	{
939	w = SvNV (*hv_fetch (hv, "w", 1, 1));	997	w = SvNV (*hv_fetch (hv, "w", 1, 1));
940	h = SvNV (*hv_fetch (hv, "h", 1, 1));	998	h = SvNV (*hv_fetch (hv, "h", 1, 1));
941	}	999	}
942		1000
943	if (ix)	1001	if (ix)
944	{	1002	{
945	glEnable (GL_BLEND);	1003	glEnable (GL_BLEND);
		1004
		1005	if (ix == 2)
946	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);
947	}	1013	}
948		1014
949	glBindTexture (GL_TEXTURE_2D, name);	1015	glBindTexture (GL_TEXTURE_2D, name);
950
951	if (wrap_mode)
952	{
953	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
954	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
955	}
956		1016
957	glBegin (GL_QUADS);	1017	glBegin (GL_QUADS);
958	glTexCoord2f (0, 0); glVertex2f (x , y );	1018	glTexCoord2f (0, 0); glVertex2f (x , y );
959	glTexCoord2f (0, t); glVertex2f (x , y + h);	1019	glTexCoord2f (0, t); glVertex2f (x , y + h);
960	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1020	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
961	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1021	glTexCoord2f (s, 0); glVertex2f (x + w, y );
962	glEnd ();	1022	glEnd ();
963		1023
964	if (ix)	1024	if (ix)
		1025	{
		1026	glDisable (GL_ALPHA_TEST);
965	glDisable (GL_BLEND);	1027	glDisable (GL_BLEND);
		1028	}
966	}	1029	}
967		1030
968	MODULE = CFClient PACKAGE = CFClient::Map	1031	MODULE = CFClient PACKAGE = CFClient::Map
969		1032
970	CFClient::Map	1033	CFClient::Map
…		…
1034	tex->r = r;	1097	tex->r = r;
1035	tex->g = g;	1098	tex->g = g;
1036	tex->b = b;	1099	tex->b = b;
1037	tex->a = a;	1100	tex->a = a;
1038	}	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);
1039	}	1111	}
1040		1112
1041	int	1113	int
1042	ox (CFClient::Map self)	1114	ox (CFClient::Map self)
1043	ALIAS:	1115	ALIAS:
1044	oy = 1	1116	oy = 1
		1117	x = 2
		1118	y = 3
		1119	w = 4
		1120	h = 5
1045	CODE:	1121	CODE:
1046	switch (ix)	1122	switch (ix)
1047	{	1123	{
1048	case 0: RETVAL = self->ox; break;	1124	case 0: RETVAL = self->ox; break;
1049	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;
1050	}	1130	}
1051	OUTPUT:	1131	OUTPUT:
1052	RETVAL	1132	RETVAL
1053		1133
1054	void	1134	void
…		…
1481	const_iv (GL_COLOR_MATERIAL),	1561	const_iv (GL_COLOR_MATERIAL),
1482	const_iv (GL_SMOOTH),	1562	const_iv (GL_SMOOTH),
1483	const_iv (GL_FLAT),	1563	const_iv (GL_FLAT),
1484	const_iv (GL_DITHER),	1564	const_iv (GL_DITHER),
1485	const_iv (GL_BLEND),	1565	const_iv (GL_BLEND),
		1566	const_iv (GL_CULL_FACE),
1486	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),
1487	const_iv (GL_AND),	1572	const_iv (GL_AND),
1488	const_iv (GL_ONE),	1573	const_iv (GL_ONE),
1489	const_iv (GL_ZERO),	1574	const_iv (GL_ZERO),
1490	const_iv (GL_SRC_ALPHA),	1575	const_iv (GL_SRC_ALPHA),
1491	const_iv (GL_SRC_ALPHA_SATURATE),	1576	const_iv (GL_DST_ALPHA),
1492	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1577	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1493	const_iv (GL_ONE_MINUS_DST_ALPHA),	1578	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1579	const_iv (GL_SRC_ALPHA_SATURATE),
1494	const_iv (GL_RGB),	1580	const_iv (GL_RGB),
1495	const_iv (GL_RGBA),	1581	const_iv (GL_RGBA),
1496	const_iv (GL_UNSIGNED_BYTE),	1582	const_iv (GL_UNSIGNED_BYTE),
		1583	const_iv (GL_UNSIGNED_SHORT),
		1584	const_iv (GL_UNSIGNED_INT),
1497	const_iv (GL_ALPHA),	1585	const_iv (GL_ALPHA),
		1586	const_iv (GL_INTENSITY),
1498	const_iv (GL_LUMINANCE),	1587	const_iv (GL_LUMINANCE),
		1588	const_iv (GL_LUMINANCE_ALPHA),
1499	const_iv (GL_FLOAT),	1589	const_iv (GL_FLOAT),
1500	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1590	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1501	const_iv (GL_COMPILE),	1591	const_iv (GL_COMPILE),
1502	const_iv (GL_TEXTURE_1D),	1592	const_iv (GL_TEXTURE_1D),
1503	const_iv (GL_TEXTURE_2D),	1593	const_iv (GL_TEXTURE_2D),
…		…
1505	const_iv (GL_TEXTURE_MAG_FILTER),	1595	const_iv (GL_TEXTURE_MAG_FILTER),
1506	const_iv (GL_TEXTURE_MIN_FILTER),	1596	const_iv (GL_TEXTURE_MIN_FILTER),
1507	const_iv (GL_TEXTURE_ENV_MODE),	1597	const_iv (GL_TEXTURE_ENV_MODE),
1508	const_iv (GL_TEXTURE_WRAP_S),	1598	const_iv (GL_TEXTURE_WRAP_S),
1509	const_iv (GL_TEXTURE_WRAP_T),	1599	const_iv (GL_TEXTURE_WRAP_T),
		1600	const_iv (GL_REPEAT),
1510	const_iv (GL_CLAMP),	1601	const_iv (GL_CLAMP),
1511	const_iv (GL_REPEAT),	1602	const_iv (GL_CLAMP_TO_EDGE),
1512	const_iv (GL_NEAREST),	1603	const_iv (GL_NEAREST),
1513	const_iv (GL_LINEAR),	1604	const_iv (GL_LINEAR),
1514	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1605	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1515	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1606	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1516	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1607	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1517	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1608	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1518	const_iv (GL_GENERATE_MIPMAP),	1609	const_iv (GL_GENERATE_MIPMAP),
1519	const_iv (GL_MODULATE),	1610	const_iv (GL_MODULATE),
1520	const_iv (GL_DECAL),	1611	const_iv (GL_DECAL),
1521	const_iv (GL_REPLACE),	1612	const_iv (GL_REPLACE),
		1613	const_iv (GL_DEPTH_BUFFER_BIT),
1522	const_iv (GL_COLOR_BUFFER_BIT),	1614	const_iv (GL_COLOR_BUFFER_BIT),
1523	const_iv (GL_PROJECTION),	1615	const_iv (GL_PROJECTION),
1524	const_iv (GL_MODELVIEW),	1616	const_iv (GL_MODELVIEW),
1525	const_iv (GL_COLOR_LOGIC_OP),	1617	const_iv (GL_COLOR_LOGIC_OP),
1526	const_iv (GL_SEPARABLE_2D),	1618	const_iv (GL_SEPARABLE_2D),
1527	const_iv (GL_CONVOLUTION_2D),	1619	const_iv (GL_CONVOLUTION_2D),
1528	const_iv (GL_CONVOLUTION_BORDER_MODE),	1620	const_iv (GL_CONVOLUTION_BORDER_MODE),
1529	const_iv (GL_CONSTANT_BORDER),	1621	const_iv (GL_CONSTANT_BORDER),
1530	const_iv (GL_LINES),	1622	const_iv (GL_LINES),
		1623	const_iv (GL_LINE_LOOP),
1531	const_iv (GL_QUADS),	1624	const_iv (GL_QUADS),
1532	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),
1533	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1629	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1534	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),
1535	# undef const_iv	1635	# undef const_iv
1536	};	1636	};
1537		1637
1538	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; )
1539	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1639	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1540	}	1640	}
1541		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
1542	int glGetError ()	1663	int glGetError ()
1543		1664
1544	void glClear (int mask)	1665	void glClear (int mask)
1545		1666
1546	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)
…		…
1554		1675
1555	void glHint (int target, int mode)	1676	void glHint (int target, int mode)
1556		1677
1557	void glBlendFunc (int sfactor, int dfactor)	1678	void glBlendFunc (int sfactor, int dfactor)
1558		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
1559	void glLogicOp (int opcode)	1686	void glLogicOp (int opcode)
1560		1687
1561	void glColorMask (int red, int green, int blue, int alpha)	1688	void glColorMask (int red, int green, int blue, int alpha)
1562		1689
1563	void glMatrixMode (int mode)	1690	void glMatrixMode (int mode)
…		…
1566		1693
1567	void glPopMatrix ()	1694	void glPopMatrix ()
1568		1695
1569	void glLoadIdentity ()	1696	void glLoadIdentity ()
1570		1697
1571	# 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
1572	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_)
1573		1703
1574	void glViewport (int x, int y, int width, int height)	1704	void glViewport (int x, int y, int width, int height)
1575		1705
1576	void glScissor (int x, int y, int width, int height)	1706	void glScissor (int x, int y, int width, int height)
…		…
1591		1721
1592	void glEnd ()	1722	void glEnd ()
1593		1723
1594	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)
1595	PROTOTYPE: @	1725	PROTOTYPE: @
		1726	ALIAS:
		1727	glColor_premultiply = 1
1596	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...
1597	glColor4ub (MIN ((int)(r * 255.f), 255),	1736	glColor4ub (MIN ((int)(r * 256.f), 255),
1598	MIN ((int)(g * 255.f), 255),	1737	MIN ((int)(g * 256.f), 255),
1599	MIN ((int)(b * 255.f), 255),	1738	MIN ((int)(b * 256.f), 255),
1600	MIN ((int)(a * 255.f), 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);
1601		1751
1602	void glVertex (float x, float y, float z = 0.)	1752	void glVertex (float x, float y, float z = 0.)
1603	CODE:	1753	CODE:
1604	glVertex3f (x, y, z);	1754	glVertex3f (x, y, z);
1605		1755
…		…
1617		1767
1618	void glBindTexture (int target, int name)	1768	void glBindTexture (int target, int name)
1619		1769
1620	void glConvolutionParameter (int target, int pname, float params)	1770	void glConvolutionParameter (int target, int pname, float params)
1621	CODE:	1771	CODE:
1622	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1772	if (gl.ConvolutionParameterf)
		1773	gl.ConvolutionParameterf (target, pname, params);
1623		1774
1624	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)
1625	CODE:	1776	CODE:
1626	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1777	if (gl.ConvolutionFilter2D)
1627	(target, internalformat, width, height, format, type, data));	1778	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1628		1779
1629	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)
1630	CODE:	1781	CODE:
1631	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1782	if (gl.SeparableFilter2D)
1632	(target, internalformat, width, height, format, type, row, column));	1783	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1633		1784
1634	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)
1635		1786
1636	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)
1637		1788
1638	void glRasterPos (int x, int y)	1789	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1639	CODE:
1640	glRasterPos2i (x, y);
1641		1790
1642	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)
1643		1792
1644	int glGenTexture ()	1793	int glGenTexture ()
1645	CODE:	1794	CODE:
…		…
1672		1821
1673	void glEndList ()	1822	void glEndList ()
1674		1823
1675	void glCallList (int list)	1824	void glCallList (int list)
1676		1825
		1826

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.82 by root, Mon May 15 00:15:08 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.82 by root, Mon May 15 00:15:08 2006 UTC vs.
Revision 1.110 by root, Sat Jun 10 02:22:33 2006 UTC