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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.119 by root, Sat Jun 17 15:07:52 2006 UTC vs.
Revision 1.132 by root, Sun Jul 23 04:37:51 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3	# include <malloc.h>	4	# include <malloc.h>
4	# include <windows.h>	5	# include <windows.h>
5	# pragma warning(disable:4244)	6	# pragma warning(disable:4244)
6	#endif	7	#endif
7		8
8	#include "EXTERN.h"	9	#include "EXTERN.h"
9	#include "perl.h"	10	#include "perl.h"
10	#include "XSUB.h"	11	#include "XSUB.h"
11		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
12	#include <math.h>	17	#include <math.h>
13	#include <string.h>	18	#include <string.h>
14	#include <stdio.h>	19	#include <stdio.h>
15	#include <stdlib.h>	20	#include <stdlib.h>
16		21
18	#include <SDL_endian.h>	23	#include <SDL_endian.h>
19	#include <SDL_image.h>	24	#include <SDL_image.h>
20	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
21	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
22		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
23	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
24		32
25	#include <pango/pango.h>	33	#include <pango/pango.h>
26	#include <pango/pangofc-fontmap.h>
27	#include <pango/pangoft2.h>
28	#include <pango/pangocairo.h>
29		34
30	#ifndef _WIN32	35	#ifndef _WIN32
31	# include <sys/types.h>	36	# include <sys/types.h>
32	# include <sys/socket.h>	37	# include <sys/socket.h>
33	# include <netinet/in.h>	38	# include <netinet/in.h>
…		…
40	typedef signed char int8_t;	45	typedef signed char int8_t;
41	typedef signed short int16_t;	46	typedef signed short int16_t;
42	typedef signed int int32_t;	47	typedef signed int int32_t;
43	#endif	48	#endif
44		49
45	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
46		51
47	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
48		53
49	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
50	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
51		56
52	#define MIN_FONT_HEIGHT 10	57	#define MIN_FONT_HEIGHT 10
		58
		59	#if 0
		60	# define PARACHUTE SDL_INIT_NOPARACHUTE
		61	#else
		62	# define PARACHUTE 0
		63	#endif
53		64
54	static struct	65	static struct
55	{	66	{
56	#define GL_FUNC(ptr,name) ptr name;	67	#define GL_FUNC(ptr,name) ptr name;
57	#include "glfunc.h"	68	#include "glfunc.h"
…		…
66	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67	else	78	else
68	glBlendFunc (sa, da);	79	glBlendFunc (sa, da);
69	}	80	}
70		81
		82	#include "texcache.c"
		83
		84	#include "pango-font.c"
		85	#include "pango-fontmap.c"
		86	#include "pango-render.c"
		87
71	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFClient__MixChunk;
72	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFClient__MixMusic;
73		90
74	typedef PangoFontDescription *CFClient__Font;	91	typedef PangoFontDescription *CFClient__Font;
75		92
		93	static int
		94	shape_attr_p (PangoLayoutRun *run)
		95	{
		96	GSList *attrs = run->item->analysis.extra_attrs;
		97
		98	while (attrs)
		99	{
		100	PangoAttribute *attr = attrs->data;
		101
		102	if (attr->klass->type == PANGO_ATTR_SHAPE)
		103	return 1;
		104
		105	attrs = attrs->next;
		106	}
		107
		108	return 0;
		109	}
		110
76	typedef struct cf_layout {	111	typedef struct cf_layout {
77	PangoLayout *pl; // either derived from a cairo or ft2 context	112	PangoLayout *pl;
78	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
80	int base_height;	114	int base_height;
81	CFClient__Font font;	115	CFClient__Font font;
82	} *CFClient__Layout;	116	} *CFClient__Layout;
83		117
84	static CFClient__Font default_font;	118	static CFClient__Font default_font;
85	static PangoContext ft2_context, cairo_context;	119	static PangoContext *opengl_context;
86	static PangoFontMap ft2_fontmap, cairo_fontmap;	120	static PangoFontMap *opengl_fontmap;
87		121
88	static void	122	static void
89	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
90	{	124	{
91	FcPatternAddBool (pattern, FC_HINTING, 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
92	#ifdef FC_HINT_STYLE	126	#ifdef FC_HINT_STYLE
93	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94	#endif	128	#endif
95	#ifdef _WIN32
96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97	#else
98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99	#endif
100	}	130	}
101		131
102	static void	132	static void
103	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFClient__Layout self)
104	{	134	{
…		…
436		466
437	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	467	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
438	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	468	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
439	}	469	}
440		470
		471	int
		472	in_destruct ()
		473	CODE:
		474	RETVAL = PL_main_cv == Nullcv;
		475	OUTPUT:
		476	RETVAL
		477
441	NV floor (NV x)	478	NV floor (NV x)
442		479
443	NV ceil (NV x)	480	NV ceil (NV x)
444		481
445	void	482	void
446	pango_init ()	483	pango_init ()
447	CODE:	484	CODE:
448	// delayed, so it can pick up new fonts added by AddFontResourceEx
449	{	485	{
450	{
451	ft2_fontmap = pango_ft2_font_map_new ();	486	opengl_fontmap = pango_opengl_font_map_new ();
452	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	487	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
453	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	488	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
454	}
455	{
456	cairo_font_options_t *fopt = cairo_font_options_create ();
457	cairo_fontmap = pango_cairo_font_map_get_default ();
458	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
459	#ifdef _WIN32
460	// cairo looks like shit eaten twice on windows
461	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
462	#else
463	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
464	#endif
465	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
466	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
467	pango_cairo_context_set_font_options (cairo_context, fopt);
468	cairo_font_options_destroy (fopt);
469	}
470	}	489	}
471		490
472	int	491	int
473	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	492	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
474		493
475	void	494	void
476	SDL_Quit ()	495	SDL_Quit ()
477		496
478	void	497	void
…		…
493	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	512	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
494	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	513	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
495	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	514	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
496		515
497	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	516	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		517	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		518	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
498		519
499	SDL_EnableUNICODE (1);	520	SDL_EnableUNICODE (1);
500	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	521	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
501		522
502	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	523	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
589	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	610	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
590	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	611	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
591	break;	612	break;
592	}	613	}
593		614
594	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	615	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFClient::UI::Event", 1))));
595	}	616	}
596	}	617	}
597		618
598	int	619	int
599	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	620	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
615	#endif	636	#endif
616		637
617	void	638	void
618	add_font (char *file)	639	add_font (char *file)
619	CODE:	640	CODE:
620	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	641	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
621	#ifdef _WIN32
622	// cairo... sigh... requires win2000
623	AddFontResourceEx (file, FR_PRIVATE, 0);
624	#endif
625		642
626	void	643	void
627	load_image_inline (SV *image_)	644	load_image_inline (SV *image_)
628	ALIAS:	645	ALIAS:
629	load_image_file = 1	646	load_image_file = 1
…		…
671		688
672	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	689	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
673		690
674	assert (surface2->pitch == surface2->w * 4);	691	assert (surface2->pitch == surface2->w * 4);
675		692
		693	SDL_LockSurface (surface2);
676	EXTEND (SP, 5);	694	EXTEND (SP, 6);
677	PUSHs (sv_2mortal (newSViv (surface2->w)));	695	PUSHs (sv_2mortal (newSViv (surface2->w)));
678	PUSHs (sv_2mortal (newSViv (surface2->h)));	696	PUSHs (sv_2mortal (newSViv (surface2->h)));
679	SDL_LockSurface (surface2);
680	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	697	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
681	SDL_UnlockSurface (surface2);
682	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	698	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
683	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	699	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
684	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	700	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		701	SDL_UnlockSurface (surface2);
685		702
686	SDL_FreeSurface (surface);	703	SDL_FreeSurface (surface);
687	SDL_FreeSurface (surface2);	704	SDL_FreeSurface (surface2);
688	}	705	}
689		706
…		…
758	CODE:	775	CODE:
759	default_font = self;	776	default_font = self;
760		777
761	MODULE = CFClient PACKAGE = CFClient::Layout	778	MODULE = CFClient PACKAGE = CFClient::Layout
762		779
		780	void
		781	reset_glyph_cache ()
		782	CODE:
		783	tc_clear ();
		784
763	CFClient::Layout	785	CFClient::Layout
764	new (SV *class, int rgba = 0)	786	new (SV *class)
765	CODE:	787	CODE:
766	New (0, RETVAL, 1, struct cf_layout);	788	New (0, RETVAL, 1, struct cf_layout);
767		789
768	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	790	RETVAL->pl = pango_layout_new (opengl_context);
769	RETVAL->rgba = rgba;
770	RETVAL->r = 1.;	791	RETVAL->r = 1.;
771	RETVAL->g = 1.;	792	RETVAL->g = 1.;
772	RETVAL->b = 1.;	793	RETVAL->b = 1.;
773	RETVAL->a = 1.;	794	RETVAL->a = 1.;
774	RETVAL->base_height = MIN_FONT_HEIGHT;	795	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
783	DESTROY (CFClient::Layout self)	804	DESTROY (CFClient::Layout self)
784	CODE:	805	CODE:
785	g_object_unref (self->pl);	806	g_object_unref (self->pl);
786	Safefree (self);	807	Safefree (self);
787		808
788	int
789	is_rgba (CFClient::Layout self)
790	CODE:
791	RETVAL = self->rgba;
792	OUTPUT:
793	RETVAL
794
795	void	809	void
796	set_text (CFClient::Layout self, SV *text_)	810	set_text (CFClient::Layout self, SV *text_)
797	CODE:	811	CODE:
798	{	812	{
799	STRLEN textlen;	813	STRLEN textlen;
…		…
809	STRLEN textlen;	823	STRLEN textlen;
810	char *text = SvPVutf8 (text_, textlen);	824	char *text = SvPVutf8 (text_, textlen);
811		825
812	pango_layout_set_markup (self->pl, text, textlen);	826	pango_layout_set_markup (self->pl, text, textlen);
813	}	827	}
		828
		829	void
		830	set_shapes (CFClient::Layout self, ...)
		831	CODE:
		832	{
		833	PangoAttrList *attrs = 0;
		834	const char *text = pango_layout_get_text (self->pl);
		835	const char *pos = text;
		836	int arg = 4;
		837
		838	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		839	{
		840	PangoRectangle inkrect, rect;
		841	PangoAttribute *attr;
		842
		843	int x = SvIV (ST (arg - 3));
		844	int y = SvIV (ST (arg - 2));
		845	int w = SvIV (ST (arg - 1));
		846	int h = SvIV (ST (arg ));
		847
		848	inkrect.x = 0;
		849	inkrect.y = 0;
		850	inkrect.width = 0;
		851	inkrect.height = 0;
		852
		853	rect.x = x * PANGO_SCALE;
		854	rect.y = y * PANGO_SCALE;
		855	rect.width = w * PANGO_SCALE;
		856	rect.height = h * PANGO_SCALE;
		857
		858	if (!attrs)
		859	attrs = pango_layout_get_attributes (self->pl);
		860
		861	attr = pango_attr_shape_new (&inkrect, &rect);
		862	attr->start_index = pos - text;
		863	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		864	pango_attr_list_insert (attrs, attr);
		865
		866	arg += 4;
		867	pos += sizeof (OBJ_STR) - 1;
		868	}
		869
		870	if (attrs)
		871	pango_layout_set_attributes (self->pl, attrs);
		872	}
		873
		874	void
		875	get_shapes (CFClient::Layout self)
		876	PPCODE:
		877	{
		878	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		879
		880	do
		881	{
		882	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		883
		884	if (run && shape_attr_p (run))
		885	{
		886	PangoRectangle extents;
		887	pango_layout_iter_get_run_extents (iter, 0, &extents);
		888
		889	EXTEND (SP, 2);
		890	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		891	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		892	}
		893	}
		894	while (pango_layout_iter_next_run (iter));
		895
		896	pango_layout_iter_free (iter);
		897	}
		898
		899	int
		900	has_wrapped (CFClient::Layout self)
		901	CODE:
		902	{
		903	int lines = 1;
		904	const char *text = pango_layout_get_text (self->pl);
		905
		906	while (*text)
		907	lines += *text++ == '\n';
		908
		909	RETVAL = lines < pango_layout_get_line_count (self->pl);
		910	}
		911	OUTPUT:
		912	RETVAL
814		913
815	SV *	914	SV *
816	get_text (CFClient::Layout self)	915	get_text (CFClient::Layout self)
817	CODE:	916	CODE:
818	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	917	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
…		…
888	PUSHs (sv_2mortal (newSViv (w)));	987	PUSHs (sv_2mortal (newSViv (w)));
889	PUSHs (sv_2mortal (newSViv (h)));	988	PUSHs (sv_2mortal (newSViv (h)));
890	}	989	}
891		990
892	int	991	int
		992	descent (CFClient::Layout self)
		993	CODE:
		994	{
		995	PangoRectangle rect;
		996	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		997	pango_layout_line_get_pixel_extents (line, 0, &rect);
		998	RETVAL = PANGO_DESCENT (rect);
		999	}
		1000	OUTPUT:
		1001	RETVAL
		1002
		1003	int
893	xy_to_index (CFClient::Layout self, int x, int y)	1004	xy_to_index (CFClient::Layout self, int x, int y)
894	CODE:	1005	CODE:
895	{	1006	{
896	int index, trailing;	1007	int index, trailing;
897	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1008	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
…		…
912	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1023	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
913	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1024	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
914	}	1025	}
915		1026
916	void	1027	void
917	render (CFClient::Layout self)	1028	render (CFClient::Layout self, float x, float y)
918	PPCODE:	1029	PPCODE:
919	{	1030	pango_opengl_render_layout_subpixel (
920	SV *retval;	1031	self->pl,
921	int w, h;	1032	x * PANGO_SCALE, y * PANGO_SCALE,
922		1033	self->r, self->g, self->b, self->a
923	layout_get_pixel_size (self, &w, &h);
924
925	if (self->rgba)
926	{	1034	);
927	cairo_surface_t *surface;
928	cairo_t *cairo;
929
930	retval = newSV (w * h * 4);
931	SvPOK_only (retval);
932	SvCUR_set (retval, w * h * 4);
933
934	memset (SvPVX (retval), 0, w * h * 4);
935
936	surface = cairo_image_surface_create_for_data (
937	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
938	cairo = cairo_create (surface);
939	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
940
941	pango_cairo_show_layout (cairo, self->pl);
942
943	cairo_destroy (cairo);
944	cairo_surface_destroy (surface);
945
946	// what a mess, and its premultiplied, too :(
947	{
948	uint32_t p = (uint32_t )SvPVX (retval);
949	uint32_t e = p + w h;
950
951	while (p < e)
952	{
953	uint32_t rgba = *p;
954	rgba = (rgba >> 24) \| (rgba << 8);
955	#if 0
956	#ifdef _WIN32
957	{//D
958	uint8_t r = rgba >> 24;
959	uint8_t g = rgba >> 16;
960	uint8_t b = rgba >> 8;
961	uint8_t a = rgba >> 0;
962
963	rgba = (rgba & 0xffffff00) \| a;
964	}
965	#endif
966	#endif
967	rgba = SDL_SwapBE32 (rgba);
968	*p++ = rgba;
969	}
970	}
971
972	EXTEND (SP, 5);
973	PUSHs (sv_2mortal (newSViv (w)));
974	PUSHs (sv_2mortal (newSViv (h)));
975	PUSHs (sv_2mortal (retval));
976	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
977	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
978	}
979	else
980	{
981	FT_Bitmap bitmap;
982
983	retval = newSV (w * h);
984	SvPOK_only (retval);
985	SvCUR_set (retval, w * h);
986
987	bitmap.rows = h;
988	bitmap.width = w;
989	bitmap.pitch = w;
990	bitmap.buffer = (unsigned char*)SvPVX (retval);
991	bitmap.num_grays = 256;
992	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
993
994	memset (bitmap.buffer, 0, w * h);
995
996	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
997
998	EXTEND (SP, 5);
999	PUSHs (sv_2mortal (newSViv (w)));
1000	PUSHs (sv_2mortal (newSViv (h)));
1001	PUSHs (sv_2mortal (retval));
1002	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1003	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1004	}
1005	}
1006		1035
1007	MODULE = CFClient PACKAGE = CFClient::Texture	1036	MODULE = CFClient PACKAGE = CFClient::Texture
1008		1037
1009	void	1038	void
1010	pad2pot (SV data_, SV w_, SV *h_)	1039	pad2pot (SV data_, SV w_, SV *h_)
…		…
1233		1262
1234	while (data < data_end)	1263	while (data < data_end)
1235	{	1264	{
1236	flags = (data [0] << 8) + data [1]; data += 2;	1265	flags = (data [0] << 8) + data [1]; data += 2;
1237		1266
1238	x = ((flags >> 10) & 63) + self->x;	1267	x = self->x + ((flags >> 10) & 63);
1239	y = ((flags >> 4) & 63) + self->y;	1268	y = self->y + ((flags >> 4) & 63);
1240		1269
1241	cell = map_get_cell (self, x, y);	1270	cell = map_get_cell (self, x, y);
1242		1271
1243	if (flags & 15)	1272	if (flags & 15)
1244	{	1273	{
…		…
1341	int vx, vy;	1370	int vx, vy;
1342	int x, y, z;	1371	int x, y, z;
1343	int last_name;	1372	int last_name;
1344	mapface face;	1373	mapface face;
1345		1374
1346	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1375	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1347	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1376	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1348		1377
1349	/*	1378	/*
1350	int vx = self->vx = self->w >= sw	1379	int vx = self->vx = self->w >= sw
1351	? self->x + (self->w - sw) / 2	1380	? self->x + (self->w - sw) / 2
1352	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1381	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1412	void	1441	void
1413	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1442	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
1414	CODE:	1443	CODE:
1415	{	1444	{
1416	static float color[16][3] = {	1445	static float color[16][3] = {
1417	{ 0.00, 0.00, 0.00 },	1446	{ 0.00F, 0.00F, 0.00F },
1418	{ 1.00, 1.00, 1.00 },	1447	{ 1.00F, 1.00F, 1.00F },
1419	{ 0.00, 0.00, 0.55 },	1448	{ 0.00F, 0.00F, 0.55F },
1420	{ 1.00, 0.00, 0.00 },	1449	{ 1.00F, 0.00F, 0.00F },
1421		1450
1422	{ 1.00, 0.54, 0.00 },	1451	{ 1.00F, 0.54F, 0.00F },
1423	{ 0.11, 0.56, 1.00 },	1452	{ 0.11F, 0.56F, 1.00F },
1424	{ 0.93, 0.46, 0.00 },	1453	{ 0.93F, 0.46F, 0.00F },
1425	{ 0.18, 0.54, 0.34 },	1454	{ 0.18F, 0.54F, 0.34F },
1426		1455
1427	{ 0.56, 0.73, 0.56 },	1456	{ 0.56F, 0.73F, 0.56F },
1428	{ 0.80, 0.80, 0.80 },	1457	{ 0.80F, 0.80F, 0.80F },
1429	{ 0.55, 0.41, 0.13 },	1458	{ 0.55F, 0.41F, 0.13F },
1430	{ 0.99, 0.77, 0.26 },	1459	{ 0.99F, 0.77F, 0.26F },
1431		1460
1432	{ 0.74, 0.65, 0.41 },	1461	{ 0.74F, 0.65F, 0.41F },
1433		1462
1434	{ 0.00, 1.00, 1.00 },	1463	{ 0.00F, 1.00F, 1.00F },
1435	{ 1.00, 0.00, 1.00 },	1464	{ 1.00F, 0.00F, 1.00F },
1436	{ 1.00, 1.00, 0.00 },	1465	{ 1.00F, 1.00F, 0.00F },
1437	};	1466	};
1438		1467
1439	int x, y;	1468	int x, y;
1440		1469
1441	glEnable (GL_TEXTURE_2D);	1470	glEnable (GL_TEXTURE_2D);
…		…
1890	r *= a;	1919	r *= a;
1891	g *= a;	1920	g *= a;
1892	b *= a;	1921	b *= a;
1893	}	1922	}
1894	// microsoft visual "c" rounds instead of truncating...	1923	// microsoft visual "c" rounds instead of truncating...
1895	glColor4ub (MIN ((int)(r * 256.f), 255),	1924	glColor4f (r, g, b, a);
1896	MIN ((int)(g * 256.f), 255),
1897	MIN ((int)(b * 256.f), 255),
1898	MIN ((int)(a * 256.f), 255));
1899		1925
1900	void glInterleavedArrays (int format, int stride, char *data)	1926	void glInterleavedArrays (int format, int stride, char *data)
1901		1927
1902	void glDrawElements (int mode, int count, int type, char *indices)	1928	void glDrawElements (int mode, int count, int type, char *indices)
1903		1929

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.119 by root, Sat Jun 17 15:07:52 2006 UTC vs. Revision 1.132 by root, Sun Jul 23 04:37:51 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.119 by root, Sat Jun 17 15:07:52 2006 UTC vs.
Revision 1.132 by root, Sun Jul 23 04:37:51 2006 UTC