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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.71 by root, Fri May 5 19:05:47 2006 UTC vs.
Revision 1.92 by elmex, Tue May 23 17:30:18 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 = 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
…		…
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, 1);
425		447
		448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
		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);
…		…
446	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	469	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
447		470
448	++m;	471	++m;
449	}	472	}
450	}	473	}
		474
		475	char *
		476	SDL_GetError ()
451		477
452	int	478	int
453	SDL_SetVideoMode (int w, int h, int fullscreen)	479	SDL_SetVideoMode (int w, int h, int fullscreen)
454	CODE:	480	CODE:
455	RETVAL = !!SDL_SetVideoMode (	481	RETVAL = !!SDL_SetVideoMode (
…		…
501	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	527	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
502	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	528	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
503	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	529	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
504	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	530	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
505	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;
506	}	538	}
507		539
508	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	540	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
509	}	541	}
510	}	542	}
511		543
512	int	544	int
513	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)
514	POSTCALL:	546	POSTCALL:
515	Mix_HookMusicFinished (music_finished);	547	Mix_HookMusicFinished (music_finished);
516	Mix_ChannelFinished (channel_finished);	548	Mix_ChannelFinished (channel_finished);
517		549
518	void	550	void
…		…
527	#ifndef _WIN32	559	#ifndef _WIN32
528	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	560	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
529	#endif	561	#endif
530		562
531	char *	563	char *
		564	gl_vendor ()
		565	CODE:
		566	RETVAL = (char *)glGetString (GL_VENDOR);
		567	OUTPUT:
		568	RETVAL
		569
		570	char *
532	gl_version ()	571	gl_version ()
533	CODE:	572	CODE:
534	RETVAL = (char *)glGetString (GL_VERSION);	573	RETVAL = (char *)glGetString (GL_VERSION);
535	OUTPUT:	574	OUTPUT:
536	RETVAL	575	RETVAL
…		…
544		583
545	void	584	void
546	add_font (char *file)	585	add_font (char *file)
547	CODE:	586	CODE:
548	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	587	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
		588	#ifdef _WIN32
		589	// cairo... sigh... requires win2000
		590	AddFontResourceEx (file, FR_PRIVATE, 0);
		591	#endif
549		592
550	void	593	void
551	load_image_inline (SV *image_)	594	load_image_inline (SV *image_)
552	ALIAS:	595	ALIAS:
553	load_image_file = 1	596	load_image_file = 1
…		…
637	}	680	}
638		681
639	void	682	void
640	error (char *message)	683	error (char *message)
641	CODE:	684	CODE:
		685	fprintf (stderr, "ERROR: %s\n", message);
642	#ifdef _WIN32	686	#ifdef _WIN32
643	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	687	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
644	#else
645	fprintf (stderr, "ERROR: %s\n", message);
646	#endif	688	#endif
647		689
648	void	690	void
649	fatal (char *message)	691	fatal (char *message)
650	CODE:	692	CODE:
		693	fprintf (stderr, "FATAL: %s\n", message);
651	#ifdef _WIN32	694	#ifdef _WIN32
652	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	695	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
653	#else
654	fprintf (stderr, "FATAL: %s\n", message);
655	#endif	696	#endif
656	exit (1);	697	exit (1);
657		698
658	MODULE = CFClient PACKAGE = CFClient::Font	699	MODULE = CFClient PACKAGE = CFClient::Font
659		700
…		…
680	default_font = self;	721	default_font = self;
681		722
682	MODULE = CFClient PACKAGE = CFClient::Layout	723	MODULE = CFClient PACKAGE = CFClient::Layout
683		724
684	CFClient::Layout	725	CFClient::Layout
685	new (SV *class, int base_height = MIN_FONT_HEIGHT)	726	new (SV *class, int rgba = 0)
686	CODE:	727	CODE:
		728	#if _WIN32
		729	rgba = 0;//D
		730	#endif
687	New (0, RETVAL, 1, struct cf_layout);	731	New (0, RETVAL, 1, struct cf_layout);
688	RETVAL->pl = pango_layout_new (context);	732
689	RETVAL->base_height = base_height;	733	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
		734	RETVAL->rgba = rgba;
		735	RETVAL->r = 1.;
		736	RETVAL->g = 1.;
		737	RETVAL->b = 1.;
		738	RETVAL->a = 1.;
		739	RETVAL->base_height = MIN_FONT_HEIGHT;
690	RETVAL->font = 0;	740	RETVAL->font = 0;
		741
691	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	742	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
692	pango_layout_set_font_description (RETVAL->pl, default_font);	743	layout_update_font (RETVAL);
693	OUTPUT:	744	OUTPUT:
694	RETVAL	745	RETVAL
695		746
696	void	747	void
697	DESTROY (CFClient::Layout self)	748	DESTROY (CFClient::Layout self)
698	CODE:	749	CODE:
699	g_object_unref (self->pl);	750	g_object_unref (self->pl);
700	Safefree (self);	751	Safefree (self);
701		752
		753	int
		754	is_rgba (CFClient::Layout self)
		755	CODE:
		756	RETVAL = self->rgba;
		757	OUTPUT:
		758	RETVAL
		759
702	void	760	void
703	set_text (CFClient::Layout self, SV *text_)	761	set_text (CFClient::Layout self, SV *text_)
704	CODE:	762	CODE:
705	{	763	{
706	STRLEN textlen;	764	STRLEN textlen;
…		…
724	CODE:	782	CODE:
725	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	783	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
726	SvUTF8_on (RETVAL);	784	SvUTF8_on (RETVAL);
727	OUTPUT:	785	OUTPUT:
728	RETVAL	786	RETVAL
		787
		788	void
		789	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
		790	CODE:
		791	self->r = r;
		792	self->g = g;
		793	self->b = b;
		794	self->a = a;
729		795
730	void	796	void
731	set_font (CFClient::Layout self, CFClient::Font font = 0)	797	set_font (CFClient::Layout self, CFClient::Font font = 0)
732	CODE:	798	CODE:
733	if (self->font != font)	799	if (self->font != font)
…		…
749	set_width (CFClient::Layout self, int max_width = -1)	815	set_width (CFClient::Layout self, int max_width = -1)
750	CODE:	816	CODE:
751	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	817	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
752		818
753	void	819	void
		820	set_indent (CFClient::Layout self, int indent)
		821	CODE:
		822	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		823
		824	void
		825	set_spacing (CFClient::Layout self, int spacing)
		826	CODE:
		827	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		828
		829	void
		830	set_ellipsise (CFClient::Layout self, int ellipsise)
		831	CODE:
		832	pango_layout_set_ellipsize (self->pl,
		833	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		834	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		835	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		836	: PANGO_ELLIPSIZE_NONE
		837	);
		838
		839	void
		840	set_single_paragraph_mode (CFClient::Layout self, int spm)
		841	CODE:
		842	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		843
		844	void
754	size (CFClient::Layout self)	845	size (CFClient::Layout self)
755	PPCODE:	846	PPCODE:
756	{	847	{
757	int w, h;	848	int w, h;
758		849
…		…
791	render (CFClient::Layout self)	882	render (CFClient::Layout self)
792	PPCODE:	883	PPCODE:
793	{	884	{
794	SV *retval;	885	SV *retval;
795	int w, h;	886	int w, h;
796	FT_Bitmap bitmap;
797		887
798	layout_get_pixel_size (self, &w, &h);	888	layout_get_pixel_size (self, &w, &h);
799		889
		890	if (self->rgba)
		891	{
		892	cairo_surface_t *surface;
		893	cairo_t *cairo;
		894
		895	retval = newSV (w * h * 4);
		896	SvPOK_only (retval);
		897	SvCUR_set (retval, w * h * 4);
		898
		899	memset (SvPVX (retval), 0, w * h * 4);
		900
		901	surface = cairo_image_surface_create_for_data (
		902	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		903	cairo = cairo_create (surface);
		904	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		905
		906	pango_cairo_show_layout (cairo, self->pl);
		907
		908	cairo_destroy (cairo);
		909	cairo_surface_destroy (surface);
		910
		911	// what a mess, and its premultiplied, too :(
		912	{
		913	uint32_t p = (uint32_t )SvPVX (retval);
		914	uint32_t e = p + w h;
		915
		916	while (p < e)
		917	{
		918	uint32_t rgba = *p;
		919	rgba = (rgba >> 24) \| (rgba << 8);
		920	#if 0
		921	#ifdef _WIN32
		922	{//D
		923	uint8_t r = rgba >> 24;
		924	uint8_t g = rgba >> 16;
		925	uint8_t b = rgba >> 8;
		926	uint8_t a = rgba >> 0;
		927
		928	rgba = (rgba & 0xffffff00) \| a;
		929	}
		930	#endif
		931	#endif
		932	rgba = SDL_SwapBE32 (rgba);
		933	*p++ = rgba;
		934	}
		935	}
		936
		937	EXTEND (SP, 5);
		938	PUSHs (sv_2mortal (newSViv (w)));
		939	PUSHs (sv_2mortal (newSViv (h)));
		940	PUSHs (sv_2mortal (retval));
		941	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		942	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		943	}
		944	else
		945	{
		946	FT_Bitmap bitmap;
		947
800	retval = newSV (w * h);	948	retval = newSV (w * h);
801	SvPOK_only (retval);	949	SvPOK_only (retval);
802	SvCUR_set (retval, w * h);	950	SvCUR_set (retval, w * h);
803		951
804	bitmap.rows = h;	952	bitmap.rows = h;
805	bitmap.width = w;	953	bitmap.width = w;
806	bitmap.pitch = w;	954	bitmap.pitch = w;
807	bitmap.buffer = (unsigned char*)SvPVX (retval);	955	bitmap.buffer = (unsigned char*)SvPVX (retval);
808	bitmap.num_grays = 256;	956	bitmap.num_grays = 256;
809	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	957	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
810		958
811	memset (bitmap.buffer, 0, w * h);	959	memset (bitmap.buffer, 0, w * h);
812		960
813	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	961	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
814		962
815	EXTEND (SP, 3);	963	EXTEND (SP, 5);
816	PUSHs (sv_2mortal (newSViv (w)));	964	PUSHs (sv_2mortal (newSViv (w)));
817	PUSHs (sv_2mortal (newSViv (h)));	965	PUSHs (sv_2mortal (newSViv (h)));
818	PUSHs (sv_2mortal (retval));	966	PUSHs (sv_2mortal (retval));
		967	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		968	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		969	}
819	}	970	}
820		971
821	MODULE = CFClient PACKAGE = CFClient::Texture	972	MODULE = CFClient PACKAGE = CFClient::Texture
822		973
823	void	974	void
824	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	975	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
825	PROTOTYPE: $$$;$$	976	PROTOTYPE: $$$;$$
		977	ALIAS:
		978	draw_quad_alpha = 1
		979	draw_quad_alpha_premultiplied = 2
826	CODE:	980	CODE:
827	{	981	{
828	HV hv = (HV )SvRV (self);	982	HV hv = (HV )SvRV (self);
829	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	983	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
830	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	984	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
835	{	989	{
836	w = SvNV (*hv_fetch (hv, "w", 1, 1));	990	w = SvNV (*hv_fetch (hv, "w", 1, 1));
837	h = SvNV (*hv_fetch (hv, "h", 1, 1));	991	h = SvNV (*hv_fetch (hv, "h", 1, 1));
838	}	992	}
839		993
		994	if (ix)
		995	{
		996	glEnable (GL_BLEND);
		997	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		998	glEnable (GL_ALPHA_TEST);
		999	glAlphaFunc (GL_GREATER, 0.01f);
		1000	}
		1001
840	glBindTexture (GL_TEXTURE_2D, name);	1002	glBindTexture (GL_TEXTURE_2D, name);
		1003
841	if (wrap_mode) {	1004	if (wrap_mode)
		1005	{
842	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	1006	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
843	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	1007	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
844	}	1008	}
		1009
845	glBegin (GL_QUADS);	1010	glBegin (GL_QUADS);
846	glTexCoord2f (0, 0); glVertex2f (x , y );	1011	glTexCoord2f (0, 0); glVertex2f (x , y );
847	glTexCoord2f (0, t); glVertex2f (x , y + h);	1012	glTexCoord2f (0, t); glVertex2f (x , y + h);
848	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1013	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
849	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1014	glTexCoord2f (s, 0); glVertex2f (x + w, y );
850	glEnd ();	1015	glEnd ();
		1016
		1017	if (ix)
		1018	{
		1019	glDisable (GL_ALPHA_TEST);
		1020	glDisable (GL_BLEND);
		1021	}
851	}	1022	}
852		1023
853	MODULE = CFClient PACKAGE = CFClient::Map	1024	MODULE = CFClient PACKAGE = CFClient::Map
854		1025
855	CFClient::Map	1026	CFClient::Map
…		…
1366	const_iv (GL_COLOR_MATERIAL),	1537	const_iv (GL_COLOR_MATERIAL),
1367	const_iv (GL_SMOOTH),	1538	const_iv (GL_SMOOTH),
1368	const_iv (GL_FLAT),	1539	const_iv (GL_FLAT),
1369	const_iv (GL_DITHER),	1540	const_iv (GL_DITHER),
1370	const_iv (GL_BLEND),	1541	const_iv (GL_BLEND),
		1542	const_iv (GL_CULL_FACE),
1371	const_iv (GL_SCISSOR_TEST),	1543	const_iv (GL_SCISSOR_TEST),
		1544	const_iv (GL_DEPTH_TEST),
		1545	const_iv (GL_ALPHA_TEST),
		1546	const_iv (GL_NORMALIZE),
		1547	const_iv (GL_RESCALE_NORMAL),
1372	const_iv (GL_AND),	1548	const_iv (GL_AND),
1373	const_iv (GL_ONE),	1549	const_iv (GL_ONE),
1374	const_iv (GL_ZERO),	1550	const_iv (GL_ZERO),
1375	const_iv (GL_SRC_ALPHA),	1551	const_iv (GL_SRC_ALPHA),
1376	const_iv (GL_SRC_ALPHA_SATURATE),	1552	const_iv (GL_SRC_ALPHA_SATURATE),
1377	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1553	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1378	const_iv (GL_ONE_MINUS_DST_ALPHA),	1554	const_iv (GL_ONE_MINUS_DST_ALPHA),
1379	const_iv (GL_RGB),	1555	const_iv (GL_RGB),
1380	const_iv (GL_RGBA),	1556	const_iv (GL_RGBA),
1381	const_iv (GL_UNSIGNED_BYTE),	1557	const_iv (GL_UNSIGNED_BYTE),
		1558	const_iv (GL_UNSIGNED_SHORT),
		1559	const_iv (GL_UNSIGNED_INT),
1382	const_iv (GL_ALPHA),	1560	const_iv (GL_ALPHA),
		1561	const_iv (GL_INTENSITY),
		1562	const_iv (GL_LUMINANCE),
		1563	const_iv (GL_LUMINANCE_ALPHA),
1383	const_iv (GL_FLOAT),	1564	const_iv (GL_FLOAT),
1384	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1565	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1385	const_iv (GL_COMPILE),	1566	const_iv (GL_COMPILE),
1386	const_iv (GL_TEXTURE_1D),	1567	const_iv (GL_TEXTURE_1D),
1387	const_iv (GL_TEXTURE_2D),	1568	const_iv (GL_TEXTURE_2D),
…		…
1401	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1582	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1402	const_iv (GL_GENERATE_MIPMAP),	1583	const_iv (GL_GENERATE_MIPMAP),
1403	const_iv (GL_MODULATE),	1584	const_iv (GL_MODULATE),
1404	const_iv (GL_DECAL),	1585	const_iv (GL_DECAL),
1405	const_iv (GL_REPLACE),	1586	const_iv (GL_REPLACE),
		1587	const_iv (GL_DEPTH_BUFFER_BIT),
1406	const_iv (GL_COLOR_BUFFER_BIT),	1588	const_iv (GL_COLOR_BUFFER_BIT),
1407	const_iv (GL_PROJECTION),	1589	const_iv (GL_PROJECTION),
1408	const_iv (GL_MODELVIEW),	1590	const_iv (GL_MODELVIEW),
1409	const_iv (GL_COLOR_LOGIC_OP),	1591	const_iv (GL_COLOR_LOGIC_OP),
1410	const_iv (GL_SEPARABLE_2D),	1592	const_iv (GL_SEPARABLE_2D),
1411	const_iv (GL_CONVOLUTION_2D),	1593	const_iv (GL_CONVOLUTION_2D),
1412	const_iv (GL_CONVOLUTION_BORDER_MODE),	1594	const_iv (GL_CONVOLUTION_BORDER_MODE),
1413	const_iv (GL_CONSTANT_BORDER),	1595	const_iv (GL_CONSTANT_BORDER),
1414	const_iv (GL_LINES),	1596	const_iv (GL_LINES),
		1597	const_iv (GL_LINE_LOOP),
1415	const_iv (GL_QUADS),	1598	const_iv (GL_QUADS),
1416	const_iv (GL_LINE_LOOP),	1599	const_iv (GL_QUAD_STRIP),
		1600	const_iv (GL_TRIANGLES),
		1601	const_iv (GL_TRIANGLE_STRIP),
		1602	const_iv (GL_TRIANGLE_FAN),
1417	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1603	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1418	const_iv (GL_FASTEST),	1604	const_iv (GL_FASTEST),
		1605	const_iv (GL_V2F),
		1606	const_iv (GL_V3F),
		1607	const_iv (GL_T2F_V3F),
		1608	const_iv (GL_T2F_N3F_V3F),
1419	# undef const_iv	1609	# undef const_iv
1420	};	1610	};
1421		1611
1422	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1612	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1423	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1613	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
1438		1628
1439	void glHint (int target, int mode)	1629	void glHint (int target, int mode)
1440		1630
1441	void glBlendFunc (int sfactor, int dfactor)	1631	void glBlendFunc (int sfactor, int dfactor)
1442		1632
		1633	void glDepthMask (int flag)
		1634
1443	void glLogicOp (int opcode)	1635	void glLogicOp (int opcode)
1444		1636
1445	void glColorMask (int red, int green, int blue, int alpha)	1637	void glColorMask (int red, int green, int blue, int alpha)
1446		1638
1447	void glMatrixMode (int mode)	1639	void glMatrixMode (int mode)
…		…
1450		1642
1451	void glPopMatrix ()	1643	void glPopMatrix ()
1452		1644
1453	void glLoadIdentity ()	1645	void glLoadIdentity ()
1454		1646
1455	# near and far are due to microsofts buggy c compiler	1647	# near_ and far_ are due to microsofts buggy "c" compiler
		1648	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1649
		1650	# near_ and far_ are due to microsofts buggy "c" compiler
1456	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1651	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1457		1652
1458	void glViewport (int x, int y, int width, int height)	1653	void glViewport (int x, int y, int width, int height)
1459		1654
1460	void glScissor (int x, int y, int width, int height)	1655	void glScissor (int x, int y, int width, int height)
…		…
1476	void glEnd ()	1671	void glEnd ()
1477		1672
1478	void glColor (float r, float g, float b, float a = 1.0)	1673	void glColor (float r, float g, float b, float a = 1.0)
1479	PROTOTYPE: @	1674	PROTOTYPE: @
1480	CODE:	1675	CODE:
1481	glColor4ub (r * 255., g * 255., b * 255., a * 255.);	1676	// microsoft visual "c" rounds instead of truncating...
		1677	glColor4ub (MIN ((int)(r * 255.f), 255),
		1678	MIN ((int)(g * 255.f), 255),
		1679	MIN ((int)(b * 255.f), 255),
		1680	MIN ((int)(a * 255.f), 255));
		1681
		1682	void glInterleavedArrays (int format, int stride, char *data)
		1683
		1684	void glDrawElements (int mode, int count, int type, char *indices)
		1685
		1686	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1687
		1688	void glRasterPos (float x, float y, float z = 0.)
		1689	CODE:
		1690	glRasterPos3f (0, 0, z);
		1691	glBitmap (0, 0, 0, 0, x, y, 0);
1482		1692
1483	void glVertex (float x, float y, float z = 0.)	1693	void glVertex (float x, float y, float z = 0.)
1484	CODE:	1694	CODE:
1485	glVertex3f (x, y, z);	1695	glVertex3f (x, y, z);
1486		1696
…		…
1514		1724
1515	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1725	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1516		1726
1517	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1727	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1518		1728
1519	void glRasterPos (int x, int y)	1729	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1520	CODE:
1521	glRasterPos2i (x, y);
1522		1730
1523	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1731	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1524		1732
1525	int glGenTexture ()	1733	int glGenTexture ()
1526	CODE:	1734	CODE:
…		…
1553		1761
1554	void glEndList ()	1762	void glEndList ()
1555		1763
1556	void glCallList (int list)	1764	void glCallList (int list)
1557		1765
		1766

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.71 by root, Fri May 5 19:05:47 2006 UTC vs. Revision 1.92 by elmex, Tue May 23 17:30:18 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.71 by root, Fri May 5 19:05:47 2006 UTC vs.
Revision 1.92 by elmex, Tue May 23 17:30:18 2006 UTC