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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.55 by root, Thu Apr 20 08:11:56 2006 UTC vs.
Revision 1.76 by root, Thu May 11 23:41:45 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>
33	typedef signed char int8_t;	36	typedef signed char int8_t;
34	typedef signed short int16_t;	37	typedef signed short int16_t;
35	typedef signed int int32_t;	38	typedef signed int int32_t;
36	#endif	39	#endif
37		40
		41	#include "glext.h"
		42
38	#define FOW_DARKNESS 32	43	#define FOW_DARKNESS 32
39		44
40	#define MAP_EXTEND_X 32	45	#define MAP_EXTEND_X 32
41	#define MAP_EXTEND_Y 512	46	#define MAP_EXTEND_Y 512
42		47
		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	}
		64
43	typedef Mix_Chunk *CFClient__MixChunk;	65	typedef Mix_Chunk *CFClient__MixChunk;
44	typedef Mix_Music *CFClient__MixMusic;	66	typedef Mix_Music *CFClient__MixMusic;
45		67
46	static PangoContext *context;	68	typedef PangoFontDescription *CFClient__Font;
47	static PangoFontMap *fontmap;
48		69
49	typedef struct cf_layout {	70	typedef struct cf_layout {
50	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
51	int base_height;	74	int base_height;
		75	CFClient__Font font;
52	} *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;
53		81
54	static void	82	static void
55	substitute_func (FcPattern *pattern, gpointer data)	83	substitute_func (FcPattern *pattern, gpointer data)
56	{	84	{
57	FcPatternAddBool (pattern, FC_HINTING , 1);	85	FcPatternAddBool (pattern, FC_HINTING , 1);
58	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	86	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
59	}	87	}
60		88
61	static void	89	static void
62	layout_update (CFClient__Layout self)	90	layout_update_font (CFClient__Layout self)
63	{	91	{
64	/* 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
65	* reasonably well with bitstream vera	93	* reasonably well with bitstream vera
66	*/	94	*/
67	PangoFontDescription *font = pango_context_get_font_description (context);	95	PangoFontDescription *font = self->font ? self->font : default_font;
68		96
69	int height = self->base_height * (PANGO_SCALE * 8 / 10);
70
71	if (pango_font_description_get_size (font) != height)
72	{
73	pango_font_description_set_absolute_size (font, height);	97	pango_font_description_set_absolute_size (font,
74	pango_layout_context_changed (self->pl);	98	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
75	}	99
		100	pango_layout_set_font_description (self->pl, font);
76	}	101	}
77		102
78	static void	103	static void
79	layout_get_pixel_size (CFClient__Layout self, int w, int h)	104	layout_get_pixel_size (CFClient__Layout self, int w, int h)
80	{	105	{
81	layout_update (self);
82
83	pango_layout_get_pixel_size (self->pl, w, h);	106	pango_layout_get_pixel_size (self->pl, w, h);
84		107
85	w = (w + 3) & ~3;
86	if (!w) w = 1;	108	if (!w) w = 1;
87	if (!h) h = 1;	109	if (!h) h = 1;
		110
		111	w = (w + 3) & ~3;
88	}	112	}
89		113
90	typedef uint16_t mapface;	114	typedef uint16_t mapface;
91		115
92	typedef struct {	116	typedef struct {
…		…
237	break;	261	break;
238		262
239	row->col[x - row->c0].darkness = -1;	263	row->col[x - row->c0].darkness = -1;
240	}	264	}
241	}	265	}
		266	}
		267
		268	static void
		269	music_finished (void)
		270	{
		271	SDL_UserEvent ev;
		272
		273	ev.type = SDL_USEREVENT;
		274	ev.code = 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;
		289	ev.data2 = 0;
		290
		291	SDL_PushEvent ((SDL_Event *)&ev);
242	}	292	}
243		293
244	MODULE = CFClient PACKAGE = CFClient	294	MODULE = CFClient PACKAGE = CFClient
245		295
246	PROTOTYPES: ENABLE	296	PROTOTYPES: ENABLE
…		…
355	};	405	};
356		406
357	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; )
358	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	408	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
359		409
360	fontmap = pango_ft2_font_map_new ();	410	ft2_fontmap = pango_ft2_font_map_new ();
361	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);
362	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);
363	}	416	}
364		417
365	int	418	int
366	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	419	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
367		420
…		…
426		479
427	while (SDL_PollEvent (&ev))	480	while (SDL_PollEvent (&ev))
428	{	481	{
429	HV *hv = newHV ();	482	HV *hv = newHV ();
430	hv_store (hv, "type", 4, newSViv (ev.type), 0);	483	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		484
431	switch (ev.type)	485	switch (ev.type)
432	{	486	{
433	case SDL_KEYDOWN:	487	case SDL_KEYDOWN:
434	case SDL_KEYUP:	488	case SDL_KEYUP:
435	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	489	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
455	case SDL_MOUSEBUTTONUP:	509	case SDL_MOUSEBUTTONUP:
456	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	510	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
457	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	511	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
458	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	512	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
459	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;
460	}	521	}
461		522
462	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	523	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
463	}	524	}
464	}	525	}
465		526
466	int	527	int
467	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)
		529	POSTCALL:
		530	Mix_HookMusicFinished (music_finished);
		531	Mix_ChannelFinished (channel_finished);
468		532
469	void	533	void
470	Mix_CloseAudio ()	534	Mix_CloseAudio ()
471		535
472	int	536	int
…		…
495		559
496	void	560	void
497	add_font (char *file)	561	add_font (char *file)
498	CODE:	562	CODE:
499	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	563	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
500
501	void
502	set_font (char *file)
503	CODE:
504	{
505	int count;
506	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )file, 0, 0, &count);
507	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
508	FcPatternDestroy (pattern);
509	pango_context_set_font_description (context, font);
510	}
511		564
512	void	565	void
513	load_image_inline (SV *image_)	566	load_image_inline (SV *image_)
514	ALIAS:	567	ALIAS:
515	load_image_file = 1	568	load_image_file = 1
…		…
597	PUSHs (sv_2mortal (newSViv (b / y)));	650	PUSHs (sv_2mortal (newSViv (b / y)));
598	PUSHs (sv_2mortal (newSViv (a / y)));	651	PUSHs (sv_2mortal (newSViv (a / y)));
599	}	652	}
600		653
601	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
602	fatal (char *message)	664	fatal (char *message)
603	CODE:	665	CODE:
604	#ifdef _WIN32	666	#ifdef _WIN32
605	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);
606	#else	668	#else
607	fprintf (stderr, "FATAL: %s\n", message);	669	fprintf (stderr, "FATAL: %s\n", message);
608	#endif	670	#endif
609	exit (1);	671	exit (1);
610		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
611	MODULE = CFClient PACKAGE = CFClient::Layout	697	MODULE = CFClient PACKAGE = CFClient::Layout
612		698
613	CFClient::Layout	699	CFClient::Layout
614	new (SV *class, int base_height = 10)	700	new (SV *class, int rgba = 0)
615	CODE:	701	CODE:
616	New (0, RETVAL, 1, struct cf_layout);	702	New (0, RETVAL, 1, struct cf_layout);
617	RETVAL->base_height = base_height;	703
618	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
619	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	713	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
		714	layout_update_font (RETVAL);
620	OUTPUT:	715	OUTPUT:
621	RETVAL	716	RETVAL
622		717
623	void	718	void
624	DESTROY (CFClient::Layout self)	719	DESTROY (CFClient::Layout self)
625	CODE:	720	CODE:
626	g_object_unref (self->pl);	721	g_object_unref (self->pl);
627	Safefree (self);	722	Safefree (self);
628		723
		724	int
		725	is_rgba (CFClient::Layout self)
		726	CODE:
		727	RETVAL = self->rgba;
		728	OUTPUT:
		729	RETVAL
		730
629	void	731	void
630	set_text (CFClient::Layout self, SV *text_)	732	set_text (CFClient::Layout self, SV *text_)
631	CODE:	733	CODE:
632	{	734	{
633	STRLEN textlen;	735	STRLEN textlen;
…		…
653	SvUTF8_on (RETVAL);	755	SvUTF8_on (RETVAL);
654	OUTPUT:	756	OUTPUT:
655	RETVAL	757	RETVAL
656		758
657	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
658	set_height (CFClient::Layout self, int base_height)	777	set_height (CFClient::Layout self, int base_height)
659	CODE:	778	CODE:
		779	if (self->base_height != base_height)
		780	{
660	self->base_height = base_height;	781	self->base_height = base_height;
		782	layout_update_font (self);
		783	}
661		784
662	void	785	void
663	set_width (CFClient::Layout self, int max_width = -1)	786	set_width (CFClient::Layout self, int max_width = -1)
664	CODE:	787	CODE:
665	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);
…		…
668	size (CFClient::Layout self)	791	size (CFClient::Layout self)
669	PPCODE:	792	PPCODE:
670	{	793	{
671	int w, h;	794	int w, h;
672		795
673	layout_update (self);
674	layout_get_pixel_size (self, &w, &h);	796	layout_get_pixel_size (self, &w, &h);
675		797
676	EXTEND (SP, 2);	798	EXTEND (SP, 2);
677	PUSHs (sv_2mortal (newSViv (w)));	799	PUSHs (sv_2mortal (newSViv (w)));
678	PUSHs (sv_2mortal (newSViv (h)));	800	PUSHs (sv_2mortal (newSViv (h)));
…		…
681	int	803	int
682	xy_to_index (CFClient::Layout self, int x, int y)	804	xy_to_index (CFClient::Layout self, int x, int y)
683	CODE:	805	CODE:
684	{	806	{
685	int index, trailing;	807	int index, trailing;
686
687	layout_update (self);
688	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);
689
690	RETVAL = index;	809	RETVAL = index;
691	}	810	}
692	OUTPUT:	811	OUTPUT:
693	RETVAL	812	RETVAL
694		813
695	void	814	void
696	cursor_pos (CFClient::Layout self, int index)	815	cursor_pos (CFClient::Layout self, int index)
697	PPCODE:	816	PPCODE:
698	{	817	{
699	PangoRectangle strong_pos;	818	PangoRectangle strong_pos;
700	layout_update (self);
701	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	819	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
702		820
703	EXTEND (SP, 3);	821	EXTEND (SP, 3);
704	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	822	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
705	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	823	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
…		…
710	render (CFClient::Layout self)	828	render (CFClient::Layout self)
711	PPCODE:	829	PPCODE:
712	{	830	{
713	SV *retval;	831	SV *retval;
714	int w, h;	832	int w, h;
715	FT_Bitmap bitmap;
716		833
717	layout_update (self);
718	layout_get_pixel_size (self, &w, &h);	834	layout_get_pixel_size (self, &w, &h);
719		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
720	retval = newSV (w * h);	882	retval = newSV (w * h);
721	SvPOK_only (retval);	883	SvPOK_only (retval);
722	SvCUR_set (retval, w * h);	884	SvCUR_set (retval, w * h);
723		885
724	bitmap.rows = h;	886	bitmap.rows = h;
725	bitmap.width = w;	887	bitmap.width = w;
726	bitmap.pitch = w;	888	bitmap.pitch = w;
727	bitmap.buffer = (unsigned char*)SvPVX (retval);	889	bitmap.buffer = (unsigned char*)SvPVX (retval);
728	bitmap.num_grays = 256;	890	bitmap.num_grays = 256;
729	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	891	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
730		892
731	memset (bitmap.buffer, 0, w * h);	893	memset (bitmap.buffer, 0, w * h);
732		894
733	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);
734		896
735	EXTEND (SP, 3);	897	EXTEND (SP, 5);
736	PUSHs (sv_2mortal (newSViv (w)));	898	PUSHs (sv_2mortal (newSViv (w)));
737	PUSHs (sv_2mortal (newSViv (h)));	899	PUSHs (sv_2mortal (newSViv (h)));
738	PUSHs (sv_2mortal (retval));	900	PUSHs (sv_2mortal (retval));
		901	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		902	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		903	}
739	}	904	}
740		905
741	MODULE = CFClient PACKAGE = CFClient::Texture	906	MODULE = CFClient PACKAGE = CFClient::Texture
742		907
743	void	908	void
744	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)
745	PROTOTYPE: $$$;$$	910	PROTOTYPE: $$$;$$
		911	ALIAS:
		912	draw_quad_alpha = 1
		913	draw_quad_alpha_premultiplied = 2
746	CODE:	914	CODE:
747	{	915	{
748	HV hv = (HV )SvRV (self);	916	HV hv = (HV )SvRV (self);
749	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	917	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
750	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	918	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
755	{	923	{
756	w = SvNV (*hv_fetch (hv, "w", 1, 1));	924	w = SvNV (*hv_fetch (hv, "w", 1, 1));
757	h = SvNV (*hv_fetch (hv, "h", 1, 1));	925	h = SvNV (*hv_fetch (hv, "h", 1, 1));
758	}	926	}
759		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
760	glBindTexture (GL_TEXTURE_2D, name);	934	glBindTexture (GL_TEXTURE_2D, name);
		935
761	if (wrap_mode) {	936	if (wrap_mode)
		937	{
762	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	938	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
763	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	939	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
764	}	940	}
		941
765	glBegin (GL_QUADS);	942	glBegin (GL_QUADS);
766	glTexCoord2f (0, 0); glVertex2f (x , y );	943	glTexCoord2f (0, 0); glVertex2f (x , y );
767	glTexCoord2f (0, t); glVertex2f (x , y + h);	944	glTexCoord2f (0, t); glVertex2f (x , y + h);
768	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	945	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
769	glTexCoord2f (s, 0); glVertex2f (x + w, y );	946	glTexCoord2f (s, 0); glVertex2f (x + w, y );
770	glEnd ();	947	glEnd ();
		948
		949	if (ix)
		950	glDisable (GL_BLEND);
771	}	951	}
772		952
773	MODULE = CFClient PACKAGE = CFClient::Map	953	MODULE = CFClient PACKAGE = CFClient::Map
774		954
775	CFClient::Map	955	CFClient::Map
…		…
1284	} *civ, const_iv[] = {	1464	} *civ, const_iv[] = {
1285	# define const_iv(name) { # name, (IV)name }	1465	# define const_iv(name) { # name, (IV)name }
1286	const_iv (GL_COLOR_MATERIAL),	1466	const_iv (GL_COLOR_MATERIAL),
1287	const_iv (GL_SMOOTH),	1467	const_iv (GL_SMOOTH),
1288	const_iv (GL_FLAT),	1468	const_iv (GL_FLAT),
		1469	const_iv (GL_DITHER),
1289	const_iv (GL_BLEND),	1470	const_iv (GL_BLEND),
		1471	const_iv (GL_SCISSOR_TEST),
1290	const_iv (GL_AND),	1472	const_iv (GL_AND),
		1473	const_iv (GL_ONE),
		1474	const_iv (GL_ZERO),
1291	const_iv (GL_SRC_ALPHA),	1475	const_iv (GL_SRC_ALPHA),
		1476	const_iv (GL_SRC_ALPHA_SATURATE),
1292	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1477	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1478	const_iv (GL_ONE_MINUS_DST_ALPHA),
1293	const_iv (GL_RGB),	1479	const_iv (GL_RGB),
1294	const_iv (GL_RGBA),	1480	const_iv (GL_RGBA),
1295	const_iv (GL_UNSIGNED_BYTE),	1481	const_iv (GL_UNSIGNED_BYTE),
1296	const_iv (GL_ALPHA4),
1297	const_iv (GL_ALPHA),	1482	const_iv (GL_ALPHA),
		1483	const_iv (GL_LUMINANCE),
1298	const_iv (GL_FLOAT),	1484	const_iv (GL_FLOAT),
1299	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1485	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1300	const_iv (GL_COMPILE),	1486	const_iv (GL_COMPILE),
1301	const_iv (GL_TEXTURE_1D),	1487	const_iv (GL_TEXTURE_1D),
1302	const_iv (GL_TEXTURE_2D),	1488	const_iv (GL_TEXTURE_2D),
…		…
1308	const_iv (GL_TEXTURE_WRAP_T),	1494	const_iv (GL_TEXTURE_WRAP_T),
1309	const_iv (GL_CLAMP),	1495	const_iv (GL_CLAMP),
1310	const_iv (GL_REPEAT),	1496	const_iv (GL_REPEAT),
1311	const_iv (GL_NEAREST),	1497	const_iv (GL_NEAREST),
1312	const_iv (GL_LINEAR),	1498	const_iv (GL_LINEAR),
		1499	const_iv (GL_NEAREST_MIPMAP_NEAREST),
		1500	const_iv (GL_LINEAR_MIPMAP_NEAREST),
		1501	const_iv (GL_NEAREST_MIPMAP_LINEAR),
		1502	const_iv (GL_LINEAR_MIPMAP_LINEAR),
		1503	const_iv (GL_GENERATE_MIPMAP),
1313	const_iv (GL_MODULATE),	1504	const_iv (GL_MODULATE),
		1505	const_iv (GL_DECAL),
1314	const_iv (GL_REPLACE),	1506	const_iv (GL_REPLACE),
1315	const_iv (GL_COLOR_BUFFER_BIT),	1507	const_iv (GL_COLOR_BUFFER_BIT),
1316	const_iv (GL_PROJECTION),	1508	const_iv (GL_PROJECTION),
1317	const_iv (GL_MODELVIEW),	1509	const_iv (GL_MODELVIEW),
1318	const_iv (GL_COLOR_LOGIC_OP),	1510	const_iv (GL_COLOR_LOGIC_OP),
		1511	const_iv (GL_SEPARABLE_2D),
1319	const_iv (GL_CONVOLUTION_2D),	1512	const_iv (GL_CONVOLUTION_2D),
1320	const_iv (GL_CONVOLUTION_BORDER_MODE),	1513	const_iv (GL_CONVOLUTION_BORDER_MODE),
1321	const_iv (GL_CONSTANT_BORDER),	1514	const_iv (GL_CONSTANT_BORDER),
1322	const_iv (GL_LINES),	1515	const_iv (GL_LINES),
1323	const_iv (GL_QUADS),	1516	const_iv (GL_QUADS),
…		…
1348		1541
1349	void glBlendFunc (int sfactor, int dfactor)	1542	void glBlendFunc (int sfactor, int dfactor)
1350		1543
1351	void glLogicOp (int opcode)	1544	void glLogicOp (int opcode)
1352		1545
		1546	void glColorMask (int red, int green, int blue, int alpha)
		1547
1353	void glMatrixMode (int mode)	1548	void glMatrixMode (int mode)
1354		1549
1355	void glPushMatrix ()	1550	void glPushMatrix ()
1356		1551
1357	void glPopMatrix ()	1552	void glPopMatrix ()
1358		1553
1359	void glLoadIdentity ()	1554	void glLoadIdentity ()
1360		1555
		1556	# near and far are due to microsofts buggy c compiler
1361	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_)
1362		1558
1363	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)
1364		1562
1365	void glTranslate (float x, float y, float z = 0.)	1563	void glTranslate (float x, float y, float z = 0.)
1366	CODE:	1564	CODE:
1367	glTranslatef (x, y, z);	1565	glTranslatef (x, y, z);
1368		1566
1369	void glScale (float x, float y, float z)	1567	void glScale (float x, float y, float z = 1.)
1370	CODE:	1568	CODE:
1371	glScalef (x, y, z);	1569	glScalef (x, y, z);
1372		1570
1373	void glRotate (float angle, float x, float y, float z)	1571	void glRotate (float angle, float x, float y, float z)
1374	CODE:	1572	CODE:
…		…
1379	void glEnd ()	1577	void glEnd ()
1380		1578
1381	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)
1382	PROTOTYPE: @	1580	PROTOTYPE: @
1383	CODE:	1581	CODE:
1384	glColor4f (r, g, b, a);	1582	glColor4ub (r * 255., g * 255., b * 255., a * 255.);
1385		1583
1386	void glVertex (float x, float y, float z = 0.)	1584	void glVertex (float x, float y, float z = 0.)
1387	CODE:	1585	CODE:
1388	glVertex3f (x, y, z);	1586	glVertex3f (x, y, z);
1389		1587
…		…
1401		1599
1402	void glBindTexture (int target, int name)	1600	void glBindTexture (int target, int name)
1403		1601
1404	void glConvolutionParameter (int target, int pname, float params)	1602	void glConvolutionParameter (int target, int pname, float params)
1405	CODE:	1603	CODE:
1406	glConvolutionParameterf (target, pname, params);	1604	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1407		1605
1408	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1606	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1607	CODE:
		1608	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
		1609	(target, internalformat, width, height, format, type, data));
		1610
		1611	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		1612	CODE:
		1613	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
		1614	(target, internalformat, width, height, format, type, row, column));
1409		1615
1410	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1616	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1411		1617
1412	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1618	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1619
		1620	void glRasterPos (int x, int y)
		1621	CODE:
		1622	glRasterPos2i (x, y);
		1623
		1624	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1413		1625
1414	int glGenTexture ()	1626	int glGenTexture ()
1415	CODE:	1627	CODE:
1416	{	1628	{
1417	GLuint name;	1629	GLuint name;

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.55 by root, Thu Apr 20 08:11:56 2006 UTC vs. Revision 1.76 by root, Thu May 11 23:41:45 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.55 by root, Thu Apr 20 08:11:56 2006 UTC vs.
Revision 1.76 by root, Thu May 11 23:41:45 2006 UTC