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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.72 by root, Fri May 5 19:10:16 2006 UTC vs.
Revision 1.87 by root, Fri May 19 18:39:06 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2	# include <malloc.h>	3	# include <malloc.h>
		4	# include <windows.h>
		5	# pragma warning(disable:4244)
3	#endif	6	#endif
4		7
5	#include "EXTERN.h"	8	#include "EXTERN.h"
6	#include "perl.h"	9	#include "perl.h"
7	#include "XSUB.h"	10	#include "XSUB.h"
8		11
		12	#include <math.h>
9	#include <string.h>	13	#include <string.h>
10	#include <stdio.h>	14	#include <stdio.h>
11		15
12	#include <SDL.h>	16	#include <SDL.h>
		17	#include <SDL_endian.h>
13	#include <SDL_image.h>	18	#include <SDL_image.h>
14	#include <SDL_mixer.h>	19	#include <SDL_mixer.h>
15	#include <SDL_opengl.h>	20	#include <SDL_opengl.h>
16		21
17	#include <glib/gmacros.h>	22	#include <glib/gmacros.h>
18		23
19	#include <pango/pango.h>	24	#include <pango/pango.h>
20	#include <pango/pangofc-fontmap.h>	25	#include <pango/pangofc-fontmap.h>
21	#include <pango/pangoft2.h>	26	#include <pango/pangoft2.h>
		27	#include <pango/pangocairo.h>
22		28
23	#ifndef _WIN32	29	#ifndef _WIN32
24	# include <sys/types.h>	30	# include <sys/types.h>
25	# include <sys/socket.h>	31	# include <sys/socket.h>
26	# include <netinet/in.h>	32	# include <netinet/in.h>
63	typedef Mix_Music *CFClient__MixMusic;	69	typedef Mix_Music *CFClient__MixMusic;
64		70
65	typedef PangoFontDescription *CFClient__Font;	71	typedef PangoFontDescription *CFClient__Font;
66		72
67	typedef struct cf_layout {	73	typedef struct cf_layout {
68	PangoLayout *pl;	74	PangoLayout *pl; // either derived from a cairo or ft2 context
		75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
		76	float r, g, b, a; // default color for rgba mode
69	int base_height;	77	int base_height;
70	CFClient__Font font;	78	CFClient__Font font;
71	} *CFClient__Layout;	79	} *CFClient__Layout;
72		80
73	static CFClient__Font default_font;	81	static CFClient__Font default_font;
74	static PangoContext *context;	82	static PangoContext ft2_context, cairo_context;
75	static PangoFontMap *fontmap;	83	static PangoFontMap ft2_fontmap, cairo_fontmap;
76		84
77	static void	85	static void
78	substitute_func (FcPattern *pattern, gpointer data)	86	substitute_func (FcPattern *pattern, gpointer data)
79	{	87	{
80	FcPatternAddBool (pattern, FC_HINTING , 1);	88	FcPatternAddBool (pattern, FC_HINTING , 1);
		89	#ifdef _WIN32
		90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
		91	#else
81	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
		93	#endif
82	}	94	}
83		95
84	static void	96	static void
85	layout_update_font (CFClient__Layout self)	97	layout_update_font (CFClient__Layout self)
86	{	98	{
…		…
98	static void	110	static void
99	layout_get_pixel_size (CFClient__Layout self, int w, int h)	111	layout_get_pixel_size (CFClient__Layout self, int w, int h)
100	{	112	{
101	pango_layout_get_pixel_size (self->pl, w, h);	113	pango_layout_get_pixel_size (self->pl, w, h);
102		114
103	w = (w + 3) & ~3;
104	if (!w) w = 1;	115	if (!w) w = 1;
105	if (!h) h = 1;	116	if (!h) h = 1;
		117
		118	w = (w + 3) & ~3;
106	}	119	}
107		120
108	typedef uint16_t mapface;	121	typedef uint16_t mapface;
109		122
110	typedef struct {	123	typedef struct {
…		…
258	}	271	}
259	}	272	}
260	}	273	}
261		274
262	static void	275	static void
263	music_finished ()	276	music_finished (void)
264	{	277	{
265	SDL_UserEvent ev;	278	SDL_UserEvent ev;
266		279
267	ev.type = SDL_USEREVENT;	280	ev.type = SDL_USEREVENT;
268	ev.code = 0;	281	ev.code = 0;
…		…
277	{	290	{
278	SDL_UserEvent ev;	291	SDL_UserEvent ev;
279		292
280	ev.type = SDL_USEREVENT;	293	ev.type = SDL_USEREVENT;
281	ev.code = 1;	294	ev.code = 1;
282	ev.data1 = (void *)channel;	295	ev.data1 = (void *)(long)channel;
283	ev.data2 = 0;	296	ev.data2 = 0;
284		297
285	SDL_PushEvent ((SDL_Event *)&ev);	298	SDL_PushEvent ((SDL_Event *)&ev);
286	}	299	}
287		300
…		…
398	# undef const_iv	411	# undef const_iv
399	};	412	};
400		413
401	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
402	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		416	}
403		417
		418	void
		419	pango_init ()
		420	CODE:
		421	{
		422	// delayed, so it can pick up new fonts added by AddFontResourceEx
404	fontmap = pango_ft2_font_map_new ();	423	ft2_fontmap = pango_ft2_font_map_new ();
405	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);	424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
406	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);	425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
		426
		427	cairo_fontmap = pango_cairo_font_map_get_default ();
		428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
407	}	429	}
408		430
409	int	431	int
410	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
411		433
…		…
419	SDL_Rect **m;	441	SDL_Rect **m;
420		442
421	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	443	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
422	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
423	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
424	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 16);
		447
		448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 64);
		449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
425		450
426	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
427	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
428	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
429	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
430		455
431	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
432	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
433	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
434		457
435	SDL_EnableUNICODE (1);	458	SDL_EnableUNICODE (1);
436	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
437		460
438	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	461	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
514	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	537	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
515	}	538	}
516	}	539	}
517		540
518	int	541	int
519	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	542	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
520	POSTCALL:	543	POSTCALL:
521	Mix_HookMusicFinished (music_finished);	544	Mix_HookMusicFinished (music_finished);
522	Mix_ChannelFinished (channel_finished);	545	Mix_ChannelFinished (channel_finished);
523		546
524	void	547	void
…		…
550		573
551	void	574	void
552	add_font (char *file)	575	add_font (char *file)
553	CODE:	576	CODE:
554	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	577	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
		578	#ifdef _WIN32
		579	// cairo... sigh... requires win2000
		580	AddFontResourceEx (file, FR_PRIVATE, 0);
		581	#endif
555		582
556	void	583	void
557	load_image_inline (SV *image_)	584	load_image_inline (SV *image_)
558	ALIAS:	585	ALIAS:
559	load_image_file = 1	586	load_image_file = 1
…		…
643	}	670	}
644		671
645	void	672	void
646	error (char *message)	673	error (char *message)
647	CODE:	674	CODE:
		675	fprintf (stderr, "ERROR: %s\n", message);
648	#ifdef _WIN32	676	#ifdef _WIN32
649	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	677	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
650	#else
651	fprintf (stderr, "ERROR: %s\n", message);
652	#endif	678	#endif
653		679
654	void	680	void
655	fatal (char *message)	681	fatal (char *message)
656	CODE:	682	CODE:
		683	fprintf (stderr, "FATAL: %s\n", message);
657	#ifdef _WIN32	684	#ifdef _WIN32
658	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	685	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
659	#else
660	fprintf (stderr, "FATAL: %s\n", message);
661	#endif	686	#endif
662	exit (1);	687	exit (1);
663		688
664	MODULE = CFClient PACKAGE = CFClient::Font	689	MODULE = CFClient PACKAGE = CFClient::Font
665		690
…		…
686	default_font = self;	711	default_font = self;
687		712
688	MODULE = CFClient PACKAGE = CFClient::Layout	713	MODULE = CFClient PACKAGE = CFClient::Layout
689		714
690	CFClient::Layout	715	CFClient::Layout
691	new (SV *class, int base_height = MIN_FONT_HEIGHT)	716	new (SV *class, int rgba = 0)
692	CODE:	717	CODE:
		718	#if _WIN32
		719	rgba = 0;//D
		720	#endif
693	New (0, RETVAL, 1, struct cf_layout);	721	New (0, RETVAL, 1, struct cf_layout);
694	RETVAL->pl = pango_layout_new (context);	722
695	RETVAL->base_height = base_height;	723	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
		724	RETVAL->rgba = rgba;
		725	RETVAL->r = 1.;
		726	RETVAL->g = 1.;
		727	RETVAL->b = 1.;
		728	RETVAL->a = 1.;
		729	RETVAL->base_height = MIN_FONT_HEIGHT;
696	RETVAL->font = 0;	730	RETVAL->font = 0;
		731
697	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	732	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
698	pango_layout_set_font_description (RETVAL->pl, default_font);	733	layout_update_font (RETVAL);
699	OUTPUT:	734	OUTPUT:
700	RETVAL	735	RETVAL
701		736
702	void	737	void
703	DESTROY (CFClient::Layout self)	738	DESTROY (CFClient::Layout self)
704	CODE:	739	CODE:
705	g_object_unref (self->pl);	740	g_object_unref (self->pl);
706	Safefree (self);	741	Safefree (self);
707		742
		743	int
		744	is_rgba (CFClient::Layout self)
		745	CODE:
		746	RETVAL = self->rgba;
		747	OUTPUT:
		748	RETVAL
		749
708	void	750	void
709	set_text (CFClient::Layout self, SV *text_)	751	set_text (CFClient::Layout self, SV *text_)
710	CODE:	752	CODE:
711	{	753	{
712	STRLEN textlen;	754	STRLEN textlen;
…		…
730	CODE:	772	CODE:
731	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	773	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
732	SvUTF8_on (RETVAL);	774	SvUTF8_on (RETVAL);
733	OUTPUT:	775	OUTPUT:
734	RETVAL	776	RETVAL
		777
		778	void
		779	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
		780	CODE:
		781	self->r = r;
		782	self->g = g;
		783	self->b = b;
		784	self->a = a;
735		785
736	void	786	void
737	set_font (CFClient::Layout self, CFClient::Font font = 0)	787	set_font (CFClient::Layout self, CFClient::Font font = 0)
738	CODE:	788	CODE:
739	if (self->font != font)	789	if (self->font != font)
…		…
755	set_width (CFClient::Layout self, int max_width = -1)	805	set_width (CFClient::Layout self, int max_width = -1)
756	CODE:	806	CODE:
757	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	807	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
758		808
759	void	809	void
		810	set_indent (CFClient::Layout self, int indent)
		811	CODE:
		812	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		813
		814	void
		815	set_spacing (CFClient::Layout self, int spacing)
		816	CODE:
		817	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		818
		819	void
		820	set_ellipsise (CFClient::Layout self, int ellipsise)
		821	CODE:
		822	pango_layout_set_ellipsize (self->pl,
		823	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		824	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		825	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		826	: PANGO_ELLIPSIZE_NONE
		827	);
		828
		829	void
		830	set_single_paragraph_mode (CFClient::Layout self, int spm)
		831	CODE:
		832	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		833
		834	void
760	size (CFClient::Layout self)	835	size (CFClient::Layout self)
761	PPCODE:	836	PPCODE:
762	{	837	{
763	int w, h;	838	int w, h;
764		839
…		…
797	render (CFClient::Layout self)	872	render (CFClient::Layout self)
798	PPCODE:	873	PPCODE:
799	{	874	{
800	SV *retval;	875	SV *retval;
801	int w, h;	876	int w, h;
802	FT_Bitmap bitmap;
803		877
804	layout_get_pixel_size (self, &w, &h);	878	layout_get_pixel_size (self, &w, &h);
805		879
		880	if (self->rgba)
		881	{
		882	cairo_surface_t *surface;
		883	cairo_t *cairo;
		884
		885	retval = newSV (w * h * 4);
		886	SvPOK_only (retval);
		887	SvCUR_set (retval, w * h * 4);
		888
		889	memset (SvPVX (retval), 0, w * h * 4);
		890
		891	surface = cairo_image_surface_create_for_data (
		892	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		893	cairo = cairo_create (surface);
		894	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		895
		896	pango_cairo_show_layout (cairo, self->pl);
		897
		898	cairo_destroy (cairo);
		899	cairo_surface_destroy (surface);
		900
		901	// what a mess, and its premultiplied, too :(
		902	{
		903	uint32_t p = (uint32_t )SvPVX (retval);
		904	uint32_t e = p + w h;
		905
		906	while (p < e)
		907	{
		908	uint32_t rgba = *p;
		909	rgba = (rgba >> 24) \| (rgba << 8);
		910	#if 0
		911	#ifdef _WIN32
		912	{//D
		913	uint8_t r = rgba >> 24;
		914	uint8_t g = rgba >> 16;
		915	uint8_t b = rgba >> 8;
		916	uint8_t a = rgba >> 0;
		917
		918	rgba = (rgba & 0xffffff00) \| a;
		919	}
		920	#endif
		921	#endif
		922	rgba = SDL_SwapBE32 (rgba);
		923	*p++ = rgba;
		924	}
		925	}
		926
		927	EXTEND (SP, 5);
		928	PUSHs (sv_2mortal (newSViv (w)));
		929	PUSHs (sv_2mortal (newSViv (h)));
		930	PUSHs (sv_2mortal (retval));
		931	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		932	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		933	}
		934	else
		935	{
		936	FT_Bitmap bitmap;
		937
806	retval = newSV (w * h);	938	retval = newSV (w * h);
807	SvPOK_only (retval);	939	SvPOK_only (retval);
808	SvCUR_set (retval, w * h);	940	SvCUR_set (retval, w * h);
809		941
810	bitmap.rows = h;	942	bitmap.rows = h;
811	bitmap.width = w;	943	bitmap.width = w;
812	bitmap.pitch = w;	944	bitmap.pitch = w;
813	bitmap.buffer = (unsigned char*)SvPVX (retval);	945	bitmap.buffer = (unsigned char*)SvPVX (retval);
814	bitmap.num_grays = 256;	946	bitmap.num_grays = 256;
815	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	947	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
816		948
817	memset (bitmap.buffer, 0, w * h);	949	memset (bitmap.buffer, 0, w * h);
818		950
819	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	951	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
820		952
821	EXTEND (SP, 3);	953	EXTEND (SP, 5);
822	PUSHs (sv_2mortal (newSViv (w)));	954	PUSHs (sv_2mortal (newSViv (w)));
823	PUSHs (sv_2mortal (newSViv (h)));	955	PUSHs (sv_2mortal (newSViv (h)));
824	PUSHs (sv_2mortal (retval));	956	PUSHs (sv_2mortal (retval));
		957	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		958	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		959	}
825	}	960	}
826		961
827	MODULE = CFClient PACKAGE = CFClient::Texture	962	MODULE = CFClient PACKAGE = CFClient::Texture
828		963
829	void	964	void
830	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	965	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
831	PROTOTYPE: $$$;$$	966	PROTOTYPE: $$$;$$
		967	ALIAS:
		968	draw_quad_alpha = 1
		969	draw_quad_alpha_premultiplied = 2
832	CODE:	970	CODE:
833	{	971	{
834	HV hv = (HV )SvRV (self);	972	HV hv = (HV )SvRV (self);
835	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	973	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
836	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	974	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
841	{	979	{
842	w = SvNV (*hv_fetch (hv, "w", 1, 1));	980	w = SvNV (*hv_fetch (hv, "w", 1, 1));
843	h = SvNV (*hv_fetch (hv, "h", 1, 1));	981	h = SvNV (*hv_fetch (hv, "h", 1, 1));
844	}	982	}
845		983
		984	if (ix)
		985	{
		986	glEnable (GL_BLEND);
		987	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		988	glEnable (GL_ALPHA_TEST);
		989	glAlphaFunc (GL_GREATER, 0.01f);
		990	}
		991
846	glBindTexture (GL_TEXTURE_2D, name);	992	glBindTexture (GL_TEXTURE_2D, name);
		993
847	if (wrap_mode) {	994	if (wrap_mode)
		995	{
848	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	996	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
849	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	997	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
850	}	998	}
		999
851	glBegin (GL_QUADS);	1000	glBegin (GL_QUADS);
852	glTexCoord2f (0, 0); glVertex2f (x , y );	1001	glTexCoord2f (0, 0); glVertex2f (x , y );
853	glTexCoord2f (0, t); glVertex2f (x , y + h);	1002	glTexCoord2f (0, t); glVertex2f (x , y + h);
854	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1003	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
855	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1004	glTexCoord2f (s, 0); glVertex2f (x + w, y );
856	glEnd ();	1005	glEnd ();
		1006
		1007	if (ix)
		1008	{
		1009	glDisable (GL_ALPHA_TEST);
		1010	glDisable (GL_BLEND);
		1011	}
857	}	1012	}
858		1013
859	MODULE = CFClient PACKAGE = CFClient::Map	1014	MODULE = CFClient PACKAGE = CFClient::Map
860		1015
861	CFClient::Map	1016	CFClient::Map
…		…
1384	const_iv (GL_ONE_MINUS_DST_ALPHA),	1539	const_iv (GL_ONE_MINUS_DST_ALPHA),
1385	const_iv (GL_RGB),	1540	const_iv (GL_RGB),
1386	const_iv (GL_RGBA),	1541	const_iv (GL_RGBA),
1387	const_iv (GL_UNSIGNED_BYTE),	1542	const_iv (GL_UNSIGNED_BYTE),
1388	const_iv (GL_ALPHA),	1543	const_iv (GL_ALPHA),
		1544	const_iv (GL_INTENSITY),
		1545	const_iv (GL_LUMINANCE),
		1546	const_iv (GL_LUMINANCE_ALPHA),
1389	const_iv (GL_FLOAT),	1547	const_iv (GL_FLOAT),
1390	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1548	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1391	const_iv (GL_COMPILE),	1549	const_iv (GL_COMPILE),
1392	const_iv (GL_TEXTURE_1D),	1550	const_iv (GL_TEXTURE_1D),
1393	const_iv (GL_TEXTURE_2D),	1551	const_iv (GL_TEXTURE_2D),
…		…
1482	void glEnd ()	1640	void glEnd ()
1483		1641
1484	void glColor (float r, float g, float b, float a = 1.0)	1642	void glColor (float r, float g, float b, float a = 1.0)
1485	PROTOTYPE: @	1643	PROTOTYPE: @
1486	CODE:	1644	CODE:
1487	glColor4ub (r * 255., g * 255., b * 255., a * 255.);	1645	glColor4ub (MIN ((int)(r * 255.f), 255),
		1646	MIN ((int)(g * 255.f), 255),
		1647	MIN ((int)(b * 255.f), 255),
		1648	MIN ((int)(a * 255.f), 255));
1488		1649
1489	void glVertex (float x, float y, float z = 0.)	1650	void glVertex (float x, float y, float z = 0.)
1490	CODE:	1651	CODE:
1491	glVertex3f (x, y, z);	1652	glVertex3f (x, y, z);
1492		1653

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.72 by root, Fri May 5 19:10:16 2006 UTC vs. Revision 1.87 by root, Fri May 19 18:39:06 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.72 by root, Fri May 5 19:10:16 2006 UTC vs.
Revision 1.87 by root, Fri May 19 18:39:06 2006 UTC