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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.54 by root, Wed Apr 19 23:37:48 2006 UTC vs.
Revision 1.79 by root, Sun May 14 22:24:14 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2	# include <malloc.h>	3	# include <malloc.h>
		4	# include <windows.h>
		5	# pragma warning(disable:4244)
3	#endif	6	#endif
4		7
5	#include "EXTERN.h"	8	#include "EXTERN.h"
6	#include "perl.h"	9	#include "perl.h"
7	#include "XSUB.h"	10	#include "XSUB.h"
8		11
9	#include <string.h>	12	#include <string.h>
10	#include <stdio.h>	13	#include <stdio.h>
11		14
12	#include <SDL.h>	15	#include <SDL.h>
		16	#include <SDL_endian.h>
13	#include <SDL_image.h>	17	#include <SDL_image.h>
14	#include <SDL_mixer.h>	18	#include <SDL_mixer.h>
15	#include <SDL_opengl.h>	19	#include <SDL_opengl.h>
16		20
17	#include <glib/gmacros.h>	21	#include <glib/gmacros.h>
18		22
19	#include <pango/pango.h>	23	#include <pango/pango.h>
20	#include <pango/pangofc-fontmap.h>	24	#include <pango/pangofc-fontmap.h>
21	#include <pango/pangoft2.h>	25	#include <pango/pangoft2.h>
		26	#include <pango/pangocairo.h>
22		27
23	#ifndef _WIN32	28	#ifndef _WIN32
24	# include <sys/types.h>	29	# include <sys/types.h>
25	# include <sys/socket.h>	30	# include <sys/socket.h>
26	# include <netinet/in.h>	31	# include <netinet/in.h>
33	typedef signed char int8_t;	38	typedef signed char int8_t;
34	typedef signed short int16_t;	39	typedef signed short int16_t;
35	typedef signed int int32_t;	40	typedef signed int int32_t;
36	#endif	41	#endif
37		42
		43	#include "glext.h"
		44
38	#define FOW_DARKNESS 32	45	#define FOW_DARKNESS 32
39		46
40	#define MAP_EXTEND_X 32	47	#define MAP_EXTEND_X 32
41	#define MAP_EXTEND_Y 512	48	#define MAP_EXTEND_Y 512
42		49
		50	#define MIN_FONT_HEIGHT 10
		51
		52	#define GL_CALL(type,func,args) \
		53	{ \
		54	static int init_; \
		55	static type fptr_; \
		56	\
		57	if (!init_) \
		58	{ \
		59	init_ = 1; \
		60	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
		61	} \
		62	\
		63	if (fptr_) \
		64	fptr_ args; \
		65	}
		66
43	typedef Mix_Chunk *CFClient__MixChunk;	67	typedef Mix_Chunk *CFClient__MixChunk;
44	typedef Mix_Music *CFClient__MixMusic;	68	typedef Mix_Music *CFClient__MixMusic;
45		69
46	static PangoContext *context;	70	typedef PangoFontDescription *CFClient__Font;
47	static PangoFontMap *fontmap;
48		71
49	typedef struct cf_layout {	72	typedef struct cf_layout {
50	PangoLayout *pl;	73	PangoLayout *pl; // either derived from a cairo or ft2 context
		74	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
		75	float r, g, b, a; // default color for rgba mode
51	int base_height;	76	int base_height;
		77	CFClient__Font font;
52	} *CFClient__Layout;	78	} *CFClient__Layout;
		79
		80	static CFClient__Font default_font;
		81	static PangoContext ft2_context, cairo_context;
		82	static PangoFontMap ft2_fontmap, cairo_fontmap;
53		83
54	static void	84	static void
55	substitute_func (FcPattern *pattern, gpointer data)	85	substitute_func (FcPattern *pattern, gpointer data)
56	{	86	{
57	FcPatternAddBool (pattern, FC_HINTING , 1);	87	FcPatternAddBool (pattern, FC_HINTING , 1);
58	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	88	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
59	}	89	}
60		90
61	static void	91	static void
62	layout_update (CFClient__Layout self)	92	layout_update_font (CFClient__Layout self)
63	{	93	{
64	/* use a random scale factor to account for unknown descenders, 0.8 works	94	/* use a random scale factor to account for unknown descenders, 0.8 works
65	* reasonably well with bitstream vera	95	* reasonably well with bitstream vera
66	*/	96	*/
67	PangoFontDescription *font = pango_context_get_font_description (context);	97	PangoFontDescription *font = self->font ? self->font : default_font;
68		98
69	int height = self->base_height * (PANGO_SCALE * 8 / 10);
70
71	if (pango_font_description_get_size (font) != height)
72	{
73	pango_font_description_set_absolute_size (font, height);	99	pango_font_description_set_absolute_size (font,
74	pango_layout_context_changed (self->pl);	100	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
75	}	101
		102	pango_layout_set_font_description (self->pl, font);
76	}	103	}
77		104
78	static void	105	static void
79	layout_get_pixel_size (CFClient__Layout self, int w, int h)	106	layout_get_pixel_size (CFClient__Layout self, int w, int h)
80	{	107	{
81	layout_update (self);
82
83	pango_layout_get_pixel_size (self->pl, w, h);	108	pango_layout_get_pixel_size (self->pl, w, h);
84		109
85	w = (w + 3) & ~3;
86	if (!w) w = 1;	110	if (!w) w = 1;
87	if (!h) h = 1;	111	if (!h) h = 1;
		112
		113	w = (w + 3) & ~3;
88	}	114	}
89		115
90	typedef uint16_t mapface;	116	typedef uint16_t mapface;
91		117
92	typedef struct {	118	typedef struct {
…		…
237	break;	263	break;
238		264
239	row->col[x - row->c0].darkness = -1;	265	row->col[x - row->c0].darkness = -1;
240	}	266	}
241	}	267	}
		268	}
		269
		270	static void
		271	music_finished (void)
		272	{
		273	SDL_UserEvent ev;
		274
		275	ev.type = SDL_USEREVENT;
		276	ev.code = 0;
		277	ev.data1 = 0;
		278	ev.data2 = 0;
		279
		280	SDL_PushEvent ((SDL_Event *)&ev);
		281	}
		282
		283	static void
		284	channel_finished (int channel)
		285	{
		286	SDL_UserEvent ev;
		287
		288	ev.type = SDL_USEREVENT;
		289	ev.code = 1;
		290	ev.data1 = (void *)(long)channel;
		291	ev.data2 = 0;
		292
		293	SDL_PushEvent ((SDL_Event *)&ev);
242	}	294	}
243		295
244	MODULE = CFClient PACKAGE = CFClient	296	MODULE = CFClient PACKAGE = CFClient
245		297
246	PROTOTYPES: ENABLE	298	PROTOTYPES: ENABLE
…		…
354	# undef const_iv	406	# undef const_iv
355	};	407	};
356		408
357	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	409	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
358	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	410	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		411	}
359		412
		413	void
		414	pango_init ()
		415	CODE:
		416	{
		417	// delayed, so it can pick up new fonts added by AddFontResourceEx
360	fontmap = pango_ft2_font_map_new ();	418	ft2_fontmap = pango_ft2_font_map_new ();
361	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);	419	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
362	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);	420	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
		421
		422	cairo_fontmap = pango_cairo_font_map_get_default ();
		423	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
363	}	424	}
364		425
365	int	426	int
366	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	427	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
367		428
…		…
426		487
427	while (SDL_PollEvent (&ev))	488	while (SDL_PollEvent (&ev))
428	{	489	{
429	HV *hv = newHV ();	490	HV *hv = newHV ();
430	hv_store (hv, "type", 4, newSViv (ev.type), 0);	491	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		492
431	switch (ev.type)	493	switch (ev.type)
432	{	494	{
433	case SDL_KEYDOWN:	495	case SDL_KEYDOWN:
434	case SDL_KEYUP:	496	case SDL_KEYUP:
435	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	497	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
455	case SDL_MOUSEBUTTONUP:	517	case SDL_MOUSEBUTTONUP:
456	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	518	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
457	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	519	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
458	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	520	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
459	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	521	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		522	break;
		523
		524	case SDL_USEREVENT:
		525	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		526	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		527	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		528	break;
460	}	529	}
461		530
462	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	531	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
463	}	532	}
464	}	533	}
465		534
466	int	535	int
467	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	536	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
		537	POSTCALL:
		538	Mix_HookMusicFinished (music_finished);
		539	Mix_ChannelFinished (channel_finished);
468		540
469	void	541	void
470	Mix_CloseAudio ()	542	Mix_CloseAudio ()
471		543
472	int	544	int
…		…
495		567
496	void	568	void
497	add_font (char *file)	569	add_font (char *file)
498	CODE:	570	CODE:
499	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	571	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
500		572	#ifdef _WIN32
501	void	573	// cairo... sigh... requires win2000
502	set_font (char *file)	574	AddFontResourceEx (file, FR_PRIVATE, 0);
503	CODE:	575	#endif
504	{
505	int count;
506	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )file, 0, 0, &count);
507	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
508	FcPatternDestroy (pattern);
509	pango_context_set_font_description (context, font);
510	}
511		576
512	void	577	void
513	load_image_inline (SV *image_)	578	load_image_inline (SV *image_)
514	ALIAS:	579	ALIAS:
515	load_image_file = 1	580	load_image_file = 1
…		…
597	PUSHs (sv_2mortal (newSViv (b / y)));	662	PUSHs (sv_2mortal (newSViv (b / y)));
598	PUSHs (sv_2mortal (newSViv (a / y)));	663	PUSHs (sv_2mortal (newSViv (a / y)));
599	}	664	}
600		665
601	void	666	void
		667	error (char *message)
		668	CODE:
		669	#ifdef _WIN32
		670	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
		671	#else
		672	fprintf (stderr, "ERROR: %s\n", message);
		673	#endif
		674
		675	void
602	fatal (char *message)	676	fatal (char *message)
603	CODE:	677	CODE:
604	#ifdef _WIN32	678	#ifdef _WIN32
605	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	679	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
606	#else	680	#else
607	fprintf (stderr, "FATAL: %s\n", message);	681	fprintf (stderr, "FATAL: %s\n", message);
608	#endif	682	#endif
609	exit (1);	683	exit (1);
610		684
		685	MODULE = CFClient PACKAGE = CFClient::Font
		686
		687	CFClient::Font
		688	new_from_file (SV class, char path, int id = 0)
		689	CODE:
		690	{
		691	int count;
		692	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
		693	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
		694	FcPatternDestroy (pattern);
		695	}
		696	OUTPUT:
		697	RETVAL
		698
		699	void
		700	DESTROY (CFClient::Font self)
		701	CODE:
		702	pango_font_description_free (self);
		703
		704	void
		705	make_default (CFClient::Font self)
		706	CODE:
		707	default_font = self;
		708
611	MODULE = CFClient PACKAGE = CFClient::Layout	709	MODULE = CFClient PACKAGE = CFClient::Layout
612		710
613	CFClient::Layout	711	CFClient::Layout
614	new (SV *class, int base_height = 10)	712	new (SV *class, int rgba = 0)
615	CODE:	713	CODE:
616	New (0, RETVAL, 1, struct cf_layout);	714	New (0, RETVAL, 1, struct cf_layout);
617	RETVAL->base_height = base_height;	715
618	RETVAL->pl = pango_layout_new (context);	716	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
		717	RETVAL->rgba = rgba;
		718	RETVAL->r = 1.;
		719	RETVAL->g = 1.;
		720	RETVAL->b = 1.;
		721	RETVAL->a = 1.;
		722	RETVAL->base_height = MIN_FONT_HEIGHT;
		723	RETVAL->font = 0;
		724
619	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	725	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
		726	layout_update_font (RETVAL);
620	OUTPUT:	727	OUTPUT:
621	RETVAL	728	RETVAL
622		729
623	void	730	void
624	DESTROY (CFClient::Layout self)	731	DESTROY (CFClient::Layout self)
625	CODE:	732	CODE:
626	g_object_unref (self->pl);	733	g_object_unref (self->pl);
627	Safefree (self);	734	Safefree (self);
628		735
		736	int
		737	is_rgba (CFClient::Layout self)
		738	CODE:
		739	RETVAL = self->rgba;
		740	OUTPUT:
		741	RETVAL
		742
629	void	743	void
630	set_text (CFClient::Layout self, SV *text_)	744	set_text (CFClient::Layout self, SV *text_)
631	CODE:	745	CODE:
632	{	746	{
633	STRLEN textlen;	747	STRLEN textlen;
…		…
653	SvUTF8_on (RETVAL);	767	SvUTF8_on (RETVAL);
654	OUTPUT:	768	OUTPUT:
655	RETVAL	769	RETVAL
656		770
657	void	771	void
		772	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
		773	CODE:
		774	self->r = r;
		775	self->g = g;
		776	self->b = b;
		777	self->a = a;
		778
		779	void
		780	set_font (CFClient::Layout self, CFClient::Font font = 0)
		781	CODE:
		782	if (self->font != font)
		783	{
		784	self->font = font;
		785	layout_update_font (self);
		786	}
		787
		788	void
658	set_height (CFClient::Layout self, int base_height)	789	set_height (CFClient::Layout self, int base_height)
659	CODE:	790	CODE:
		791	if (self->base_height != base_height)
		792	{
660	self->base_height = base_height;	793	self->base_height = base_height;
		794	layout_update_font (self);
		795	}
661		796
662	void	797	void
663	set_width (CFClient::Layout self, int max_width = -1)	798	set_width (CFClient::Layout self, int max_width = -1)
664	CODE:	799	CODE:
665	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	800	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
…		…
668	size (CFClient::Layout self)	803	size (CFClient::Layout self)
669	PPCODE:	804	PPCODE:
670	{	805	{
671	int w, h;	806	int w, h;
672		807
673	layout_update (self);
674	layout_get_pixel_size (self, &w, &h);	808	layout_get_pixel_size (self, &w, &h);
675		809
676	EXTEND (SP, 2);	810	EXTEND (SP, 2);
677	PUSHs (sv_2mortal (newSViv (w)));	811	PUSHs (sv_2mortal (newSViv (w)));
678	PUSHs (sv_2mortal (newSViv (h)));	812	PUSHs (sv_2mortal (newSViv (h)));
…		…
681	int	815	int
682	xy_to_index (CFClient::Layout self, int x, int y)	816	xy_to_index (CFClient::Layout self, int x, int y)
683	CODE:	817	CODE:
684	{	818	{
685	int index, trailing;	819	int index, trailing;
686
687	layout_update (self);
688	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	820	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
689
690	RETVAL = index;	821	RETVAL = index;
691	}	822	}
692	OUTPUT:	823	OUTPUT:
693	RETVAL	824	RETVAL
694		825
695	void	826	void
696	cursor_pos (CFClient::Layout self, int index)	827	cursor_pos (CFClient::Layout self, int index)
697	PPCODE:	828	PPCODE:
698	{	829	{
699	PangoRectangle strong_pos;	830	PangoRectangle strong_pos;
700	layout_update (self);
701	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	831	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
702		832
703	EXTEND (SP, 3);	833	EXTEND (SP, 3);
704	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	834	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
705	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	835	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
…		…
710	render (CFClient::Layout self)	840	render (CFClient::Layout self)
711	PPCODE:	841	PPCODE:
712	{	842	{
713	SV *retval;	843	SV *retval;
714	int w, h;	844	int w, h;
715	FT_Bitmap bitmap;
716		845
717	layout_update (self);
718	layout_get_pixel_size (self, &w, &h);	846	layout_get_pixel_size (self, &w, &h);
719		847
		848	if (self->rgba)
		849	{
		850	cairo_surface_t *surface;
		851	cairo_t *cairo;
		852
		853	retval = newSV (w * h * 4);
		854	SvPOK_only (retval);
		855	SvCUR_set (retval, w * h * 4);
		856
		857	memset (SvPVX (retval), 0, w * h * 4);
		858
		859	surface = cairo_image_surface_create_for_data (
		860	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		861	cairo = cairo_create (surface);
		862	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		863
		864	pango_cairo_show_layout (cairo, self->pl);
		865
		866	cairo_destroy (cairo);
		867	cairo_surface_destroy (surface);
		868
		869	// what a mess, and its premultiplied, too :(
		870	{
		871	uint32_t p = (uint32_t )SvPVX (retval);
		872	uint32_t e = p + w h;
		873
		874	while (p < e)
		875	{
		876	uint32_t rgba = *p;
		877	rgba = (rgba >> 24) \| (rgba << 8);
		878	rgba = SDL_SwapBE32 (rgba);
		879	*p++ = rgba;
		880	}
		881	}
		882
		883	EXTEND (SP, 5);
		884	PUSHs (sv_2mortal (newSViv (w)));
		885	PUSHs (sv_2mortal (newSViv (h)));
		886	PUSHs (sv_2mortal (retval));
		887	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		888	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		889	}
		890	else
		891	{
		892	FT_Bitmap bitmap;
		893
720	retval = newSV (w * h);	894	retval = newSV (w * h);
721	SvPOK_only (retval);	895	SvPOK_only (retval);
722	SvCUR_set (retval, w * h);	896	SvCUR_set (retval, w * h);
723		897
724	bitmap.rows = h;	898	bitmap.rows = h;
725	bitmap.width = w;	899	bitmap.width = w;
726	bitmap.pitch = w;	900	bitmap.pitch = w;
727	bitmap.buffer = (unsigned char*)SvPVX (retval);	901	bitmap.buffer = (unsigned char*)SvPVX (retval);
728	bitmap.num_grays = 256;	902	bitmap.num_grays = 256;
729	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	903	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
730		904
731	memset (bitmap.buffer, 0, w * h);	905	memset (bitmap.buffer, 0, w * h);
732		906
733	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	907	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
734		908
735	EXTEND (SP, 3);	909	EXTEND (SP, 5);
736	PUSHs (sv_2mortal (newSViv (w)));	910	PUSHs (sv_2mortal (newSViv (w)));
737	PUSHs (sv_2mortal (newSViv (h)));	911	PUSHs (sv_2mortal (newSViv (h)));
738	PUSHs (sv_2mortal (retval));	912	PUSHs (sv_2mortal (retval));
		913	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		914	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		915	}
739	}	916	}
740		917
741	MODULE = CFClient PACKAGE = CFClient::Texture	918	MODULE = CFClient PACKAGE = CFClient::Texture
742		919
743	void	920	void
744	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	921	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
745	PROTOTYPE: $$$;$$	922	PROTOTYPE: $$$;$$
		923	ALIAS:
		924	draw_quad_alpha = 1
		925	draw_quad_alpha_premultiplied = 2
746	CODE:	926	CODE:
747	{	927	{
748	HV hv = (HV )SvRV (self);	928	HV hv = (HV )SvRV (self);
749	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	929	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
750	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	930	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
755	{	935	{
756	w = SvNV (*hv_fetch (hv, "w", 1, 1));	936	w = SvNV (*hv_fetch (hv, "w", 1, 1));
757	h = SvNV (*hv_fetch (hv, "h", 1, 1));	937	h = SvNV (*hv_fetch (hv, "h", 1, 1));
758	}	938	}
759		939
		940	if (ix)
		941	{
		942	glEnable (GL_BLEND);
		943	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		944	}
		945
760	glBindTexture (GL_TEXTURE_2D, name);	946	glBindTexture (GL_TEXTURE_2D, name);
		947
761	if (wrap_mode) {	948	if (wrap_mode)
		949	{
762	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	950	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
763	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	951	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
764	}	952	}
		953
765	glBegin (GL_QUADS);	954	glBegin (GL_QUADS);
766	glTexCoord2f (0, 0); glVertex2f (x , y );	955	glTexCoord2f (0, 0); glVertex2f (x , y );
767	glTexCoord2f (0, t); glVertex2f (x , y + h);	956	glTexCoord2f (0, t); glVertex2f (x , y + h);
768	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	957	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
769	glTexCoord2f (s, 0); glVertex2f (x + w, y );	958	glTexCoord2f (s, 0); glVertex2f (x + w, y );
770	glEnd ();	959	glEnd ();
		960
		961	if (ix)
		962	glDisable (GL_BLEND);
771	}	963	}
772		964
773	MODULE = CFClient PACKAGE = CFClient::Map	965	MODULE = CFClient PACKAGE = CFClient::Map
774		966
775	CFClient::Map	967	CFClient::Map
…		…
933	cell->darkness = -1;	1125	cell->darkness = -1;
934	}	1126	}
935	}	1127	}
936		1128
937	SV *	1129	SV *
938	mapmap (CFClient::Map self, int w, int h)	1130	mapmap (CFClient::Map self, int x0, int y0, int w, int h)
939	CODE:	1131	CODE:
940	{	1132	{
941	int x0, x1, x;	1133	int x1, x;
942	int y0, y1, y;	1134	int y1, y;
943	int z;	1135	int z;
944	SV map_sv = newSV (w h * sizeof (uint32_t));	1136	SV map_sv = newSV (w h * sizeof (uint32_t));
945	uint32_t map = (uint32_t )SvPVX (map_sv);	1137	uint32_t map = (uint32_t )SvPVX (map_sv);
946		1138
947	SvPOK_only (map_sv);	1139	SvPOK_only (map_sv);
948	SvCUR_set (map_sv, w * h * sizeof (uint32_t));	1140	SvCUR_set (map_sv, w * h * sizeof (uint32_t));
949		1141
950	x0 = self->x - w / 2; x1 = x0 + w;	1142	x0 += self->x; x1 = x0 + w;
951	y0 = self->y - h / 2; y1 = y0 + h;	1143	y0 += self->y; y1 = y0 + h;
952		1144
953	for (y = y0; y < y1; y++)	1145	for (y = y0; y < y1; y++)
954	{	1146	{
955	maprow *row = 0 <= y && y < self->rows	1147	maprow *row = 0 <= y && y < self->rows
956	? self->row + y	1148	? self->row + y
…		…
1096	data++ = 0; / version 0 format */	1288	data++ = 0; / version 0 format */
1097	data++ = w >> 8; data++ = w;	1289	data++ = w >> 8; data++ = w;
1098	data++ = h >> 8; data++ = h;	1290	data++ = h >> 8; data++ = h;
1099		1291
1100	// we need to do this 'cause we don't keep an absolute coord system for rows	1292	// we need to do this 'cause we don't keep an absolute coord system for rows
1101	// TODO: treat rows as we treat	1293	// TODO: treat rows as we treat columns
1102	map_get_row (self, y0 + self->y - self->oy);//D	1294	map_get_row (self, y0 + self->y - self->oy);//D
1103	map_get_row (self, y0 + self->y - self->oy + h - 1);//D	1295	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1104		1296
1105	x0 += self->x - self->ox;	1297	x0 += self->x - self->ox;
1106	y0 += self->y - self->oy;	1298	y0 += self->y - self->oy;
…		…
1170		1362
1171	w = data++ << 8; w \|= data++;	1363	w = data++ << 8; w \|= data++;
1172	h = data++ << 8; h \|= data++;	1364	h = data++ << 8; h \|= data++;
1173		1365
1174	// we need to do this 'cause we don't keep an absolute coord system for rows	1366	// we need to do this 'cause we don't keep an absolute coord system for rows
1175	// TODO: treat rows as we treat	1367	// TODO: treat rows as we treat columns
1176	map_get_row (self, y0 + self->y - self->oy);//D	1368	map_get_row (self, y0 + self->y - self->oy);//D
1177	map_get_row (self, y0 + self->y - self->oy + h - 1);//D	1369	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1178		1370
1179	x0 += self->x - self->ox;	1371	x0 += self->x - self->ox;
1180	y0 += self->y - self->oy;	1372	y0 += self->y - self->oy;
…		…
1284	} *civ, const_iv[] = {	1476	} *civ, const_iv[] = {
1285	# define const_iv(name) { # name, (IV)name }	1477	# define const_iv(name) { # name, (IV)name }
1286	const_iv (GL_COLOR_MATERIAL),	1478	const_iv (GL_COLOR_MATERIAL),
1287	const_iv (GL_SMOOTH),	1479	const_iv (GL_SMOOTH),
1288	const_iv (GL_FLAT),	1480	const_iv (GL_FLAT),
		1481	const_iv (GL_DITHER),
1289	const_iv (GL_BLEND),	1482	const_iv (GL_BLEND),
		1483	const_iv (GL_SCISSOR_TEST),
1290	const_iv (GL_AND),	1484	const_iv (GL_AND),
		1485	const_iv (GL_ONE),
		1486	const_iv (GL_ZERO),
1291	const_iv (GL_SRC_ALPHA),	1487	const_iv (GL_SRC_ALPHA),
		1488	const_iv (GL_SRC_ALPHA_SATURATE),
1292	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1489	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1490	const_iv (GL_ONE_MINUS_DST_ALPHA),
1293	const_iv (GL_RGB),	1491	const_iv (GL_RGB),
1294	const_iv (GL_RGBA),	1492	const_iv (GL_RGBA),
1295	const_iv (GL_UNSIGNED_BYTE),	1493	const_iv (GL_UNSIGNED_BYTE),
1296	const_iv (GL_ALPHA4),
1297	const_iv (GL_ALPHA),	1494	const_iv (GL_ALPHA),
		1495	const_iv (GL_LUMINANCE),
1298	const_iv (GL_FLOAT),	1496	const_iv (GL_FLOAT),
1299	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1497	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1300	const_iv (GL_COMPILE),	1498	const_iv (GL_COMPILE),
1301	const_iv (GL_TEXTURE_1D),	1499	const_iv (GL_TEXTURE_1D),
1302	const_iv (GL_TEXTURE_2D),	1500	const_iv (GL_TEXTURE_2D),
…		…
1308	const_iv (GL_TEXTURE_WRAP_T),	1506	const_iv (GL_TEXTURE_WRAP_T),
1309	const_iv (GL_CLAMP),	1507	const_iv (GL_CLAMP),
1310	const_iv (GL_REPEAT),	1508	const_iv (GL_REPEAT),
1311	const_iv (GL_NEAREST),	1509	const_iv (GL_NEAREST),
1312	const_iv (GL_LINEAR),	1510	const_iv (GL_LINEAR),
		1511	const_iv (GL_NEAREST_MIPMAP_NEAREST),
		1512	const_iv (GL_LINEAR_MIPMAP_NEAREST),
		1513	const_iv (GL_NEAREST_MIPMAP_LINEAR),
		1514	const_iv (GL_LINEAR_MIPMAP_LINEAR),
		1515	const_iv (GL_GENERATE_MIPMAP),
1313	const_iv (GL_MODULATE),	1516	const_iv (GL_MODULATE),
		1517	const_iv (GL_DECAL),
1314	const_iv (GL_REPLACE),	1518	const_iv (GL_REPLACE),
1315	const_iv (GL_COLOR_BUFFER_BIT),	1519	const_iv (GL_COLOR_BUFFER_BIT),
1316	const_iv (GL_PROJECTION),	1520	const_iv (GL_PROJECTION),
1317	const_iv (GL_MODELVIEW),	1521	const_iv (GL_MODELVIEW),
1318	const_iv (GL_COLOR_LOGIC_OP),	1522	const_iv (GL_COLOR_LOGIC_OP),
		1523	const_iv (GL_SEPARABLE_2D),
1319	const_iv (GL_CONVOLUTION_2D),	1524	const_iv (GL_CONVOLUTION_2D),
1320	const_iv (GL_CONVOLUTION_BORDER_MODE),	1525	const_iv (GL_CONVOLUTION_BORDER_MODE),
1321	const_iv (GL_CONSTANT_BORDER),	1526	const_iv (GL_CONSTANT_BORDER),
1322	const_iv (GL_LINES),	1527	const_iv (GL_LINES),
1323	const_iv (GL_QUADS),	1528	const_iv (GL_QUADS),
		1529	const_iv (GL_LINE_LOOP),
1324	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1530	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1325	const_iv (GL_FASTEST),	1531	const_iv (GL_FASTEST),
1326	# undef const_iv	1532	# undef const_iv
1327	};	1533	};
1328		1534
…		…
1347		1553
1348	void glBlendFunc (int sfactor, int dfactor)	1554	void glBlendFunc (int sfactor, int dfactor)
1349		1555
1350	void glLogicOp (int opcode)	1556	void glLogicOp (int opcode)
1351		1557
		1558	void glColorMask (int red, int green, int blue, int alpha)
		1559
1352	void glMatrixMode (int mode)	1560	void glMatrixMode (int mode)
1353		1561
1354	void glPushMatrix ()	1562	void glPushMatrix ()
1355		1563
1356	void glPopMatrix ()	1564	void glPopMatrix ()
1357		1565
1358	void glLoadIdentity ()	1566	void glLoadIdentity ()
1359		1567
		1568	# near and far are due to microsofts buggy c compiler
1360	void glOrtho (double left, double right, double bottom, double top, double near, double far)	1569	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1361		1570
1362	void glViewport (int x, int y, int width, int height)	1571	void glViewport (int x, int y, int width, int height)
		1572
		1573	void glScissor (int x, int y, int width, int height)
1363		1574
1364	void glTranslate (float x, float y, float z = 0.)	1575	void glTranslate (float x, float y, float z = 0.)
1365	CODE:	1576	CODE:
1366	glTranslatef (x, y, z);	1577	glTranslatef (x, y, z);
1367		1578
1368	void glScale (float x, float y, float z)	1579	void glScale (float x, float y, float z = 1.)
1369	CODE:	1580	CODE:
1370	glScalef (x, y, z);	1581	glScalef (x, y, z);
1371		1582
1372	void glRotate (float angle, float x, float y, float z)	1583	void glRotate (float angle, float x, float y, float z)
1373	CODE:	1584	CODE:
…		…
1378	void glEnd ()	1589	void glEnd ()
1379		1590
1380	void glColor (float r, float g, float b, float a = 1.0)	1591	void glColor (float r, float g, float b, float a = 1.0)
1381	PROTOTYPE: @	1592	PROTOTYPE: @
1382	CODE:	1593	CODE:
1383	glColor4f (r, g, b, a);	1594	// 255.999 is close enough to correctness (256 and clamp)
		1595	glColor4ub (r * 255.999, g * 255.999, b * 255.999, a * 255.999);
1384		1596
1385	void glVertex (float x, float y, float z = 0.)	1597	void glVertex (float x, float y, float z = 0.)
1386	CODE:	1598	CODE:
1387	glVertex3f (x, y, z);	1599	glVertex3f (x, y, z);
1388		1600
…		…
1400		1612
1401	void glBindTexture (int target, int name)	1613	void glBindTexture (int target, int name)
1402		1614
1403	void glConvolutionParameter (int target, int pname, float params)	1615	void glConvolutionParameter (int target, int pname, float params)
1404	CODE:	1616	CODE:
1405	glConvolutionParameterf (target, pname, params);	1617	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1406		1618
1407	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1619	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1620	CODE:
		1621	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
		1622	(target, internalformat, width, height, format, type, data));
		1623
		1624	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		1625	CODE:
		1626	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
		1627	(target, internalformat, width, height, format, type, row, column));
1408		1628
1409	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1629	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1410		1630
1411	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1631	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1632
		1633	void glRasterPos (int x, int y)
		1634	CODE:
		1635	glRasterPos2i (x, y);
		1636
		1637	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1412		1638
1413	int glGenTexture ()	1639	int glGenTexture ()
1414	CODE:	1640	CODE:
1415	{	1641	{
1416	GLuint name;	1642	GLuint name;

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.54 by root, Wed Apr 19 23:37:48 2006 UTC vs. Revision 1.79 by root, Sun May 14 22:24:14 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.54 by root, Wed Apr 19 23:37:48 2006 UTC vs.
Revision 1.79 by root, Sun May 14 22:24:14 2006 UTC