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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.105 by root, Mon Jun 5 03:33:09 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);
		127	#ifdef FC_HINT_STYLE
91	//FcPatternAddBool (pattern, FC_AUTOHINT, 1);	128	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		129	#endif
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	130	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	}	131	}
94		132
95	static void	133	static void
96	layout_update_font (CFClient__Layout self)	134	layout_update_font (CFPlus__Layout self)
97	{	135	{
98	/* 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
99	* reasonably well with bitstream vera	137	* reasonably well with bitstream vera
100	*/	138	*/
101	PangoFontDescription *font = self->font ? self->font : default_font;	139	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
105		143
106	pango_layout_set_font_description (self->pl, font);	144	pango_layout_set_font_description (self->pl, font);
107	}	145	}
108		146
109	static void	147	static void
110	layout_get_pixel_size (CFClient__Layout self, int w, int h)	148	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
111	{	149	{
		150	PangoRectangle rect;
		151
		152	// get_pixel_* wrongly rounds down
112	pango_layout_get_pixel_size (self->pl, w, h);	153	pango_layout_get_extents (self->pl, 0, &rect);
113		154
114	if (!w) w = 1;	155	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
115	if (!h) h = 1;	156	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
116		157
117	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;
118	}	163	}
119		164
120	typedef uint16_t mapface;	165	typedef uint16_t mapface;
121		166
122	typedef struct {	167	typedef struct {
…		…
125	float s, t;	170	float s, t;
126	uint8_t r, g, b, a;	171	uint8_t r, g, b, a;
127	} maptex;	172	} maptex;
128		173
129	typedef struct {	174	typedef struct {
130	int16_t darkness;	175	uint32_t player;
131	mapface face[3];	176	mapface face[3];
		177	uint16_t darkness;
		178	uint8_t stat_width, stat_hp, flags;
132	} mapcell;	179	} mapcell;
133		180
134	typedef struct {	181	typedef struct {
135	int32_t c0, c1;	182	int32_t c0, c1;
136	mapcell *col;	183	mapcell *col;
…		…
145	int texs;	192	int texs;
146	maptex *tex;	193	maptex *tex;
147		194
148	int32_t rows;	195	int32_t rows;
149	maprow *row;	196	maprow *row;
150	} *CFClient__Map;	197	} *CFPlus__Map;
151		198
152	static char *	199	static char *
153	prepend (char *ptr, int sze, int inc)	200	prepend (char *ptr, int sze, int inc)
154	{	201	{
155	char *p;	202	char *p;
…		…
173		220
174	#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))
175	#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))
176		223
177	static maprow *	224	static maprow *
178	map_get_row (CFClient__Map self, int y)	225	map_get_row (CFPlus__Map self, int y)
179	{	226	{
180	if (0 > y)	227	if (0 > y)
181	{	228	{
182	int extend = - y + MAP_EXTEND_Y;	229	int extend = - y + MAP_EXTEND_Y;
183	Prepend (maprow, self->row, self->rows, extend);	230	Prepend (maprow, self->row, self->rows, extend);
…		…
221		268
222	return row->col + (x - row->c0);	269	return row->col + (x - row->c0);
223	}	270	}
224		271
225	static mapcell *	272	static mapcell *
226	map_get_cell (CFClient__Map self, int x, int y)	273	map_get_cell (CFPlus__Map self, int x, int y)
227	{	274	{
228	return row_get_cell (map_get_row (self, y), x);	275	return row_get_cell (map_get_row (self, y), x);
229	}	276	}
230		277
231	static void	278	static void
232	map_clear (CFClient__Map self)	279	map_clear (CFPlus__Map self)
233	{	280	{
234	int r;	281	int r;
235		282
236	for (r = 0; r < self->rows; r++)	283	for (r = 0; r < self->rows; r++)
237	Safefree (self->row[r].col);	284	Safefree (self->row[r].col);
…		…
245	self->row = 0;	292	self->row = 0;
246	self->rows = 0;	293	self->rows = 0;
247	}	294	}
248		295
249	static void	296	static void
250	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)
251	{	298	{
252	int x, y;	299	int x, y;
253	maprow *row;	300	maprow *row;
		301	mapcell *cell;
254		302
255	for (y = y0; y < y0 + h; y++)	303	for (y = y0; y < y0 + h; y++)
256	if (y >= 0)	304	if (y >= 0)
257	{	305	{
258	if (y >= self->rows)	306	if (y >= self->rows)
…		…
264	if (x >= row->c0)	312	if (x >= row->c0)
265	{	313	{
266	if (x >= row->c1)	314	if (x >= row->c1)
267	break;	315	break;
268		316
269	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;
270	}	323	}
271	}	324	}
272	}	325	}
273		326
274	static void	327	static void
…		…
295	ev.data2 = 0;	348	ev.data2 = 0;
296		349
297	SDL_PushEvent ((SDL_Event *)&ev);	350	SDL_PushEvent ((SDL_Event *)&ev);
298	}	351	}
299		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
300	MODULE = CFClient PACKAGE = CFClient	370	MODULE = CFPlus PACKAGE = CFPlus
301		371
302	PROTOTYPES: ENABLE	372	PROTOTYPES: ENABLE
303		373
304	BOOT:	374	BOOT:
305	{	375	{
306	HV *stash = gv_stashpv ("CFClient", 1);	376	HV *stash = gv_stashpv ("CFPlus", 1);
307	static const struct {	377	static const struct {
308	const char *name;	378	const char *name;
309	IV iv;	379	IV iv;
310	} *civ, const_iv[] = {	380	} *civ, const_iv[] = {
311	# define const_iv(name) { # name, (IV)name }	381	# define const_iv(name) { # name, (IV)name }
…		…
412		482
413	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; )
414	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	484	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
415	}	485	}
416		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
417	void	498	void
418	pango_init ()	499	pango_init ()
419	CODE:	500	CODE:
420	// delayed, so it can pick up new fonts added by AddFontResourceEx
421	{	501	{
422	{
423	ft2_fontmap = pango_ft2_font_map_new ();	502	opengl_fontmap = pango_opengl_font_map_new ();
424	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);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	504	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426	}
427
428	{
429	cairo_font_options_t *fopt = cairo_font_options_create ();
430	cairo_fontmap = pango_cairo_font_map_get_default ();
431	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
432	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
433	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
434	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
435	pango_cairo_context_set_font_options (cairo_context, fopt);
436	cairo_font_options_destroy (fopt);
437	}
438	}	505	}
439		506
440	int	507	int
441	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	508	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
442		509
443	void	510	void
444	SDL_Quit ()	511	SDL_Quit ()
445		512
446	void	513	void
…		…
453	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	520	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
454	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	521	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
455	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	522	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
456		523
457	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	524	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
458	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	525	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
459		526
460	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
461	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	528	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
462	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	529	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
463	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	530	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
464		531
465	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
466		537
467	SDL_EnableUNICODE (1);	538	SDL_EnableUNICODE (1);
468	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	539	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
469		540
470	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	541	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
557	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	628	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
558	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	629	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
559	break;	630	break;
560	}	631	}
561		632
562	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	633	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
563	}	634	}
564	}	635	}
565		636
566	int	637	int
567	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)
…		…
581	#ifndef _WIN32	652	#ifndef _WIN32
582	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	653	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
583	#endif	654	#endif
584		655
585	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
586	add_font (char *file)	686	add_font (char *file)
587	CODE:	687	CODE:
588	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	688	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
589	#ifdef _WIN32
590	// cairo... sigh... requires win2000
591	AddFontResourceEx (file, FR_PRIVATE, 0);
592	#endif
593		689
594	void	690	void
595	load_image_inline (SV *image_)	691	load_image_inline (SV *image_)
596	ALIAS:	692	ALIAS:
597	load_image_file = 1	693	load_image_file = 1
…		…
639		735
640	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	736	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
641		737
642	assert (surface2->pitch == surface2->w * 4);	738	assert (surface2->pitch == surface2->w * 4);
643		739
		740	SDL_LockSurface (surface2);
644	EXTEND (SP, 5);	741	EXTEND (SP, 6);
645	PUSHs (sv_2mortal (newSViv (surface2->w)));	742	PUSHs (sv_2mortal (newSViv (surface2->w)));
646	PUSHs (sv_2mortal (newSViv (surface2->h)));	743	PUSHs (sv_2mortal (newSViv (surface2->h)));
647	SDL_LockSurface (surface2);
648	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	744	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
649	SDL_UnlockSurface (surface2);
650	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)));
651	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	746	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
652	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	747	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		748	SDL_UnlockSurface (surface2);
653		749
654	SDL_FreeSurface (surface);	750	SDL_FreeSurface (surface);
655	SDL_FreeSurface (surface2);	751	SDL_FreeSurface (surface2);
656	}	752	}
657		753
…		…
693	CODE:	789	CODE:
694	fprintf (stderr, "FATAL: %s\n", message);	790	fprintf (stderr, "FATAL: %s\n", message);
695	#ifdef _WIN32	791	#ifdef _WIN32
696	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	792	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
697	#endif	793	#endif
698	exit (1);	794	_exit (1);
699		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
700	MODULE = CFClient PACKAGE = CFClient::Font	805	MODULE = CFPlus PACKAGE = CFPlus::Font
701		806
702	CFClient::Font	807	CFPlus::Font
703	new_from_file (SV class, char path, int id = 0)	808	new_from_file (SV class, char path, int id = 0)
704	CODE:	809	CODE:
705	{	810	{
706	int count;	811	int count;
707	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	812	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
710	}	815	}
711	OUTPUT:	816	OUTPUT:
712	RETVAL	817	RETVAL
713		818
714	void	819	void
715	DESTROY (CFClient::Font self)	820	DESTROY (CFPlus::Font self)
716	CODE:	821	CODE:
717	pango_font_description_free (self);	822	pango_font_description_free (self);
718		823
719	void	824	void
720	make_default (CFClient::Font self)	825	make_default (CFPlus::Font self)
721	CODE:	826	CODE:
722	default_font = self;	827	default_font = self;
723		828
724	MODULE = CFClient PACKAGE = CFClient::Layout	829	MODULE = CFPlus PACKAGE = CFPlus::Layout
725		830
726	CFClient::Layout	831	void
727	new (SV *class, int rgba = 0)	832	reset_glyph_cache ()
728	CODE:	833	CODE:
729	#if _WIN32	834	tc_clear ();
730	//rgba = 0;//D makes text nicer, breaks TextView	835
731	#endif	836	CFPlus::Layout
732	rgba=1;//D	837	new (SV *class)
		838	CODE:
733	New (0, RETVAL, 1, struct cf_layout);	839	New (0, RETVAL, 1, struct cf_layout);
734		840
735	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	841	RETVAL->pl = pango_layout_new (opengl_context);
736	RETVAL->rgba = rgba;
737	RETVAL->r = 1.;	842	RETVAL->r = 1.;
738	RETVAL->g = 1.;	843	RETVAL->g = 1.;
739	RETVAL->b = 1.;	844	RETVAL->b = 1.;
740	RETVAL->a = 1.;	845	RETVAL->a = 1.;
741	RETVAL->base_height = MIN_FONT_HEIGHT;	846	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
745	layout_update_font (RETVAL);	850	layout_update_font (RETVAL);
746	OUTPUT:	851	OUTPUT:
747	RETVAL	852	RETVAL
748		853
749	void	854	void
750	DESTROY (CFClient::Layout self)	855	DESTROY (CFPlus::Layout self)
751	CODE:	856	CODE:
752	g_object_unref (self->pl);	857	g_object_unref (self->pl);
753	Safefree (self);	858	Safefree (self);
754		859
755	int
756	is_rgba (CFClient::Layout self)
757	CODE:
758	RETVAL = self->rgba;
759	OUTPUT:
760	RETVAL
761
762	void	860	void
763	set_text (CFClient::Layout self, SV *text_)	861	set_text (CFPlus::Layout self, SV *text_)
764	CODE:	862	CODE:
765	{	863	{
766	STRLEN textlen;	864	STRLEN textlen;
767	char *text = SvPVutf8 (text_, textlen);	865	char *text = SvPVutf8 (text_, textlen);
768		866
769	pango_layout_set_text (self->pl, text, textlen);	867	pango_layout_set_text (self->pl, text, textlen);
770	}	868	}
771		869
772	void	870	void
773	set_markup (CFClient::Layout self, SV *text_)	871	set_markup (CFPlus::Layout self, SV *text_)
774	CODE:	872	CODE:
775	{	873	{
776	STRLEN textlen;	874	STRLEN textlen;
777	char *text = SvPVutf8 (text_, textlen);	875	char *text = SvPVutf8 (text_, textlen);
778		876
779	pango_layout_set_markup (self->pl, text, textlen);	877	pango_layout_set_markup (self->pl, text, textlen);
780	}	878	}
781		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
782	SV *	965	SV *
783	get_text (CFClient::Layout self)	966	get_text (CFPlus::Layout self)
784	CODE:	967	CODE:
785	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	968	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
786	SvUTF8_on (RETVAL);	969	sv_utf8_decode (RETVAL);
787	OUTPUT:	970	OUTPUT:
788	RETVAL	971	RETVAL
789		972
790	void	973	void
791	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.)
792	CODE:	975	CODE:
793	self->r = r;	976	self->r = r;
794	self->g = g;	977	self->g = g;
795	self->b = b;	978	self->b = b;
796	self->a = a;	979	self->a = a;
797		980
798	void	981	void
799	set_font (CFClient::Layout self, CFClient::Font font = 0)	982	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
800	CODE:	983	CODE:
801	if (self->font != font)	984	if (self->font != font)
802	{	985	{
803	self->font = font;	986	self->font = font;
804	layout_update_font (self);	987	layout_update_font (self);
805	}	988	}
806		989
807	void	990	void
808	set_height (CFClient::Layout self, int base_height)	991	set_height (CFPlus::Layout self, int base_height)
809	CODE:	992	CODE:
810	if (self->base_height != base_height)	993	if (self->base_height != base_height)
811	{	994	{
812	self->base_height = base_height;	995	self->base_height = base_height;
813	layout_update_font (self);	996	layout_update_font (self);
814	}	997	}
815		998
816	void	999	void
817	set_width (CFClient::Layout self, int max_width = -1)	1000	set_width (CFPlus::Layout self, int max_width = -1)
818	CODE:	1001	CODE:
819	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);
820		1003
821	void	1004	void
822	set_indent (CFClient::Layout self, int indent)	1005	set_indent (CFPlus::Layout self, int indent)
823	CODE:	1006	CODE:
824	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1007	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
825		1008
826	void	1009	void
827	set_spacing (CFClient::Layout self, int spacing)	1010	set_spacing (CFPlus::Layout self, int spacing)
828	CODE:	1011	CODE:
829	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1012	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
830		1013
831	void	1014	void
832	set_ellipsise (CFClient::Layout self, int ellipsise)	1015	set_ellipsise (CFPlus::Layout self, int ellipsise)
833	CODE:	1016	CODE:
834	pango_layout_set_ellipsize (self->pl,	1017	pango_layout_set_ellipsize (self->pl,
835	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1018	ellipsise == 1 ? PANGO_ELLIPSIZE_START
836	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1019	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
837	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1020	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
838	: PANGO_ELLIPSIZE_NONE	1021	: PANGO_ELLIPSIZE_NONE
839	);	1022	);
840		1023
841	void	1024	void
842	set_single_paragraph_mode (CFClient::Layout self, int spm)	1025	set_single_paragraph_mode (CFPlus::Layout self, int spm)
843	CODE:	1026	CODE:
844	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1027	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
845		1028
846	void	1029	void
847	size (CFClient::Layout self)	1030	size (CFPlus::Layout self)
848	PPCODE:	1031	PPCODE:
849	{	1032	{
850	int w, h;	1033	int w, h;
851		1034
852	layout_get_pixel_size (self, &w, &h);	1035	layout_get_pixel_size (self, &w, &h);
…		…
855	PUSHs (sv_2mortal (newSViv (w)));	1038	PUSHs (sv_2mortal (newSViv (w)));
856	PUSHs (sv_2mortal (newSViv (h)));	1039	PUSHs (sv_2mortal (newSViv (h)));
857	}	1040	}
858		1041
859	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
860	xy_to_index (CFClient::Layout self, int x, int y)	1055	xy_to_index (CFPlus::Layout self, int x, int y)
861	CODE:	1056	CODE:
862	{	1057	{
863	int index, trailing;	1058	int index, trailing;
864	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);
865	RETVAL = index;	1060	RETVAL = index;
866	}	1061	}
867	OUTPUT:	1062	OUTPUT:
868	RETVAL	1063	RETVAL
869		1064
870	void	1065	void
871	cursor_pos (CFClient::Layout self, int index)	1066	cursor_pos (CFPlus::Layout self, int index)
872	PPCODE:	1067	PPCODE:
873	{	1068	{
874	PangoRectangle strong_pos;	1069	PangoRectangle strong_pos;
875	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1070	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
876		1071
…		…
879	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1074	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
880	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1075	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
881	}	1076	}
882		1077
883	void	1078	void
884	render (CFClient::Layout self)	1079	render (CFPlus::Layout self, float x, float y, int flags = 0)
885	PPCODE:	1080	PPCODE:
886	{	1081	pango_opengl_render_layout_subpixel (
887	SV *retval;	1082	self->pl,
888	int w, h;	1083	x * PANGO_SCALE, y * PANGO_SCALE,
		1084	self->r, self->g, self->b, self->a,
		1085	flags
		1086	);
889		1087
890	layout_get_pixel_size (self, &w, &h);	1088	MODULE = CFPlus PACKAGE = CFPlus::Texture
891		1089
892	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)
893	{	1098	{
894	cairo_surface_t *surface;	1099	int nw = minpot (ow);
895	cairo_t *cairo;	1100	int nh = minpot (oh);
896		1101
897	retval = newSV (w * h * 4);	1102	if (nw != ow \|\| nh != oh)
898	SvPOK_only (retval);
899	SvCUR_set (retval, w * h * 4);
900
901	memset (SvPVX (retval), 0, w * h * 4);
902
903	surface = cairo_image_surface_create_for_data (
904	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
905	cairo = cairo_create (surface);
906	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
907
908	pango_cairo_show_layout (cairo, self->pl);
909
910	cairo_destroy (cairo);
911	cairo_surface_destroy (surface);
912
913	// what a mess, and its premultiplied, too :(
914	{	1103	{
915	uint32_t p = (uint32_t )SvPVX (retval);	1104	if (SvOK (data_))
916	uint32_t e = p + w h;
917
918	while (p < e)
919	{	1105	{
920	uint32_t rgba = *p;	1106	STRLEN datalen;
921	rgba = (rgba >> 24) \| (rgba << 8);	1107	char *data = SvPVbyte (data_, datalen);
922	#if 0	1108	int bpp = datalen / (ow * oh);
923	#ifdef _WIN32	1109	SV result_ = sv_2mortal (newSV (nw nh * bpp));
924	{//D
925	uint8_t r = rgba >> 24;
926	uint8_t g = rgba >> 16;
927	uint8_t b = rgba >> 8;
928	uint8_t a = rgba >> 0;
929		1110
930	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_);
931	}	1119	}
932	#endif	1120
933	#endif	1121	sv_setiv (w_, nw);
934	rgba = SDL_SwapBE32 (rgba);	1122	sv_setiv (h_, nh);
935	*p++ = rgba;
936	}	1123	}
937	}
938
939	EXTEND (SP, 5);
940	PUSHs (sv_2mortal (newSViv (w)));
941	PUSHs (sv_2mortal (newSViv (h)));
942	PUSHs (sv_2mortal (retval));
943	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
944	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
945	}	1124	}
946	else
947	{
948	FT_Bitmap bitmap;
949
950	retval = newSV (w * h);
951	SvPOK_only (retval);
952	SvCUR_set (retval, w * h);
953
954	bitmap.rows = h;
955	bitmap.width = w;
956	bitmap.pitch = w;
957	bitmap.buffer = (unsigned char*)SvPVX (retval);
958	bitmap.num_grays = 256;
959	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
960
961	memset (bitmap.buffer, 0, w * h);
962
963	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
964
965	EXTEND (SP, 5);
966	PUSHs (sv_2mortal (newSViv (w)));
967	PUSHs (sv_2mortal (newSViv (h)));
968	PUSHs (sv_2mortal (retval));
969	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
970	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
971	}
972	}	1125	}
973		1126
974	MODULE = CFClient PACKAGE = CFClient::Texture
975
976	void	1127	void
977	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.)
978	PROTOTYPE: $$$;$$	1129	PROTOTYPE: $$$;$$
979	ALIAS:	1130	ALIAS:
980	draw_quad_alpha = 1	1131	draw_quad_alpha = 1
981	draw_quad_alpha_premultiplied = 2	1132	draw_quad_alpha_premultiplied = 2
982	CODE:	1133	CODE:
…		…
1020	glDisable (GL_ALPHA_TEST);	1171	glDisable (GL_ALPHA_TEST);
1021	glDisable (GL_BLEND);	1172	glDisable (GL_BLEND);
1022	}	1173	}
1023	}	1174	}
1024		1175
1025	MODULE = CFClient PACKAGE = CFClient::Map	1176	MODULE = CFPlus PACKAGE = CFPlus::Map
1026		1177
1027	CFClient::Map	1178	CFPlus::Map
1028	new (SV *class, int map_width, int map_height)	1179	new (SV *class, int map_width, int map_height)
1029	CODE:	1180	CODE:
1030	New (0, RETVAL, 1, struct map);	1181	New (0, RETVAL, 1, struct map);
1031	RETVAL->x = 0;	1182	RETVAL->x = 0;
1032	RETVAL->y = 0;	1183	RETVAL->y = 0;
…		…
1042	RETVAL->row = 0;	1193	RETVAL->row = 0;
1043	OUTPUT:	1194	OUTPUT:
1044	RETVAL	1195	RETVAL
1045		1196
1046	void	1197	void
1047	DESTROY (CFClient::Map self)	1198	DESTROY (CFPlus::Map self)
1048	CODE:	1199	CODE:
1049	{	1200	{
1050	map_clear (self);	1201	map_clear (self);
1051	Safefree (self->face);	1202	Safefree (self->face);
		1203	Safefree (self->tex);
1052	Safefree (self);	1204	Safefree (self);
1053	}	1205	}
1054		1206
1055	void	1207	void
1056	clear (CFClient::Map self)	1208	clear (CFPlus::Map self)
1057	CODE:	1209	CODE:
1058	map_clear (self);	1210	map_clear (self);
1059		1211
1060	void	1212	void
1061	set_face (CFClient::Map self, int face, int texid)	1213	set_face (CFPlus::Map self, int face, int texid)
1062	CODE:	1214	CODE:
1063	{	1215	{
1064	while (self->faces <= face)	1216	while (self->faces <= face)
1065	{	1217	{
1066	Append (mapface, self->face, self->faces, self->faces);	1218	Append (mapface, self->face, self->faces, self->faces);
…		…
1069		1221
1070	self->face [face] = texid;	1222	self->face [face] = texid;
1071	}	1223	}
1072		1224
1073	void	1225	void
1074	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)
1075	CODE:	1227	CODE:
1076	{	1228	{
1077	while (self->texs <= texid)	1229	while (self->texs <= texid)
1078	{	1230	{
1079	Append (maptex, self->tex, self->texs, self->texs);	1231	Append (maptex, self->tex, self->texs, self->texs);
…		…
1103	// from transparent color bleeding and ugly wrapping effects.	1255	// from transparent color bleeding and ugly wrapping effects.
1104	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1256	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1105	}	1257	}
1106		1258
1107	int	1259	int
1108	ox (CFClient::Map self)	1260	ox (CFPlus::Map self)
1109	ALIAS:	1261	ALIAS:
1110	oy = 1	1262	oy = 1
1111	x = 2	1263	x = 2
1112	y = 3	1264	y = 3
1113	w = 4	1265	w = 4
…		…
1124	}	1276	}
1125	OUTPUT:	1277	OUTPUT:
1126	RETVAL	1278	RETVAL
1127		1279
1128	void	1280	void
1129	scroll (CFClient::Map self, int dx, int dy)	1281	scroll (CFPlus::Map self, int dx, int dy)
1130	CODE:	1282	CODE:
1131	{	1283	{
1132	if (dx > 0)	1284	if (dx > 0)
1133	map_blank (self, self->x, self->y, dx - 1, self->h);	1285	map_blank (self, self->x, self->y, dx, self->h);
1134	else if (dx < 0)	1286	else if (dx < 0)
1135	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);
1136		1288
1137	if (dy > 0)	1289	if (dy > 0)
1138	map_blank (self, self->x, self->y, self->w, dy - 1);	1290	map_blank (self, self->x, self->y, self->w, dy);
1139	else if (dy < 0)	1291	else if (dy < 0)
1140	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);
1141		1293
1142	self->ox += dx; self->x += dx;	1294	self->ox += dx; self->x += dx;
1143	self->oy += dy; self->y += dy;	1295	self->oy += dy; self->y += dy;
1144		1296
1145	while (self->y < 0)	1297	while (self->y < 0)
…		…
1150	self->y += MAP_EXTEND_Y;	1302	self->y += MAP_EXTEND_Y;
1151	}	1303	}
1152	}	1304	}
1153		1305
1154	void	1306	void
1155	map1a_update (CFClient::Map self, SV *data_)	1307	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1156	CODE:	1308	CODE:
1157	{	1309	{
1158	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1310	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1159	uint8_t data_end = (uint8_t )SvEND (data_);	1311	uint8_t data_end = (uint8_t )SvEND (data_);
1160	mapcell *cell;	1312	mapcell *cell;
1161	int x, y, flags;	1313	int x, y, flags;
1162		1314
1163	while (data < data_end)	1315	while (data < data_end - 1)
1164	{	1316	{
1165	flags = (data [0] << 8) + data [1]; data += 2;	1317	flags = (data [0] << 8) + data [1]; data += 2;
1166		1318
1167	x = ((flags >> 10) & 63) + self->x;	1319	x = self->x + ((flags >> 10) & 63);
1168	y = ((flags >> 4) & 63) + self->y;	1320	y = self->y + ((flags >> 4) & 63);
1169		1321
1170	cell = map_get_cell (self, x, y);	1322	cell = map_get_cell (self, x, y);
1171		1323
1172	if (flags & 15)	1324	if (flags & 15)
1173	{	1325	{
1174	if (cell->darkness < 0)	1326	if (!cell->darkness)
1175	{	1327	{
		1328	memset (cell, 0, sizeof (*cell));
1176	cell->darkness = 0;	1329	cell->darkness = 256;
1177	cell->face [0] = 0;
1178	cell->face [1] = 0;
1179	cell->face [2] = 0;
1180	}	1330	}
1181		1331
1182	cell->darkness = flags & 8 ? *data++ : 255;
1183
1184	//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	}
1185		1373
1186	if (flags & 4)	1374	if (flags & 4)
1187	{	1375	{
1188	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;
1189	}	1377	}
…		…
1197	{	1385	{
1198	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;
1199	}	1387	}
1200	}	1388	}
1201	else	1389	else
1202	cell->darkness = -1;	1390	cell->darkness = 0;
1203	}	1391	}
1204	}	1392	}
1205		1393
1206	SV *	1394	SV *
1207	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)
1208	CODE:	1396	CODE:
1209	{	1397	{
1210	int x1, x;	1398	int x1, x;
1211	int y1, y;	1399	int y1, y;
1212	int z;	1400	int z;
…		…
1262	}	1450	}
1263	OUTPUT:	1451	OUTPUT:
1264	RETVAL	1452	RETVAL
1265		1453
1266	void	1454	void
1267	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)
1268	PPCODE:	1456	CODE:
1269	{	1457	{
1270	int vx, vy;	1458	int vx, vy;
1271	int x, y, z;	1459	int x, y, z;
1272	int last_name;	1460	int last_name;
1273	mapface face;	1461	mapface face;
1274	int sw4 = (sw + 3) & ~3;
1275	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1276	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1277		1462
1278	memset (darkness, 255, sw4 * sh);
1279	SvPOK_only (darkness_sv);
1280	SvCUR_set (darkness_sv, sw4 * sh);
1281
1282	vx = self->x + (self->w - sw) / 2 - shift_x;	1463	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1283	vy = self->y + (self->h - sh) / 2 - shift_y;	1464	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1284		1465
1285	/*	1466	/*
1286	int vx = self->vx = self->w >= sw	1467	int vx = self->vx = self->w >= sw
1287	? self->x + (self->w - sw) / 2	1468	? self->x + (self->w - sw) / 2
1288	: 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));
…		…
1292	: 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));
1293	*/	1474	*/
1294		1475
1295	glColor4ub (255, 255, 255, 255);	1476	glColor4ub (255, 255, 255, 255);
1296		1477
		1478	glEnable (GL_BLEND);
1297	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1479	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1298	glEnable (GL_BLEND);
1299	glEnable (GL_TEXTURE_2D);	1480	glEnable (GL_TEXTURE_2D);
1300	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1481	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1301		1482
1302	glBegin (GL_QUADS);	1483	glBegin (GL_QUADS);
1303		1484
…		…
1312	for (x = 0; x < sw; x++)	1493	for (x = 0; x < sw; x++)
1313	if (row->c0 <= x + vx && x + vx < row->c1)	1494	if (row->c0 <= x + vx && x + vx < row->c1)
1314	{	1495	{
1315	mapcell *cell = row->col + (x + vx - row->c0);	1496	mapcell *cell = row->col + (x + vx - row->c0);
1316		1497
1317	darkness[y * sw4 + x] = cell->darkness < 0
1318	? 255 - FOW_DARKNESS
1319	: 255 - cell->darkness;
1320
1321	face = cell->face [z];	1498	face = cell->face [z];
1322		1499
1323	if (face)	1500	if (face && face < self->texs)
1324	{	1501	{
1325	maptex tex = self->tex [face];	1502	maptex tex = self->tex [face];
1326
1327	int px = (x + 1) * 32 - tex.w;	1503	int px = (x + 1) * 32 - tex.w;
1328	int py = (y + 1) * 32 - tex.h;	1504	int py = (y + 1) * 32 - tex.h;
1329		1505
1330	if (last_name != tex.name)	1506	if (last_name != tex.name)
1331	{	1507	{
1332	glEnd ();	1508	glEnd ();
1333	last_name = tex.name;
1334	glBindTexture (GL_TEXTURE_2D, last_name);	1509	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1335	glBegin (GL_QUADS);	1510	glBegin (GL_QUADS);
1336	}	1511	}
1337		1512
1338	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1513	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1339	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1514	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1340	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);
1341	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1516	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1342	}	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	}
1343	}	1537	}
1344	}	1538	}
1345		1539
1346	glEnd ();	1540	glEnd ();
1347		1541
1348	glDisable (GL_TEXTURE_2D);	1542	glDisable (GL_TEXTURE_2D);
1349	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	}
1350		1669
1351	EXTEND (SP, 3);	1670	EXTEND (SP, 3);
1352	PUSHs (sv_2mortal (newSViv (sw4)));	1671	PUSHs (sv_2mortal (newSViv (sw4)));
1353	PUSHs (sv_2mortal (newSViv (sh)));	1672	PUSHs (sv_2mortal (newSViv (sh)));
1354	PUSHs (darkness_sv);	1673	PUSHs (darkness_sv);
1355	}	1674	}
1356		1675
1357	SV *	1676	SV *
1358	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)
1359	CODE:	1678	CODE:
1360	{	1679	{
1361	int x, y, x1, y1;	1680	int x, y, x1, y1;
1362	SV data_sv = newSV (w h * 7 + 5);	1681	SV data_sv = newSV (w h * 7 + 5);
1363	uint8_t data = (uint8_t )SvPVX (data_sv);	1682	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1425	}	1744	}
1426	OUTPUT:	1745	OUTPUT:
1427	RETVAL	1746	RETVAL
1428		1747
1429	void	1748	void
1430	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)
1431	PPCODE:	1750	PPCODE:
1432	{	1751	{
1433	int x, y, z;	1752	int x, y, z;
1434	int w, h;	1753	int w, h;
1435	int x1, y1;	1754	int x1, y1;
…		…
1467		1786
1468	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1787	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1469	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1788	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1470	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1789	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1471		1790
1472	if (cell->darkness <= 0)	1791	if (cell->darkness == 0)
1473	{	1792	{
1474	cell->darkness = -1;	1793	cell->darkness = 0;
1475		1794
1476	for (z = 0; z <= 2; z++)	1795	for (z = 0; z <= 2; z++)
1477	{	1796	{
1478	cell->face[z] = face[z];	1797	cell->face[z] = face[z];
1479		1798
…		…
1484	}	1803	}
1485	}	1804	}
1486	}	1805	}
1487	}	1806	}
1488		1807
1489	MODULE = CFClient PACKAGE = CFClient::MixChunk	1808	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1490		1809
1491	CFClient::MixChunk	1810	CFPlus::MixChunk
1492	new_from_file (SV class, char path)	1811	new_from_file (SV class, char path)
1493	CODE:	1812	CODE:
1494	RETVAL = Mix_LoadWAV (path);	1813	RETVAL = Mix_LoadWAV (path);
1495	OUTPUT:	1814	OUTPUT:
1496	RETVAL	1815	RETVAL
1497		1816
1498	void	1817	void
1499	DESTROY (CFClient::MixChunk self)	1818	DESTROY (CFPlus::MixChunk self)
1500	CODE:	1819	CODE:
1501	Mix_FreeChunk (self);	1820	Mix_FreeChunk (self);
1502		1821
1503	int	1822	int
1504	volume (CFClient::MixChunk self, int volume = -1)	1823	volume (CFPlus::MixChunk self, int volume = -1)
1505	CODE:	1824	CODE:
1506	RETVAL = Mix_VolumeChunk (self, volume);	1825	RETVAL = Mix_VolumeChunk (self, volume);
1507	OUTPUT:	1826	OUTPUT:
1508	RETVAL	1827	RETVAL
1509		1828
1510	int	1829	int
1511	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)
1512	CODE:	1831	CODE:
1513	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1832	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1514	OUTPUT:	1833	OUTPUT:
1515	RETVAL	1834	RETVAL
1516		1835
1517	MODULE = CFClient PACKAGE = CFClient::MixMusic	1836	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1518		1837
1519	int	1838	int
1520	volume (int volume = -1)	1839	volume (int volume = -1)
1521	CODE:	1840	CODE:
1522	RETVAL = Mix_VolumeMusic (volume);	1841	RETVAL = Mix_VolumeMusic (volume);
1523	OUTPUT:	1842	OUTPUT:
1524	RETVAL	1843	RETVAL
1525		1844
1526	CFClient::MixMusic	1845	CFPlus::MixMusic
1527	new_from_file (SV class, char path)	1846	new_from_file (SV class, char path)
1528	CODE:	1847	CODE:
1529	RETVAL = Mix_LoadMUS (path);	1848	RETVAL = Mix_LoadMUS (path);
1530	OUTPUT:	1849	OUTPUT:
1531	RETVAL	1850	RETVAL
1532		1851
1533	void	1852	void
1534	DESTROY (CFClient::MixMusic self)	1853	DESTROY (CFPlus::MixMusic self)
1535	CODE:	1854	CODE:
1536	Mix_FreeMusic (self);	1855	Mix_FreeMusic (self);
1537		1856
1538	int	1857	int
1539	play (CFClient::MixMusic self, int loops = -1)	1858	play (CFPlus::MixMusic self, int loops = -1)
1540	CODE:	1859	CODE:
1541	RETVAL = Mix_PlayMusic (self, loops);	1860	RETVAL = Mix_PlayMusic (self, loops);
1542	OUTPUT:	1861	OUTPUT:
1543	RETVAL	1862	RETVAL
1544		1863
1545	MODULE = CFClient PACKAGE = CFClient::OpenGL	1864	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1546		1865
1547	BOOT:	1866	BOOT:
1548	{	1867	{
1549	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1868	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1550	static const struct {	1869	static const struct {
1551	const char *name;	1870	const char *name;
1552	IV iv;	1871	IV iv;
1553	} *civ, const_iv[] = {	1872	} *civ, const_iv[] = {
1554	# define const_iv(name) { # name, (IV)name }	1873	# define const_iv(name) { # name, (IV)name }
…		…
1561	const_iv (GL_SCISSOR_TEST),	1880	const_iv (GL_SCISSOR_TEST),
1562	const_iv (GL_DEPTH_TEST),	1881	const_iv (GL_DEPTH_TEST),
1563	const_iv (GL_ALPHA_TEST),	1882	const_iv (GL_ALPHA_TEST),
1564	const_iv (GL_NORMALIZE),	1883	const_iv (GL_NORMALIZE),
1565	const_iv (GL_RESCALE_NORMAL),	1884	const_iv (GL_RESCALE_NORMAL),
		1885	const_iv (GL_FRONT),
		1886	const_iv (GL_BACK),
1566	const_iv (GL_AND),	1887	const_iv (GL_AND),
1567	const_iv (GL_ONE),	1888	const_iv (GL_ONE),
1568	const_iv (GL_ZERO),	1889	const_iv (GL_ZERO),
1569	const_iv (GL_SRC_ALPHA),	1890	const_iv (GL_SRC_ALPHA),
1570	const_iv (GL_DST_ALPHA),	1891	const_iv (GL_DST_ALPHA),
1571	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1892	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1572	const_iv (GL_ONE_MINUS_DST_ALPHA),	1893	const_iv (GL_ONE_MINUS_DST_ALPHA),
1573	const_iv (GL_SRC_ALPHA_SATURATE),	1894	const_iv (GL_SRC_ALPHA_SATURATE),
1574	const_iv (GL_RGB),	1895	const_iv (GL_RGB),
1575	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),
1576	const_iv (GL_UNSIGNED_BYTE),	1900	const_iv (GL_UNSIGNED_BYTE),
1577	const_iv (GL_UNSIGNED_SHORT),	1901	const_iv (GL_UNSIGNED_SHORT),
1578	const_iv (GL_UNSIGNED_INT),	1902	const_iv (GL_UNSIGNED_INT),
1579	const_iv (GL_ALPHA),	1903	const_iv (GL_ALPHA),
1580	const_iv (GL_INTENSITY),	1904	const_iv (GL_INTENSITY),
…		…
1612	const_iv (GL_SEPARABLE_2D),	1936	const_iv (GL_SEPARABLE_2D),
1613	const_iv (GL_CONVOLUTION_2D),	1937	const_iv (GL_CONVOLUTION_2D),
1614	const_iv (GL_CONVOLUTION_BORDER_MODE),	1938	const_iv (GL_CONVOLUTION_BORDER_MODE),
1615	const_iv (GL_CONSTANT_BORDER),	1939	const_iv (GL_CONSTANT_BORDER),
1616	const_iv (GL_LINES),	1940	const_iv (GL_LINES),
		1941	const_iv (GL_LINE_STRIP),
1617	const_iv (GL_LINE_LOOP),	1942	const_iv (GL_LINE_LOOP),
1618	const_iv (GL_QUADS),	1943	const_iv (GL_QUADS),
1619	const_iv (GL_QUAD_STRIP),	1944	const_iv (GL_QUAD_STRIP),
1620	const_iv (GL_TRIANGLES),	1945	const_iv (GL_TRIANGLES),
1621	const_iv (GL_TRIANGLE_STRIP),	1946	const_iv (GL_TRIANGLE_STRIP),
…		…
1654	OUTPUT:	1979	OUTPUT:
1655	RETVAL	1980	RETVAL
1656		1981
1657	int glGetError ()	1982	int glGetError ()
1658		1983
		1984	void glFinish ()
		1985
1659	void glClear (int mask)	1986	void glClear (int mask)
1660		1987
1661	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)
1662	PROTOTYPE: @	1989	PROTOTYPE: @
1663		1990
…		…
1686	void glPushMatrix ()	2013	void glPushMatrix ()
1687		2014
1688	void glPopMatrix ()	2015	void glPopMatrix ()
1689		2016
1690	void glLoadIdentity ()	2017	void glLoadIdentity ()
		2018
		2019	void glDrawBuffer (int buffer)
		2020
		2021	void glReadBuffer (int buffer)
1691		2022
1692	# near_ and far_ are due to microsofts buggy "c" compiler	2023	# near_ and far_ are due to microsofts buggy "c" compiler
1693	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_)
1694		2025
1695	# near_ and far_ are due to microsofts buggy "c" compiler	2026	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1725	r *= a;	2056	r *= a;
1726	g *= a;	2057	g *= a;
1727	b *= a;	2058	b *= a;
1728	}	2059	}
1729	// microsoft visual "c" rounds instead of truncating...	2060	// microsoft visual "c" rounds instead of truncating...
1730	glColor4ub (MIN ((int)(r * 256.f), 255),	2061	glColor4f (r, g, b, a);
1731	MIN ((int)(g * 256.f), 255),
1732	MIN ((int)(b * 256.f), 255),
1733	MIN ((int)(a * 256.f), 255));
1734		2062
1735	void glInterleavedArrays (int format, int stride, char *data)	2063	void glInterleavedArrays (int format, int stride, char *data)
1736		2064
1737	void glDrawElements (int mode, int count, int type, char *indices)	2065	void glDrawElements (int mode, int count, int type, char *indices)
1738		2066
…		…
1815		2143
1816	void glEndList ()	2144	void glEndList ()
1817		2145
1818	void glCallList (int list)	2146	void glCallList (int list)
1819		2147
1820

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.105 by root, Mon Jun 5 03:33:09 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.105 by root, Mon Jun 5 03:33:09 2006 UTC vs.
Revision 1.161 by root, Mon Oct 9 23:30:44 2006 UTC