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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.60 by root, Sun Apr 23 04:47:02 2006 UTC vs.
Revision 1.78 by root, Fri May 12 01:47:03 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
2	# include <malloc.h>	2	# include <malloc.h>
		3	# pragma warning(disable:4244)
3	#endif	4	#endif
4		5
5	#include "EXTERN.h"	6	#include "EXTERN.h"
6	#include "perl.h"	7	#include "perl.h"
7	#include "XSUB.h"	8	#include "XSUB.h"
8		9
9	#include <string.h>	10	#include <string.h>
10	#include <stdio.h>	11	#include <stdio.h>
11		12
12	#include <SDL.h>	13	#include <SDL.h>
		14	#include <SDL_endian.h>
13	#include <SDL_image.h>	15	#include <SDL_image.h>
14	#include <SDL_mixer.h>	16	#include <SDL_mixer.h>
15	#include <SDL_opengl.h>	17	#include <SDL_opengl.h>
16		18
17	#include <glib/gmacros.h>	19	#include <glib/gmacros.h>
18		20
19	#include <pango/pango.h>	21	#include <pango/pango.h>
20	#include <pango/pangofc-fontmap.h>	22	#include <pango/pangofc-fontmap.h>
21	#include <pango/pangoft2.h>	23	#include <pango/pangoft2.h>
		24	#include <pango/pangocairo.h>
22		25
23	#ifndef _WIN32	26	#ifndef _WIN32
24	# include <sys/types.h>	27	# include <sys/types.h>
25	# include <sys/socket.h>	28	# include <sys/socket.h>
26	# include <netinet/in.h>	29	# include <netinet/in.h>
40	#define FOW_DARKNESS 32	43	#define FOW_DARKNESS 32
41		44
42	#define MAP_EXTEND_X 32	45	#define MAP_EXTEND_X 32
43	#define MAP_EXTEND_Y 512	46	#define MAP_EXTEND_Y 512
44		47
45	#define MIN_FONT_HEIGHT 8 * PANGO_SCALE	48	#define MIN_FONT_HEIGHT 10
		49
		50	#define GL_CALL(type,func,args) \
		51	{ \
		52	static int init_; \
		53	static type fptr_; \
		54	\
		55	if (!init_) \
		56	{ \
		57	init_ = 1; \
		58	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
		59	} \
		60	\
		61	if (fptr_) \
		62	fptr_ args; \
		63	}
46		64
47	typedef Mix_Chunk *CFClient__MixChunk;	65	typedef Mix_Chunk *CFClient__MixChunk;
48	typedef Mix_Music *CFClient__MixMusic;	66	typedef Mix_Music *CFClient__MixMusic;
49		67
50	static PangoContext *context;	68	typedef PangoFontDescription *CFClient__Font;
51	static PangoFontMap *fontmap;
52		69
53	typedef struct cf_layout {	70	typedef struct cf_layout {
54	PangoLayout *pl;	71	PangoLayout *pl; // either derived from a cairo or ft2 context
		72	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
		73	float r, g, b, a; // default color for rgba mode
55	int base_height;	74	int base_height;
		75	CFClient__Font font;
56	} *CFClient__Layout;	76	} *CFClient__Layout;
		77
		78	static CFClient__Font default_font;
		79	static PangoContext ft2_context, cairo_context;
		80	static PangoFontMap ft2_fontmap, cairo_fontmap;
57		81
58	static void	82	static void
59	substitute_func (FcPattern *pattern, gpointer data)	83	substitute_func (FcPattern *pattern, gpointer data)
60	{	84	{
61	FcPatternAddBool (pattern, FC_HINTING , 1);	85	FcPatternAddBool (pattern, FC_HINTING , 1);
62	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	86	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
63	}	87	}
64		88
65	static void	89	static void
66	layout_update (CFClient__Layout self)	90	layout_update_font (CFClient__Layout self)
67	{	91	{
68	/* use a random scale factor to account for unknown descenders, 0.8 works	92	/* use a random scale factor to account for unknown descenders, 0.8 works
69	* reasonably well with bitstream vera	93	* reasonably well with bitstream vera
70	*/	94	*/
71	PangoFontDescription font = (PangoFontDescription )	95	PangoFontDescription *font = self->font ? self->font : default_font;
72	pango_layout_get_font_description (self->pl);
73		96
74	int height = self->base_height * (PANGO_SCALE * 8 / 10);
75
76	if (height < MIN_FONT_HEIGHT)
77	height = MIN_FONT_HEIGHT;
78
79	if (pango_font_description_get_size (font) != height)
80	{
81	font = pango_font_description_copy (font);
82	pango_font_description_set_absolute_size (font, height);	97	pango_font_description_set_absolute_size (font,
		98	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
		99
83	pango_layout_set_font_description (self->pl, font);	100	pango_layout_set_font_description (self->pl, font);
84	}
85	}	101	}
86		102
87	static void	103	static void
88	layout_get_pixel_size (CFClient__Layout self, int w, int h)	104	layout_get_pixel_size (CFClient__Layout self, int w, int h)
89	{	105	{
90	layout_update (self);
91
92	pango_layout_get_pixel_size (self->pl, w, h);	106	pango_layout_get_pixel_size (self->pl, w, h);
93		107
94	w = (w + 3) & ~3;
95	if (!w) w = 1;	108	if (!w) w = 1;
96	if (!h) h = 1;	109	if (!h) h = 1;
		110
		111	w = (w + 3) & ~3;
97	}	112	}
98		113
99	typedef uint16_t mapface;	114	typedef uint16_t mapface;
100		115
101	typedef struct {	116	typedef struct {
…		…
249	}	264	}
250	}	265	}
251	}	266	}
252		267
253	static void	268	static void
254	music_finished ()	269	music_finished (void)
255	{	270	{
256	SDL_UserEvent ev;	271	SDL_UserEvent ev;
257		272
258	ev.type = SDL_USEREVENT;	273	ev.type = SDL_USEREVENT;
259	ev.code = 0;	274	ev.code = 0;
260	ev.data1 = 0;	275	ev.data1 = 0;
		276	ev.data2 = 0;
		277
		278	SDL_PushEvent ((SDL_Event *)&ev);
		279	}
		280
		281	static void
		282	channel_finished (int channel)
		283	{
		284	SDL_UserEvent ev;
		285
		286	ev.type = SDL_USEREVENT;
		287	ev.code = 1;
		288	ev.data1 = (void *)(long)channel;
261	ev.data2 = 0;	289	ev.data2 = 0;
262		290
263	SDL_PushEvent ((SDL_Event *)&ev);	291	SDL_PushEvent ((SDL_Event *)&ev);
264	}	292	}
265		293
…		…
377	};	405	};
378		406
379	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	407	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
380	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	408	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
381		409
382	fontmap = pango_ft2_font_map_new ();	410	ft2_fontmap = pango_ft2_font_map_new ();
383	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);	411	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
384	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);	412	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
		413
		414	cairo_fontmap = pango_cairo_font_map_get_default ();
		415	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
385	}	416	}
386		417
387	int	418	int
388	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	419	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
389		420
…		…
448		479
449	while (SDL_PollEvent (&ev))	480	while (SDL_PollEvent (&ev))
450	{	481	{
451	HV *hv = newHV ();	482	HV *hv = newHV ();
452	hv_store (hv, "type", 4, newSViv (ev.type), 0);	483	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		484
453	switch (ev.type)	485	switch (ev.type)
454	{	486	{
455	case SDL_KEYDOWN:	487	case SDL_KEYDOWN:
456	case SDL_KEYUP:	488	case SDL_KEYUP:
457	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	489	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
477	case SDL_MOUSEBUTTONUP:	509	case SDL_MOUSEBUTTONUP:
478	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	510	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
479	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	511	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
480	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	512	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
481	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	513	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		514	break;
		515
		516	case SDL_USEREVENT:
		517	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		518	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		519	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		520	break;
482	}	521	}
483		522
484	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	523	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
485	}	524	}
486	}	525	}
487		526
488	int	527	int
489	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	528	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
490	POSTCALL:	529	POSTCALL:
491	Mix_HookMusicFinished (music_finished);	530	Mix_HookMusicFinished (music_finished);
		531	Mix_ChannelFinished (channel_finished);
492		532
493	void	533	void
494	Mix_CloseAudio ()	534	Mix_CloseAudio ()
495		535
496	int	536	int
…		…
519		559
520	void	560	void
521	add_font (char *file)	561	add_font (char *file)
522	CODE:	562	CODE:
523	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	563	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
524
525	void
526	set_font (char *file)
527	CODE:
528	{
529	int count;
530	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )file, 0, 0, &count);
531	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
532	FcPatternDestroy (pattern);
533	pango_font_description_set_absolute_size (font, MIN_FONT_HEIGHT);
534	pango_context_set_font_description (context, font);
535	}
536		564
537	void	565	void
538	load_image_inline (SV *image_)	566	load_image_inline (SV *image_)
539	ALIAS:	567	ALIAS:
540	load_image_file = 1	568	load_image_file = 1
…		…
622	PUSHs (sv_2mortal (newSViv (b / y)));	650	PUSHs (sv_2mortal (newSViv (b / y)));
623	PUSHs (sv_2mortal (newSViv (a / y)));	651	PUSHs (sv_2mortal (newSViv (a / y)));
624	}	652	}
625		653
626	void	654	void
		655	error (char *message)
		656	CODE:
		657	#ifdef _WIN32
		658	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
		659	#else
		660	fprintf (stderr, "ERROR: %s\n", message);
		661	#endif
		662
		663	void
627	fatal (char *message)	664	fatal (char *message)
628	CODE:	665	CODE:
629	#ifdef _WIN32	666	#ifdef _WIN32
630	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	667	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
631	#else	668	#else
632	fprintf (stderr, "FATAL: %s\n", message);	669	fprintf (stderr, "FATAL: %s\n", message);
633	#endif	670	#endif
634	exit (1);	671	exit (1);
635		672
		673	MODULE = CFClient PACKAGE = CFClient::Font
		674
		675	CFClient::Font
		676	new_from_file (SV class, char path, int id = 0)
		677	CODE:
		678	{
		679	int count;
		680	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
		681	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
		682	FcPatternDestroy (pattern);
		683	}
		684	OUTPUT:
		685	RETVAL
		686
		687	void
		688	DESTROY (CFClient::Font self)
		689	CODE:
		690	pango_font_description_free (self);
		691
		692	void
		693	make_default (CFClient::Font self)
		694	CODE:
		695	default_font = self;
		696
636	MODULE = CFClient PACKAGE = CFClient::Layout	697	MODULE = CFClient PACKAGE = CFClient::Layout
637		698
638	CFClient::Layout	699	CFClient::Layout
639	new (SV *class, int base_height = 10)	700	new (SV *class, int rgba = 0)
640	CODE:	701	CODE:
641	New (0, RETVAL, 1, struct cf_layout);	702	New (0, RETVAL, 1, struct cf_layout);
642	RETVAL->base_height = base_height;	703
643	RETVAL->pl = pango_layout_new (context);	704	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
		705	RETVAL->rgba = rgba;
		706	RETVAL->r = 1.;
		707	RETVAL->g = 1.;
		708	RETVAL->b = 1.;
		709	RETVAL->a = 1.;
		710	RETVAL->base_height = MIN_FONT_HEIGHT;
		711	RETVAL->font = 0;
		712
644	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	713	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
645	pango_layout_set_font_description (RETVAL->pl,	714	layout_update_font (RETVAL);
646	pango_font_description_copy (
647	pango_context_get_font_description (context)));
648	OUTPUT:	715	OUTPUT:
649	RETVAL	716	RETVAL
650		717
651	void	718	void
652	DESTROY (CFClient::Layout self)	719	DESTROY (CFClient::Layout self)
653	CODE:	720	CODE:
654	g_object_unref (self->pl);	721	g_object_unref (self->pl);
655	Safefree (self);	722	Safefree (self);
656		723
		724	int
		725	is_rgba (CFClient::Layout self)
		726	CODE:
		727	RETVAL = self->rgba;
		728	OUTPUT:
		729	RETVAL
		730
657	void	731	void
658	set_text (CFClient::Layout self, SV *text_)	732	set_text (CFClient::Layout self, SV *text_)
659	CODE:	733	CODE:
660	{	734	{
661	STRLEN textlen;	735	STRLEN textlen;
…		…
681	SvUTF8_on (RETVAL);	755	SvUTF8_on (RETVAL);
682	OUTPUT:	756	OUTPUT:
683	RETVAL	757	RETVAL
684		758
685	void	759	void
		760	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
		761	CODE:
		762	self->r = r;
		763	self->g = g;
		764	self->b = b;
		765	self->a = a;
		766
		767	void
		768	set_font (CFClient::Layout self, CFClient::Font font = 0)
		769	CODE:
		770	if (self->font != font)
		771	{
		772	self->font = font;
		773	layout_update_font (self);
		774	}
		775
		776	void
686	set_height (CFClient::Layout self, int base_height)	777	set_height (CFClient::Layout self, int base_height)
687	CODE:	778	CODE:
		779	if (self->base_height != base_height)
		780	{
688	self->base_height = base_height;	781	self->base_height = base_height;
		782	layout_update_font (self);
		783	}
689		784
690	void	785	void
691	set_width (CFClient::Layout self, int max_width = -1)	786	set_width (CFClient::Layout self, int max_width = -1)
692	CODE:	787	CODE:
693	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	788	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
…		…
696	size (CFClient::Layout self)	791	size (CFClient::Layout self)
697	PPCODE:	792	PPCODE:
698	{	793	{
699	int w, h;	794	int w, h;
700		795
701	layout_update (self);
702	layout_get_pixel_size (self, &w, &h);	796	layout_get_pixel_size (self, &w, &h);
703		797
704	EXTEND (SP, 2);	798	EXTEND (SP, 2);
705	PUSHs (sv_2mortal (newSViv (w)));	799	PUSHs (sv_2mortal (newSViv (w)));
706	PUSHs (sv_2mortal (newSViv (h)));	800	PUSHs (sv_2mortal (newSViv (h)));
…		…
709	int	803	int
710	xy_to_index (CFClient::Layout self, int x, int y)	804	xy_to_index (CFClient::Layout self, int x, int y)
711	CODE:	805	CODE:
712	{	806	{
713	int index, trailing;	807	int index, trailing;
714
715	layout_update (self);
716	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	808	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
717
718	RETVAL = index;	809	RETVAL = index;
719	}	810	}
720	OUTPUT:	811	OUTPUT:
721	RETVAL	812	RETVAL
722		813
723	void	814	void
724	cursor_pos (CFClient::Layout self, int index)	815	cursor_pos (CFClient::Layout self, int index)
725	PPCODE:	816	PPCODE:
726	{	817	{
727	PangoRectangle strong_pos;	818	PangoRectangle strong_pos;
728	layout_update (self);
729	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	819	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
730		820
731	EXTEND (SP, 3);	821	EXTEND (SP, 3);
732	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	822	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
733	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	823	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
…		…
738	render (CFClient::Layout self)	828	render (CFClient::Layout self)
739	PPCODE:	829	PPCODE:
740	{	830	{
741	SV *retval;	831	SV *retval;
742	int w, h;	832	int w, h;
743	FT_Bitmap bitmap;
744		833
745	layout_update (self);
746	layout_get_pixel_size (self, &w, &h);	834	layout_get_pixel_size (self, &w, &h);
747		835
		836	if (self->rgba)
		837	{
		838	cairo_surface_t *surface;
		839	cairo_t *cairo;
		840
		841	retval = newSV (w * h * 4);
		842	SvPOK_only (retval);
		843	SvCUR_set (retval, w * h * 4);
		844
		845	memset (SvPVX (retval), 0, w * h * 4);
		846
		847	surface = cairo_image_surface_create_for_data (
		848	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		849	cairo = cairo_create (surface);
		850	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		851
		852	pango_cairo_show_layout (cairo, self->pl);
		853
		854	cairo_destroy (cairo);
		855	cairo_surface_destroy (surface);
		856
		857	// what a mess, and its premultiplied, too :(
		858	{
		859	uint32_t p = (uint32_t )SvPVX (retval);
		860	uint32_t e = p + w h;
		861
		862	while (p < e)
		863	{
		864	uint32_t rgba = *p;
		865	rgba = (rgba >> 24) \| (rgba << 8);
		866	rgba = SDL_SwapBE32 (rgba);
		867	*p++ = rgba;
		868	}
		869	}
		870
		871	EXTEND (SP, 5);
		872	PUSHs (sv_2mortal (newSViv (w)));
		873	PUSHs (sv_2mortal (newSViv (h)));
		874	PUSHs (sv_2mortal (retval));
		875	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		876	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		877	}
		878	else
		879	{
		880	FT_Bitmap bitmap;
		881
748	retval = newSV (w * h);	882	retval = newSV (w * h);
749	SvPOK_only (retval);	883	SvPOK_only (retval);
750	SvCUR_set (retval, w * h);	884	SvCUR_set (retval, w * h);
751		885
752	bitmap.rows = h;	886	bitmap.rows = h;
753	bitmap.width = w;	887	bitmap.width = w;
754	bitmap.pitch = w;	888	bitmap.pitch = w;
755	bitmap.buffer = (unsigned char*)SvPVX (retval);	889	bitmap.buffer = (unsigned char*)SvPVX (retval);
756	bitmap.num_grays = 256;	890	bitmap.num_grays = 256;
757	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	891	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
758		892
759	memset (bitmap.buffer, 0, w * h);	893	memset (bitmap.buffer, 0, w * h);
760		894
761	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	895	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
762		896
763	EXTEND (SP, 3);	897	EXTEND (SP, 5);
764	PUSHs (sv_2mortal (newSViv (w)));	898	PUSHs (sv_2mortal (newSViv (w)));
765	PUSHs (sv_2mortal (newSViv (h)));	899	PUSHs (sv_2mortal (newSViv (h)));
766	PUSHs (sv_2mortal (retval));	900	PUSHs (sv_2mortal (retval));
		901	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		902	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		903	}
767	}	904	}
768		905
769	MODULE = CFClient PACKAGE = CFClient::Texture	906	MODULE = CFClient PACKAGE = CFClient::Texture
770		907
771	void	908	void
772	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	909	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
773	PROTOTYPE: $$$;$$	910	PROTOTYPE: $$$;$$
		911	ALIAS:
		912	draw_quad_alpha = 1
		913	draw_quad_alpha_premultiplied = 2
774	CODE:	914	CODE:
775	{	915	{
776	HV hv = (HV )SvRV (self);	916	HV hv = (HV )SvRV (self);
777	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	917	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
778	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	918	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
783	{	923	{
784	w = SvNV (*hv_fetch (hv, "w", 1, 1));	924	w = SvNV (*hv_fetch (hv, "w", 1, 1));
785	h = SvNV (*hv_fetch (hv, "h", 1, 1));	925	h = SvNV (*hv_fetch (hv, "h", 1, 1));
786	}	926	}
787		927
		928	if (ix)
		929	{
		930	glEnable (GL_BLEND);
		931	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		932	}
		933
788	glBindTexture (GL_TEXTURE_2D, name);	934	glBindTexture (GL_TEXTURE_2D, name);
		935
789	if (wrap_mode) {	936	if (wrap_mode)
		937	{
790	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	938	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
791	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	939	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
792	}	940	}
		941
793	glBegin (GL_QUADS);	942	glBegin (GL_QUADS);
794	glTexCoord2f (0, 0); glVertex2f (x , y );	943	glTexCoord2f (0, 0); glVertex2f (x , y );
795	glTexCoord2f (0, t); glVertex2f (x , y + h);	944	glTexCoord2f (0, t); glVertex2f (x , y + h);
796	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	945	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
797	glTexCoord2f (s, 0); glVertex2f (x + w, y );	946	glTexCoord2f (s, 0); glVertex2f (x + w, y );
798	glEnd ();	947	glEnd ();
		948
		949	if (ix)
		950	glDisable (GL_BLEND);
799	}	951	}
800		952
801	MODULE = CFClient PACKAGE = CFClient::Map	953	MODULE = CFClient PACKAGE = CFClient::Map
802		954
803	CFClient::Map	955	CFClient::Map
…		…
1312	} *civ, const_iv[] = {	1464	} *civ, const_iv[] = {
1313	# define const_iv(name) { # name, (IV)name }	1465	# define const_iv(name) { # name, (IV)name }
1314	const_iv (GL_COLOR_MATERIAL),	1466	const_iv (GL_COLOR_MATERIAL),
1315	const_iv (GL_SMOOTH),	1467	const_iv (GL_SMOOTH),
1316	const_iv (GL_FLAT),	1468	const_iv (GL_FLAT),
		1469	const_iv (GL_DITHER),
1317	const_iv (GL_BLEND),	1470	const_iv (GL_BLEND),
		1471	const_iv (GL_SCISSOR_TEST),
1318	const_iv (GL_AND),	1472	const_iv (GL_AND),
		1473	const_iv (GL_ONE),
		1474	const_iv (GL_ZERO),
1319	const_iv (GL_SRC_ALPHA),	1475	const_iv (GL_SRC_ALPHA),
		1476	const_iv (GL_SRC_ALPHA_SATURATE),
1320	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1477	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1478	const_iv (GL_ONE_MINUS_DST_ALPHA),
1321	const_iv (GL_RGB),	1479	const_iv (GL_RGB),
1322	const_iv (GL_RGBA),	1480	const_iv (GL_RGBA),
1323	const_iv (GL_UNSIGNED_BYTE),	1481	const_iv (GL_UNSIGNED_BYTE),
1324	const_iv (GL_ALPHA4),
1325	const_iv (GL_ALPHA),	1482	const_iv (GL_ALPHA),
		1483	const_iv (GL_LUMINANCE),
1326	const_iv (GL_FLOAT),	1484	const_iv (GL_FLOAT),
1327	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1485	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1328	const_iv (GL_COMPILE),	1486	const_iv (GL_COMPILE),
1329	const_iv (GL_TEXTURE_1D),	1487	const_iv (GL_TEXTURE_1D),
1330	const_iv (GL_TEXTURE_2D),	1488	const_iv (GL_TEXTURE_2D),
…		…
1341	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1499	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1342	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1500	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1343	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1501	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1344	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1502	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1345	const_iv (GL_GENERATE_MIPMAP),	1503	const_iv (GL_GENERATE_MIPMAP),
1346	const_iv (GL_LINEAR),
1347	const_iv (GL_MODULATE),	1504	const_iv (GL_MODULATE),
		1505	const_iv (GL_DECAL),
1348	const_iv (GL_REPLACE),	1506	const_iv (GL_REPLACE),
1349	const_iv (GL_COLOR_BUFFER_BIT),	1507	const_iv (GL_COLOR_BUFFER_BIT),
1350	const_iv (GL_PROJECTION),	1508	const_iv (GL_PROJECTION),
1351	const_iv (GL_MODELVIEW),	1509	const_iv (GL_MODELVIEW),
1352	const_iv (GL_COLOR_LOGIC_OP),	1510	const_iv (GL_COLOR_LOGIC_OP),
		1511	const_iv (GL_SEPARABLE_2D),
1353	const_iv (GL_CONVOLUTION_2D),	1512	const_iv (GL_CONVOLUTION_2D),
1354	const_iv (GL_CONVOLUTION_BORDER_MODE),	1513	const_iv (GL_CONVOLUTION_BORDER_MODE),
1355	const_iv (GL_CONSTANT_BORDER),	1514	const_iv (GL_CONSTANT_BORDER),
1356	const_iv (GL_LINES),	1515	const_iv (GL_LINES),
1357	const_iv (GL_QUADS),	1516	const_iv (GL_QUADS),
…		…
1382		1541
1383	void glBlendFunc (int sfactor, int dfactor)	1542	void glBlendFunc (int sfactor, int dfactor)
1384		1543
1385	void glLogicOp (int opcode)	1544	void glLogicOp (int opcode)
1386		1545
		1546	void glColorMask (int red, int green, int blue, int alpha)
		1547
1387	void glMatrixMode (int mode)	1548	void glMatrixMode (int mode)
1388		1549
1389	void glPushMatrix ()	1550	void glPushMatrix ()
1390		1551
1391	void glPopMatrix ()	1552	void glPopMatrix ()
1392		1553
1393	void glLoadIdentity ()	1554	void glLoadIdentity ()
1394		1555
		1556	# near and far are due to microsofts buggy c compiler
1395	void glOrtho (double left, double right, double bottom, double top, double near, double far)	1557	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1396		1558
1397	void glViewport (int x, int y, int width, int height)	1559	void glViewport (int x, int y, int width, int height)
		1560
		1561	void glScissor (int x, int y, int width, int height)
1398		1562
1399	void glTranslate (float x, float y, float z = 0.)	1563	void glTranslate (float x, float y, float z = 0.)
1400	CODE:	1564	CODE:
1401	glTranslatef (x, y, z);	1565	glTranslatef (x, y, z);
1402		1566
1403	void glScale (float x, float y, float z)	1567	void glScale (float x, float y, float z = 1.)
1404	CODE:	1568	CODE:
1405	glScalef (x, y, z);	1569	glScalef (x, y, z);
1406		1570
1407	void glRotate (float angle, float x, float y, float z)	1571	void glRotate (float angle, float x, float y, float z)
1408	CODE:	1572	CODE:
…		…
1413	void glEnd ()	1577	void glEnd ()
1414		1578
1415	void glColor (float r, float g, float b, float a = 1.0)	1579	void glColor (float r, float g, float b, float a = 1.0)
1416	PROTOTYPE: @	1580	PROTOTYPE: @
1417	CODE:	1581	CODE:
1418	glColor4f (r, g, b, a);	1582	// 255.999 is close enough to correctness (256 and clamp)
		1583	glColor4ub (r * 255.999, g * 255.999, b * 255.999, a * 255.999);
1419		1584
1420	void glVertex (float x, float y, float z = 0.)	1585	void glVertex (float x, float y, float z = 0.)
1421	CODE:	1586	CODE:
1422	glVertex3f (x, y, z);	1587	glVertex3f (x, y, z);
1423		1588
…		…
1435		1600
1436	void glBindTexture (int target, int name)	1601	void glBindTexture (int target, int name)
1437		1602
1438	void glConvolutionParameter (int target, int pname, float params)	1603	void glConvolutionParameter (int target, int pname, float params)
1439	CODE:	1604	CODE:
1440	glConvolutionParameterf (target, pname, params);	1605	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1441		1606
1442	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1607	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1608	CODE:
		1609	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
		1610	(target, internalformat, width, height, format, type, data));
		1611
		1612	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		1613	CODE:
		1614	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
		1615	(target, internalformat, width, height, format, type, row, column));
1443		1616
1444	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1617	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1445		1618
1446	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1619	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1620
		1621	void glRasterPos (int x, int y)
		1622	CODE:
		1623	glRasterPos2i (x, y);
		1624
		1625	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1447		1626
1448	int glGenTexture ()	1627	int glGenTexture ()
1449	CODE:	1628	CODE:
1450	{	1629	{
1451	GLuint name;	1630	GLuint name;

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.60 by root, Sun Apr 23 04:47:02 2006 UTC vs. Revision 1.78 by root, Fri May 12 01:47:03 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.60 by root, Sun Apr 23 04:47:02 2006 UTC vs.
Revision 1.78 by root, Fri May 12 01:47:03 2006 UTC