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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.111 by root, Mon Jun 12 13:26:14 2006 UTC vs. Revision 1.157 by root, Sun Oct 1 14:48:50 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.111 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.157 by root, Sun Oct 1 14:48:50 2006 UTC