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