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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.81 by root, Sun May 14 23:19:14 2006 UTC vs.
Revision 1.104 by root, Mon Jun 5 00:17:47 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);
		91	#ifdef _WIN32
89	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	92	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
		93	#else
		94	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
		95	#endif
90	}	96	}
91		97
92	static void	98	static void
93	layout_update_font (CFClient__Layout self)	99	layout_update_font (CFClient__Layout self)
94	{	100	{
…		…
439	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	445	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
440	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	446	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
441	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	447	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
442	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	448	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
443		449
		450	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		451	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
		452
444	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	453	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
445	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	454	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
446	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	455	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
447	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	456	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
448		457
449	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	458	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
450	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
452		459
453	SDL_EnableUNICODE (1);	460	SDL_EnableUNICODE (1);
454	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	461	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
455		462
456	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	463	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
465		472
466	++m;	473	++m;
467	}	474	}
468	}	475	}
469		476
		477	char *
		478	SDL_GetError ()
		479
470	int	480	int
471	SDL_SetVideoMode (int w, int h, int fullscreen)	481	SDL_SetVideoMode (int w, int h, int fullscreen)
472	CODE:	482	CODE:
473	RETVAL = !!SDL_SetVideoMode (	483	RETVAL = !!SDL_SetVideoMode (
474	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	484	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
475	);	485	);
		486	if (RETVAL)
		487	{
476	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	488	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		489	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		490	# include "glfunc.h"
		491	# undef GL_FUNC
		492	}
477	OUTPUT:	493	OUTPUT:
478	RETVAL	494	RETVAL
479		495
480	void	496	void
481	SDL_GL_SwapBuffers ()	497	SDL_GL_SwapBuffers ()
		498
		499	char *
		500	SDL_GetKeyName (int sym)
482		501
483	void	502	void
484	SDL_PollEvent ()	503	SDL_PollEvent ()
485	PPCODE:	504	PPCODE:
486	{	505	{
…		…
505	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	524	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
506	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	525	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
507	break;	526	break;
508		527
509	case SDL_MOUSEMOTION:	528	case SDL_MOUSEMOTION:
		529	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		530
510	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	531	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
511	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	532	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
512	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	533	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
513	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	534	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
514	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	535	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
515	break;	536	break;
516		537
517	case SDL_MOUSEBUTTONDOWN:	538	case SDL_MOUSEBUTTONDOWN:
518	case SDL_MOUSEBUTTONUP:	539	case SDL_MOUSEBUTTONUP:
		540	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		541
519	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	542	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
520	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	543	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
521	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	544	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
522	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	545	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
523	break;	546	break;
…		…
549	lowdelay (int fd, int val = 1)	572	lowdelay (int fd, int val = 1)
550	CODE:	573	CODE:
551	#ifndef _WIN32	574	#ifndef _WIN32
552	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	575	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
553	#endif	576	#endif
554
555	char *
556	gl_version ()
557	CODE:
558	RETVAL = (char *)glGetString (GL_VERSION);
559	OUTPUT:
560	RETVAL
561
562	char *
563	gl_extensions ()
564	CODE:
565	RETVAL = (char *)glGetString (GL_EXTENSIONS);
566	OUTPUT:
567	RETVAL
568		577
569	void	578	void
570	add_font (char *file)	579	add_font (char *file)
571	CODE:	580	CODE:
572	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	581	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
665	}	674	}
666		675
667	void	676	void
668	error (char *message)	677	error (char *message)
669	CODE:	678	CODE:
		679	fprintf (stderr, "ERROR: %s\n", message);
670	#ifdef _WIN32	680	#ifdef _WIN32
671	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	681	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
672	#else
673	fprintf (stderr, "ERROR: %s\n", message);
674	#endif	682	#endif
675		683
676	void	684	void
677	fatal (char *message)	685	fatal (char *message)
678	CODE:	686	CODE:
		687	fprintf (stderr, "FATAL: %s\n", message);
679	#ifdef _WIN32	688	#ifdef _WIN32
680	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	689	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
681	#else
682	fprintf (stderr, "FATAL: %s\n", message);
683	#endif	690	#endif
684	exit (1);	691	exit (1);
685		692
686	MODULE = CFClient PACKAGE = CFClient::Font	693	MODULE = CFClient PACKAGE = CFClient::Font
687		694
…		…
710	MODULE = CFClient PACKAGE = CFClient::Layout	717	MODULE = CFClient PACKAGE = CFClient::Layout
711		718
712	CFClient::Layout	719	CFClient::Layout
713	new (SV *class, int rgba = 0)	720	new (SV *class, int rgba = 0)
714	CODE:	721	CODE:
		722	#if _WIN32
		723	//rgba = 0;//D makes text nicer, breaks TextView
		724	#endif
		725	rgba=1;//D
715	New (0, RETVAL, 1, struct cf_layout);	726	New (0, RETVAL, 1, struct cf_layout);
716		727
717	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	728	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
718	RETVAL->rgba = rgba;	729	RETVAL->rgba = rgba;
719	RETVAL->r = 1.;	730	RETVAL->r = 1.;
…		…
799	set_width (CFClient::Layout self, int max_width = -1)	810	set_width (CFClient::Layout self, int max_width = -1)
800	CODE:	811	CODE:
801	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	812	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
802		813
803	void	814	void
		815	set_indent (CFClient::Layout self, int indent)
		816	CODE:
		817	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		818
		819	void
		820	set_spacing (CFClient::Layout self, int spacing)
		821	CODE:
		822	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		823
		824	void
		825	set_ellipsise (CFClient::Layout self, int ellipsise)
		826	CODE:
		827	pango_layout_set_ellipsize (self->pl,
		828	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		829	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		830	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		831	: PANGO_ELLIPSIZE_NONE
		832	);
		833
		834	void
		835	set_single_paragraph_mode (CFClient::Layout self, int spm)
		836	CODE:
		837	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		838
		839	void
804	size (CFClient::Layout self)	840	size (CFClient::Layout self)
805	PPCODE:	841	PPCODE:
806	{	842	{
807	int w, h;	843	int w, h;
808		844
…		…
874		910
875	while (p < e)	911	while (p < e)
876	{	912	{
877	uint32_t rgba = *p;	913	uint32_t rgba = *p;
878	rgba = (rgba >> 24) \| (rgba << 8);	914	rgba = (rgba >> 24) \| (rgba << 8);
		915	#if 0
		916	#ifdef _WIN32
		917	{//D
		918	uint8_t r = rgba >> 24;
		919	uint8_t g = rgba >> 16;
		920	uint8_t b = rgba >> 8;
		921	uint8_t a = rgba >> 0;
		922
		923	rgba = (rgba & 0xffffff00) \| a;
		924	}
		925	#endif
		926	#endif
879	rgba = SDL_SwapBE32 (rgba);	927	rgba = SDL_SwapBE32 (rgba);
880	*p++ = rgba;	928	*p++ = rgba;
881	}	929	}
882	}	930	}
883		931
…		…
928	{	976	{
929	HV hv = (HV )SvRV (self);	977	HV hv = (HV )SvRV (self);
930	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	978	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
931	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	979	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
932	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	980	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
933	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
934		981
935	if (items < 5)	982	if (items < 5)
936	{	983	{
937	w = SvNV (*hv_fetch (hv, "w", 1, 1));	984	w = SvNV (*hv_fetch (hv, "w", 1, 1));
938	h = SvNV (*hv_fetch (hv, "h", 1, 1));	985	h = SvNV (*hv_fetch (hv, "h", 1, 1));
939	}	986	}
940		987
941	if (ix)	988	if (ix)
942	{	989	{
943	glEnable (GL_BLEND);	990	glEnable (GL_BLEND);
		991
		992	if (ix == 2)
944	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	993	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		994	else
		995	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		996	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		997
		998	glEnable (GL_ALPHA_TEST);
		999	glAlphaFunc (GL_GREATER, 0.01f);
945	}	1000	}
946		1001
947	glBindTexture (GL_TEXTURE_2D, name);	1002	glBindTexture (GL_TEXTURE_2D, name);
948
949	if (wrap_mode)
950	{
951	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
952	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
953	}
954		1003
955	glBegin (GL_QUADS);	1004	glBegin (GL_QUADS);
956	glTexCoord2f (0, 0); glVertex2f (x , y );	1005	glTexCoord2f (0, 0); glVertex2f (x , y );
957	glTexCoord2f (0, t); glVertex2f (x , y + h);	1006	glTexCoord2f (0, t); glVertex2f (x , y + h);
958	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1007	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
959	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1008	glTexCoord2f (s, 0); glVertex2f (x + w, y );
960	glEnd ();	1009	glEnd ();
961		1010
962	if (ix)	1011	if (ix)
		1012	{
		1013	glDisable (GL_ALPHA_TEST);
963	glDisable (GL_BLEND);	1014	glDisable (GL_BLEND);
		1015	}
964	}	1016	}
965		1017
966	MODULE = CFClient PACKAGE = CFClient::Map	1018	MODULE = CFClient PACKAGE = CFClient::Map
967		1019
968	CFClient::Map	1020	CFClient::Map
…		…
1032	tex->r = r;	1084	tex->r = r;
1033	tex->g = g;	1085	tex->g = g;
1034	tex->b = b;	1086	tex->b = b;
1035	tex->a = a;	1087	tex->a = a;
1036	}	1088	}
		1089
		1090	// somewhat hackish, but for textures that require it, it really
		1091	// improves the look, and most others don't suffer.
		1092	glBindTexture (GL_TEXTURE_2D, name);
		1093	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1094	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1095	// use uglier nearest interpolation because linear suffers
		1096	// from transparent color bleeding and ugly wrapping effects.
		1097	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1037	}	1098	}
1038		1099
1039	int	1100	int
1040	ox (CFClient::Map self)	1101	ox (CFClient::Map self)
1041	ALIAS:	1102	ALIAS:
1042	oy = 1	1103	oy = 1
		1104	x = 2
		1105	y = 3
		1106	w = 4
		1107	h = 5
1043	CODE:	1108	CODE:
1044	switch (ix)	1109	switch (ix)
1045	{	1110	{
1046	case 0: RETVAL = self->ox; break;	1111	case 0: RETVAL = self->ox; break;
1047	case 1: RETVAL = self->oy; break;	1112	case 1: RETVAL = self->oy; break;
		1113	case 2: RETVAL = self->x; break;
		1114	case 3: RETVAL = self->y; break;
		1115	case 4: RETVAL = self->w; break;
		1116	case 5: RETVAL = self->h; break;
1048	}	1117	}
1049	OUTPUT:	1118	OUTPUT:
1050	RETVAL	1119	RETVAL
1051		1120
1052	void	1121	void
…		…
1479	const_iv (GL_COLOR_MATERIAL),	1548	const_iv (GL_COLOR_MATERIAL),
1480	const_iv (GL_SMOOTH),	1549	const_iv (GL_SMOOTH),
1481	const_iv (GL_FLAT),	1550	const_iv (GL_FLAT),
1482	const_iv (GL_DITHER),	1551	const_iv (GL_DITHER),
1483	const_iv (GL_BLEND),	1552	const_iv (GL_BLEND),
		1553	const_iv (GL_CULL_FACE),
1484	const_iv (GL_SCISSOR_TEST),	1554	const_iv (GL_SCISSOR_TEST),
		1555	const_iv (GL_DEPTH_TEST),
		1556	const_iv (GL_ALPHA_TEST),
		1557	const_iv (GL_NORMALIZE),
		1558	const_iv (GL_RESCALE_NORMAL),
1485	const_iv (GL_AND),	1559	const_iv (GL_AND),
1486	const_iv (GL_ONE),	1560	const_iv (GL_ONE),
1487	const_iv (GL_ZERO),	1561	const_iv (GL_ZERO),
1488	const_iv (GL_SRC_ALPHA),	1562	const_iv (GL_SRC_ALPHA),
1489	const_iv (GL_SRC_ALPHA_SATURATE),	1563	const_iv (GL_DST_ALPHA),
1490	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1564	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1491	const_iv (GL_ONE_MINUS_DST_ALPHA),	1565	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1566	const_iv (GL_SRC_ALPHA_SATURATE),
1492	const_iv (GL_RGB),	1567	const_iv (GL_RGB),
1493	const_iv (GL_RGBA),	1568	const_iv (GL_RGBA),
1494	const_iv (GL_UNSIGNED_BYTE),	1569	const_iv (GL_UNSIGNED_BYTE),
		1570	const_iv (GL_UNSIGNED_SHORT),
		1571	const_iv (GL_UNSIGNED_INT),
1495	const_iv (GL_ALPHA),	1572	const_iv (GL_ALPHA),
		1573	const_iv (GL_INTENSITY),
1496	const_iv (GL_LUMINANCE),	1574	const_iv (GL_LUMINANCE),
		1575	const_iv (GL_LUMINANCE_ALPHA),
1497	const_iv (GL_FLOAT),	1576	const_iv (GL_FLOAT),
1498	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1577	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1499	const_iv (GL_COMPILE),	1578	const_iv (GL_COMPILE),
1500	const_iv (GL_TEXTURE_1D),	1579	const_iv (GL_TEXTURE_1D),
1501	const_iv (GL_TEXTURE_2D),	1580	const_iv (GL_TEXTURE_2D),
…		…
1503	const_iv (GL_TEXTURE_MAG_FILTER),	1582	const_iv (GL_TEXTURE_MAG_FILTER),
1504	const_iv (GL_TEXTURE_MIN_FILTER),	1583	const_iv (GL_TEXTURE_MIN_FILTER),
1505	const_iv (GL_TEXTURE_ENV_MODE),	1584	const_iv (GL_TEXTURE_ENV_MODE),
1506	const_iv (GL_TEXTURE_WRAP_S),	1585	const_iv (GL_TEXTURE_WRAP_S),
1507	const_iv (GL_TEXTURE_WRAP_T),	1586	const_iv (GL_TEXTURE_WRAP_T),
		1587	const_iv (GL_REPEAT),
1508	const_iv (GL_CLAMP),	1588	const_iv (GL_CLAMP),
1509	const_iv (GL_REPEAT),	1589	const_iv (GL_CLAMP_TO_EDGE),
1510	const_iv (GL_NEAREST),	1590	const_iv (GL_NEAREST),
1511	const_iv (GL_LINEAR),	1591	const_iv (GL_LINEAR),
1512	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1592	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1513	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1593	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1514	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1594	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1515	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1595	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1516	const_iv (GL_GENERATE_MIPMAP),	1596	const_iv (GL_GENERATE_MIPMAP),
1517	const_iv (GL_MODULATE),	1597	const_iv (GL_MODULATE),
1518	const_iv (GL_DECAL),	1598	const_iv (GL_DECAL),
1519	const_iv (GL_REPLACE),	1599	const_iv (GL_REPLACE),
		1600	const_iv (GL_DEPTH_BUFFER_BIT),
1520	const_iv (GL_COLOR_BUFFER_BIT),	1601	const_iv (GL_COLOR_BUFFER_BIT),
1521	const_iv (GL_PROJECTION),	1602	const_iv (GL_PROJECTION),
1522	const_iv (GL_MODELVIEW),	1603	const_iv (GL_MODELVIEW),
1523	const_iv (GL_COLOR_LOGIC_OP),	1604	const_iv (GL_COLOR_LOGIC_OP),
1524	const_iv (GL_SEPARABLE_2D),	1605	const_iv (GL_SEPARABLE_2D),
1525	const_iv (GL_CONVOLUTION_2D),	1606	const_iv (GL_CONVOLUTION_2D),
1526	const_iv (GL_CONVOLUTION_BORDER_MODE),	1607	const_iv (GL_CONVOLUTION_BORDER_MODE),
1527	const_iv (GL_CONSTANT_BORDER),	1608	const_iv (GL_CONSTANT_BORDER),
1528	const_iv (GL_LINES),	1609	const_iv (GL_LINES),
		1610	const_iv (GL_LINE_LOOP),
1529	const_iv (GL_QUADS),	1611	const_iv (GL_QUADS),
1530	const_iv (GL_LINE_LOOP),	1612	const_iv (GL_QUAD_STRIP),
		1613	const_iv (GL_TRIANGLES),
		1614	const_iv (GL_TRIANGLE_STRIP),
		1615	const_iv (GL_TRIANGLE_FAN),
1531	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1616	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1532	const_iv (GL_FASTEST),	1617	const_iv (GL_FASTEST),
		1618	const_iv (GL_V2F),
		1619	const_iv (GL_V3F),
		1620	const_iv (GL_T2F_V3F),
		1621	const_iv (GL_T2F_N3F_V3F),
1533	# undef const_iv	1622	# undef const_iv
1534	};	1623	};
1535		1624
1536	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1625	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1537	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1626	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1538	}	1627	}
1539		1628
		1629	char *
		1630	gl_vendor ()
		1631	CODE:
		1632	RETVAL = (char *)glGetString (GL_VENDOR);
		1633	OUTPUT:
		1634	RETVAL
		1635
		1636	char *
		1637	gl_version ()
		1638	CODE:
		1639	RETVAL = (char *)glGetString (GL_VERSION);
		1640	OUTPUT:
		1641	RETVAL
		1642
		1643	char *
		1644	gl_extensions ()
		1645	CODE:
		1646	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1647	OUTPUT:
		1648	RETVAL
		1649
1540	int glGetError ()	1650	int glGetError ()
1541		1651
1542	void glClear (int mask)	1652	void glClear (int mask)
1543		1653
1544	void glClearColor (float r, float g, float b, float a = 1.0)	1654	void glClearColor (float r, float g, float b, float a = 1.0)
…		…
1552		1662
1553	void glHint (int target, int mode)	1663	void glHint (int target, int mode)
1554		1664
1555	void glBlendFunc (int sfactor, int dfactor)	1665	void glBlendFunc (int sfactor, int dfactor)
1556		1666
		1667	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1668	CODE:
		1669	gl_BlendFuncSeparate (sa, da, saa, daa);
		1670
		1671	void glDepthMask (int flag)
		1672
1557	void glLogicOp (int opcode)	1673	void glLogicOp (int opcode)
1558		1674
1559	void glColorMask (int red, int green, int blue, int alpha)	1675	void glColorMask (int red, int green, int blue, int alpha)
1560		1676
1561	void glMatrixMode (int mode)	1677	void glMatrixMode (int mode)
…		…
1564		1680
1565	void glPopMatrix ()	1681	void glPopMatrix ()
1566		1682
1567	void glLoadIdentity ()	1683	void glLoadIdentity ()
1568		1684
1569	# near and far are due to microsofts buggy c compiler	1685	# near_ and far_ are due to microsofts buggy "c" compiler
		1686	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1687
		1688	# near_ and far_ are due to microsofts buggy "c" compiler
1570	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1689	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1571		1690
1572	void glViewport (int x, int y, int width, int height)	1691	void glViewport (int x, int y, int width, int height)
1573		1692
1574	void glScissor (int x, int y, int width, int height)	1693	void glScissor (int x, int y, int width, int height)
…		…
1589		1708
1590	void glEnd ()	1709	void glEnd ()
1591		1710
1592	void glColor (float r, float g, float b, float a = 1.0)	1711	void glColor (float r, float g, float b, float a = 1.0)
1593	PROTOTYPE: @	1712	PROTOTYPE: @
		1713	ALIAS:
		1714	glColor_premultiply = 1
1594	CODE:	1715	CODE:
		1716	if (ix)
		1717	{
		1718	r *= a;
		1719	g *= a;
		1720	b *= a;
		1721	}
		1722	// microsoft visual "c" rounds instead of truncating...
1595	glColor4ub (MIN ((int)(r * 255.f), 255),	1723	glColor4ub (MIN ((int)(r * 256.f), 255),
1596	MIN ((int)(g * 255.f), 255),	1724	MIN ((int)(g * 256.f), 255),
1597	MIN ((int)(b * 255.f), 255),	1725	MIN ((int)(b * 256.f), 255),
1598	MIN ((int)(a * 255.f), 255));	1726	MIN ((int)(a * 256.f), 255));
		1727
		1728	void glInterleavedArrays (int format, int stride, char *data)
		1729
		1730	void glDrawElements (int mode, int count, int type, char *indices)
		1731
		1732	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1733
		1734	void glRasterPos (float x, float y, float z = 0.)
		1735	CODE:
		1736	glRasterPos3f (0, 0, z);
		1737	glBitmap (0, 0, 0, 0, x, y, 0);
1599		1738
1600	void glVertex (float x, float y, float z = 0.)	1739	void glVertex (float x, float y, float z = 0.)
1601	CODE:	1740	CODE:
1602	glVertex3f (x, y, z);	1741	glVertex3f (x, y, z);
1603		1742
…		…
1615		1754
1616	void glBindTexture (int target, int name)	1755	void glBindTexture (int target, int name)
1617		1756
1618	void glConvolutionParameter (int target, int pname, float params)	1757	void glConvolutionParameter (int target, int pname, float params)
1619	CODE:	1758	CODE:
1620	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1759	if (gl.ConvolutionParameterf)
		1760	gl.ConvolutionParameterf (target, pname, params);
1621		1761
1622	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1762	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1623	CODE:	1763	CODE:
1624	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1764	if (gl.ConvolutionFilter2D)
1625	(target, internalformat, width, height, format, type, data));	1765	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1626		1766
1627	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1767	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1628	CODE:	1768	CODE:
1629	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1769	if (gl.SeparableFilter2D)
1630	(target, internalformat, width, height, format, type, row, column));	1770	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1631		1771
1632	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1772	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1633		1773
1634	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1774	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1635		1775
1636	void glRasterPos (int x, int y)	1776	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1637	CODE:
1638	glRasterPos2i (x, y);
1639		1777
1640	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1778	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1641		1779
1642	int glGenTexture ()	1780	int glGenTexture ()
1643	CODE:	1781	CODE:
…		…
1670		1808
1671	void glEndList ()	1809	void glEndList ()
1672		1810
1673	void glCallList (int list)	1811	void glCallList (int list)
1674		1812
		1813

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.81 by root, Sun May 14 23:19:14 2006 UTC vs. Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.81 by root, Sun May 14 23:19:14 2006 UTC vs.
Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC