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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.101 by root, Sat Jun 3 21:57:23 2006 UTC vs.
Revision 1.155 by root, Thu Sep 21 00:16:42 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;
		320	cell->flags = 0;
		321	cell->player = 0;
271	}	322	}
272	}	323	}
273	}	324	}
274		325
275	static void	326	static void
…		…
296	ev.data2 = 0;	347	ev.data2 = 0;
297		348
298	SDL_PushEvent ((SDL_Event *)&ev);	349	SDL_PushEvent ((SDL_Event *)&ev);
299	}	350	}
300		351
		352	static unsigned int
		353	minpot (unsigned int n)
		354	{
		355	if (!n)
		356	return 0;
		357
		358	--n;
		359
		360	n \|= n >> 1;
		361	n \|= n >> 2;
		362	n \|= n >> 4;
		363	n \|= n >> 8;
		364	n \|= n >> 16;
		365
		366	return n + 1;
		367	}
		368
301	MODULE = CFClient PACKAGE = CFClient	369	MODULE = CFPlus PACKAGE = CFPlus
302		370
303	PROTOTYPES: ENABLE	371	PROTOTYPES: ENABLE
304		372
305	BOOT:	373	BOOT:
306	{	374	{
307	HV *stash = gv_stashpv ("CFClient", 1);	375	HV *stash = gv_stashpv ("CFPlus", 1);
308	static const struct {	376	static const struct {
309	const char *name;	377	const char *name;
310	IV iv;	378	IV iv;
311	} *civ, const_iv[] = {	379	} *civ, const_iv[] = {
312	# define const_iv(name) { # name, (IV)name }	380	# define const_iv(name) { # name, (IV)name }
…		…
413		481
414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	482	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	483	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416	}	484	}
417		485
		486	int
		487	in_destruct ()
		488	CODE:
		489	RETVAL = PL_main_cv == Nullcv;
		490	OUTPUT:
		491	RETVAL
		492
		493	NV floor (NV x)
		494
		495	NV ceil (NV x)
		496
418	void	497	void
419	pango_init ()	498	pango_init ()
420	CODE:	499	CODE:
421	{	500	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx
423	ft2_fontmap = pango_ft2_font_map_new ();	501	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	502	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);	503	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	}	504	}
430		505
431	int	506	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	507	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
433		508
434	void	509	void
435	SDL_Quit ()	510	SDL_Quit ()
436		511
437	void	512	void
…		…
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	519	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	520	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	521	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		522
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	523	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	524	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450		525
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	528	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	529	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455		530
456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	531	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		532	#if SDL_VERSION_ATLEAST(1,2,10)
		533	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		534	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		535	#endif
457		536
458	SDL_EnableUNICODE (1);	537	SDL_EnableUNICODE (1);
459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	538	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460		539
461	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	540	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	558	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	559	CODE:
481	RETVAL = !!SDL_SetVideoMode (	560	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	561	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	562	);
		563	if (RETVAL)
		564	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	565	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		566	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		567	# include "glfunc.h"
		568	# undef GL_FUNC
		569	}
485	OUTPUT:	570	OUTPUT:
486	RETVAL	571	RETVAL
487		572
488	void	573	void
489	SDL_GL_SwapBuffers ()	574	SDL_GL_SwapBuffers ()
…		…
542	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	627	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
543	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	628	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
544	break;	629	break;
545	}	630	}
546		631
547	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	632	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
548	}	633	}
549	}	634	}
550		635
551	int	636	int
552	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	637	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
568	#endif	653	#endif
569		654
570	void	655	void
571	add_font (char *file)	656	add_font (char *file)
572	CODE:	657	CODE:
573	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	658	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
574	#ifdef _WIN32
575	// cairo... sigh... requires win2000
576	AddFontResourceEx (file, FR_PRIVATE, 0);
577	#endif
578		659
579	void	660	void
580	load_image_inline (SV *image_)	661	load_image_inline (SV *image_)
581	ALIAS:	662	ALIAS:
582	load_image_file = 1	663	load_image_file = 1
…		…
624		705
625	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	706	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
626		707
627	assert (surface2->pitch == surface2->w * 4);	708	assert (surface2->pitch == surface2->w * 4);
628		709
		710	SDL_LockSurface (surface2);
629	EXTEND (SP, 5);	711	EXTEND (SP, 6);
630	PUSHs (sv_2mortal (newSViv (surface2->w)));	712	PUSHs (sv_2mortal (newSViv (surface2->w)));
631	PUSHs (sv_2mortal (newSViv (surface2->h)));	713	PUSHs (sv_2mortal (newSViv (surface2->h)));
632	SDL_LockSurface (surface2);
633	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	714	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)));	715	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
636	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	716	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
637	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	717	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		718	SDL_UnlockSurface (surface2);
638		719
639	SDL_FreeSurface (surface);	720	SDL_FreeSurface (surface);
640	SDL_FreeSurface (surface2);	721	SDL_FreeSurface (surface2);
641	}	722	}
642		723
…		…
678	CODE:	759	CODE:
679	fprintf (stderr, "FATAL: %s\n", message);	760	fprintf (stderr, "FATAL: %s\n", message);
680	#ifdef _WIN32	761	#ifdef _WIN32
681	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	762	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
682	#endif	763	#endif
683	exit (1);	764	_exit (1);
684		765
		766	void
		767	_exit (int retval)
		768	CODE:
		769	_exit (retval);
		770
685	MODULE = CFClient PACKAGE = CFClient::Font	771	MODULE = CFPlus PACKAGE = CFPlus::Font
686		772
687	CFClient::Font	773	CFPlus::Font
688	new_from_file (SV class, char path, int id = 0)	774	new_from_file (SV class, char path, int id = 0)
689	CODE:	775	CODE:
690	{	776	{
691	int count;	777	int count;
692	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	778	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
695	}	781	}
696	OUTPUT:	782	OUTPUT:
697	RETVAL	783	RETVAL
698		784
699	void	785	void
700	DESTROY (CFClient::Font self)	786	DESTROY (CFPlus::Font self)
701	CODE:	787	CODE:
702	pango_font_description_free (self);	788	pango_font_description_free (self);
703		789
704	void	790	void
705	make_default (CFClient::Font self)	791	make_default (CFPlus::Font self)
706	CODE:	792	CODE:
707	default_font = self;	793	default_font = self;
708		794
709	MODULE = CFClient PACKAGE = CFClient::Layout	795	MODULE = CFPlus PACKAGE = CFPlus::Layout
710		796
711	CFClient::Layout	797	void
712	new (SV *class, int rgba = 0)	798	reset_glyph_cache ()
713	CODE:	799	CODE:
714	#if _WIN32	800	tc_clear ();
715	//rgba = 0;//D make stext nicer, breaks TextView	801
716	#endif	802	CFPlus::Layout
		803	new (SV *class)
		804	CODE:
717	New (0, RETVAL, 1, struct cf_layout);	805	New (0, RETVAL, 1, struct cf_layout);
718		806
719	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	807	RETVAL->pl = pango_layout_new (opengl_context);
720	RETVAL->rgba = rgba;
721	RETVAL->r = 1.;	808	RETVAL->r = 1.;
722	RETVAL->g = 1.;	809	RETVAL->g = 1.;
723	RETVAL->b = 1.;	810	RETVAL->b = 1.;
724	RETVAL->a = 1.;	811	RETVAL->a = 1.;
725	RETVAL->base_height = MIN_FONT_HEIGHT;	812	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
729	layout_update_font (RETVAL);	816	layout_update_font (RETVAL);
730	OUTPUT:	817	OUTPUT:
731	RETVAL	818	RETVAL
732		819
733	void	820	void
734	DESTROY (CFClient::Layout self)	821	DESTROY (CFPlus::Layout self)
735	CODE:	822	CODE:
736	g_object_unref (self->pl);	823	g_object_unref (self->pl);
737	Safefree (self);	824	Safefree (self);
738		825
739	int
740	is_rgba (CFClient::Layout self)
741	CODE:
742	RETVAL = self->rgba;
743	OUTPUT:
744	RETVAL
745
746	void	826	void
747	set_text (CFClient::Layout self, SV *text_)	827	set_text (CFPlus::Layout self, SV *text_)
748	CODE:	828	CODE:
749	{	829	{
750	STRLEN textlen;	830	STRLEN textlen;
751	char *text = SvPVutf8 (text_, textlen);	831	char *text = SvPVutf8 (text_, textlen);
752		832
753	pango_layout_set_text (self->pl, text, textlen);	833	pango_layout_set_text (self->pl, text, textlen);
754	}	834	}
755		835
756	void	836	void
757	set_markup (CFClient::Layout self, SV *text_)	837	set_markup (CFPlus::Layout self, SV *text_)
758	CODE:	838	CODE:
759	{	839	{
760	STRLEN textlen;	840	STRLEN textlen;
761	char *text = SvPVutf8 (text_, textlen);	841	char *text = SvPVutf8 (text_, textlen);
762		842
763	pango_layout_set_markup (self->pl, text, textlen);	843	pango_layout_set_markup (self->pl, text, textlen);
764	}	844	}
765		845
		846	void
		847	set_shapes (CFPlus::Layout self, ...)
		848	CODE:
		849	{
		850	PangoAttrList *attrs = 0;
		851	const char *text = pango_layout_get_text (self->pl);
		852	const char *pos = text;
		853	int arg = 4;
		854
		855	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		856	{
		857	PangoRectangle inkrect, rect;
		858	PangoAttribute *attr;
		859
		860	int x = SvIV (ST (arg - 3));
		861	int y = SvIV (ST (arg - 2));
		862	int w = SvIV (ST (arg - 1));
		863	int h = SvIV (ST (arg ));
		864
		865	inkrect.x = 0;
		866	inkrect.y = 0;
		867	inkrect.width = 0;
		868	inkrect.height = 0;
		869
		870	rect.x = x * PANGO_SCALE;
		871	rect.y = y * PANGO_SCALE;
		872	rect.width = w * PANGO_SCALE;
		873	rect.height = h * PANGO_SCALE;
		874
		875	if (!attrs)
		876	attrs = pango_layout_get_attributes (self->pl);
		877
		878	attr = pango_attr_shape_new (&inkrect, &rect);
		879	attr->start_index = pos - text;
		880	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		881	pango_attr_list_insert (attrs, attr);
		882
		883	arg += 4;
		884	pos += sizeof (OBJ_STR) - 1;
		885	}
		886
		887	if (attrs)
		888	pango_layout_set_attributes (self->pl, attrs);
		889	}
		890
		891	void
		892	get_shapes (CFPlus::Layout self)
		893	PPCODE:
		894	{
		895	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		896
		897	do
		898	{
		899	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		900
		901	if (run && shape_attr_p (run))
		902	{
		903	PangoRectangle extents;
		904	pango_layout_iter_get_run_extents (iter, 0, &extents);
		905
		906	EXTEND (SP, 2);
		907	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		908	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		909	}
		910	}
		911	while (pango_layout_iter_next_run (iter));
		912
		913	pango_layout_iter_free (iter);
		914	}
		915
		916	int
		917	has_wrapped (CFPlus::Layout self)
		918	CODE:
		919	{
		920	int lines = 1;
		921	const char *text = pango_layout_get_text (self->pl);
		922
		923	while (*text)
		924	lines += *text++ == '\n';
		925
		926	RETVAL = lines < pango_layout_get_line_count (self->pl);
		927	}
		928	OUTPUT:
		929	RETVAL
		930
766	SV *	931	SV *
767	get_text (CFClient::Layout self)	932	get_text (CFPlus::Layout self)
768	CODE:	933	CODE:
769	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	934	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
770	SvUTF8_on (RETVAL);	935	sv_utf8_decode (RETVAL);
771	OUTPUT:	936	OUTPUT:
772	RETVAL	937	RETVAL
773		938
774	void	939	void
775	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	940	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
776	CODE:	941	CODE:
777	self->r = r;	942	self->r = r;
778	self->g = g;	943	self->g = g;
779	self->b = b;	944	self->b = b;
780	self->a = a;	945	self->a = a;
781		946
782	void	947	void
783	set_font (CFClient::Layout self, CFClient::Font font = 0)	948	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
784	CODE:	949	CODE:
785	if (self->font != font)	950	if (self->font != font)
786	{	951	{
787	self->font = font;	952	self->font = font;
788	layout_update_font (self);	953	layout_update_font (self);
789	}	954	}
790		955
791	void	956	void
792	set_height (CFClient::Layout self, int base_height)	957	set_height (CFPlus::Layout self, int base_height)
793	CODE:	958	CODE:
794	if (self->base_height != base_height)	959	if (self->base_height != base_height)
795	{	960	{
796	self->base_height = base_height;	961	self->base_height = base_height;
797	layout_update_font (self);	962	layout_update_font (self);
798	}	963	}
799		964
800	void	965	void
801	set_width (CFClient::Layout self, int max_width = -1)	966	set_width (CFPlus::Layout self, int max_width = -1)
802	CODE:	967	CODE:
803	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	968	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
804		969
805	void	970	void
806	set_indent (CFClient::Layout self, int indent)	971	set_indent (CFPlus::Layout self, int indent)
807	CODE:	972	CODE:
808	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	973	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
809		974
810	void	975	void
811	set_spacing (CFClient::Layout self, int spacing)	976	set_spacing (CFPlus::Layout self, int spacing)
812	CODE:	977	CODE:
813	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	978	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
814		979
815	void	980	void
816	set_ellipsise (CFClient::Layout self, int ellipsise)	981	set_ellipsise (CFPlus::Layout self, int ellipsise)
817	CODE:	982	CODE:
818	pango_layout_set_ellipsize (self->pl,	983	pango_layout_set_ellipsize (self->pl,
819	ellipsise == 1 ? PANGO_ELLIPSIZE_START	984	ellipsise == 1 ? PANGO_ELLIPSIZE_START
820	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	985	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
821	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	986	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
822	: PANGO_ELLIPSIZE_NONE	987	: PANGO_ELLIPSIZE_NONE
823	);	988	);
824		989
825	void	990	void
826	set_single_paragraph_mode (CFClient::Layout self, int spm)	991	set_single_paragraph_mode (CFPlus::Layout self, int spm)
827	CODE:	992	CODE:
828	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	993	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
829		994
830	void	995	void
831	size (CFClient::Layout self)	996	size (CFPlus::Layout self)
832	PPCODE:	997	PPCODE:
833	{	998	{
834	int w, h;	999	int w, h;
835		1000
836	layout_get_pixel_size (self, &w, &h);	1001	layout_get_pixel_size (self, &w, &h);
…		…
839	PUSHs (sv_2mortal (newSViv (w)));	1004	PUSHs (sv_2mortal (newSViv (w)));
840	PUSHs (sv_2mortal (newSViv (h)));	1005	PUSHs (sv_2mortal (newSViv (h)));
841	}	1006	}
842		1007
843	int	1008	int
		1009	descent (CFPlus::Layout self)
		1010	CODE:
		1011	{
		1012	PangoRectangle rect;
		1013	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1014	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1015	RETVAL = PANGO_DESCENT (rect);
		1016	}
		1017	OUTPUT:
		1018	RETVAL
		1019
		1020	int
844	xy_to_index (CFClient::Layout self, int x, int y)	1021	xy_to_index (CFPlus::Layout self, int x, int y)
845	CODE:	1022	CODE:
846	{	1023	{
847	int index, trailing;	1024	int index, trailing;
848	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1025	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
849	RETVAL = index;	1026	RETVAL = index;
850	}	1027	}
851	OUTPUT:	1028	OUTPUT:
852	RETVAL	1029	RETVAL
853		1030
854	void	1031	void
855	cursor_pos (CFClient::Layout self, int index)	1032	cursor_pos (CFPlus::Layout self, int index)
856	PPCODE:	1033	PPCODE:
857	{	1034	{
858	PangoRectangle strong_pos;	1035	PangoRectangle strong_pos;
859	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1036	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
860		1037
…		…
863	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1040	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
864	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1041	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
865	}	1042	}
866		1043
867	void	1044	void
868	render (CFClient::Layout self)	1045	render (CFPlus::Layout self, float x, float y, int flags = 0)
869	PPCODE:	1046	PPCODE:
870	{	1047	pango_opengl_render_layout_subpixel (
871	SV *retval;	1048	self->pl,
872	int w, h;	1049	x * PANGO_SCALE, y * PANGO_SCALE,
		1050	self->r, self->g, self->b, self->a,
		1051	flags
		1052	);
873		1053
874	layout_get_pixel_size (self, &w, &h);	1054	MODULE = CFPlus PACKAGE = CFPlus::Texture
875		1055
876	if (self->rgba)	1056	void
		1057	pad2pot (SV data_, SV w_, SV *h_)
		1058	CODE:
		1059	{
		1060	int ow = SvIV (w_);
		1061	int oh = SvIV (h_);
		1062
		1063	if (ow && oh)
877	{	1064	{
878	cairo_surface_t *surface;	1065	int nw = minpot (ow);
879	cairo_t *cairo;	1066	int nh = minpot (oh);
880		1067
881	retval = newSV (w * h * 4);	1068	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	{	1069	{
899	uint32_t p = (uint32_t )SvPVX (retval);	1070	if (SvOK (data_))
900	uint32_t e = p + w h;
901
902	while (p < e)
903	{	1071	{
904	uint32_t rgba = *p;	1072	STRLEN datalen;
905	rgba = (rgba >> 24) \| (rgba << 8);	1073	char *data = SvPVbyte (data_, datalen);
906	#if 0	1074	int bpp = datalen / (ow * oh);
907	#ifdef _WIN32	1075	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		1076
914	rgba = (rgba & 0xffffff00) \| a;	1077	SvPOK_only (result_);
		1078	SvCUR_set (result_, nw * nh * bpp);
		1079
		1080	memset (SvPVX (result_), 0, nw * nh * bpp);
		1081	while (oh--)
		1082	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1083
		1084	sv_setsv (data_, result_);
915	}	1085	}
916	#endif	1086
917	#endif	1087	sv_setiv (w_, nw);
918	rgba = SDL_SwapBE32 (rgba);	1088	sv_setiv (h_, nh);
919	*p++ = rgba;
920	}	1089	}
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	}	1090	}
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	}	1091	}
957		1092
958	MODULE = CFClient PACKAGE = CFClient::Texture
959
960	void	1093	void
961	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1094	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
962	PROTOTYPE: $$$;$$	1095	PROTOTYPE: $$$;$$
963	ALIAS:	1096	ALIAS:
964	draw_quad_alpha = 1	1097	draw_quad_alpha = 1
965	draw_quad_alpha_premultiplied = 2	1098	draw_quad_alpha_premultiplied = 2
966	CODE:	1099	CODE:
…		…
977	}	1110	}
978		1111
979	if (ix)	1112	if (ix)
980	{	1113	{
981	glEnable (GL_BLEND);	1114	glEnable (GL_BLEND);
		1115
		1116	if (ix == 2)
982	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1117	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1118	else
		1119	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1120	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1121
983	glEnable (GL_ALPHA_TEST);	1122	glEnable (GL_ALPHA_TEST);
984	glAlphaFunc (GL_GREATER, 0.01f);	1123	glAlphaFunc (GL_GREATER, 0.01f);
985	}	1124	}
986		1125
987	glBindTexture (GL_TEXTURE_2D, name);	1126	glBindTexture (GL_TEXTURE_2D, name);
…		…
998	glDisable (GL_ALPHA_TEST);	1137	glDisable (GL_ALPHA_TEST);
999	glDisable (GL_BLEND);	1138	glDisable (GL_BLEND);
1000	}	1139	}
1001	}	1140	}
1002		1141
1003	MODULE = CFClient PACKAGE = CFClient::Map	1142	MODULE = CFPlus PACKAGE = CFPlus::Map
1004		1143
1005	CFClient::Map	1144	CFPlus::Map
1006	new (SV *class, int map_width, int map_height)	1145	new (SV *class, int map_width, int map_height)
1007	CODE:	1146	CODE:
1008	New (0, RETVAL, 1, struct map);	1147	New (0, RETVAL, 1, struct map);
1009	RETVAL->x = 0;	1148	RETVAL->x = 0;
1010	RETVAL->y = 0;	1149	RETVAL->y = 0;
…		…
1020	RETVAL->row = 0;	1159	RETVAL->row = 0;
1021	OUTPUT:	1160	OUTPUT:
1022	RETVAL	1161	RETVAL
1023		1162
1024	void	1163	void
1025	DESTROY (CFClient::Map self)	1164	DESTROY (CFPlus::Map self)
1026	CODE:	1165	CODE:
1027	{	1166	{
1028	map_clear (self);	1167	map_clear (self);
1029	Safefree (self->face);	1168	Safefree (self->face);
		1169	Safefree (self->tex);
1030	Safefree (self);	1170	Safefree (self);
1031	}	1171	}
1032		1172
1033	void	1173	void
1034	clear (CFClient::Map self)	1174	clear (CFPlus::Map self)
1035	CODE:	1175	CODE:
1036	map_clear (self);	1176	map_clear (self);
1037		1177
1038	void	1178	void
1039	set_face (CFClient::Map self, int face, int texid)	1179	set_face (CFPlus::Map self, int face, int texid)
1040	CODE:	1180	CODE:
1041	{	1181	{
1042	while (self->faces <= face)	1182	while (self->faces <= face)
1043	{	1183	{
1044	Append (mapface, self->face, self->faces, self->faces);	1184	Append (mapface, self->face, self->faces, self->faces);
…		…
1047		1187
1048	self->face [face] = texid;	1188	self->face [face] = texid;
1049	}	1189	}
1050		1190
1051	void	1191	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)	1192	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:	1193	CODE:
1054	{	1194	{
1055	while (self->texs <= texid)	1195	while (self->texs <= texid)
1056	{	1196	{
1057	Append (maptex, self->tex, self->texs, self->texs);	1197	Append (maptex, self->tex, self->texs, self->texs);
…		…
1081	// from transparent color bleeding and ugly wrapping effects.	1221	// from transparent color bleeding and ugly wrapping effects.
1082	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1222	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1083	}	1223	}
1084		1224
1085	int	1225	int
1086	ox (CFClient::Map self)	1226	ox (CFPlus::Map self)
1087	ALIAS:	1227	ALIAS:
1088	oy = 1	1228	oy = 1
1089	x = 2	1229	x = 2
1090	y = 3	1230	y = 3
		1231	w = 4
		1232	h = 5
1091	CODE:	1233	CODE:
1092	switch (ix)	1234	switch (ix)
1093	{	1235	{
1094	case 0: RETVAL = self->ox; break;	1236	case 0: RETVAL = self->ox; break;
1095	case 1: RETVAL = self->oy; break;	1237	case 1: RETVAL = self->oy; break;
1096	case 2: RETVAL = self->x; break;	1238	case 2: RETVAL = self->x; break;
1097	case 3: RETVAL = self->y; break;	1239	case 3: RETVAL = self->y; break;
		1240	case 4: RETVAL = self->w; break;
		1241	case 5: RETVAL = self->h; break;
1098	}	1242	}
1099	OUTPUT:	1243	OUTPUT:
1100	RETVAL	1244	RETVAL
1101		1245
1102	void	1246	void
1103	scroll (CFClient::Map self, int dx, int dy)	1247	scroll (CFPlus::Map self, int dx, int dy)
1104	CODE:	1248	CODE:
1105	{	1249	{
1106	if (dx > 0)	1250	if (dx > 0)
1107	map_blank (self, self->x, self->y, dx - 1, self->h);	1251	map_blank (self, self->x, self->y, dx, self->h);
1108	else if (dx < 0)	1252	else if (dx < 0)
1109	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1253	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1110		1254
1111	if (dy > 0)	1255	if (dy > 0)
1112	map_blank (self, self->x, self->y, self->w, dy - 1);	1256	map_blank (self, self->x, self->y, self->w, dy);
1113	else if (dy < 0)	1257	else if (dy < 0)
1114	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1258	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1115		1259
1116	self->ox += dx; self->x += dx;	1260	self->ox += dx; self->x += dx;
1117	self->oy += dy; self->y += dy;	1261	self->oy += dy; self->y += dy;
1118		1262
1119	while (self->y < 0)	1263	while (self->y < 0)
…		…
1124	self->y += MAP_EXTEND_Y;	1268	self->y += MAP_EXTEND_Y;
1125	}	1269	}
1126	}	1270	}
1127		1271
1128	void	1272	void
1129	map1a_update (CFClient::Map self, SV *data_)	1273	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1130	CODE:	1274	CODE:
1131	{	1275	{
1132	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1276	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1133	uint8_t data_end = (uint8_t )SvEND (data_);	1277	uint8_t data_end = (uint8_t )SvEND (data_);
1134	mapcell *cell;	1278	mapcell *cell;
1135	int x, y, flags;	1279	int x, y, flags;
1136		1280
1137	while (data < data_end)	1281	while (data < data_end - 1)
1138	{	1282	{
1139	flags = (data [0] << 8) + data [1]; data += 2;	1283	flags = (data [0] << 8) + data [1]; data += 2;
1140		1284
1141	x = ((flags >> 10) & 63) + self->x;	1285	x = self->x + ((flags >> 10) & 63);
1142	y = ((flags >> 4) & 63) + self->y;	1286	y = self->y + ((flags >> 4) & 63);
1143		1287
1144	cell = map_get_cell (self, x, y);	1288	cell = map_get_cell (self, x, y);
1145		1289
1146	if (flags & 15)	1290	if (flags & 15)
1147	{	1291	{
1148	if (cell->darkness < 0)	1292	if (!cell->darkness)
1149	{	1293	{
		1294	memset (cell, 0, sizeof (*cell));
1150	cell->darkness = 0;	1295	cell->darkness = 256;
1151	cell->face [0] = 0;
1152	cell->face [1] = 0;
1153	cell->face [2] = 0;
1154	}	1296	}
1155		1297
1156	cell->darkness = flags & 8 ? *data++ : 255;
1157
1158	//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
		1339	}
1159		1340
1160	if (flags & 4)	1341	if (flags & 4)
1161	{	1342	{
1162	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1343	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1163	}	1344	}
…		…
1171	{	1352	{
1172	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1353	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1173	}	1354	}
1174	}	1355	}
1175	else	1356	else
1176	cell->darkness = -1;	1357	cell->darkness = 0;
1177	}	1358	}
1178	}	1359	}
1179		1360
1180	SV *	1361	SV *
1181	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1362	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1182	CODE:	1363	CODE:
1183	{	1364	{
1184	int x1, x;	1365	int x1, x;
1185	int y1, y;	1366	int y1, y;
1186	int z;	1367	int z;
…		…
1236	}	1417	}
1237	OUTPUT:	1418	OUTPUT:
1238	RETVAL	1419	RETVAL
1239		1420
1240	void	1421	void
1241	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1422	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1242	PPCODE:	1423	CODE:
1243	{	1424	{
1244	int vx, vy;	1425	int vx, vy;
1245	int x, y, z;	1426	int x, y, z;
1246	int last_name;	1427	int last_name;
1247	mapface face;	1428	mapface face;
1248	int sw4 = (sw + 3) & ~3;
1249	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1250	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1251		1429
1252	memset (darkness, 255, sw4 * sh);
1253	SvPOK_only (darkness_sv);
1254	SvCUR_set (darkness_sv, sw4 * sh);
1255
1256	vx = self->x + (self->w - sw) / 2 - shift_x;	1430	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1257	vy = self->y + (self->h - sh) / 2 - shift_y;	1431	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1258		1432
1259	/*	1433	/*
1260	int vx = self->vx = self->w >= sw	1434	int vx = self->vx = self->w >= sw
1261	? self->x + (self->w - sw) / 2	1435	? self->x + (self->w - sw) / 2
1262	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1436	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1266	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1440	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1267	*/	1441	*/
1268		1442
1269	glColor4ub (255, 255, 255, 255);	1443	glColor4ub (255, 255, 255, 255);
1270		1444
		1445	glEnable (GL_BLEND);
1271	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1446	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1272	glEnable (GL_BLEND);
1273	glEnable (GL_TEXTURE_2D);	1447	glEnable (GL_TEXTURE_2D);
1274	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1448	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1275		1449
1276	glBegin (GL_QUADS);	1450	glBegin (GL_QUADS);
1277		1451
…		…
1286	for (x = 0; x < sw; x++)	1460	for (x = 0; x < sw; x++)
1287	if (row->c0 <= x + vx && x + vx < row->c1)	1461	if (row->c0 <= x + vx && x + vx < row->c1)
1288	{	1462	{
1289	mapcell *cell = row->col + (x + vx - row->c0);	1463	mapcell *cell = row->col + (x + vx - row->c0);
1290		1464
1291	darkness[y * sw4 + x] = cell->darkness < 0
1292	? 255 - FOW_DARKNESS
1293	: 255 - cell->darkness;
1294
1295	face = cell->face [z];	1465	face = cell->face [z];
1296		1466
1297	if (face)	1467	if (face && face < self->texs)
1298	{	1468	{
1299	maptex tex = self->tex [face];	1469	maptex tex = self->tex [face];
1300
1301	int px = (x + 1) * 32 - tex.w;	1470	int px = (x + 1) * 32 - tex.w;
1302	int py = (y + 1) * 32 - tex.h;	1471	int py = (y + 1) * 32 - tex.h;
1303		1472
1304	if (last_name != tex.name)	1473	if (last_name != tex.name)
1305	{	1474	{
1306	glEnd ();	1475	glEnd ();
1307	last_name = tex.name;
1308	glBindTexture (GL_TEXTURE_2D, last_name);	1476	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1309	glBegin (GL_QUADS);	1477	glBegin (GL_QUADS);
1310	}	1478	}
1311		1479
1312	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1480	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1313	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1481	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1314	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1482	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1315	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1483	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1316	}	1484	}
		1485
		1486	if (cell->flags && z == 2)
		1487	{
		1488	if (cell->flags & 1)
		1489	{
		1490	maptex tex = self->tex [1];
		1491	int px = (x + 1) * 32 - tex.w + 2;
		1492	int py = (y + 1) * 32 - tex.h - 6;
		1493
		1494	glEnd ();
		1495	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1496	glBegin (GL_QUADS);
		1497
		1498	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1499	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1500	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1501	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1502	}
		1503	}
1317	}	1504	}
1318	}	1505	}
1319		1506
1320	glEnd ();	1507	glEnd ();
1321		1508
1322	glDisable (GL_TEXTURE_2D);	1509	glDisable (GL_TEXTURE_2D);
1323	glDisable (GL_BLEND);	1510	glDisable (GL_BLEND);
		1511
		1512	// top layer: overlays such as the health bar
		1513	for (y = 0; y < sh; y++)
		1514	if (0 <= y + vy && y + vy < self->rows)
		1515	{
		1516	maprow *row = self->row + (y + vy);
		1517
		1518	for (x = 0; x < sw; x++)
		1519	if (row->c0 <= x + vx && x + vx < row->c1)
		1520	{
		1521	mapcell *cell = row->col + (x + vx - row->c0);
		1522
		1523	int px = x * 32;
		1524	int py = y * 32;
		1525
		1526	if (cell->stat_hp)
		1527	{
		1528	int width = cell->stat_width * 32;
		1529	int thick = sh / 28 + 1 + cell->stat_width;
		1530
		1531	glColor3ub (0, 0, 0);
		1532	glRectf (px + 1, py - thick - 2,
		1533	px + width - 1, py);
		1534
		1535	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1536	glRectf (px + 2,
		1537	py - thick - 1,
		1538	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1539	}
		1540	}
		1541	}
		1542	}
		1543
		1544	void
		1545	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1546	CODE:
		1547	{
		1548	static float color[16][3] = {
		1549	{ 0.00F, 0.00F, 0.00F },
		1550	{ 1.00F, 1.00F, 1.00F },
		1551	{ 0.00F, 0.00F, 0.55F },
		1552	{ 1.00F, 0.00F, 0.00F },
		1553
		1554	{ 1.00F, 0.54F, 0.00F },
		1555	{ 0.11F, 0.56F, 1.00F },
		1556	{ 0.93F, 0.46F, 0.00F },
		1557	{ 0.18F, 0.54F, 0.34F },
		1558
		1559	{ 0.56F, 0.73F, 0.56F },
		1560	{ 0.80F, 0.80F, 0.80F },
		1561	{ 0.55F, 0.41F, 0.13F },
		1562	{ 0.99F, 0.77F, 0.26F },
		1563
		1564	{ 0.74F, 0.65F, 0.41F },
		1565
		1566	{ 0.00F, 1.00F, 1.00F },
		1567	{ 1.00F, 0.00F, 1.00F },
		1568	{ 1.00F, 1.00F, 0.00F },
		1569	};
		1570
		1571	int x, y;
		1572
		1573	glEnable (GL_TEXTURE_2D);
		1574	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1575	glEnable (GL_BLEND);
		1576	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1577	glBegin (GL_QUADS);
		1578
		1579	for (y = 0; y < h; y++)
		1580	for (x = 0; x < w; x++)
		1581	{
		1582	unsigned char m = data [x + y * w];
		1583
		1584	if (m)
		1585	{
		1586	float *c = color [m & 15];
		1587
		1588	float tx1 = m & 0x40 ? 0.5 : 0.;
		1589	float tx2 = tx1 + 0.5;
		1590
		1591	glColor4f (c[0], c[1], c[2], 0.75);
		1592	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1593	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1594	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1595	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1596	}
		1597	}
		1598
		1599	glEnd ();
		1600	glDisable (GL_BLEND);
		1601	glDisable (GL_TEXTURE_2D);
		1602	}
		1603
		1604	void
		1605	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1606	PPCODE:
		1607	{
		1608	int vx, vy;
		1609	int x, y;
		1610	int sw4 = (sw + 3) & ~3;
		1611	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1612	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1613
		1614	memset (darkness, 255, sw4 * sh);
		1615	SvPOK_only (darkness_sv);
		1616	SvCUR_set (darkness_sv, sw4 * sh);
		1617
		1618	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1619	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1620
		1621	for (y = 0; y < sh; y++)
		1622	if (0 <= y + vy && y + vy < self->rows)
		1623	{
		1624	maprow *row = self->row + (y + vy);
		1625
		1626	for (x = 0; x < sw; x++)
		1627	if (row->c0 <= x + vx && x + vx < row->c1)
		1628	{
		1629	mapcell *cell = row->col + (x + vx - row->c0);
		1630
		1631	darkness[y * sw4 + x] = cell->darkness
		1632	? 255 - (cell->darkness - 1)
		1633	: 255 - FOW_DARKNESS;
		1634	}
		1635	}
1324		1636
1325	EXTEND (SP, 3);	1637	EXTEND (SP, 3);
1326	PUSHs (sv_2mortal (newSViv (sw4)));	1638	PUSHs (sv_2mortal (newSViv (sw4)));
1327	PUSHs (sv_2mortal (newSViv (sh)));	1639	PUSHs (sv_2mortal (newSViv (sh)));
1328	PUSHs (darkness_sv);	1640	PUSHs (darkness_sv);
1329	}	1641	}
1330		1642
1331	SV *	1643	SV *
1332	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1644	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1333	CODE:	1645	CODE:
1334	{	1646	{
1335	int x, y, x1, y1;	1647	int x, y, x1, y1;
1336	SV data_sv = newSV (w h * 7 + 5);	1648	SV data_sv = newSV (w h * 7 + 5);
1337	uint8_t data = (uint8_t )SvPVX (data_sv);	1649	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1399	}	1711	}
1400	OUTPUT:	1712	OUTPUT:
1401	RETVAL	1713	RETVAL
1402		1714
1403	void	1715	void
1404	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1716	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1405	PPCODE:	1717	PPCODE:
1406	{	1718	{
1407	int x, y, z;	1719	int x, y, z;
1408	int w, h;	1720	int w, h;
1409	int x1, y1;	1721	int x1, y1;
…		…
1441		1753
1442	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1754	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1443	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1755	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1444	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1756	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1445		1757
1446	if (cell->darkness <= 0)	1758	if (cell->darkness == 0)
1447	{	1759	{
1448	cell->darkness = -1;	1760	cell->darkness = 0;
1449		1761
1450	for (z = 0; z <= 2; z++)	1762	for (z = 0; z <= 2; z++)
1451	{	1763	{
1452	cell->face[z] = face[z];	1764	cell->face[z] = face[z];
1453		1765
…		…
1458	}	1770	}
1459	}	1771	}
1460	}	1772	}
1461	}	1773	}
1462		1774
1463	MODULE = CFClient PACKAGE = CFClient::MixChunk	1775	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1464		1776
1465	CFClient::MixChunk	1777	CFPlus::MixChunk
1466	new_from_file (SV class, char path)	1778	new_from_file (SV class, char path)
1467	CODE:	1779	CODE:
1468	RETVAL = Mix_LoadWAV (path);	1780	RETVAL = Mix_LoadWAV (path);
1469	OUTPUT:	1781	OUTPUT:
1470	RETVAL	1782	RETVAL
1471		1783
1472	void	1784	void
1473	DESTROY (CFClient::MixChunk self)	1785	DESTROY (CFPlus::MixChunk self)
1474	CODE:	1786	CODE:
1475	Mix_FreeChunk (self);	1787	Mix_FreeChunk (self);
1476		1788
1477	int	1789	int
1478	volume (CFClient::MixChunk self, int volume = -1)	1790	volume (CFPlus::MixChunk self, int volume = -1)
1479	CODE:	1791	CODE:
1480	RETVAL = Mix_VolumeChunk (self, volume);	1792	RETVAL = Mix_VolumeChunk (self, volume);
1481	OUTPUT:	1793	OUTPUT:
1482	RETVAL	1794	RETVAL
1483		1795
1484	int	1796	int
1485	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1797	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1486	CODE:	1798	CODE:
1487	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1799	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1488	OUTPUT:	1800	OUTPUT:
1489	RETVAL	1801	RETVAL
1490		1802
1491	MODULE = CFClient PACKAGE = CFClient::MixMusic	1803	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1492		1804
1493	int	1805	int
1494	volume (int volume = -1)	1806	volume (int volume = -1)
1495	CODE:	1807	CODE:
1496	RETVAL = Mix_VolumeMusic (volume);	1808	RETVAL = Mix_VolumeMusic (volume);
1497	OUTPUT:	1809	OUTPUT:
1498	RETVAL	1810	RETVAL
1499		1811
1500	CFClient::MixMusic	1812	CFPlus::MixMusic
1501	new_from_file (SV class, char path)	1813	new_from_file (SV class, char path)
1502	CODE:	1814	CODE:
1503	RETVAL = Mix_LoadMUS (path);	1815	RETVAL = Mix_LoadMUS (path);
1504	OUTPUT:	1816	OUTPUT:
1505	RETVAL	1817	RETVAL
1506		1818
1507	void	1819	void
1508	DESTROY (CFClient::MixMusic self)	1820	DESTROY (CFPlus::MixMusic self)
1509	CODE:	1821	CODE:
1510	Mix_FreeMusic (self);	1822	Mix_FreeMusic (self);
1511		1823
1512	int	1824	int
1513	play (CFClient::MixMusic self, int loops = -1)	1825	play (CFPlus::MixMusic self, int loops = -1)
1514	CODE:	1826	CODE:
1515	RETVAL = Mix_PlayMusic (self, loops);	1827	RETVAL = Mix_PlayMusic (self, loops);
1516	OUTPUT:	1828	OUTPUT:
1517	RETVAL	1829	RETVAL
1518		1830
1519	MODULE = CFClient PACKAGE = CFClient::OpenGL	1831	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1520		1832
1521	BOOT:	1833	BOOT:
1522	{	1834	{
1523	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1835	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1524	static const struct {	1836	static const struct {
1525	const char *name;	1837	const char *name;
1526	IV iv;	1838	IV iv;
1527	} *civ, const_iv[] = {	1839	} *civ, const_iv[] = {
1528	# define const_iv(name) { # name, (IV)name }	1840	# define const_iv(name) { # name, (IV)name }
…		…
1535	const_iv (GL_SCISSOR_TEST),	1847	const_iv (GL_SCISSOR_TEST),
1536	const_iv (GL_DEPTH_TEST),	1848	const_iv (GL_DEPTH_TEST),
1537	const_iv (GL_ALPHA_TEST),	1849	const_iv (GL_ALPHA_TEST),
1538	const_iv (GL_NORMALIZE),	1850	const_iv (GL_NORMALIZE),
1539	const_iv (GL_RESCALE_NORMAL),	1851	const_iv (GL_RESCALE_NORMAL),
		1852	const_iv (GL_FRONT),
		1853	const_iv (GL_BACK),
1540	const_iv (GL_AND),	1854	const_iv (GL_AND),
1541	const_iv (GL_ONE),	1855	const_iv (GL_ONE),
1542	const_iv (GL_ZERO),	1856	const_iv (GL_ZERO),
1543	const_iv (GL_SRC_ALPHA),	1857	const_iv (GL_SRC_ALPHA),
1544	const_iv (GL_SRC_ALPHA_SATURATE),	1858	const_iv (GL_DST_ALPHA),
1545	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1859	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1546	const_iv (GL_ONE_MINUS_DST_ALPHA),	1860	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1861	const_iv (GL_SRC_ALPHA_SATURATE),
1547	const_iv (GL_RGB),	1862	const_iv (GL_RGB),
1548	const_iv (GL_RGBA),	1863	const_iv (GL_RGBA),
		1864	const_iv (GL_RGBA4),
		1865	const_iv (GL_RGBA8),
		1866	const_iv (GL_RGB5_A1),
1549	const_iv (GL_UNSIGNED_BYTE),	1867	const_iv (GL_UNSIGNED_BYTE),
1550	const_iv (GL_UNSIGNED_SHORT),	1868	const_iv (GL_UNSIGNED_SHORT),
1551	const_iv (GL_UNSIGNED_INT),	1869	const_iv (GL_UNSIGNED_INT),
1552	const_iv (GL_ALPHA),	1870	const_iv (GL_ALPHA),
1553	const_iv (GL_INTENSITY),	1871	const_iv (GL_INTENSITY),
…		…
1585	const_iv (GL_SEPARABLE_2D),	1903	const_iv (GL_SEPARABLE_2D),
1586	const_iv (GL_CONVOLUTION_2D),	1904	const_iv (GL_CONVOLUTION_2D),
1587	const_iv (GL_CONVOLUTION_BORDER_MODE),	1905	const_iv (GL_CONVOLUTION_BORDER_MODE),
1588	const_iv (GL_CONSTANT_BORDER),	1906	const_iv (GL_CONSTANT_BORDER),
1589	const_iv (GL_LINES),	1907	const_iv (GL_LINES),
		1908	const_iv (GL_LINE_STRIP),
1590	const_iv (GL_LINE_LOOP),	1909	const_iv (GL_LINE_LOOP),
1591	const_iv (GL_QUADS),	1910	const_iv (GL_QUADS),
1592	const_iv (GL_QUAD_STRIP),	1911	const_iv (GL_QUAD_STRIP),
1593	const_iv (GL_TRIANGLES),	1912	const_iv (GL_TRIANGLES),
1594	const_iv (GL_TRIANGLE_STRIP),	1913	const_iv (GL_TRIANGLE_STRIP),
…		…
1627	OUTPUT:	1946	OUTPUT:
1628	RETVAL	1947	RETVAL
1629		1948
1630	int glGetError ()	1949	int glGetError ()
1631		1950
		1951	void glFinish ()
		1952
1632	void glClear (int mask)	1953	void glClear (int mask)
1633		1954
1634	void glClearColor (float r, float g, float b, float a = 1.0)	1955	void glClearColor (float r, float g, float b, float a = 1.0)
1635	PROTOTYPE: @	1956	PROTOTYPE: @
1636		1957
…		…
1642		1963
1643	void glHint (int target, int mode)	1964	void glHint (int target, int mode)
1644		1965
1645	void glBlendFunc (int sfactor, int dfactor)	1966	void glBlendFunc (int sfactor, int dfactor)
1646		1967
		1968	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1969	CODE:
		1970	gl_BlendFuncSeparate (sa, da, saa, daa);
		1971
1647	void glDepthMask (int flag)	1972	void glDepthMask (int flag)
1648		1973
1649	void glLogicOp (int opcode)	1974	void glLogicOp (int opcode)
1650		1975
1651	void glColorMask (int red, int green, int blue, int alpha)	1976	void glColorMask (int red, int green, int blue, int alpha)
…		…
1655	void glPushMatrix ()	1980	void glPushMatrix ()
1656		1981
1657	void glPopMatrix ()	1982	void glPopMatrix ()
1658		1983
1659	void glLoadIdentity ()	1984	void glLoadIdentity ()
		1985
		1986	void glDrawBuffer (int buffer)
		1987
		1988	void glReadBuffer (int buffer)
1660		1989
1661	# near_ and far_ are due to microsofts buggy "c" compiler	1990	# near_ and far_ are due to microsofts buggy "c" compiler
1662	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1991	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1663		1992
1664	# near_ and far_ are due to microsofts buggy "c" compiler	1993	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1684		2013
1685	void glEnd ()	2014	void glEnd ()
1686		2015
1687	void glColor (float r, float g, float b, float a = 1.0)	2016	void glColor (float r, float g, float b, float a = 1.0)
1688	PROTOTYPE: @	2017	PROTOTYPE: @
		2018	ALIAS:
		2019	glColor_premultiply = 1
1689	CODE:	2020	CODE:
		2021	if (ix)
		2022	{
		2023	r *= a;
		2024	g *= a;
		2025	b *= a;
		2026	}
1690	// microsoft visual "c" rounds instead of truncating...	2027	// microsoft visual "c" rounds instead of truncating...
1691	glColor4ub (MIN ((int)(r * 256.f), 255),	2028	glColor4f (r, g, b, a);
1692	MIN ((int)(g * 256.f), 255),
1693	MIN ((int)(b * 256.f), 255),
1694	MIN ((int)(a * 256.f), 255));
1695		2029
1696	void glInterleavedArrays (int format, int stride, char *data)	2030	void glInterleavedArrays (int format, int stride, char *data)
1697		2031
1698	void glDrawElements (int mode, int count, int type, char *indices)	2032	void glDrawElements (int mode, int count, int type, char *indices)
1699		2033
…		…
1722		2056
1723	void glBindTexture (int target, int name)	2057	void glBindTexture (int target, int name)
1724		2058
1725	void glConvolutionParameter (int target, int pname, float params)	2059	void glConvolutionParameter (int target, int pname, float params)
1726	CODE:	2060	CODE:
1727	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2061	if (gl.ConvolutionParameterf)
		2062	gl.ConvolutionParameterf (target, pname, params);
1728		2063
1729	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2064	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1730	CODE:	2065	CODE:
1731	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2066	if (gl.ConvolutionFilter2D)
1732	(target, internalformat, width, height, format, type, data));	2067	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1733		2068
1734	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2069	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1735	CODE:	2070	CODE:
1736	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2071	if (gl.SeparableFilter2D)
1737	(target, internalformat, width, height, format, type, row, column));	2072	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1738		2073
1739	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2074	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1740		2075
1741	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2076	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1742		2077
…		…
1775		2110
1776	void glEndList ()	2111	void glEndList ()
1777		2112
1778	void glCallList (int list)	2113	void glCallList (int list)
1779		2114
1780

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.101 by root, Sat Jun 3 21:57:23 2006 UTC vs. Revision 1.155 by root, Thu Sep 21 00:16:42 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.101 by root, Sat Jun 3 21:57:23 2006 UTC vs.
Revision 1.155 by root, Thu Sep 21 00:16:42 2006 UTC