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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.86 by root, Fri May 19 16:43:56 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);
89	#ifdef _WIN32	92	#ifdef _WIN32
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	93	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91	#else	94	#else
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	95	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif	96	#endif
…		…
416	}	419	}
417		420
418	void	421	void
419	pango_init ()	422	pango_init ()
420	CODE:	423	CODE:
421	{
422	// 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	{
423	ft2_fontmap = pango_ft2_font_map_new ();	427	ft2_fontmap = pango_ft2_font_map_new ();
424	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);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	429	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426		430	}
		431	{
		432	cairo_font_options_t *fopt = cairo_font_options_create ();
427	cairo_fontmap = pango_cairo_font_map_get_default ();	433	cairo_fontmap = pango_cairo_font_map_get_default ();
428	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	}
429	}	446	}
430		447
431	int	448	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	449	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
433		450
…		…
441	SDL_Rect **m;	458	SDL_Rect **m;
442		459
443	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	460	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	461	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	462	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 16);	463	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		464
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 64);	465	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	466	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
450		467
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	468	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	469	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	470	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	471	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
…		…
470		487
471	++m;	488	++m;
472	}	489	}
473	}	490	}
474		491
		492	char *
		493	SDL_GetError ()
		494
475	int	495	int
476	SDL_SetVideoMode (int w, int h, int fullscreen)	496	SDL_SetVideoMode (int w, int h, int fullscreen)
477	CODE:	497	CODE:
478	RETVAL = !!SDL_SetVideoMode (	498	RETVAL = !!SDL_SetVideoMode (
479	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	499	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
480	);	500	);
		501	if (RETVAL)
		502	{
481	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	}
482	OUTPUT:	508	OUTPUT:
483	RETVAL	509	RETVAL
484		510
485	void	511	void
486	SDL_GL_SwapBuffers ()	512	SDL_GL_SwapBuffers ()
		513
		514	char *
		515	SDL_GetKeyName (int sym)
487		516
488	void	517	void
489	SDL_PollEvent ()	518	SDL_PollEvent ()
490	PPCODE:	519	PPCODE:
491	{	520	{
…		…
510	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	539	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
511	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	540	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
512	break;	541	break;
513		542
514	case SDL_MOUSEMOTION:	543	case SDL_MOUSEMOTION:
		544	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		545
515	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	546	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
516	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	547	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
517	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	548	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
518	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	549	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
519	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	550	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
520	break;	551	break;
521		552
522	case SDL_MOUSEBUTTONDOWN:	553	case SDL_MOUSEBUTTONDOWN:
523	case SDL_MOUSEBUTTONUP:	554	case SDL_MOUSEBUTTONUP:
		555	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		556
524	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	557	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
525	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	558	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
526	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	559	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
527	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	560	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
528	break;	561	break;
…		…
554	lowdelay (int fd, int val = 1)	587	lowdelay (int fd, int val = 1)
555	CODE:	588	CODE:
556	#ifndef _WIN32	589	#ifndef _WIN32
557	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	590	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
558	#endif	591	#endif
559
560	char *
561	gl_version ()
562	CODE:
563	RETVAL = (char *)glGetString (GL_VERSION);
564	OUTPUT:
565	RETVAL
566
567	char *
568	gl_extensions ()
569	CODE:
570	RETVAL = (char *)glGetString (GL_EXTENSIONS);
571	OUTPUT:
572	RETVAL
573		592
574	void	593	void
575	add_font (char *file)	594	add_font (char *file)
576	CODE:	595	CODE:
577	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	596	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
766		785
767	SV *	786	SV *
768	get_text (CFClient::Layout self)	787	get_text (CFClient::Layout self)
769	CODE:	788	CODE:
770	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	789	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
771	SvUTF8_on (RETVAL);	790	sv_utf8_decode (RETVAL);
772	OUTPUT:	791	OUTPUT:
773	RETVAL	792	RETVAL
774		793
775	void	794	void
776	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.)
…		…
902		921
903	while (p < e)	922	while (p < e)
904	{	923	{
905	uint32_t rgba = *p;	924	uint32_t rgba = *p;
906	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
907	rgba = SDL_SwapBE32 (rgba);	938	rgba = SDL_SwapBE32 (rgba);
908	*p++ = rgba;	939	*p++ = rgba;
909	}	940	}
910	}	941	}
911		942
…		…
956	{	987	{
957	HV hv = (HV )SvRV (self);	988	HV hv = (HV )SvRV (self);
958	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	989	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
959	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	990	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
960	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	991	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
961	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
962		992
963	if (items < 5)	993	if (items < 5)
964	{	994	{
965	w = SvNV (*hv_fetch (hv, "w", 1, 1));	995	w = SvNV (*hv_fetch (hv, "w", 1, 1));
966	h = SvNV (*hv_fetch (hv, "h", 1, 1));	996	h = SvNV (*hv_fetch (hv, "h", 1, 1));
967	}	997	}
968		998
969	if (ix)	999	if (ix)
970	{	1000	{
971	glEnable (GL_BLEND);	1001	glEnable (GL_BLEND);
		1002
		1003	if (ix == 2)
972	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
973	glEnable (GL_ALPHA_TEST);	1009	glEnable (GL_ALPHA_TEST);
974	glAlphaFunc (GL_GREATER, 0.01f);	1010	glAlphaFunc (GL_GREATER, 0.01f);
975	}	1011	}
976		1012
977	glBindTexture (GL_TEXTURE_2D, name);	1013	glBindTexture (GL_TEXTURE_2D, name);
978
979	if (wrap_mode)
980	{
981	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
982	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
983	}
984		1014
985	glBegin (GL_QUADS);	1015	glBegin (GL_QUADS);
986	glTexCoord2f (0, 0); glVertex2f (x , y );	1016	glTexCoord2f (0, 0); glVertex2f (x , y );
987	glTexCoord2f (0, t); glVertex2f (x , y + h);	1017	glTexCoord2f (0, t); glVertex2f (x , y + h);
988	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1018	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1065	tex->r = r;	1095	tex->r = r;
1066	tex->g = g;	1096	tex->g = g;
1067	tex->b = b;	1097	tex->b = b;
1068	tex->a = a;	1098	tex->a = a;
1069	}	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);
1070	}	1109	}
1071		1110
1072	int	1111	int
1073	ox (CFClient::Map self)	1112	ox (CFClient::Map self)
1074	ALIAS:	1113	ALIAS:
1075	oy = 1	1114	oy = 1
		1115	x = 2
		1116	y = 3
		1117	w = 4
		1118	h = 5
1076	CODE:	1119	CODE:
1077	switch (ix)	1120	switch (ix)
1078	{	1121	{
1079	case 0: RETVAL = self->ox; break;	1122	case 0: RETVAL = self->ox; break;
1080	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;
1081	}	1128	}
1082	OUTPUT:	1129	OUTPUT:
1083	RETVAL	1130	RETVAL
1084		1131
1085	void	1132	void
…		…
1512	const_iv (GL_COLOR_MATERIAL),	1559	const_iv (GL_COLOR_MATERIAL),
1513	const_iv (GL_SMOOTH),	1560	const_iv (GL_SMOOTH),
1514	const_iv (GL_FLAT),	1561	const_iv (GL_FLAT),
1515	const_iv (GL_DITHER),	1562	const_iv (GL_DITHER),
1516	const_iv (GL_BLEND),	1563	const_iv (GL_BLEND),
		1564	const_iv (GL_CULL_FACE),
1517	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),
1518	const_iv (GL_AND),	1570	const_iv (GL_AND),
1519	const_iv (GL_ONE),	1571	const_iv (GL_ONE),
1520	const_iv (GL_ZERO),	1572	const_iv (GL_ZERO),
1521	const_iv (GL_SRC_ALPHA),	1573	const_iv (GL_SRC_ALPHA),
1522	const_iv (GL_SRC_ALPHA_SATURATE),	1574	const_iv (GL_DST_ALPHA),
1523	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1575	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1524	const_iv (GL_ONE_MINUS_DST_ALPHA),	1576	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1577	const_iv (GL_SRC_ALPHA_SATURATE),
1525	const_iv (GL_RGB),	1578	const_iv (GL_RGB),
1526	const_iv (GL_RGBA),	1579	const_iv (GL_RGBA),
1527	const_iv (GL_UNSIGNED_BYTE),	1580	const_iv (GL_UNSIGNED_BYTE),
		1581	const_iv (GL_UNSIGNED_SHORT),
		1582	const_iv (GL_UNSIGNED_INT),
1528	const_iv (GL_ALPHA),	1583	const_iv (GL_ALPHA),
1529	const_iv (GL_INTENSITY),	1584	const_iv (GL_INTENSITY),
1530	const_iv (GL_LUMINANCE),	1585	const_iv (GL_LUMINANCE),
1531	const_iv (GL_LUMINANCE_ALPHA),	1586	const_iv (GL_LUMINANCE_ALPHA),
1532	const_iv (GL_FLOAT),	1587	const_iv (GL_FLOAT),
…		…
1538	const_iv (GL_TEXTURE_MAG_FILTER),	1593	const_iv (GL_TEXTURE_MAG_FILTER),
1539	const_iv (GL_TEXTURE_MIN_FILTER),	1594	const_iv (GL_TEXTURE_MIN_FILTER),
1540	const_iv (GL_TEXTURE_ENV_MODE),	1595	const_iv (GL_TEXTURE_ENV_MODE),
1541	const_iv (GL_TEXTURE_WRAP_S),	1596	const_iv (GL_TEXTURE_WRAP_S),
1542	const_iv (GL_TEXTURE_WRAP_T),	1597	const_iv (GL_TEXTURE_WRAP_T),
		1598	const_iv (GL_REPEAT),
1543	const_iv (GL_CLAMP),	1599	const_iv (GL_CLAMP),
1544	const_iv (GL_REPEAT),	1600	const_iv (GL_CLAMP_TO_EDGE),
1545	const_iv (GL_NEAREST),	1601	const_iv (GL_NEAREST),
1546	const_iv (GL_LINEAR),	1602	const_iv (GL_LINEAR),
1547	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1603	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1548	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1604	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1549	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1605	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1550	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1606	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1551	const_iv (GL_GENERATE_MIPMAP),	1607	const_iv (GL_GENERATE_MIPMAP),
1552	const_iv (GL_MODULATE),	1608	const_iv (GL_MODULATE),
1553	const_iv (GL_DECAL),	1609	const_iv (GL_DECAL),
1554	const_iv (GL_REPLACE),	1610	const_iv (GL_REPLACE),
		1611	const_iv (GL_DEPTH_BUFFER_BIT),
1555	const_iv (GL_COLOR_BUFFER_BIT),	1612	const_iv (GL_COLOR_BUFFER_BIT),
1556	const_iv (GL_PROJECTION),	1613	const_iv (GL_PROJECTION),
1557	const_iv (GL_MODELVIEW),	1614	const_iv (GL_MODELVIEW),
1558	const_iv (GL_COLOR_LOGIC_OP),	1615	const_iv (GL_COLOR_LOGIC_OP),
1559	const_iv (GL_SEPARABLE_2D),	1616	const_iv (GL_SEPARABLE_2D),
1560	const_iv (GL_CONVOLUTION_2D),	1617	const_iv (GL_CONVOLUTION_2D),
1561	const_iv (GL_CONVOLUTION_BORDER_MODE),	1618	const_iv (GL_CONVOLUTION_BORDER_MODE),
1562	const_iv (GL_CONSTANT_BORDER),	1619	const_iv (GL_CONSTANT_BORDER),
1563	const_iv (GL_LINES),	1620	const_iv (GL_LINES),
		1621	const_iv (GL_LINE_LOOP),
1564	const_iv (GL_QUADS),	1622	const_iv (GL_QUADS),
1565	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),
1566	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1627	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1567	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),
1568	# undef const_iv	1633	# undef const_iv
1569	};	1634	};
1570		1635
1571	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; )
1572	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1637	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1573	}	1638	}
1574		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
1575	int glGetError ()	1661	int glGetError ()
1576		1662
1577	void glClear (int mask)	1663	void glClear (int mask)
1578		1664
1579	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)
…		…
1587		1673
1588	void glHint (int target, int mode)	1674	void glHint (int target, int mode)
1589		1675
1590	void glBlendFunc (int sfactor, int dfactor)	1676	void glBlendFunc (int sfactor, int dfactor)
1591		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
1592	void glLogicOp (int opcode)	1684	void glLogicOp (int opcode)
1593		1685
1594	void glColorMask (int red, int green, int blue, int alpha)	1686	void glColorMask (int red, int green, int blue, int alpha)
1595		1687
1596	void glMatrixMode (int mode)	1688	void glMatrixMode (int mode)
…		…
1599		1691
1600	void glPopMatrix ()	1692	void glPopMatrix ()
1601		1693
1602	void glLoadIdentity ()	1694	void glLoadIdentity ()
1603		1695
1604	# 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
1605	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_)
1606		1701
1607	void glViewport (int x, int y, int width, int height)	1702	void glViewport (int x, int y, int width, int height)
1608		1703
1609	void glScissor (int x, int y, int width, int height)	1704	void glScissor (int x, int y, int width, int height)
…		…
1624		1719
1625	void glEnd ()	1720	void glEnd ()
1626		1721
1627	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)
1628	PROTOTYPE: @	1723	PROTOTYPE: @
		1724	ALIAS:
		1725	glColor_premultiply = 1
1629	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...
1630	glColor4ub (MIN ((int)(r * 255.f), 255),	1734	glColor4ub (MIN ((int)(r * 256.f), 255),
1631	MIN ((int)(g * 255.f), 255),	1735	MIN ((int)(g * 256.f), 255),
1632	MIN ((int)(b * 255.f), 255),	1736	MIN ((int)(b * 256.f), 255),
1633	MIN ((int)(a * 255.f), 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);
1634		1749
1635	void glVertex (float x, float y, float z = 0.)	1750	void glVertex (float x, float y, float z = 0.)
1636	CODE:	1751	CODE:
1637	glVertex3f (x, y, z);	1752	glVertex3f (x, y, z);
1638		1753
…		…
1650		1765
1651	void glBindTexture (int target, int name)	1766	void glBindTexture (int target, int name)
1652		1767
1653	void glConvolutionParameter (int target, int pname, float params)	1768	void glConvolutionParameter (int target, int pname, float params)
1654	CODE:	1769	CODE:
1655	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1770	if (gl.ConvolutionParameterf)
		1771	gl.ConvolutionParameterf (target, pname, params);
1656		1772
1657	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)
1658	CODE:	1774	CODE:
1659	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1775	if (gl.ConvolutionFilter2D)
1660	(target, internalformat, width, height, format, type, data));	1776	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1661		1777
1662	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)
1663	CODE:	1779	CODE:
1664	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1780	if (gl.SeparableFilter2D)
1665	(target, internalformat, width, height, format, type, row, column));	1781	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1666		1782
1667	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)
1668		1784
1669	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)
1670		1786
1671	void glRasterPos (int x, int y)	1787	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1672	CODE:
1673	glRasterPos2i (x, y);
1674		1788
1675	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)
1676		1790
1677	int glGenTexture ()	1791	int glGenTexture ()
1678	CODE:	1792	CODE:
…		…
1705		1819
1706	void glEndList ()	1820	void glEndList ()
1707		1821
1708	void glCallList (int list)	1822	void glCallList (int list)
1709		1823
		1824

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.86 by root, Fri May 19 16:43:56 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.86 by root, Fri May 19 16:43:56 2006 UTC vs.
Revision 1.108 by root, Wed Jun 7 23:28:12 2006 UTC