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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.75 by root, Mon May 8 18:28:40 2006 UTC vs.
Revision 1.102 by root, Sat Jun 3 23:47:46 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>
3	# pragma warning(disable:4244)	5	# pragma warning(disable:4244)
4	#endif	6	#endif
5		7
6	#include "EXTERN.h"	8	#include "EXTERN.h"
7	#include "perl.h"	9	#include "perl.h"
8	#include "XSUB.h"	10	#include "XSUB.h"
9		11
		12	#include <math.h>
10	#include <string.h>	13	#include <string.h>
11	#include <stdio.h>	14	#include <stdio.h>
12		15
13	#include <SDL.h>	16	#include <SDL.h>
		17	#include <SDL_endian.h>
14	#include <SDL_image.h>	18	#include <SDL_image.h>
15	#include <SDL_mixer.h>	19	#include <SDL_mixer.h>
16	#include <SDL_opengl.h>	20	#include <SDL_opengl.h>
17		21
18	#include <glib/gmacros.h>	22	#include <glib/gmacros.h>
19		23
20	#include <pango/pango.h>	24	#include <pango/pango.h>
21	#include <pango/pangofc-fontmap.h>	25	#include <pango/pangofc-fontmap.h>
22	#include <pango/pangoft2.h>	26	#include <pango/pangoft2.h>
		27	#include <pango/pangocairo.h>
23		28
24	#ifndef _WIN32	29	#ifndef _WIN32
25	# include <sys/types.h>	30	# include <sys/types.h>
26	# include <sys/socket.h>	31	# include <sys/socket.h>
27	# include <netinet/in.h>	32	# include <netinet/in.h>
64	typedef Mix_Music *CFClient__MixMusic;	69	typedef Mix_Music *CFClient__MixMusic;
65		70
66	typedef PangoFontDescription *CFClient__Font;	71	typedef PangoFontDescription *CFClient__Font;
67		72
68	typedef struct cf_layout {	73	typedef struct cf_layout {
69	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
70	int base_height;	77	int base_height;
71	CFClient__Font font;	78	CFClient__Font font;
72	} *CFClient__Layout;	79	} *CFClient__Layout;
73		80
74	static CFClient__Font default_font;	81	static CFClient__Font default_font;
75	static PangoContext *context;	82	static PangoContext ft2_context, cairo_context;
76	static PangoFontMap *fontmap;	83	static PangoFontMap ft2_fontmap, cairo_fontmap;
77		84
78	static void	85	static void
79	substitute_func (FcPattern *pattern, gpointer data)	86	substitute_func (FcPattern *pattern, gpointer data)
80	{	87	{
81	FcPatternAddBool (pattern, FC_HINTING , 1);	88	FcPatternAddBool (pattern, FC_HINTING , 1);
		89	#ifdef _WIN32
		90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
		91	#else
82	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
		93	#endif
83	}	94	}
84		95
85	static void	96	static void
86	layout_update_font (CFClient__Layout self)	97	layout_update_font (CFClient__Layout self)
87	{	98	{
…		…
99	static void	110	static void
100	layout_get_pixel_size (CFClient__Layout self, int w, int h)	111	layout_get_pixel_size (CFClient__Layout self, int w, int h)
101	{	112	{
102	pango_layout_get_pixel_size (self->pl, w, h);	113	pango_layout_get_pixel_size (self->pl, w, h);
103		114
104	w = (w + 3) & ~3;
105	if (!w) w = 1;	115	if (!w) w = 1;
106	if (!h) h = 1;	116	if (!h) h = 1;
		117
		118	w = (w + 3) & ~3;
107	}	119	}
108		120
109	typedef uint16_t mapface;	121	typedef uint16_t mapface;
110		122
111	typedef struct {	123	typedef struct {
…		…
399	# undef const_iv	411	# undef const_iv
400	};	412	};
401		413
402	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
403	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		416	}
404		417
		418	void
		419	pango_init ()
		420	CODE:
		421	{
		422	// delayed, so it can pick up new fonts added by AddFontResourceEx
405	fontmap = pango_ft2_font_map_new ();	423	ft2_fontmap = pango_ft2_font_map_new ();
406	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);	424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
407	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);	425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
		426
		427	cairo_fontmap = pango_cairo_font_map_get_default ();
		428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
408	}	429	}
409		430
410	int	431	int
411	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
412		433
…		…
422	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	443	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
423	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
424	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
425	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
426		447
		448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
		450
427	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
428	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
429	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
430	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
431		455
432	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
433	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
434	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
435		457
436	SDL_EnableUNICODE (1);	458	SDL_EnableUNICODE (1);
437	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
438		460
439	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	461	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
448		470
449	++m;	471	++m;
450	}	472	}
451	}	473	}
452		474
		475	char *
		476	SDL_GetError ()
		477
453	int	478	int
454	SDL_SetVideoMode (int w, int h, int fullscreen)	479	SDL_SetVideoMode (int w, int h, int fullscreen)
455	CODE:	480	CODE:
456	RETVAL = !!SDL_SetVideoMode (	481	RETVAL = !!SDL_SetVideoMode (
457	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
…		…
460	OUTPUT:	485	OUTPUT:
461	RETVAL	486	RETVAL
462		487
463	void	488	void
464	SDL_GL_SwapBuffers ()	489	SDL_GL_SwapBuffers ()
		490
		491	char *
		492	SDL_GetKeyName (int sym)
465		493
466	void	494	void
467	SDL_PollEvent ()	495	SDL_PollEvent ()
468	PPCODE:	496	PPCODE:
469	{	497	{
…		…
488	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	516	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
489	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	517	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
490	break;	518	break;
491		519
492	case SDL_MOUSEMOTION:	520	case SDL_MOUSEMOTION:
		521	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		522
493	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	523	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
494	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	524	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
495	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	525	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
496	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	526	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
497	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	527	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
498	break;	528	break;
499		529
500	case SDL_MOUSEBUTTONDOWN:	530	case SDL_MOUSEBUTTONDOWN:
501	case SDL_MOUSEBUTTONUP:	531	case SDL_MOUSEBUTTONUP:
		532	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		533
502	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	534	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
503	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	535	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
504	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	536	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
505	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	537	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
506	break;	538	break;
…		…
533	CODE:	565	CODE:
534	#ifndef _WIN32	566	#ifndef _WIN32
535	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	567	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
536	#endif	568	#endif
537		569
538	char *
539	gl_version ()
540	CODE:
541	RETVAL = (char *)glGetString (GL_VERSION);
542	OUTPUT:
543	RETVAL
544
545	char *
546	gl_extensions ()
547	CODE:
548	RETVAL = (char *)glGetString (GL_EXTENSIONS);
549	OUTPUT:
550	RETVAL
551
552	void	570	void
553	add_font (char *file)	571	add_font (char *file)
554	CODE:	572	CODE:
555	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	573	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
		574	#ifdef _WIN32
		575	// cairo... sigh... requires win2000
		576	AddFontResourceEx (file, FR_PRIVATE, 0);
		577	#endif
556		578
557	void	579	void
558	load_image_inline (SV *image_)	580	load_image_inline (SV *image_)
559	ALIAS:	581	ALIAS:
560	load_image_file = 1	582	load_image_file = 1
…		…
644	}	666	}
645		667
646	void	668	void
647	error (char *message)	669	error (char *message)
648	CODE:	670	CODE:
		671	fprintf (stderr, "ERROR: %s\n", message);
649	#ifdef _WIN32	672	#ifdef _WIN32
650	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	673	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
651	#else
652	fprintf (stderr, "ERROR: %s\n", message);
653	#endif	674	#endif
654		675
655	void	676	void
656	fatal (char *message)	677	fatal (char *message)
657	CODE:	678	CODE:
		679	fprintf (stderr, "FATAL: %s\n", message);
658	#ifdef _WIN32	680	#ifdef _WIN32
659	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	681	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
660	#else
661	fprintf (stderr, "FATAL: %s\n", message);
662	#endif	682	#endif
663	exit (1);	683	exit (1);
664		684
665	MODULE = CFClient PACKAGE = CFClient::Font	685	MODULE = CFClient PACKAGE = CFClient::Font
666		686
…		…
687	default_font = self;	707	default_font = self;
688		708
689	MODULE = CFClient PACKAGE = CFClient::Layout	709	MODULE = CFClient PACKAGE = CFClient::Layout
690		710
691	CFClient::Layout	711	CFClient::Layout
692	new (SV *class, int base_height = MIN_FONT_HEIGHT)	712	new (SV *class, int rgba = 0)
693	CODE:	713	CODE:
		714	#if _WIN32
		715	//rgba = 0;//D make stext nicer, breaks TextView
		716	#endif
694	New (0, RETVAL, 1, struct cf_layout);	717	New (0, RETVAL, 1, struct cf_layout);
695	RETVAL->pl = pango_layout_new (context);	718
696	RETVAL->base_height = base_height;	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;
697	RETVAL->font = 0;	726	RETVAL->font = 0;
		727
698	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	728	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
699	pango_layout_set_font_description (RETVAL->pl, default_font);	729	layout_update_font (RETVAL);
700	OUTPUT:	730	OUTPUT:
701	RETVAL	731	RETVAL
702		732
703	void	733	void
704	DESTROY (CFClient::Layout self)	734	DESTROY (CFClient::Layout self)
705	CODE:	735	CODE:
706	g_object_unref (self->pl);	736	g_object_unref (self->pl);
707	Safefree (self);	737	Safefree (self);
708		738
		739	int
		740	is_rgba (CFClient::Layout self)
		741	CODE:
		742	RETVAL = self->rgba;
		743	OUTPUT:
		744	RETVAL
		745
709	void	746	void
710	set_text (CFClient::Layout self, SV *text_)	747	set_text (CFClient::Layout self, SV *text_)
711	CODE:	748	CODE:
712	{	749	{
713	STRLEN textlen;	750	STRLEN textlen;
…		…
731	CODE:	768	CODE:
732	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	769	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
733	SvUTF8_on (RETVAL);	770	SvUTF8_on (RETVAL);
734	OUTPUT:	771	OUTPUT:
735	RETVAL	772	RETVAL
		773
		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;
736		781
737	void	782	void
738	set_font (CFClient::Layout self, CFClient::Font font = 0)	783	set_font (CFClient::Layout self, CFClient::Font font = 0)
739	CODE:	784	CODE:
740	if (self->font != font)	785	if (self->font != font)
…		…
756	set_width (CFClient::Layout self, int max_width = -1)	801	set_width (CFClient::Layout self, int max_width = -1)
757	CODE:	802	CODE:
758	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);
759		804
760	void	805	void
		806	set_indent (CFClient::Layout self, int indent)
		807	CODE:
		808	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		809
		810	void
		811	set_spacing (CFClient::Layout self, int spacing)
		812	CODE:
		813	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		814
		815	void
		816	set_ellipsise (CFClient::Layout self, int ellipsise)
		817	CODE:
		818	pango_layout_set_ellipsize (self->pl,
		819	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		820	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		821	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		822	: PANGO_ELLIPSIZE_NONE
		823	);
		824
		825	void
		826	set_single_paragraph_mode (CFClient::Layout self, int spm)
		827	CODE:
		828	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		829
		830	void
761	size (CFClient::Layout self)	831	size (CFClient::Layout self)
762	PPCODE:	832	PPCODE:
763	{	833	{
764	int w, h;	834	int w, h;
765		835
…		…
798	render (CFClient::Layout self)	868	render (CFClient::Layout self)
799	PPCODE:	869	PPCODE:
800	{	870	{
801	SV *retval;	871	SV *retval;
802	int w, h;	872	int w, h;
803	FT_Bitmap bitmap;
804		873
805	layout_get_pixel_size (self, &w, &h);	874	layout_get_pixel_size (self, &w, &h);
806		875
		876	if (self->rgba)
		877	{
		878	cairo_surface_t *surface;
		879	cairo_t *cairo;
		880
		881	retval = newSV (w * h * 4);
		882	SvPOK_only (retval);
		883	SvCUR_set (retval, w * h * 4);
		884
		885	memset (SvPVX (retval), 0, w * h * 4);
		886
		887	surface = cairo_image_surface_create_for_data (
		888	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		889	cairo = cairo_create (surface);
		890	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		891
		892	pango_cairo_show_layout (cairo, self->pl);
		893
		894	cairo_destroy (cairo);
		895	cairo_surface_destroy (surface);
		896
		897	// what a mess, and its premultiplied, too :(
		898	{
		899	uint32_t p = (uint32_t )SvPVX (retval);
		900	uint32_t e = p + w h;
		901
		902	while (p < e)
		903	{
		904	uint32_t rgba = *p;
		905	rgba = (rgba >> 24) \| (rgba << 8);
		906	#if 0
		907	#ifdef _WIN32
		908	{//D
		909	uint8_t r = rgba >> 24;
		910	uint8_t g = rgba >> 16;
		911	uint8_t b = rgba >> 8;
		912	uint8_t a = rgba >> 0;
		913
		914	rgba = (rgba & 0xffffff00) \| a;
		915	}
		916	#endif
		917	#endif
		918	rgba = SDL_SwapBE32 (rgba);
		919	*p++ = rgba;
		920	}
		921	}
		922
		923	EXTEND (SP, 5);
		924	PUSHs (sv_2mortal (newSViv (w)));
		925	PUSHs (sv_2mortal (newSViv (h)));
		926	PUSHs (sv_2mortal (retval));
		927	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		928	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		929	}
		930	else
		931	{
		932	FT_Bitmap bitmap;
		933
807	retval = newSV (w * h);	934	retval = newSV (w * h);
808	SvPOK_only (retval);	935	SvPOK_only (retval);
809	SvCUR_set (retval, w * h);	936	SvCUR_set (retval, w * h);
810		937
811	bitmap.rows = h;	938	bitmap.rows = h;
812	bitmap.width = w;	939	bitmap.width = w;
813	bitmap.pitch = w;	940	bitmap.pitch = w;
814	bitmap.buffer = (unsigned char*)SvPVX (retval);	941	bitmap.buffer = (unsigned char*)SvPVX (retval);
815	bitmap.num_grays = 256;	942	bitmap.num_grays = 256;
816	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	943	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
817		944
818	memset (bitmap.buffer, 0, w * h);	945	memset (bitmap.buffer, 0, w * h);
819		946
820	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	947	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
821		948
822	EXTEND (SP, 3);	949	EXTEND (SP, 5);
823	PUSHs (sv_2mortal (newSViv (w)));	950	PUSHs (sv_2mortal (newSViv (w)));
824	PUSHs (sv_2mortal (newSViv (h)));	951	PUSHs (sv_2mortal (newSViv (h)));
825	PUSHs (sv_2mortal (retval));	952	PUSHs (sv_2mortal (retval));
		953	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		954	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		955	}
826	}	956	}
827		957
828	MODULE = CFClient PACKAGE = CFClient::Texture	958	MODULE = CFClient PACKAGE = CFClient::Texture
829		959
830	void	960	void
831	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	961	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
832	PROTOTYPE: $$$;$$	962	PROTOTYPE: $$$;$$
		963	ALIAS:
		964	draw_quad_alpha = 1
		965	draw_quad_alpha_premultiplied = 2
833	CODE:	966	CODE:
834	{	967	{
835	HV hv = (HV )SvRV (self);	968	HV hv = (HV )SvRV (self);
836	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	969	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
837	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	970	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
838	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	971	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
839	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
840		972
841	if (items < 5)	973	if (items < 5)
842	{	974	{
843	w = SvNV (*hv_fetch (hv, "w", 1, 1));	975	w = SvNV (*hv_fetch (hv, "w", 1, 1));
844	h = SvNV (*hv_fetch (hv, "h", 1, 1));	976	h = SvNV (*hv_fetch (hv, "h", 1, 1));
845	}	977	}
846		978
		979	if (ix)
		980	{
		981	glEnable (GL_BLEND);
		982	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		983	glEnable (GL_ALPHA_TEST);
		984	glAlphaFunc (GL_GREATER, 0.01f);
		985	}
		986
847	glBindTexture (GL_TEXTURE_2D, name);	987	glBindTexture (GL_TEXTURE_2D, name);
848	if (wrap_mode) {	988
849	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
850	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
851	}
852	glBegin (GL_QUADS);	989	glBegin (GL_QUADS);
853	glTexCoord2f (0, 0); glVertex2f (x , y );	990	glTexCoord2f (0, 0); glVertex2f (x , y );
854	glTexCoord2f (0, t); glVertex2f (x , y + h);	991	glTexCoord2f (0, t); glVertex2f (x , y + h);
855	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	992	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
856	glTexCoord2f (s, 0); glVertex2f (x + w, y );	993	glTexCoord2f (s, 0); glVertex2f (x + w, y );
857	glEnd ();	994	glEnd ();
		995
		996	if (ix)
		997	{
		998	glDisable (GL_ALPHA_TEST);
		999	glDisable (GL_BLEND);
		1000	}
858	}	1001	}
859		1002
860	MODULE = CFClient PACKAGE = CFClient::Map	1003	MODULE = CFClient PACKAGE = CFClient::Map
861		1004
862	CFClient::Map	1005	CFClient::Map
…		…
926	tex->r = r;	1069	tex->r = r;
927	tex->g = g;	1070	tex->g = g;
928	tex->b = b;	1071	tex->b = b;
929	tex->a = a;	1072	tex->a = a;
930	}	1073	}
		1074
		1075	// somewhat hackish, but for textures that require it, it really
		1076	// improves the look, and most others don't suffer.
		1077	glBindTexture (GL_TEXTURE_2D, name);
		1078	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1079	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1080	// use uglier nearest interpolation because linear suffers
		1081	// from transparent color bleeding and ugly wrapping effects.
		1082	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
931	}	1083	}
932		1084
933	int	1085	int
934	ox (CFClient::Map self)	1086	ox (CFClient::Map self)
935	ALIAS:	1087	ALIAS:
936	oy = 1	1088	oy = 1
		1089	x = 2
		1090	y = 3
		1091	w = 4
		1092	h = 5
937	CODE:	1093	CODE:
938	switch (ix)	1094	switch (ix)
939	{	1095	{
940	case 0: RETVAL = self->ox; break;	1096	case 0: RETVAL = self->ox; break;
941	case 1: RETVAL = self->oy; break;	1097	case 1: RETVAL = self->oy; break;
		1098	case 2: RETVAL = self->x; break;
		1099	case 3: RETVAL = self->y; break;
		1100	case 4: RETVAL = self->w; break;
		1101	case 5: RETVAL = self->h; break;
942	}	1102	}
943	OUTPUT:	1103	OUTPUT:
944	RETVAL	1104	RETVAL
945		1105
946	void	1106	void
…		…
1373	const_iv (GL_COLOR_MATERIAL),	1533	const_iv (GL_COLOR_MATERIAL),
1374	const_iv (GL_SMOOTH),	1534	const_iv (GL_SMOOTH),
1375	const_iv (GL_FLAT),	1535	const_iv (GL_FLAT),
1376	const_iv (GL_DITHER),	1536	const_iv (GL_DITHER),
1377	const_iv (GL_BLEND),	1537	const_iv (GL_BLEND),
		1538	const_iv (GL_CULL_FACE),
1378	const_iv (GL_SCISSOR_TEST),	1539	const_iv (GL_SCISSOR_TEST),
		1540	const_iv (GL_DEPTH_TEST),
		1541	const_iv (GL_ALPHA_TEST),
		1542	const_iv (GL_NORMALIZE),
		1543	const_iv (GL_RESCALE_NORMAL),
1379	const_iv (GL_AND),	1544	const_iv (GL_AND),
1380	const_iv (GL_ONE),	1545	const_iv (GL_ONE),
1381	const_iv (GL_ZERO),	1546	const_iv (GL_ZERO),
1382	const_iv (GL_SRC_ALPHA),	1547	const_iv (GL_SRC_ALPHA),
1383	const_iv (GL_SRC_ALPHA_SATURATE),	1548	const_iv (GL_SRC_ALPHA_SATURATE),
1384	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1549	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1385	const_iv (GL_ONE_MINUS_DST_ALPHA),	1550	const_iv (GL_ONE_MINUS_DST_ALPHA),
1386	const_iv (GL_RGB),	1551	const_iv (GL_RGB),
1387	const_iv (GL_RGBA),	1552	const_iv (GL_RGBA),
1388	const_iv (GL_UNSIGNED_BYTE),	1553	const_iv (GL_UNSIGNED_BYTE),
		1554	const_iv (GL_UNSIGNED_SHORT),
		1555	const_iv (GL_UNSIGNED_INT),
1389	const_iv (GL_ALPHA),	1556	const_iv (GL_ALPHA),
		1557	const_iv (GL_INTENSITY),
		1558	const_iv (GL_LUMINANCE),
		1559	const_iv (GL_LUMINANCE_ALPHA),
1390	const_iv (GL_FLOAT),	1560	const_iv (GL_FLOAT),
1391	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1561	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1392	const_iv (GL_COMPILE),	1562	const_iv (GL_COMPILE),
1393	const_iv (GL_TEXTURE_1D),	1563	const_iv (GL_TEXTURE_1D),
1394	const_iv (GL_TEXTURE_2D),	1564	const_iv (GL_TEXTURE_2D),
…		…
1396	const_iv (GL_TEXTURE_MAG_FILTER),	1566	const_iv (GL_TEXTURE_MAG_FILTER),
1397	const_iv (GL_TEXTURE_MIN_FILTER),	1567	const_iv (GL_TEXTURE_MIN_FILTER),
1398	const_iv (GL_TEXTURE_ENV_MODE),	1568	const_iv (GL_TEXTURE_ENV_MODE),
1399	const_iv (GL_TEXTURE_WRAP_S),	1569	const_iv (GL_TEXTURE_WRAP_S),
1400	const_iv (GL_TEXTURE_WRAP_T),	1570	const_iv (GL_TEXTURE_WRAP_T),
		1571	const_iv (GL_REPEAT),
1401	const_iv (GL_CLAMP),	1572	const_iv (GL_CLAMP),
1402	const_iv (GL_REPEAT),	1573	const_iv (GL_CLAMP_TO_EDGE),
1403	const_iv (GL_NEAREST),	1574	const_iv (GL_NEAREST),
1404	const_iv (GL_LINEAR),	1575	const_iv (GL_LINEAR),
1405	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1576	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1406	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1577	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1407	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1578	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1408	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1579	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1409	const_iv (GL_GENERATE_MIPMAP),	1580	const_iv (GL_GENERATE_MIPMAP),
1410	const_iv (GL_MODULATE),	1581	const_iv (GL_MODULATE),
1411	const_iv (GL_DECAL),	1582	const_iv (GL_DECAL),
1412	const_iv (GL_REPLACE),	1583	const_iv (GL_REPLACE),
		1584	const_iv (GL_DEPTH_BUFFER_BIT),
1413	const_iv (GL_COLOR_BUFFER_BIT),	1585	const_iv (GL_COLOR_BUFFER_BIT),
1414	const_iv (GL_PROJECTION),	1586	const_iv (GL_PROJECTION),
1415	const_iv (GL_MODELVIEW),	1587	const_iv (GL_MODELVIEW),
1416	const_iv (GL_COLOR_LOGIC_OP),	1588	const_iv (GL_COLOR_LOGIC_OP),
1417	const_iv (GL_SEPARABLE_2D),	1589	const_iv (GL_SEPARABLE_2D),
1418	const_iv (GL_CONVOLUTION_2D),	1590	const_iv (GL_CONVOLUTION_2D),
1419	const_iv (GL_CONVOLUTION_BORDER_MODE),	1591	const_iv (GL_CONVOLUTION_BORDER_MODE),
1420	const_iv (GL_CONSTANT_BORDER),	1592	const_iv (GL_CONSTANT_BORDER),
1421	const_iv (GL_LINES),	1593	const_iv (GL_LINES),
		1594	const_iv (GL_LINE_LOOP),
1422	const_iv (GL_QUADS),	1595	const_iv (GL_QUADS),
1423	const_iv (GL_LINE_LOOP),	1596	const_iv (GL_QUAD_STRIP),
		1597	const_iv (GL_TRIANGLES),
		1598	const_iv (GL_TRIANGLE_STRIP),
		1599	const_iv (GL_TRIANGLE_FAN),
1424	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1600	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1425	const_iv (GL_FASTEST),	1601	const_iv (GL_FASTEST),
		1602	const_iv (GL_V2F),
		1603	const_iv (GL_V3F),
		1604	const_iv (GL_T2F_V3F),
		1605	const_iv (GL_T2F_N3F_V3F),
1426	# undef const_iv	1606	# undef const_iv
1427	};	1607	};
1428		1608
1429	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1609	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1430	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1610	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1431	}	1611	}
1432		1612
		1613	char *
		1614	gl_vendor ()
		1615	CODE:
		1616	RETVAL = (char *)glGetString (GL_VENDOR);
		1617	OUTPUT:
		1618	RETVAL
		1619
		1620	char *
		1621	gl_version ()
		1622	CODE:
		1623	RETVAL = (char *)glGetString (GL_VERSION);
		1624	OUTPUT:
		1625	RETVAL
		1626
		1627	char *
		1628	gl_extensions ()
		1629	CODE:
		1630	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1631	OUTPUT:
		1632	RETVAL
		1633
1433	int glGetError ()	1634	int glGetError ()
1434		1635
1435	void glClear (int mask)	1636	void glClear (int mask)
1436		1637
1437	void glClearColor (float r, float g, float b, float a = 1.0)	1638	void glClearColor (float r, float g, float b, float a = 1.0)
…		…
1445		1646
1446	void glHint (int target, int mode)	1647	void glHint (int target, int mode)
1447		1648
1448	void glBlendFunc (int sfactor, int dfactor)	1649	void glBlendFunc (int sfactor, int dfactor)
1449		1650
		1651	void glDepthMask (int flag)
		1652
1450	void glLogicOp (int opcode)	1653	void glLogicOp (int opcode)
1451		1654
1452	void glColorMask (int red, int green, int blue, int alpha)	1655	void glColorMask (int red, int green, int blue, int alpha)
1453		1656
1454	void glMatrixMode (int mode)	1657	void glMatrixMode (int mode)
…		…
1457		1660
1458	void glPopMatrix ()	1661	void glPopMatrix ()
1459		1662
1460	void glLoadIdentity ()	1663	void glLoadIdentity ()
1461		1664
1462	# near and far are due to microsofts buggy c compiler	1665	# near_ and far_ are due to microsofts buggy "c" compiler
		1666	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1667
		1668	# near_ and far_ are due to microsofts buggy "c" compiler
1463	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1669	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1464		1670
1465	void glViewport (int x, int y, int width, int height)	1671	void glViewport (int x, int y, int width, int height)
1466		1672
1467	void glScissor (int x, int y, int width, int height)	1673	void glScissor (int x, int y, int width, int height)
…		…
1483	void glEnd ()	1689	void glEnd ()
1484		1690
1485	void glColor (float r, float g, float b, float a = 1.0)	1691	void glColor (float r, float g, float b, float a = 1.0)
1486	PROTOTYPE: @	1692	PROTOTYPE: @
1487	CODE:	1693	CODE:
1488	glColor4ub (r * 255., g * 255., b * 255., a * 255.);	1694	// microsoft visual "c" rounds instead of truncating...
		1695	glColor4ub (MIN ((int)(r * 256.f), 255),
		1696	MIN ((int)(g * 256.f), 255),
		1697	MIN ((int)(b * 256.f), 255),
		1698	MIN ((int)(a * 256.f), 255));
		1699
		1700	void glInterleavedArrays (int format, int stride, char *data)
		1701
		1702	void glDrawElements (int mode, int count, int type, char *indices)
		1703
		1704	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1705
		1706	void glRasterPos (float x, float y, float z = 0.)
		1707	CODE:
		1708	glRasterPos3f (0, 0, z);
		1709	glBitmap (0, 0, 0, 0, x, y, 0);
1489		1710
1490	void glVertex (float x, float y, float z = 0.)	1711	void glVertex (float x, float y, float z = 0.)
1491	CODE:	1712	CODE:
1492	glVertex3f (x, y, z);	1713	glVertex3f (x, y, z);
1493		1714
…		…
1521		1742
1522	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1743	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1523		1744
1524	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1745	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1525		1746
1526	void glRasterPos (int x, int y)	1747	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1527	CODE:
1528	glRasterPos2i (x, y);
1529		1748
1530	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1749	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1531		1750
1532	int glGenTexture ()	1751	int glGenTexture ()
1533	CODE:	1752	CODE:
…		…
1560		1779
1561	void glEndList ()	1780	void glEndList ()
1562		1781
1563	void glCallList (int list)	1782	void glCallList (int list)
1564		1783
		1784

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.75 by root, Mon May 8 18:28:40 2006 UTC vs. Revision 1.102 by root, Sat Jun 3 23:47:46 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.75 by root, Mon May 8 18:28:40 2006 UTC vs.
Revision 1.102 by root, Sat Jun 3 23:47:46 2006 UTC