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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.98 by root, Mon May 29 02:01:56 2006 UTC vs.
Revision 1.153 by root, Tue Sep 19 22:02:38 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>
		20	#include <stdlib.h>
15		21
16	#include <SDL.h>	22	#include <SDL.h>
17	#include <SDL_endian.h>	23	#include <SDL_endian.h>
18	#include <SDL_image.h>	24	#include <SDL_image.h>
19	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
21		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
22	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
23		32
24	#include <pango/pango.h>	33	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		34
29	#ifndef _WIN32	35	#ifndef _WIN32
30	# include <sys/types.h>	36	# include <sys/types.h>
31	# include <sys/socket.h>	37	# include <sys/socket.h>
32	# include <netinet/in.h>	38	# include <netinet/in.h>
39	typedef signed char int8_t;	45	typedef signed char int8_t;
40	typedef signed short int16_t;	46	typedef signed short int16_t;
41	typedef signed int int32_t;	47	typedef signed int int32_t;
42	#endif	48	#endif
43		49
44	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45		51
46	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
47		53
48	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
50		56
51	#define MIN_FONT_HEIGHT 10	57	#define MIN_FONT_HEIGHT 10
52		58
53	#define GL_CALL(type,func,args) \	59	#if 0
54	{ \	60	# define PARACHUTE SDL_INIT_NOPARACHUTE
55	static int init_; \	61	#else
56	static type fptr_; \	62	# define PARACHUTE 0
57	\	63	#endif
58	if (!init_) \
59	{ \
60	init_ = 1; \
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62	} \
63	\
64	if (fptr_) \
65	fptr_ args; \
66	}
67		64
		65	static struct
		66	{
		67	#define GL_FUNC(ptr,name) ptr name;
		68	#include "glfunc.h"
		69	#undef GL_FUNC
		70	} gl;
		71
		72	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
		73	{
		74	if (gl.BlendFuncSeparate)
		75	gl.BlendFuncSeparate (sa, da, saa, daa);
		76	else if (gl.BlendFuncSeparateEXT)
		77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
		78	else
		79	glBlendFunc (sa, da);
		80	}
		81
		82	#include "texcache.c"
		83
		84	#include "pango-font.c"
		85	#include "pango-fontmap.c"
		86	#include "pango-render.c"
		87
68	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
70		90
71	typedef PangoFontDescription *CFClient__Font;	91	typedef PangoFontDescription *CFPlus__Font;
		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	}
72		110
73	typedef struct cf_layout {	111	typedef struct cf_layout {
74	PangoLayout *pl; // either derived from a cairo or ft2 context	112	PangoLayout *pl;
75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
77	int base_height;	114	int base_height;
78	CFClient__Font font;	115	CFPlus__Font font;
79	} *CFClient__Layout;	116	} *CFPlus__Layout;
80		117
81	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
82	static PangoContext ft2_context, cairo_context;	119	static PangoContext *opengl_context;
83	static PangoFontMap ft2_fontmap, cairo_fontmap;	120	static PangoFontMap *opengl_fontmap;
84		121
85	static void	122	static void
86	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
87	{	124	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
89	#ifdef _WIN32	126	#ifdef FC_HINT_STYLE
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91	#else	128	#endif
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif
94	}	130	}
95		131
96	static void	132	static void
97	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
98	{	134	{
99	/* use a random scale factor to account for unknown descenders, 0.8 works	135	/* use a random scale factor to account for unknown descenders, 0.8 works
100	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
101	*/	137	*/
102	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
106		142
107	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
108	}	144	}
109		145
110	static void	146	static void
111	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
112	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
113	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
114		153
115	if (!w) w = 1;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
116	if (!h) h = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
117		156
118	w = (w + 3) & ~3;	157	if (!rect.width) rect.width = 1;
		158	if (!rect.height) rect.height = 1;
		159
		160	*w = rect.width;
		161	*h = rect.height;
119	}	162	}
120		163
121	typedef uint16_t mapface;	164	typedef uint16_t mapface;
122		165
123	typedef struct {	166	typedef struct {
…		…
126	float s, t;	169	float s, t;
127	uint8_t r, g, b, a;	170	uint8_t r, g, b, a;
128	} maptex;	171	} maptex;
129		172
130	typedef struct {	173	typedef struct {
131	int16_t darkness;	174	uint32_t player;
132	mapface face[3];	175	mapface face[3];
		176	uint16_t darkness;
		177	uint8_t stat_width, stat_hp, flags;
133	} mapcell;	178	} mapcell;
134		179
135	typedef struct {	180	typedef struct {
136	int32_t c0, c1;	181	int32_t c0, c1;
137	mapcell *col;	182	mapcell *col;
…		…
146	int texs;	191	int texs;
147	maptex *tex;	192	maptex *tex;
148		193
149	int32_t rows;	194	int32_t rows;
150	maprow *row;	195	maprow *row;
151	} *CFClient__Map;	196	} *CFPlus__Map;
152		197
153	static char *	198	static char *
154	prepend (char *ptr, int sze, int inc)	199	prepend (char *ptr, int sze, int inc)
155	{	200	{
156	char *p;	201	char *p;
…		…
174		219
175	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	220	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
176	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	221	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
177		222
178	static maprow *	223	static maprow *
179	map_get_row (CFClient__Map self, int y)	224	map_get_row (CFPlus__Map self, int y)
180	{	225	{
181	if (0 > y)	226	if (0 > y)
182	{	227	{
183	int extend = - y + MAP_EXTEND_Y;	228	int extend = - y + MAP_EXTEND_Y;
184	Prepend (maprow, self->row, self->rows, extend);	229	Prepend (maprow, self->row, self->rows, extend);
…		…
222		267
223	return row->col + (x - row->c0);	268	return row->col + (x - row->c0);
224	}	269	}
225		270
226	static mapcell *	271	static mapcell *
227	map_get_cell (CFClient__Map self, int x, int y)	272	map_get_cell (CFPlus__Map self, int x, int y)
228	{	273	{
229	return row_get_cell (map_get_row (self, y), x);	274	return row_get_cell (map_get_row (self, y), x);
230	}	275	}
231		276
232	static void	277	static void
233	map_clear (CFClient__Map self)	278	map_clear (CFPlus__Map self)
234	{	279	{
235	int r;	280	int r;
236		281
237	for (r = 0; r < self->rows; r++)	282	for (r = 0; r < self->rows; r++)
238	Safefree (self->row[r].col);	283	Safefree (self->row[r].col);
…		…
246	self->row = 0;	291	self->row = 0;
247	self->rows = 0;	292	self->rows = 0;
248	}	293	}
249		294
250	static void	295	static void
251	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	296	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
252	{	297	{
253	int x, y;	298	int x, y;
254	maprow *row;	299	maprow *row;
		300	mapcell *cell;
255		301
256	for (y = y0; y < y0 + h; y++)	302	for (y = y0; y < y0 + h; y++)
257	if (y >= 0)	303	if (y >= 0)
258	{	304	{
259	if (y >= self->rows)	305	if (y >= self->rows)
…		…
265	if (x >= row->c0)	311	if (x >= row->c0)
266	{	312	{
267	if (x >= row->c1)	313	if (x >= row->c1)
268	break;	314	break;
269		315
270	row->col[x - row->c0].darkness = -1;	316	cell = row->col + x - row->c0;
		317
		318	cell->darkness = 0;
		319	cell->stat_hp = 0;
271	}	320	}
272	}	321	}
273	}	322	}
274		323
275	static void	324	static void
…		…
296	ev.data2 = 0;	345	ev.data2 = 0;
297		346
298	SDL_PushEvent ((SDL_Event *)&ev);	347	SDL_PushEvent ((SDL_Event *)&ev);
299	}	348	}
300		349
		350	static unsigned int
		351	minpot (unsigned int n)
		352	{
		353	if (!n)
		354	return 0;
		355
		356	--n;
		357
		358	n \|= n >> 1;
		359	n \|= n >> 2;
		360	n \|= n >> 4;
		361	n \|= n >> 8;
		362	n \|= n >> 16;
		363
		364	return n + 1;
		365	}
		366
301	MODULE = CFClient PACKAGE = CFClient	367	MODULE = CFPlus PACKAGE = CFPlus
302		368
303	PROTOTYPES: ENABLE	369	PROTOTYPES: ENABLE
304		370
305	BOOT:	371	BOOT:
306	{	372	{
307	HV *stash = gv_stashpv ("CFClient", 1);	373	HV *stash = gv_stashpv ("CFPlus", 1);
308	static const struct {	374	static const struct {
309	const char *name;	375	const char *name;
310	IV iv;	376	IV iv;
311	} *civ, const_iv[] = {	377	} *civ, const_iv[] = {
312	# define const_iv(name) { # name, (IV)name }	378	# define const_iv(name) { # name, (IV)name }
…		…
413		479
414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	480	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	481	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416	}	482	}
417		483
		484	int
		485	in_destruct ()
		486	CODE:
		487	RETVAL = PL_main_cv == Nullcv;
		488	OUTPUT:
		489	RETVAL
		490
		491	NV floor (NV x)
		492
		493	NV ceil (NV x)
		494
418	void	495	void
419	pango_init ()	496	pango_init ()
420	CODE:	497	CODE:
421	{	498	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx
423	ft2_fontmap = pango_ft2_font_map_new ();	499	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	500	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	501	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426
427	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
429	}	502	}
430		503
431	int	504	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	505	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
433		506
434	void	507	void
435	SDL_Quit ()	508	SDL_Quit ()
436		509
437	void	510	void
…		…
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	517	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	518	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	519	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		520
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	521	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	522	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450		523
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	524	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	525	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455		528
456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	529	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		530	#if SDL_VERSION_ATLEAST(1,2,10)
		531	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		532	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		533	#endif
457		534
458	SDL_EnableUNICODE (1);	535	SDL_EnableUNICODE (1);
459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	536	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460		537
461	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	538	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	556	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	557	CODE:
481	RETVAL = !!SDL_SetVideoMode (	558	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	559	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	560	);
		561	if (RETVAL)
		562	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	563	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		564	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		565	# include "glfunc.h"
		566	# undef GL_FUNC
		567	}
485	OUTPUT:	568	OUTPUT:
486	RETVAL	569	RETVAL
487		570
488	void	571	void
489	SDL_GL_SwapBuffers ()	572	SDL_GL_SwapBuffers ()
…		…
542	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	625	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
543	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	626	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
544	break;	627	break;
545	}	628	}
546		629
547	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	630	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
548	}	631	}
549	}	632	}
550		633
551	int	634	int
552	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	635	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
568	#endif	651	#endif
569		652
570	void	653	void
571	add_font (char *file)	654	add_font (char *file)
572	CODE:	655	CODE:
573	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	656	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
574	#ifdef _WIN32
575	// cairo... sigh... requires win2000
576	AddFontResourceEx (file, FR_PRIVATE, 0);
577	#endif
578		657
579	void	658	void
580	load_image_inline (SV *image_)	659	load_image_inline (SV *image_)
581	ALIAS:	660	ALIAS:
582	load_image_file = 1	661	load_image_file = 1
…		…
624		703
625	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	704	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
626		705
627	assert (surface2->pitch == surface2->w * 4);	706	assert (surface2->pitch == surface2->w * 4);
628		707
		708	SDL_LockSurface (surface2);
629	EXTEND (SP, 5);	709	EXTEND (SP, 6);
630	PUSHs (sv_2mortal (newSViv (surface2->w)));	710	PUSHs (sv_2mortal (newSViv (surface2->w)));
631	PUSHs (sv_2mortal (newSViv (surface2->h)));	711	PUSHs (sv_2mortal (newSViv (surface2->h)));
632	SDL_LockSurface (surface2);
633	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	712	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
634	SDL_UnlockSurface (surface2);
635	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	713	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
636	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	714	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
637	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	715	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		716	SDL_UnlockSurface (surface2);
638		717
639	SDL_FreeSurface (surface);	718	SDL_FreeSurface (surface);
640	SDL_FreeSurface (surface2);	719	SDL_FreeSurface (surface2);
641	}	720	}
642		721
…		…
678	CODE:	757	CODE:
679	fprintf (stderr, "FATAL: %s\n", message);	758	fprintf (stderr, "FATAL: %s\n", message);
680	#ifdef _WIN32	759	#ifdef _WIN32
681	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	760	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
682	#endif	761	#endif
683	exit (1);	762	_exit (1);
684		763
		764	void
		765	_exit (int retval)
		766	CODE:
		767	_exit (retval);
		768
685	MODULE = CFClient PACKAGE = CFClient::Font	769	MODULE = CFPlus PACKAGE = CFPlus::Font
686		770
687	CFClient::Font	771	CFPlus::Font
688	new_from_file (SV class, char path, int id = 0)	772	new_from_file (SV class, char path, int id = 0)
689	CODE:	773	CODE:
690	{	774	{
691	int count;	775	int count;
692	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	776	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
695	}	779	}
696	OUTPUT:	780	OUTPUT:
697	RETVAL	781	RETVAL
698		782
699	void	783	void
700	DESTROY (CFClient::Font self)	784	DESTROY (CFPlus::Font self)
701	CODE:	785	CODE:
702	pango_font_description_free (self);	786	pango_font_description_free (self);
703		787
704	void	788	void
705	make_default (CFClient::Font self)	789	make_default (CFPlus::Font self)
706	CODE:	790	CODE:
707	default_font = self;	791	default_font = self;
708		792
709	MODULE = CFClient PACKAGE = CFClient::Layout	793	MODULE = CFPlus PACKAGE = CFPlus::Layout
710		794
711	CFClient::Layout	795	void
712	new (SV *class, int rgba = 0)	796	reset_glyph_cache ()
713	CODE:	797	CODE:
714	#if _WIN32	798	tc_clear ();
715	//rgba = 0;//D make stext nicer, breaks TextView	799
716	#endif	800	CFPlus::Layout
		801	new (SV *class)
		802	CODE:
717	New (0, RETVAL, 1, struct cf_layout);	803	New (0, RETVAL, 1, struct cf_layout);
718		804
719	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	805	RETVAL->pl = pango_layout_new (opengl_context);
720	RETVAL->rgba = rgba;
721	RETVAL->r = 1.;	806	RETVAL->r = 1.;
722	RETVAL->g = 1.;	807	RETVAL->g = 1.;
723	RETVAL->b = 1.;	808	RETVAL->b = 1.;
724	RETVAL->a = 1.;	809	RETVAL->a = 1.;
725	RETVAL->base_height = MIN_FONT_HEIGHT;	810	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
729	layout_update_font (RETVAL);	814	layout_update_font (RETVAL);
730	OUTPUT:	815	OUTPUT:
731	RETVAL	816	RETVAL
732		817
733	void	818	void
734	DESTROY (CFClient::Layout self)	819	DESTROY (CFPlus::Layout self)
735	CODE:	820	CODE:
736	g_object_unref (self->pl);	821	g_object_unref (self->pl);
737	Safefree (self);	822	Safefree (self);
738		823
739	int
740	is_rgba (CFClient::Layout self)
741	CODE:
742	RETVAL = self->rgba;
743	OUTPUT:
744	RETVAL
745
746	void	824	void
747	set_text (CFClient::Layout self, SV *text_)	825	set_text (CFPlus::Layout self, SV *text_)
748	CODE:	826	CODE:
749	{	827	{
750	STRLEN textlen;	828	STRLEN textlen;
751	char *text = SvPVutf8 (text_, textlen);	829	char *text = SvPVutf8 (text_, textlen);
752		830
753	pango_layout_set_text (self->pl, text, textlen);	831	pango_layout_set_text (self->pl, text, textlen);
754	}	832	}
755		833
756	void	834	void
757	set_markup (CFClient::Layout self, SV *text_)	835	set_markup (CFPlus::Layout self, SV *text_)
758	CODE:	836	CODE:
759	{	837	{
760	STRLEN textlen;	838	STRLEN textlen;
761	char *text = SvPVutf8 (text_, textlen);	839	char *text = SvPVutf8 (text_, textlen);
762		840
763	pango_layout_set_markup (self->pl, text, textlen);	841	pango_layout_set_markup (self->pl, text, textlen);
764	}	842	}
765		843
		844	void
		845	set_shapes (CFPlus::Layout self, ...)
		846	CODE:
		847	{
		848	PangoAttrList *attrs = 0;
		849	const char *text = pango_layout_get_text (self->pl);
		850	const char *pos = text;
		851	int arg = 4;
		852
		853	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		854	{
		855	PangoRectangle inkrect, rect;
		856	PangoAttribute *attr;
		857
		858	int x = SvIV (ST (arg - 3));
		859	int y = SvIV (ST (arg - 2));
		860	int w = SvIV (ST (arg - 1));
		861	int h = SvIV (ST (arg ));
		862
		863	inkrect.x = 0;
		864	inkrect.y = 0;
		865	inkrect.width = 0;
		866	inkrect.height = 0;
		867
		868	rect.x = x * PANGO_SCALE;
		869	rect.y = y * PANGO_SCALE;
		870	rect.width = w * PANGO_SCALE;
		871	rect.height = h * PANGO_SCALE;
		872
		873	if (!attrs)
		874	attrs = pango_layout_get_attributes (self->pl);
		875
		876	attr = pango_attr_shape_new (&inkrect, &rect);
		877	attr->start_index = pos - text;
		878	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		879	pango_attr_list_insert (attrs, attr);
		880
		881	arg += 4;
		882	pos += sizeof (OBJ_STR) - 1;
		883	}
		884
		885	if (attrs)
		886	pango_layout_set_attributes (self->pl, attrs);
		887	}
		888
		889	void
		890	get_shapes (CFPlus::Layout self)
		891	PPCODE:
		892	{
		893	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		894
		895	do
		896	{
		897	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		898
		899	if (run && shape_attr_p (run))
		900	{
		901	PangoRectangle extents;
		902	pango_layout_iter_get_run_extents (iter, 0, &extents);
		903
		904	EXTEND (SP, 2);
		905	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		906	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		907	}
		908	}
		909	while (pango_layout_iter_next_run (iter));
		910
		911	pango_layout_iter_free (iter);
		912	}
		913
		914	int
		915	has_wrapped (CFPlus::Layout self)
		916	CODE:
		917	{
		918	int lines = 1;
		919	const char *text = pango_layout_get_text (self->pl);
		920
		921	while (*text)
		922	lines += *text++ == '\n';
		923
		924	RETVAL = lines < pango_layout_get_line_count (self->pl);
		925	}
		926	OUTPUT:
		927	RETVAL
		928
766	SV *	929	SV *
767	get_text (CFClient::Layout self)	930	get_text (CFPlus::Layout self)
768	CODE:	931	CODE:
769	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	932	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
770	SvUTF8_on (RETVAL);	933	sv_utf8_decode (RETVAL);
771	OUTPUT:	934	OUTPUT:
772	RETVAL	935	RETVAL
773		936
774	void	937	void
775	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	938	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
776	CODE:	939	CODE:
777	self->r = r;	940	self->r = r;
778	self->g = g;	941	self->g = g;
779	self->b = b;	942	self->b = b;
780	self->a = a;	943	self->a = a;
781		944
782	void	945	void
783	set_font (CFClient::Layout self, CFClient::Font font = 0)	946	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
784	CODE:	947	CODE:
785	if (self->font != font)	948	if (self->font != font)
786	{	949	{
787	self->font = font;	950	self->font = font;
788	layout_update_font (self);	951	layout_update_font (self);
789	}	952	}
790		953
791	void	954	void
792	set_height (CFClient::Layout self, int base_height)	955	set_height (CFPlus::Layout self, int base_height)
793	CODE:	956	CODE:
794	if (self->base_height != base_height)	957	if (self->base_height != base_height)
795	{	958	{
796	self->base_height = base_height;	959	self->base_height = base_height;
797	layout_update_font (self);	960	layout_update_font (self);
798	}	961	}
799		962
800	void	963	void
801	set_width (CFClient::Layout self, int max_width = -1)	964	set_width (CFPlus::Layout self, int max_width = -1)
802	CODE:	965	CODE:
803	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	966	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
804		967
805	void	968	void
806	set_indent (CFClient::Layout self, int indent)	969	set_indent (CFPlus::Layout self, int indent)
807	CODE:	970	CODE:
808	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	971	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
809		972
810	void	973	void
811	set_spacing (CFClient::Layout self, int spacing)	974	set_spacing (CFPlus::Layout self, int spacing)
812	CODE:	975	CODE:
813	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	976	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
814		977
815	void	978	void
816	set_ellipsise (CFClient::Layout self, int ellipsise)	979	set_ellipsise (CFPlus::Layout self, int ellipsise)
817	CODE:	980	CODE:
818	pango_layout_set_ellipsize (self->pl,	981	pango_layout_set_ellipsize (self->pl,
819	ellipsise == 1 ? PANGO_ELLIPSIZE_START	982	ellipsise == 1 ? PANGO_ELLIPSIZE_START
820	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	983	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
821	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	984	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
822	: PANGO_ELLIPSIZE_NONE	985	: PANGO_ELLIPSIZE_NONE
823	);	986	);
824		987
825	void	988	void
826	set_single_paragraph_mode (CFClient::Layout self, int spm)	989	set_single_paragraph_mode (CFPlus::Layout self, int spm)
827	CODE:	990	CODE:
828	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	991	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
829		992
830	void	993	void
831	size (CFClient::Layout self)	994	size (CFPlus::Layout self)
832	PPCODE:	995	PPCODE:
833	{	996	{
834	int w, h;	997	int w, h;
835		998
836	layout_get_pixel_size (self, &w, &h);	999	layout_get_pixel_size (self, &w, &h);
…		…
839	PUSHs (sv_2mortal (newSViv (w)));	1002	PUSHs (sv_2mortal (newSViv (w)));
840	PUSHs (sv_2mortal (newSViv (h)));	1003	PUSHs (sv_2mortal (newSViv (h)));
841	}	1004	}
842		1005
843	int	1006	int
		1007	descent (CFPlus::Layout self)
		1008	CODE:
		1009	{
		1010	PangoRectangle rect;
		1011	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1012	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1013	RETVAL = PANGO_DESCENT (rect);
		1014	}
		1015	OUTPUT:
		1016	RETVAL
		1017
		1018	int
844	xy_to_index (CFClient::Layout self, int x, int y)	1019	xy_to_index (CFPlus::Layout self, int x, int y)
845	CODE:	1020	CODE:
846	{	1021	{
847	int index, trailing;	1022	int index, trailing;
848	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1023	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
849	RETVAL = index;	1024	RETVAL = index;
850	}	1025	}
851	OUTPUT:	1026	OUTPUT:
852	RETVAL	1027	RETVAL
853		1028
854	void	1029	void
855	cursor_pos (CFClient::Layout self, int index)	1030	cursor_pos (CFPlus::Layout self, int index)
856	PPCODE:	1031	PPCODE:
857	{	1032	{
858	PangoRectangle strong_pos;	1033	PangoRectangle strong_pos;
859	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1034	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
860		1035
…		…
863	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1038	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
864	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1039	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
865	}	1040	}
866		1041
867	void	1042	void
868	render (CFClient::Layout self)	1043	render (CFPlus::Layout self, float x, float y, int flags = 0)
869	PPCODE:	1044	PPCODE:
870	{	1045	pango_opengl_render_layout_subpixel (
871	SV *retval;	1046	self->pl,
872	int w, h;	1047	x * PANGO_SCALE, y * PANGO_SCALE,
		1048	self->r, self->g, self->b, self->a,
		1049	flags
		1050	);
873		1051
874	layout_get_pixel_size (self, &w, &h);	1052	MODULE = CFPlus PACKAGE = CFPlus::Texture
875		1053
876	if (self->rgba)	1054	void
		1055	pad2pot (SV data_, SV w_, SV *h_)
		1056	CODE:
		1057	{
		1058	int ow = SvIV (w_);
		1059	int oh = SvIV (h_);
		1060
		1061	if (ow && oh)
877	{	1062	{
878	cairo_surface_t *surface;	1063	int nw = minpot (ow);
879	cairo_t *cairo;	1064	int nh = minpot (oh);
880		1065
881	retval = newSV (w * h * 4);	1066	if (nw != ow \|\| nh != oh)
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	{	1067	{
899	uint32_t p = (uint32_t )SvPVX (retval);	1068	if (SvOK (data_))
900	uint32_t e = p + w h;
901
902	while (p < e)
903	{	1069	{
904	uint32_t rgba = *p;	1070	STRLEN datalen;
905	rgba = (rgba >> 24) \| (rgba << 8);	1071	char *data = SvPVbyte (data_, datalen);
906	#if 0	1072	int bpp = datalen / (ow * oh);
907	#ifdef _WIN32	1073	SV result_ = sv_2mortal (newSV (nw nh * bpp));
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		1074
914	rgba = (rgba & 0xffffff00) \| a;	1075	SvPOK_only (result_);
		1076	SvCUR_set (result_, nw * nh * bpp);
		1077
		1078	memset (SvPVX (result_), 0, nw * nh * bpp);
		1079	while (oh--)
		1080	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1081
		1082	sv_setsv (data_, result_);
915	}	1083	}
916	#endif	1084
917	#endif	1085	sv_setiv (w_, nw);
918	rgba = SDL_SwapBE32 (rgba);	1086	sv_setiv (h_, nh);
919	*p++ = rgba;
920	}	1087	}
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	}	1088	}
930	else
931	{
932	FT_Bitmap bitmap;
933
934	retval = newSV (w * h);
935	SvPOK_only (retval);
936	SvCUR_set (retval, w * h);
937
938	bitmap.rows = h;
939	bitmap.width = w;
940	bitmap.pitch = w;
941	bitmap.buffer = (unsigned char*)SvPVX (retval);
942	bitmap.num_grays = 256;
943	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
944
945	memset (bitmap.buffer, 0, w * h);
946
947	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
948
949	EXTEND (SP, 5);
950	PUSHs (sv_2mortal (newSViv (w)));
951	PUSHs (sv_2mortal (newSViv (h)));
952	PUSHs (sv_2mortal (retval));
953	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
954	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
955	}
956	}	1089	}
957		1090
958	MODULE = CFClient PACKAGE = CFClient::Texture
959
960	void	1091	void
961	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1092	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
962	PROTOTYPE: $$$;$$	1093	PROTOTYPE: $$$;$$
963	ALIAS:	1094	ALIAS:
964	draw_quad_alpha = 1	1095	draw_quad_alpha = 1
965	draw_quad_alpha_premultiplied = 2	1096	draw_quad_alpha_premultiplied = 2
966	CODE:	1097	CODE:
…		…
977	}	1108	}
978		1109
979	if (ix)	1110	if (ix)
980	{	1111	{
981	glEnable (GL_BLEND);	1112	glEnable (GL_BLEND);
		1113
		1114	if (ix == 2)
982	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1115	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1116	else
		1117	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1118	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1119
983	glEnable (GL_ALPHA_TEST);	1120	glEnable (GL_ALPHA_TEST);
984	glAlphaFunc (GL_GREATER, 0.01f);	1121	glAlphaFunc (GL_GREATER, 0.01f);
985	}	1122	}
986		1123
987	glBindTexture (GL_TEXTURE_2D, name);	1124	glBindTexture (GL_TEXTURE_2D, name);
…		…
998	glDisable (GL_ALPHA_TEST);	1135	glDisable (GL_ALPHA_TEST);
999	glDisable (GL_BLEND);	1136	glDisable (GL_BLEND);
1000	}	1137	}
1001	}	1138	}
1002		1139
1003	MODULE = CFClient PACKAGE = CFClient::Map	1140	MODULE = CFPlus PACKAGE = CFPlus::Map
1004		1141
1005	CFClient::Map	1142	CFPlus::Map
1006	new (SV *class, int map_width, int map_height)	1143	new (SV *class, int map_width, int map_height)
1007	CODE:	1144	CODE:
1008	New (0, RETVAL, 1, struct map);	1145	New (0, RETVAL, 1, struct map);
1009	RETVAL->x = 0;	1146	RETVAL->x = 0;
1010	RETVAL->y = 0;	1147	RETVAL->y = 0;
…		…
1020	RETVAL->row = 0;	1157	RETVAL->row = 0;
1021	OUTPUT:	1158	OUTPUT:
1022	RETVAL	1159	RETVAL
1023		1160
1024	void	1161	void
1025	DESTROY (CFClient::Map self)	1162	DESTROY (CFPlus::Map self)
1026	CODE:	1163	CODE:
1027	{	1164	{
1028	map_clear (self);	1165	map_clear (self);
1029	Safefree (self->face);	1166	Safefree (self->face);
		1167	Safefree (self->tex);
1030	Safefree (self);	1168	Safefree (self);
1031	}	1169	}
1032		1170
1033	void	1171	void
1034	clear (CFClient::Map self)	1172	clear (CFPlus::Map self)
1035	CODE:	1173	CODE:
1036	map_clear (self);	1174	map_clear (self);
1037		1175
1038	void	1176	void
1039	set_face (CFClient::Map self, int face, int texid)	1177	set_face (CFPlus::Map self, int face, int texid)
1040	CODE:	1178	CODE:
1041	{	1179	{
1042	while (self->faces <= face)	1180	while (self->faces <= face)
1043	{	1181	{
1044	Append (mapface, self->face, self->faces, self->faces);	1182	Append (mapface, self->face, self->faces, self->faces);
…		…
1047		1185
1048	self->face [face] = texid;	1186	self->face [face] = texid;
1049	}	1187	}
1050		1188
1051	void	1189	void
1052	set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1190	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1053	CODE:	1191	CODE:
1054	{	1192	{
1055	while (self->texs <= texid)	1193	while (self->texs <= texid)
1056	{	1194	{
1057	Append (maptex, self->tex, self->texs, self->texs);	1195	Append (maptex, self->tex, self->texs, self->texs);
…		…
1073	}	1211	}
1074		1212
1075	// somewhat hackish, but for textures that require it, it really	1213	// somewhat hackish, but for textures that require it, it really
1076	// improves the look, and most others don't suffer.	1214	// improves the look, and most others don't suffer.
1077	glBindTexture (GL_TEXTURE_2D, name);	1215	glBindTexture (GL_TEXTURE_2D, name);
1078	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	1216	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1079	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	1217	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1218	// use uglier nearest interpolation because linear suffers
		1219	// from transparent color bleeding and ugly wrapping effects.
		1220	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1080	}	1221	}
1081		1222
1082	int	1223	int
1083	ox (CFClient::Map self)	1224	ox (CFPlus::Map self)
1084	ALIAS:	1225	ALIAS:
1085	oy = 1	1226	oy = 1
		1227	x = 2
		1228	y = 3
		1229	w = 4
		1230	h = 5
1086	CODE:	1231	CODE:
1087	switch (ix)	1232	switch (ix)
1088	{	1233	{
1089	case 0: RETVAL = self->ox; break;	1234	case 0: RETVAL = self->ox; break;
1090	case 1: RETVAL = self->oy; break;	1235	case 1: RETVAL = self->oy; break;
		1236	case 2: RETVAL = self->x; break;
		1237	case 3: RETVAL = self->y; break;
		1238	case 4: RETVAL = self->w; break;
		1239	case 5: RETVAL = self->h; break;
1091	}	1240	}
1092	OUTPUT:	1241	OUTPUT:
1093	RETVAL	1242	RETVAL
1094		1243
1095	void	1244	void
1096	scroll (CFClient::Map self, int dx, int dy)	1245	scroll (CFPlus::Map self, int dx, int dy)
1097	CODE:	1246	CODE:
1098	{	1247	{
1099	if (dx > 0)	1248	if (dx > 0)
1100	map_blank (self, self->x, self->y, dx - 1, self->h);	1249	map_blank (self, self->x, self->y, dx - 1, self->h);
1101	else if (dx < 0)	1250	else if (dx < 0)
…		…
1117	self->y += MAP_EXTEND_Y;	1266	self->y += MAP_EXTEND_Y;
1118	}	1267	}
1119	}	1268	}
1120		1269
1121	void	1270	void
1122	map1a_update (CFClient::Map self, SV *data_)	1271	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1123	CODE:	1272	CODE:
1124	{	1273	{
1125	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1274	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1126	uint8_t data_end = (uint8_t )SvEND (data_);	1275	uint8_t data_end = (uint8_t )SvEND (data_);
1127	mapcell *cell;	1276	mapcell *cell;
1128	int x, y, flags;	1277	int x, y, flags;
1129		1278
1130	while (data < data_end)	1279	while (data < data_end - 1)
1131	{	1280	{
1132	flags = (data [0] << 8) + data [1]; data += 2;	1281	flags = (data [0] << 8) + data [1]; data += 2;
1133		1282
1134	x = ((flags >> 10) & 63) + self->x;	1283	x = self->x + ((flags >> 10) & 63);
1135	y = ((flags >> 4) & 63) + self->y;	1284	y = self->y + ((flags >> 4) & 63);
1136		1285
1137	cell = map_get_cell (self, x, y);	1286	cell = map_get_cell (self, x, y);
1138		1287
1139	if (flags & 15)	1288	if (flags & 15)
1140	{	1289	{
1141	if (cell->darkness < 0)	1290	if (!cell->darkness)
1142	{	1291	{
1143	cell->darkness = 0;	1292	cell->darkness = 256;
1144	cell->face [0] = 0;	1293	cell->face [0] = 0;
1145	cell->face [1] = 0;	1294	cell->face [1] = 0;
1146	cell->face [2] = 0;	1295	cell->face [2] = 0;
1147	}	1296	}
1148		1297
1149	cell->darkness = flags & 8 ? *data++ : 255;
1150
1151	//TODO: don't trust server data to be in-range(!)	1298	//TODO: don't trust server data to be in-range(!)
		1299
		1300	if (flags & 8)
		1301	{
		1302	if (extmap)
		1303	{
		1304	uint8_t ext, cmd;
		1305
		1306	do
		1307	{
		1308	ext = *data++;
		1309	cmd = ext & 0x3f;
		1310
		1311	if (cmd < 4)
		1312	cell->darkness = 255 - ext * 64 + 1;
		1313	else if (cmd == 5) // health
		1314	{
		1315	cell->stat_width = 1;
		1316	cell->stat_hp = *data++;
		1317	}
		1318	else if (cmd == 6) // monster width
		1319	cell->stat_width = *data++ + 1;
		1320	else if (cmd == 0x47) // monster width
		1321	{
		1322	if (*data == 4)
		1323	; // decode player tag
		1324
		1325	data += *data + 1;
		1326	}
		1327	else if (cmd == 8) // cell flags
		1328	cell->flags = *data++;
		1329	else if (ext & 0x40) // unknown, multibyte => skip
		1330	data += *data + 1;
		1331	else
		1332	data++;
		1333	}
		1334	while (ext & 0x80);
		1335	}
		1336	else
		1337	cell->darkness = *data++ + 1;
		1338	}
1152		1339
1153	if (flags & 4)	1340	if (flags & 4)
1154	{	1341	{
1155	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1342	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1156	}	1343	}
…		…
1164	{	1351	{
1165	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1352	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1166	}	1353	}
1167	}	1354	}
1168	else	1355	else
		1356	{
1169	cell->darkness = -1;	1357	cell->darkness = 0;
		1358	cell->stat_hp = 0;
		1359	}
1170	}	1360	}
1171	}	1361	}
1172		1362
1173	SV *	1363	SV *
1174	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1364	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1175	CODE:	1365	CODE:
1176	{	1366	{
1177	int x1, x;	1367	int x1, x;
1178	int y1, y;	1368	int y1, y;
1179	int z;	1369	int z;
…		…
1229	}	1419	}
1230	OUTPUT:	1420	OUTPUT:
1231	RETVAL	1421	RETVAL
1232		1422
1233	void	1423	void
1234	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1424	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1235	PPCODE:	1425	CODE:
1236	{	1426	{
1237	int vx, vy;	1427	int vx, vy;
1238	int x, y, z;	1428	int x, y, z;
1239	int last_name;	1429	int last_name;
1240	mapface face;	1430	mapface face;
1241	int sw4 = (sw + 3) & ~3;
1242	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1243	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1244		1431
1245	memset (darkness, 255, sw4 * sh);
1246	SvPOK_only (darkness_sv);
1247	SvCUR_set (darkness_sv, sw4 * sh);
1248
1249	vx = self->x + (self->w - sw) / 2 - shift_x;	1432	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1250	vy = self->y + (self->h - sh) / 2 - shift_y;	1433	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1251		1434
1252	/*	1435	/*
1253	int vx = self->vx = self->w >= sw	1436	int vx = self->vx = self->w >= sw
1254	? self->x + (self->w - sw) / 2	1437	? self->x + (self->w - sw) / 2
1255	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1438	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1259	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1442	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1260	*/	1443	*/
1261		1444
1262	glColor4ub (255, 255, 255, 255);	1445	glColor4ub (255, 255, 255, 255);
1263		1446
		1447	glEnable (GL_BLEND);
1264	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1448	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1265	glEnable (GL_BLEND);
1266	glEnable (GL_TEXTURE_2D);	1449	glEnable (GL_TEXTURE_2D);
1267	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1450	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1268		1451
1269	glBegin (GL_QUADS);	1452	glBegin (GL_QUADS);
1270		1453
…		…
1279	for (x = 0; x < sw; x++)	1462	for (x = 0; x < sw; x++)
1280	if (row->c0 <= x + vx && x + vx < row->c1)	1463	if (row->c0 <= x + vx && x + vx < row->c1)
1281	{	1464	{
1282	mapcell *cell = row->col + (x + vx - row->c0);	1465	mapcell *cell = row->col + (x + vx - row->c0);
1283		1466
1284	darkness[y * sw4 + x] = cell->darkness < 0
1285	? 255 - FOW_DARKNESS
1286	: 255 - cell->darkness;
1287
1288	face = cell->face [z];	1467	face = cell->face [z];
1289		1468
1290	if (face)	1469	if (face && face < self->texs)
1291	{	1470	{
1292	maptex tex = self->tex [face];	1471	maptex tex = self->tex [face];
1293
1294	int px = (x + 1) * 32 - tex.w;	1472	int px = (x + 1) * 32 - tex.w;
1295	int py = (y + 1) * 32 - tex.h;	1473	int py = (y + 1) * 32 - tex.h;
1296		1474
1297	if (last_name != tex.name)	1475	if (last_name != tex.name)
1298	{	1476	{
1299	glEnd ();	1477	glEnd ();
1300	last_name = tex.name;
1301	glBindTexture (GL_TEXTURE_2D, last_name);	1478	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1302	glBegin (GL_QUADS);	1479	glBegin (GL_QUADS);
1303	}	1480	}
1304		1481
1305	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1482	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1306	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1483	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1307	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1484	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1308	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1485	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1309	}	1486	}
		1487
		1488	if (cell->flags && z == 2)
		1489	{
		1490	if (cell->flags & 1)
		1491	{
		1492	maptex tex = self->tex [1];
		1493	int px = (x + 1) * 32 - tex.w + 2;
		1494	int py = (y + 1) * 32 - tex.h - 6;
		1495
		1496	glEnd ();
		1497	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1498	glBegin (GL_QUADS);
		1499
		1500	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1501	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1502	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1503	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1504	}
		1505	}
1310	}	1506	}
1311	}	1507	}
1312		1508
1313	glEnd ();	1509	glEnd ();
1314		1510
1315	glDisable (GL_TEXTURE_2D);	1511	glDisable (GL_TEXTURE_2D);
1316	glDisable (GL_BLEND);	1512	glDisable (GL_BLEND);
		1513
		1514	// top layer: overlays such as the health bar
		1515	for (y = 0; y < sh; y++)
		1516	if (0 <= y + vy && y + vy < self->rows)
		1517	{
		1518	maprow *row = self->row + (y + vy);
		1519
		1520	for (x = 0; x < sw; x++)
		1521	if (row->c0 <= x + vx && x + vx < row->c1)
		1522	{
		1523	mapcell *cell = row->col + (x + vx - row->c0);
		1524
		1525	int px = x * 32;
		1526	int py = y * 32;
		1527
		1528	if (cell->stat_hp)
		1529	{
		1530	int width = cell->stat_width * 32;
		1531	int thick = sh / 28 + 1 + cell->stat_width;
		1532
		1533	glColor3ub (0, 0, 0);
		1534	glRectf (px + 1, py - thick - 2,
		1535	px + width - 1, py);
		1536
		1537	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1538	glRectf (px + 2,
		1539	py - thick - 1,
		1540	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1541	}
		1542	}
		1543	}
		1544	}
		1545
		1546	void
		1547	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1548	CODE:
		1549	{
		1550	static float color[16][3] = {
		1551	{ 0.00F, 0.00F, 0.00F },
		1552	{ 1.00F, 1.00F, 1.00F },
		1553	{ 0.00F, 0.00F, 0.55F },
		1554	{ 1.00F, 0.00F, 0.00F },
		1555
		1556	{ 1.00F, 0.54F, 0.00F },
		1557	{ 0.11F, 0.56F, 1.00F },
		1558	{ 0.93F, 0.46F, 0.00F },
		1559	{ 0.18F, 0.54F, 0.34F },
		1560
		1561	{ 0.56F, 0.73F, 0.56F },
		1562	{ 0.80F, 0.80F, 0.80F },
		1563	{ 0.55F, 0.41F, 0.13F },
		1564	{ 0.99F, 0.77F, 0.26F },
		1565
		1566	{ 0.74F, 0.65F, 0.41F },
		1567
		1568	{ 0.00F, 1.00F, 1.00F },
		1569	{ 1.00F, 0.00F, 1.00F },
		1570	{ 1.00F, 1.00F, 0.00F },
		1571	};
		1572
		1573	int x, y;
		1574
		1575	glEnable (GL_TEXTURE_2D);
		1576	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1577	glEnable (GL_BLEND);
		1578	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1579	glBegin (GL_QUADS);
		1580
		1581	for (y = 0; y < h; y++)
		1582	for (x = 0; x < w; x++)
		1583	{
		1584	unsigned char m = data [x + y * w];
		1585
		1586	if (m)
		1587	{
		1588	float *c = color [m & 15];
		1589
		1590	float tx1 = m & 0x40 ? 0.5 : 0.;
		1591	float tx2 = tx1 + 0.5;
		1592
		1593	glColor4f (c[0], c[1], c[2], 0.75);
		1594	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1595	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1596	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1597	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1598	}
		1599	}
		1600
		1601	glEnd ();
		1602	glDisable (GL_BLEND);
		1603	glDisable (GL_TEXTURE_2D);
		1604	}
		1605
		1606	void
		1607	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1608	PPCODE:
		1609	{
		1610	int vx, vy;
		1611	int x, y;
		1612	int sw4 = (sw + 3) & ~3;
		1613	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1614	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1615
		1616	memset (darkness, 255, sw4 * sh);
		1617	SvPOK_only (darkness_sv);
		1618	SvCUR_set (darkness_sv, sw4 * sh);
		1619
		1620	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1621	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1622
		1623	for (y = 0; y < sh; y++)
		1624	if (0 <= y + vy && y + vy < self->rows)
		1625	{
		1626	maprow *row = self->row + (y + vy);
		1627
		1628	for (x = 0; x < sw; x++)
		1629	if (row->c0 <= x + vx && x + vx < row->c1)
		1630	{
		1631	mapcell *cell = row->col + (x + vx - row->c0);
		1632
		1633	darkness[y * sw4 + x] = cell->darkness
		1634	? 255 - (cell->darkness - 1)
		1635	: 255 - FOW_DARKNESS;
		1636	}
		1637	}
1317		1638
1318	EXTEND (SP, 3);	1639	EXTEND (SP, 3);
1319	PUSHs (sv_2mortal (newSViv (sw4)));	1640	PUSHs (sv_2mortal (newSViv (sw4)));
1320	PUSHs (sv_2mortal (newSViv (sh)));	1641	PUSHs (sv_2mortal (newSViv (sh)));
1321	PUSHs (darkness_sv);	1642	PUSHs (darkness_sv);
1322	}	1643	}
1323		1644
1324	SV *	1645	SV *
1325	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1646	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1326	CODE:	1647	CODE:
1327	{	1648	{
1328	int x, y, x1, y1;	1649	int x, y, x1, y1;
1329	SV data_sv = newSV (w h * 7 + 5);	1650	SV data_sv = newSV (w h * 7 + 5);
1330	uint8_t data = (uint8_t )SvPVX (data_sv);	1651	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1392	}	1713	}
1393	OUTPUT:	1714	OUTPUT:
1394	RETVAL	1715	RETVAL
1395		1716
1396	void	1717	void
1397	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1718	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1398	PPCODE:	1719	PPCODE:
1399	{	1720	{
1400	int x, y, z;	1721	int x, y, z;
1401	int w, h;	1722	int w, h;
1402	int x1, y1;	1723	int x1, y1;
…		…
1434		1755
1435	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1756	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1436	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1757	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1437	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1758	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1438		1759
1439	if (cell->darkness <= 0)	1760	if (cell->darkness == 0)
1440	{	1761	{
1441	cell->darkness = -1;	1762	cell->darkness = 0;
1442		1763
1443	for (z = 0; z <= 2; z++)	1764	for (z = 0; z <= 2; z++)
1444	{	1765	{
1445	cell->face[z] = face[z];	1766	cell->face[z] = face[z];
1446		1767
…		…
1451	}	1772	}
1452	}	1773	}
1453	}	1774	}
1454	}	1775	}
1455		1776
1456	MODULE = CFClient PACKAGE = CFClient::MixChunk	1777	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1457		1778
1458	CFClient::MixChunk	1779	CFPlus::MixChunk
1459	new_from_file (SV class, char path)	1780	new_from_file (SV class, char path)
1460	CODE:	1781	CODE:
1461	RETVAL = Mix_LoadWAV (path);	1782	RETVAL = Mix_LoadWAV (path);
1462	OUTPUT:	1783	OUTPUT:
1463	RETVAL	1784	RETVAL
1464		1785
1465	void	1786	void
1466	DESTROY (CFClient::MixChunk self)	1787	DESTROY (CFPlus::MixChunk self)
1467	CODE:	1788	CODE:
1468	Mix_FreeChunk (self);	1789	Mix_FreeChunk (self);
1469		1790
1470	int	1791	int
1471	volume (CFClient::MixChunk self, int volume = -1)	1792	volume (CFPlus::MixChunk self, int volume = -1)
1472	CODE:	1793	CODE:
1473	RETVAL = Mix_VolumeChunk (self, volume);	1794	RETVAL = Mix_VolumeChunk (self, volume);
1474	OUTPUT:	1795	OUTPUT:
1475	RETVAL	1796	RETVAL
1476		1797
1477	int	1798	int
1478	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1799	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1479	CODE:	1800	CODE:
1480	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1801	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1481	OUTPUT:	1802	OUTPUT:
1482	RETVAL	1803	RETVAL
1483		1804
1484	MODULE = CFClient PACKAGE = CFClient::MixMusic	1805	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1485		1806
1486	int	1807	int
1487	volume (int volume = -1)	1808	volume (int volume = -1)
1488	CODE:	1809	CODE:
1489	RETVAL = Mix_VolumeMusic (volume);	1810	RETVAL = Mix_VolumeMusic (volume);
1490	OUTPUT:	1811	OUTPUT:
1491	RETVAL	1812	RETVAL
1492		1813
1493	CFClient::MixMusic	1814	CFPlus::MixMusic
1494	new_from_file (SV class, char path)	1815	new_from_file (SV class, char path)
1495	CODE:	1816	CODE:
1496	RETVAL = Mix_LoadMUS (path);	1817	RETVAL = Mix_LoadMUS (path);
1497	OUTPUT:	1818	OUTPUT:
1498	RETVAL	1819	RETVAL
1499		1820
1500	void	1821	void
1501	DESTROY (CFClient::MixMusic self)	1822	DESTROY (CFPlus::MixMusic self)
1502	CODE:	1823	CODE:
1503	Mix_FreeMusic (self);	1824	Mix_FreeMusic (self);
1504		1825
1505	int	1826	int
1506	play (CFClient::MixMusic self, int loops = -1)	1827	play (CFPlus::MixMusic self, int loops = -1)
1507	CODE:	1828	CODE:
1508	RETVAL = Mix_PlayMusic (self, loops);	1829	RETVAL = Mix_PlayMusic (self, loops);
1509	OUTPUT:	1830	OUTPUT:
1510	RETVAL	1831	RETVAL
1511		1832
1512	MODULE = CFClient PACKAGE = CFClient::OpenGL	1833	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1513		1834
1514	BOOT:	1835	BOOT:
1515	{	1836	{
1516	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1837	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1517	static const struct {	1838	static const struct {
1518	const char *name;	1839	const char *name;
1519	IV iv;	1840	IV iv;
1520	} *civ, const_iv[] = {	1841	} *civ, const_iv[] = {
1521	# define const_iv(name) { # name, (IV)name }	1842	# define const_iv(name) { # name, (IV)name }
…		…
1528	const_iv (GL_SCISSOR_TEST),	1849	const_iv (GL_SCISSOR_TEST),
1529	const_iv (GL_DEPTH_TEST),	1850	const_iv (GL_DEPTH_TEST),
1530	const_iv (GL_ALPHA_TEST),	1851	const_iv (GL_ALPHA_TEST),
1531	const_iv (GL_NORMALIZE),	1852	const_iv (GL_NORMALIZE),
1532	const_iv (GL_RESCALE_NORMAL),	1853	const_iv (GL_RESCALE_NORMAL),
		1854	const_iv (GL_FRONT),
		1855	const_iv (GL_BACK),
1533	const_iv (GL_AND),	1856	const_iv (GL_AND),
1534	const_iv (GL_ONE),	1857	const_iv (GL_ONE),
1535	const_iv (GL_ZERO),	1858	const_iv (GL_ZERO),
1536	const_iv (GL_SRC_ALPHA),	1859	const_iv (GL_SRC_ALPHA),
1537	const_iv (GL_SRC_ALPHA_SATURATE),	1860	const_iv (GL_DST_ALPHA),
1538	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1861	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1539	const_iv (GL_ONE_MINUS_DST_ALPHA),	1862	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1863	const_iv (GL_SRC_ALPHA_SATURATE),
1540	const_iv (GL_RGB),	1864	const_iv (GL_RGB),
1541	const_iv (GL_RGBA),	1865	const_iv (GL_RGBA),
		1866	const_iv (GL_RGBA4),
		1867	const_iv (GL_RGBA8),
		1868	const_iv (GL_RGB5_A1),
1542	const_iv (GL_UNSIGNED_BYTE),	1869	const_iv (GL_UNSIGNED_BYTE),
1543	const_iv (GL_UNSIGNED_SHORT),	1870	const_iv (GL_UNSIGNED_SHORT),
1544	const_iv (GL_UNSIGNED_INT),	1871	const_iv (GL_UNSIGNED_INT),
1545	const_iv (GL_ALPHA),	1872	const_iv (GL_ALPHA),
1546	const_iv (GL_INTENSITY),	1873	const_iv (GL_INTENSITY),
…		…
1578	const_iv (GL_SEPARABLE_2D),	1905	const_iv (GL_SEPARABLE_2D),
1579	const_iv (GL_CONVOLUTION_2D),	1906	const_iv (GL_CONVOLUTION_2D),
1580	const_iv (GL_CONVOLUTION_BORDER_MODE),	1907	const_iv (GL_CONVOLUTION_BORDER_MODE),
1581	const_iv (GL_CONSTANT_BORDER),	1908	const_iv (GL_CONSTANT_BORDER),
1582	const_iv (GL_LINES),	1909	const_iv (GL_LINES),
		1910	const_iv (GL_LINE_STRIP),
1583	const_iv (GL_LINE_LOOP),	1911	const_iv (GL_LINE_LOOP),
1584	const_iv (GL_QUADS),	1912	const_iv (GL_QUADS),
1585	const_iv (GL_QUAD_STRIP),	1913	const_iv (GL_QUAD_STRIP),
1586	const_iv (GL_TRIANGLES),	1914	const_iv (GL_TRIANGLES),
1587	const_iv (GL_TRIANGLE_STRIP),	1915	const_iv (GL_TRIANGLE_STRIP),
…		…
1620	OUTPUT:	1948	OUTPUT:
1621	RETVAL	1949	RETVAL
1622		1950
1623	int glGetError ()	1951	int glGetError ()
1624		1952
		1953	void glFinish ()
		1954
1625	void glClear (int mask)	1955	void glClear (int mask)
1626		1956
1627	void glClearColor (float r, float g, float b, float a = 1.0)	1957	void glClearColor (float r, float g, float b, float a = 1.0)
1628	PROTOTYPE: @	1958	PROTOTYPE: @
1629		1959
…		…
1635		1965
1636	void glHint (int target, int mode)	1966	void glHint (int target, int mode)
1637		1967
1638	void glBlendFunc (int sfactor, int dfactor)	1968	void glBlendFunc (int sfactor, int dfactor)
1639		1969
		1970	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1971	CODE:
		1972	gl_BlendFuncSeparate (sa, da, saa, daa);
		1973
1640	void glDepthMask (int flag)	1974	void glDepthMask (int flag)
1641		1975
1642	void glLogicOp (int opcode)	1976	void glLogicOp (int opcode)
1643		1977
1644	void glColorMask (int red, int green, int blue, int alpha)	1978	void glColorMask (int red, int green, int blue, int alpha)
…		…
1648	void glPushMatrix ()	1982	void glPushMatrix ()
1649		1983
1650	void glPopMatrix ()	1984	void glPopMatrix ()
1651		1985
1652	void glLoadIdentity ()	1986	void glLoadIdentity ()
		1987
		1988	void glDrawBuffer (int buffer)
		1989
		1990	void glReadBuffer (int buffer)
1653		1991
1654	# near_ and far_ are due to microsofts buggy "c" compiler	1992	# 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_)	1993	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1656		1994
1657	# near_ and far_ are due to microsofts buggy "c" compiler	1995	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1677		2015
1678	void glEnd ()	2016	void glEnd ()
1679		2017
1680	void glColor (float r, float g, float b, float a = 1.0)	2018	void glColor (float r, float g, float b, float a = 1.0)
1681	PROTOTYPE: @	2019	PROTOTYPE: @
		2020	ALIAS:
		2021	glColor_premultiply = 1
1682	CODE:	2022	CODE:
		2023	if (ix)
		2024	{
		2025	r *= a;
		2026	g *= a;
		2027	b *= a;
		2028	}
1683	// microsoft visual "c" rounds instead of truncating...	2029	// microsoft visual "c" rounds instead of truncating...
1684	glColor4ub (MIN ((int)(r * 255.f), 255),	2030	glColor4f (r, g, b, a);
1685	MIN ((int)(g * 255.f), 255),
1686	MIN ((int)(b * 255.f), 255),
1687	MIN ((int)(a * 255.f), 255));
1688		2031
1689	void glInterleavedArrays (int format, int stride, char *data)	2032	void glInterleavedArrays (int format, int stride, char *data)
1690		2033
1691	void glDrawElements (int mode, int count, int type, char *indices)	2034	void glDrawElements (int mode, int count, int type, char *indices)
1692		2035
…		…
1715		2058
1716	void glBindTexture (int target, int name)	2059	void glBindTexture (int target, int name)
1717		2060
1718	void glConvolutionParameter (int target, int pname, float params)	2061	void glConvolutionParameter (int target, int pname, float params)
1719	CODE:	2062	CODE:
1720	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2063	if (gl.ConvolutionParameterf)
		2064	gl.ConvolutionParameterf (target, pname, params);
1721		2065
1722	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2066	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1723	CODE:	2067	CODE:
1724	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2068	if (gl.ConvolutionFilter2D)
1725	(target, internalformat, width, height, format, type, data));	2069	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1726		2070
1727	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2071	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1728	CODE:	2072	CODE:
1729	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2073	if (gl.SeparableFilter2D)
1730	(target, internalformat, width, height, format, type, row, column));	2074	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1731		2075
1732	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2076	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1733		2077
1734	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2078	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1735		2079
…		…
1768		2112
1769	void glEndList ()	2113	void glEndList ()
1770		2114
1771	void glCallList (int list)	2115	void glCallList (int list)
1772		2116
1773

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.98 by root, Mon May 29 02:01:56 2006 UTC vs. Revision 1.153 by root, Tue Sep 19 22:02:38 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.98 by root, Mon May 29 02:01:56 2006 UTC vs.
Revision 1.153 by root, Tue Sep 19 22:02:38 2006 UTC