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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.84 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.112 by root, Mon Jun 12 14:55:41 2006 UTC

…		…
10	#include "XSUB.h"	10	#include "XSUB.h"
11		11
12	#include <math.h>	12	#include <math.h>
13	#include <string.h>	13	#include <string.h>
14	#include <stdio.h>	14	#include <stdio.h>
		15	#include <stdlib.h>
15		16
16	#include <SDL.h>	17	#include <SDL.h>
17	#include <SDL_endian.h>	18	#include <SDL_endian.h>
18	#include <SDL_image.h>	19	#include <SDL_image.h>
19	#include <SDL_mixer.h>	20	#include <SDL_mixer.h>
…		…
48	#define MAP_EXTEND_X 32	49	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	50	#define MAP_EXTEND_Y 512
50		51
51	#define MIN_FONT_HEIGHT 10	52	#define MIN_FONT_HEIGHT 10
52		53
53	#define GL_CALL(type,func,args) \	54	static struct
54	{ \	55	{
55	static int init_; \	56	#define GL_FUNC(ptr,name) ptr name;
56	static type fptr_; \	57	#include "glfunc.h"
57	\	58	#undef GL_FUNC
58	if (!init_) \	59	} gl;
59	{ \	60
60	init_ = 1; \	61	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \	62	{
62	} \	63	if (gl.BlendFuncSeparate)
63	\	64	gl.BlendFuncSeparate (sa, da, saa, daa);
64	if (fptr_) \	65	else if (gl.BlendFuncSeparateEXT)
65	fptr_ args; \	66	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	}	67	else
		68	glBlendFunc (sa, da);
		69	}
67		70
68	typedef Mix_Chunk *CFClient__MixChunk;	71	typedef Mix_Chunk *CFClient__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	72	typedef Mix_Music *CFClient__MixMusic;
70		73
71	typedef PangoFontDescription *CFClient__Font;	74	typedef PangoFontDescription *CFClient__Font;
…		…
83	static PangoFontMap ft2_fontmap, cairo_fontmap;	86	static PangoFontMap ft2_fontmap, cairo_fontmap;
84		87
85	static void	88	static void
86	substitute_func (FcPattern *pattern, gpointer data)	89	substitute_func (FcPattern *pattern, gpointer data)
87	{	90	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	91	FcPatternAddBool (pattern, FC_HINTING, 1);
		92	#ifdef FC_HINT_STYLE
		93	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		94	#endif
89	#ifdef _WIN32	95	#ifdef _WIN32
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91	#else	97	#else
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif	99	#endif
…		…
416	}	422	}
417		423
418	void	424	void
419	pango_init ()	425	pango_init ()
420	CODE:	426	CODE:
421	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx	427	// delayed, so it can pick up new fonts added by AddFontResourceEx
		428	{
		429	{
423	ft2_fontmap = pango_ft2_font_map_new ();	430	ft2_fontmap = pango_ft2_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	431	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);	432	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426		433	}
		434	{
		435	cairo_font_options_t *fopt = cairo_font_options_create ();
427	cairo_fontmap = pango_cairo_font_map_get_default ();	436	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);	437	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
		438	#ifdef _WIN32
		439	// cairo looks like shit eaten twice on windows
		440	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
		441	#else
		442	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
		443	#endif
		444	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
		445	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
		446	pango_cairo_context_set_font_options (cairo_context, fopt);
		447	cairo_font_options_destroy (fopt);
		448	}
429	}	449	}
430		450
431	int	451	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	452	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
433		453
…		…
443	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	463	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	464	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	465	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	466	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		467
		468	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		469	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
		470
448	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	471	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
449	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	472	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
450	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	473	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	474	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
452		475
453	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	476	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		477
457	SDL_EnableUNICODE (1);	478	SDL_EnableUNICODE (1);
458	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	479	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
459		480
460	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	481	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
469		490
470	++m;	491	++m;
471	}	492	}
472	}	493	}
473		494
		495	char *
		496	SDL_GetError ()
		497
474	int	498	int
475	SDL_SetVideoMode (int w, int h, int fullscreen)	499	SDL_SetVideoMode (int w, int h, int fullscreen)
476	CODE:	500	CODE:
477	RETVAL = !!SDL_SetVideoMode (	501	RETVAL = !!SDL_SetVideoMode (
478	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	502	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
479	);	503	);
		504	if (RETVAL)
		505	{
480	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	506	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		507	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		508	# include "glfunc.h"
		509	# undef GL_FUNC
		510	}
481	OUTPUT:	511	OUTPUT:
482	RETVAL	512	RETVAL
483		513
484	void	514	void
485	SDL_GL_SwapBuffers ()	515	SDL_GL_SwapBuffers ()
		516
		517	char *
		518	SDL_GetKeyName (int sym)
486		519
487	void	520	void
488	SDL_PollEvent ()	521	SDL_PollEvent ()
489	PPCODE:	522	PPCODE:
490	{	523	{
…		…
509	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	542	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
510	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	543	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
511	break;	544	break;
512		545
513	case SDL_MOUSEMOTION:	546	case SDL_MOUSEMOTION:
		547	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		548
514	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	549	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
515	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	550	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
516	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	551	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
517	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	552	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
518	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	553	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
519	break;	554	break;
520		555
521	case SDL_MOUSEBUTTONDOWN:	556	case SDL_MOUSEBUTTONDOWN:
522	case SDL_MOUSEBUTTONUP:	557	case SDL_MOUSEBUTTONUP:
		558	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		559
523	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	560	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
524	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	561	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
525	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	562	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
526	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	563	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
527	break;	564	break;
…		…
553	lowdelay (int fd, int val = 1)	590	lowdelay (int fd, int val = 1)
554	CODE:	591	CODE:
555	#ifndef _WIN32	592	#ifndef _WIN32
556	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	593	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
557	#endif	594	#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		595
573	void	596	void
574	add_font (char *file)	597	add_font (char *file)
575	CODE:	598	CODE:
576	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	599	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
669	}	692	}
670		693
671	void	694	void
672	error (char *message)	695	error (char *message)
673	CODE:	696	CODE:
		697	fprintf (stderr, "ERROR: %s\n", message);
674	#ifdef _WIN32	698	#ifdef _WIN32
675	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	699	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
676	#else
677	fprintf (stderr, "ERROR: %s\n", message);
678	#endif	700	#endif
679		701
680	void	702	void
681	fatal (char *message)	703	fatal (char *message)
682	CODE:	704	CODE:
		705	fprintf (stderr, "FATAL: %s\n", message);
683	#ifdef _WIN32	706	#ifdef _WIN32
684	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	707	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
685	#else
686	fprintf (stderr, "FATAL: %s\n", message);
687	#endif	708	#endif
688	exit (1);	709	_exit (1);
		710
		711	void
		712	_exit (int retval)
		713	CODE:
		714	_exit (retval);
689		715
690	MODULE = CFClient PACKAGE = CFClient::Font	716	MODULE = CFClient PACKAGE = CFClient::Font
691		717
692	CFClient::Font	718	CFClient::Font
693	new_from_file (SV class, char path, int id = 0)	719	new_from_file (SV class, char path, int id = 0)
…		…
767		793
768	SV *	794	SV *
769	get_text (CFClient::Layout self)	795	get_text (CFClient::Layout self)
770	CODE:	796	CODE:
771	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	797	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
772	SvUTF8_on (RETVAL);	798	sv_utf8_decode (RETVAL);
773	OUTPUT:	799	OUTPUT:
774	RETVAL	800	RETVAL
775		801
776	void	802	void
777	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	803	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
…		…
903		929
904	while (p < e)	930	while (p < e)
905	{	931	{
906	uint32_t rgba = *p;	932	uint32_t rgba = *p;
907	rgba = (rgba >> 24) \| (rgba << 8);	933	rgba = (rgba >> 24) \| (rgba << 8);
		934	#if 0
		935	#ifdef _WIN32
		936	{//D
		937	uint8_t r = rgba >> 24;
		938	uint8_t g = rgba >> 16;
		939	uint8_t b = rgba >> 8;
		940	uint8_t a = rgba >> 0;
		941
		942	rgba = (rgba & 0xffffff00) \| a;
		943	}
		944	#endif
		945	#endif
908	rgba = SDL_SwapBE32 (rgba);	946	rgba = SDL_SwapBE32 (rgba);
909	*p++ = rgba;	947	*p++ = rgba;
910	}	948	}
911	}	949	}
912		950
…		…
957	{	995	{
958	HV hv = (HV )SvRV (self);	996	HV hv = (HV )SvRV (self);
959	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	997	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
960	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	998	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
961	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	999	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
962	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
963		1000
964	if (items < 5)	1001	if (items < 5)
965	{	1002	{
966	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1003	w = SvNV (*hv_fetch (hv, "w", 1, 1));
967	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1004	h = SvNV (*hv_fetch (hv, "h", 1, 1));
968	}	1005	}
969		1006
970	if (ix)	1007	if (ix)
971	{	1008	{
972	glEnable (GL_BLEND);	1009	glEnable (GL_BLEND);
		1010
		1011	if (ix == 2)
973	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1012	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1013	else
		1014	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1015	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1016
		1017	glEnable (GL_ALPHA_TEST);
		1018	glAlphaFunc (GL_GREATER, 0.01f);
974	}	1019	}
975		1020
976	glBindTexture (GL_TEXTURE_2D, name);	1021	glBindTexture (GL_TEXTURE_2D, name);
977
978	if (wrap_mode)
979	{
980	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
981	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
982	}
983		1022
984	glBegin (GL_QUADS);	1023	glBegin (GL_QUADS);
985	glTexCoord2f (0, 0); glVertex2f (x , y );	1024	glTexCoord2f (0, 0); glVertex2f (x , y );
986	glTexCoord2f (0, t); glVertex2f (x , y + h);	1025	glTexCoord2f (0, t); glVertex2f (x , y + h);
987	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1026	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
988	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1027	glTexCoord2f (s, 0); glVertex2f (x + w, y );
989	glEnd ();	1028	glEnd ();
990		1029
991	if (ix)	1030	if (ix)
		1031	{
		1032	glDisable (GL_ALPHA_TEST);
992	glDisable (GL_BLEND);	1033	glDisable (GL_BLEND);
		1034	}
993	}	1035	}
994		1036
995	MODULE = CFClient PACKAGE = CFClient::Map	1037	MODULE = CFClient PACKAGE = CFClient::Map
996		1038
997	CFClient::Map	1039	CFClient::Map
…		…
1017	DESTROY (CFClient::Map self)	1059	DESTROY (CFClient::Map self)
1018	CODE:	1060	CODE:
1019	{	1061	{
1020	map_clear (self);	1062	map_clear (self);
1021	Safefree (self->face);	1063	Safefree (self->face);
		1064	Safefree (self->tex);
1022	Safefree (self);	1065	Safefree (self);
1023	}	1066	}
1024		1067
1025	void	1068	void
1026	clear (CFClient::Map self)	1069	clear (CFClient::Map self)
…		…
1061	tex->r = r;	1104	tex->r = r;
1062	tex->g = g;	1105	tex->g = g;
1063	tex->b = b;	1106	tex->b = b;
1064	tex->a = a;	1107	tex->a = a;
1065	}	1108	}
		1109
		1110	// somewhat hackish, but for textures that require it, it really
		1111	// improves the look, and most others don't suffer.
		1112	glBindTexture (GL_TEXTURE_2D, name);
		1113	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1114	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1115	// use uglier nearest interpolation because linear suffers
		1116	// from transparent color bleeding and ugly wrapping effects.
		1117	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1066	}	1118	}
1067		1119
1068	int	1120	int
1069	ox (CFClient::Map self)	1121	ox (CFClient::Map self)
1070	ALIAS:	1122	ALIAS:
1071	oy = 1	1123	oy = 1
		1124	x = 2
		1125	y = 3
		1126	w = 4
		1127	h = 5
1072	CODE:	1128	CODE:
1073	switch (ix)	1129	switch (ix)
1074	{	1130	{
1075	case 0: RETVAL = self->ox; break;	1131	case 0: RETVAL = self->ox; break;
1076	case 1: RETVAL = self->oy; break;	1132	case 1: RETVAL = self->oy; break;
		1133	case 2: RETVAL = self->x; break;
		1134	case 3: RETVAL = self->y; break;
		1135	case 4: RETVAL = self->w; break;
		1136	case 5: RETVAL = self->h; break;
1077	}	1137	}
1078	OUTPUT:	1138	OUTPUT:
1079	RETVAL	1139	RETVAL
1080		1140
1081	void	1141	void
…		…
1508	const_iv (GL_COLOR_MATERIAL),	1568	const_iv (GL_COLOR_MATERIAL),
1509	const_iv (GL_SMOOTH),	1569	const_iv (GL_SMOOTH),
1510	const_iv (GL_FLAT),	1570	const_iv (GL_FLAT),
1511	const_iv (GL_DITHER),	1571	const_iv (GL_DITHER),
1512	const_iv (GL_BLEND),	1572	const_iv (GL_BLEND),
		1573	const_iv (GL_CULL_FACE),
1513	const_iv (GL_SCISSOR_TEST),	1574	const_iv (GL_SCISSOR_TEST),
		1575	const_iv (GL_DEPTH_TEST),
		1576	const_iv (GL_ALPHA_TEST),
		1577	const_iv (GL_NORMALIZE),
		1578	const_iv (GL_RESCALE_NORMAL),
1514	const_iv (GL_AND),	1579	const_iv (GL_AND),
1515	const_iv (GL_ONE),	1580	const_iv (GL_ONE),
1516	const_iv (GL_ZERO),	1581	const_iv (GL_ZERO),
1517	const_iv (GL_SRC_ALPHA),	1582	const_iv (GL_SRC_ALPHA),
1518	const_iv (GL_SRC_ALPHA_SATURATE),	1583	const_iv (GL_DST_ALPHA),
1519	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1584	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1520	const_iv (GL_ONE_MINUS_DST_ALPHA),	1585	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1586	const_iv (GL_SRC_ALPHA_SATURATE),
1521	const_iv (GL_RGB),	1587	const_iv (GL_RGB),
1522	const_iv (GL_RGBA),	1588	const_iv (GL_RGBA),
1523	const_iv (GL_UNSIGNED_BYTE),	1589	const_iv (GL_UNSIGNED_BYTE),
		1590	const_iv (GL_UNSIGNED_SHORT),
		1591	const_iv (GL_UNSIGNED_INT),
1524	const_iv (GL_ALPHA),	1592	const_iv (GL_ALPHA),
		1593	const_iv (GL_INTENSITY),
1525	const_iv (GL_LUMINANCE),	1594	const_iv (GL_LUMINANCE),
		1595	const_iv (GL_LUMINANCE_ALPHA),
1526	const_iv (GL_FLOAT),	1596	const_iv (GL_FLOAT),
1527	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1597	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1528	const_iv (GL_COMPILE),	1598	const_iv (GL_COMPILE),
1529	const_iv (GL_TEXTURE_1D),	1599	const_iv (GL_TEXTURE_1D),
1530	const_iv (GL_TEXTURE_2D),	1600	const_iv (GL_TEXTURE_2D),
…		…
1532	const_iv (GL_TEXTURE_MAG_FILTER),	1602	const_iv (GL_TEXTURE_MAG_FILTER),
1533	const_iv (GL_TEXTURE_MIN_FILTER),	1603	const_iv (GL_TEXTURE_MIN_FILTER),
1534	const_iv (GL_TEXTURE_ENV_MODE),	1604	const_iv (GL_TEXTURE_ENV_MODE),
1535	const_iv (GL_TEXTURE_WRAP_S),	1605	const_iv (GL_TEXTURE_WRAP_S),
1536	const_iv (GL_TEXTURE_WRAP_T),	1606	const_iv (GL_TEXTURE_WRAP_T),
		1607	const_iv (GL_REPEAT),
1537	const_iv (GL_CLAMP),	1608	const_iv (GL_CLAMP),
1538	const_iv (GL_REPEAT),	1609	const_iv (GL_CLAMP_TO_EDGE),
1539	const_iv (GL_NEAREST),	1610	const_iv (GL_NEAREST),
1540	const_iv (GL_LINEAR),	1611	const_iv (GL_LINEAR),
1541	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1612	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1542	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1613	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1543	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1614	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1544	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1615	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1545	const_iv (GL_GENERATE_MIPMAP),	1616	const_iv (GL_GENERATE_MIPMAP),
1546	const_iv (GL_MODULATE),	1617	const_iv (GL_MODULATE),
1547	const_iv (GL_DECAL),	1618	const_iv (GL_DECAL),
1548	const_iv (GL_REPLACE),	1619	const_iv (GL_REPLACE),
		1620	const_iv (GL_DEPTH_BUFFER_BIT),
1549	const_iv (GL_COLOR_BUFFER_BIT),	1621	const_iv (GL_COLOR_BUFFER_BIT),
1550	const_iv (GL_PROJECTION),	1622	const_iv (GL_PROJECTION),
1551	const_iv (GL_MODELVIEW),	1623	const_iv (GL_MODELVIEW),
1552	const_iv (GL_COLOR_LOGIC_OP),	1624	const_iv (GL_COLOR_LOGIC_OP),
1553	const_iv (GL_SEPARABLE_2D),	1625	const_iv (GL_SEPARABLE_2D),
1554	const_iv (GL_CONVOLUTION_2D),	1626	const_iv (GL_CONVOLUTION_2D),
1555	const_iv (GL_CONVOLUTION_BORDER_MODE),	1627	const_iv (GL_CONVOLUTION_BORDER_MODE),
1556	const_iv (GL_CONSTANT_BORDER),	1628	const_iv (GL_CONSTANT_BORDER),
1557	const_iv (GL_LINES),	1629	const_iv (GL_LINES),
		1630	const_iv (GL_LINE_LOOP),
1558	const_iv (GL_QUADS),	1631	const_iv (GL_QUADS),
1559	const_iv (GL_LINE_LOOP),	1632	const_iv (GL_QUAD_STRIP),
		1633	const_iv (GL_TRIANGLES),
		1634	const_iv (GL_TRIANGLE_STRIP),
		1635	const_iv (GL_TRIANGLE_FAN),
1560	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1636	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1561	const_iv (GL_FASTEST),	1637	const_iv (GL_FASTEST),
		1638	const_iv (GL_V2F),
		1639	const_iv (GL_V3F),
		1640	const_iv (GL_T2F_V3F),
		1641	const_iv (GL_T2F_N3F_V3F),
1562	# undef const_iv	1642	# undef const_iv
1563	};	1643	};
1564		1644
1565	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1645	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1566	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1646	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1567	}	1647	}
1568		1648
		1649	char *
		1650	gl_vendor ()
		1651	CODE:
		1652	RETVAL = (char *)glGetString (GL_VENDOR);
		1653	OUTPUT:
		1654	RETVAL
		1655
		1656	char *
		1657	gl_version ()
		1658	CODE:
		1659	RETVAL = (char *)glGetString (GL_VERSION);
		1660	OUTPUT:
		1661	RETVAL
		1662
		1663	char *
		1664	gl_extensions ()
		1665	CODE:
		1666	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1667	OUTPUT:
		1668	RETVAL
		1669
1569	int glGetError ()	1670	int glGetError ()
1570		1671
1571	void glClear (int mask)	1672	void glClear (int mask)
1572		1673
1573	void glClearColor (float r, float g, float b, float a = 1.0)	1674	void glClearColor (float r, float g, float b, float a = 1.0)
…		…
1581		1682
1582	void glHint (int target, int mode)	1683	void glHint (int target, int mode)
1583		1684
1584	void glBlendFunc (int sfactor, int dfactor)	1685	void glBlendFunc (int sfactor, int dfactor)
1585		1686
		1687	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1688	CODE:
		1689	gl_BlendFuncSeparate (sa, da, saa, daa);
		1690
		1691	void glDepthMask (int flag)
		1692
1586	void glLogicOp (int opcode)	1693	void glLogicOp (int opcode)
1587		1694
1588	void glColorMask (int red, int green, int blue, int alpha)	1695	void glColorMask (int red, int green, int blue, int alpha)
1589		1696
1590	void glMatrixMode (int mode)	1697	void glMatrixMode (int mode)
…		…
1593		1700
1594	void glPopMatrix ()	1701	void glPopMatrix ()
1595		1702
1596	void glLoadIdentity ()	1703	void glLoadIdentity ()
1597		1704
1598	# near and far are due to microsofts buggy c compiler	1705	# near_ and far_ are due to microsofts buggy "c" compiler
		1706	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1707
		1708	# near_ and far_ are due to microsofts buggy "c" compiler
1599	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1709	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1600		1710
1601	void glViewport (int x, int y, int width, int height)	1711	void glViewport (int x, int y, int width, int height)
1602		1712
1603	void glScissor (int x, int y, int width, int height)	1713	void glScissor (int x, int y, int width, int height)
…		…
1618		1728
1619	void glEnd ()	1729	void glEnd ()
1620		1730
1621	void glColor (float r, float g, float b, float a = 1.0)	1731	void glColor (float r, float g, float b, float a = 1.0)
1622	PROTOTYPE: @	1732	PROTOTYPE: @
		1733	ALIAS:
		1734	glColor_premultiply = 1
1623	CODE:	1735	CODE:
		1736	if (ix)
		1737	{
		1738	r *= a;
		1739	g *= a;
		1740	b *= a;
		1741	}
		1742	// microsoft visual "c" rounds instead of truncating...
1624	glColor4ub (MIN ((int)(r * 255.f), 255),	1743	glColor4ub (MIN ((int)(r * 256.f), 255),
1625	MIN ((int)(g * 255.f), 255),	1744	MIN ((int)(g * 256.f), 255),
1626	MIN ((int)(b * 255.f), 255),	1745	MIN ((int)(b * 256.f), 255),
1627	MIN ((int)(a * 255.f), 255));	1746	MIN ((int)(a * 256.f), 255));
		1747
		1748	void glInterleavedArrays (int format, int stride, char *data)
		1749
		1750	void glDrawElements (int mode, int count, int type, char *indices)
		1751
		1752	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1753
		1754	void glRasterPos (float x, float y, float z = 0.)
		1755	CODE:
		1756	glRasterPos3f (0, 0, z);
		1757	glBitmap (0, 0, 0, 0, x, y, 0);
1628		1758
1629	void glVertex (float x, float y, float z = 0.)	1759	void glVertex (float x, float y, float z = 0.)
1630	CODE:	1760	CODE:
1631	glVertex3f (x, y, z);	1761	glVertex3f (x, y, z);
1632		1762
…		…
1644		1774
1645	void glBindTexture (int target, int name)	1775	void glBindTexture (int target, int name)
1646		1776
1647	void glConvolutionParameter (int target, int pname, float params)	1777	void glConvolutionParameter (int target, int pname, float params)
1648	CODE:	1778	CODE:
1649	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1779	if (gl.ConvolutionParameterf)
		1780	gl.ConvolutionParameterf (target, pname, params);
1650		1781
1651	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1782	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1652	CODE:	1783	CODE:
1653	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1784	if (gl.ConvolutionFilter2D)
1654	(target, internalformat, width, height, format, type, data));	1785	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1655		1786
1656	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1787	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1657	CODE:	1788	CODE:
1658	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1789	if (gl.SeparableFilter2D)
1659	(target, internalformat, width, height, format, type, row, column));	1790	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1660		1791
1661	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1792	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1662		1793
1663	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1794	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1664		1795
1665	void glRasterPos (int x, int y)	1796	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1666	CODE:
1667	glRasterPos2i (x, y);
1668		1797
1669	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1798	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1670		1799
1671	int glGenTexture ()	1800	int glGenTexture ()
1672	CODE:	1801	CODE:
…		…
1699		1828
1700	void glEndList ()	1829	void glEndList ()
1701		1830
1702	void glCallList (int list)	1831	void glCallList (int list)
1703		1832
		1833

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.84 by root, Wed May 17 15:18:57 2006 UTC vs. Revision 1.112 by root, Mon Jun 12 14:55:41 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.84 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.112 by root, Mon Jun 12 14:55:41 2006 UTC