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