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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.79 by root, Sun May 14 22:24:14 2006 UTC vs.
Revision 1.111 by root, Mon Jun 12 13:26:14 2006 UTC

…		…
7		7
8	#include "EXTERN.h"	8	#include "EXTERN.h"
9	#include "perl.h"	9	#include "perl.h"
10	#include "XSUB.h"	10	#include "XSUB.h"
11		11
		12	#include <math.h>
12	#include <string.h>	13	#include <string.h>
13	#include <stdio.h>	14	#include <stdio.h>
		15	#include <stdlib.h>
14		16
15	#include <SDL.h>	17	#include <SDL.h>
16	#include <SDL_endian.h>	18	#include <SDL_endian.h>
17	#include <SDL_image.h>	19	#include <SDL_image.h>
18	#include <SDL_mixer.h>	20	#include <SDL_mixer.h>
…		…
47	#define MAP_EXTEND_X 32	49	#define MAP_EXTEND_X 32
48	#define MAP_EXTEND_Y 512	50	#define MAP_EXTEND_Y 512
49		51
50	#define MIN_FONT_HEIGHT 10	52	#define MIN_FONT_HEIGHT 10
51		53
52	#define GL_CALL(type,func,args) \	54	static struct
53	{ \	55	{
54	static int init_; \	56	#define GL_FUNC(ptr,name) ptr name;
55	static type fptr_; \	57	#include "glfunc.h"
56	\	58	#undef GL_FUNC
57	if (!init_) \	59	} gl;
58	{ \	60
59	init_ = 1; \	61	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
60	fptr_ = (type)SDL_GL_GetProcAddress (# func); \	62	{
61	} \	63	if (gl.BlendFuncSeparate)
62	\	64	gl.BlendFuncSeparate (sa, da, saa, daa);
63	if (fptr_) \	65	else if (gl.BlendFuncSeparateEXT)
64	fptr_ args; \	66	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
65	}	67	else
		68	glBlendFunc (sa, da);
		69	}
66		70
67	typedef Mix_Chunk *CFClient__MixChunk;	71	typedef Mix_Chunk *CFClient__MixChunk;
68	typedef Mix_Music *CFClient__MixMusic;	72	typedef Mix_Music *CFClient__MixMusic;
69		73
70	typedef PangoFontDescription *CFClient__Font;	74	typedef PangoFontDescription *CFClient__Font;
…		…
82	static PangoFontMap ft2_fontmap, cairo_fontmap;	86	static PangoFontMap ft2_fontmap, cairo_fontmap;
83		87
84	static void	88	static void
85	substitute_func (FcPattern *pattern, gpointer data)	89	substitute_func (FcPattern *pattern, gpointer data)
86	{	90	{
87	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
		95	#ifdef _WIN32
88	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
		97	#else
		98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
		99	#endif
89	}	100	}
90		101
91	static void	102	static void
92	layout_update_font (CFClient__Layout self)	103	layout_update_font (CFClient__Layout self)
93	{	104	{
…		…
411	}	422	}
412		423
413	void	424	void
414	pango_init ()	425	pango_init ()
415	CODE:	426	CODE:
416	{
417	// 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	{
418	ft2_fontmap = pango_ft2_font_map_new ();	430	ft2_fontmap = pango_ft2_font_map_new ();
419	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);
420	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	432	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
421		433	}
		434	{
		435	cairo_font_options_t *fopt = cairo_font_options_create ();
422	cairo_fontmap = pango_cairo_font_map_get_default ();	436	cairo_fontmap = pango_cairo_font_map_get_default ();
423	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	}
424	}	449	}
425		450
426	int	451	int
427	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	452	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
428		453
…		…
438	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	463	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
439	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	464	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
440	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	465	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
441	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	466	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
442		467
		468	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		469	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
		470
443	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	471	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
444	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	472	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
445	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	473	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
446	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	474	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
447		475
448	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	476	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
449	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
450	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
451		477
452	SDL_EnableUNICODE (1);	478	SDL_EnableUNICODE (1);
453	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	479	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
454		480
455	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	481	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
464		490
465	++m;	491	++m;
466	}	492	}
467	}	493	}
468		494
		495	char *
		496	SDL_GetError ()
		497
469	int	498	int
470	SDL_SetVideoMode (int w, int h, int fullscreen)	499	SDL_SetVideoMode (int w, int h, int fullscreen)
471	CODE:	500	CODE:
472	RETVAL = !!SDL_SetVideoMode (	501	RETVAL = !!SDL_SetVideoMode (
473	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	502	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
474	);	503	);
		504	if (RETVAL)
		505	{
475	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	}
476	OUTPUT:	511	OUTPUT:
477	RETVAL	512	RETVAL
478		513
479	void	514	void
480	SDL_GL_SwapBuffers ()	515	SDL_GL_SwapBuffers ()
		516
		517	char *
		518	SDL_GetKeyName (int sym)
481		519
482	void	520	void
483	SDL_PollEvent ()	521	SDL_PollEvent ()
484	PPCODE:	522	PPCODE:
485	{	523	{
…		…
504	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	542	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
505	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	543	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
506	break;	544	break;
507		545
508	case SDL_MOUSEMOTION:	546	case SDL_MOUSEMOTION:
		547	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		548
509	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	549	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
510	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	550	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
511	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	551	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
512	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	552	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
513	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	553	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
514	break;	554	break;
515		555
516	case SDL_MOUSEBUTTONDOWN:	556	case SDL_MOUSEBUTTONDOWN:
517	case SDL_MOUSEBUTTONUP:	557	case SDL_MOUSEBUTTONUP:
		558	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		559
518	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	560	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
519	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	561	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
520	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	562	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
521	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	563	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
522	break;	564	break;
…		…
548	lowdelay (int fd, int val = 1)	590	lowdelay (int fd, int val = 1)
549	CODE:	591	CODE:
550	#ifndef _WIN32	592	#ifndef _WIN32
551	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	593	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
552	#endif	594	#endif
553
554	char *
555	gl_version ()
556	CODE:
557	RETVAL = (char *)glGetString (GL_VERSION);
558	OUTPUT:
559	RETVAL
560
561	char *
562	gl_extensions ()
563	CODE:
564	RETVAL = (char *)glGetString (GL_EXTENSIONS);
565	OUTPUT:
566	RETVAL
567		595
568	void	596	void
569	add_font (char *file)	597	add_font (char *file)
570	CODE:	598	CODE:
571	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	599	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
664	}	692	}
665		693
666	void	694	void
667	error (char *message)	695	error (char *message)
668	CODE:	696	CODE:
		697	fprintf (stderr, "ERROR: %s\n", message);
669	#ifdef _WIN32	698	#ifdef _WIN32
670	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	699	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
671	#else
672	fprintf (stderr, "ERROR: %s\n", message);
673	#endif	700	#endif
674		701
675	void	702	void
676	fatal (char *message)	703	fatal (char *message)
677	CODE:	704	CODE:
		705	fprintf (stderr, "FATAL: %s\n", message);
678	#ifdef _WIN32	706	#ifdef _WIN32
679	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	707	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
680	#else
681	fprintf (stderr, "FATAL: %s\n", message);
682	#endif	708	#endif
683	exit (1);	709	_Exit (1);
		710
		711	void
		712	_exit (int retval)
		713	CODE:
		714	_Exit (retval);
684		715
685	MODULE = CFClient PACKAGE = CFClient::Font	716	MODULE = CFClient PACKAGE = CFClient::Font
686		717
687	CFClient::Font	718	CFClient::Font
688	new_from_file (SV class, char path, int id = 0)	719	new_from_file (SV class, char path, int id = 0)
…		…
762		793
763	SV *	794	SV *
764	get_text (CFClient::Layout self)	795	get_text (CFClient::Layout self)
765	CODE:	796	CODE:
766	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	797	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
767	SvUTF8_on (RETVAL);	798	sv_utf8_decode (RETVAL);
768	OUTPUT:	799	OUTPUT:
769	RETVAL	800	RETVAL
770		801
771	void	802	void
772	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.)
…		…
798	set_width (CFClient::Layout self, int max_width = -1)	829	set_width (CFClient::Layout self, int max_width = -1)
799	CODE:	830	CODE:
800	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);
801		832
802	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
803	size (CFClient::Layout self)	859	size (CFClient::Layout self)
804	PPCODE:	860	PPCODE:
805	{	861	{
806	int w, h;	862	int w, h;
807		863
…		…
873		929
874	while (p < e)	930	while (p < e)
875	{	931	{
876	uint32_t rgba = *p;	932	uint32_t rgba = *p;
877	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
878	rgba = SDL_SwapBE32 (rgba);	946	rgba = SDL_SwapBE32 (rgba);
879	*p++ = rgba;	947	*p++ = rgba;
880	}	948	}
881	}	949	}
882		950
…		…
927	{	995	{
928	HV hv = (HV )SvRV (self);	996	HV hv = (HV )SvRV (self);
929	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	997	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
930	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	998	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
931	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	999	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
932	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
933		1000
934	if (items < 5)	1001	if (items < 5)
935	{	1002	{
936	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1003	w = SvNV (*hv_fetch (hv, "w", 1, 1));
937	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1004	h = SvNV (*hv_fetch (hv, "h", 1, 1));
938	}	1005	}
939		1006
940	if (ix)	1007	if (ix)
941	{	1008	{
942	glEnable (GL_BLEND);	1009	glEnable (GL_BLEND);
		1010
		1011	if (ix == 2)
943	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);
944	}	1019	}
945		1020
946	glBindTexture (GL_TEXTURE_2D, name);	1021	glBindTexture (GL_TEXTURE_2D, name);
947
948	if (wrap_mode)
949	{
950	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
951	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
952	}
953		1022
954	glBegin (GL_QUADS);	1023	glBegin (GL_QUADS);
955	glTexCoord2f (0, 0); glVertex2f (x , y );	1024	glTexCoord2f (0, 0); glVertex2f (x , y );
956	glTexCoord2f (0, t); glVertex2f (x , y + h);	1025	glTexCoord2f (0, t); glVertex2f (x , y + h);
957	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1026	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
958	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1027	glTexCoord2f (s, 0); glVertex2f (x + w, y );
959	glEnd ();	1028	glEnd ();
960		1029
961	if (ix)	1030	if (ix)
		1031	{
		1032	glDisable (GL_ALPHA_TEST);
962	glDisable (GL_BLEND);	1033	glDisable (GL_BLEND);
		1034	}
963	}	1035	}
964		1036
965	MODULE = CFClient PACKAGE = CFClient::Map	1037	MODULE = CFClient PACKAGE = CFClient::Map
966		1038
967	CFClient::Map	1039	CFClient::Map
…		…
987	DESTROY (CFClient::Map self)	1059	DESTROY (CFClient::Map self)
988	CODE:	1060	CODE:
989	{	1061	{
990	map_clear (self);	1062	map_clear (self);
991	Safefree (self->face);	1063	Safefree (self->face);
		1064	Safefree (self->tex);
992	Safefree (self);	1065	Safefree (self);
993	}	1066	}
994		1067
995	void	1068	void
996	clear (CFClient::Map self)	1069	clear (CFClient::Map self)
…		…
1031	tex->r = r;	1104	tex->r = r;
1032	tex->g = g;	1105	tex->g = g;
1033	tex->b = b;	1106	tex->b = b;
1034	tex->a = a;	1107	tex->a = a;
1035	}	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);
1036	}	1118	}
1037		1119
1038	int	1120	int
1039	ox (CFClient::Map self)	1121	ox (CFClient::Map self)
1040	ALIAS:	1122	ALIAS:
1041	oy = 1	1123	oy = 1
		1124	x = 2
		1125	y = 3
		1126	w = 4
		1127	h = 5
1042	CODE:	1128	CODE:
1043	switch (ix)	1129	switch (ix)
1044	{	1130	{
1045	case 0: RETVAL = self->ox; break;	1131	case 0: RETVAL = self->ox; break;
1046	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;
1047	}	1137	}
1048	OUTPUT:	1138	OUTPUT:
1049	RETVAL	1139	RETVAL
1050		1140
1051	void	1141	void
…		…
1478	const_iv (GL_COLOR_MATERIAL),	1568	const_iv (GL_COLOR_MATERIAL),
1479	const_iv (GL_SMOOTH),	1569	const_iv (GL_SMOOTH),
1480	const_iv (GL_FLAT),	1570	const_iv (GL_FLAT),
1481	const_iv (GL_DITHER),	1571	const_iv (GL_DITHER),
1482	const_iv (GL_BLEND),	1572	const_iv (GL_BLEND),
		1573	const_iv (GL_CULL_FACE),
1483	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),
1484	const_iv (GL_AND),	1579	const_iv (GL_AND),
1485	const_iv (GL_ONE),	1580	const_iv (GL_ONE),
1486	const_iv (GL_ZERO),	1581	const_iv (GL_ZERO),
1487	const_iv (GL_SRC_ALPHA),	1582	const_iv (GL_SRC_ALPHA),
1488	const_iv (GL_SRC_ALPHA_SATURATE),	1583	const_iv (GL_DST_ALPHA),
1489	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1584	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1490	const_iv (GL_ONE_MINUS_DST_ALPHA),	1585	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1586	const_iv (GL_SRC_ALPHA_SATURATE),
1491	const_iv (GL_RGB),	1587	const_iv (GL_RGB),
1492	const_iv (GL_RGBA),	1588	const_iv (GL_RGBA),
1493	const_iv (GL_UNSIGNED_BYTE),	1589	const_iv (GL_UNSIGNED_BYTE),
		1590	const_iv (GL_UNSIGNED_SHORT),
		1591	const_iv (GL_UNSIGNED_INT),
1494	const_iv (GL_ALPHA),	1592	const_iv (GL_ALPHA),
		1593	const_iv (GL_INTENSITY),
1495	const_iv (GL_LUMINANCE),	1594	const_iv (GL_LUMINANCE),
		1595	const_iv (GL_LUMINANCE_ALPHA),
1496	const_iv (GL_FLOAT),	1596	const_iv (GL_FLOAT),
1497	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1597	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1498	const_iv (GL_COMPILE),	1598	const_iv (GL_COMPILE),
1499	const_iv (GL_TEXTURE_1D),	1599	const_iv (GL_TEXTURE_1D),
1500	const_iv (GL_TEXTURE_2D),	1600	const_iv (GL_TEXTURE_2D),
…		…
1502	const_iv (GL_TEXTURE_MAG_FILTER),	1602	const_iv (GL_TEXTURE_MAG_FILTER),
1503	const_iv (GL_TEXTURE_MIN_FILTER),	1603	const_iv (GL_TEXTURE_MIN_FILTER),
1504	const_iv (GL_TEXTURE_ENV_MODE),	1604	const_iv (GL_TEXTURE_ENV_MODE),
1505	const_iv (GL_TEXTURE_WRAP_S),	1605	const_iv (GL_TEXTURE_WRAP_S),
1506	const_iv (GL_TEXTURE_WRAP_T),	1606	const_iv (GL_TEXTURE_WRAP_T),
		1607	const_iv (GL_REPEAT),
1507	const_iv (GL_CLAMP),	1608	const_iv (GL_CLAMP),
1508	const_iv (GL_REPEAT),	1609	const_iv (GL_CLAMP_TO_EDGE),
1509	const_iv (GL_NEAREST),	1610	const_iv (GL_NEAREST),
1510	const_iv (GL_LINEAR),	1611	const_iv (GL_LINEAR),
1511	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1612	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1512	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1613	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1513	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1614	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1514	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1615	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1515	const_iv (GL_GENERATE_MIPMAP),	1616	const_iv (GL_GENERATE_MIPMAP),
1516	const_iv (GL_MODULATE),	1617	const_iv (GL_MODULATE),
1517	const_iv (GL_DECAL),	1618	const_iv (GL_DECAL),
1518	const_iv (GL_REPLACE),	1619	const_iv (GL_REPLACE),
		1620	const_iv (GL_DEPTH_BUFFER_BIT),
1519	const_iv (GL_COLOR_BUFFER_BIT),	1621	const_iv (GL_COLOR_BUFFER_BIT),
1520	const_iv (GL_PROJECTION),	1622	const_iv (GL_PROJECTION),
1521	const_iv (GL_MODELVIEW),	1623	const_iv (GL_MODELVIEW),
1522	const_iv (GL_COLOR_LOGIC_OP),	1624	const_iv (GL_COLOR_LOGIC_OP),
1523	const_iv (GL_SEPARABLE_2D),	1625	const_iv (GL_SEPARABLE_2D),
1524	const_iv (GL_CONVOLUTION_2D),	1626	const_iv (GL_CONVOLUTION_2D),
1525	const_iv (GL_CONVOLUTION_BORDER_MODE),	1627	const_iv (GL_CONVOLUTION_BORDER_MODE),
1526	const_iv (GL_CONSTANT_BORDER),	1628	const_iv (GL_CONSTANT_BORDER),
1527	const_iv (GL_LINES),	1629	const_iv (GL_LINES),
		1630	const_iv (GL_LINE_LOOP),
1528	const_iv (GL_QUADS),	1631	const_iv (GL_QUADS),
1529	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),
1530	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1636	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1531	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),
1532	# undef const_iv	1642	# undef const_iv
1533	};	1643	};
1534		1644
1535	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; )
1536	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1646	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1537	}	1647	}
1538		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
1539	int glGetError ()	1670	int glGetError ()
1540		1671
1541	void glClear (int mask)	1672	void glClear (int mask)
1542		1673
1543	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)
…		…
1551		1682
1552	void glHint (int target, int mode)	1683	void glHint (int target, int mode)
1553		1684
1554	void glBlendFunc (int sfactor, int dfactor)	1685	void glBlendFunc (int sfactor, int dfactor)
1555		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
1556	void glLogicOp (int opcode)	1693	void glLogicOp (int opcode)
1557		1694
1558	void glColorMask (int red, int green, int blue, int alpha)	1695	void glColorMask (int red, int green, int blue, int alpha)
1559		1696
1560	void glMatrixMode (int mode)	1697	void glMatrixMode (int mode)
…		…
1563		1700
1564	void glPopMatrix ()	1701	void glPopMatrix ()
1565		1702
1566	void glLoadIdentity ()	1703	void glLoadIdentity ()
1567		1704
1568	# 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
1569	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_)
1570		1710
1571	void glViewport (int x, int y, int width, int height)	1711	void glViewport (int x, int y, int width, int height)
1572		1712
1573	void glScissor (int x, int y, int width, int height)	1713	void glScissor (int x, int y, int width, int height)
…		…
1588		1728
1589	void glEnd ()	1729	void glEnd ()
1590		1730
1591	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)
1592	PROTOTYPE: @	1732	PROTOTYPE: @
		1733	ALIAS:
		1734	glColor_premultiply = 1
1593	CODE:	1735	CODE:
1594	// 255.999 is close enough to correctness (256 and clamp)	1736	if (ix)
1595	glColor4ub (r * 255.999, g * 255.999, b * 255.999, a * 255.999);	1737	{
		1738	r *= a;
		1739	g *= a;
		1740	b *= a;
		1741	}
		1742	// microsoft visual "c" rounds instead of truncating...
		1743	glColor4ub (MIN ((int)(r * 256.f), 255),
		1744	MIN ((int)(g * 256.f), 255),
		1745	MIN ((int)(b * 256.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);
1596		1758
1597	void glVertex (float x, float y, float z = 0.)	1759	void glVertex (float x, float y, float z = 0.)
1598	CODE:	1760	CODE:
1599	glVertex3f (x, y, z);	1761	glVertex3f (x, y, z);
1600		1762
…		…
1612		1774
1613	void glBindTexture (int target, int name)	1775	void glBindTexture (int target, int name)
1614		1776
1615	void glConvolutionParameter (int target, int pname, float params)	1777	void glConvolutionParameter (int target, int pname, float params)
1616	CODE:	1778	CODE:
1617	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1779	if (gl.ConvolutionParameterf)
		1780	gl.ConvolutionParameterf (target, pname, params);
1618		1781
1619	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)
1620	CODE:	1783	CODE:
1621	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1784	if (gl.ConvolutionFilter2D)
1622	(target, internalformat, width, height, format, type, data));	1785	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1623		1786
1624	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)
1625	CODE:	1788	CODE:
1626	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1789	if (gl.SeparableFilter2D)
1627	(target, internalformat, width, height, format, type, row, column));	1790	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1628		1791
1629	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)
1630		1793
1631	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)
1632		1795
1633	void glRasterPos (int x, int y)	1796	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1634	CODE:
1635	glRasterPos2i (x, y);
1636		1797
1637	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)
1638		1799
1639	int glGenTexture ()	1800	int glGenTexture ()
1640	CODE:	1801	CODE:
…		…
1667		1828
1668	void glEndList ()	1829	void glEndList ()
1669		1830
1670	void glCallList (int list)	1831	void glCallList (int list)
1671		1832
		1833

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.79 by root, Sun May 14 22:24:14 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.79 by root, Sun May 14 22:24:14 2006 UTC vs.
Revision 1.111 by root, Mon Jun 12 13:26:14 2006 UTC