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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.58 by root, Sun Apr 23 00:57:38 2006 UTC vs.
Revision 1.82 by root, Mon May 15 00:15:08 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>
40	#define FOW_DARKNESS 32	46	#define FOW_DARKNESS 32
41		47
42	#define MAP_EXTEND_X 32	48	#define MAP_EXTEND_X 32
43	#define MAP_EXTEND_Y 512	49	#define MAP_EXTEND_Y 512
44		50
45	#define MIN_FONT_HEIGHT 8 * PANGO_SCALE	51	#define MIN_FONT_HEIGHT 10
		52
		53	#define GL_CALL(type,func,args) \
		54	{ \
		55	static int init_; \
		56	static type fptr_; \
		57	\
		58	if (!init_) \
		59	{ \
		60	init_ = 1; \
		61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
		62	} \
		63	\
		64	if (fptr_) \
		65	fptr_ args; \
		66	}
46		67
47	typedef Mix_Chunk *CFClient__MixChunk;	68	typedef Mix_Chunk *CFClient__MixChunk;
48	typedef Mix_Music *CFClient__MixMusic;	69	typedef Mix_Music *CFClient__MixMusic;
49		70
50	static PangoContext *context;	71	typedef PangoFontDescription *CFClient__Font;
51	static PangoFontMap *fontmap;
52		72
53	typedef struct cf_layout {	73	typedef struct cf_layout {
54	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
55	int base_height;	77	int base_height;
		78	CFClient__Font font;
56	} *CFClient__Layout;	79	} *CFClient__Layout;
		80
		81	static CFClient__Font default_font;
		82	static PangoContext ft2_context, cairo_context;
		83	static PangoFontMap ft2_fontmap, cairo_fontmap;
57		84
58	static void	85	static void
59	substitute_func (FcPattern *pattern, gpointer data)	86	substitute_func (FcPattern *pattern, gpointer data)
60	{	87	{
61	FcPatternAddBool (pattern, FC_HINTING , 1);	88	FcPatternAddBool (pattern, FC_HINTING , 1);
		89	#ifndef _WIN32
62	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	90	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
		91	#endif
63	}	92	}
64		93
65	static void	94	static void
66	layout_update (CFClient__Layout self)	95	layout_update_font (CFClient__Layout self)
67	{	96	{
68	/* use a random scale factor to account for unknown descenders, 0.8 works	97	/* use a random scale factor to account for unknown descenders, 0.8 works
69	* reasonably well with bitstream vera	98	* reasonably well with bitstream vera
70	*/	99	*/
71	PangoFontDescription *font = pango_context_get_font_description (context);	100	PangoFontDescription *font = self->font ? self->font : default_font;
72		101
73	int height = self->base_height * (PANGO_SCALE * 8 / 10);
74
75	if (height < MIN_FONT_HEIGHT)
76	height = MIN_FONT_HEIGHT;
77
78	if (pango_font_description_get_size (font) != height)
79	{
80	pango_font_description_set_absolute_size (font, height);	102	pango_font_description_set_absolute_size (font,
81	pango_layout_context_changed (self->pl);	103	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
82	}	104
		105	pango_layout_set_font_description (self->pl, font);
83	}	106	}
84		107
85	static void	108	static void
86	layout_get_pixel_size (CFClient__Layout self, int w, int h)	109	layout_get_pixel_size (CFClient__Layout self, int w, int h)
87	{	110	{
88	layout_update (self);
89
90	pango_layout_get_pixel_size (self->pl, w, h);	111	pango_layout_get_pixel_size (self->pl, w, h);
91		112
92	w = (w + 3) & ~3;
93	if (!w) w = 1;	113	if (!w) w = 1;
94	if (!h) h = 1;	114	if (!h) h = 1;
		115
		116	w = (w + 3) & ~3;
95	}	117	}
96		118
97	typedef uint16_t mapface;	119	typedef uint16_t mapface;
98		120
99	typedef struct {	121	typedef struct {
…		…
247	}	269	}
248	}	270	}
249	}	271	}
250		272
251	static void	273	static void
252	music_finished ()	274	music_finished (void)
253	{	275	{
254	SDL_UserEvent ev;	276	SDL_UserEvent ev;
255		277
256	ev.type = SDL_USEREVENT;	278	ev.type = SDL_USEREVENT;
257	ev.code = 0;	279	ev.code = 0;
258	ev.data1 = 0;	280	ev.data1 = 0;
		281	ev.data2 = 0;
		282
		283	SDL_PushEvent ((SDL_Event *)&ev);
		284	}
		285
		286	static void
		287	channel_finished (int channel)
		288	{
		289	SDL_UserEvent ev;
		290
		291	ev.type = SDL_USEREVENT;
		292	ev.code = 1;
		293	ev.data1 = (void *)(long)channel;
259	ev.data2 = 0;	294	ev.data2 = 0;
260		295
261	SDL_PushEvent ((SDL_Event *)&ev);	296	SDL_PushEvent ((SDL_Event *)&ev);
262	}	297	}
263		298
…		…
374	# undef const_iv	409	# undef const_iv
375	};	410	};
376		411
377	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	412	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
378	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	413	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		414	}
379		415
		416	void
		417	pango_init ()
		418	CODE:
		419	{
		420	// delayed, so it can pick up new fonts added by AddFontResourceEx
380	fontmap = pango_ft2_font_map_new ();	421	ft2_fontmap = pango_ft2_font_map_new ();
381	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);	422	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
382	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);	423	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
		424
		425	cairo_fontmap = pango_cairo_font_map_get_default ();
		426	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
383	}	427	}
384		428
385	int	429	int
386	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	430	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
387		431
…		…
446		490
447	while (SDL_PollEvent (&ev))	491	while (SDL_PollEvent (&ev))
448	{	492	{
449	HV *hv = newHV ();	493	HV *hv = newHV ();
450	hv_store (hv, "type", 4, newSViv (ev.type), 0);	494	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		495
451	switch (ev.type)	496	switch (ev.type)
452	{	497	{
453	case SDL_KEYDOWN:	498	case SDL_KEYDOWN:
454	case SDL_KEYUP:	499	case SDL_KEYUP:
455	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	500	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
475	case SDL_MOUSEBUTTONUP:	520	case SDL_MOUSEBUTTONUP:
476	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	521	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
477	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	522	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
478	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	523	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
479	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	524	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		525	break;
		526
		527	case SDL_USEREVENT:
		528	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		529	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		530	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		531	break;
480	}	532	}
481		533
482	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	534	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
483	}	535	}
484	}	536	}
485		537
486	int	538	int
487	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	539	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
488	POSTCALL:	540	POSTCALL:
489	Mix_HookMusicFinished (music_finished);	541	Mix_HookMusicFinished (music_finished);
		542	Mix_ChannelFinished (channel_finished);
490		543
491	void	544	void
492	Mix_CloseAudio ()	545	Mix_CloseAudio ()
493		546
494	int	547	int
…		…
517		570
518	void	571	void
519	add_font (char *file)	572	add_font (char *file)
520	CODE:	573	CODE:
521	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	574	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
522		575	#ifdef _WIN32
523	void	576	// cairo... sigh... requires win2000
524	set_font (char *file)	577	AddFontResourceEx (file, FR_PRIVATE, 0);
525	CODE:	578	#endif
526	{
527	int count;
528	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )file, 0, 0, &count);
529	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
530	FcPatternDestroy (pattern);
531	pango_context_set_font_description (context, font);
532	}
533		579
534	void	580	void
535	load_image_inline (SV *image_)	581	load_image_inline (SV *image_)
536	ALIAS:	582	ALIAS:
537	load_image_file = 1	583	load_image_file = 1
…		…
619	PUSHs (sv_2mortal (newSViv (b / y)));	665	PUSHs (sv_2mortal (newSViv (b / y)));
620	PUSHs (sv_2mortal (newSViv (a / y)));	666	PUSHs (sv_2mortal (newSViv (a / y)));
621	}	667	}
622		668
623	void	669	void
		670	error (char *message)
		671	CODE:
		672	#ifdef _WIN32
		673	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
		674	#else
		675	fprintf (stderr, "ERROR: %s\n", message);
		676	#endif
		677
		678	void
624	fatal (char *message)	679	fatal (char *message)
625	CODE:	680	CODE:
626	#ifdef _WIN32	681	#ifdef _WIN32
627	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	682	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
628	#else	683	#else
629	fprintf (stderr, "FATAL: %s\n", message);	684	fprintf (stderr, "FATAL: %s\n", message);
630	#endif	685	#endif
631	exit (1);	686	exit (1);
632		687
		688	MODULE = CFClient PACKAGE = CFClient::Font
		689
		690	CFClient::Font
		691	new_from_file (SV class, char path, int id = 0)
		692	CODE:
		693	{
		694	int count;
		695	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
		696	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
		697	FcPatternDestroy (pattern);
		698	}
		699	OUTPUT:
		700	RETVAL
		701
		702	void
		703	DESTROY (CFClient::Font self)
		704	CODE:
		705	pango_font_description_free (self);
		706
		707	void
		708	make_default (CFClient::Font self)
		709	CODE:
		710	default_font = self;
		711
633	MODULE = CFClient PACKAGE = CFClient::Layout	712	MODULE = CFClient PACKAGE = CFClient::Layout
634		713
635	CFClient::Layout	714	CFClient::Layout
636	new (SV *class, int base_height = 10)	715	new (SV *class, int rgba = 0)
637	CODE:	716	CODE:
638	New (0, RETVAL, 1, struct cf_layout);	717	New (0, RETVAL, 1, struct cf_layout);
639	RETVAL->base_height = base_height;	718
640	RETVAL->pl = pango_layout_new (context);	719	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
		720	RETVAL->rgba = rgba;
		721	RETVAL->r = 1.;
		722	RETVAL->g = 1.;
		723	RETVAL->b = 1.;
		724	RETVAL->a = 1.;
		725	RETVAL->base_height = MIN_FONT_HEIGHT;
		726	RETVAL->font = 0;
		727
641	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	728	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
		729	layout_update_font (RETVAL);
642	OUTPUT:	730	OUTPUT:
643	RETVAL	731	RETVAL
644		732
645	void	733	void
646	DESTROY (CFClient::Layout self)	734	DESTROY (CFClient::Layout self)
647	CODE:	735	CODE:
648	g_object_unref (self->pl);	736	g_object_unref (self->pl);
649	Safefree (self);	737	Safefree (self);
650		738
		739	int
		740	is_rgba (CFClient::Layout self)
		741	CODE:
		742	RETVAL = self->rgba;
		743	OUTPUT:
		744	RETVAL
		745
651	void	746	void
652	set_text (CFClient::Layout self, SV *text_)	747	set_text (CFClient::Layout self, SV *text_)
653	CODE:	748	CODE:
654	{	749	{
655	STRLEN textlen;	750	STRLEN textlen;
…		…
675	SvUTF8_on (RETVAL);	770	SvUTF8_on (RETVAL);
676	OUTPUT:	771	OUTPUT:
677	RETVAL	772	RETVAL
678		773
679	void	774	void
		775	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
		776	CODE:
		777	self->r = r;
		778	self->g = g;
		779	self->b = b;
		780	self->a = a;
		781
		782	void
		783	set_font (CFClient::Layout self, CFClient::Font font = 0)
		784	CODE:
		785	if (self->font != font)
		786	{
		787	self->font = font;
		788	layout_update_font (self);
		789	}
		790
		791	void
680	set_height (CFClient::Layout self, int base_height)	792	set_height (CFClient::Layout self, int base_height)
681	CODE:	793	CODE:
		794	if (self->base_height != base_height)
		795	{
682	self->base_height = base_height;	796	self->base_height = base_height;
		797	layout_update_font (self);
		798	}
683		799
684	void	800	void
685	set_width (CFClient::Layout self, int max_width = -1)	801	set_width (CFClient::Layout self, int max_width = -1)
686	CODE:	802	CODE:
687	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	803	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
…		…
690	size (CFClient::Layout self)	806	size (CFClient::Layout self)
691	PPCODE:	807	PPCODE:
692	{	808	{
693	int w, h;	809	int w, h;
694		810
695	layout_update (self);
696	layout_get_pixel_size (self, &w, &h);	811	layout_get_pixel_size (self, &w, &h);
697		812
698	EXTEND (SP, 2);	813	EXTEND (SP, 2);
699	PUSHs (sv_2mortal (newSViv (w)));	814	PUSHs (sv_2mortal (newSViv (w)));
700	PUSHs (sv_2mortal (newSViv (h)));	815	PUSHs (sv_2mortal (newSViv (h)));
…		…
703	int	818	int
704	xy_to_index (CFClient::Layout self, int x, int y)	819	xy_to_index (CFClient::Layout self, int x, int y)
705	CODE:	820	CODE:
706	{	821	{
707	int index, trailing;	822	int index, trailing;
708
709	layout_update (self);
710	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	823	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
711
712	RETVAL = index;	824	RETVAL = index;
713	}	825	}
714	OUTPUT:	826	OUTPUT:
715	RETVAL	827	RETVAL
716		828
717	void	829	void
718	cursor_pos (CFClient::Layout self, int index)	830	cursor_pos (CFClient::Layout self, int index)
719	PPCODE:	831	PPCODE:
720	{	832	{
721	PangoRectangle strong_pos;	833	PangoRectangle strong_pos;
722	layout_update (self);
723	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	834	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
724		835
725	EXTEND (SP, 3);	836	EXTEND (SP, 3);
726	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	837	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
727	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	838	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
…		…
732	render (CFClient::Layout self)	843	render (CFClient::Layout self)
733	PPCODE:	844	PPCODE:
734	{	845	{
735	SV *retval;	846	SV *retval;
736	int w, h;	847	int w, h;
737	FT_Bitmap bitmap;
738		848
739	layout_update (self);
740	layout_get_pixel_size (self, &w, &h);	849	layout_get_pixel_size (self, &w, &h);
741		850
		851	if (self->rgba)
		852	{
		853	cairo_surface_t *surface;
		854	cairo_t *cairo;
		855
		856	retval = newSV (w * h * 4);
		857	SvPOK_only (retval);
		858	SvCUR_set (retval, w * h * 4);
		859
		860	memset (SvPVX (retval), 0, w * h * 4);
		861
		862	surface = cairo_image_surface_create_for_data (
		863	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		864	cairo = cairo_create (surface);
		865	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		866
		867	pango_cairo_show_layout (cairo, self->pl);
		868
		869	cairo_destroy (cairo);
		870	cairo_surface_destroy (surface);
		871
		872	// what a mess, and its premultiplied, too :(
		873	{
		874	uint32_t p = (uint32_t )SvPVX (retval);
		875	uint32_t e = p + w h;
		876
		877	while (p < e)
		878	{
		879	uint32_t rgba = *p;
		880	rgba = (rgba >> 24) \| (rgba << 8);
		881	rgba = SDL_SwapBE32 (rgba);
		882	*p++ = rgba;
		883	}
		884	}
		885
		886	EXTEND (SP, 5);
		887	PUSHs (sv_2mortal (newSViv (w)));
		888	PUSHs (sv_2mortal (newSViv (h)));
		889	PUSHs (sv_2mortal (retval));
		890	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		891	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		892	}
		893	else
		894	{
		895	FT_Bitmap bitmap;
		896
742	retval = newSV (w * h);	897	retval = newSV (w * h);
743	SvPOK_only (retval);	898	SvPOK_only (retval);
744	SvCUR_set (retval, w * h);	899	SvCUR_set (retval, w * h);
745		900
746	bitmap.rows = h;	901	bitmap.rows = h;
747	bitmap.width = w;	902	bitmap.width = w;
748	bitmap.pitch = w;	903	bitmap.pitch = w;
749	bitmap.buffer = (unsigned char*)SvPVX (retval);	904	bitmap.buffer = (unsigned char*)SvPVX (retval);
750	bitmap.num_grays = 256;	905	bitmap.num_grays = 256;
751	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	906	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
752		907
753	memset (bitmap.buffer, 0, w * h);	908	memset (bitmap.buffer, 0, w * h);
754		909
755	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	910	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
756		911
757	EXTEND (SP, 3);	912	EXTEND (SP, 5);
758	PUSHs (sv_2mortal (newSViv (w)));	913	PUSHs (sv_2mortal (newSViv (w)));
759	PUSHs (sv_2mortal (newSViv (h)));	914	PUSHs (sv_2mortal (newSViv (h)));
760	PUSHs (sv_2mortal (retval));	915	PUSHs (sv_2mortal (retval));
		916	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		917	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		918	}
761	}	919	}
762		920
763	MODULE = CFClient PACKAGE = CFClient::Texture	921	MODULE = CFClient PACKAGE = CFClient::Texture
764		922
765	void	923	void
766	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	924	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
767	PROTOTYPE: $$$;$$	925	PROTOTYPE: $$$;$$
		926	ALIAS:
		927	draw_quad_alpha = 1
		928	draw_quad_alpha_premultiplied = 2
768	CODE:	929	CODE:
769	{	930	{
770	HV hv = (HV )SvRV (self);	931	HV hv = (HV )SvRV (self);
771	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	932	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
772	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	933	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
777	{	938	{
778	w = SvNV (*hv_fetch (hv, "w", 1, 1));	939	w = SvNV (*hv_fetch (hv, "w", 1, 1));
779	h = SvNV (*hv_fetch (hv, "h", 1, 1));	940	h = SvNV (*hv_fetch (hv, "h", 1, 1));
780	}	941	}
781		942
		943	if (ix)
		944	{
		945	glEnable (GL_BLEND);
		946	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		947	}
		948
782	glBindTexture (GL_TEXTURE_2D, name);	949	glBindTexture (GL_TEXTURE_2D, name);
		950
783	if (wrap_mode) {	951	if (wrap_mode)
		952	{
784	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	953	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
785	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	954	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
786	}	955	}
		956
787	glBegin (GL_QUADS);	957	glBegin (GL_QUADS);
788	glTexCoord2f (0, 0); glVertex2f (x , y );	958	glTexCoord2f (0, 0); glVertex2f (x , y );
789	glTexCoord2f (0, t); glVertex2f (x , y + h);	959	glTexCoord2f (0, t); glVertex2f (x , y + h);
790	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	960	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
791	glTexCoord2f (s, 0); glVertex2f (x + w, y );	961	glTexCoord2f (s, 0); glVertex2f (x + w, y );
792	glEnd ();	962	glEnd ();
		963
		964	if (ix)
		965	glDisable (GL_BLEND);
793	}	966	}
794		967
795	MODULE = CFClient PACKAGE = CFClient::Map	968	MODULE = CFClient PACKAGE = CFClient::Map
796		969
797	CFClient::Map	970	CFClient::Map
…		…
1306	} *civ, const_iv[] = {	1479	} *civ, const_iv[] = {
1307	# define const_iv(name) { # name, (IV)name }	1480	# define const_iv(name) { # name, (IV)name }
1308	const_iv (GL_COLOR_MATERIAL),	1481	const_iv (GL_COLOR_MATERIAL),
1309	const_iv (GL_SMOOTH),	1482	const_iv (GL_SMOOTH),
1310	const_iv (GL_FLAT),	1483	const_iv (GL_FLAT),
		1484	const_iv (GL_DITHER),
1311	const_iv (GL_BLEND),	1485	const_iv (GL_BLEND),
		1486	const_iv (GL_SCISSOR_TEST),
1312	const_iv (GL_AND),	1487	const_iv (GL_AND),
		1488	const_iv (GL_ONE),
		1489	const_iv (GL_ZERO),
1313	const_iv (GL_SRC_ALPHA),	1490	const_iv (GL_SRC_ALPHA),
		1491	const_iv (GL_SRC_ALPHA_SATURATE),
1314	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1492	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1493	const_iv (GL_ONE_MINUS_DST_ALPHA),
1315	const_iv (GL_RGB),	1494	const_iv (GL_RGB),
1316	const_iv (GL_RGBA),	1495	const_iv (GL_RGBA),
1317	const_iv (GL_UNSIGNED_BYTE),	1496	const_iv (GL_UNSIGNED_BYTE),
1318	const_iv (GL_ALPHA4),
1319	const_iv (GL_ALPHA),	1497	const_iv (GL_ALPHA),
		1498	const_iv (GL_LUMINANCE),
1320	const_iv (GL_FLOAT),	1499	const_iv (GL_FLOAT),
1321	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1500	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1322	const_iv (GL_COMPILE),	1501	const_iv (GL_COMPILE),
1323	const_iv (GL_TEXTURE_1D),	1502	const_iv (GL_TEXTURE_1D),
1324	const_iv (GL_TEXTURE_2D),	1503	const_iv (GL_TEXTURE_2D),
…		…
1335	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1514	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1336	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1515	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1337	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1516	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1338	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1517	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1339	const_iv (GL_GENERATE_MIPMAP),	1518	const_iv (GL_GENERATE_MIPMAP),
1340	const_iv (GL_LINEAR),
1341	const_iv (GL_MODULATE),	1519	const_iv (GL_MODULATE),
		1520	const_iv (GL_DECAL),
1342	const_iv (GL_REPLACE),	1521	const_iv (GL_REPLACE),
1343	const_iv (GL_COLOR_BUFFER_BIT),	1522	const_iv (GL_COLOR_BUFFER_BIT),
1344	const_iv (GL_PROJECTION),	1523	const_iv (GL_PROJECTION),
1345	const_iv (GL_MODELVIEW),	1524	const_iv (GL_MODELVIEW),
1346	const_iv (GL_COLOR_LOGIC_OP),	1525	const_iv (GL_COLOR_LOGIC_OP),
		1526	const_iv (GL_SEPARABLE_2D),
1347	const_iv (GL_CONVOLUTION_2D),	1527	const_iv (GL_CONVOLUTION_2D),
1348	const_iv (GL_CONVOLUTION_BORDER_MODE),	1528	const_iv (GL_CONVOLUTION_BORDER_MODE),
1349	const_iv (GL_CONSTANT_BORDER),	1529	const_iv (GL_CONSTANT_BORDER),
1350	const_iv (GL_LINES),	1530	const_iv (GL_LINES),
1351	const_iv (GL_QUADS),	1531	const_iv (GL_QUADS),
…		…
1376		1556
1377	void glBlendFunc (int sfactor, int dfactor)	1557	void glBlendFunc (int sfactor, int dfactor)
1378		1558
1379	void glLogicOp (int opcode)	1559	void glLogicOp (int opcode)
1380		1560
		1561	void glColorMask (int red, int green, int blue, int alpha)
		1562
1381	void glMatrixMode (int mode)	1563	void glMatrixMode (int mode)
1382		1564
1383	void glPushMatrix ()	1565	void glPushMatrix ()
1384		1566
1385	void glPopMatrix ()	1567	void glPopMatrix ()
1386		1568
1387	void glLoadIdentity ()	1569	void glLoadIdentity ()
1388		1570
		1571	# near and far are due to microsofts buggy c compiler
1389	void glOrtho (double left, double right, double bottom, double top, double near, double far)	1572	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1390		1573
1391	void glViewport (int x, int y, int width, int height)	1574	void glViewport (int x, int y, int width, int height)
		1575
		1576	void glScissor (int x, int y, int width, int height)
1392		1577
1393	void glTranslate (float x, float y, float z = 0.)	1578	void glTranslate (float x, float y, float z = 0.)
1394	CODE:	1579	CODE:
1395	glTranslatef (x, y, z);	1580	glTranslatef (x, y, z);
1396		1581
1397	void glScale (float x, float y, float z)	1582	void glScale (float x, float y, float z = 1.)
1398	CODE:	1583	CODE:
1399	glScalef (x, y, z);	1584	glScalef (x, y, z);
1400		1585
1401	void glRotate (float angle, float x, float y, float z)	1586	void glRotate (float angle, float x, float y, float z)
1402	CODE:	1587	CODE:
…		…
1407	void glEnd ()	1592	void glEnd ()
1408		1593
1409	void glColor (float r, float g, float b, float a = 1.0)	1594	void glColor (float r, float g, float b, float a = 1.0)
1410	PROTOTYPE: @	1595	PROTOTYPE: @
1411	CODE:	1596	CODE:
1412	glColor4f (r, g, b, a);	1597	glColor4ub (MIN ((int)(r * 255.f), 255),
		1598	MIN ((int)(g * 255.f), 255),
		1599	MIN ((int)(b * 255.f), 255),
		1600	MIN ((int)(a * 255.f), 255));
1413		1601
1414	void glVertex (float x, float y, float z = 0.)	1602	void glVertex (float x, float y, float z = 0.)
1415	CODE:	1603	CODE:
1416	glVertex3f (x, y, z);	1604	glVertex3f (x, y, z);
1417		1605
…		…
1429		1617
1430	void glBindTexture (int target, int name)	1618	void glBindTexture (int target, int name)
1431		1619
1432	void glConvolutionParameter (int target, int pname, float params)	1620	void glConvolutionParameter (int target, int pname, float params)
1433	CODE:	1621	CODE:
1434	glConvolutionParameterf (target, pname, params);	1622	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1435		1623
1436	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1624	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1625	CODE:
		1626	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
		1627	(target, internalformat, width, height, format, type, data));
		1628
		1629	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		1630	CODE:
		1631	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
		1632	(target, internalformat, width, height, format, type, row, column));
1437		1633
1438	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1634	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1439		1635
1440	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1636	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1637
		1638	void glRasterPos (int x, int y)
		1639	CODE:
		1640	glRasterPos2i (x, y);
		1641
		1642	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1441		1643
1442	int glGenTexture ()	1644	int glGenTexture ()
1443	CODE:	1645	CODE:
1444	{	1646	{
1445	GLuint name;	1647	GLuint name;

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.58 by root, Sun Apr 23 00:57:38 2006 UTC vs. Revision 1.82 by root, Mon May 15 00:15:08 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.58 by root, Sun Apr 23 00:57:38 2006 UTC vs.
Revision 1.82 by root, Mon May 15 00:15:08 2006 UTC