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

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

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

Diff Legend

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

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

Diff Legend

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