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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.82 by root, Mon May 15 00:15:08 2006 UTC vs.
Revision 1.111 by root, Mon Jun 12 13:26:14 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	#ifndef _WIN32	95	#ifdef _WIN32
		96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
		97	#else
90	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
91	#endif	99	#endif
92	}	100	}
93		101
94	static void	102	static void
…		…
414	}	422	}
415		423
416	void	424	void
417	pango_init ()	425	pango_init ()
418	CODE:	426	CODE:
419	{
420	// 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	{
421	ft2_fontmap = pango_ft2_font_map_new ();	430	ft2_fontmap = pango_ft2_font_map_new ();
422	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);
423	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	432	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
424		433	}
		434	{
		435	cairo_font_options_t *fopt = cairo_font_options_create ();
425	cairo_fontmap = pango_cairo_font_map_get_default ();	436	cairo_fontmap = pango_cairo_font_map_get_default ();
426	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	}
427	}	449	}
428		450
429	int	451	int
430	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	452	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
431		453
…		…
441	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	463	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
442	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	464	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
443	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	465	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
444	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	466	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
445		467
		468	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		469	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
		470
446	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	471	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
447	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	472	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
448	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	473	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
449	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	474	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
450		475
451	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	476	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
452	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
453	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
454		477
455	SDL_EnableUNICODE (1);	478	SDL_EnableUNICODE (1);
456	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	479	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
457		480
458	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	481	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
467		490
468	++m;	491	++m;
469	}	492	}
470	}	493	}
471		494
		495	char *
		496	SDL_GetError ()
		497
472	int	498	int
473	SDL_SetVideoMode (int w, int h, int fullscreen)	499	SDL_SetVideoMode (int w, int h, int fullscreen)
474	CODE:	500	CODE:
475	RETVAL = !!SDL_SetVideoMode (	501	RETVAL = !!SDL_SetVideoMode (
476	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	502	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
477	);	503	);
		504	if (RETVAL)
		505	{
478	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	}
479	OUTPUT:	511	OUTPUT:
480	RETVAL	512	RETVAL
481		513
482	void	514	void
483	SDL_GL_SwapBuffers ()	515	SDL_GL_SwapBuffers ()
		516
		517	char *
		518	SDL_GetKeyName (int sym)
484		519
485	void	520	void
486	SDL_PollEvent ()	521	SDL_PollEvent ()
487	PPCODE:	522	PPCODE:
488	{	523	{
…		…
507	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	542	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
508	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	543	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
509	break;	544	break;
510		545
511	case SDL_MOUSEMOTION:	546	case SDL_MOUSEMOTION:
		547	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		548
512	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	549	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
513	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	550	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
514	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	551	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
515	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	552	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
516	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	553	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
517	break;	554	break;
518		555
519	case SDL_MOUSEBUTTONDOWN:	556	case SDL_MOUSEBUTTONDOWN:
520	case SDL_MOUSEBUTTONUP:	557	case SDL_MOUSEBUTTONUP:
		558	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		559
521	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	560	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
522	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	561	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
523	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	562	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
524	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	563	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
525	break;	564	break;
…		…
551	lowdelay (int fd, int val = 1)	590	lowdelay (int fd, int val = 1)
552	CODE:	591	CODE:
553	#ifndef _WIN32	592	#ifndef _WIN32
554	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	593	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
555	#endif	594	#endif
556
557	char *
558	gl_version ()
559	CODE:
560	RETVAL = (char *)glGetString (GL_VERSION);
561	OUTPUT:
562	RETVAL
563
564	char *
565	gl_extensions ()
566	CODE:
567	RETVAL = (char *)glGetString (GL_EXTENSIONS);
568	OUTPUT:
569	RETVAL
570		595
571	void	596	void
572	add_font (char *file)	597	add_font (char *file)
573	CODE:	598	CODE:
574	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	599	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
667	}	692	}
668		693
669	void	694	void
670	error (char *message)	695	error (char *message)
671	CODE:	696	CODE:
		697	fprintf (stderr, "ERROR: %s\n", message);
672	#ifdef _WIN32	698	#ifdef _WIN32
673	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	699	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
674	#else
675	fprintf (stderr, "ERROR: %s\n", message);
676	#endif	700	#endif
677		701
678	void	702	void
679	fatal (char *message)	703	fatal (char *message)
680	CODE:	704	CODE:
		705	fprintf (stderr, "FATAL: %s\n", message);
681	#ifdef _WIN32	706	#ifdef _WIN32
682	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	707	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
683	#else
684	fprintf (stderr, "FATAL: %s\n", message);
685	#endif	708	#endif
686	exit (1);	709	_Exit (1);
		710
		711	void
		712	_exit (int retval)
		713	CODE:
		714	_Exit (retval);
687		715
688	MODULE = CFClient PACKAGE = CFClient::Font	716	MODULE = CFClient PACKAGE = CFClient::Font
689		717
690	CFClient::Font	718	CFClient::Font
691	new_from_file (SV class, char path, int id = 0)	719	new_from_file (SV class, char path, int id = 0)
…		…
765		793
766	SV *	794	SV *
767	get_text (CFClient::Layout self)	795	get_text (CFClient::Layout self)
768	CODE:	796	CODE:
769	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	797	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
770	SvUTF8_on (RETVAL);	798	sv_utf8_decode (RETVAL);
771	OUTPUT:	799	OUTPUT:
772	RETVAL	800	RETVAL
773		801
774	void	802	void
775	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.)
…		…
801	set_width (CFClient::Layout self, int max_width = -1)	829	set_width (CFClient::Layout self, int max_width = -1)
802	CODE:	830	CODE:
803	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	831	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
804		832
805	void	833	void
		834	set_indent (CFClient::Layout self, int indent)
		835	CODE:
		836	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		837
		838	void
		839	set_spacing (CFClient::Layout self, int spacing)
		840	CODE:
		841	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		842
		843	void
		844	set_ellipsise (CFClient::Layout self, int ellipsise)
		845	CODE:
		846	pango_layout_set_ellipsize (self->pl,
		847	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		848	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		849	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		850	: PANGO_ELLIPSIZE_NONE
		851	);
		852
		853	void
		854	set_single_paragraph_mode (CFClient::Layout self, int spm)
		855	CODE:
		856	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		857
		858	void
806	size (CFClient::Layout self)	859	size (CFClient::Layout self)
807	PPCODE:	860	PPCODE:
808	{	861	{
809	int w, h;	862	int w, h;
810		863
…		…
876		929
877	while (p < e)	930	while (p < e)
878	{	931	{
879	uint32_t rgba = *p;	932	uint32_t rgba = *p;
880	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
881	rgba = SDL_SwapBE32 (rgba);	946	rgba = SDL_SwapBE32 (rgba);
882	*p++ = rgba;	947	*p++ = rgba;
883	}	948	}
884	}	949	}
885		950
…		…
930	{	995	{
931	HV hv = (HV )SvRV (self);	996	HV hv = (HV )SvRV (self);
932	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	997	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
933	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	998	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
934	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	999	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
935	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
936		1000
937	if (items < 5)	1001	if (items < 5)
938	{	1002	{
939	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1003	w = SvNV (*hv_fetch (hv, "w", 1, 1));
940	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1004	h = SvNV (*hv_fetch (hv, "h", 1, 1));
941	}	1005	}
942		1006
943	if (ix)	1007	if (ix)
944	{	1008	{
945	glEnable (GL_BLEND);	1009	glEnable (GL_BLEND);
		1010
		1011	if (ix == 2)
946	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);
947	}	1019	}
948		1020
949	glBindTexture (GL_TEXTURE_2D, name);	1021	glBindTexture (GL_TEXTURE_2D, name);
950
951	if (wrap_mode)
952	{
953	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
954	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
955	}
956		1022
957	glBegin (GL_QUADS);	1023	glBegin (GL_QUADS);
958	glTexCoord2f (0, 0); glVertex2f (x , y );	1024	glTexCoord2f (0, 0); glVertex2f (x , y );
959	glTexCoord2f (0, t); glVertex2f (x , y + h);	1025	glTexCoord2f (0, t); glVertex2f (x , y + h);
960	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1026	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
961	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1027	glTexCoord2f (s, 0); glVertex2f (x + w, y );
962	glEnd ();	1028	glEnd ();
963		1029
964	if (ix)	1030	if (ix)
		1031	{
		1032	glDisable (GL_ALPHA_TEST);
965	glDisable (GL_BLEND);	1033	glDisable (GL_BLEND);
		1034	}
966	}	1035	}
967		1036
968	MODULE = CFClient PACKAGE = CFClient::Map	1037	MODULE = CFClient PACKAGE = CFClient::Map
969		1038
970	CFClient::Map	1039	CFClient::Map
…		…
990	DESTROY (CFClient::Map self)	1059	DESTROY (CFClient::Map self)
991	CODE:	1060	CODE:
992	{	1061	{
993	map_clear (self);	1062	map_clear (self);
994	Safefree (self->face);	1063	Safefree (self->face);
		1064	Safefree (self->tex);
995	Safefree (self);	1065	Safefree (self);
996	}	1066	}
997		1067
998	void	1068	void
999	clear (CFClient::Map self)	1069	clear (CFClient::Map self)
…		…
1034	tex->r = r;	1104	tex->r = r;
1035	tex->g = g;	1105	tex->g = g;
1036	tex->b = b;	1106	tex->b = b;
1037	tex->a = a;	1107	tex->a = a;
1038	}	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);
1039	}	1118	}
1040		1119
1041	int	1120	int
1042	ox (CFClient::Map self)	1121	ox (CFClient::Map self)
1043	ALIAS:	1122	ALIAS:
1044	oy = 1	1123	oy = 1
		1124	x = 2
		1125	y = 3
		1126	w = 4
		1127	h = 5
1045	CODE:	1128	CODE:
1046	switch (ix)	1129	switch (ix)
1047	{	1130	{
1048	case 0: RETVAL = self->ox; break;	1131	case 0: RETVAL = self->ox; break;
1049	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;
1050	}	1137	}
1051	OUTPUT:	1138	OUTPUT:
1052	RETVAL	1139	RETVAL
1053		1140
1054	void	1141	void
…		…
1481	const_iv (GL_COLOR_MATERIAL),	1568	const_iv (GL_COLOR_MATERIAL),
1482	const_iv (GL_SMOOTH),	1569	const_iv (GL_SMOOTH),
1483	const_iv (GL_FLAT),	1570	const_iv (GL_FLAT),
1484	const_iv (GL_DITHER),	1571	const_iv (GL_DITHER),
1485	const_iv (GL_BLEND),	1572	const_iv (GL_BLEND),
		1573	const_iv (GL_CULL_FACE),
1486	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),
1487	const_iv (GL_AND),	1579	const_iv (GL_AND),
1488	const_iv (GL_ONE),	1580	const_iv (GL_ONE),
1489	const_iv (GL_ZERO),	1581	const_iv (GL_ZERO),
1490	const_iv (GL_SRC_ALPHA),	1582	const_iv (GL_SRC_ALPHA),
1491	const_iv (GL_SRC_ALPHA_SATURATE),	1583	const_iv (GL_DST_ALPHA),
1492	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1584	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1493	const_iv (GL_ONE_MINUS_DST_ALPHA),	1585	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1586	const_iv (GL_SRC_ALPHA_SATURATE),
1494	const_iv (GL_RGB),	1587	const_iv (GL_RGB),
1495	const_iv (GL_RGBA),	1588	const_iv (GL_RGBA),
1496	const_iv (GL_UNSIGNED_BYTE),	1589	const_iv (GL_UNSIGNED_BYTE),
		1590	const_iv (GL_UNSIGNED_SHORT),
		1591	const_iv (GL_UNSIGNED_INT),
1497	const_iv (GL_ALPHA),	1592	const_iv (GL_ALPHA),
		1593	const_iv (GL_INTENSITY),
1498	const_iv (GL_LUMINANCE),	1594	const_iv (GL_LUMINANCE),
		1595	const_iv (GL_LUMINANCE_ALPHA),
1499	const_iv (GL_FLOAT),	1596	const_iv (GL_FLOAT),
1500	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1597	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1501	const_iv (GL_COMPILE),	1598	const_iv (GL_COMPILE),
1502	const_iv (GL_TEXTURE_1D),	1599	const_iv (GL_TEXTURE_1D),
1503	const_iv (GL_TEXTURE_2D),	1600	const_iv (GL_TEXTURE_2D),
…		…
1505	const_iv (GL_TEXTURE_MAG_FILTER),	1602	const_iv (GL_TEXTURE_MAG_FILTER),
1506	const_iv (GL_TEXTURE_MIN_FILTER),	1603	const_iv (GL_TEXTURE_MIN_FILTER),
1507	const_iv (GL_TEXTURE_ENV_MODE),	1604	const_iv (GL_TEXTURE_ENV_MODE),
1508	const_iv (GL_TEXTURE_WRAP_S),	1605	const_iv (GL_TEXTURE_WRAP_S),
1509	const_iv (GL_TEXTURE_WRAP_T),	1606	const_iv (GL_TEXTURE_WRAP_T),
		1607	const_iv (GL_REPEAT),
1510	const_iv (GL_CLAMP),	1608	const_iv (GL_CLAMP),
1511	const_iv (GL_REPEAT),	1609	const_iv (GL_CLAMP_TO_EDGE),
1512	const_iv (GL_NEAREST),	1610	const_iv (GL_NEAREST),
1513	const_iv (GL_LINEAR),	1611	const_iv (GL_LINEAR),
1514	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1612	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1515	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1613	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1516	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1614	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1517	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1615	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1518	const_iv (GL_GENERATE_MIPMAP),	1616	const_iv (GL_GENERATE_MIPMAP),
1519	const_iv (GL_MODULATE),	1617	const_iv (GL_MODULATE),
1520	const_iv (GL_DECAL),	1618	const_iv (GL_DECAL),
1521	const_iv (GL_REPLACE),	1619	const_iv (GL_REPLACE),
		1620	const_iv (GL_DEPTH_BUFFER_BIT),
1522	const_iv (GL_COLOR_BUFFER_BIT),	1621	const_iv (GL_COLOR_BUFFER_BIT),
1523	const_iv (GL_PROJECTION),	1622	const_iv (GL_PROJECTION),
1524	const_iv (GL_MODELVIEW),	1623	const_iv (GL_MODELVIEW),
1525	const_iv (GL_COLOR_LOGIC_OP),	1624	const_iv (GL_COLOR_LOGIC_OP),
1526	const_iv (GL_SEPARABLE_2D),	1625	const_iv (GL_SEPARABLE_2D),
1527	const_iv (GL_CONVOLUTION_2D),	1626	const_iv (GL_CONVOLUTION_2D),
1528	const_iv (GL_CONVOLUTION_BORDER_MODE),	1627	const_iv (GL_CONVOLUTION_BORDER_MODE),
1529	const_iv (GL_CONSTANT_BORDER),	1628	const_iv (GL_CONSTANT_BORDER),
1530	const_iv (GL_LINES),	1629	const_iv (GL_LINES),
		1630	const_iv (GL_LINE_LOOP),
1531	const_iv (GL_QUADS),	1631	const_iv (GL_QUADS),
1532	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),
1533	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1636	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1534	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),
1535	# undef const_iv	1642	# undef const_iv
1536	};	1643	};
1537		1644
1538	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; )
1539	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1646	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1540	}	1647	}
1541		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
1542	int glGetError ()	1670	int glGetError ()
1543		1671
1544	void glClear (int mask)	1672	void glClear (int mask)
1545		1673
1546	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)
…		…
1554		1682
1555	void glHint (int target, int mode)	1683	void glHint (int target, int mode)
1556		1684
1557	void glBlendFunc (int sfactor, int dfactor)	1685	void glBlendFunc (int sfactor, int dfactor)
1558		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
1559	void glLogicOp (int opcode)	1693	void glLogicOp (int opcode)
1560		1694
1561	void glColorMask (int red, int green, int blue, int alpha)	1695	void glColorMask (int red, int green, int blue, int alpha)
1562		1696
1563	void glMatrixMode (int mode)	1697	void glMatrixMode (int mode)
…		…
1566		1700
1567	void glPopMatrix ()	1701	void glPopMatrix ()
1568		1702
1569	void glLoadIdentity ()	1703	void glLoadIdentity ()
1570		1704
1571	# 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
1572	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_)
1573		1710
1574	void glViewport (int x, int y, int width, int height)	1711	void glViewport (int x, int y, int width, int height)
1575		1712
1576	void glScissor (int x, int y, int width, int height)	1713	void glScissor (int x, int y, int width, int height)
…		…
1591		1728
1592	void glEnd ()	1729	void glEnd ()
1593		1730
1594	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)
1595	PROTOTYPE: @	1732	PROTOTYPE: @
		1733	ALIAS:
		1734	glColor_premultiply = 1
1596	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...
1597	glColor4ub (MIN ((int)(r * 255.f), 255),	1743	glColor4ub (MIN ((int)(r * 256.f), 255),
1598	MIN ((int)(g * 255.f), 255),	1744	MIN ((int)(g * 256.f), 255),
1599	MIN ((int)(b * 255.f), 255),	1745	MIN ((int)(b * 256.f), 255),
1600	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);
1601		1758
1602	void glVertex (float x, float y, float z = 0.)	1759	void glVertex (float x, float y, float z = 0.)
1603	CODE:	1760	CODE:
1604	glVertex3f (x, y, z);	1761	glVertex3f (x, y, z);
1605		1762
…		…
1617		1774
1618	void glBindTexture (int target, int name)	1775	void glBindTexture (int target, int name)
1619		1776
1620	void glConvolutionParameter (int target, int pname, float params)	1777	void glConvolutionParameter (int target, int pname, float params)
1621	CODE:	1778	CODE:
1622	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1779	if (gl.ConvolutionParameterf)
		1780	gl.ConvolutionParameterf (target, pname, params);
1623		1781
1624	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)
1625	CODE:	1783	CODE:
1626	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1784	if (gl.ConvolutionFilter2D)
1627	(target, internalformat, width, height, format, type, data));	1785	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1628		1786
1629	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)
1630	CODE:	1788	CODE:
1631	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1789	if (gl.SeparableFilter2D)
1632	(target, internalformat, width, height, format, type, row, column));	1790	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1633		1791
1634	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)
1635		1793
1636	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)
1637		1795
1638	void glRasterPos (int x, int y)	1796	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1639	CODE:
1640	glRasterPos2i (x, y);
1641		1797
1642	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)
1643		1799
1644	int glGenTexture ()	1800	int glGenTexture ()
1645	CODE:	1801	CODE:
…		…
1672		1828
1673	void glEndList ()	1829	void glEndList ()
1674		1830
1675	void glCallList (int list)	1831	void glCallList (int list)
1676		1832
		1833

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.82 by root, Mon May 15 00:15:08 2006 UTC vs. Revision 1.111 by root, Mon Jun 12 13:26:14 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.82 by root, Mon May 15 00:15:08 2006 UTC vs.
Revision 1.111 by root, Mon Jun 12 13:26:14 2006 UTC