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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.80 by root, Sun May 14 22:58:24 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	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	91	//FcPatternAddBool (pattern, FC_AUTOHINT, 1);
		92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
90	}	93	}
91		94
92	static void	95	static void
93	layout_update_font (CFClient__Layout self)	96	layout_update_font (CFClient__Layout self)
94	{	97	{
…		…
412	}	415	}
413		416
414	void	417	void
415	pango_init ()	418	pango_init ()
416	CODE:	419	CODE:
417	{
418	// 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	{
419	ft2_fontmap = pango_ft2_font_map_new ();	423	ft2_fontmap = pango_ft2_font_map_new ();
420	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);
421	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
		426	}
422		427
		428	{
		429	cairo_font_options_t *fopt = cairo_font_options_create ();
423	cairo_fontmap = pango_cairo_font_map_get_default ();	430	cairo_fontmap = pango_cairo_font_map_get_default ();
424	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	}
425	}	438	}
426		439
427	int	440	int
428	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	441	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
429		442
…		…
439	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	452	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
440	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	453	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
441	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	454	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
442	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	455	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
443		456
		457	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		458	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
		459
444	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	460	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
445	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	461	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
446	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	462	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
447	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	463	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
448		464
449	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	465	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		466
453	SDL_EnableUNICODE (1);	467	SDL_EnableUNICODE (1);
454	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	468	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
455		469
456	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	470	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
465		479
466	++m;	480	++m;
467	}	481	}
468	}	482	}
469		483
		484	char *
		485	SDL_GetError ()
		486
470	int	487	int
471	SDL_SetVideoMode (int w, int h, int fullscreen)	488	SDL_SetVideoMode (int w, int h, int fullscreen)
472	CODE:	489	CODE:
473	RETVAL = !!SDL_SetVideoMode (	490	RETVAL = !!SDL_SetVideoMode (
474	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	491	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
475	);	492	);
		493	if (RETVAL)
		494	{
476	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	}
477	OUTPUT:	500	OUTPUT:
478	RETVAL	501	RETVAL
479		502
480	void	503	void
481	SDL_GL_SwapBuffers ()	504	SDL_GL_SwapBuffers ()
		505
		506	char *
		507	SDL_GetKeyName (int sym)
482		508
483	void	509	void
484	SDL_PollEvent ()	510	SDL_PollEvent ()
485	PPCODE:	511	PPCODE:
486	{	512	{
…		…
505	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	531	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
506	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	532	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
507	break;	533	break;
508		534
509	case SDL_MOUSEMOTION:	535	case SDL_MOUSEMOTION:
		536	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		537
510	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	538	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
511	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	539	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
512	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	540	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
513	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	541	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
514	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	542	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
515	break;	543	break;
516		544
517	case SDL_MOUSEBUTTONDOWN:	545	case SDL_MOUSEBUTTONDOWN:
518	case SDL_MOUSEBUTTONUP:	546	case SDL_MOUSEBUTTONUP:
		547	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		548
519	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	549	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
520	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	550	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
521	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	551	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
522	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	552	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
523	break;	553	break;
…		…
549	lowdelay (int fd, int val = 1)	579	lowdelay (int fd, int val = 1)
550	CODE:	580	CODE:
551	#ifndef _WIN32	581	#ifndef _WIN32
552	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	582	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
553	#endif	583	#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		584
569	void	585	void
570	add_font (char *file)	586	add_font (char *file)
571	CODE:	587	CODE:
572	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	588	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
665	}	681	}
666		682
667	void	683	void
668	error (char *message)	684	error (char *message)
669	CODE:	685	CODE:
		686	fprintf (stderr, "ERROR: %s\n", message);
670	#ifdef _WIN32	687	#ifdef _WIN32
671	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	688	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
672	#else
673	fprintf (stderr, "ERROR: %s\n", message);
674	#endif	689	#endif
675		690
676	void	691	void
677	fatal (char *message)	692	fatal (char *message)
678	CODE:	693	CODE:
		694	fprintf (stderr, "FATAL: %s\n", message);
679	#ifdef _WIN32	695	#ifdef _WIN32
680	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	696	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
681	#else
682	fprintf (stderr, "FATAL: %s\n", message);
683	#endif	697	#endif
684	exit (1);	698	exit (1);
685		699
686	MODULE = CFClient PACKAGE = CFClient::Font	700	MODULE = CFClient PACKAGE = CFClient::Font
687		701
…		…
710	MODULE = CFClient PACKAGE = CFClient::Layout	724	MODULE = CFClient PACKAGE = CFClient::Layout
711		725
712	CFClient::Layout	726	CFClient::Layout
713	new (SV *class, int rgba = 0)	727	new (SV *class, int rgba = 0)
714	CODE:	728	CODE:
		729	#if _WIN32
		730	//rgba = 0;//D makes text nicer, breaks TextView
		731	#endif
		732	rgba=1;//D
715	New (0, RETVAL, 1, struct cf_layout);	733	New (0, RETVAL, 1, struct cf_layout);
716		734
717	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	735	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
718	RETVAL->rgba = rgba;	736	RETVAL->rgba = rgba;
719	RETVAL->r = 1.;	737	RETVAL->r = 1.;
…		…
799	set_width (CFClient::Layout self, int max_width = -1)	817	set_width (CFClient::Layout self, int max_width = -1)
800	CODE:	818	CODE:
801	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	819	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
802		820
803	void	821	void
		822	set_indent (CFClient::Layout self, int indent)
		823	CODE:
		824	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		825
		826	void
		827	set_spacing (CFClient::Layout self, int spacing)
		828	CODE:
		829	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		830
		831	void
		832	set_ellipsise (CFClient::Layout self, int ellipsise)
		833	CODE:
		834	pango_layout_set_ellipsize (self->pl,
		835	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		836	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		837	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		838	: PANGO_ELLIPSIZE_NONE
		839	);
		840
		841	void
		842	set_single_paragraph_mode (CFClient::Layout self, int spm)
		843	CODE:
		844	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		845
		846	void
804	size (CFClient::Layout self)	847	size (CFClient::Layout self)
805	PPCODE:	848	PPCODE:
806	{	849	{
807	int w, h;	850	int w, h;
808		851
…		…
874		917
875	while (p < e)	918	while (p < e)
876	{	919	{
877	uint32_t rgba = *p;	920	uint32_t rgba = *p;
878	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
879	rgba = SDL_SwapBE32 (rgba);	934	rgba = SDL_SwapBE32 (rgba);
880	*p++ = rgba;	935	*p++ = rgba;
881	}	936	}
882	}	937	}
883		938
…		…
928	{	983	{
929	HV hv = (HV )SvRV (self);	984	HV hv = (HV )SvRV (self);
930	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	985	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
931	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	986	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
932	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	987	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
933	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
934		988
935	if (items < 5)	989	if (items < 5)
936	{	990	{
937	w = SvNV (*hv_fetch (hv, "w", 1, 1));	991	w = SvNV (*hv_fetch (hv, "w", 1, 1));
938	h = SvNV (*hv_fetch (hv, "h", 1, 1));	992	h = SvNV (*hv_fetch (hv, "h", 1, 1));
939	}	993	}
940		994
941	if (ix)	995	if (ix)
942	{	996	{
943	glEnable (GL_BLEND);	997	glEnable (GL_BLEND);
		998
		999	if (ix == 2)
944	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
		1005	glEnable (GL_ALPHA_TEST);
		1006	glAlphaFunc (GL_GREATER, 0.01f);
945	}	1007	}
946		1008
947	glBindTexture (GL_TEXTURE_2D, name);	1009	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		1010
955	glBegin (GL_QUADS);	1011	glBegin (GL_QUADS);
956	glTexCoord2f (0, 0); glVertex2f (x , y );	1012	glTexCoord2f (0, 0); glVertex2f (x , y );
957	glTexCoord2f (0, t); glVertex2f (x , y + h);	1013	glTexCoord2f (0, t); glVertex2f (x , y + h);
958	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1014	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
959	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1015	glTexCoord2f (s, 0); glVertex2f (x + w, y );
960	glEnd ();	1016	glEnd ();
961		1017
962	if (ix)	1018	if (ix)
		1019	{
		1020	glDisable (GL_ALPHA_TEST);
963	glDisable (GL_BLEND);	1021	glDisable (GL_BLEND);
		1022	}
964	}	1023	}
965		1024
966	MODULE = CFClient PACKAGE = CFClient::Map	1025	MODULE = CFClient PACKAGE = CFClient::Map
967		1026
968	CFClient::Map	1027	CFClient::Map
…		…
1032	tex->r = r;	1091	tex->r = r;
1033	tex->g = g;	1092	tex->g = g;
1034	tex->b = b;	1093	tex->b = b;
1035	tex->a = a;	1094	tex->a = a;
1036	}	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);
1037	}	1105	}
1038		1106
1039	int	1107	int
1040	ox (CFClient::Map self)	1108	ox (CFClient::Map self)
1041	ALIAS:	1109	ALIAS:
1042	oy = 1	1110	oy = 1
		1111	x = 2
		1112	y = 3
		1113	w = 4
		1114	h = 5
1043	CODE:	1115	CODE:
1044	switch (ix)	1116	switch (ix)
1045	{	1117	{
1046	case 0: RETVAL = self->ox; break;	1118	case 0: RETVAL = self->ox; break;
1047	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;
1048	}	1124	}
1049	OUTPUT:	1125	OUTPUT:
1050	RETVAL	1126	RETVAL
1051		1127
1052	void	1128	void
…		…
1479	const_iv (GL_COLOR_MATERIAL),	1555	const_iv (GL_COLOR_MATERIAL),
1480	const_iv (GL_SMOOTH),	1556	const_iv (GL_SMOOTH),
1481	const_iv (GL_FLAT),	1557	const_iv (GL_FLAT),
1482	const_iv (GL_DITHER),	1558	const_iv (GL_DITHER),
1483	const_iv (GL_BLEND),	1559	const_iv (GL_BLEND),
		1560	const_iv (GL_CULL_FACE),
1484	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),
1485	const_iv (GL_AND),	1566	const_iv (GL_AND),
1486	const_iv (GL_ONE),	1567	const_iv (GL_ONE),
1487	const_iv (GL_ZERO),	1568	const_iv (GL_ZERO),
1488	const_iv (GL_SRC_ALPHA),	1569	const_iv (GL_SRC_ALPHA),
1489	const_iv (GL_SRC_ALPHA_SATURATE),	1570	const_iv (GL_DST_ALPHA),
1490	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1571	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1491	const_iv (GL_ONE_MINUS_DST_ALPHA),	1572	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1573	const_iv (GL_SRC_ALPHA_SATURATE),
1492	const_iv (GL_RGB),	1574	const_iv (GL_RGB),
1493	const_iv (GL_RGBA),	1575	const_iv (GL_RGBA),
1494	const_iv (GL_UNSIGNED_BYTE),	1576	const_iv (GL_UNSIGNED_BYTE),
		1577	const_iv (GL_UNSIGNED_SHORT),
		1578	const_iv (GL_UNSIGNED_INT),
1495	const_iv (GL_ALPHA),	1579	const_iv (GL_ALPHA),
		1580	const_iv (GL_INTENSITY),
1496	const_iv (GL_LUMINANCE),	1581	const_iv (GL_LUMINANCE),
		1582	const_iv (GL_LUMINANCE_ALPHA),
1497	const_iv (GL_FLOAT),	1583	const_iv (GL_FLOAT),
1498	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1584	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1499	const_iv (GL_COMPILE),	1585	const_iv (GL_COMPILE),
1500	const_iv (GL_TEXTURE_1D),	1586	const_iv (GL_TEXTURE_1D),
1501	const_iv (GL_TEXTURE_2D),	1587	const_iv (GL_TEXTURE_2D),
…		…
1503	const_iv (GL_TEXTURE_MAG_FILTER),	1589	const_iv (GL_TEXTURE_MAG_FILTER),
1504	const_iv (GL_TEXTURE_MIN_FILTER),	1590	const_iv (GL_TEXTURE_MIN_FILTER),
1505	const_iv (GL_TEXTURE_ENV_MODE),	1591	const_iv (GL_TEXTURE_ENV_MODE),
1506	const_iv (GL_TEXTURE_WRAP_S),	1592	const_iv (GL_TEXTURE_WRAP_S),
1507	const_iv (GL_TEXTURE_WRAP_T),	1593	const_iv (GL_TEXTURE_WRAP_T),
		1594	const_iv (GL_REPEAT),
1508	const_iv (GL_CLAMP),	1595	const_iv (GL_CLAMP),
1509	const_iv (GL_REPEAT),	1596	const_iv (GL_CLAMP_TO_EDGE),
1510	const_iv (GL_NEAREST),	1597	const_iv (GL_NEAREST),
1511	const_iv (GL_LINEAR),	1598	const_iv (GL_LINEAR),
1512	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1599	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1513	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1600	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1514	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1601	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1515	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1602	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1516	const_iv (GL_GENERATE_MIPMAP),	1603	const_iv (GL_GENERATE_MIPMAP),
1517	const_iv (GL_MODULATE),	1604	const_iv (GL_MODULATE),
1518	const_iv (GL_DECAL),	1605	const_iv (GL_DECAL),
1519	const_iv (GL_REPLACE),	1606	const_iv (GL_REPLACE),
		1607	const_iv (GL_DEPTH_BUFFER_BIT),
1520	const_iv (GL_COLOR_BUFFER_BIT),	1608	const_iv (GL_COLOR_BUFFER_BIT),
1521	const_iv (GL_PROJECTION),	1609	const_iv (GL_PROJECTION),
1522	const_iv (GL_MODELVIEW),	1610	const_iv (GL_MODELVIEW),
1523	const_iv (GL_COLOR_LOGIC_OP),	1611	const_iv (GL_COLOR_LOGIC_OP),
1524	const_iv (GL_SEPARABLE_2D),	1612	const_iv (GL_SEPARABLE_2D),
1525	const_iv (GL_CONVOLUTION_2D),	1613	const_iv (GL_CONVOLUTION_2D),
1526	const_iv (GL_CONVOLUTION_BORDER_MODE),	1614	const_iv (GL_CONVOLUTION_BORDER_MODE),
1527	const_iv (GL_CONSTANT_BORDER),	1615	const_iv (GL_CONSTANT_BORDER),
1528	const_iv (GL_LINES),	1616	const_iv (GL_LINES),
		1617	const_iv (GL_LINE_LOOP),
1529	const_iv (GL_QUADS),	1618	const_iv (GL_QUADS),
1530	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),
1531	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1623	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1532	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),
1533	# undef const_iv	1629	# undef const_iv
1534	};	1630	};
1535		1631
1536	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; )
1537	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1633	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1538	}	1634	}
1539		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
1540	int glGetError ()	1657	int glGetError ()
1541		1658
1542	void glClear (int mask)	1659	void glClear (int mask)
1543		1660
1544	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)
…		…
1552		1669
1553	void glHint (int target, int mode)	1670	void glHint (int target, int mode)
1554		1671
1555	void glBlendFunc (int sfactor, int dfactor)	1672	void glBlendFunc (int sfactor, int dfactor)
1556		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
1557	void glLogicOp (int opcode)	1680	void glLogicOp (int opcode)
1558		1681
1559	void glColorMask (int red, int green, int blue, int alpha)	1682	void glColorMask (int red, int green, int blue, int alpha)
1560		1683
1561	void glMatrixMode (int mode)	1684	void glMatrixMode (int mode)
…		…
1564		1687
1565	void glPopMatrix ()	1688	void glPopMatrix ()
1566		1689
1567	void glLoadIdentity ()	1690	void glLoadIdentity ()
1568		1691
1569	# 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
1570	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_)
1571		1697
1572	void glViewport (int x, int y, int width, int height)	1698	void glViewport (int x, int y, int width, int height)
1573		1699
1574	void glScissor (int x, int y, int width, int height)	1700	void glScissor (int x, int y, int width, int height)
…		…
1589		1715
1590	void glEnd ()	1716	void glEnd ()
1591		1717
1592	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)
1593	PROTOTYPE: @	1719	PROTOTYPE: @
		1720	ALIAS:
		1721	glColor_premultiply = 1
1594	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...
1595	glColor4ub (MIN ((int)r * 256., 255),	1730	glColor4ub (MIN ((int)(r * 256.f), 255),
1596	MIN ((int)g * 256., 255),	1731	MIN ((int)(g * 256.f), 255),
1597	MIN ((int)b * 256., 255),	1732	MIN ((int)(b * 256.f), 255),
1598	MIN ((int)a * 256., 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);
1599		1745
1600	void glVertex (float x, float y, float z = 0.)	1746	void glVertex (float x, float y, float z = 0.)
1601	CODE:	1747	CODE:
1602	glVertex3f (x, y, z);	1748	glVertex3f (x, y, z);
1603		1749
…		…
1615		1761
1616	void glBindTexture (int target, int name)	1762	void glBindTexture (int target, int name)
1617		1763
1618	void glConvolutionParameter (int target, int pname, float params)	1764	void glConvolutionParameter (int target, int pname, float params)
1619	CODE:	1765	CODE:
1620	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1766	if (gl.ConvolutionParameterf)
		1767	gl.ConvolutionParameterf (target, pname, params);
1621		1768
1622	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)
1623	CODE:	1770	CODE:
1624	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1771	if (gl.ConvolutionFilter2D)
1625	(target, internalformat, width, height, format, type, data));	1772	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1626		1773
1627	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)
1628	CODE:	1775	CODE:
1629	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1776	if (gl.SeparableFilter2D)
1630	(target, internalformat, width, height, format, type, row, column));	1777	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1631		1778
1632	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)
1633		1780
1634	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)
1635		1782
1636	void glRasterPos (int x, int y)	1783	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1637	CODE:
1638	glRasterPos2i (x, y);
1639		1784
1640	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)
1641		1786
1642	int glGenTexture ()	1787	int glGenTexture ()
1643	CODE:	1788	CODE:
…		…
1670		1815
1671	void glEndList ()	1816	void glEndList ()
1672		1817
1673	void glCallList (int list)	1818	void glCallList (int list)
1674		1819
		1820

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.80 by root, Sun May 14 22:58:24 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.80 by root, Sun May 14 22:58:24 2006 UTC vs.
Revision 1.105 by root, Mon Jun 5 03:33:09 2006 UTC