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