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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.84 by root, Wed May 17 15:18:57 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	#ifdef _WIN32	94	#ifdef _WIN32
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	95	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91	#else	96	#else
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	97	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif	98	#endif
…		…
416	}	421	}
417		422
418	void	423	void
419	pango_init ()	424	pango_init ()
420	CODE:	425	CODE:
421	{
422	// 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	{
423	ft2_fontmap = pango_ft2_font_map_new ();	429	ft2_fontmap = pango_ft2_font_map_new ();
424	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);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	431	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426		432	}
		433	{
		434	cairo_font_options_t *fopt = cairo_font_options_create ();
427	cairo_fontmap = pango_cairo_font_map_get_default ();	435	cairo_fontmap = pango_cairo_font_map_get_default ();
428	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	}
429	}	448	}
430		449
431	int	450	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	451	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
433		452
…		…
443	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	462	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	463	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	464	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	465	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		466
		467	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		468	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
		469
448	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	470	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
449	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	471	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
450	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	472	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	473	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
452		474
453	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	475	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
454	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
455	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
456		476
457	SDL_EnableUNICODE (1);	477	SDL_EnableUNICODE (1);
458	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	478	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
459		479
460	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	480	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
469		489
470	++m;	490	++m;
471	}	491	}
472	}	492	}
473		493
		494	char *
		495	SDL_GetError ()
		496
474	int	497	int
475	SDL_SetVideoMode (int w, int h, int fullscreen)	498	SDL_SetVideoMode (int w, int h, int fullscreen)
476	CODE:	499	CODE:
477	RETVAL = !!SDL_SetVideoMode (	500	RETVAL = !!SDL_SetVideoMode (
478	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	501	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
479	);	502	);
		503	if (RETVAL)
		504	{
480	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	}
481	OUTPUT:	510	OUTPUT:
482	RETVAL	511	RETVAL
483		512
484	void	513	void
485	SDL_GL_SwapBuffers ()	514	SDL_GL_SwapBuffers ()
		515
		516	char *
		517	SDL_GetKeyName (int sym)
486		518
487	void	519	void
488	SDL_PollEvent ()	520	SDL_PollEvent ()
489	PPCODE:	521	PPCODE:
490	{	522	{
…		…
509	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	541	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
510	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	542	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
511	break;	543	break;
512		544
513	case SDL_MOUSEMOTION:	545	case SDL_MOUSEMOTION:
		546	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		547
514	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	548	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
515	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	549	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
516	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	550	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
517	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	551	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
518	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	552	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
519	break;	553	break;
520		554
521	case SDL_MOUSEBUTTONDOWN:	555	case SDL_MOUSEBUTTONDOWN:
522	case SDL_MOUSEBUTTONUP:	556	case SDL_MOUSEBUTTONUP:
		557	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		558
523	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	559	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
524	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	560	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
525	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	561	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
526	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	562	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
527	break;	563	break;
…		…
553	lowdelay (int fd, int val = 1)	589	lowdelay (int fd, int val = 1)
554	CODE:	590	CODE:
555	#ifndef _WIN32	591	#ifndef _WIN32
556	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	592	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
557	#endif	593	#endif
558
559	char *
560	gl_version ()
561	CODE:
562	RETVAL = (char *)glGetString (GL_VERSION);
563	OUTPUT:
564	RETVAL
565
566	char *
567	gl_extensions ()
568	CODE:
569	RETVAL = (char *)glGetString (GL_EXTENSIONS);
570	OUTPUT:
571	RETVAL
572		594
573	void	595	void
574	add_font (char *file)	596	add_font (char *file)
575	CODE:	597	CODE:
576	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	598	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
669	}	691	}
670		692
671	void	693	void
672	error (char *message)	694	error (char *message)
673	CODE:	695	CODE:
		696	fprintf (stderr, "ERROR: %s\n", message);
674	#ifdef _WIN32	697	#ifdef _WIN32
675	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	698	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
676	#else
677	fprintf (stderr, "ERROR: %s\n", message);
678	#endif	699	#endif
679		700
680	void	701	void
681	fatal (char *message)	702	fatal (char *message)
682	CODE:	703	CODE:
		704	fprintf (stderr, "FATAL: %s\n", message);
683	#ifdef _WIN32	705	#ifdef _WIN32
684	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	706	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
685	#else
686	fprintf (stderr, "FATAL: %s\n", message);
687	#endif	707	#endif
688	exit (1);	708	exit (1);
689		709
690	MODULE = CFClient PACKAGE = CFClient::Font	710	MODULE = CFClient PACKAGE = CFClient::Font
691		711
…		…
767		787
768	SV *	788	SV *
769	get_text (CFClient::Layout self)	789	get_text (CFClient::Layout self)
770	CODE:	790	CODE:
771	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	791	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
772	SvUTF8_on (RETVAL);	792	sv_utf8_decode (RETVAL);
773	OUTPUT:	793	OUTPUT:
774	RETVAL	794	RETVAL
775		795
776	void	796	void
777	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.)
…		…
903		923
904	while (p < e)	924	while (p < e)
905	{	925	{
906	uint32_t rgba = *p;	926	uint32_t rgba = *p;
907	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
908	rgba = SDL_SwapBE32 (rgba);	940	rgba = SDL_SwapBE32 (rgba);
909	*p++ = rgba;	941	*p++ = rgba;
910	}	942	}
911	}	943	}
912		944
…		…
957	{	989	{
958	HV hv = (HV )SvRV (self);	990	HV hv = (HV )SvRV (self);
959	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	991	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
960	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	992	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
961	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	993	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
962	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
963		994
964	if (items < 5)	995	if (items < 5)
965	{	996	{
966	w = SvNV (*hv_fetch (hv, "w", 1, 1));	997	w = SvNV (*hv_fetch (hv, "w", 1, 1));
967	h = SvNV (*hv_fetch (hv, "h", 1, 1));	998	h = SvNV (*hv_fetch (hv, "h", 1, 1));
968	}	999	}
969		1000
970	if (ix)	1001	if (ix)
971	{	1002	{
972	glEnable (GL_BLEND);	1003	glEnable (GL_BLEND);
		1004
		1005	if (ix == 2)
973	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);
974	}	1013	}
975		1014
976	glBindTexture (GL_TEXTURE_2D, name);	1015	glBindTexture (GL_TEXTURE_2D, name);
977
978	if (wrap_mode)
979	{
980	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
981	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
982	}
983		1016
984	glBegin (GL_QUADS);	1017	glBegin (GL_QUADS);
985	glTexCoord2f (0, 0); glVertex2f (x , y );	1018	glTexCoord2f (0, 0); glVertex2f (x , y );
986	glTexCoord2f (0, t); glVertex2f (x , y + h);	1019	glTexCoord2f (0, t); glVertex2f (x , y + h);
987	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1020	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
988	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1021	glTexCoord2f (s, 0); glVertex2f (x + w, y );
989	glEnd ();	1022	glEnd ();
990		1023
991	if (ix)	1024	if (ix)
		1025	{
		1026	glDisable (GL_ALPHA_TEST);
992	glDisable (GL_BLEND);	1027	glDisable (GL_BLEND);
		1028	}
993	}	1029	}
994		1030
995	MODULE = CFClient PACKAGE = CFClient::Map	1031	MODULE = CFClient PACKAGE = CFClient::Map
996		1032
997	CFClient::Map	1033	CFClient::Map
…		…
1061	tex->r = r;	1097	tex->r = r;
1062	tex->g = g;	1098	tex->g = g;
1063	tex->b = b;	1099	tex->b = b;
1064	tex->a = a;	1100	tex->a = a;
1065	}	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);
1066	}	1111	}
1067		1112
1068	int	1113	int
1069	ox (CFClient::Map self)	1114	ox (CFClient::Map self)
1070	ALIAS:	1115	ALIAS:
1071	oy = 1	1116	oy = 1
		1117	x = 2
		1118	y = 3
		1119	w = 4
		1120	h = 5
1072	CODE:	1121	CODE:
1073	switch (ix)	1122	switch (ix)
1074	{	1123	{
1075	case 0: RETVAL = self->ox; break;	1124	case 0: RETVAL = self->ox; break;
1076	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;
1077	}	1130	}
1078	OUTPUT:	1131	OUTPUT:
1079	RETVAL	1132	RETVAL
1080		1133
1081	void	1134	void
…		…
1508	const_iv (GL_COLOR_MATERIAL),	1561	const_iv (GL_COLOR_MATERIAL),
1509	const_iv (GL_SMOOTH),	1562	const_iv (GL_SMOOTH),
1510	const_iv (GL_FLAT),	1563	const_iv (GL_FLAT),
1511	const_iv (GL_DITHER),	1564	const_iv (GL_DITHER),
1512	const_iv (GL_BLEND),	1565	const_iv (GL_BLEND),
		1566	const_iv (GL_CULL_FACE),
1513	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),
1514	const_iv (GL_AND),	1572	const_iv (GL_AND),
1515	const_iv (GL_ONE),	1573	const_iv (GL_ONE),
1516	const_iv (GL_ZERO),	1574	const_iv (GL_ZERO),
1517	const_iv (GL_SRC_ALPHA),	1575	const_iv (GL_SRC_ALPHA),
1518	const_iv (GL_SRC_ALPHA_SATURATE),	1576	const_iv (GL_DST_ALPHA),
1519	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1577	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1520	const_iv (GL_ONE_MINUS_DST_ALPHA),	1578	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1579	const_iv (GL_SRC_ALPHA_SATURATE),
1521	const_iv (GL_RGB),	1580	const_iv (GL_RGB),
1522	const_iv (GL_RGBA),	1581	const_iv (GL_RGBA),
1523	const_iv (GL_UNSIGNED_BYTE),	1582	const_iv (GL_UNSIGNED_BYTE),
		1583	const_iv (GL_UNSIGNED_SHORT),
		1584	const_iv (GL_UNSIGNED_INT),
1524	const_iv (GL_ALPHA),	1585	const_iv (GL_ALPHA),
		1586	const_iv (GL_INTENSITY),
1525	const_iv (GL_LUMINANCE),	1587	const_iv (GL_LUMINANCE),
		1588	const_iv (GL_LUMINANCE_ALPHA),
1526	const_iv (GL_FLOAT),	1589	const_iv (GL_FLOAT),
1527	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1590	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1528	const_iv (GL_COMPILE),	1591	const_iv (GL_COMPILE),
1529	const_iv (GL_TEXTURE_1D),	1592	const_iv (GL_TEXTURE_1D),
1530	const_iv (GL_TEXTURE_2D),	1593	const_iv (GL_TEXTURE_2D),
…		…
1532	const_iv (GL_TEXTURE_MAG_FILTER),	1595	const_iv (GL_TEXTURE_MAG_FILTER),
1533	const_iv (GL_TEXTURE_MIN_FILTER),	1596	const_iv (GL_TEXTURE_MIN_FILTER),
1534	const_iv (GL_TEXTURE_ENV_MODE),	1597	const_iv (GL_TEXTURE_ENV_MODE),
1535	const_iv (GL_TEXTURE_WRAP_S),	1598	const_iv (GL_TEXTURE_WRAP_S),
1536	const_iv (GL_TEXTURE_WRAP_T),	1599	const_iv (GL_TEXTURE_WRAP_T),
		1600	const_iv (GL_REPEAT),
1537	const_iv (GL_CLAMP),	1601	const_iv (GL_CLAMP),
1538	const_iv (GL_REPEAT),	1602	const_iv (GL_CLAMP_TO_EDGE),
1539	const_iv (GL_NEAREST),	1603	const_iv (GL_NEAREST),
1540	const_iv (GL_LINEAR),	1604	const_iv (GL_LINEAR),
1541	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1605	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1542	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1606	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1543	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1607	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1544	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1608	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1545	const_iv (GL_GENERATE_MIPMAP),	1609	const_iv (GL_GENERATE_MIPMAP),
1546	const_iv (GL_MODULATE),	1610	const_iv (GL_MODULATE),
1547	const_iv (GL_DECAL),	1611	const_iv (GL_DECAL),
1548	const_iv (GL_REPLACE),	1612	const_iv (GL_REPLACE),
		1613	const_iv (GL_DEPTH_BUFFER_BIT),
1549	const_iv (GL_COLOR_BUFFER_BIT),	1614	const_iv (GL_COLOR_BUFFER_BIT),
1550	const_iv (GL_PROJECTION),	1615	const_iv (GL_PROJECTION),
1551	const_iv (GL_MODELVIEW),	1616	const_iv (GL_MODELVIEW),
1552	const_iv (GL_COLOR_LOGIC_OP),	1617	const_iv (GL_COLOR_LOGIC_OP),
1553	const_iv (GL_SEPARABLE_2D),	1618	const_iv (GL_SEPARABLE_2D),
1554	const_iv (GL_CONVOLUTION_2D),	1619	const_iv (GL_CONVOLUTION_2D),
1555	const_iv (GL_CONVOLUTION_BORDER_MODE),	1620	const_iv (GL_CONVOLUTION_BORDER_MODE),
1556	const_iv (GL_CONSTANT_BORDER),	1621	const_iv (GL_CONSTANT_BORDER),
1557	const_iv (GL_LINES),	1622	const_iv (GL_LINES),
		1623	const_iv (GL_LINE_LOOP),
1558	const_iv (GL_QUADS),	1624	const_iv (GL_QUADS),
1559	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),
1560	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1629	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1561	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),
1562	# undef const_iv	1635	# undef const_iv
1563	};	1636	};
1564		1637
1565	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; )
1566	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1639	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1567	}	1640	}
1568		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
1569	int glGetError ()	1663	int glGetError ()
1570		1664
1571	void glClear (int mask)	1665	void glClear (int mask)
1572		1666
1573	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)
…		…
1581		1675
1582	void glHint (int target, int mode)	1676	void glHint (int target, int mode)
1583		1677
1584	void glBlendFunc (int sfactor, int dfactor)	1678	void glBlendFunc (int sfactor, int dfactor)
1585		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
1586	void glLogicOp (int opcode)	1686	void glLogicOp (int opcode)
1587		1687
1588	void glColorMask (int red, int green, int blue, int alpha)	1688	void glColorMask (int red, int green, int blue, int alpha)
1589		1689
1590	void glMatrixMode (int mode)	1690	void glMatrixMode (int mode)
…		…
1593		1693
1594	void glPopMatrix ()	1694	void glPopMatrix ()
1595		1695
1596	void glLoadIdentity ()	1696	void glLoadIdentity ()
1597		1697
1598	# 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
1599	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_)
1600		1703
1601	void glViewport (int x, int y, int width, int height)	1704	void glViewport (int x, int y, int width, int height)
1602		1705
1603	void glScissor (int x, int y, int width, int height)	1706	void glScissor (int x, int y, int width, int height)
…		…
1618		1721
1619	void glEnd ()	1722	void glEnd ()
1620		1723
1621	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)
1622	PROTOTYPE: @	1725	PROTOTYPE: @
		1726	ALIAS:
		1727	glColor_premultiply = 1
1623	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...
1624	glColor4ub (MIN ((int)(r * 255.f), 255),	1736	glColor4ub (MIN ((int)(r * 256.f), 255),
1625	MIN ((int)(g * 255.f), 255),	1737	MIN ((int)(g * 256.f), 255),
1626	MIN ((int)(b * 255.f), 255),	1738	MIN ((int)(b * 256.f), 255),
1627	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);
1628		1751
1629	void glVertex (float x, float y, float z = 0.)	1752	void glVertex (float x, float y, float z = 0.)
1630	CODE:	1753	CODE:
1631	glVertex3f (x, y, z);	1754	glVertex3f (x, y, z);
1632		1755
…		…
1644		1767
1645	void glBindTexture (int target, int name)	1768	void glBindTexture (int target, int name)
1646		1769
1647	void glConvolutionParameter (int target, int pname, float params)	1770	void glConvolutionParameter (int target, int pname, float params)
1648	CODE:	1771	CODE:
1649	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1772	if (gl.ConvolutionParameterf)
		1773	gl.ConvolutionParameterf (target, pname, params);
1650		1774
1651	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)
1652	CODE:	1776	CODE:
1653	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1777	if (gl.ConvolutionFilter2D)
1654	(target, internalformat, width, height, format, type, data));	1778	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1655		1779
1656	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)
1657	CODE:	1781	CODE:
1658	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1782	if (gl.SeparableFilter2D)
1659	(target, internalformat, width, height, format, type, row, column));	1783	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1660		1784
1661	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)
1662		1786
1663	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)
1664		1788
1665	void glRasterPos (int x, int y)	1789	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1666	CODE:
1667	glRasterPos2i (x, y);
1668		1790
1669	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)
1670		1792
1671	int glGenTexture ()	1793	int glGenTexture ()
1672	CODE:	1794	CODE:
…		…
1699		1821
1700	void glEndList ()	1822	void glEndList ()
1701		1823
1702	void glCallList (int list)	1824	void glCallList (int list)
1703		1825
		1826

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.84 by root, Wed May 17 15:18:57 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.84 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.110 by root, Sat Jun 10 02:22:33 2006 UTC