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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.88 by root, Fri May 19 23:18:40 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
…		…
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
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	467	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	468	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
450		469
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	470	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	471	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	472	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	473	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	498	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	499	CODE:
481	RETVAL = !!SDL_SetVideoMode (	500	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	501	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	502	);
		503	if (RETVAL)
		504	{
484	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	}
485	OUTPUT:	510	OUTPUT:
486	RETVAL	511	RETVAL
487		512
488	void	513	void
489	SDL_GL_SwapBuffers ()	514	SDL_GL_SwapBuffers ()
		515
		516	char *
		517	SDL_GetKeyName (int sym)
490		518
491	void	519	void
492	SDL_PollEvent ()	520	SDL_PollEvent ()
493	PPCODE:	521	PPCODE:
494	{	522	{
…		…
513	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	541	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
514	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	542	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
515	break;	543	break;
516		544
517	case SDL_MOUSEMOTION:	545	case SDL_MOUSEMOTION:
		546	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		547
518	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	548	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
519	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	549	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
520	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	550	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
521	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	551	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
522	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	552	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
523	break;	553	break;
524		554
525	case SDL_MOUSEBUTTONDOWN:	555	case SDL_MOUSEBUTTONDOWN:
526	case SDL_MOUSEBUTTONUP:	556	case SDL_MOUSEBUTTONUP:
		557	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		558
527	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	559	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
528	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	560	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
529	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	561	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
530	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	562	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531	break;	563	break;
…		…
557	lowdelay (int fd, int val = 1)	589	lowdelay (int fd, int val = 1)
558	CODE:	590	CODE:
559	#ifndef _WIN32	591	#ifndef _WIN32
560	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	592	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
561	#endif	593	#endif
562
563	char *
564	gl_version ()
565	CODE:
566	RETVAL = (char *)glGetString (GL_VERSION);
567	OUTPUT:
568	RETVAL
569
570	char *
571	gl_extensions ()
572	CODE:
573	RETVAL = (char *)glGetString (GL_EXTENSIONS);
574	OUTPUT:
575	RETVAL
576		594
577	void	595	void
578	add_font (char *file)	596	add_font (char *file)
579	CODE:	597	CODE:
580	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	598	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
716	MODULE = CFClient PACKAGE = CFClient::Layout	734	MODULE = CFClient PACKAGE = CFClient::Layout
717		735
718	CFClient::Layout	736	CFClient::Layout
719	new (SV *class, int rgba = 0)	737	new (SV *class, int rgba = 0)
720	CODE:	738	CODE:
721	#if _WIN32
722	rgba = 0;//D
723	#endif
724	New (0, RETVAL, 1, struct cf_layout);	739	New (0, RETVAL, 1, struct cf_layout);
725		740
726	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	741	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
727	RETVAL->rgba = rgba;	742	RETVAL->rgba = rgba;
728	RETVAL->r = 1.;	743	RETVAL->r = 1.;
…		…
772		787
773	SV *	788	SV *
774	get_text (CFClient::Layout self)	789	get_text (CFClient::Layout self)
775	CODE:	790	CODE:
776	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	791	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
777	SvUTF8_on (RETVAL);	792	sv_utf8_decode (RETVAL);
778	OUTPUT:	793	OUTPUT:
779	RETVAL	794	RETVAL
780		795
781	void	796	void
782	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.)
…		…
974	{	989	{
975	HV hv = (HV )SvRV (self);	990	HV hv = (HV )SvRV (self);
976	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	991	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
977	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	992	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
978	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	993	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
979	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
980		994
981	if (items < 5)	995	if (items < 5)
982	{	996	{
983	w = SvNV (*hv_fetch (hv, "w", 1, 1));	997	w = SvNV (*hv_fetch (hv, "w", 1, 1));
984	h = SvNV (*hv_fetch (hv, "h", 1, 1));	998	h = SvNV (*hv_fetch (hv, "h", 1, 1));
985	}	999	}
986		1000
987	if (ix)	1001	if (ix)
988	{	1002	{
989	glEnable (GL_BLEND);	1003	glEnable (GL_BLEND);
		1004
		1005	if (ix == 2)
990	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
991	glEnable (GL_ALPHA_TEST);	1011	glEnable (GL_ALPHA_TEST);
992	glAlphaFunc (GL_GREATER, 0.01f);	1012	glAlphaFunc (GL_GREATER, 0.01f);
993	}	1013	}
994		1014
995	glBindTexture (GL_TEXTURE_2D, name);	1015	glBindTexture (GL_TEXTURE_2D, name);
996
997	if (wrap_mode)
998	{
999	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1000	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1001	}
1002		1016
1003	glBegin (GL_QUADS);	1017	glBegin (GL_QUADS);
1004	glTexCoord2f (0, 0); glVertex2f (x , y );	1018	glTexCoord2f (0, 0); glVertex2f (x , y );
1005	glTexCoord2f (0, t); glVertex2f (x , y + h);	1019	glTexCoord2f (0, t); glVertex2f (x , y + h);
1006	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1020	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1083	tex->r = r;	1097	tex->r = r;
1084	tex->g = g;	1098	tex->g = g;
1085	tex->b = b;	1099	tex->b = b;
1086	tex->a = a;	1100	tex->a = a;
1087	}	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);
1088	}	1111	}
1089		1112
1090	int	1113	int
1091	ox (CFClient::Map self)	1114	ox (CFClient::Map self)
1092	ALIAS:	1115	ALIAS:
1093	oy = 1	1116	oy = 1
		1117	x = 2
		1118	y = 3
		1119	w = 4
		1120	h = 5
1094	CODE:	1121	CODE:
1095	switch (ix)	1122	switch (ix)
1096	{	1123	{
1097	case 0: RETVAL = self->ox; break;	1124	case 0: RETVAL = self->ox; break;
1098	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;
1099	}	1130	}
1100	OUTPUT:	1131	OUTPUT:
1101	RETVAL	1132	RETVAL
1102		1133
1103	void	1134	void
…		…
1530	const_iv (GL_COLOR_MATERIAL),	1561	const_iv (GL_COLOR_MATERIAL),
1531	const_iv (GL_SMOOTH),	1562	const_iv (GL_SMOOTH),
1532	const_iv (GL_FLAT),	1563	const_iv (GL_FLAT),
1533	const_iv (GL_DITHER),	1564	const_iv (GL_DITHER),
1534	const_iv (GL_BLEND),	1565	const_iv (GL_BLEND),
		1566	const_iv (GL_CULL_FACE),
1535	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),
1536	const_iv (GL_AND),	1572	const_iv (GL_AND),
1537	const_iv (GL_ONE),	1573	const_iv (GL_ONE),
1538	const_iv (GL_ZERO),	1574	const_iv (GL_ZERO),
1539	const_iv (GL_SRC_ALPHA),	1575	const_iv (GL_SRC_ALPHA),
1540	const_iv (GL_SRC_ALPHA_SATURATE),	1576	const_iv (GL_DST_ALPHA),
1541	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1577	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1542	const_iv (GL_ONE_MINUS_DST_ALPHA),	1578	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1579	const_iv (GL_SRC_ALPHA_SATURATE),
1543	const_iv (GL_RGB),	1580	const_iv (GL_RGB),
1544	const_iv (GL_RGBA),	1581	const_iv (GL_RGBA),
1545	const_iv (GL_UNSIGNED_BYTE),	1582	const_iv (GL_UNSIGNED_BYTE),
		1583	const_iv (GL_UNSIGNED_SHORT),
		1584	const_iv (GL_UNSIGNED_INT),
1546	const_iv (GL_ALPHA),	1585	const_iv (GL_ALPHA),
1547	const_iv (GL_INTENSITY),	1586	const_iv (GL_INTENSITY),
1548	const_iv (GL_LUMINANCE),	1587	const_iv (GL_LUMINANCE),
1549	const_iv (GL_LUMINANCE_ALPHA),	1588	const_iv (GL_LUMINANCE_ALPHA),
1550	const_iv (GL_FLOAT),	1589	const_iv (GL_FLOAT),
…		…
1556	const_iv (GL_TEXTURE_MAG_FILTER),	1595	const_iv (GL_TEXTURE_MAG_FILTER),
1557	const_iv (GL_TEXTURE_MIN_FILTER),	1596	const_iv (GL_TEXTURE_MIN_FILTER),
1558	const_iv (GL_TEXTURE_ENV_MODE),	1597	const_iv (GL_TEXTURE_ENV_MODE),
1559	const_iv (GL_TEXTURE_WRAP_S),	1598	const_iv (GL_TEXTURE_WRAP_S),
1560	const_iv (GL_TEXTURE_WRAP_T),	1599	const_iv (GL_TEXTURE_WRAP_T),
		1600	const_iv (GL_REPEAT),
1561	const_iv (GL_CLAMP),	1601	const_iv (GL_CLAMP),
1562	const_iv (GL_REPEAT),	1602	const_iv (GL_CLAMP_TO_EDGE),
1563	const_iv (GL_NEAREST),	1603	const_iv (GL_NEAREST),
1564	const_iv (GL_LINEAR),	1604	const_iv (GL_LINEAR),
1565	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1605	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1566	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1606	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1567	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1607	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1568	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1608	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1569	const_iv (GL_GENERATE_MIPMAP),	1609	const_iv (GL_GENERATE_MIPMAP),
1570	const_iv (GL_MODULATE),	1610	const_iv (GL_MODULATE),
1571	const_iv (GL_DECAL),	1611	const_iv (GL_DECAL),
1572	const_iv (GL_REPLACE),	1612	const_iv (GL_REPLACE),
		1613	const_iv (GL_DEPTH_BUFFER_BIT),
1573	const_iv (GL_COLOR_BUFFER_BIT),	1614	const_iv (GL_COLOR_BUFFER_BIT),
1574	const_iv (GL_PROJECTION),	1615	const_iv (GL_PROJECTION),
1575	const_iv (GL_MODELVIEW),	1616	const_iv (GL_MODELVIEW),
1576	const_iv (GL_COLOR_LOGIC_OP),	1617	const_iv (GL_COLOR_LOGIC_OP),
1577	const_iv (GL_SEPARABLE_2D),	1618	const_iv (GL_SEPARABLE_2D),
1578	const_iv (GL_CONVOLUTION_2D),	1619	const_iv (GL_CONVOLUTION_2D),
1579	const_iv (GL_CONVOLUTION_BORDER_MODE),	1620	const_iv (GL_CONVOLUTION_BORDER_MODE),
1580	const_iv (GL_CONSTANT_BORDER),	1621	const_iv (GL_CONSTANT_BORDER),
1581	const_iv (GL_LINES),	1622	const_iv (GL_LINES),
		1623	const_iv (GL_LINE_LOOP),
1582	const_iv (GL_QUADS),	1624	const_iv (GL_QUADS),
1583	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),
1584	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1629	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1585	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),
1586	# undef const_iv	1635	# undef const_iv
1587	};	1636	};
1588		1637
1589	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; )
1590	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1639	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1591	}	1640	}
1592		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
1593	int glGetError ()	1663	int glGetError ()
1594		1664
1595	void glClear (int mask)	1665	void glClear (int mask)
1596		1666
1597	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)
…		…
1605		1675
1606	void glHint (int target, int mode)	1676	void glHint (int target, int mode)
1607		1677
1608	void glBlendFunc (int sfactor, int dfactor)	1678	void glBlendFunc (int sfactor, int dfactor)
1609		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
1610	void glLogicOp (int opcode)	1686	void glLogicOp (int opcode)
1611		1687
1612	void glColorMask (int red, int green, int blue, int alpha)	1688	void glColorMask (int red, int green, int blue, int alpha)
1613		1689
1614	void glMatrixMode (int mode)	1690	void glMatrixMode (int mode)
…		…
1617		1693
1618	void glPopMatrix ()	1694	void glPopMatrix ()
1619		1695
1620	void glLoadIdentity ()	1696	void glLoadIdentity ()
1621		1697
1622	# 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
1623	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_)
1624		1703
1625	void glViewport (int x, int y, int width, int height)	1704	void glViewport (int x, int y, int width, int height)
1626		1705
1627	void glScissor (int x, int y, int width, int height)	1706	void glScissor (int x, int y, int width, int height)
…		…
1642		1721
1643	void glEnd ()	1722	void glEnd ()
1644		1723
1645	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)
1646	PROTOTYPE: @	1725	PROTOTYPE: @
		1726	ALIAS:
		1727	glColor_premultiply = 1
1647	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...
1648	glColor4ub (MIN ((int)(r * 255.f), 255),	1736	glColor4ub (MIN ((int)(r * 256.f), 255),
1649	MIN ((int)(g * 255.f), 255),	1737	MIN ((int)(g * 256.f), 255),
1650	MIN ((int)(b * 255.f), 255),	1738	MIN ((int)(b * 256.f), 255),
1651	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);
1652		1751
1653	void glVertex (float x, float y, float z = 0.)	1752	void glVertex (float x, float y, float z = 0.)
1654	CODE:	1753	CODE:
1655	glVertex3f (x, y, z);	1754	glVertex3f (x, y, z);
1656		1755
…		…
1668		1767
1669	void glBindTexture (int target, int name)	1768	void glBindTexture (int target, int name)
1670		1769
1671	void glConvolutionParameter (int target, int pname, float params)	1770	void glConvolutionParameter (int target, int pname, float params)
1672	CODE:	1771	CODE:
1673	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1772	if (gl.ConvolutionParameterf)
		1773	gl.ConvolutionParameterf (target, pname, params);
1674		1774
1675	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)
1676	CODE:	1776	CODE:
1677	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1777	if (gl.ConvolutionFilter2D)
1678	(target, internalformat, width, height, format, type, data));	1778	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1679		1779
1680	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)
1681	CODE:	1781	CODE:
1682	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1782	if (gl.SeparableFilter2D)
1683	(target, internalformat, width, height, format, type, row, column));	1783	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1684		1784
1685	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)
1686		1786
1687	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)
1688		1788
1689	void glRasterPos (int x, int y)	1789	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1690	CODE:
1691	glRasterPos2i (x, y);
1692		1790
1693	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)
1694		1792
1695	int glGenTexture ()	1793	int glGenTexture ()
1696	CODE:	1794	CODE:
…		…
1723		1821
1724	void glEndList ()	1822	void glEndList ()
1725		1823
1726	void glCallList (int list)	1824	void glCallList (int list)
1727		1825
		1826

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.88 by root, Fri May 19 23:18:40 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.88 by root, Fri May 19 23:18:40 2006 UTC vs.
Revision 1.110 by root, Sat Jun 10 02:22:33 2006 UTC