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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.161 by root, Mon Oct 9 23:30:44 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>
		6	# include <wininet.h>
5	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
6	#endif	8	#endif
7		9
8	#include "EXTERN.h"	10	#include "EXTERN.h"
9	#include "perl.h"	11	#include "perl.h"
10	#include "XSUB.h"	12	#include "XSUB.h"
11		13
		14	#ifdef _WIN32
		15	# undef pipe
		16	#endif
		17
12	#include <math.h>	18	#include <math.h>
13	#include <string.h>	19	#include <string.h>
14	#include <stdio.h>	20	#include <stdio.h>
		21	#include <stdlib.h>
15		22
16	#include <SDL.h>	23	#include <SDL.h>
17	#include <SDL_endian.h>	24	#include <SDL_endian.h>
18	#include <SDL_image.h>	25	#include <SDL_image.h>
19	#include <SDL_mixer.h>	26	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	27	#include <SDL_opengl.h>
21		28
		29	#define PANGO_ENABLE_BACKEND
		30	#define G_DISABLE_CAST_CHECKS
		31
22	#include <glib/gmacros.h>	32	#include <glib/gmacros.h>
23		33
24	#include <pango/pango.h>	34	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		35
29	#ifndef _WIN32	36	#ifndef _WIN32
30	# include <sys/types.h>	37	# include <sys/types.h>
31	# include <sys/socket.h>	38	# include <sys/socket.h>
32	# include <netinet/in.h>	39	# include <netinet/in.h>
39	typedef signed char int8_t;	46	typedef signed char int8_t;
40	typedef signed short int16_t;	47	typedef signed short int16_t;
41	typedef signed int int32_t;	48	typedef signed int int32_t;
42	#endif	49	#endif
43		50
44	#include "glext.h"	51	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45		52
46	#define FOW_DARKNESS 32	53	#define FOW_DARKNESS 32
47		54
48	#define MAP_EXTEND_X 32	55	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	56	#define MAP_EXTEND_Y 512
50		57
51	#define MIN_FONT_HEIGHT 10	58	#define MIN_FONT_HEIGHT 10
		59
		60	#if 0
		61	# define PARACHUTE SDL_INIT_NOPARACHUTE
		62	#else
		63	# define PARACHUTE 0
		64	#endif
52		65
53	static struct	66	static struct
54	{	67	{
55	#define GL_FUNC(ptr,name) ptr name;	68	#define GL_FUNC(ptr,name) ptr name;
56	#include "glfunc.h"	69	#include "glfunc.h"
…		…
65	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	78	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	else	79	else
67	glBlendFunc (sa, da);	80	glBlendFunc (sa, da);
68	}	81	}
69		82
		83	#include "texcache.c"
		84
		85	#include "pango-font.c"
		86	#include "pango-fontmap.c"
		87	#include "pango-render.c"
		88
70	typedef Mix_Chunk *CFClient__MixChunk;	89	typedef Mix_Chunk *CFPlus__MixChunk;
71	typedef Mix_Music *CFClient__MixMusic;	90	typedef Mix_Music *CFPlus__MixMusic;
72		91
73	typedef PangoFontDescription *CFClient__Font;	92	typedef PangoFontDescription *CFPlus__Font;
		93
		94	static int
		95	shape_attr_p (PangoLayoutRun *run)
		96	{
		97	GSList *attrs = run->item->analysis.extra_attrs;
		98
		99	while (attrs)
		100	{
		101	PangoAttribute *attr = attrs->data;
		102
		103	if (attr->klass->type == PANGO_ATTR_SHAPE)
		104	return 1;
		105
		106	attrs = attrs->next;
		107	}
		108
		109	return 0;
		110	}
74		111
75	typedef struct cf_layout {	112	typedef struct cf_layout {
76	PangoLayout *pl; // either derived from a cairo or ft2 context	113	PangoLayout *pl;
77	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78	float r, g, b, a; // default color for rgba mode	114	float r, g, b, a; // default color for rgba mode
79	int base_height;	115	int base_height;
80	CFClient__Font font;	116	CFPlus__Font font;
81	} *CFClient__Layout;	117	} *CFPlus__Layout;
82		118
83	static CFClient__Font default_font;	119	static CFPlus__Font default_font;
84	static PangoContext ft2_context, cairo_context;	120	static PangoContext *opengl_context;
85	static PangoFontMap ft2_fontmap, cairo_fontmap;	121	static PangoFontMap *opengl_fontmap;
86		122
87	static void	123	static void
88	substitute_func (FcPattern *pattern, gpointer data)	124	substitute_func (FcPattern *pattern, gpointer data)
89	{	125	{
90	FcPatternAddBool (pattern, FC_HINTING , 1);	126	FcPatternAddBool (pattern, FC_HINTING, 1);
91	#ifdef _WIN32	127	#ifdef FC_HINT_STYLE
92	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	128	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
93	#else	129	#endif
94	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	130	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
95	#endif
96	}	131	}
97		132
98	static void	133	static void
99	layout_update_font (CFClient__Layout self)	134	layout_update_font (CFPlus__Layout self)
100	{	135	{
101	/* use a random scale factor to account for unknown descenders, 0.8 works	136	/* use a random scale factor to account for unknown descenders, 0.8 works
102	* reasonably well with bitstream vera	137	* reasonably well with bitstream vera
103	*/	138	*/
104	PangoFontDescription *font = self->font ? self->font : default_font;	139	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
108		143
109	pango_layout_set_font_description (self->pl, font);	144	pango_layout_set_font_description (self->pl, font);
110	}	145	}
111		146
112	static void	147	static void
113	layout_get_pixel_size (CFClient__Layout self, int w, int h)	148	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
114	{	149	{
		150	PangoRectangle rect;
		151
		152	// get_pixel_* wrongly rounds down
115	pango_layout_get_pixel_size (self->pl, w, h);	153	pango_layout_get_extents (self->pl, 0, &rect);
116		154
117	if (!w) w = 1;	155	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
118	if (!h) h = 1;	156	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
119		157
120	w = (w + 3) & ~3;	158	if (!rect.width) rect.width = 1;
		159	if (!rect.height) rect.height = 1;
		160
		161	*w = rect.width;
		162	*h = rect.height;
121	}	163	}
122		164
123	typedef uint16_t mapface;	165	typedef uint16_t mapface;
124		166
125	typedef struct {	167	typedef struct {
…		…
128	float s, t;	170	float s, t;
129	uint8_t r, g, b, a;	171	uint8_t r, g, b, a;
130	} maptex;	172	} maptex;
131		173
132	typedef struct {	174	typedef struct {
133	int16_t darkness;	175	uint32_t player;
134	mapface face[3];	176	mapface face[3];
		177	uint16_t darkness;
		178	uint8_t stat_width, stat_hp, flags;
135	} mapcell;	179	} mapcell;
136		180
137	typedef struct {	181	typedef struct {
138	int32_t c0, c1;	182	int32_t c0, c1;
139	mapcell *col;	183	mapcell *col;
…		…
148	int texs;	192	int texs;
149	maptex *tex;	193	maptex *tex;
150		194
151	int32_t rows;	195	int32_t rows;
152	maprow *row;	196	maprow *row;
153	} *CFClient__Map;	197	} *CFPlus__Map;
154		198
155	static char *	199	static char *
156	prepend (char *ptr, int sze, int inc)	200	prepend (char *ptr, int sze, int inc)
157	{	201	{
158	char *p;	202	char *p;
…		…
176		220
177	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	221	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
178	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	222	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
179		223
180	static maprow *	224	static maprow *
181	map_get_row (CFClient__Map self, int y)	225	map_get_row (CFPlus__Map self, int y)
182	{	226	{
183	if (0 > y)	227	if (0 > y)
184	{	228	{
185	int extend = - y + MAP_EXTEND_Y;	229	int extend = - y + MAP_EXTEND_Y;
186	Prepend (maprow, self->row, self->rows, extend);	230	Prepend (maprow, self->row, self->rows, extend);
…		…
224		268
225	return row->col + (x - row->c0);	269	return row->col + (x - row->c0);
226	}	270	}
227		271
228	static mapcell *	272	static mapcell *
229	map_get_cell (CFClient__Map self, int x, int y)	273	map_get_cell (CFPlus__Map self, int x, int y)
230	{	274	{
231	return row_get_cell (map_get_row (self, y), x);	275	return row_get_cell (map_get_row (self, y), x);
232	}	276	}
233		277
234	static void	278	static void
235	map_clear (CFClient__Map self)	279	map_clear (CFPlus__Map self)
236	{	280	{
237	int r;	281	int r;
238		282
239	for (r = 0; r < self->rows; r++)	283	for (r = 0; r < self->rows; r++)
240	Safefree (self->row[r].col);	284	Safefree (self->row[r].col);
…		…
248	self->row = 0;	292	self->row = 0;
249	self->rows = 0;	293	self->rows = 0;
250	}	294	}
251		295
252	static void	296	static void
253	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	297	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
254	{	298	{
255	int x, y;	299	int x, y;
256	maprow *row;	300	maprow *row;
		301	mapcell *cell;
257		302
258	for (y = y0; y < y0 + h; y++)	303	for (y = y0; y < y0 + h; y++)
259	if (y >= 0)	304	if (y >= 0)
260	{	305	{
261	if (y >= self->rows)	306	if (y >= self->rows)
…		…
267	if (x >= row->c0)	312	if (x >= row->c0)
268	{	313	{
269	if (x >= row->c1)	314	if (x >= row->c1)
270	break;	315	break;
271		316
272	row->col[x - row->c0].darkness = -1;	317	cell = row->col + x - row->c0;
		318
		319	cell->darkness = 0;
		320	cell->stat_hp = 0;
		321	cell->flags = 0;
		322	cell->player = 0;
273	}	323	}
274	}	324	}
275	}	325	}
276		326
277	static void	327	static void
…		…
298	ev.data2 = 0;	348	ev.data2 = 0;
299		349
300	SDL_PushEvent ((SDL_Event *)&ev);	350	SDL_PushEvent ((SDL_Event *)&ev);
301	}	351	}
302		352
		353	static unsigned int
		354	minpot (unsigned int n)
		355	{
		356	if (!n)
		357	return 0;
		358
		359	--n;
		360
		361	n \|= n >> 1;
		362	n \|= n >> 2;
		363	n \|= n >> 4;
		364	n \|= n >> 8;
		365	n \|= n >> 16;
		366
		367	return n + 1;
		368	}
		369
303	MODULE = CFClient PACKAGE = CFClient	370	MODULE = CFPlus PACKAGE = CFPlus
304		371
305	PROTOTYPES: ENABLE	372	PROTOTYPES: ENABLE
306		373
307	BOOT:	374	BOOT:
308	{	375	{
309	HV *stash = gv_stashpv ("CFClient", 1);	376	HV *stash = gv_stashpv ("CFPlus", 1);
310	static const struct {	377	static const struct {
311	const char *name;	378	const char *name;
312	IV iv;	379	IV iv;
313	} *civ, const_iv[] = {	380	} *civ, const_iv[] = {
314	# define const_iv(name) { # name, (IV)name }	381	# define const_iv(name) { # name, (IV)name }
…		…
415		482
416	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	483	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
417	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	484	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
418	}	485	}
419		486
		487	int
		488	in_destruct ()
		489	CODE:
		490	RETVAL = PL_main_cv == Nullcv;
		491	OUTPUT:
		492	RETVAL
		493
		494	NV floor (NV x)
		495
		496	NV ceil (NV x)
		497
420	void	498	void
421	pango_init ()	499	pango_init ()
422	CODE:	500	CODE:
423	{	501	{
424	// delayed, so it can pick up new fonts added by AddFontResourceEx
425	ft2_fontmap = pango_ft2_font_map_new ();	502	opengl_fontmap = pango_opengl_font_map_new ();
426	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	503	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
427	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	504	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
428
429	cairo_fontmap = pango_cairo_font_map_get_default ();
430	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
431	}	505	}
432		506
433	int	507	int
434	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	508	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
435		509
436	void	510	void
437	SDL_Quit ()	511	SDL_Quit ()
438		512
439	void	513	void
…		…
446	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	520	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
447	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	521	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
448	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	522	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
449		523
450	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	524	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	525	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
452		526
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	528	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
455	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	529	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
456	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	530	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
457		531
458	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	532	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		533	#if SDL_VERSION_ATLEAST(1,2,10)
		534	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		535	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		536	#endif
459		537
460	SDL_EnableUNICODE (1);	538	SDL_EnableUNICODE (1);
461	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	539	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
462		540
463	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	541	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
550	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	628	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
551	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	629	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
552	break;	630	break;
553	}	631	}
554		632
555	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	633	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
556	}	634	}
557	}	635	}
558		636
559	int	637	int
560	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	638	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
574	#ifndef _WIN32	652	#ifndef _WIN32
575	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	653	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
576	#endif	654	#endif
577		655
578	void	656	void
		657	win32_proxy_info ()
		658	PPCODE:
		659	{
		660	#ifdef _WIN32
		661	char buffer[2048];
		662	DWORD buflen;
		663
		664	EXTEND (SP, 3);
		665
		666	buflen = sizeof (buffer);
		667	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		668	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		669	{
		670	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		671
		672	buflen = sizeof (buffer);
		673	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		674	{
		675	PUSHs (newSVpv (buffer, 0));
		676
		677	buflen = sizeof (buffer);
		678	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		679	PUSHs (newSVpv (buffer, 0));
		680	}
		681	}
		682	#endif
		683	}
		684
		685	void
579	add_font (char *file)	686	add_font (char *file)
580	CODE:	687	CODE:
581	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	688	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
582	#ifdef _WIN32
583	// cairo... sigh... requires win2000
584	AddFontResourceEx (file, FR_PRIVATE, 0);
585	#endif
586		689
587	void	690	void
588	load_image_inline (SV *image_)	691	load_image_inline (SV *image_)
589	ALIAS:	692	ALIAS:
590	load_image_file = 1	693	load_image_file = 1
…		…
632		735
633	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	736	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
634		737
635	assert (surface2->pitch == surface2->w * 4);	738	assert (surface2->pitch == surface2->w * 4);
636		739
		740	SDL_LockSurface (surface2);
637	EXTEND (SP, 5);	741	EXTEND (SP, 6);
638	PUSHs (sv_2mortal (newSViv (surface2->w)));	742	PUSHs (sv_2mortal (newSViv (surface2->w)));
639	PUSHs (sv_2mortal (newSViv (surface2->h)));	743	PUSHs (sv_2mortal (newSViv (surface2->h)));
640	SDL_LockSurface (surface2);
641	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	744	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
642	SDL_UnlockSurface (surface2);
643	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	745	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
644	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	746	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
645	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	747	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		748	SDL_UnlockSurface (surface2);
646		749
647	SDL_FreeSurface (surface);	750	SDL_FreeSurface (surface);
648	SDL_FreeSurface (surface2);	751	SDL_FreeSurface (surface2);
649	}	752	}
650		753
…		…
686	CODE:	789	CODE:
687	fprintf (stderr, "FATAL: %s\n", message);	790	fprintf (stderr, "FATAL: %s\n", message);
688	#ifdef _WIN32	791	#ifdef _WIN32
689	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	792	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
690	#endif	793	#endif
691	exit (1);	794	_exit (1);
692		795
		796	void
		797	_exit (int retval = 0)
		798	CODE:
		799	#ifdef WIN32
		800	ExitThread (retval); // unclean, please beam me up
		801	#else
		802	_exit (retval);
		803	#endif
		804
693	MODULE = CFClient PACKAGE = CFClient::Font	805	MODULE = CFPlus PACKAGE = CFPlus::Font
694		806
695	CFClient::Font	807	CFPlus::Font
696	new_from_file (SV class, char path, int id = 0)	808	new_from_file (SV class, char path, int id = 0)
697	CODE:	809	CODE:
698	{	810	{
699	int count;	811	int count;
700	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	812	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
703	}	815	}
704	OUTPUT:	816	OUTPUT:
705	RETVAL	817	RETVAL
706		818
707	void	819	void
708	DESTROY (CFClient::Font self)	820	DESTROY (CFPlus::Font self)
709	CODE:	821	CODE:
710	pango_font_description_free (self);	822	pango_font_description_free (self);
711		823
712	void	824	void
713	make_default (CFClient::Font self)	825	make_default (CFPlus::Font self)
714	CODE:	826	CODE:
715	default_font = self;	827	default_font = self;
716		828
717	MODULE = CFClient PACKAGE = CFClient::Layout	829	MODULE = CFPlus PACKAGE = CFPlus::Layout
718		830
719	CFClient::Layout	831	void
720	new (SV *class, int rgba = 0)	832	reset_glyph_cache ()
721	CODE:	833	CODE:
722	#if _WIN32	834	tc_clear ();
723	//rgba = 0;//D makes text nicer, breaks TextView	835
724	#endif	836	CFPlus::Layout
725	rgba=1;//D	837	new (SV *class)
		838	CODE:
726	New (0, RETVAL, 1, struct cf_layout);	839	New (0, RETVAL, 1, struct cf_layout);
727		840
728	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	841	RETVAL->pl = pango_layout_new (opengl_context);
729	RETVAL->rgba = rgba;
730	RETVAL->r = 1.;	842	RETVAL->r = 1.;
731	RETVAL->g = 1.;	843	RETVAL->g = 1.;
732	RETVAL->b = 1.;	844	RETVAL->b = 1.;
733	RETVAL->a = 1.;	845	RETVAL->a = 1.;
734	RETVAL->base_height = MIN_FONT_HEIGHT;	846	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
738	layout_update_font (RETVAL);	850	layout_update_font (RETVAL);
739	OUTPUT:	851	OUTPUT:
740	RETVAL	852	RETVAL
741		853
742	void	854	void
743	DESTROY (CFClient::Layout self)	855	DESTROY (CFPlus::Layout self)
744	CODE:	856	CODE:
745	g_object_unref (self->pl);	857	g_object_unref (self->pl);
746	Safefree (self);	858	Safefree (self);
747		859
748	int
749	is_rgba (CFClient::Layout self)
750	CODE:
751	RETVAL = self->rgba;
752	OUTPUT:
753	RETVAL
754
755	void	860	void
756	set_text (CFClient::Layout self, SV *text_)	861	set_text (CFPlus::Layout self, SV *text_)
757	CODE:	862	CODE:
758	{	863	{
759	STRLEN textlen;	864	STRLEN textlen;
760	char *text = SvPVutf8 (text_, textlen);	865	char *text = SvPVutf8 (text_, textlen);
761		866
762	pango_layout_set_text (self->pl, text, textlen);	867	pango_layout_set_text (self->pl, text, textlen);
763	}	868	}
764		869
765	void	870	void
766	set_markup (CFClient::Layout self, SV *text_)	871	set_markup (CFPlus::Layout self, SV *text_)
767	CODE:	872	CODE:
768	{	873	{
769	STRLEN textlen;	874	STRLEN textlen;
770	char *text = SvPVutf8 (text_, textlen);	875	char *text = SvPVutf8 (text_, textlen);
771		876
772	pango_layout_set_markup (self->pl, text, textlen);	877	pango_layout_set_markup (self->pl, text, textlen);
773	}	878	}
774		879
		880	void
		881	set_shapes (CFPlus::Layout self, ...)
		882	CODE:
		883	{
		884	PangoAttrList *attrs = 0;
		885	const char *text = pango_layout_get_text (self->pl);
		886	const char *pos = text;
		887	int arg = 4;
		888
		889	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		890	{
		891	PangoRectangle inkrect, rect;
		892	PangoAttribute *attr;
		893
		894	int x = SvIV (ST (arg - 3));
		895	int y = SvIV (ST (arg - 2));
		896	int w = SvIV (ST (arg - 1));
		897	int h = SvIV (ST (arg ));
		898
		899	inkrect.x = 0;
		900	inkrect.y = 0;
		901	inkrect.width = 0;
		902	inkrect.height = 0;
		903
		904	rect.x = x * PANGO_SCALE;
		905	rect.y = y * PANGO_SCALE;
		906	rect.width = w * PANGO_SCALE;
		907	rect.height = h * PANGO_SCALE;
		908
		909	if (!attrs)
		910	attrs = pango_layout_get_attributes (self->pl);
		911
		912	attr = pango_attr_shape_new (&inkrect, &rect);
		913	attr->start_index = pos - text;
		914	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		915	pango_attr_list_insert (attrs, attr);
		916
		917	arg += 4;
		918	pos += sizeof (OBJ_STR) - 1;
		919	}
		920
		921	if (attrs)
		922	pango_layout_set_attributes (self->pl, attrs);
		923	}
		924
		925	void
		926	get_shapes (CFPlus::Layout self)
		927	PPCODE:
		928	{
		929	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		930
		931	do
		932	{
		933	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		934
		935	if (run && shape_attr_p (run))
		936	{
		937	PangoRectangle extents;
		938	pango_layout_iter_get_run_extents (iter, 0, &extents);
		939
		940	EXTEND (SP, 2);
		941	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		942	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		943	}
		944	}
		945	while (pango_layout_iter_next_run (iter));
		946
		947	pango_layout_iter_free (iter);
		948	}
		949
		950	int
		951	has_wrapped (CFPlus::Layout self)
		952	CODE:
		953	{
		954	int lines = 1;
		955	const char *text = pango_layout_get_text (self->pl);
		956
		957	while (*text)
		958	lines += *text++ == '\n';
		959
		960	RETVAL = lines < pango_layout_get_line_count (self->pl);
		961	}
		962	OUTPUT:
		963	RETVAL
		964
775	SV *	965	SV *
776	get_text (CFClient::Layout self)	966	get_text (CFPlus::Layout self)
777	CODE:	967	CODE:
778	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	968	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
779	SvUTF8_on (RETVAL);	969	sv_utf8_decode (RETVAL);
780	OUTPUT:	970	OUTPUT:
781	RETVAL	971	RETVAL
782		972
783	void	973	void
784	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	974	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
785	CODE:	975	CODE:
786	self->r = r;	976	self->r = r;
787	self->g = g;	977	self->g = g;
788	self->b = b;	978	self->b = b;
789	self->a = a;	979	self->a = a;
790		980
791	void	981	void
792	set_font (CFClient::Layout self, CFClient::Font font = 0)	982	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
793	CODE:	983	CODE:
794	if (self->font != font)	984	if (self->font != font)
795	{	985	{
796	self->font = font;	986	self->font = font;
797	layout_update_font (self);	987	layout_update_font (self);
798	}	988	}
799		989
800	void	990	void
801	set_height (CFClient::Layout self, int base_height)	991	set_height (CFPlus::Layout self, int base_height)
802	CODE:	992	CODE:
803	if (self->base_height != base_height)	993	if (self->base_height != base_height)
804	{	994	{
805	self->base_height = base_height;	995	self->base_height = base_height;
806	layout_update_font (self);	996	layout_update_font (self);
807	}	997	}
808		998
809	void	999	void
810	set_width (CFClient::Layout self, int max_width = -1)	1000	set_width (CFPlus::Layout self, int max_width = -1)
811	CODE:	1001	CODE:
812	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1002	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
813		1003
814	void	1004	void
815	set_indent (CFClient::Layout self, int indent)	1005	set_indent (CFPlus::Layout self, int indent)
816	CODE:	1006	CODE:
817	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1007	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
818		1008
819	void	1009	void
820	set_spacing (CFClient::Layout self, int spacing)	1010	set_spacing (CFPlus::Layout self, int spacing)
821	CODE:	1011	CODE:
822	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1012	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
823		1013
824	void	1014	void
825	set_ellipsise (CFClient::Layout self, int ellipsise)	1015	set_ellipsise (CFPlus::Layout self, int ellipsise)
826	CODE:	1016	CODE:
827	pango_layout_set_ellipsize (self->pl,	1017	pango_layout_set_ellipsize (self->pl,
828	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1018	ellipsise == 1 ? PANGO_ELLIPSIZE_START
829	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1019	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
830	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1020	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
831	: PANGO_ELLIPSIZE_NONE	1021	: PANGO_ELLIPSIZE_NONE
832	);	1022	);
833		1023
834	void	1024	void
835	set_single_paragraph_mode (CFClient::Layout self, int spm)	1025	set_single_paragraph_mode (CFPlus::Layout self, int spm)
836	CODE:	1026	CODE:
837	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1027	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
838		1028
839	void	1029	void
840	size (CFClient::Layout self)	1030	size (CFPlus::Layout self)
841	PPCODE:	1031	PPCODE:
842	{	1032	{
843	int w, h;	1033	int w, h;
844		1034
845	layout_get_pixel_size (self, &w, &h);	1035	layout_get_pixel_size (self, &w, &h);
…		…
848	PUSHs (sv_2mortal (newSViv (w)));	1038	PUSHs (sv_2mortal (newSViv (w)));
849	PUSHs (sv_2mortal (newSViv (h)));	1039	PUSHs (sv_2mortal (newSViv (h)));
850	}	1040	}
851		1041
852	int	1042	int
		1043	descent (CFPlus::Layout self)
		1044	CODE:
		1045	{
		1046	PangoRectangle rect;
		1047	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1048	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1049	RETVAL = PANGO_DESCENT (rect);
		1050	}
		1051	OUTPUT:
		1052	RETVAL
		1053
		1054	int
853	xy_to_index (CFClient::Layout self, int x, int y)	1055	xy_to_index (CFPlus::Layout self, int x, int y)
854	CODE:	1056	CODE:
855	{	1057	{
856	int index, trailing;	1058	int index, trailing;
857	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1059	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
858	RETVAL = index;	1060	RETVAL = index;
859	}	1061	}
860	OUTPUT:	1062	OUTPUT:
861	RETVAL	1063	RETVAL
862		1064
863	void	1065	void
864	cursor_pos (CFClient::Layout self, int index)	1066	cursor_pos (CFPlus::Layout self, int index)
865	PPCODE:	1067	PPCODE:
866	{	1068	{
867	PangoRectangle strong_pos;	1069	PangoRectangle strong_pos;
868	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1070	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
869		1071
…		…
872	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1074	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
873	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1075	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
874	}	1076	}
875		1077
876	void	1078	void
877	render (CFClient::Layout self)	1079	render (CFPlus::Layout self, float x, float y, int flags = 0)
878	PPCODE:	1080	PPCODE:
879	{	1081	pango_opengl_render_layout_subpixel (
880	SV *retval;	1082	self->pl,
881	int w, h;	1083	x * PANGO_SCALE, y * PANGO_SCALE,
		1084	self->r, self->g, self->b, self->a,
		1085	flags
		1086	);
882		1087
883	layout_get_pixel_size (self, &w, &h);	1088	MODULE = CFPlus PACKAGE = CFPlus::Texture
884		1089
885	if (self->rgba)	1090	void
		1091	pad2pot (SV data_, SV w_, SV *h_)
		1092	CODE:
		1093	{
		1094	int ow = SvIV (w_);
		1095	int oh = SvIV (h_);
		1096
		1097	if (ow && oh)
886	{	1098	{
887	cairo_surface_t *surface;	1099	int nw = minpot (ow);
888	cairo_t *cairo;	1100	int nh = minpot (oh);
889		1101
890	retval = newSV (w * h * 4);	1102	if (nw != ow \|\| nh != oh)
891	SvPOK_only (retval);
892	SvCUR_set (retval, w * h * 4);
893
894	memset (SvPVX (retval), 0, w * h * 4);
895
896	surface = cairo_image_surface_create_for_data (
897	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
898	cairo = cairo_create (surface);
899	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
900
901	pango_cairo_show_layout (cairo, self->pl);
902
903	cairo_destroy (cairo);
904	cairo_surface_destroy (surface);
905
906	// what a mess, and its premultiplied, too :(
907	{	1103	{
908	uint32_t p = (uint32_t )SvPVX (retval);	1104	if (SvOK (data_))
909	uint32_t e = p + w h;
910
911	while (p < e)
912	{	1105	{
913	uint32_t rgba = *p;	1106	STRLEN datalen;
914	rgba = (rgba >> 24) \| (rgba << 8);	1107	char *data = SvPVbyte (data_, datalen);
915	#if 0	1108	int bpp = datalen / (ow * oh);
916	#ifdef _WIN32	1109	SV result_ = sv_2mortal (newSV (nw nh * bpp));
917	{//D
918	uint8_t r = rgba >> 24;
919	uint8_t g = rgba >> 16;
920	uint8_t b = rgba >> 8;
921	uint8_t a = rgba >> 0;
922		1110
923	rgba = (rgba & 0xffffff00) \| a;	1111	SvPOK_only (result_);
		1112	SvCUR_set (result_, nw * nh * bpp);
		1113
		1114	memset (SvPVX (result_), 0, nw * nh * bpp);
		1115	while (oh--)
		1116	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1117
		1118	sv_setsv (data_, result_);
924	}	1119	}
925	#endif	1120
926	#endif	1121	sv_setiv (w_, nw);
927	rgba = SDL_SwapBE32 (rgba);	1122	sv_setiv (h_, nh);
928	*p++ = rgba;
929	}	1123	}
930	}
931
932	EXTEND (SP, 5);
933	PUSHs (sv_2mortal (newSViv (w)));
934	PUSHs (sv_2mortal (newSViv (h)));
935	PUSHs (sv_2mortal (retval));
936	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
937	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
938	}	1124	}
939	else
940	{
941	FT_Bitmap bitmap;
942
943	retval = newSV (w * h);
944	SvPOK_only (retval);
945	SvCUR_set (retval, w * h);
946
947	bitmap.rows = h;
948	bitmap.width = w;
949	bitmap.pitch = w;
950	bitmap.buffer = (unsigned char*)SvPVX (retval);
951	bitmap.num_grays = 256;
952	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
953
954	memset (bitmap.buffer, 0, w * h);
955
956	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
957
958	EXTEND (SP, 5);
959	PUSHs (sv_2mortal (newSViv (w)));
960	PUSHs (sv_2mortal (newSViv (h)));
961	PUSHs (sv_2mortal (retval));
962	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
963	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
964	}
965	}	1125	}
966		1126
967	MODULE = CFClient PACKAGE = CFClient::Texture
968
969	void	1127	void
970	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1128	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
971	PROTOTYPE: $$$;$$	1129	PROTOTYPE: $$$;$$
972	ALIAS:	1130	ALIAS:
973	draw_quad_alpha = 1	1131	draw_quad_alpha = 1
974	draw_quad_alpha_premultiplied = 2	1132	draw_quad_alpha_premultiplied = 2
975	CODE:	1133	CODE:
…		…
1013	glDisable (GL_ALPHA_TEST);	1171	glDisable (GL_ALPHA_TEST);
1014	glDisable (GL_BLEND);	1172	glDisable (GL_BLEND);
1015	}	1173	}
1016	}	1174	}
1017		1175
1018	MODULE = CFClient PACKAGE = CFClient::Map	1176	MODULE = CFPlus PACKAGE = CFPlus::Map
1019		1177
1020	CFClient::Map	1178	CFPlus::Map
1021	new (SV *class, int map_width, int map_height)	1179	new (SV *class, int map_width, int map_height)
1022	CODE:	1180	CODE:
1023	New (0, RETVAL, 1, struct map);	1181	New (0, RETVAL, 1, struct map);
1024	RETVAL->x = 0;	1182	RETVAL->x = 0;
1025	RETVAL->y = 0;	1183	RETVAL->y = 0;
…		…
1035	RETVAL->row = 0;	1193	RETVAL->row = 0;
1036	OUTPUT:	1194	OUTPUT:
1037	RETVAL	1195	RETVAL
1038		1196
1039	void	1197	void
1040	DESTROY (CFClient::Map self)	1198	DESTROY (CFPlus::Map self)
1041	CODE:	1199	CODE:
1042	{	1200	{
1043	map_clear (self);	1201	map_clear (self);
1044	Safefree (self->face);	1202	Safefree (self->face);
		1203	Safefree (self->tex);
1045	Safefree (self);	1204	Safefree (self);
1046	}	1205	}
1047		1206
1048	void	1207	void
1049	clear (CFClient::Map self)	1208	clear (CFPlus::Map self)
1050	CODE:	1209	CODE:
1051	map_clear (self);	1210	map_clear (self);
1052		1211
1053	void	1212	void
1054	set_face (CFClient::Map self, int face, int texid)	1213	set_face (CFPlus::Map self, int face, int texid)
1055	CODE:	1214	CODE:
1056	{	1215	{
1057	while (self->faces <= face)	1216	while (self->faces <= face)
1058	{	1217	{
1059	Append (mapface, self->face, self->faces, self->faces);	1218	Append (mapface, self->face, self->faces, self->faces);
…		…
1062		1221
1063	self->face [face] = texid;	1222	self->face [face] = texid;
1064	}	1223	}
1065		1224
1066	void	1225	void
1067	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)	1226	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)
1068	CODE:	1227	CODE:
1069	{	1228	{
1070	while (self->texs <= texid)	1229	while (self->texs <= texid)
1071	{	1230	{
1072	Append (maptex, self->tex, self->texs, self->texs);	1231	Append (maptex, self->tex, self->texs, self->texs);
…		…
1096	// from transparent color bleeding and ugly wrapping effects.	1255	// from transparent color bleeding and ugly wrapping effects.
1097	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1256	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1098	}	1257	}
1099		1258
1100	int	1259	int
1101	ox (CFClient::Map self)	1260	ox (CFPlus::Map self)
1102	ALIAS:	1261	ALIAS:
1103	oy = 1	1262	oy = 1
1104	x = 2	1263	x = 2
1105	y = 3	1264	y = 3
1106	w = 4	1265	w = 4
…		…
1117	}	1276	}
1118	OUTPUT:	1277	OUTPUT:
1119	RETVAL	1278	RETVAL
1120		1279
1121	void	1280	void
1122	scroll (CFClient::Map self, int dx, int dy)	1281	scroll (CFPlus::Map self, int dx, int dy)
1123	CODE:	1282	CODE:
1124	{	1283	{
1125	if (dx > 0)	1284	if (dx > 0)
1126	map_blank (self, self->x, self->y, dx - 1, self->h);	1285	map_blank (self, self->x, self->y, dx, self->h);
1127	else if (dx < 0)	1286	else if (dx < 0)
1128	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1287	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1129		1288
1130	if (dy > 0)	1289	if (dy > 0)
1131	map_blank (self, self->x, self->y, self->w, dy - 1);	1290	map_blank (self, self->x, self->y, self->w, dy);
1132	else if (dy < 0)	1291	else if (dy < 0)
1133	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1292	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1134		1293
1135	self->ox += dx; self->x += dx;	1294	self->ox += dx; self->x += dx;
1136	self->oy += dy; self->y += dy;	1295	self->oy += dy; self->y += dy;
1137		1296
1138	while (self->y < 0)	1297	while (self->y < 0)
…		…
1143	self->y += MAP_EXTEND_Y;	1302	self->y += MAP_EXTEND_Y;
1144	}	1303	}
1145	}	1304	}
1146		1305
1147	void	1306	void
1148	map1a_update (CFClient::Map self, SV *data_)	1307	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1149	CODE:	1308	CODE:
1150	{	1309	{
1151	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1310	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1152	uint8_t data_end = (uint8_t )SvEND (data_);	1311	uint8_t data_end = (uint8_t )SvEND (data_);
1153	mapcell *cell;	1312	mapcell *cell;
1154	int x, y, flags;	1313	int x, y, flags;
1155		1314
1156	while (data < data_end)	1315	while (data < data_end - 1)
1157	{	1316	{
1158	flags = (data [0] << 8) + data [1]; data += 2;	1317	flags = (data [0] << 8) + data [1]; data += 2;
1159		1318
1160	x = ((flags >> 10) & 63) + self->x;	1319	x = self->x + ((flags >> 10) & 63);
1161	y = ((flags >> 4) & 63) + self->y;	1320	y = self->y + ((flags >> 4) & 63);
1162		1321
1163	cell = map_get_cell (self, x, y);	1322	cell = map_get_cell (self, x, y);
1164		1323
1165	if (flags & 15)	1324	if (flags & 15)
1166	{	1325	{
1167	if (cell->darkness < 0)	1326	if (!cell->darkness)
1168	{	1327	{
		1328	memset (cell, 0, sizeof (*cell));
1169	cell->darkness = 0;	1329	cell->darkness = 256;
1170	cell->face [0] = 0;
1171	cell->face [1] = 0;
1172	cell->face [2] = 0;
1173	}	1330	}
1174		1331
1175	cell->darkness = flags & 8 ? *data++ : 255;
1176
1177	//TODO: don't trust server data to be in-range(!)	1332	//TODO: don't trust server data to be in-range(!)
		1333
		1334	if (flags & 8)
		1335	{
		1336	if (extmap)
		1337	{
		1338	uint8_t ext, cmd;
		1339
		1340	do
		1341	{
		1342	ext = *data++;
		1343	cmd = ext & 0x3f;
		1344
		1345	if (cmd < 4)
		1346	cell->darkness = 255 - ext * 64 + 1;
		1347	else if (cmd == 5) // health
		1348	{
		1349	cell->stat_width = 1;
		1350	cell->stat_hp = *data++;
		1351	}
		1352	else if (cmd == 6) // monster width
		1353	cell->stat_width = *data++ + 1;
		1354	else if (cmd == 0x47) // monster width
		1355	{
		1356	if (*data == 4)
		1357	; // decode player tag
		1358
		1359	data += *data + 1;
		1360	}
		1361	else if (cmd == 8) // cell flags
		1362	cell->flags = *data++;
		1363	else if (ext & 0x40) // unknown, multibyte => skip
		1364	data += *data + 1;
		1365	else
		1366	data++;
		1367	}
		1368	while (ext & 0x80);
		1369	}
		1370	else
		1371	cell->darkness = *data++ + 1;
		1372	}
1178		1373
1179	if (flags & 4)	1374	if (flags & 4)
1180	{	1375	{
1181	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1376	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1182	}	1377	}
…		…
1190	{	1385	{
1191	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1386	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1192	}	1387	}
1193	}	1388	}
1194	else	1389	else
1195	cell->darkness = -1;	1390	cell->darkness = 0;
1196	}	1391	}
1197	}	1392	}
1198		1393
1199	SV *	1394	SV *
1200	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1395	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1201	CODE:	1396	CODE:
1202	{	1397	{
1203	int x1, x;	1398	int x1, x;
1204	int y1, y;	1399	int y1, y;
1205	int z;	1400	int z;
…		…
1255	}	1450	}
1256	OUTPUT:	1451	OUTPUT:
1257	RETVAL	1452	RETVAL
1258		1453
1259	void	1454	void
1260	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1455	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1261	PPCODE:	1456	CODE:
1262	{	1457	{
1263	int vx, vy;	1458	int vx, vy;
1264	int x, y, z;	1459	int x, y, z;
1265	int last_name;	1460	int last_name;
1266	mapface face;	1461	mapface face;
1267	int sw4 = (sw + 3) & ~3;
1268	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1269	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1270		1462
1271	memset (darkness, 255, sw4 * sh);
1272	SvPOK_only (darkness_sv);
1273	SvCUR_set (darkness_sv, sw4 * sh);
1274
1275	vx = self->x + (self->w - sw) / 2 - shift_x;	1463	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1276	vy = self->y + (self->h - sh) / 2 - shift_y;	1464	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1277		1465
1278	/*	1466	/*
1279	int vx = self->vx = self->w >= sw	1467	int vx = self->vx = self->w >= sw
1280	? self->x + (self->w - sw) / 2	1468	? self->x + (self->w - sw) / 2
1281	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1469	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1285	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1473	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1286	*/	1474	*/
1287		1475
1288	glColor4ub (255, 255, 255, 255);	1476	glColor4ub (255, 255, 255, 255);
1289		1477
		1478	glEnable (GL_BLEND);
1290	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1479	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1291	glEnable (GL_BLEND);
1292	glEnable (GL_TEXTURE_2D);	1480	glEnable (GL_TEXTURE_2D);
1293	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1481	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1294		1482
1295	glBegin (GL_QUADS);	1483	glBegin (GL_QUADS);
1296		1484
…		…
1305	for (x = 0; x < sw; x++)	1493	for (x = 0; x < sw; x++)
1306	if (row->c0 <= x + vx && x + vx < row->c1)	1494	if (row->c0 <= x + vx && x + vx < row->c1)
1307	{	1495	{
1308	mapcell *cell = row->col + (x + vx - row->c0);	1496	mapcell *cell = row->col + (x + vx - row->c0);
1309		1497
1310	darkness[y * sw4 + x] = cell->darkness < 0
1311	? 255 - FOW_DARKNESS
1312	: 255 - cell->darkness;
1313
1314	face = cell->face [z];	1498	face = cell->face [z];
1315		1499
1316	if (face)	1500	if (face && face < self->texs)
1317	{	1501	{
1318	maptex tex = self->tex [face];	1502	maptex tex = self->tex [face];
1319
1320	int px = (x + 1) * 32 - tex.w;	1503	int px = (x + 1) * 32 - tex.w;
1321	int py = (y + 1) * 32 - tex.h;	1504	int py = (y + 1) * 32 - tex.h;
1322		1505
1323	if (last_name != tex.name)	1506	if (last_name != tex.name)
1324	{	1507	{
1325	glEnd ();	1508	glEnd ();
1326	last_name = tex.name;
1327	glBindTexture (GL_TEXTURE_2D, last_name);	1509	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1328	glBegin (GL_QUADS);	1510	glBegin (GL_QUADS);
1329	}	1511	}
1330		1512
1331	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1513	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1332	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1514	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1333	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1515	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1334	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1516	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1335	}	1517	}
		1518
		1519	if (cell->flags && z == 2)
		1520	{
		1521	if (cell->flags & 1)
		1522	{
		1523	maptex tex = self->tex [1];
		1524	int px = (x + 1) * 32 - tex.w + 2;
		1525	int py = (y + 1) * 32 - tex.h - 6;
		1526
		1527	glEnd ();
		1528	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1529	glBegin (GL_QUADS);
		1530
		1531	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1532	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1533	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1534	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1535	}
		1536	}
1336	}	1537	}
1337	}	1538	}
1338		1539
1339	glEnd ();	1540	glEnd ();
1340		1541
1341	glDisable (GL_TEXTURE_2D);	1542	glDisable (GL_TEXTURE_2D);
1342	glDisable (GL_BLEND);	1543	glDisable (GL_BLEND);
		1544
		1545	// top layer: overlays such as the health bar
		1546	for (y = 0; y < sh; y++)
		1547	if (0 <= y + vy && y + vy < self->rows)
		1548	{
		1549	maprow *row = self->row + (y + vy);
		1550
		1551	for (x = 0; x < sw; x++)
		1552	if (row->c0 <= x + vx && x + vx < row->c1)
		1553	{
		1554	mapcell *cell = row->col + (x + vx - row->c0);
		1555
		1556	int px = x * 32;
		1557	int py = y * 32;
		1558
		1559	if (cell->stat_hp)
		1560	{
		1561	int width = cell->stat_width * 32;
		1562	int thick = sh / 28 + 1 + cell->stat_width;
		1563
		1564	glColor3ub (0, 0, 0);
		1565	glRectf (px + 1, py - thick - 2,
		1566	px + width - 1, py);
		1567
		1568	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1569	glRectf (px + 2,
		1570	py - thick - 1,
		1571	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1572	}
		1573	}
		1574	}
		1575	}
		1576
		1577	void
		1578	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1579	CODE:
		1580	{
		1581	static float color[16][3] = {
		1582	{ 0.00F, 0.00F, 0.00F },
		1583	{ 1.00F, 1.00F, 1.00F },
		1584	{ 0.00F, 0.00F, 0.55F },
		1585	{ 1.00F, 0.00F, 0.00F },
		1586
		1587	{ 1.00F, 0.54F, 0.00F },
		1588	{ 0.11F, 0.56F, 1.00F },
		1589	{ 0.93F, 0.46F, 0.00F },
		1590	{ 0.18F, 0.54F, 0.34F },
		1591
		1592	{ 0.56F, 0.73F, 0.56F },
		1593	{ 0.80F, 0.80F, 0.80F },
		1594	{ 0.55F, 0.41F, 0.13F },
		1595	{ 0.99F, 0.77F, 0.26F },
		1596
		1597	{ 0.74F, 0.65F, 0.41F },
		1598
		1599	{ 0.00F, 1.00F, 1.00F },
		1600	{ 1.00F, 0.00F, 1.00F },
		1601	{ 1.00F, 1.00F, 0.00F },
		1602	};
		1603
		1604	int x, y;
		1605
		1606	glEnable (GL_TEXTURE_2D);
		1607	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1608	glEnable (GL_BLEND);
		1609	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1610	glBegin (GL_QUADS);
		1611
		1612	for (y = 0; y < h; y++)
		1613	for (x = 0; x < w; x++)
		1614	{
		1615	unsigned char m = data [x + y * w];
		1616
		1617	if (m)
		1618	{
		1619	float *c = color [m & 15];
		1620
		1621	float tx1 = m & 0x40 ? 0.5 : 0.;
		1622	float tx2 = tx1 + 0.5;
		1623
		1624	glColor4f (c[0], c[1], c[2], 0.75);
		1625	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1626	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1627	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1628	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1629	}
		1630	}
		1631
		1632	glEnd ();
		1633	glDisable (GL_BLEND);
		1634	glDisable (GL_TEXTURE_2D);
		1635	}
		1636
		1637	void
		1638	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1639	PPCODE:
		1640	{
		1641	int vx, vy;
		1642	int x, y;
		1643	int sw4 = (sw + 3) & ~3;
		1644	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1645	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1646
		1647	memset (darkness, 255, sw4 * sh);
		1648	SvPOK_only (darkness_sv);
		1649	SvCUR_set (darkness_sv, sw4 * sh);
		1650
		1651	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1652	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1653
		1654	for (y = 0; y < sh; y++)
		1655	if (0 <= y + vy && y + vy < self->rows)
		1656	{
		1657	maprow *row = self->row + (y + vy);
		1658
		1659	for (x = 0; x < sw; x++)
		1660	if (row->c0 <= x + vx && x + vx < row->c1)
		1661	{
		1662	mapcell *cell = row->col + (x + vx - row->c0);
		1663
		1664	darkness[y * sw4 + x] = cell->darkness
		1665	? 255 - (cell->darkness - 1)
		1666	: 255 - FOW_DARKNESS;
		1667	}
		1668	}
1343		1669
1344	EXTEND (SP, 3);	1670	EXTEND (SP, 3);
1345	PUSHs (sv_2mortal (newSViv (sw4)));	1671	PUSHs (sv_2mortal (newSViv (sw4)));
1346	PUSHs (sv_2mortal (newSViv (sh)));	1672	PUSHs (sv_2mortal (newSViv (sh)));
1347	PUSHs (darkness_sv);	1673	PUSHs (darkness_sv);
1348	}	1674	}
1349		1675
1350	SV *	1676	SV *
1351	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1677	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1352	CODE:	1678	CODE:
1353	{	1679	{
1354	int x, y, x1, y1;	1680	int x, y, x1, y1;
1355	SV data_sv = newSV (w h * 7 + 5);	1681	SV data_sv = newSV (w h * 7 + 5);
1356	uint8_t data = (uint8_t )SvPVX (data_sv);	1682	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1418	}	1744	}
1419	OUTPUT:	1745	OUTPUT:
1420	RETVAL	1746	RETVAL
1421		1747
1422	void	1748	void
1423	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1749	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1424	PPCODE:	1750	PPCODE:
1425	{	1751	{
1426	int x, y, z;	1752	int x, y, z;
1427	int w, h;	1753	int w, h;
1428	int x1, y1;	1754	int x1, y1;
…		…
1460		1786
1461	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1787	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1462	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1788	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1463	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1789	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1464		1790
1465	if (cell->darkness <= 0)	1791	if (cell->darkness == 0)
1466	{	1792	{
1467	cell->darkness = -1;	1793	cell->darkness = 0;
1468		1794
1469	for (z = 0; z <= 2; z++)	1795	for (z = 0; z <= 2; z++)
1470	{	1796	{
1471	cell->face[z] = face[z];	1797	cell->face[z] = face[z];
1472		1798
…		…
1477	}	1803	}
1478	}	1804	}
1479	}	1805	}
1480	}	1806	}
1481		1807
1482	MODULE = CFClient PACKAGE = CFClient::MixChunk	1808	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1483		1809
1484	CFClient::MixChunk	1810	CFPlus::MixChunk
1485	new_from_file (SV class, char path)	1811	new_from_file (SV class, char path)
1486	CODE:	1812	CODE:
1487	RETVAL = Mix_LoadWAV (path);	1813	RETVAL = Mix_LoadWAV (path);
1488	OUTPUT:	1814	OUTPUT:
1489	RETVAL	1815	RETVAL
1490		1816
1491	void	1817	void
1492	DESTROY (CFClient::MixChunk self)	1818	DESTROY (CFPlus::MixChunk self)
1493	CODE:	1819	CODE:
1494	Mix_FreeChunk (self);	1820	Mix_FreeChunk (self);
1495		1821
1496	int	1822	int
1497	volume (CFClient::MixChunk self, int volume = -1)	1823	volume (CFPlus::MixChunk self, int volume = -1)
1498	CODE:	1824	CODE:
1499	RETVAL = Mix_VolumeChunk (self, volume);	1825	RETVAL = Mix_VolumeChunk (self, volume);
1500	OUTPUT:	1826	OUTPUT:
1501	RETVAL	1827	RETVAL
1502		1828
1503	int	1829	int
1504	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1830	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1505	CODE:	1831	CODE:
1506	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1832	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1507	OUTPUT:	1833	OUTPUT:
1508	RETVAL	1834	RETVAL
1509		1835
1510	MODULE = CFClient PACKAGE = CFClient::MixMusic	1836	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1511		1837
1512	int	1838	int
1513	volume (int volume = -1)	1839	volume (int volume = -1)
1514	CODE:	1840	CODE:
1515	RETVAL = Mix_VolumeMusic (volume);	1841	RETVAL = Mix_VolumeMusic (volume);
1516	OUTPUT:	1842	OUTPUT:
1517	RETVAL	1843	RETVAL
1518		1844
1519	CFClient::MixMusic	1845	CFPlus::MixMusic
1520	new_from_file (SV class, char path)	1846	new_from_file (SV class, char path)
1521	CODE:	1847	CODE:
1522	RETVAL = Mix_LoadMUS (path);	1848	RETVAL = Mix_LoadMUS (path);
1523	OUTPUT:	1849	OUTPUT:
1524	RETVAL	1850	RETVAL
1525		1851
1526	void	1852	void
1527	DESTROY (CFClient::MixMusic self)	1853	DESTROY (CFPlus::MixMusic self)
1528	CODE:	1854	CODE:
1529	Mix_FreeMusic (self);	1855	Mix_FreeMusic (self);
1530		1856
1531	int	1857	int
1532	play (CFClient::MixMusic self, int loops = -1)	1858	play (CFPlus::MixMusic self, int loops = -1)
1533	CODE:	1859	CODE:
1534	RETVAL = Mix_PlayMusic (self, loops);	1860	RETVAL = Mix_PlayMusic (self, loops);
1535	OUTPUT:	1861	OUTPUT:
1536	RETVAL	1862	RETVAL
1537		1863
1538	MODULE = CFClient PACKAGE = CFClient::OpenGL	1864	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1539		1865
1540	BOOT:	1866	BOOT:
1541	{	1867	{
1542	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1868	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1543	static const struct {	1869	static const struct {
1544	const char *name;	1870	const char *name;
1545	IV iv;	1871	IV iv;
1546	} *civ, const_iv[] = {	1872	} *civ, const_iv[] = {
1547	# define const_iv(name) { # name, (IV)name }	1873	# define const_iv(name) { # name, (IV)name }
…		…
1554	const_iv (GL_SCISSOR_TEST),	1880	const_iv (GL_SCISSOR_TEST),
1555	const_iv (GL_DEPTH_TEST),	1881	const_iv (GL_DEPTH_TEST),
1556	const_iv (GL_ALPHA_TEST),	1882	const_iv (GL_ALPHA_TEST),
1557	const_iv (GL_NORMALIZE),	1883	const_iv (GL_NORMALIZE),
1558	const_iv (GL_RESCALE_NORMAL),	1884	const_iv (GL_RESCALE_NORMAL),
		1885	const_iv (GL_FRONT),
		1886	const_iv (GL_BACK),
1559	const_iv (GL_AND),	1887	const_iv (GL_AND),
1560	const_iv (GL_ONE),	1888	const_iv (GL_ONE),
1561	const_iv (GL_ZERO),	1889	const_iv (GL_ZERO),
1562	const_iv (GL_SRC_ALPHA),	1890	const_iv (GL_SRC_ALPHA),
1563	const_iv (GL_DST_ALPHA),	1891	const_iv (GL_DST_ALPHA),
1564	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1892	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1565	const_iv (GL_ONE_MINUS_DST_ALPHA),	1893	const_iv (GL_ONE_MINUS_DST_ALPHA),
1566	const_iv (GL_SRC_ALPHA_SATURATE),	1894	const_iv (GL_SRC_ALPHA_SATURATE),
1567	const_iv (GL_RGB),	1895	const_iv (GL_RGB),
1568	const_iv (GL_RGBA),	1896	const_iv (GL_RGBA),
		1897	const_iv (GL_RGBA4),
		1898	const_iv (GL_RGBA8),
		1899	const_iv (GL_RGB5_A1),
1569	const_iv (GL_UNSIGNED_BYTE),	1900	const_iv (GL_UNSIGNED_BYTE),
1570	const_iv (GL_UNSIGNED_SHORT),	1901	const_iv (GL_UNSIGNED_SHORT),
1571	const_iv (GL_UNSIGNED_INT),	1902	const_iv (GL_UNSIGNED_INT),
1572	const_iv (GL_ALPHA),	1903	const_iv (GL_ALPHA),
1573	const_iv (GL_INTENSITY),	1904	const_iv (GL_INTENSITY),
…		…
1605	const_iv (GL_SEPARABLE_2D),	1936	const_iv (GL_SEPARABLE_2D),
1606	const_iv (GL_CONVOLUTION_2D),	1937	const_iv (GL_CONVOLUTION_2D),
1607	const_iv (GL_CONVOLUTION_BORDER_MODE),	1938	const_iv (GL_CONVOLUTION_BORDER_MODE),
1608	const_iv (GL_CONSTANT_BORDER),	1939	const_iv (GL_CONSTANT_BORDER),
1609	const_iv (GL_LINES),	1940	const_iv (GL_LINES),
		1941	const_iv (GL_LINE_STRIP),
1610	const_iv (GL_LINE_LOOP),	1942	const_iv (GL_LINE_LOOP),
1611	const_iv (GL_QUADS),	1943	const_iv (GL_QUADS),
1612	const_iv (GL_QUAD_STRIP),	1944	const_iv (GL_QUAD_STRIP),
1613	const_iv (GL_TRIANGLES),	1945	const_iv (GL_TRIANGLES),
1614	const_iv (GL_TRIANGLE_STRIP),	1946	const_iv (GL_TRIANGLE_STRIP),
…		…
1647	OUTPUT:	1979	OUTPUT:
1648	RETVAL	1980	RETVAL
1649		1981
1650	int glGetError ()	1982	int glGetError ()
1651		1983
		1984	void glFinish ()
		1985
1652	void glClear (int mask)	1986	void glClear (int mask)
1653		1987
1654	void glClearColor (float r, float g, float b, float a = 1.0)	1988	void glClearColor (float r, float g, float b, float a = 1.0)
1655	PROTOTYPE: @	1989	PROTOTYPE: @
1656		1990
…		…
1679	void glPushMatrix ()	2013	void glPushMatrix ()
1680		2014
1681	void glPopMatrix ()	2015	void glPopMatrix ()
1682		2016
1683	void glLoadIdentity ()	2017	void glLoadIdentity ()
		2018
		2019	void glDrawBuffer (int buffer)
		2020
		2021	void glReadBuffer (int buffer)
1684		2022
1685	# near_ and far_ are due to microsofts buggy "c" compiler	2023	# near_ and far_ are due to microsofts buggy "c" compiler
1686	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2024	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1687		2025
1688	# near_ and far_ are due to microsofts buggy "c" compiler	2026	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1718	r *= a;	2056	r *= a;
1719	g *= a;	2057	g *= a;
1720	b *= a;	2058	b *= a;
1721	}	2059	}
1722	// microsoft visual "c" rounds instead of truncating...	2060	// microsoft visual "c" rounds instead of truncating...
1723	glColor4ub (MIN ((int)(r * 256.f), 255),	2061	glColor4f (r, g, b, a);
1724	MIN ((int)(g * 256.f), 255),
1725	MIN ((int)(b * 256.f), 255),
1726	MIN ((int)(a * 256.f), 255));
1727		2062
1728	void glInterleavedArrays (int format, int stride, char *data)	2063	void glInterleavedArrays (int format, int stride, char *data)
1729		2064
1730	void glDrawElements (int mode, int count, int type, char *indices)	2065	void glDrawElements (int mode, int count, int type, char *indices)
1731		2066
…		…
1808		2143
1809	void glEndList ()	2144	void glEndList ()
1810		2145
1811	void glCallList (int list)	2146	void glCallList (int list)
1812		2147
1813

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC vs. Revision 1.161 by root, Mon Oct 9 23:30:44 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.161 by root, Mon Oct 9 23:30:44 2006 UTC