[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.94 by root, Tue May 23 18:57:35 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;
…		…
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 *	570	char *
		571	gl_vendor ()
		572	CODE:
		573	RETVAL = (char *)glGetString (GL_VENDOR);
		574	OUTPUT:
		575	RETVAL
		576
		577	char *
539	gl_version ()	578	gl_version ()
540	CODE:	579	CODE:
541	RETVAL = (char *)glGetString (GL_VERSION);	580	RETVAL = (char *)glGetString (GL_VERSION);
542	OUTPUT:	581	OUTPUT:
543	RETVAL	582	RETVAL
…		…
551		590
552	void	591	void
553	add_font (char *file)	592	add_font (char *file)
554	CODE:	593	CODE:
555	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	594	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
		595	#ifdef _WIN32
		596	// cairo... sigh... requires win2000
		597	AddFontResourceEx (file, FR_PRIVATE, 0);
		598	#endif
556		599
557	void	600	void
558	load_image_inline (SV *image_)	601	load_image_inline (SV *image_)
559	ALIAS:	602	ALIAS:
560	load_image_file = 1	603	load_image_file = 1
…		…
644	}	687	}
645		688
646	void	689	void
647	error (char *message)	690	error (char *message)
648	CODE:	691	CODE:
		692	fprintf (stderr, "ERROR: %s\n", message);
649	#ifdef _WIN32	693	#ifdef _WIN32
650	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	694	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
651	#else
652	fprintf (stderr, "ERROR: %s\n", message);
653	#endif	695	#endif
654		696
655	void	697	void
656	fatal (char *message)	698	fatal (char *message)
657	CODE:	699	CODE:
		700	fprintf (stderr, "FATAL: %s\n", message);
658	#ifdef _WIN32	701	#ifdef _WIN32
659	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	702	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
660	#else
661	fprintf (stderr, "FATAL: %s\n", message);
662	#endif	703	#endif
663	exit (1);	704	exit (1);
664		705
665	MODULE = CFClient PACKAGE = CFClient::Font	706	MODULE = CFClient PACKAGE = CFClient::Font
666		707
…		…
687	default_font = self;	728	default_font = self;
688		729
689	MODULE = CFClient PACKAGE = CFClient::Layout	730	MODULE = CFClient PACKAGE = CFClient::Layout
690		731
691	CFClient::Layout	732	CFClient::Layout
692	new (SV *class, int base_height = MIN_FONT_HEIGHT)	733	new (SV *class, int rgba = 0)
693	CODE:	734	CODE:
		735	#if _WIN32
		736	rgba = 0;//D
		737	#endif
694	New (0, RETVAL, 1, struct cf_layout);	738	New (0, RETVAL, 1, struct cf_layout);
695	RETVAL->pl = pango_layout_new (context);	739
696	RETVAL->base_height = base_height;	740	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
		741	RETVAL->rgba = rgba;
		742	RETVAL->r = 1.;
		743	RETVAL->g = 1.;
		744	RETVAL->b = 1.;
		745	RETVAL->a = 1.;
		746	RETVAL->base_height = MIN_FONT_HEIGHT;
697	RETVAL->font = 0;	747	RETVAL->font = 0;
		748
698	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	749	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
699	pango_layout_set_font_description (RETVAL->pl, default_font);	750	layout_update_font (RETVAL);
700	OUTPUT:	751	OUTPUT:
701	RETVAL	752	RETVAL
702		753
703	void	754	void
704	DESTROY (CFClient::Layout self)	755	DESTROY (CFClient::Layout self)
705	CODE:	756	CODE:
706	g_object_unref (self->pl);	757	g_object_unref (self->pl);
707	Safefree (self);	758	Safefree (self);
708		759
		760	int
		761	is_rgba (CFClient::Layout self)
		762	CODE:
		763	RETVAL = self->rgba;
		764	OUTPUT:
		765	RETVAL
		766
709	void	767	void
710	set_text (CFClient::Layout self, SV *text_)	768	set_text (CFClient::Layout self, SV *text_)
711	CODE:	769	CODE:
712	{	770	{
713	STRLEN textlen;	771	STRLEN textlen;
…		…
731	CODE:	789	CODE:
732	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	790	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
733	SvUTF8_on (RETVAL);	791	SvUTF8_on (RETVAL);
734	OUTPUT:	792	OUTPUT:
735	RETVAL	793	RETVAL
		794
		795	void
		796	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
		797	CODE:
		798	self->r = r;
		799	self->g = g;
		800	self->b = b;
		801	self->a = a;
736		802
737	void	803	void
738	set_font (CFClient::Layout self, CFClient::Font font = 0)	804	set_font (CFClient::Layout self, CFClient::Font font = 0)
739	CODE:	805	CODE:
740	if (self->font != font)	806	if (self->font != font)
…		…
756	set_width (CFClient::Layout self, int max_width = -1)	822	set_width (CFClient::Layout self, int max_width = -1)
757	CODE:	823	CODE:
758	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	824	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
759		825
760	void	826	void
		827	set_indent (CFClient::Layout self, int indent)
		828	CODE:
		829	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		830
		831	void
		832	set_spacing (CFClient::Layout self, int spacing)
		833	CODE:
		834	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		835
		836	void
		837	set_ellipsise (CFClient::Layout self, int ellipsise)
		838	CODE:
		839	pango_layout_set_ellipsize (self->pl,
		840	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		841	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		842	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		843	: PANGO_ELLIPSIZE_NONE
		844	);
		845
		846	void
		847	set_single_paragraph_mode (CFClient::Layout self, int spm)
		848	CODE:
		849	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		850
		851	void
761	size (CFClient::Layout self)	852	size (CFClient::Layout self)
762	PPCODE:	853	PPCODE:
763	{	854	{
764	int w, h;	855	int w, h;
765		856
…		…
798	render (CFClient::Layout self)	889	render (CFClient::Layout self)
799	PPCODE:	890	PPCODE:
800	{	891	{
801	SV *retval;	892	SV *retval;
802	int w, h;	893	int w, h;
803	FT_Bitmap bitmap;
804		894
805	layout_get_pixel_size (self, &w, &h);	895	layout_get_pixel_size (self, &w, &h);
806		896
		897	if (self->rgba)
		898	{
		899	cairo_surface_t *surface;
		900	cairo_t *cairo;
		901
		902	retval = newSV (w * h * 4);
		903	SvPOK_only (retval);
		904	SvCUR_set (retval, w * h * 4);
		905
		906	memset (SvPVX (retval), 0, w * h * 4);
		907
		908	surface = cairo_image_surface_create_for_data (
		909	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		910	cairo = cairo_create (surface);
		911	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		912
		913	pango_cairo_show_layout (cairo, self->pl);
		914
		915	cairo_destroy (cairo);
		916	cairo_surface_destroy (surface);
		917
		918	// what a mess, and its premultiplied, too :(
		919	{
		920	uint32_t p = (uint32_t )SvPVX (retval);
		921	uint32_t e = p + w h;
		922
		923	while (p < e)
		924	{
		925	uint32_t rgba = *p;
		926	rgba = (rgba >> 24) \| (rgba << 8);
		927	#if 0
		928	#ifdef _WIN32
		929	{//D
		930	uint8_t r = rgba >> 24;
		931	uint8_t g = rgba >> 16;
		932	uint8_t b = rgba >> 8;
		933	uint8_t a = rgba >> 0;
		934
		935	rgba = (rgba & 0xffffff00) \| a;
		936	}
		937	#endif
		938	#endif
		939	rgba = SDL_SwapBE32 (rgba);
		940	*p++ = rgba;
		941	}
		942	}
		943
		944	EXTEND (SP, 5);
		945	PUSHs (sv_2mortal (newSViv (w)));
		946	PUSHs (sv_2mortal (newSViv (h)));
		947	PUSHs (sv_2mortal (retval));
		948	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		949	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		950	}
		951	else
		952	{
		953	FT_Bitmap bitmap;
		954
807	retval = newSV (w * h);	955	retval = newSV (w * h);
808	SvPOK_only (retval);	956	SvPOK_only (retval);
809	SvCUR_set (retval, w * h);	957	SvCUR_set (retval, w * h);
810		958
811	bitmap.rows = h;	959	bitmap.rows = h;
812	bitmap.width = w;	960	bitmap.width = w;
813	bitmap.pitch = w;	961	bitmap.pitch = w;
814	bitmap.buffer = (unsigned char*)SvPVX (retval);	962	bitmap.buffer = (unsigned char*)SvPVX (retval);
815	bitmap.num_grays = 256;	963	bitmap.num_grays = 256;
816	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	964	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
817		965
818	memset (bitmap.buffer, 0, w * h);	966	memset (bitmap.buffer, 0, w * h);
819		967
820	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	968	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
821		969
822	EXTEND (SP, 3);	970	EXTEND (SP, 5);
823	PUSHs (sv_2mortal (newSViv (w)));	971	PUSHs (sv_2mortal (newSViv (w)));
824	PUSHs (sv_2mortal (newSViv (h)));	972	PUSHs (sv_2mortal (newSViv (h)));
825	PUSHs (sv_2mortal (retval));	973	PUSHs (sv_2mortal (retval));
		974	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		975	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		976	}
826	}	977	}
827		978
828	MODULE = CFClient PACKAGE = CFClient::Texture	979	MODULE = CFClient PACKAGE = CFClient::Texture
829		980
830	void	981	void
831	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	982	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
832	PROTOTYPE: $$$;$$	983	PROTOTYPE: $$$;$$
		984	ALIAS:
		985	draw_quad_alpha = 1
		986	draw_quad_alpha_premultiplied = 2
833	CODE:	987	CODE:
834	{	988	{
835	HV hv = (HV )SvRV (self);	989	HV hv = (HV )SvRV (self);
836	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	990	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
837	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	991	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
842	{	996	{
843	w = SvNV (*hv_fetch (hv, "w", 1, 1));	997	w = SvNV (*hv_fetch (hv, "w", 1, 1));
844	h = SvNV (*hv_fetch (hv, "h", 1, 1));	998	h = SvNV (*hv_fetch (hv, "h", 1, 1));
845	}	999	}
846		1000
		1001	if (ix)
		1002	{
		1003	glEnable (GL_BLEND);
		1004	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1005	glEnable (GL_ALPHA_TEST);
		1006	glAlphaFunc (GL_GREATER, 0.01f);
		1007	}
		1008
847	glBindTexture (GL_TEXTURE_2D, name);	1009	glBindTexture (GL_TEXTURE_2D, name);
		1010
848	if (wrap_mode) {	1011	if (wrap_mode)
		1012	{
849	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	1013	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
850	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	1014	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
851	}	1015	}
		1016
852	glBegin (GL_QUADS);	1017	glBegin (GL_QUADS);
853	glTexCoord2f (0, 0); glVertex2f (x , y );	1018	glTexCoord2f (0, 0); glVertex2f (x , y );
854	glTexCoord2f (0, t); glVertex2f (x , y + h);	1019	glTexCoord2f (0, t); glVertex2f (x , y + h);
855	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1020	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
856	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1021	glTexCoord2f (s, 0); glVertex2f (x + w, y );
857	glEnd ();	1022	glEnd ();
		1023
		1024	if (ix)
		1025	{
		1026	glDisable (GL_ALPHA_TEST);
		1027	glDisable (GL_BLEND);
		1028	}
858	}	1029	}
859		1030
860	MODULE = CFClient PACKAGE = CFClient::Map	1031	MODULE = CFClient PACKAGE = CFClient::Map
861		1032
862	CFClient::Map	1033	CFClient::Map
…		…
1373	const_iv (GL_COLOR_MATERIAL),	1544	const_iv (GL_COLOR_MATERIAL),
1374	const_iv (GL_SMOOTH),	1545	const_iv (GL_SMOOTH),
1375	const_iv (GL_FLAT),	1546	const_iv (GL_FLAT),
1376	const_iv (GL_DITHER),	1547	const_iv (GL_DITHER),
1377	const_iv (GL_BLEND),	1548	const_iv (GL_BLEND),
		1549	const_iv (GL_CULL_FACE),
1378	const_iv (GL_SCISSOR_TEST),	1550	const_iv (GL_SCISSOR_TEST),
		1551	const_iv (GL_DEPTH_TEST),
		1552	const_iv (GL_ALPHA_TEST),
		1553	const_iv (GL_NORMALIZE),
		1554	const_iv (GL_RESCALE_NORMAL),
1379	const_iv (GL_AND),	1555	const_iv (GL_AND),
1380	const_iv (GL_ONE),	1556	const_iv (GL_ONE),
1381	const_iv (GL_ZERO),	1557	const_iv (GL_ZERO),
1382	const_iv (GL_SRC_ALPHA),	1558	const_iv (GL_SRC_ALPHA),
1383	const_iv (GL_SRC_ALPHA_SATURATE),	1559	const_iv (GL_SRC_ALPHA_SATURATE),
1384	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1560	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1385	const_iv (GL_ONE_MINUS_DST_ALPHA),	1561	const_iv (GL_ONE_MINUS_DST_ALPHA),
1386	const_iv (GL_RGB),	1562	const_iv (GL_RGB),
1387	const_iv (GL_RGBA),	1563	const_iv (GL_RGBA),
1388	const_iv (GL_UNSIGNED_BYTE),	1564	const_iv (GL_UNSIGNED_BYTE),
		1565	const_iv (GL_UNSIGNED_SHORT),
		1566	const_iv (GL_UNSIGNED_INT),
1389	const_iv (GL_ALPHA),	1567	const_iv (GL_ALPHA),
		1568	const_iv (GL_INTENSITY),
		1569	const_iv (GL_LUMINANCE),
		1570	const_iv (GL_LUMINANCE_ALPHA),
1390	const_iv (GL_FLOAT),	1571	const_iv (GL_FLOAT),
1391	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1572	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1392	const_iv (GL_COMPILE),	1573	const_iv (GL_COMPILE),
1393	const_iv (GL_TEXTURE_1D),	1574	const_iv (GL_TEXTURE_1D),
1394	const_iv (GL_TEXTURE_2D),	1575	const_iv (GL_TEXTURE_2D),
…		…
1408	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1589	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1409	const_iv (GL_GENERATE_MIPMAP),	1590	const_iv (GL_GENERATE_MIPMAP),
1410	const_iv (GL_MODULATE),	1591	const_iv (GL_MODULATE),
1411	const_iv (GL_DECAL),	1592	const_iv (GL_DECAL),
1412	const_iv (GL_REPLACE),	1593	const_iv (GL_REPLACE),
		1594	const_iv (GL_DEPTH_BUFFER_BIT),
1413	const_iv (GL_COLOR_BUFFER_BIT),	1595	const_iv (GL_COLOR_BUFFER_BIT),
1414	const_iv (GL_PROJECTION),	1596	const_iv (GL_PROJECTION),
1415	const_iv (GL_MODELVIEW),	1597	const_iv (GL_MODELVIEW),
1416	const_iv (GL_COLOR_LOGIC_OP),	1598	const_iv (GL_COLOR_LOGIC_OP),
1417	const_iv (GL_SEPARABLE_2D),	1599	const_iv (GL_SEPARABLE_2D),
1418	const_iv (GL_CONVOLUTION_2D),	1600	const_iv (GL_CONVOLUTION_2D),
1419	const_iv (GL_CONVOLUTION_BORDER_MODE),	1601	const_iv (GL_CONVOLUTION_BORDER_MODE),
1420	const_iv (GL_CONSTANT_BORDER),	1602	const_iv (GL_CONSTANT_BORDER),
1421	const_iv (GL_LINES),	1603	const_iv (GL_LINES),
		1604	const_iv (GL_LINE_LOOP),
1422	const_iv (GL_QUADS),	1605	const_iv (GL_QUADS),
1423	const_iv (GL_LINE_LOOP),	1606	const_iv (GL_QUAD_STRIP),
		1607	const_iv (GL_TRIANGLES),
		1608	const_iv (GL_TRIANGLE_STRIP),
		1609	const_iv (GL_TRIANGLE_FAN),
1424	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1610	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1425	const_iv (GL_FASTEST),	1611	const_iv (GL_FASTEST),
		1612	const_iv (GL_V2F),
		1613	const_iv (GL_V3F),
		1614	const_iv (GL_T2F_V3F),
		1615	const_iv (GL_T2F_N3F_V3F),
1426	# undef const_iv	1616	# undef const_iv
1427	};	1617	};
1428		1618
1429	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1619	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1430	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1620	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
1445		1635
1446	void glHint (int target, int mode)	1636	void glHint (int target, int mode)
1447		1637
1448	void glBlendFunc (int sfactor, int dfactor)	1638	void glBlendFunc (int sfactor, int dfactor)
1449		1639
		1640	void glDepthMask (int flag)
		1641
1450	void glLogicOp (int opcode)	1642	void glLogicOp (int opcode)
1451		1643
1452	void glColorMask (int red, int green, int blue, int alpha)	1644	void glColorMask (int red, int green, int blue, int alpha)
1453		1645
1454	void glMatrixMode (int mode)	1646	void glMatrixMode (int mode)
…		…
1457		1649
1458	void glPopMatrix ()	1650	void glPopMatrix ()
1459		1651
1460	void glLoadIdentity ()	1652	void glLoadIdentity ()
1461		1653
1462	# near and far are due to microsofts buggy c compiler	1654	# near_ and far_ are due to microsofts buggy "c" compiler
		1655	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1656
		1657	# 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_)	1658	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1464		1659
1465	void glViewport (int x, int y, int width, int height)	1660	void glViewport (int x, int y, int width, int height)
1466		1661
1467	void glScissor (int x, int y, int width, int height)	1662	void glScissor (int x, int y, int width, int height)
…		…
1483	void glEnd ()	1678	void glEnd ()
1484		1679
1485	void glColor (float r, float g, float b, float a = 1.0)	1680	void glColor (float r, float g, float b, float a = 1.0)
1486	PROTOTYPE: @	1681	PROTOTYPE: @
1487	CODE:	1682	CODE:
1488	glColor4ub (r * 255., g * 255., b * 255., a * 255.);	1683	// microsoft visual "c" rounds instead of truncating...
		1684	glColor4ub (MIN ((int)(r * 255.f), 255),
		1685	MIN ((int)(g * 255.f), 255),
		1686	MIN ((int)(b * 255.f), 255),
		1687	MIN ((int)(a * 255.f), 255));
		1688
		1689	void glInterleavedArrays (int format, int stride, char *data)
		1690
		1691	void glDrawElements (int mode, int count, int type, char *indices)
		1692
		1693	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1694
		1695	void glRasterPos (float x, float y, float z = 0.)
		1696	CODE:
		1697	glRasterPos3f (0, 0, z);
		1698	glBitmap (0, 0, 0, 0, x, y, 0);
1489		1699
1490	void glVertex (float x, float y, float z = 0.)	1700	void glVertex (float x, float y, float z = 0.)
1491	CODE:	1701	CODE:
1492	glVertex3f (x, y, z);	1702	glVertex3f (x, y, z);
1493		1703
…		…
1521		1731
1522	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1732	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1523		1733
1524	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1734	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1525		1735
1526	void glRasterPos (int x, int y)	1736	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1527	CODE:
1528	glRasterPos2i (x, y);
1529		1737
1530	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1738	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1531		1739
1532	int glGenTexture ()	1740	int glGenTexture ()
1533	CODE:	1741	CODE:
…		…
1560		1768
1561	void glEndList ()	1769	void glEndList ()
1562		1770
1563	void glCallList (int list)	1771	void glCallList (int list)
1564		1772
		1773

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.94 by root, Tue May 23 18:57:35 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.94 by root, Tue May 23 18:57:35 2006 UTC