[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.105 by root, Mon Jun 5 03:33:09 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;
…		…
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);
89	#ifdef _WIN32
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	91	//FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91	#else
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif
94	}	93	}
95		94
96	static void	95	static void
97	layout_update_font (CFClient__Layout self)	96	layout_update_font (CFClient__Layout self)
98	{	97	{
…		…
416	}	415	}
417		416
418	void	417	void
419	pango_init ()	418	pango_init ()
420	CODE:	419	CODE:
421	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx	420	// delayed, so it can pick up new fonts added by AddFontResourceEx
		421	{
		422	{
423	ft2_fontmap = pango_ft2_font_map_new ();	423	ft2_fontmap = pango_ft2_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	424	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);	425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
		426	}
426		427
		428	{
		429	cairo_font_options_t *fopt = cairo_font_options_create ();
427	cairo_fontmap = pango_cairo_font_map_get_default ();	430	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);	431	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
		432	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
		433	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
		434	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
		435	pango_cairo_context_set_font_options (cairo_context, fopt);
		436	cairo_font_options_destroy (fopt);
		437	}
429	}	438	}
430		439
431	int	440	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	441	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
433		442
…		…
441	SDL_Rect **m;	450	SDL_Rect **m;
442		451
443	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	452	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	453	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	454	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 16);	455	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		456
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 64);	457	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	458	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
450		459
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	460	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	461	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	462	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	463	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
…		…
470		479
471	++m;	480	++m;
472	}	481	}
473	}	482	}
474		483
		484	char *
		485	SDL_GetError ()
		486
475	int	487	int
476	SDL_SetVideoMode (int w, int h, int fullscreen)	488	SDL_SetVideoMode (int w, int h, int fullscreen)
477	CODE:	489	CODE:
478	RETVAL = !!SDL_SetVideoMode (	490	RETVAL = !!SDL_SetVideoMode (
479	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	491	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
480	);	492	);
		493	if (RETVAL)
		494	{
481	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	495	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		496	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		497	# include "glfunc.h"
		498	# undef GL_FUNC
		499	}
482	OUTPUT:	500	OUTPUT:
483	RETVAL	501	RETVAL
484		502
485	void	503	void
486	SDL_GL_SwapBuffers ()	504	SDL_GL_SwapBuffers ()
		505
		506	char *
		507	SDL_GetKeyName (int sym)
487		508
488	void	509	void
489	SDL_PollEvent ()	510	SDL_PollEvent ()
490	PPCODE:	511	PPCODE:
491	{	512	{
…		…
510	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	531	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
511	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	532	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
512	break;	533	break;
513		534
514	case SDL_MOUSEMOTION:	535	case SDL_MOUSEMOTION:
		536	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		537
515	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	538	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
516	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	539	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
517	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	540	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
518	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	541	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
519	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	542	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
520	break;	543	break;
521		544
522	case SDL_MOUSEBUTTONDOWN:	545	case SDL_MOUSEBUTTONDOWN:
523	case SDL_MOUSEBUTTONUP:	546	case SDL_MOUSEBUTTONUP:
		547	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		548
524	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	549	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
525	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	550	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
526	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	551	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
527	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	552	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
528	break;	553	break;
…		…
554	lowdelay (int fd, int val = 1)	579	lowdelay (int fd, int val = 1)
555	CODE:	580	CODE:
556	#ifndef _WIN32	581	#ifndef _WIN32
557	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	582	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
558	#endif	583	#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		584
574	void	585	void
575	add_font (char *file)	586	add_font (char *file)
576	CODE:	587	CODE:
577	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	588	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
713	MODULE = CFClient PACKAGE = CFClient::Layout	724	MODULE = CFClient PACKAGE = CFClient::Layout
714		725
715	CFClient::Layout	726	CFClient::Layout
716	new (SV *class, int rgba = 0)	727	new (SV *class, int rgba = 0)
717	CODE:	728	CODE:
		729	#if _WIN32
		730	//rgba = 0;//D makes text nicer, breaks TextView
		731	#endif
		732	rgba=1;//D
718	New (0, RETVAL, 1, struct cf_layout);	733	New (0, RETVAL, 1, struct cf_layout);
719		734
720	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	735	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
721	RETVAL->rgba = rgba;	736	RETVAL->rgba = rgba;
722	RETVAL->r = 1.;	737	RETVAL->r = 1.;
…		…
902		917
903	while (p < e)	918	while (p < e)
904	{	919	{
905	uint32_t rgba = *p;	920	uint32_t rgba = *p;
906	rgba = (rgba >> 24) \| (rgba << 8);	921	rgba = (rgba >> 24) \| (rgba << 8);
		922	#if 0
		923	#ifdef _WIN32
		924	{//D
		925	uint8_t r = rgba >> 24;
		926	uint8_t g = rgba >> 16;
		927	uint8_t b = rgba >> 8;
		928	uint8_t a = rgba >> 0;
		929
		930	rgba = (rgba & 0xffffff00) \| a;
		931	}
		932	#endif
		933	#endif
907	rgba = SDL_SwapBE32 (rgba);	934	rgba = SDL_SwapBE32 (rgba);
908	*p++ = rgba;	935	*p++ = rgba;
909	}	936	}
910	}	937	}
911		938
…		…
956	{	983	{
957	HV hv = (HV )SvRV (self);	984	HV hv = (HV )SvRV (self);
958	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	985	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
959	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	986	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
960	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	987	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
961	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
962		988
963	if (items < 5)	989	if (items < 5)
964	{	990	{
965	w = SvNV (*hv_fetch (hv, "w", 1, 1));	991	w = SvNV (*hv_fetch (hv, "w", 1, 1));
966	h = SvNV (*hv_fetch (hv, "h", 1, 1));	992	h = SvNV (*hv_fetch (hv, "h", 1, 1));
967	}	993	}
968		994
969	if (ix)	995	if (ix)
970	{	996	{
971	glEnable (GL_BLEND);	997	glEnable (GL_BLEND);
		998
		999	if (ix == 2)
972	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1000	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1001	else
		1002	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1003	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1004
973	glEnable (GL_ALPHA_TEST);	1005	glEnable (GL_ALPHA_TEST);
974	glAlphaFunc (GL_GREATER, 0.01f);	1006	glAlphaFunc (GL_GREATER, 0.01f);
975	}	1007	}
976		1008
977	glBindTexture (GL_TEXTURE_2D, name);	1009	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		1010
985	glBegin (GL_QUADS);	1011	glBegin (GL_QUADS);
986	glTexCoord2f (0, 0); glVertex2f (x , y );	1012	glTexCoord2f (0, 0); glVertex2f (x , y );
987	glTexCoord2f (0, t); glVertex2f (x , y + h);	1013	glTexCoord2f (0, t); glVertex2f (x , y + h);
988	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1014	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1065	tex->r = r;	1091	tex->r = r;
1066	tex->g = g;	1092	tex->g = g;
1067	tex->b = b;	1093	tex->b = b;
1068	tex->a = a;	1094	tex->a = a;
1069	}	1095	}
		1096
		1097	// somewhat hackish, but for textures that require it, it really
		1098	// improves the look, and most others don't suffer.
		1099	glBindTexture (GL_TEXTURE_2D, name);
		1100	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1101	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1102	// use uglier nearest interpolation because linear suffers
		1103	// from transparent color bleeding and ugly wrapping effects.
		1104	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1070	}	1105	}
1071		1106
1072	int	1107	int
1073	ox (CFClient::Map self)	1108	ox (CFClient::Map self)
1074	ALIAS:	1109	ALIAS:
1075	oy = 1	1110	oy = 1
		1111	x = 2
		1112	y = 3
		1113	w = 4
		1114	h = 5
1076	CODE:	1115	CODE:
1077	switch (ix)	1116	switch (ix)
1078	{	1117	{
1079	case 0: RETVAL = self->ox; break;	1118	case 0: RETVAL = self->ox; break;
1080	case 1: RETVAL = self->oy; break;	1119	case 1: RETVAL = self->oy; break;
		1120	case 2: RETVAL = self->x; break;
		1121	case 3: RETVAL = self->y; break;
		1122	case 4: RETVAL = self->w; break;
		1123	case 5: RETVAL = self->h; break;
1081	}	1124	}
1082	OUTPUT:	1125	OUTPUT:
1083	RETVAL	1126	RETVAL
1084		1127
1085	void	1128	void
…		…
1512	const_iv (GL_COLOR_MATERIAL),	1555	const_iv (GL_COLOR_MATERIAL),
1513	const_iv (GL_SMOOTH),	1556	const_iv (GL_SMOOTH),
1514	const_iv (GL_FLAT),	1557	const_iv (GL_FLAT),
1515	const_iv (GL_DITHER),	1558	const_iv (GL_DITHER),
1516	const_iv (GL_BLEND),	1559	const_iv (GL_BLEND),
		1560	const_iv (GL_CULL_FACE),
1517	const_iv (GL_SCISSOR_TEST),	1561	const_iv (GL_SCISSOR_TEST),
		1562	const_iv (GL_DEPTH_TEST),
		1563	const_iv (GL_ALPHA_TEST),
		1564	const_iv (GL_NORMALIZE),
		1565	const_iv (GL_RESCALE_NORMAL),
1518	const_iv (GL_AND),	1566	const_iv (GL_AND),
1519	const_iv (GL_ONE),	1567	const_iv (GL_ONE),
1520	const_iv (GL_ZERO),	1568	const_iv (GL_ZERO),
1521	const_iv (GL_SRC_ALPHA),	1569	const_iv (GL_SRC_ALPHA),
1522	const_iv (GL_SRC_ALPHA_SATURATE),	1570	const_iv (GL_DST_ALPHA),
1523	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1571	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1524	const_iv (GL_ONE_MINUS_DST_ALPHA),	1572	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1573	const_iv (GL_SRC_ALPHA_SATURATE),
1525	const_iv (GL_RGB),	1574	const_iv (GL_RGB),
1526	const_iv (GL_RGBA),	1575	const_iv (GL_RGBA),
1527	const_iv (GL_UNSIGNED_BYTE),	1576	const_iv (GL_UNSIGNED_BYTE),
		1577	const_iv (GL_UNSIGNED_SHORT),
		1578	const_iv (GL_UNSIGNED_INT),
1528	const_iv (GL_ALPHA),	1579	const_iv (GL_ALPHA),
1529	const_iv (GL_INTENSITY),	1580	const_iv (GL_INTENSITY),
1530	const_iv (GL_LUMINANCE),	1581	const_iv (GL_LUMINANCE),
1531	const_iv (GL_LUMINANCE_ALPHA),	1582	const_iv (GL_LUMINANCE_ALPHA),
1532	const_iv (GL_FLOAT),	1583	const_iv (GL_FLOAT),
…		…
1538	const_iv (GL_TEXTURE_MAG_FILTER),	1589	const_iv (GL_TEXTURE_MAG_FILTER),
1539	const_iv (GL_TEXTURE_MIN_FILTER),	1590	const_iv (GL_TEXTURE_MIN_FILTER),
1540	const_iv (GL_TEXTURE_ENV_MODE),	1591	const_iv (GL_TEXTURE_ENV_MODE),
1541	const_iv (GL_TEXTURE_WRAP_S),	1592	const_iv (GL_TEXTURE_WRAP_S),
1542	const_iv (GL_TEXTURE_WRAP_T),	1593	const_iv (GL_TEXTURE_WRAP_T),
		1594	const_iv (GL_REPEAT),
1543	const_iv (GL_CLAMP),	1595	const_iv (GL_CLAMP),
1544	const_iv (GL_REPEAT),	1596	const_iv (GL_CLAMP_TO_EDGE),
1545	const_iv (GL_NEAREST),	1597	const_iv (GL_NEAREST),
1546	const_iv (GL_LINEAR),	1598	const_iv (GL_LINEAR),
1547	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1599	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1548	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1600	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1549	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1601	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1550	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1602	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1551	const_iv (GL_GENERATE_MIPMAP),	1603	const_iv (GL_GENERATE_MIPMAP),
1552	const_iv (GL_MODULATE),	1604	const_iv (GL_MODULATE),
1553	const_iv (GL_DECAL),	1605	const_iv (GL_DECAL),
1554	const_iv (GL_REPLACE),	1606	const_iv (GL_REPLACE),
		1607	const_iv (GL_DEPTH_BUFFER_BIT),
1555	const_iv (GL_COLOR_BUFFER_BIT),	1608	const_iv (GL_COLOR_BUFFER_BIT),
1556	const_iv (GL_PROJECTION),	1609	const_iv (GL_PROJECTION),
1557	const_iv (GL_MODELVIEW),	1610	const_iv (GL_MODELVIEW),
1558	const_iv (GL_COLOR_LOGIC_OP),	1611	const_iv (GL_COLOR_LOGIC_OP),
1559	const_iv (GL_SEPARABLE_2D),	1612	const_iv (GL_SEPARABLE_2D),
1560	const_iv (GL_CONVOLUTION_2D),	1613	const_iv (GL_CONVOLUTION_2D),
1561	const_iv (GL_CONVOLUTION_BORDER_MODE),	1614	const_iv (GL_CONVOLUTION_BORDER_MODE),
1562	const_iv (GL_CONSTANT_BORDER),	1615	const_iv (GL_CONSTANT_BORDER),
1563	const_iv (GL_LINES),	1616	const_iv (GL_LINES),
		1617	const_iv (GL_LINE_LOOP),
1564	const_iv (GL_QUADS),	1618	const_iv (GL_QUADS),
1565	const_iv (GL_LINE_LOOP),	1619	const_iv (GL_QUAD_STRIP),
		1620	const_iv (GL_TRIANGLES),
		1621	const_iv (GL_TRIANGLE_STRIP),
		1622	const_iv (GL_TRIANGLE_FAN),
1566	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1623	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1567	const_iv (GL_FASTEST),	1624	const_iv (GL_FASTEST),
		1625	const_iv (GL_V2F),
		1626	const_iv (GL_V3F),
		1627	const_iv (GL_T2F_V3F),
		1628	const_iv (GL_T2F_N3F_V3F),
1568	# undef const_iv	1629	# undef const_iv
1569	};	1630	};
1570		1631
1571	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1632	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1572	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1633	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1573	}	1634	}
1574		1635
		1636	char *
		1637	gl_vendor ()
		1638	CODE:
		1639	RETVAL = (char *)glGetString (GL_VENDOR);
		1640	OUTPUT:
		1641	RETVAL
		1642
		1643	char *
		1644	gl_version ()
		1645	CODE:
		1646	RETVAL = (char *)glGetString (GL_VERSION);
		1647	OUTPUT:
		1648	RETVAL
		1649
		1650	char *
		1651	gl_extensions ()
		1652	CODE:
		1653	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1654	OUTPUT:
		1655	RETVAL
		1656
1575	int glGetError ()	1657	int glGetError ()
1576		1658
1577	void glClear (int mask)	1659	void glClear (int mask)
1578		1660
1579	void glClearColor (float r, float g, float b, float a = 1.0)	1661	void glClearColor (float r, float g, float b, float a = 1.0)
…		…
1587		1669
1588	void glHint (int target, int mode)	1670	void glHint (int target, int mode)
1589		1671
1590	void glBlendFunc (int sfactor, int dfactor)	1672	void glBlendFunc (int sfactor, int dfactor)
1591		1673
		1674	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1675	CODE:
		1676	gl_BlendFuncSeparate (sa, da, saa, daa);
		1677
		1678	void glDepthMask (int flag)
		1679
1592	void glLogicOp (int opcode)	1680	void glLogicOp (int opcode)
1593		1681
1594	void glColorMask (int red, int green, int blue, int alpha)	1682	void glColorMask (int red, int green, int blue, int alpha)
1595		1683
1596	void glMatrixMode (int mode)	1684	void glMatrixMode (int mode)
…		…
1599		1687
1600	void glPopMatrix ()	1688	void glPopMatrix ()
1601		1689
1602	void glLoadIdentity ()	1690	void glLoadIdentity ()
1603		1691
1604	# near and far are due to microsofts buggy c compiler	1692	# near_ and far_ are due to microsofts buggy "c" compiler
		1693	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1694
		1695	# 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_)	1696	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1606		1697
1607	void glViewport (int x, int y, int width, int height)	1698	void glViewport (int x, int y, int width, int height)
1608		1699
1609	void glScissor (int x, int y, int width, int height)	1700	void glScissor (int x, int y, int width, int height)
…		…
1624		1715
1625	void glEnd ()	1716	void glEnd ()
1626		1717
1627	void glColor (float r, float g, float b, float a = 1.0)	1718	void glColor (float r, float g, float b, float a = 1.0)
1628	PROTOTYPE: @	1719	PROTOTYPE: @
		1720	ALIAS:
		1721	glColor_premultiply = 1
1629	CODE:	1722	CODE:
		1723	if (ix)
		1724	{
		1725	r *= a;
		1726	g *= a;
		1727	b *= a;
		1728	}
		1729	// microsoft visual "c" rounds instead of truncating...
1630	glColor4ub (MIN ((int)(r * 255.f), 255),	1730	glColor4ub (MIN ((int)(r * 256.f), 255),
1631	MIN ((int)(g * 255.f), 255),	1731	MIN ((int)(g * 256.f), 255),
1632	MIN ((int)(b * 255.f), 255),	1732	MIN ((int)(b * 256.f), 255),
1633	MIN ((int)(a * 255.f), 255));	1733	MIN ((int)(a * 256.f), 255));
		1734
		1735	void glInterleavedArrays (int format, int stride, char *data)
		1736
		1737	void glDrawElements (int mode, int count, int type, char *indices)
		1738
		1739	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1740
		1741	void glRasterPos (float x, float y, float z = 0.)
		1742	CODE:
		1743	glRasterPos3f (0, 0, z);
		1744	glBitmap (0, 0, 0, 0, x, y, 0);
1634		1745
1635	void glVertex (float x, float y, float z = 0.)	1746	void glVertex (float x, float y, float z = 0.)
1636	CODE:	1747	CODE:
1637	glVertex3f (x, y, z);	1748	glVertex3f (x, y, z);
1638		1749
…		…
1650		1761
1651	void glBindTexture (int target, int name)	1762	void glBindTexture (int target, int name)
1652		1763
1653	void glConvolutionParameter (int target, int pname, float params)	1764	void glConvolutionParameter (int target, int pname, float params)
1654	CODE:	1765	CODE:
1655	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1766	if (gl.ConvolutionParameterf)
		1767	gl.ConvolutionParameterf (target, pname, params);
1656		1768
1657	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1769	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1658	CODE:	1770	CODE:
1659	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1771	if (gl.ConvolutionFilter2D)
1660	(target, internalformat, width, height, format, type, data));	1772	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1661		1773
1662	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1774	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1663	CODE:	1775	CODE:
1664	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1776	if (gl.SeparableFilter2D)
1665	(target, internalformat, width, height, format, type, row, column));	1777	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1666		1778
1667	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1779	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1668		1780
1669	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1781	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1670		1782
1671	void glRasterPos (int x, int y)	1783	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1672	CODE:
1673	glRasterPos2i (x, y);
1674		1784
1675	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1785	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1676		1786
1677	int glGenTexture ()	1787	int glGenTexture ()
1678	CODE:	1788	CODE:
…		…
1705		1815
1706	void glEndList ()	1816	void glEndList ()
1707		1817
1708	void glCallList (int list)	1818	void glCallList (int list)
1709		1819
		1820

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.105 by root, Mon Jun 5 03:33:09 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.105 by root, Mon Jun 5 03:33:09 2006 UTC