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