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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.83 by root, Mon May 15 00:25:14 2006 UTC vs.
Revision 1.106 by root, Mon Jun 5 03:48:49 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;
…		…
416	}	418	}
417		419
418	void	420	void
419	pango_init ()	421	pango_init ()
420	CODE:	422	CODE:
421	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx	423	// delayed, so it can pick up new fonts added by AddFontResourceEx
		424	{
		425	{
423	ft2_fontmap = pango_ft2_font_map_new ();	426	ft2_fontmap = pango_ft2_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	427	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);	428	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426		429	}
		430	{
		431	cairo_font_options_t *fopt = cairo_font_options_create ();
427	cairo_fontmap = pango_cairo_font_map_get_default ();	432	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);	433	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
		434	#ifdef _WIN32
		435	// cairo looks like shit eaten twice on windows
		436	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
		437	#else
		438	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
		439	#endif
		440	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
		441	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
		442	pango_cairo_context_set_font_options (cairo_context, fopt);
		443	cairo_font_options_destroy (fopt);
		444	}
429	}	445	}
430		446
431	int	447	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	448	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
433		449
…		…
443	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	459	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	460	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	461	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	462	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		463
		464	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		465	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
		466
448	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	467	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
449	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	468	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
450	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	469	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	470	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
452		471
453	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	472	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
454	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
455	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
456		473
457	SDL_EnableUNICODE (1);	474	SDL_EnableUNICODE (1);
458	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	475	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
459		476
460	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	477	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
469		486
470	++m;	487	++m;
471	}	488	}
472	}	489	}
473		490
		491	char *
		492	SDL_GetError ()
		493
474	int	494	int
475	SDL_SetVideoMode (int w, int h, int fullscreen)	495	SDL_SetVideoMode (int w, int h, int fullscreen)
476	CODE:	496	CODE:
477	RETVAL = !!SDL_SetVideoMode (	497	RETVAL = !!SDL_SetVideoMode (
478	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	498	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
479	);	499	);
		500	if (RETVAL)
		501	{
480	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	502	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		503	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		504	# include "glfunc.h"
		505	# undef GL_FUNC
		506	}
481	OUTPUT:	507	OUTPUT:
482	RETVAL	508	RETVAL
483		509
484	void	510	void
485	SDL_GL_SwapBuffers ()	511	SDL_GL_SwapBuffers ()
		512
		513	char *
		514	SDL_GetKeyName (int sym)
486		515
487	void	516	void
488	SDL_PollEvent ()	517	SDL_PollEvent ()
489	PPCODE:	518	PPCODE:
490	{	519	{
…		…
509	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	538	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
510	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	539	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
511	break;	540	break;
512		541
513	case SDL_MOUSEMOTION:	542	case SDL_MOUSEMOTION:
		543	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		544
514	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	545	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
515	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	546	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
516	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	547	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
517	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	548	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
518	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	549	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
519	break;	550	break;
520		551
521	case SDL_MOUSEBUTTONDOWN:	552	case SDL_MOUSEBUTTONDOWN:
522	case SDL_MOUSEBUTTONUP:	553	case SDL_MOUSEBUTTONUP:
		554	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		555
523	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	556	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
524	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	557	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
525	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	558	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
526	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	559	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
527	break;	560	break;
…		…
553	lowdelay (int fd, int val = 1)	586	lowdelay (int fd, int val = 1)
554	CODE:	587	CODE:
555	#ifndef _WIN32	588	#ifndef _WIN32
556	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	589	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
557	#endif	590	#endif
558
559	char *
560	gl_version ()
561	CODE:
562	RETVAL = (char *)glGetString (GL_VERSION);
563	OUTPUT:
564	RETVAL
565
566	char *
567	gl_extensions ()
568	CODE:
569	RETVAL = (char *)glGetString (GL_EXTENSIONS);
570	OUTPUT:
571	RETVAL
572		591
573	void	592	void
574	add_font (char *file)	593	add_font (char *file)
575	CODE:	594	CODE:
576	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	595	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
669	}	688	}
670		689
671	void	690	void
672	error (char *message)	691	error (char *message)
673	CODE:	692	CODE:
		693	fprintf (stderr, "ERROR: %s\n", message);
674	#ifdef _WIN32	694	#ifdef _WIN32
675	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	695	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
676	#else
677	fprintf (stderr, "ERROR: %s\n", message);
678	#endif	696	#endif
679		697
680	void	698	void
681	fatal (char *message)	699	fatal (char *message)
682	CODE:	700	CODE:
		701	fprintf (stderr, "FATAL: %s\n", message);
683	#ifdef _WIN32	702	#ifdef _WIN32
684	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	703	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
685	#else
686	fprintf (stderr, "FATAL: %s\n", message);
687	#endif	704	#endif
688	exit (1);	705	exit (1);
689		706
690	MODULE = CFClient PACKAGE = CFClient::Font	707	MODULE = CFClient PACKAGE = CFClient::Font
691		708
…		…
803	set_width (CFClient::Layout self, int max_width = -1)	820	set_width (CFClient::Layout self, int max_width = -1)
804	CODE:	821	CODE:
805	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	822	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
806		823
807	void	824	void
		825	set_indent (CFClient::Layout self, int indent)
		826	CODE:
		827	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		828
		829	void
		830	set_spacing (CFClient::Layout self, int spacing)
		831	CODE:
		832	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		833
		834	void
		835	set_ellipsise (CFClient::Layout self, int ellipsise)
		836	CODE:
		837	pango_layout_set_ellipsize (self->pl,
		838	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		839	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		840	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		841	: PANGO_ELLIPSIZE_NONE
		842	);
		843
		844	void
		845	set_single_paragraph_mode (CFClient::Layout self, int spm)
		846	CODE:
		847	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		848
		849	void
808	size (CFClient::Layout self)	850	size (CFClient::Layout self)
809	PPCODE:	851	PPCODE:
810	{	852	{
811	int w, h;	853	int w, h;
812		854
…		…
878		920
879	while (p < e)	921	while (p < e)
880	{	922	{
881	uint32_t rgba = *p;	923	uint32_t rgba = *p;
882	rgba = (rgba >> 24) \| (rgba << 8);	924	rgba = (rgba >> 24) \| (rgba << 8);
		925	#if 0
		926	#ifdef _WIN32
		927	{//D
		928	uint8_t r = rgba >> 24;
		929	uint8_t g = rgba >> 16;
		930	uint8_t b = rgba >> 8;
		931	uint8_t a = rgba >> 0;
		932
		933	rgba = (rgba & 0xffffff00) \| a;
		934	}
		935	#endif
		936	#endif
883	rgba = SDL_SwapBE32 (rgba);	937	rgba = SDL_SwapBE32 (rgba);
884	*p++ = rgba;	938	*p++ = rgba;
885	}	939	}
886	}	940	}
887		941
…		…
932	{	986	{
933	HV hv = (HV )SvRV (self);	987	HV hv = (HV )SvRV (self);
934	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	988	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
935	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	989	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
936	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	990	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
937	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
938		991
939	if (items < 5)	992	if (items < 5)
940	{	993	{
941	w = SvNV (*hv_fetch (hv, "w", 1, 1));	994	w = SvNV (*hv_fetch (hv, "w", 1, 1));
942	h = SvNV (*hv_fetch (hv, "h", 1, 1));	995	h = SvNV (*hv_fetch (hv, "h", 1, 1));
943	}	996	}
944		997
945	if (ix)	998	if (ix)
946	{	999	{
947	glEnable (GL_BLEND);	1000	glEnable (GL_BLEND);
		1001
		1002	if (ix == 2)
948	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1003	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1004	else
		1005	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1006	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1007
		1008	glEnable (GL_ALPHA_TEST);
		1009	glAlphaFunc (GL_GREATER, 0.01f);
949	}	1010	}
950		1011
951	glBindTexture (GL_TEXTURE_2D, name);	1012	glBindTexture (GL_TEXTURE_2D, name);
952
953	if (wrap_mode)
954	{
955	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
956	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
957	}
958		1013
959	glBegin (GL_QUADS);	1014	glBegin (GL_QUADS);
960	glTexCoord2f (0, 0); glVertex2f (x , y );	1015	glTexCoord2f (0, 0); glVertex2f (x , y );
961	glTexCoord2f (0, t); glVertex2f (x , y + h);	1016	glTexCoord2f (0, t); glVertex2f (x , y + h);
962	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1017	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
963	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1018	glTexCoord2f (s, 0); glVertex2f (x + w, y );
964	glEnd ();	1019	glEnd ();
965		1020
966	if (ix)	1021	if (ix)
		1022	{
		1023	glDisable (GL_ALPHA_TEST);
967	glDisable (GL_BLEND);	1024	glDisable (GL_BLEND);
		1025	}
968	}	1026	}
969		1027
970	MODULE = CFClient PACKAGE = CFClient::Map	1028	MODULE = CFClient PACKAGE = CFClient::Map
971		1029
972	CFClient::Map	1030	CFClient::Map
…		…
1036	tex->r = r;	1094	tex->r = r;
1037	tex->g = g;	1095	tex->g = g;
1038	tex->b = b;	1096	tex->b = b;
1039	tex->a = a;	1097	tex->a = a;
1040	}	1098	}
		1099
		1100	// somewhat hackish, but for textures that require it, it really
		1101	// improves the look, and most others don't suffer.
		1102	glBindTexture (GL_TEXTURE_2D, name);
		1103	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1104	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1105	// use uglier nearest interpolation because linear suffers
		1106	// from transparent color bleeding and ugly wrapping effects.
		1107	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1041	}	1108	}
1042		1109
1043	int	1110	int
1044	ox (CFClient::Map self)	1111	ox (CFClient::Map self)
1045	ALIAS:	1112	ALIAS:
1046	oy = 1	1113	oy = 1
		1114	x = 2
		1115	y = 3
		1116	w = 4
		1117	h = 5
1047	CODE:	1118	CODE:
1048	switch (ix)	1119	switch (ix)
1049	{	1120	{
1050	case 0: RETVAL = self->ox; break;	1121	case 0: RETVAL = self->ox; break;
1051	case 1: RETVAL = self->oy; break;	1122	case 1: RETVAL = self->oy; break;
		1123	case 2: RETVAL = self->x; break;
		1124	case 3: RETVAL = self->y; break;
		1125	case 4: RETVAL = self->w; break;
		1126	case 5: RETVAL = self->h; break;
1052	}	1127	}
1053	OUTPUT:	1128	OUTPUT:
1054	RETVAL	1129	RETVAL
1055		1130
1056	void	1131	void
…		…
1483	const_iv (GL_COLOR_MATERIAL),	1558	const_iv (GL_COLOR_MATERIAL),
1484	const_iv (GL_SMOOTH),	1559	const_iv (GL_SMOOTH),
1485	const_iv (GL_FLAT),	1560	const_iv (GL_FLAT),
1486	const_iv (GL_DITHER),	1561	const_iv (GL_DITHER),
1487	const_iv (GL_BLEND),	1562	const_iv (GL_BLEND),
		1563	const_iv (GL_CULL_FACE),
1488	const_iv (GL_SCISSOR_TEST),	1564	const_iv (GL_SCISSOR_TEST),
		1565	const_iv (GL_DEPTH_TEST),
		1566	const_iv (GL_ALPHA_TEST),
		1567	const_iv (GL_NORMALIZE),
		1568	const_iv (GL_RESCALE_NORMAL),
1489	const_iv (GL_AND),	1569	const_iv (GL_AND),
1490	const_iv (GL_ONE),	1570	const_iv (GL_ONE),
1491	const_iv (GL_ZERO),	1571	const_iv (GL_ZERO),
1492	const_iv (GL_SRC_ALPHA),	1572	const_iv (GL_SRC_ALPHA),
1493	const_iv (GL_SRC_ALPHA_SATURATE),	1573	const_iv (GL_DST_ALPHA),
1494	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1574	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1495	const_iv (GL_ONE_MINUS_DST_ALPHA),	1575	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1576	const_iv (GL_SRC_ALPHA_SATURATE),
1496	const_iv (GL_RGB),	1577	const_iv (GL_RGB),
1497	const_iv (GL_RGBA),	1578	const_iv (GL_RGBA),
1498	const_iv (GL_UNSIGNED_BYTE),	1579	const_iv (GL_UNSIGNED_BYTE),
		1580	const_iv (GL_UNSIGNED_SHORT),
		1581	const_iv (GL_UNSIGNED_INT),
1499	const_iv (GL_ALPHA),	1582	const_iv (GL_ALPHA),
		1583	const_iv (GL_INTENSITY),
1500	const_iv (GL_LUMINANCE),	1584	const_iv (GL_LUMINANCE),
		1585	const_iv (GL_LUMINANCE_ALPHA),
1501	const_iv (GL_FLOAT),	1586	const_iv (GL_FLOAT),
1502	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1587	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1503	const_iv (GL_COMPILE),	1588	const_iv (GL_COMPILE),
1504	const_iv (GL_TEXTURE_1D),	1589	const_iv (GL_TEXTURE_1D),
1505	const_iv (GL_TEXTURE_2D),	1590	const_iv (GL_TEXTURE_2D),
…		…
1507	const_iv (GL_TEXTURE_MAG_FILTER),	1592	const_iv (GL_TEXTURE_MAG_FILTER),
1508	const_iv (GL_TEXTURE_MIN_FILTER),	1593	const_iv (GL_TEXTURE_MIN_FILTER),
1509	const_iv (GL_TEXTURE_ENV_MODE),	1594	const_iv (GL_TEXTURE_ENV_MODE),
1510	const_iv (GL_TEXTURE_WRAP_S),	1595	const_iv (GL_TEXTURE_WRAP_S),
1511	const_iv (GL_TEXTURE_WRAP_T),	1596	const_iv (GL_TEXTURE_WRAP_T),
		1597	const_iv (GL_REPEAT),
1512	const_iv (GL_CLAMP),	1598	const_iv (GL_CLAMP),
1513	const_iv (GL_REPEAT),	1599	const_iv (GL_CLAMP_TO_EDGE),
1514	const_iv (GL_NEAREST),	1600	const_iv (GL_NEAREST),
1515	const_iv (GL_LINEAR),	1601	const_iv (GL_LINEAR),
1516	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1602	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1517	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1603	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1518	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1604	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1519	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1605	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1520	const_iv (GL_GENERATE_MIPMAP),	1606	const_iv (GL_GENERATE_MIPMAP),
1521	const_iv (GL_MODULATE),	1607	const_iv (GL_MODULATE),
1522	const_iv (GL_DECAL),	1608	const_iv (GL_DECAL),
1523	const_iv (GL_REPLACE),	1609	const_iv (GL_REPLACE),
		1610	const_iv (GL_DEPTH_BUFFER_BIT),
1524	const_iv (GL_COLOR_BUFFER_BIT),	1611	const_iv (GL_COLOR_BUFFER_BIT),
1525	const_iv (GL_PROJECTION),	1612	const_iv (GL_PROJECTION),
1526	const_iv (GL_MODELVIEW),	1613	const_iv (GL_MODELVIEW),
1527	const_iv (GL_COLOR_LOGIC_OP),	1614	const_iv (GL_COLOR_LOGIC_OP),
1528	const_iv (GL_SEPARABLE_2D),	1615	const_iv (GL_SEPARABLE_2D),
1529	const_iv (GL_CONVOLUTION_2D),	1616	const_iv (GL_CONVOLUTION_2D),
1530	const_iv (GL_CONVOLUTION_BORDER_MODE),	1617	const_iv (GL_CONVOLUTION_BORDER_MODE),
1531	const_iv (GL_CONSTANT_BORDER),	1618	const_iv (GL_CONSTANT_BORDER),
1532	const_iv (GL_LINES),	1619	const_iv (GL_LINES),
		1620	const_iv (GL_LINE_LOOP),
1533	const_iv (GL_QUADS),	1621	const_iv (GL_QUADS),
1534	const_iv (GL_LINE_LOOP),	1622	const_iv (GL_QUAD_STRIP),
		1623	const_iv (GL_TRIANGLES),
		1624	const_iv (GL_TRIANGLE_STRIP),
		1625	const_iv (GL_TRIANGLE_FAN),
1535	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1626	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1536	const_iv (GL_FASTEST),	1627	const_iv (GL_FASTEST),
		1628	const_iv (GL_V2F),
		1629	const_iv (GL_V3F),
		1630	const_iv (GL_T2F_V3F),
		1631	const_iv (GL_T2F_N3F_V3F),
1537	# undef const_iv	1632	# undef const_iv
1538	};	1633	};
1539		1634
1540	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1635	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1541	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1636	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1542	}	1637	}
1543		1638
		1639	char *
		1640	gl_vendor ()
		1641	CODE:
		1642	RETVAL = (char *)glGetString (GL_VENDOR);
		1643	OUTPUT:
		1644	RETVAL
		1645
		1646	char *
		1647	gl_version ()
		1648	CODE:
		1649	RETVAL = (char *)glGetString (GL_VERSION);
		1650	OUTPUT:
		1651	RETVAL
		1652
		1653	char *
		1654	gl_extensions ()
		1655	CODE:
		1656	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1657	OUTPUT:
		1658	RETVAL
		1659
1544	int glGetError ()	1660	int glGetError ()
1545		1661
1546	void glClear (int mask)	1662	void glClear (int mask)
1547		1663
1548	void glClearColor (float r, float g, float b, float a = 1.0)	1664	void glClearColor (float r, float g, float b, float a = 1.0)
…		…
1556		1672
1557	void glHint (int target, int mode)	1673	void glHint (int target, int mode)
1558		1674
1559	void glBlendFunc (int sfactor, int dfactor)	1675	void glBlendFunc (int sfactor, int dfactor)
1560		1676
		1677	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1678	CODE:
		1679	gl_BlendFuncSeparate (sa, da, saa, daa);
		1680
		1681	void glDepthMask (int flag)
		1682
1561	void glLogicOp (int opcode)	1683	void glLogicOp (int opcode)
1562		1684
1563	void glColorMask (int red, int green, int blue, int alpha)	1685	void glColorMask (int red, int green, int blue, int alpha)
1564		1686
1565	void glMatrixMode (int mode)	1687	void glMatrixMode (int mode)
…		…
1568		1690
1569	void glPopMatrix ()	1691	void glPopMatrix ()
1570		1692
1571	void glLoadIdentity ()	1693	void glLoadIdentity ()
1572		1694
1573	# near and far are due to microsofts buggy c compiler	1695	# near_ and far_ are due to microsofts buggy "c" compiler
		1696	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1697
		1698	# near_ and far_ are due to microsofts buggy "c" compiler
1574	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1699	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1575		1700
1576	void glViewport (int x, int y, int width, int height)	1701	void glViewport (int x, int y, int width, int height)
1577		1702
1578	void glScissor (int x, int y, int width, int height)	1703	void glScissor (int x, int y, int width, int height)
…		…
1593		1718
1594	void glEnd ()	1719	void glEnd ()
1595		1720
1596	void glColor (float r, float g, float b, float a = 1.0)	1721	void glColor (float r, float g, float b, float a = 1.0)
1597	PROTOTYPE: @	1722	PROTOTYPE: @
		1723	ALIAS:
		1724	glColor_premultiply = 1
1598	CODE:	1725	CODE:
		1726	if (ix)
		1727	{
		1728	r *= a;
		1729	g *= a;
		1730	b *= a;
		1731	}
		1732	// microsoft visual "c" rounds instead of truncating...
1599	glColor4ub (MIN ((int)(r * 255.f), 255),	1733	glColor4ub (MIN ((int)(r * 256.f), 255),
1600	MIN ((int)(g * 255.f), 255),	1734	MIN ((int)(g * 256.f), 255),
1601	MIN ((int)(b * 255.f), 255),	1735	MIN ((int)(b * 256.f), 255),
1602	MIN ((int)(a * 255.f), 255));	1736	MIN ((int)(a * 256.f), 255));
		1737
		1738	void glInterleavedArrays (int format, int stride, char *data)
		1739
		1740	void glDrawElements (int mode, int count, int type, char *indices)
		1741
		1742	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1743
		1744	void glRasterPos (float x, float y, float z = 0.)
		1745	CODE:
		1746	glRasterPos3f (0, 0, z);
		1747	glBitmap (0, 0, 0, 0, x, y, 0);
1603		1748
1604	void glVertex (float x, float y, float z = 0.)	1749	void glVertex (float x, float y, float z = 0.)
1605	CODE:	1750	CODE:
1606	glVertex3f (x, y, z);	1751	glVertex3f (x, y, z);
1607		1752
…		…
1619		1764
1620	void glBindTexture (int target, int name)	1765	void glBindTexture (int target, int name)
1621		1766
1622	void glConvolutionParameter (int target, int pname, float params)	1767	void glConvolutionParameter (int target, int pname, float params)
1623	CODE:	1768	CODE:
1624	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1769	if (gl.ConvolutionParameterf)
		1770	gl.ConvolutionParameterf (target, pname, params);
1625		1771
1626	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1772	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1627	CODE:	1773	CODE:
1628	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1774	if (gl.ConvolutionFilter2D)
1629	(target, internalformat, width, height, format, type, data));	1775	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1630		1776
1631	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1777	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1632	CODE:	1778	CODE:
1633	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1779	if (gl.SeparableFilter2D)
1634	(target, internalformat, width, height, format, type, row, column));	1780	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1635		1781
1636	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1782	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1637		1783
1638	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1784	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1639		1785
1640	void glRasterPos (int x, int y)	1786	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1641	CODE:
1642	glRasterPos2i (x, y);
1643		1787
1644	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1788	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1645		1789
1646	int glGenTexture ()	1790	int glGenTexture ()
1647	CODE:	1791	CODE:
…		…
1674		1818
1675	void glEndList ()	1819	void glEndList ()
1676		1820
1677	void glCallList (int list)	1821	void glCallList (int list)
1678		1822
		1823

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.83 by root, Mon May 15 00:25:14 2006 UTC vs. Revision 1.106 by root, Mon Jun 5 03:48:49 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.83 by root, Mon May 15 00:25:14 2006 UTC vs.
Revision 1.106 by root, Mon Jun 5 03:48:49 2006 UTC