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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.70 by root, Sun Apr 30 09:21:47 2006 UTC vs.
Revision 1.91 by root, Mon May 22 03:28:54 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;
269	ev.data1 = 0;	282	ev.data1 = 0;
		283	ev.data2 = 0;
		284
		285	SDL_PushEvent ((SDL_Event *)&ev);
		286	}
		287
		288	static void
		289	channel_finished (int channel)
		290	{
		291	SDL_UserEvent ev;
		292
		293	ev.type = SDL_USEREVENT;
		294	ev.code = 1;
		295	ev.data1 = (void *)(long)channel;
270	ev.data2 = 0;	296	ev.data2 = 0;
271		297
272	SDL_PushEvent ((SDL_Event *)&ev);	298	SDL_PushEvent ((SDL_Event *)&ev);
273	}	299	}
274		300
…		…
385	# undef const_iv	411	# undef const_iv
386	};	412	};
387		413
388	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; )
389	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		416	}
390		417
		418	void
		419	pango_init ()
		420	CODE:
		421	{
		422	// delayed, so it can pick up new fonts added by AddFontResourceEx
391	fontmap = pango_ft2_font_map_new ();	423	ft2_fontmap = pango_ft2_font_map_new ();
392	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);
393	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);
394	}	429	}
395		430
396	int	431	int
397	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
398		433
…		…
408	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	443	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
409	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
410	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
411	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
412		447
		448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
		450
413	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
414	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
415	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
416	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
417		455
418	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
419	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
420	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
421		457
422	SDL_EnableUNICODE (1);	458	SDL_EnableUNICODE (1);
423	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
424		460
425	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	461	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
433	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	469	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
434		470
435	++m;	471	++m;
436	}	472	}
437	}	473	}
		474
		475	char *
		476	SDL_GetError ()
438		477
439	int	478	int
440	SDL_SetVideoMode (int w, int h, int fullscreen)	479	SDL_SetVideoMode (int w, int h, int fullscreen)
441	CODE:	480	CODE:
442	RETVAL = !!SDL_SetVideoMode (	481	RETVAL = !!SDL_SetVideoMode (
…		…
488	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	527	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
489	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	528	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
490	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	529	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
491	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	530	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
492	break;	531	break;
		532
		533	case SDL_USEREVENT:
		534	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		535	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		536	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		537	break;
493	}	538	}
494		539
495	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	540	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
496	}	541	}
497	}	542	}
498		543
499	int	544	int
500	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	545	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
501	POSTCALL:	546	POSTCALL:
502	Mix_HookMusicFinished (music_finished);	547	Mix_HookMusicFinished (music_finished);
		548	Mix_ChannelFinished (channel_finished);
503		549
504	void	550	void
505	Mix_CloseAudio ()	551	Mix_CloseAudio ()
506		552
507	int	553	int
…		…
530		576
531	void	577	void
532	add_font (char *file)	578	add_font (char *file)
533	CODE:	579	CODE:
534	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	580	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
		581	#ifdef _WIN32
		582	// cairo... sigh... requires win2000
		583	AddFontResourceEx (file, FR_PRIVATE, 0);
		584	#endif
535		585
536	void	586	void
537	load_image_inline (SV *image_)	587	load_image_inline (SV *image_)
538	ALIAS:	588	ALIAS:
539	load_image_file = 1	589	load_image_file = 1
…		…
623	}	673	}
624		674
625	void	675	void
626	error (char *message)	676	error (char *message)
627	CODE:	677	CODE:
		678	fprintf (stderr, "ERROR: %s\n", message);
628	#ifdef _WIN32	679	#ifdef _WIN32
629	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	680	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
630	#else
631	fprintf (stderr, "ERROR: %s\n", message);
632	#endif	681	#endif
633		682
634	void	683	void
635	fatal (char *message)	684	fatal (char *message)
636	CODE:	685	CODE:
		686	fprintf (stderr, "FATAL: %s\n", message);
637	#ifdef _WIN32	687	#ifdef _WIN32
638	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	688	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
639	#else
640	fprintf (stderr, "FATAL: %s\n", message);
641	#endif	689	#endif
642	exit (1);	690	exit (1);
643		691
644	MODULE = CFClient PACKAGE = CFClient::Font	692	MODULE = CFClient PACKAGE = CFClient::Font
645		693
…		…
666	default_font = self;	714	default_font = self;
667		715
668	MODULE = CFClient PACKAGE = CFClient::Layout	716	MODULE = CFClient PACKAGE = CFClient::Layout
669		717
670	CFClient::Layout	718	CFClient::Layout
671	new (SV *class, int base_height = MIN_FONT_HEIGHT)	719	new (SV *class, int rgba = 0)
672	CODE:	720	CODE:
		721	#if _WIN32
		722	rgba = 0;//D
		723	#endif
673	New (0, RETVAL, 1, struct cf_layout);	724	New (0, RETVAL, 1, struct cf_layout);
674	RETVAL->pl = pango_layout_new (context);	725
675	RETVAL->base_height = base_height;	726	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
		727	RETVAL->rgba = rgba;
		728	RETVAL->r = 1.;
		729	RETVAL->g = 1.;
		730	RETVAL->b = 1.;
		731	RETVAL->a = 1.;
		732	RETVAL->base_height = MIN_FONT_HEIGHT;
676	RETVAL->font = 0;	733	RETVAL->font = 0;
		734
677	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	735	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
678	pango_layout_set_font_description (RETVAL->pl, default_font);	736	layout_update_font (RETVAL);
679	OUTPUT:	737	OUTPUT:
680	RETVAL	738	RETVAL
681		739
682	void	740	void
683	DESTROY (CFClient::Layout self)	741	DESTROY (CFClient::Layout self)
684	CODE:	742	CODE:
685	g_object_unref (self->pl);	743	g_object_unref (self->pl);
686	Safefree (self);	744	Safefree (self);
687		745
		746	int
		747	is_rgba (CFClient::Layout self)
		748	CODE:
		749	RETVAL = self->rgba;
		750	OUTPUT:
		751	RETVAL
		752
688	void	753	void
689	set_text (CFClient::Layout self, SV *text_)	754	set_text (CFClient::Layout self, SV *text_)
690	CODE:	755	CODE:
691	{	756	{
692	STRLEN textlen;	757	STRLEN textlen;
…		…
710	CODE:	775	CODE:
711	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	776	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
712	SvUTF8_on (RETVAL);	777	SvUTF8_on (RETVAL);
713	OUTPUT:	778	OUTPUT:
714	RETVAL	779	RETVAL
		780
		781	void
		782	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
		783	CODE:
		784	self->r = r;
		785	self->g = g;
		786	self->b = b;
		787	self->a = a;
715		788
716	void	789	void
717	set_font (CFClient::Layout self, CFClient::Font font = 0)	790	set_font (CFClient::Layout self, CFClient::Font font = 0)
718	CODE:	791	CODE:
719	if (self->font != font)	792	if (self->font != font)
…		…
735	set_width (CFClient::Layout self, int max_width = -1)	808	set_width (CFClient::Layout self, int max_width = -1)
736	CODE:	809	CODE:
737	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	810	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
738		811
739	void	812	void
		813	set_indent (CFClient::Layout self, int indent)
		814	CODE:
		815	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		816
		817	void
		818	set_spacing (CFClient::Layout self, int spacing)
		819	CODE:
		820	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		821
		822	void
		823	set_ellipsise (CFClient::Layout self, int ellipsise)
		824	CODE:
		825	pango_layout_set_ellipsize (self->pl,
		826	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		827	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		828	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		829	: PANGO_ELLIPSIZE_NONE
		830	);
		831
		832	void
		833	set_single_paragraph_mode (CFClient::Layout self, int spm)
		834	CODE:
		835	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		836
		837	void
740	size (CFClient::Layout self)	838	size (CFClient::Layout self)
741	PPCODE:	839	PPCODE:
742	{	840	{
743	int w, h;	841	int w, h;
744		842
…		…
777	render (CFClient::Layout self)	875	render (CFClient::Layout self)
778	PPCODE:	876	PPCODE:
779	{	877	{
780	SV *retval;	878	SV *retval;
781	int w, h;	879	int w, h;
782	FT_Bitmap bitmap;
783		880
784	layout_get_pixel_size (self, &w, &h);	881	layout_get_pixel_size (self, &w, &h);
785		882
		883	if (self->rgba)
		884	{
		885	cairo_surface_t *surface;
		886	cairo_t *cairo;
		887
		888	retval = newSV (w * h * 4);
		889	SvPOK_only (retval);
		890	SvCUR_set (retval, w * h * 4);
		891
		892	memset (SvPVX (retval), 0, w * h * 4);
		893
		894	surface = cairo_image_surface_create_for_data (
		895	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		896	cairo = cairo_create (surface);
		897	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		898
		899	pango_cairo_show_layout (cairo, self->pl);
		900
		901	cairo_destroy (cairo);
		902	cairo_surface_destroy (surface);
		903
		904	// what a mess, and its premultiplied, too :(
		905	{
		906	uint32_t p = (uint32_t )SvPVX (retval);
		907	uint32_t e = p + w h;
		908
		909	while (p < e)
		910	{
		911	uint32_t rgba = *p;
		912	rgba = (rgba >> 24) \| (rgba << 8);
		913	#if 0
		914	#ifdef _WIN32
		915	{//D
		916	uint8_t r = rgba >> 24;
		917	uint8_t g = rgba >> 16;
		918	uint8_t b = rgba >> 8;
		919	uint8_t a = rgba >> 0;
		920
		921	rgba = (rgba & 0xffffff00) \| a;
		922	}
		923	#endif
		924	#endif
		925	rgba = SDL_SwapBE32 (rgba);
		926	*p++ = rgba;
		927	}
		928	}
		929
		930	EXTEND (SP, 5);
		931	PUSHs (sv_2mortal (newSViv (w)));
		932	PUSHs (sv_2mortal (newSViv (h)));
		933	PUSHs (sv_2mortal (retval));
		934	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		935	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		936	}
		937	else
		938	{
		939	FT_Bitmap bitmap;
		940
786	retval = newSV (w * h);	941	retval = newSV (w * h);
787	SvPOK_only (retval);	942	SvPOK_only (retval);
788	SvCUR_set (retval, w * h);	943	SvCUR_set (retval, w * h);
789		944
790	bitmap.rows = h;	945	bitmap.rows = h;
791	bitmap.width = w;	946	bitmap.width = w;
792	bitmap.pitch = w;	947	bitmap.pitch = w;
793	bitmap.buffer = (unsigned char*)SvPVX (retval);	948	bitmap.buffer = (unsigned char*)SvPVX (retval);
794	bitmap.num_grays = 256;	949	bitmap.num_grays = 256;
795	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	950	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
796		951
797	memset (bitmap.buffer, 0, w * h);	952	memset (bitmap.buffer, 0, w * h);
798		953
799	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	954	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
800		955
801	EXTEND (SP, 3);	956	EXTEND (SP, 5);
802	PUSHs (sv_2mortal (newSViv (w)));	957	PUSHs (sv_2mortal (newSViv (w)));
803	PUSHs (sv_2mortal (newSViv (h)));	958	PUSHs (sv_2mortal (newSViv (h)));
804	PUSHs (sv_2mortal (retval));	959	PUSHs (sv_2mortal (retval));
		960	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		961	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		962	}
805	}	963	}
806		964
807	MODULE = CFClient PACKAGE = CFClient::Texture	965	MODULE = CFClient PACKAGE = CFClient::Texture
808		966
809	void	967	void
810	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	968	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
811	PROTOTYPE: $$$;$$	969	PROTOTYPE: $$$;$$
		970	ALIAS:
		971	draw_quad_alpha = 1
		972	draw_quad_alpha_premultiplied = 2
812	CODE:	973	CODE:
813	{	974	{
814	HV hv = (HV )SvRV (self);	975	HV hv = (HV )SvRV (self);
815	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	976	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
816	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	977	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
821	{	982	{
822	w = SvNV (*hv_fetch (hv, "w", 1, 1));	983	w = SvNV (*hv_fetch (hv, "w", 1, 1));
823	h = SvNV (*hv_fetch (hv, "h", 1, 1));	984	h = SvNV (*hv_fetch (hv, "h", 1, 1));
824	}	985	}
825		986
		987	if (ix)
		988	{
		989	glEnable (GL_BLEND);
		990	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		991	glEnable (GL_ALPHA_TEST);
		992	glAlphaFunc (GL_GREATER, 0.01f);
		993	}
		994
826	glBindTexture (GL_TEXTURE_2D, name);	995	glBindTexture (GL_TEXTURE_2D, name);
		996
827	if (wrap_mode) {	997	if (wrap_mode)
		998	{
828	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	999	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
829	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	1000	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
830	}	1001	}
		1002
831	glBegin (GL_QUADS);	1003	glBegin (GL_QUADS);
832	glTexCoord2f (0, 0); glVertex2f (x , y );	1004	glTexCoord2f (0, 0); glVertex2f (x , y );
833	glTexCoord2f (0, t); glVertex2f (x , y + h);	1005	glTexCoord2f (0, t); glVertex2f (x , y + h);
834	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1006	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
835	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1007	glTexCoord2f (s, 0); glVertex2f (x + w, y );
836	glEnd ();	1008	glEnd ();
		1009
		1010	if (ix)
		1011	{
		1012	glDisable (GL_ALPHA_TEST);
		1013	glDisable (GL_BLEND);
		1014	}
837	}	1015	}
838		1016
839	MODULE = CFClient PACKAGE = CFClient::Map	1017	MODULE = CFClient PACKAGE = CFClient::Map
840		1018
841	CFClient::Map	1019	CFClient::Map
…		…
1352	const_iv (GL_COLOR_MATERIAL),	1530	const_iv (GL_COLOR_MATERIAL),
1353	const_iv (GL_SMOOTH),	1531	const_iv (GL_SMOOTH),
1354	const_iv (GL_FLAT),	1532	const_iv (GL_FLAT),
1355	const_iv (GL_DITHER),	1533	const_iv (GL_DITHER),
1356	const_iv (GL_BLEND),	1534	const_iv (GL_BLEND),
		1535	const_iv (GL_CULL_FACE),
1357	const_iv (GL_SCISSOR_TEST),	1536	const_iv (GL_SCISSOR_TEST),
		1537	const_iv (GL_DEPTH_TEST),
		1538	const_iv (GL_ALPHA_TEST),
		1539	const_iv (GL_NORMALIZE),
		1540	const_iv (GL_RESCALE_NORMAL),
1358	const_iv (GL_AND),	1541	const_iv (GL_AND),
1359	const_iv (GL_ONE),	1542	const_iv (GL_ONE),
1360	const_iv (GL_ZERO),	1543	const_iv (GL_ZERO),
1361	const_iv (GL_SRC_ALPHA),	1544	const_iv (GL_SRC_ALPHA),
1362	const_iv (GL_SRC_ALPHA_SATURATE),	1545	const_iv (GL_SRC_ALPHA_SATURATE),
1363	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1546	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1364	const_iv (GL_ONE_MINUS_DST_ALPHA),	1547	const_iv (GL_ONE_MINUS_DST_ALPHA),
1365	const_iv (GL_RGB),	1548	const_iv (GL_RGB),
1366	const_iv (GL_RGBA),	1549	const_iv (GL_RGBA),
1367	const_iv (GL_UNSIGNED_BYTE),	1550	const_iv (GL_UNSIGNED_BYTE),
		1551	const_iv (GL_UNSIGNED_SHORT),
		1552	const_iv (GL_UNSIGNED_INT),
1368	const_iv (GL_ALPHA),	1553	const_iv (GL_ALPHA),
		1554	const_iv (GL_INTENSITY),
		1555	const_iv (GL_LUMINANCE),
		1556	const_iv (GL_LUMINANCE_ALPHA),
1369	const_iv (GL_FLOAT),	1557	const_iv (GL_FLOAT),
1370	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1558	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1371	const_iv (GL_COMPILE),	1559	const_iv (GL_COMPILE),
1372	const_iv (GL_TEXTURE_1D),	1560	const_iv (GL_TEXTURE_1D),
1373	const_iv (GL_TEXTURE_2D),	1561	const_iv (GL_TEXTURE_2D),
…		…
1387	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1575	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1388	const_iv (GL_GENERATE_MIPMAP),	1576	const_iv (GL_GENERATE_MIPMAP),
1389	const_iv (GL_MODULATE),	1577	const_iv (GL_MODULATE),
1390	const_iv (GL_DECAL),	1578	const_iv (GL_DECAL),
1391	const_iv (GL_REPLACE),	1579	const_iv (GL_REPLACE),
		1580	const_iv (GL_DEPTH_BUFFER_BIT),
1392	const_iv (GL_COLOR_BUFFER_BIT),	1581	const_iv (GL_COLOR_BUFFER_BIT),
1393	const_iv (GL_PROJECTION),	1582	const_iv (GL_PROJECTION),
1394	const_iv (GL_MODELVIEW),	1583	const_iv (GL_MODELVIEW),
1395	const_iv (GL_COLOR_LOGIC_OP),	1584	const_iv (GL_COLOR_LOGIC_OP),
1396	const_iv (GL_SEPARABLE_2D),	1585	const_iv (GL_SEPARABLE_2D),
1397	const_iv (GL_CONVOLUTION_2D),	1586	const_iv (GL_CONVOLUTION_2D),
1398	const_iv (GL_CONVOLUTION_BORDER_MODE),	1587	const_iv (GL_CONVOLUTION_BORDER_MODE),
1399	const_iv (GL_CONSTANT_BORDER),	1588	const_iv (GL_CONSTANT_BORDER),
1400	const_iv (GL_LINES),	1589	const_iv (GL_LINES),
		1590	const_iv (GL_LINE_LOOP),
1401	const_iv (GL_QUADS),	1591	const_iv (GL_QUADS),
1402	const_iv (GL_LINE_LOOP),	1592	const_iv (GL_QUAD_STRIP),
		1593	const_iv (GL_TRIANGLES),
		1594	const_iv (GL_TRIANGLE_STRIP),
		1595	const_iv (GL_TRIANGLE_FAN),
1403	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1596	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1404	const_iv (GL_FASTEST),	1597	const_iv (GL_FASTEST),
		1598	const_iv (GL_V2F),
		1599	const_iv (GL_V3F),
		1600	const_iv (GL_T2F_V3F),
		1601	const_iv (GL_T2F_N3F_V3F),
1405	# undef const_iv	1602	# undef const_iv
1406	};	1603	};
1407		1604
1408	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1605	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1409	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1606	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
1424		1621
1425	void glHint (int target, int mode)	1622	void glHint (int target, int mode)
1426		1623
1427	void glBlendFunc (int sfactor, int dfactor)	1624	void glBlendFunc (int sfactor, int dfactor)
1428		1625
		1626	void glDepthMask (int flag)
		1627
1429	void glLogicOp (int opcode)	1628	void glLogicOp (int opcode)
1430		1629
1431	void glColorMask (int red, int green, int blue, int alpha)	1630	void glColorMask (int red, int green, int blue, int alpha)
1432		1631
1433	void glMatrixMode (int mode)	1632	void glMatrixMode (int mode)
…		…
1436		1635
1437	void glPopMatrix ()	1636	void glPopMatrix ()
1438		1637
1439	void glLoadIdentity ()	1638	void glLoadIdentity ()
1440		1639
1441	# near and far are due to microsofts buggy c compiler	1640	# near_ and far_ are due to microsofts buggy "c" compiler
		1641	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1642
		1643	# near_ and far_ are due to microsofts buggy "c" compiler
1442	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1644	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1443		1645
1444	void glViewport (int x, int y, int width, int height)	1646	void glViewport (int x, int y, int width, int height)
1445		1647
1446	void glScissor (int x, int y, int width, int height)	1648	void glScissor (int x, int y, int width, int height)
…		…
1462	void glEnd ()	1664	void glEnd ()
1463		1665
1464	void glColor (float r, float g, float b, float a = 1.0)	1666	void glColor (float r, float g, float b, float a = 1.0)
1465	PROTOTYPE: @	1667	PROTOTYPE: @
1466	CODE:	1668	CODE:
1467	glColor4ub (r * 255., g * 255., b * 255., a * 255.);	1669	// microsoft visual "c" rounds instead of truncating...
		1670	glColor4ub (MIN ((int)(r * 255.f), 255),
		1671	MIN ((int)(g * 255.f), 255),
		1672	MIN ((int)(b * 255.f), 255),
		1673	MIN ((int)(a * 255.f), 255));
		1674
		1675	void glInterleavedArrays (int format, int stride, char *data)
		1676
		1677	void glDrawElements (int mode, int count, int type, char *indices)
		1678
		1679	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1680
		1681	void glRasterPos (float x, float y, float z = 0.)
		1682	CODE:
		1683	glRasterPos3f (0, 0, z);
		1684	glBitmap (0, 0, 0, 0, x, y, 0);
1468		1685
1469	void glVertex (float x, float y, float z = 0.)	1686	void glVertex (float x, float y, float z = 0.)
1470	CODE:	1687	CODE:
1471	glVertex3f (x, y, z);	1688	glVertex3f (x, y, z);
1472		1689
…		…
1500		1717
1501	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1718	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1502		1719
1503	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1720	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1504		1721
1505	void glRasterPos (int x, int y)	1722	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1506	CODE:
1507	glRasterPos2i (x, y);
1508		1723
1509	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1724	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1510		1725
1511	int glGenTexture ()	1726	int glGenTexture ()
1512	CODE:	1727	CODE:
…		…
1539		1754
1540	void glEndList ()	1755	void glEndList ()
1541		1756
1542	void glCallList (int list)	1757	void glCallList (int list)
1543		1758
		1759

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.70 by root, Sun Apr 30 09:21:47 2006 UTC vs. Revision 1.91 by root, Mon May 22 03:28:54 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.70 by root, Sun Apr 30 09:21:47 2006 UTC vs.
Revision 1.91 by root, Mon May 22 03:28:54 2006 UTC