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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.57 by root, Fri Apr 21 07:09:10 2006 UTC vs. Revision 1.83 by root, Mon May 15 00:25:14 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.57 by root, Fri Apr 21 07:09:10 2006 UTC vs.
Revision 1.83 by root, Mon May 15 00:25:14 2006 UTC