[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.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
		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	}
		66
45	typedef Mix_Chunk *CFClient__MixChunk;	67	typedef Mix_Chunk *CFClient__MixChunk;
46	typedef Mix_Music *CFClient__MixMusic;	68	typedef Mix_Music *CFClient__MixMusic;
47		69
48	static PangoContext *context;	70	typedef PangoFontDescription *CFClient__Font;
49	static PangoFontMap *fontmap;
50		71
51	typedef struct cf_layout {	72	typedef struct cf_layout {
52	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
53	int base_height;	76	int base_height;
		77	CFClient__Font font;
54	} *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;
55		83
56	static void	84	static void
57	substitute_func (FcPattern *pattern, gpointer data)	85	substitute_func (FcPattern *pattern, gpointer data)
58	{	86	{
59	FcPatternAddBool (pattern, FC_HINTING , 1);	87	FcPatternAddBool (pattern, FC_HINTING , 1);
60	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	88	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
61	}	89	}
62		90
63	static void	91	static void
64	layout_update (CFClient__Layout self)	92	layout_update_font (CFClient__Layout self)
65	{	93	{
66	/* 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
67	* reasonably well with bitstream vera	95	* reasonably well with bitstream vera
68	*/	96	*/
69	PangoFontDescription *font = pango_context_get_font_description (context);	97	PangoFontDescription *font = self->font ? self->font : default_font;
70		98
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);	99	pango_font_description_set_absolute_size (font,
76	pango_layout_context_changed (self->pl);	100	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
77	}	101
		102	pango_layout_set_font_description (self->pl, font);
78	}	103	}
79		104
80	static void	105	static void
81	layout_get_pixel_size (CFClient__Layout self, int w, int h)	106	layout_get_pixel_size (CFClient__Layout self, int w, int h)
82	{	107	{
83	layout_update (self);
84
85	pango_layout_get_pixel_size (self->pl, w, h);	108	pango_layout_get_pixel_size (self->pl, w, h);
86		109
87	w = (w + 3) & ~3;
88	if (!w) w = 1;	110	if (!w) w = 1;
89	if (!h) h = 1;	111	if (!h) h = 1;
		112
		113	w = (w + 3) & ~3;
90	}	114	}
91		115
92	typedef uint16_t mapface;	116	typedef uint16_t mapface;
93		117
94	typedef struct {	118	typedef struct {
…		…
242	}	266	}
243	}	267	}
244	}	268	}
245		269
246	static void	270	static void
247	music_finished ()	271	music_finished (void)
248	{	272	{
249	SDL_UserEvent ev;	273	SDL_UserEvent ev;
250		274
251	ev.type = SDL_USEREVENT;	275	ev.type = SDL_USEREVENT;
252	ev.code = 0;	276	ev.code = 0;
253	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;
254	ev.data2 = 0;	291	ev.data2 = 0;
255		292
256	SDL_PushEvent ((SDL_Event *)&ev);	293	SDL_PushEvent ((SDL_Event *)&ev);
257	}	294	}
258		295
…		…
369	# undef const_iv	406	# undef const_iv
370	};	407	};
371		408
372	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; )
373	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	410	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		411	}
374		412
		413	void
		414	pango_init ()
		415	CODE:
		416	{
		417	// delayed, so it can pick up new fonts added by AddFontResourceEx
375	fontmap = pango_ft2_font_map_new ();	418	ft2_fontmap = pango_ft2_font_map_new ();
376	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);
377	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);
378	}	424	}
379		425
380	int	426	int
381	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	427	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
382		428
…		…
441		487
442	while (SDL_PollEvent (&ev))	488	while (SDL_PollEvent (&ev))
443	{	489	{
444	HV *hv = newHV ();	490	HV *hv = newHV ();
445	hv_store (hv, "type", 4, newSViv (ev.type), 0);	491	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		492
446	switch (ev.type)	493	switch (ev.type)
447	{	494	{
448	case SDL_KEYDOWN:	495	case SDL_KEYDOWN:
449	case SDL_KEYUP:	496	case SDL_KEYUP:
450	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	497	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
470	case SDL_MOUSEBUTTONUP:	517	case SDL_MOUSEBUTTONUP:
471	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	518	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
472	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	519	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
473	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	520	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
474	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;
475	}	529	}
476		530
477	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	531	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
478	}	532	}
479	}	533	}
480		534
481	int	535	int
482	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)
483	POSTCALL:	537	POSTCALL:
484	Mix_HookMusicFinished (music_finished);	538	Mix_HookMusicFinished (music_finished);
		539	Mix_ChannelFinished (channel_finished);
485		540
486	void	541	void
487	Mix_CloseAudio ()	542	Mix_CloseAudio ()
488		543
489	int	544	int
…		…
512		567
513	void	568	void
514	add_font (char *file)	569	add_font (char *file)
515	CODE:	570	CODE:
516	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	571	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
517		572	#ifdef _WIN32
518	void	573	// cairo... sigh... requires win2000
519	set_font (char *file)	574	AddFontResourceEx (file, FR_PRIVATE, 0);
520	CODE:	575	#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		576
529	void	577	void
530	load_image_inline (SV *image_)	578	load_image_inline (SV *image_)
531	ALIAS:	579	ALIAS:
532	load_image_file = 1	580	load_image_file = 1
…		…
614	PUSHs (sv_2mortal (newSViv (b / y)));	662	PUSHs (sv_2mortal (newSViv (b / y)));
615	PUSHs (sv_2mortal (newSViv (a / y)));	663	PUSHs (sv_2mortal (newSViv (a / y)));
616	}	664	}
617		665
618	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
619	fatal (char *message)	676	fatal (char *message)
620	CODE:	677	CODE:
621	#ifdef _WIN32	678	#ifdef _WIN32
622	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);
623	#else	680	#else
624	fprintf (stderr, "FATAL: %s\n", message);	681	fprintf (stderr, "FATAL: %s\n", message);
625	#endif	682	#endif
626	exit (1);	683	exit (1);
627		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
628	MODULE = CFClient PACKAGE = CFClient::Layout	709	MODULE = CFClient PACKAGE = CFClient::Layout
629		710
630	CFClient::Layout	711	CFClient::Layout
631	new (SV *class, int base_height = 10)	712	new (SV *class, int rgba = 0)
632	CODE:	713	CODE:
633	New (0, RETVAL, 1, struct cf_layout);	714	New (0, RETVAL, 1, struct cf_layout);
634	RETVAL->base_height = base_height;	715
635	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
636	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);
637	OUTPUT:	727	OUTPUT:
638	RETVAL	728	RETVAL
639		729
640	void	730	void
641	DESTROY (CFClient::Layout self)	731	DESTROY (CFClient::Layout self)
642	CODE:	732	CODE:
643	g_object_unref (self->pl);	733	g_object_unref (self->pl);
644	Safefree (self);	734	Safefree (self);
645		735
		736	int
		737	is_rgba (CFClient::Layout self)
		738	CODE:
		739	RETVAL = self->rgba;
		740	OUTPUT:
		741	RETVAL
		742
646	void	743	void
647	set_text (CFClient::Layout self, SV *text_)	744	set_text (CFClient::Layout self, SV *text_)
648	CODE:	745	CODE:
649	{	746	{
650	STRLEN textlen;	747	STRLEN textlen;
…		…
670	SvUTF8_on (RETVAL);	767	SvUTF8_on (RETVAL);
671	OUTPUT:	768	OUTPUT:
672	RETVAL	769	RETVAL
673		770
674	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
675	set_height (CFClient::Layout self, int base_height)	789	set_height (CFClient::Layout self, int base_height)
676	CODE:	790	CODE:
		791	if (self->base_height != base_height)
		792	{
677	self->base_height = base_height;	793	self->base_height = base_height;
		794	layout_update_font (self);
		795	}
678		796
679	void	797	void
680	set_width (CFClient::Layout self, int max_width = -1)	798	set_width (CFClient::Layout self, int max_width = -1)
681	CODE:	799	CODE:
682	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);
…		…
685	size (CFClient::Layout self)	803	size (CFClient::Layout self)
686	PPCODE:	804	PPCODE:
687	{	805	{
688	int w, h;	806	int w, h;
689		807
690	layout_update (self);
691	layout_get_pixel_size (self, &w, &h);	808	layout_get_pixel_size (self, &w, &h);
692		809
693	EXTEND (SP, 2);	810	EXTEND (SP, 2);
694	PUSHs (sv_2mortal (newSViv (w)));	811	PUSHs (sv_2mortal (newSViv (w)));
695	PUSHs (sv_2mortal (newSViv (h)));	812	PUSHs (sv_2mortal (newSViv (h)));
…		…
698	int	815	int
699	xy_to_index (CFClient::Layout self, int x, int y)	816	xy_to_index (CFClient::Layout self, int x, int y)
700	CODE:	817	CODE:
701	{	818	{
702	int index, trailing;	819	int index, trailing;
703
704	layout_update (self);
705	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);
706
707	RETVAL = index;	821	RETVAL = index;
708	}	822	}
709	OUTPUT:	823	OUTPUT:
710	RETVAL	824	RETVAL
711		825
712	void	826	void
713	cursor_pos (CFClient::Layout self, int index)	827	cursor_pos (CFClient::Layout self, int index)
714	PPCODE:	828	PPCODE:
715	{	829	{
716	PangoRectangle strong_pos;	830	PangoRectangle strong_pos;
717	layout_update (self);
718	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	831	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
719		832
720	EXTEND (SP, 3);	833	EXTEND (SP, 3);
721	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	834	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
722	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	835	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
…		…
727	render (CFClient::Layout self)	840	render (CFClient::Layout self)
728	PPCODE:	841	PPCODE:
729	{	842	{
730	SV *retval;	843	SV *retval;
731	int w, h;	844	int w, h;
732	FT_Bitmap bitmap;
733		845
734	layout_update (self);
735	layout_get_pixel_size (self, &w, &h);	846	layout_get_pixel_size (self, &w, &h);
736		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
737	retval = newSV (w * h);	894	retval = newSV (w * h);
738	SvPOK_only (retval);	895	SvPOK_only (retval);
739	SvCUR_set (retval, w * h);	896	SvCUR_set (retval, w * h);
740		897
741	bitmap.rows = h;	898	bitmap.rows = h;
742	bitmap.width = w;	899	bitmap.width = w;
743	bitmap.pitch = w;	900	bitmap.pitch = w;
744	bitmap.buffer = (unsigned char*)SvPVX (retval);	901	bitmap.buffer = (unsigned char*)SvPVX (retval);
745	bitmap.num_grays = 256;	902	bitmap.num_grays = 256;
746	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	903	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
747		904
748	memset (bitmap.buffer, 0, w * h);	905	memset (bitmap.buffer, 0, w * h);
749		906
750	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);
751		908
752	EXTEND (SP, 3);	909	EXTEND (SP, 5);
753	PUSHs (sv_2mortal (newSViv (w)));	910	PUSHs (sv_2mortal (newSViv (w)));
754	PUSHs (sv_2mortal (newSViv (h)));	911	PUSHs (sv_2mortal (newSViv (h)));
755	PUSHs (sv_2mortal (retval));	912	PUSHs (sv_2mortal (retval));
		913	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		914	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		915	}
756	}	916	}
757		917
758	MODULE = CFClient PACKAGE = CFClient::Texture	918	MODULE = CFClient PACKAGE = CFClient::Texture
759		919
760	void	920	void
761	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)
762	PROTOTYPE: $$$;$$	922	PROTOTYPE: $$$;$$
		923	ALIAS:
		924	draw_quad_alpha = 1
		925	draw_quad_alpha_premultiplied = 2
763	CODE:	926	CODE:
764	{	927	{
765	HV hv = (HV )SvRV (self);	928	HV hv = (HV )SvRV (self);
766	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	929	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
767	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	930	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
772	{	935	{
773	w = SvNV (*hv_fetch (hv, "w", 1, 1));	936	w = SvNV (*hv_fetch (hv, "w", 1, 1));
774	h = SvNV (*hv_fetch (hv, "h", 1, 1));	937	h = SvNV (*hv_fetch (hv, "h", 1, 1));
775	}	938	}
776		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
777	glBindTexture (GL_TEXTURE_2D, name);	946	glBindTexture (GL_TEXTURE_2D, name);
		947
778	if (wrap_mode) {	948	if (wrap_mode)
		949	{
779	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	950	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
780	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	951	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
781	}	952	}
		953
782	glBegin (GL_QUADS);	954	glBegin (GL_QUADS);
783	glTexCoord2f (0, 0); glVertex2f (x , y );	955	glTexCoord2f (0, 0); glVertex2f (x , y );
784	glTexCoord2f (0, t); glVertex2f (x , y + h);	956	glTexCoord2f (0, t); glVertex2f (x , y + h);
785	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	957	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
786	glTexCoord2f (s, 0); glVertex2f (x + w, y );	958	glTexCoord2f (s, 0); glVertex2f (x + w, y );
787	glEnd ();	959	glEnd ();
		960
		961	if (ix)
		962	glDisable (GL_BLEND);
788	}	963	}
789		964
790	MODULE = CFClient PACKAGE = CFClient::Map	965	MODULE = CFClient PACKAGE = CFClient::Map
791		966
792	CFClient::Map	967	CFClient::Map
…		…
1301	} *civ, const_iv[] = {	1476	} *civ, const_iv[] = {
1302	# define const_iv(name) { # name, (IV)name }	1477	# define const_iv(name) { # name, (IV)name }
1303	const_iv (GL_COLOR_MATERIAL),	1478	const_iv (GL_COLOR_MATERIAL),
1304	const_iv (GL_SMOOTH),	1479	const_iv (GL_SMOOTH),
1305	const_iv (GL_FLAT),	1480	const_iv (GL_FLAT),
		1481	const_iv (GL_DITHER),
1306	const_iv (GL_BLEND),	1482	const_iv (GL_BLEND),
		1483	const_iv (GL_SCISSOR_TEST),
1307	const_iv (GL_AND),	1484	const_iv (GL_AND),
		1485	const_iv (GL_ONE),
		1486	const_iv (GL_ZERO),
1308	const_iv (GL_SRC_ALPHA),	1487	const_iv (GL_SRC_ALPHA),
		1488	const_iv (GL_SRC_ALPHA_SATURATE),
1309	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1489	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1490	const_iv (GL_ONE_MINUS_DST_ALPHA),
1310	const_iv (GL_RGB),	1491	const_iv (GL_RGB),
1311	const_iv (GL_RGBA),	1492	const_iv (GL_RGBA),
1312	const_iv (GL_UNSIGNED_BYTE),	1493	const_iv (GL_UNSIGNED_BYTE),
1313	const_iv (GL_ALPHA4),
1314	const_iv (GL_ALPHA),	1494	const_iv (GL_ALPHA),
		1495	const_iv (GL_LUMINANCE),
1315	const_iv (GL_FLOAT),	1496	const_iv (GL_FLOAT),
1316	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1497	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1317	const_iv (GL_COMPILE),	1498	const_iv (GL_COMPILE),
1318	const_iv (GL_TEXTURE_1D),	1499	const_iv (GL_TEXTURE_1D),
1319	const_iv (GL_TEXTURE_2D),	1500	const_iv (GL_TEXTURE_2D),
…		…
1330	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1511	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1331	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1512	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1332	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1513	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1333	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1514	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1334	const_iv (GL_GENERATE_MIPMAP),	1515	const_iv (GL_GENERATE_MIPMAP),
1335	const_iv (GL_LINEAR),
1336	const_iv (GL_MODULATE),	1516	const_iv (GL_MODULATE),
		1517	const_iv (GL_DECAL),
1337	const_iv (GL_REPLACE),	1518	const_iv (GL_REPLACE),
1338	const_iv (GL_COLOR_BUFFER_BIT),	1519	const_iv (GL_COLOR_BUFFER_BIT),
1339	const_iv (GL_PROJECTION),	1520	const_iv (GL_PROJECTION),
1340	const_iv (GL_MODELVIEW),	1521	const_iv (GL_MODELVIEW),
1341	const_iv (GL_COLOR_LOGIC_OP),	1522	const_iv (GL_COLOR_LOGIC_OP),
		1523	const_iv (GL_SEPARABLE_2D),
1342	const_iv (GL_CONVOLUTION_2D),	1524	const_iv (GL_CONVOLUTION_2D),
1343	const_iv (GL_CONVOLUTION_BORDER_MODE),	1525	const_iv (GL_CONVOLUTION_BORDER_MODE),
1344	const_iv (GL_CONSTANT_BORDER),	1526	const_iv (GL_CONSTANT_BORDER),
1345	const_iv (GL_LINES),	1527	const_iv (GL_LINES),
1346	const_iv (GL_QUADS),	1528	const_iv (GL_QUADS),
…		…
1371		1553
1372	void glBlendFunc (int sfactor, int dfactor)	1554	void glBlendFunc (int sfactor, int dfactor)
1373		1555
1374	void glLogicOp (int opcode)	1556	void glLogicOp (int opcode)
1375		1557
		1558	void glColorMask (int red, int green, int blue, int alpha)
		1559
1376	void glMatrixMode (int mode)	1560	void glMatrixMode (int mode)
1377		1561
1378	void glPushMatrix ()	1562	void glPushMatrix ()
1379		1563
1380	void glPopMatrix ()	1564	void glPopMatrix ()
1381		1565
1382	void glLoadIdentity ()	1566	void glLoadIdentity ()
1383		1567
		1568	# 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)	1569	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1385		1570
1386	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)
1387		1574
1388	void glTranslate (float x, float y, float z = 0.)	1575	void glTranslate (float x, float y, float z = 0.)
1389	CODE:	1576	CODE:
1390	glTranslatef (x, y, z);	1577	glTranslatef (x, y, z);
1391		1578
1392	void glScale (float x, float y, float z)	1579	void glScale (float x, float y, float z = 1.)
1393	CODE:	1580	CODE:
1394	glScalef (x, y, z);	1581	glScalef (x, y, z);
1395		1582
1396	void glRotate (float angle, float x, float y, float z)	1583	void glRotate (float angle, float x, float y, float z)
1397	CODE:	1584	CODE:
…		…
1402	void glEnd ()	1589	void glEnd ()
1403		1590
1404	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)
1405	PROTOTYPE: @	1592	PROTOTYPE: @
1406	CODE:	1593	CODE:
1407	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);
1408		1596
1409	void glVertex (float x, float y, float z = 0.)	1597	void glVertex (float x, float y, float z = 0.)
1410	CODE:	1598	CODE:
1411	glVertex3f (x, y, z);	1599	glVertex3f (x, y, z);
1412		1600
…		…
1424		1612
1425	void glBindTexture (int target, int name)	1613	void glBindTexture (int target, int name)
1426		1614
1427	void glConvolutionParameter (int target, int pname, float params)	1615	void glConvolutionParameter (int target, int pname, float params)
1428	CODE:	1616	CODE:
1429	glConvolutionParameterf (target, pname, params);	1617	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1430		1618
1431	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));
1432		1628
1433	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)
1434		1630
1435	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)
1436		1638
1437	int glGenTexture ()	1639	int glGenTexture ()
1438	CODE:	1640	CODE:
1439	{	1641	{
1440	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.57 by root, Fri Apr 21 07:09:10 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.57 by root, Fri Apr 21 07:09:10 2006 UTC vs.
Revision 1.79 by root, Sun May 14 22:24:14 2006 UTC