ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.122 by root, Fri Jun 23 22:35:15 2006 UTC vs.
Revision 1.198 by root, Sun Jul 15 21:42:02 2007 UTC

1	#ifdef _WIN32	1	#ifdef _WIN32
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	2	# define WIN32_LEAN_AND_MEAN
		3	# define NTDDI_VERSION NTDDI_WIN2K // 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)
		8	# pragma warning(disable:4761)
		9	#endif
		10
		11	//#define DEBUG 1
		12	#if DEBUG
		13	# include <valgrind/memcheck.h>
6	#endif	14	#endif
7		15
8	#include "EXTERN.h"	16	#include "EXTERN.h"
9	#include "perl.h"	17	#include "perl.h"
10	#include "XSUB.h"	18	#include "XSUB.h"
11		19
		20	#ifdef _WIN32
		21	# undef pipe
		22	#endif
		23
		24	#include <assert.h>
12	#include <math.h>	25	#include <math.h>
13	#include <string.h>	26	#include <string.h>
14	#include <stdio.h>	27	#include <stdio.h>
15	#include <stdlib.h>	28	#include <stdlib.h>
16		29
…		…
18	#include <SDL_endian.h>	31	#include <SDL_endian.h>
19	#include <SDL_image.h>	32	#include <SDL_image.h>
20	#include <SDL_mixer.h>	33	#include <SDL_mixer.h>
21	#include <SDL_opengl.h>	34	#include <SDL_opengl.h>
22		35
		36	#define PANGO_ENABLE_BACKEND
		37	#define G_DISABLE_CAST_CHECKS
		38
23	#include <glib/gmacros.h>	39	#include <glib/gmacros.h>
24		40
25	#include <pango/pango.h>	41	#include <pango/pango.h>
26	#include <pango/pangofc-fontmap.h>
27	#include <pango/pangoft2.h>
28	#include <pango/pangocairo.h>
29		42
30	#ifndef _WIN32	43	#ifndef _WIN32
31	# include <sys/types.h>	44	# include <sys/types.h>
32	# include <sys/socket.h>	45	# include <sys/socket.h>
33	# include <netinet/in.h>	46	# include <netinet/in.h>
34	# include <netinet/tcp.h>	47	# include <netinet/tcp.h>
35	# include <inttypes.h>	48	# include <inttypes.h>
36	#else
37	typedef unsigned char uint8_t;
38	typedef unsigned short uint16_t;
39	typedef unsigned int uint32_t;
40	typedef signed char int8_t;
41	typedef signed short int16_t;
42	typedef signed int int32_t;
43	#endif	49	#endif
44		50
45	#include "glext.h"
46
47	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */	51	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48		52
49	#define FOW_DARKNESS 32	53	#define FOW_DARKNESS 32
50		54
51	#define MAP_EXTEND_X 32	55	#define MAP_EXTEND_X 32
52	#define MAP_EXTEND_Y 512	56	#define MAP_EXTEND_Y 512
53		57
54	#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
		65
		66	static AV *texture_av;
55		67
56	static struct	68	static struct
57	{	69	{
58	#define GL_FUNC(ptr,name) ptr name;	70	#define GL_FUNC(ptr,name) ptr name;
59	#include "glfunc.h"	71	#include "glfunc.h"
60	#undef GL_FUNC	72	#undef GL_FUNC
61	} gl;	73	} gl;
62		74
		75	static void
63	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	76	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
64	{	77	{
65	if (gl.BlendFuncSeparate)	78	if (gl.BlendFuncSeparate)
66	gl.BlendFuncSeparate (sa, da, saa, daa);	79	gl.BlendFuncSeparate (sa, da, saa, daa);
67	else if (gl.BlendFuncSeparateEXT)	80	else if (gl.BlendFuncSeparateEXT)
68	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	81	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
69	else	82	else
70	glBlendFunc (sa, da);	83	glBlendFunc (sa, da);
71	}	84	}
72		85
		86	static GLuint
		87	gen_texture ()
		88	{
		89	GLuint name;
		90
		91	if (AvFILL (texture_av) >= 0)
		92	name = (GLuint)(size_t)av_pop (texture_av);
		93	else
		94	glGenTextures (1, &name);
		95
		96	return name;
		97	}
		98
		99	static void
		100	del_texture (GLuint name)
		101	{
		102	/* make a half-assed attempt at returning the memory used by the texture */
		103	/* textures are frequently being reused by cfplus anyway */
		104	/*glBindTexture (GL_TEXTURE_2D, name);*/
		105	/*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
		106	av_push (texture_av, (SV *)(size_t)name);
		107	glDeleteTextures (1, &name);
		108	}
		109
		110	#include "texcache.c"
		111
		112	#include "pango-font.c"
		113	#include "pango-fontmap.c"
		114	#include "pango-render.c"
		115
73	typedef Mix_Chunk *CFClient__MixChunk;	116	typedef Mix_Chunk *CFPlus__MixChunk;
74	typedef Mix_Music *CFClient__MixMusic;	117	typedef Mix_Music *CFPlus__MixMusic;
75		118
76	typedef PangoFontDescription *CFClient__Font;	119	typedef PangoFontDescription *CFPlus__Font;
77		120
78	static int	121	static int
79	shape_attr_p (PangoLayoutRun *run)	122	shape_attr_p (PangoLayoutRun *run)
80	{	123	{
81	GSList *attrs = run->item->analysis.extra_attrs;	124	GSList *attrs = run->item->analysis.extra_attrs;
…		…
92		135
93	return 0;	136	return 0;
94	}	137	}
95		138
96	typedef struct cf_layout {	139	typedef struct cf_layout {
97	PangoLayout *pl; // either derived from a cairo or ft2 context	140	PangoLayout *pl;
98	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
99	float r, g, b, a; // default color for rgba mode	141	float r, g, b, a; // default color for rgba mode
100	int base_height;	142	int base_height;
101	CFClient__Font font;	143	CFPlus__Font font;
102	} *CFClient__Layout;	144	} *CFPlus__Layout;
103		145
104	static CFClient__Font default_font;	146	static CFPlus__Font default_font;
105	static PangoContext *ft2_context, *cairo_context;	147	static PangoContext *opengl_context;
106	static PangoFontMap *ft2_fontmap, *cairo_fontmap;	148	static PangoFontMap *opengl_fontmap;
107		149
108	static void	150	static void
109	substitute_func (FcPattern *pattern, gpointer data)	151	substitute_func (FcPattern *pattern, gpointer data)
110	{	152	{
111	FcPatternAddBool (pattern, FC_HINTING, 1);	153	FcPatternAddBool (pattern, FC_HINTING, 1);
112	#ifdef FC_HINT_STYLE	154	#ifdef FC_HINT_STYLE
113	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	155	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
114	#endif	156	#endif
115	#ifdef _WIN32
116	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
117	#else
118	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	157	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
119	#endif
120	}	158	}
121		159
122	static void	160	static void
123	layout_update_font (CFClient__Layout self)	161	layout_update_font (CFPlus__Layout self)
124	{	162	{
125	/* use a random scale factor to account for unknown descenders, 0.8 works	163	/* use a random scale factor to account for unknown descenders, 0.8 works
126	* reasonably well with bitstream vera	164	* reasonably well with bitstream vera
127	*/	165	*/
128	PangoFontDescription *font = self->font ? self->font : default_font;	166	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
132		170
133	pango_layout_set_font_description (self->pl, font);	171	pango_layout_set_font_description (self->pl, font);
134	}	172	}
135		173
136	static void	174	static void
137	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	175	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
138	{	176	{
		177	PangoRectangle rect;
		178
		179	// get_pixel_* wrongly rounds down
139	pango_layout_get_pixel_size (self->pl, w, h);	180	pango_layout_get_extents (self->pl, 0, &rect);
140		181
141	if (!*w) *w = 1;	182	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
142	if (!*h) *h = 1;	183	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
143		184
144	*w = (*w + 3) & ~3;	185	if (!rect.width) rect.width = 1;
145	}	186	if (!rect.height) rect.height = 1;
146		187
		188	*w = rect.width;
		189	*h = rect.height;
		190	}
		191
		192	typedef uint16_t tileid;
147	typedef uint16_t mapface;	193	typedef uint16_t faceid;
148		194
149	typedef struct {	195	typedef struct {
150	GLint name;	196	int name;
151	int w, h;	197	int w, h;
152	float s, t;	198	float s, t;
153	uint8_t r, g, b, a;	199	uint8_t r, g, b, a;
		200	tileid smoothtile;
		201	uint8_t smoothlevel;
154	} maptex;	202	} maptex;
155		203
156	typedef struct {	204	typedef struct {
		205	uint32_t player;
		206	tileid tile[3];
157	int16_t darkness;	207	uint16_t darkness;
158	mapface face[3];	208	uint8_t stat_width, stat_hp, flags, smoothmax;
159	} mapcell;	209	} mapcell;
160		210
161	typedef struct {	211	typedef struct {
162	int32_t c0, c1;	212	int32_t c0, c1;
163	mapcell *col;	213	mapcell *col;
164	} maprow;	214	} maprow;
165		215
166	typedef struct map {	216	typedef struct map {
167	int x, y, w, h;	217	int x, y, w, h;
168	int ox, oy; /* offset to virtual global coordinate system */	218	int ox, oy; /* offset to virtual global coordinate system */
169	int faces;	219	int faces; tileid *face2tile; // [faceid]
170	mapface *face;	220	int texs; maptex *tex; // [tileid]
171
172	int texs;
173	maptex *tex;
174		221
175	int32_t rows;	222	int32_t rows;
176	maprow *row;	223	maprow *row;
177	} *CFClient__Map;	224	} *CFPlus__Map;
178		225
179	static char *	226	static char *
180	prepend (char *ptr, int sze, int inc)	227	prepend (char *ptr, int sze, int inc)
181	{	228	{
182	char *p;	229	char *p;
…		…
199	}	246	}
200		247
201	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	248	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
202	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	249	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
203		250
		251	static void
		252	need_facenum (struct map *self, faceid face)
		253	{
		254	while (self->faces <= face)
		255	{
		256	Append (tileid, self->face2tile, self->faces, self->faces);
		257	self->faces *= 2;
		258	}
		259	}
		260
		261	static void
		262	need_texid (struct map *self, int texid)
		263	{
		264	while (self->texs <= texid)
		265	{
		266	Append (maptex, self->tex, self->texs, self->texs);
		267	self->texs *= 2;
		268	}
		269	}
		270
204	static maprow *	271	static maprow *
205	map_get_row (CFClient__Map self, int y)	272	map_get_row (CFPlus__Map self, int y)
206	{	273	{
207	if (0 > y)	274	if (0 > y)
208	{	275	{
209	int extend = - y + MAP_EXTEND_Y;	276	int extend = - y + MAP_EXTEND_Y;
210	Prepend (maprow, self->row, self->rows, extend);	277	Prepend (maprow, self->row, self->rows, extend);
…		…
248		315
249	return row->col + (x - row->c0);	316	return row->col + (x - row->c0);
250	}	317	}
251		318
252	static mapcell *	319	static mapcell *
253	map_get_cell (CFClient__Map self, int x, int y)	320	map_get_cell (CFPlus__Map self, int x, int y)
254	{	321	{
255	return row_get_cell (map_get_row (self, y), x);	322	return row_get_cell (map_get_row (self, y), x);
256	}	323	}
257		324
258	static void	325	static void
259	map_clear (CFClient__Map self)	326	map_clear (CFPlus__Map self)
260	{	327	{
261	int r;	328	int r;
262		329
263	for (r = 0; r < self->rows; r++)	330	for (r = 0; r < self->rows; r++)
264	Safefree (self->row[r].col);	331	Safefree (self->row[r].col);
…		…
272	self->row = 0;	339	self->row = 0;
273	self->rows = 0;	340	self->rows = 0;
274	}	341	}
275		342
276	static void	343	static void
277	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	344	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
278	{	345	{
279	int x, y;	346	int x, y;
280	maprow *row;	347	maprow *row;
		348	mapcell *cell;
281		349
282	for (y = y0; y < y0 + h; y++)	350	for (y = y0; y < y0 + h; y++)
283	if (y >= 0)	351	if (y >= 0)
284	{	352	{
285	if (y >= self->rows)	353	if (y >= self->rows)
…		…
291	if (x >= row->c0)	359	if (x >= row->c0)
292	{	360	{
293	if (x >= row->c1)	361	if (x >= row->c1)
294	break;	362	break;
295		363
296	row->col[x - row->c0].darkness = -1;	364	cell = row->col + x - row->c0;
		365
		366	cell->darkness = 0;
		367	cell->stat_hp = 0;
		368	cell->flags = 0;
		369	cell->player = 0;
297	}	370	}
298	}	371	}
		372	}
		373
		374	typedef struct {
		375	tileid tile;
		376	uint8_t x, y, level;
		377	} smooth_key;
		378
		379	static void
		380	smooth_or_bits (HV *hv, smooth_key *key, IV bits)
		381	{
		382	SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
		383
		384	if (SvIOK (*sv))
		385	SvIV_set (*sv, SvIVX (*sv) | bits);
		386	else
		387	sv_setiv (*sv, bits);
299	}	388	}
300		389
301	static void	390	static void
302	music_finished (void)	391	music_finished (void)
303	{	392	{
…		…
339	n |= n >> 16;	428	n |= n >> 16;
340		429
341	return n + 1;	430	return n + 1;
342	}	431	}
343		432
		433	/* SDL should provide this, really. */
		434	#define SDLK_MODIFIER_MIN 300
		435	#define SDLK_MODIFIER_MAX 314
		436
344	MODULE = CFClient PACKAGE = CFClient	437	MODULE = CFPlus PACKAGE = CFPlus
345		438
346	PROTOTYPES: ENABLE	439	PROTOTYPES: ENABLE
347		440
348	BOOT:	441	BOOT:
349	{	442	{
350	HV *stash = gv_stashpv ("CFClient", 1);	443	HV *stash = gv_stashpv ("CFPlus", 1);
351	static const struct {	444	static const struct {
352	const char *name;	445	const char *name;
353	IV iv;	446	IV iv;
354	} *civ, const_iv[] = {	447	} *civ, const_iv[] = {
355	# define const_iv(name) { # name, (IV)name }	448	# define const_iv(name) { # name, (IV)name }
		449	const_iv (SDLK_MODIFIER_MIN),
		450	const_iv (SDLK_MODIFIER_MAX),
		451
356	const_iv (SDL_ACTIVEEVENT),	452	const_iv (SDL_ACTIVEEVENT),
357	const_iv (SDL_KEYDOWN),	453	const_iv (SDL_KEYDOWN),
358	const_iv (SDL_KEYUP),	454	const_iv (SDL_KEYUP),
359	const_iv (SDL_MOUSEMOTION),	455	const_iv (SDL_MOUSEMOTION),
360	const_iv (SDL_MOUSEBUTTONDOWN),	456	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
369	const_iv (SDL_EVENT_RESERVEDA),	465	const_iv (SDL_EVENT_RESERVEDA),
370	const_iv (SDL_EVENT_RESERVEDB),	466	const_iv (SDL_EVENT_RESERVEDB),
371	const_iv (SDL_VIDEORESIZE),	467	const_iv (SDL_VIDEORESIZE),
372	const_iv (SDL_VIDEOEXPOSE),	468	const_iv (SDL_VIDEOEXPOSE),
373	const_iv (SDL_USEREVENT),	469	const_iv (SDL_USEREVENT),
		470
		471	const_iv (SDL_APPINPUTFOCUS),
		472	const_iv (SDL_APPMOUSEFOCUS),
		473	const_iv (SDL_APPACTIVE),
		474
374	const_iv (SDLK_KP0),	475	const_iv (SDLK_KP0),
375	const_iv (SDLK_KP1),	476	const_iv (SDLK_KP1),
376	const_iv (SDLK_KP2),	477	const_iv (SDLK_KP2),
377	const_iv (SDLK_KP3),	478	const_iv (SDLK_KP3),
378	const_iv (SDLK_KP4),	479	const_iv (SDLK_KP4),
…		…
433	const_iv (SDLK_BREAK),	534	const_iv (SDLK_BREAK),
434	const_iv (SDLK_MENU),	535	const_iv (SDLK_MENU),
435	const_iv (SDLK_POWER),	536	const_iv (SDLK_POWER),
436	const_iv (SDLK_EURO),	537	const_iv (SDLK_EURO),
437	const_iv (SDLK_UNDO),	538	const_iv (SDLK_UNDO),
		539
438	const_iv (KMOD_NONE),	540	const_iv (KMOD_NONE),
		541	const_iv (KMOD_SHIFT),
439	const_iv (KMOD_LSHIFT),	542	const_iv (KMOD_LSHIFT),
440	const_iv (KMOD_RSHIFT),	543	const_iv (KMOD_RSHIFT),
		544	const_iv (KMOD_CTRL),
441	const_iv (KMOD_LCTRL),	545	const_iv (KMOD_LCTRL),
442	const_iv (KMOD_RCTRL),	546	const_iv (KMOD_RCTRL),
		547	const_iv (KMOD_ALT),
443	const_iv (KMOD_LALT),	548	const_iv (KMOD_LALT),
444	const_iv (KMOD_RALT),	549	const_iv (KMOD_RALT),
		550	const_iv (KMOD_META),
445	const_iv (KMOD_LMETA),	551	const_iv (KMOD_LMETA),
446	const_iv (KMOD_RMETA),	552	const_iv (KMOD_RMETA),
447	const_iv (KMOD_NUM),	553	const_iv (KMOD_NUM),
448	const_iv (KMOD_CAPS),	554	const_iv (KMOD_CAPS),
449	const_iv (KMOD_MODE),	555	const_iv (KMOD_MODE),
450	const_iv (KMOD_CTRL),
451	const_iv (KMOD_SHIFT),
452	const_iv (KMOD_ALT),
453	const_iv (KMOD_META)
454	# undef const_iv	556	# undef const_iv
455	};	557	};
456		558
457	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	559	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
458	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	560	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		561
		562	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
		563	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
459	}	564	}
		565
		566	void
		567	weaken (SV *rv)
		568	PROTOTYPE: $
		569	CODE:
		570	sv_rvweaken (rv);
		571
		572	int
		573	in_destruct ()
		574	CODE:
		575	RETVAL = PL_main_cv == Nullcv;
		576	OUTPUT:
		577	RETVAL
460		578
461	NV floor (NV x)	579	NV floor (NV x)
462		580
463	NV ceil (NV x)	581	NV ceil (NV x)
464		582
465	void	583	void
466	pango_init ()	584	pango_init ()
467	CODE:	585	CODE:
468	// delayed, so it can pick up new fonts added by AddFontResourceEx
469	{	586	{
470	{
471	ft2_fontmap = pango_ft2_font_map_new ();	587	opengl_fontmap = pango_opengl_font_map_new ();
472	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	588	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
473	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	589	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
474	}
475	{
476	cairo_font_options_t *fopt = cairo_font_options_create ();
477	cairo_fontmap = pango_cairo_font_map_get_default ();
478	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
479	#ifdef _WIN32
480	// cairo looks like shit eaten twice on windows
481	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
482	#else
483	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
484	#endif
485	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
486	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
487	pango_cairo_context_set_font_options (cairo_context, fopt);
488	cairo_font_options_destroy (fopt);
489	}
490	}	590	}
491		591
492	int	592	int
493	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	593	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
494		594
495	void	595	void
496	SDL_Quit ()	596	SDL_Quit ()
497		597
498	void	598	void
…		…
513	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	613	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
514	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	614	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
515	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	615	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
516		616
517	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	617	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		618	#if SDL_VERSION_ATLEAST(1,2,10)
		619	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		620	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		621	#endif
518		622
519	SDL_EnableUNICODE (1);	623	SDL_EnableUNICODE (1);
520	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	624	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
521		625
522	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	626	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
542	RETVAL = !!SDL_SetVideoMode (	646	RETVAL = !!SDL_SetVideoMode (
543	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)	647	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
544	);	648	);
545	if (RETVAL)	649	if (RETVAL)
546	{	650	{
		651	av_clear (texture_av);
		652
547	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	653	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
548	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	654	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
549	# include "glfunc.h"	655	# include "glfunc.h"
550	# undef GL_FUNC	656	# undef GL_FUNC
		657
551	}	658	}
552	OUTPUT:	659	OUTPUT:
553	RETVAL	660	RETVAL
554		661
555	void	662	void
556	SDL_GL_SwapBuffers ()	663	SDL_GL_SwapBuffers ()
557		664
558	char *	665	char *
559	SDL_GetKeyName (int sym)	666	SDL_GetKeyName (int sym)
560		667
		668	int
		669	SDL_GetAppState ()
		670
561	void	671	void
562	SDL_PollEvent ()	672	poll_events ()
563	PPCODE:	673	PPCODE:
564	{	674	{
565	SDL_Event ev;	675	SDL_Event ev;
566		676
567	while (SDL_PollEvent (&ev))	677	SDL_PumpEvents ();
		678	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
568	{	679	{
569	HV *hv = newHV ();	680	HV *hv = newHV ();
570	hv_store (hv, "type", 4, newSViv (ev.type), 0);	681	hv_store (hv, "type", 4, newSViv (ev.type), 0);
571		682
572	switch (ev.type)	683	switch (ev.type)
…		…
574	case SDL_KEYDOWN:	685	case SDL_KEYDOWN:
575	case SDL_KEYUP:	686	case SDL_KEYUP:
576	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	687	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
577	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	688	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
578	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	689	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		690	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
579	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	691	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
580	break;	692	break;
581		693
582	case SDL_ACTIVEEVENT:	694	case SDL_ACTIVEEVENT:
583	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	695	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
584	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	696	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
585	break;	697	break;
586		698
587	case SDL_MOUSEMOTION:	699	case SDL_MOUSEMOTION:
		700	{
		701	int state = ev.motion.state;
		702	int x = ev.motion.x;
		703	int y = ev.motion.y;
		704	int xrel = ev.motion.xrel;
		705	int yrel = ev.motion.yrel;
		706
		707	/* do simplistic event compression */
		708	while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
		709	&& state == ev.motion.state)
		710	{
		711	xrel += ev.motion.xrel;
		712	yrel += ev.motion.yrel;
		713	x = ev.motion.x;
		714	y = ev.motion.y;
		715	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
		716	}
		717
588	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	718	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
589
590	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	719	hv_store (hv, "state", 5, newSViv (state), 0);
591	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	720	hv_store (hv, "x", 1, newSViv (x), 0);
592	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	721	hv_store (hv, "y", 1, newSViv (y), 0);
593	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	722	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
594	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	723	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		724	}
595	break;	725	break;
596		726
597	case SDL_MOUSEBUTTONDOWN:	727	case SDL_MOUSEBUTTONDOWN:
598	case SDL_MOUSEBUTTONUP:	728	case SDL_MOUSEBUTTONUP:
599	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	729	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
609	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	739	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
610	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	740	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
611	break;	741	break;
612	}	742	}
613		743
614	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	744	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
615	}	745	}
616	}	746	}
617		747
618	int	748	int
619	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	749	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
628	Mix_AllocateChannels (int numchans = -1)	758	Mix_AllocateChannels (int numchans = -1)
629		759
630	void	760	void
631	lowdelay (int fd, int val = 1)	761	lowdelay (int fd, int val = 1)
632	CODE:	762	CODE:
		763	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
		764
		765	void
		766	win32_proxy_info ()
		767	PPCODE:
		768	{
633	#ifndef _WIN32	769	#ifdef _WIN32
634	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	770	char buffer[2048];
		771	DWORD buflen;
		772
		773	EXTEND (SP, 3);
		774
		775	buflen = sizeof (buffer);
		776	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		777	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		778	{
		779	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		780
		781	buflen = sizeof (buffer);
		782	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		783	{
		784	PUSHs (newSVpv (buffer, 0));
		785
		786	buflen = sizeof (buffer);
		787	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		788	PUSHs (newSVpv (buffer, 0));
		789	}
		790	}
635	#endif	791	#endif
		792	}
636		793
637	void	794	void
638	add_font (char *file)	795	add_font (char *file)
639	CODE:	796	CODE:
640	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	797	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
641	#ifdef _WIN32
642	// cairo... sigh... requires win2000
643	AddFontResourceEx (file, FR_PRIVATE, 0);
644	#endif
645		798
646	void	799	void
647	load_image_inline (SV *image_)	800	load_image_inline (SV *image_)
648	ALIAS:	801	ALIAS:
649	load_image_file = 1	802	load_image_file = 1
…		…
691		844
692	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	845	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
693		846
694	assert (surface2->pitch == surface2->w * 4);	847	assert (surface2->pitch == surface2->w * 4);
695		848
		849	SDL_LockSurface (surface2);
696	EXTEND (SP, 5);	850	EXTEND (SP, 6);
697	PUSHs (sv_2mortal (newSViv (surface2->w)));	851	PUSHs (sv_2mortal (newSViv (surface2->w)));
698	PUSHs (sv_2mortal (newSViv (surface2->h)));	852	PUSHs (sv_2mortal (newSViv (surface2->h)));
699	SDL_LockSurface (surface2);
700	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	853	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
701	SDL_UnlockSurface (surface2);
702	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	854	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
703	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	855	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
704	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	856	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		857	SDL_UnlockSurface (surface2);
705		858
706	SDL_FreeSurface (surface);	859	SDL_FreeSurface (surface);
707	SDL_FreeSurface (surface2);	860	SDL_FreeSurface (surface2);
708	}	861	}
709		862
…		…
748	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	901	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
749	#endif	902	#endif
750	_exit (1);	903	_exit (1);
751		904
752	void	905	void
753	_exit (int retval)	906	_exit (int retval = 0)
754	CODE:	907	CODE:
		908	#ifdef WIN32
		909	ExitThread (retval); // unclean, please beam me up
		910	#else
755	_exit (retval);	911	_exit (retval);
		912	#endif
756		913
		914	void
		915	debug ()
		916	CODE:
		917	{
		918	#if DEBUG
		919	VALGRIND_DO_LEAK_CHECK;
		920	#endif
		921	}
		922
757	MODULE = CFClient PACKAGE = CFClient::Font	923	MODULE = CFPlus PACKAGE = CFPlus::Font
758		924
759	CFClient::Font	925	CFPlus::Font
760	new_from_file (SV *class, char *path, int id = 0)	926	new_from_file (SV *class, char *path, int id = 0)
761	CODE:	927	CODE:
762	{	928	{
763	int count;	929	int count;
764	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	930	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
767	}	933	}
768	OUTPUT:	934	OUTPUT:
769	RETVAL	935	RETVAL
770		936
771	void	937	void
772	DESTROY (CFClient::Font self)	938	DESTROY (CFPlus::Font self)
773	CODE:	939	CODE:
774	pango_font_description_free (self);	940	pango_font_description_free (self);
775		941
776	void	942	void
777	make_default (CFClient::Font self)	943	make_default (CFPlus::Font self)
778	CODE:	944	CODE:
779	default_font = self;	945	default_font = self;
780		946
781	MODULE = CFClient PACKAGE = CFClient::Layout	947	MODULE = CFPlus PACKAGE = CFPlus::Layout
782		948
783	CFClient::Layout	949	void
784	new (SV *class, int rgba = 0)	950	reset_glyph_cache ()
		951	CODE:
		952	tc_clear ();
		953
		954	CFPlus::Layout
		955	new (SV *class)
785	CODE:	956	CODE:
786	New (0, RETVAL, 1, struct cf_layout);	957	New (0, RETVAL, 1, struct cf_layout);
787		958
788	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	959	RETVAL->pl = pango_layout_new (opengl_context);
789	RETVAL->rgba = rgba;
790	RETVAL->r = 1.;	960	RETVAL->r = 1.;
791	RETVAL->g = 1.;	961	RETVAL->g = 1.;
792	RETVAL->b = 1.;	962	RETVAL->b = 1.;
793	RETVAL->a = 1.;	963	RETVAL->a = 1.;
794	RETVAL->base_height = MIN_FONT_HEIGHT;	964	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
798	layout_update_font (RETVAL);	968	layout_update_font (RETVAL);
799	OUTPUT:	969	OUTPUT:
800	RETVAL	970	RETVAL
801		971
802	void	972	void
803	DESTROY (CFClient::Layout self)	973	DESTROY (CFPlus::Layout self)
804	CODE:	974	CODE:
805	g_object_unref (self->pl);	975	g_object_unref (self->pl);
806	Safefree (self);	976	Safefree (self);
807		977
808	int
809	is_rgba (CFClient::Layout self)
810	CODE:
811	RETVAL = self->rgba;
812	OUTPUT:
813	RETVAL
814
815	void	978	void
816	set_text (CFClient::Layout self, SV *text_)	979	set_text (CFPlus::Layout self, SV *text_)
817	CODE:	980	CODE:
818	{	981	{
819	STRLEN textlen;	982	STRLEN textlen;
820	char *text = SvPVutf8 (text_, textlen);	983	char *text = SvPVutf8 (text_, textlen);
821		984
822	pango_layout_set_text (self->pl, text, textlen);	985	pango_layout_set_text (self->pl, text, textlen);
823	}	986	}
824		987
825	void	988	void
826	set_markup (CFClient::Layout self, SV *text_)	989	set_markup (CFPlus::Layout self, SV *text_)
827	CODE:	990	CODE:
828	{	991	{
829	STRLEN textlen;	992	STRLEN textlen;
830	char *text = SvPVutf8 (text_, textlen);	993	char *text = SvPVutf8 (text_, textlen);
831		994
832	pango_layout_set_markup (self->pl, text, textlen);	995	pango_layout_set_markup (self->pl, text, textlen);
833	}	996	}
834		997
835	void	998	void
836	set_shapes (CFClient::Layout self, ...)	999	set_shapes (CFPlus::Layout self, ...)
837	CODE:	1000	CODE:
838	{	1001	{
839	PangoAttrList *attrs = 0;	1002	PangoAttrList *attrs = 0;
840	const char *text = pango_layout_get_text (self->pl);	1003	const char *text = pango_layout_get_text (self->pl);
841	const char *pos = text;	1004	const char *pos = text;
…		…
876	if (attrs)	1039	if (attrs)
877	pango_layout_set_attributes (self->pl, attrs);	1040	pango_layout_set_attributes (self->pl, attrs);
878	}	1041	}
879		1042
880	void	1043	void
881	get_shapes (CFClient::Layout self)	1044	get_shapes (CFPlus::Layout self)
882	PPCODE:	1045	PPCODE:
883	{	1046	{
884	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1047	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
885		1048
886	do	1049	do
…		…
890	if (run && shape_attr_p (run))	1053	if (run && shape_attr_p (run))
891	{	1054	{
892	PangoRectangle extents;	1055	PangoRectangle extents;
893	pango_layout_iter_get_run_extents (iter, 0, &extents);	1056	pango_layout_iter_get_run_extents (iter, 0, &extents);
894		1057
		1058	EXTEND (SP, 2);
895	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));	1059	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
896	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));	1060	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
897	}	1061	}
898	}	1062	}
899	while (pango_layout_iter_next_run (iter));	1063	while (pango_layout_iter_next_run (iter));
900		1064
901	pango_layout_iter_free (iter);	1065	pango_layout_iter_free (iter);
902	}	1066	}
903		1067
904	int	1068	int
905	has_wrapped (CFClient::Layout self)	1069	has_wrapped (CFPlus::Layout self)
906	CODE:	1070	CODE:
907	{	1071	{
908	int lines = 1;	1072	int lines = 1;
909	const char *text = pango_layout_get_text (self->pl);	1073	const char *text = pango_layout_get_text (self->pl);
910		1074
…		…
915	}	1079	}
916	OUTPUT:	1080	OUTPUT:
917	RETVAL	1081	RETVAL
918		1082
919	SV *	1083	SV *
920	get_text (CFClient::Layout self)	1084	get_text (CFPlus::Layout self)
921	CODE:	1085	CODE:
922	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1086	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
923	sv_utf8_decode (RETVAL);	1087	sv_utf8_decode (RETVAL);
924	OUTPUT:	1088	OUTPUT:
925	RETVAL	1089	RETVAL
926		1090
927	void	1091	void
928	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	1092	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
929	CODE:	1093	CODE:
930	self->r = r;	1094	self->r = r;
931	self->g = g;	1095	self->g = g;
932	self->b = b;	1096	self->b = b;
933	self->a = a;	1097	self->a = a;
934		1098
935	void	1099	void
936	set_font (CFClient::Layout self, CFClient::Font font = 0)	1100	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
937	CODE:	1101	CODE:
938	if (self->font != font)	1102	if (self->font != font)
939	{	1103	{
940	self->font = font;	1104	self->font = font;
941	layout_update_font (self);	1105	layout_update_font (self);
942	}	1106	}
943		1107
944	void	1108	void
945	set_height (CFClient::Layout self, int base_height)	1109	set_height (CFPlus::Layout self, int base_height)
946	CODE:	1110	CODE:
947	if (self->base_height != base_height)	1111	if (self->base_height != base_height)
948	{	1112	{
949	self->base_height = base_height;	1113	self->base_height = base_height;
950	layout_update_font (self);	1114	layout_update_font (self);
951	}	1115	}
952		1116
953	void	1117	void
954	set_width (CFClient::Layout self, int max_width = -1)	1118	set_width (CFPlus::Layout self, int max_width = -1)
955	CODE:	1119	CODE:
956	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1120	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
957		1121
958	void	1122	void
959	set_indent (CFClient::Layout self, int indent)	1123	set_indent (CFPlus::Layout self, int indent)
960	CODE:	1124	CODE:
961	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1125	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
962		1126
963	void	1127	void
964	set_spacing (CFClient::Layout self, int spacing)	1128	set_spacing (CFPlus::Layout self, int spacing)
965	CODE:	1129	CODE:
966	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1130	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
967		1131
968	void	1132	void
969	set_ellipsise (CFClient::Layout self, int ellipsise)	1133	set_ellipsise (CFPlus::Layout self, int ellipsise)
970	CODE:	1134	CODE:
971	pango_layout_set_ellipsize (self->pl,	1135	pango_layout_set_ellipsize (self->pl,
972	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1136	ellipsise == 1 ? PANGO_ELLIPSIZE_START
973	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1137	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
974	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1138	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
975	: PANGO_ELLIPSIZE_NONE	1139	: PANGO_ELLIPSIZE_NONE
976	);	1140	);
977		1141
978	void	1142	void
979	set_single_paragraph_mode (CFClient::Layout self, int spm)	1143	set_single_paragraph_mode (CFPlus::Layout self, int spm)
980	CODE:	1144	CODE:
981	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1145	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
982		1146
983	void	1147	void
984	size (CFClient::Layout self)	1148	size (CFPlus::Layout self)
985	PPCODE:	1149	PPCODE:
986	{	1150	{
987	int w, h;	1151	int w, h;
988		1152
989	layout_get_pixel_size (self, &w, &h);	1153	layout_get_pixel_size (self, &w, &h);
…		…
992	PUSHs (sv_2mortal (newSViv (w)));	1156	PUSHs (sv_2mortal (newSViv (w)));
993	PUSHs (sv_2mortal (newSViv (h)));	1157	PUSHs (sv_2mortal (newSViv (h)));
994	}	1158	}
995		1159
996	int	1160	int
997	descent (CFClient::Layout self)	1161	descent (CFPlus::Layout self)
998	CODE:	1162	CODE:
999	{	1163	{
1000	PangoRectangle rect;	1164	PangoRectangle rect;
1001	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1165	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1002	pango_layout_line_get_pixel_extents (line, 0, &rect);	1166	pango_layout_line_get_pixel_extents (line, 0, &rect);
…		…
1004	}	1168	}
1005	OUTPUT:	1169	OUTPUT:
1006	RETVAL	1170	RETVAL
1007		1171
1008	int	1172	int
1009	xy_to_index (CFClient::Layout self, int x, int y)	1173	xy_to_index (CFPlus::Layout self, int x, int y)
1010	CODE:	1174	CODE:
1011	{	1175	{
1012	int index, trailing;	1176	int index, trailing;
1013	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1177	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1014	RETVAL = index;	1178	RETVAL = index + trailing;
1015	}	1179	}
1016	OUTPUT:	1180	OUTPUT:
1017	RETVAL	1181	RETVAL
1018		1182
1019	void	1183	void
1020	cursor_pos (CFClient::Layout self, int index)	1184	cursor_pos (CFPlus::Layout self, int index)
1021	PPCODE:	1185	PPCODE:
1022	{	1186	{
1023	PangoRectangle strong_pos;	1187	PangoRectangle strong_pos;
1024	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1188	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1025		1189
…		…
1028	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1192	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1029	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1193	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1030	}	1194	}
1031		1195
1032	void	1196	void
1033	render (CFClient::Layout self)	1197	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1034	PPCODE:	1198	PPCODE:
1035	{	1199	{
1036	SV *retval;	1200	int line, x;
1037	int w, h;
1038		1201
1039	layout_get_pixel_size (self, &w, &h);	1202	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1203	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1040		1204
1041	if (self->rgba)
1042	{
1043	cairo_surface_t *surface;
1044	cairo_t *cairo;
1045
1046	retval = newSV (w * h * 4);
1047	SvPOK_only (retval);
1048	SvCUR_set (retval, w * h * 4);
1049
1050	memset (SvPVX (retval), 0, w * h * 4);
1051
1052	surface = cairo_image_surface_create_for_data (
1053	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
1054	cairo = cairo_create (surface);
1055	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
1056
1057	pango_cairo_show_layout (cairo, self->pl);
1058
1059	cairo_destroy (cairo);
1060	cairo_surface_destroy (surface);
1061
1062	// what a mess, and its premultiplied, too :(
1063	{
1064	uint32_t *p = (uint32_t *)SvPVX (retval);
1065	uint32_t *e = p + w * h;
1066
1067	while (p < e)
1068	{
1069	uint32_t rgba = *p;
1070	rgba = (rgba >> 24) | (rgba << 8);
1071	#if 0
1072	#ifdef _WIN32
1073	{//D
1074	uint8_t r = rgba >> 24;
1075	uint8_t g = rgba >> 16;
1076	uint8_t b = rgba >> 8;
1077	uint8_t a = rgba >> 0;
1078
1079	rgba = (rgba & 0xffffff00) | a;
1080	}
1081	#endif
1082	#endif
1083	rgba = SDL_SwapBE32 (rgba);
1084	*p++ = rgba;
1085	}
1086	}
1087
1088	EXTEND (SP, 5);	1205	EXTEND (SP, 2);
1089	PUSHs (sv_2mortal (newSViv (w)));	1206	PUSHs (sv_2mortal (newSViv (line - 1)));
		1207	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
		1208	}
		1209
		1210	void
		1211	line_x_to_index (CFPlus::Layout self, int line, int x)
		1212	PPCODE:
		1213	{
		1214	PangoLayoutLine *lp;
		1215	int index, trailing;
		1216
		1217	if (line < 0)
		1218	XSRETURN_EMPTY;
		1219
		1220	if (!(lp = pango_layout_get_line (self->pl, line)))
		1221	XSRETURN_EMPTY; /* do better */
		1222
		1223	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
		1224
		1225	EXTEND (SP, 2);
		1226	if (GIMME_V == G_SCALAR)
1090	PUSHs (sv_2mortal (newSViv (h)));	1227	PUSHs (sv_2mortal (newSViv (index + trailing)));
1091	PUSHs (sv_2mortal (retval));
1092	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1093	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1094	}
1095	else	1228	else
1096	{	1229	{
1097	FT_Bitmap bitmap;
1098
1099	retval = newSV (w * h);
1100	SvPOK_only (retval);
1101	SvCUR_set (retval, w * h);
1102
1103	bitmap.rows = h;
1104	bitmap.width = w;
1105	bitmap.pitch = w;
1106	bitmap.buffer = (unsigned char*)SvPVX (retval);
1107	bitmap.num_grays = 256;
1108	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
1109
1110	memset (bitmap.buffer, 0, w * h);
1111
1112	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
1113
1114	EXTEND (SP, 5);
1115	PUSHs (sv_2mortal (newSViv (w)));	1230	PUSHs (sv_2mortal (newSViv (index)));
1116	PUSHs (sv_2mortal (newSViv (h)));	1231	PUSHs (sv_2mortal (newSViv (trailing)));
1117	PUSHs (sv_2mortal (retval));
1118	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1119	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1120	}	1232	}
1121	}	1233	}
1122		1234
		1235	void
		1236	render (CFPlus::Layout self, float x, float y, int flags = 0)
		1237	PPCODE:
		1238	pango_opengl_render_layout_subpixel (
		1239	self->pl,
		1240	x * PANGO_SCALE, y * PANGO_SCALE,
		1241	self->r, self->g, self->b, self->a,
		1242	flags
		1243	);
		1244
1123	MODULE = CFClient PACKAGE = CFClient::Texture	1245	MODULE = CFPlus PACKAGE = CFPlus::Texture
1124		1246
1125	void	1247	void
1126	pad2pot (SV *data_, SV *w_, SV *h_)	1248	pad2pot (SV *data_, SV *w_, SV *h_)
1127	CODE:	1249	CODE:
1128	{	1250	{
…		…
1206	glDisable (GL_ALPHA_TEST);	1328	glDisable (GL_ALPHA_TEST);
1207	glDisable (GL_BLEND);	1329	glDisable (GL_BLEND);
1208	}	1330	}
1209	}	1331	}
1210		1332
1211	MODULE = CFClient PACKAGE = CFClient::Map	1333	MODULE = CFPlus PACKAGE = CFPlus::Map
1212		1334
1213	CFClient::Map	1335	CFPlus::Map
1214	new (SV *class, int map_width, int map_height)	1336	new (SV *class)
1215	CODE:	1337	CODE:
1216	New (0, RETVAL, 1, struct map);	1338	New (0, RETVAL, 1, struct map);
1217	RETVAL->x = 0;	1339	RETVAL->x = 0;
1218	RETVAL->y = 0;	1340	RETVAL->y = 0;
1219	RETVAL->w = map_width;	1341	RETVAL->w = 0;
1220	RETVAL->h = map_height;	1342	RETVAL->h = 0;
1221	RETVAL->ox = 0;	1343	RETVAL->ox = 0;
1222	RETVAL->oy = 0;	1344	RETVAL->oy = 0;
1223	RETVAL->faces = 8192;	1345	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1224	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1346	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1225	RETVAL->texs = 8192;
1226	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1227	RETVAL->rows = 0;	1347	RETVAL->rows = 0;
1228	RETVAL->row = 0;	1348	RETVAL->row = 0;
1229	OUTPUT:	1349	OUTPUT:
1230	RETVAL	1350	RETVAL
1231		1351
1232	void	1352	void
1233	DESTROY (CFClient::Map self)	1353	DESTROY (CFPlus::Map self)
1234	CODE:	1354	CODE:
1235	{	1355	{
1236	map_clear (self);	1356	map_clear (self);
1237	Safefree (self->face);	1357	Safefree (self->face2tile);
1238	Safefree (self->tex);	1358	Safefree (self->tex);
1239	Safefree (self);	1359	Safefree (self);
1240	}	1360	}
1241		1361
1242	void	1362	void
		1363	resize (CFPlus::Map self, int map_width, int map_height)
		1364	CODE:
		1365	self->w = map_width;
		1366	self->h = map_height;
		1367
		1368	void
1243	clear (CFClient::Map self)	1369	clear (CFPlus::Map self)
1244	CODE:	1370	CODE:
1245	map_clear (self);	1371	map_clear (self);
1246		1372
1247	void	1373	void
1248	set_face (CFClient::Map self, int face, int texid)	1374	set_tileid (CFPlus::Map self, int face, int tile)
1249	CODE:	1375	CODE:
1250	{	1376	{
1251	while (self->faces <= face)	1377	need_facenum (self, face); self->face2tile [face] = tile;
1252	{	1378	need_texid (self, tile);
1253	Append (mapface, self->face, self->faces, self->faces);
1254	self->faces *= 2;
1255	}
1256
1257	self->face [face] = texid;
1258	}	1379	}
1259		1380
1260	void	1381	void
		1382	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1383	CODE:
		1384	{
		1385	tileid texid;
		1386	maptex *tex;
		1387
		1388	if (face < 0 || face >= self->faces)
		1389	return;
		1390
		1391	if (smooth < 0 || smooth >= self->faces)
		1392	return;
		1393
		1394	texid = self->face2tile [face];
		1395
		1396	if (!texid)
		1397	return;
		1398
		1399	tex = self->tex + texid;
		1400	tex->smoothtile = self->face2tile [smooth];
		1401	tex->smoothlevel = level;
		1402	}
		1403
		1404	void
1261	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)	1405	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)
1262	CODE:	1406	CODE:
1263	{	1407	{
1264	while (self->texs <= texid)	1408	need_texid (self, texid);
1265	{
1266	Append (maptex, self->tex, self->texs, self->texs);
1267	self->texs *= 2;
1268	}
1269		1409
1270	{	1410	{
1271	maptex *tex = self->tex + texid;	1411	maptex *tex = self->tex + texid;
1272		1412
1273	tex->name = name;	1413	tex->name = name;
…		…
1290	// from transparent color bleeding and ugly wrapping effects.	1430	// from transparent color bleeding and ugly wrapping effects.
1291	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1431	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1292	}	1432	}
1293		1433
1294	int	1434	int
1295	ox (CFClient::Map self)	1435	ox (CFPlus::Map self)
1296	ALIAS:	1436	ALIAS:
1297	oy = 1	1437	oy = 1
1298	x = 2	1438	x = 2
1299	y = 3	1439	y = 3
1300	w = 4	1440	w = 4
…		…
1311	}	1451	}
1312	OUTPUT:	1452	OUTPUT:
1313	RETVAL	1453	RETVAL
1314		1454
1315	void	1455	void
1316	scroll (CFClient::Map self, int dx, int dy)	1456	scroll (CFPlus::Map self, int dx, int dy)
1317	CODE:	1457	CODE:
1318	{	1458	{
1319	if (dx > 0)	1459	if (dx > 0)
1320	map_blank (self, self->x, self->y, dx - 1, self->h);	1460	map_blank (self, self->x, self->y, dx, self->h);
1321	else if (dx < 0)	1461	else if (dx < 0)
1322	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1462	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1323		1463
1324	if (dy > 0)	1464	if (dy > 0)
1325	map_blank (self, self->x, self->y, self->w, dy - 1);	1465	map_blank (self, self->x, self->y, self->w, dy);
1326	else if (dy < 0)	1466	else if (dy < 0)
1327	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1467	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1328		1468
1329	self->ox += dx; self->x += dx;	1469	self->ox += dx; self->x += dx;
1330	self->oy += dy; self->y += dy;	1470	self->oy += dy; self->y += dy;
1331		1471
1332	while (self->y < 0)	1472	while (self->y < 0)
…		…
1337	self->y += MAP_EXTEND_Y;	1477	self->y += MAP_EXTEND_Y;
1338	}	1478	}
1339	}	1479	}
1340		1480
1341	void	1481	void
1342	map1a_update (CFClient::Map self, SV *data_)	1482	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1343	CODE:	1483	CODE:
1344	{	1484	{
1345	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1485	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1346	uint8_t *data_end = (uint8_t *)SvEND (data_);	1486	uint8_t *data_end = (uint8_t *)SvEND (data_);
1347	mapcell *cell;	1487	mapcell *cell;
1348	int x, y, flags;	1488	int x, y, flags;
1349		1489
1350	while (data < data_end)	1490	while (data < data_end - 1)
1351	{	1491	{
1352	flags = (data [0] << 8) + data [1]; data += 2;	1492	flags = (data [0] << 8) + data [1]; data += 2;
1353		1493
1354	x = self->x + ((flags >> 10) & 63);	1494	x = self->x + ((flags >> 10) & 63);
1355	y = self->y + ((flags >> 4) & 63);	1495	y = self->y + ((flags >> 4) & 63);
1356		1496
1357	cell = map_get_cell (self, x, y);	1497	cell = map_get_cell (self, x, y);
1358		1498
1359	if (flags & 15)	1499	if (flags & 15)
1360	{	1500	{
1361	if (cell->darkness < 0)	1501	if (!cell->darkness)
1362	{	1502	{
		1503	memset (cell, 0, sizeof (*cell));
1363	cell->darkness = 0;	1504	cell->darkness = 256;
1364	cell->face [0] = 0;
1365	cell->face [1] = 0;
1366	cell->face [2] = 0;
1367	}	1505	}
1368		1506
1369	cell->darkness = flags & 8 ? *data++ : 255;
1370
1371	//TODO: don't trust server data to be in-range(!)	1507	//TODO: don't trust server data to be in-range(!)
		1508
		1509	if (flags & 8)
		1510	{
		1511	if (extmap)
		1512	{
		1513	uint8_t ext, cmd;
		1514
		1515	do
		1516	{
		1517	ext = *data++;
		1518	cmd = ext & 0x3f;
		1519
		1520	if (cmd < 4)
		1521	cell->darkness = 255 - ext * 64 + 1;
		1522	else if (cmd == 5) // health
		1523	{
		1524	cell->stat_width = 1;
		1525	cell->stat_hp = *data++;
		1526	}
		1527	else if (cmd == 6) // monster width
		1528	cell->stat_width = *data++ + 1;
		1529	else if (cmd == 0x47)
		1530	{
		1531	if (*data == 4)
		1532	; // decode player count
		1533
		1534	data += *data + 1;
		1535	}
		1536	else if (cmd == 8) // cell flags
		1537	cell->flags = *data++;
		1538	else if (ext & 0x40) // unknown, multibyte => skip
		1539	data += *data + 1;
		1540	else
		1541	data++;
		1542	}
		1543	while (ext & 0x80);
		1544	}
		1545	else
		1546	cell->darkness = *data++ + 1;
		1547	}
1372		1548
1373	if (flags & 4)	1549	if (flags & 4)
1374	{	1550	{
1375	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1551	faceid face = (data [0] << 8) + data [1]; data += 2;
		1552	need_facenum (self, face);
		1553	cell->tile [0] = self->face2tile [face];
1376	}	1554	}
1377		1555
1378	if (flags & 2)	1556	if (flags & 2)
1379	{	1557	{
1380	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1558	faceid face = (data [0] << 8) + data [1]; data += 2;
		1559	need_facenum (self, face);
		1560	cell->tile [1] = self->face2tile [face];
1381	}	1561	}
1382		1562
1383	if (flags & 1)	1563	if (flags & 1)
1384	{	1564	{
1385	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1565	faceid face = (data [0] << 8) + data [1]; data += 2;
		1566	need_facenum (self, face);
		1567	cell->tile [2] = self->face2tile [face];
1386	}	1568	}
1387	}	1569	}
1388	else	1570	else
1389	cell->darkness = -1;	1571	cell->darkness = 0;
1390	}	1572	}
1391	}	1573	}
1392		1574
1393	SV *	1575	SV *
1394	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1576	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1395	CODE:	1577	CODE:
1396	{	1578	{
1397	int x1, x;	1579	int x1, x;
1398	int y1, y;	1580	int y1, y;
1399	int z;	1581	int z;
…		…
1420	{	1602	{
1421	mapcell *cell = row->col + (x - row->c0);	1603	mapcell *cell = row->col + (x - row->c0);
1422		1604
1423	for (z = 0; z <= 0; z++)	1605	for (z = 0; z <= 0; z++)
1424	{	1606	{
1425	mapface face = cell->face [z];
1426
1427	if (face)
1428	{
1429	maptex tex = self->tex [face];	1607	maptex tex = self->tex [cell->tile [z]];
1430	int a0 = 255 - tex.a;	1608	int a0 = 255 - tex.a;
1431	int a1 = tex.a;	1609	int a1 = tex.a;
1432		1610
1433	r = (r * a0 + tex.r * a1) / 255;	1611	r = (r * a0 + tex.r * a1) / 255;
1434	g = (g * a0 + tex.g * a1) / 255;	1612	g = (g * a0 + tex.g * a1) / 255;
1435	b = (b * a0 + tex.b * a1) / 255;	1613	b = (b * a0 + tex.b * a1) / 255;
1436	a = (a * a0 + tex.a * a1) / 255;	1614	a = (a * a0 + tex.a * a1) / 255;
1437	}
1438	}	1615	}
1439	}	1616	}
1440		1617
1441	*map++ = (r )	1618	*map++ = (r )
1442	| (g << 8)	1619	| (g << 8)
…		…
1449	}	1626	}
1450	OUTPUT:	1627	OUTPUT:
1451	RETVAL	1628	RETVAL
1452		1629
1453	void	1630	void
1454	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1631	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1455	CODE:	1632	CODE:
1456	{	1633	{
1457	int vx, vy;	1634	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
		1635	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1636	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1637	smooth_key skey;
1458	int x, y, z;	1638	int x, y, z;
1459	int last_name;	1639	int last_name;
1460	mapface face;
1461		1640
1462	vx = self->x + self->w / 2 - sw / 2 - shift_x;	1641	// thats current max. sorry.
1463	vy = self->y + self->h / 2 - sh / 2 - shift_y;	1642	if (sw > 255) sw = 255;
		1643	if (sh > 255) sh = 255;
1464		1644
1465	/*	1645	// clear key, in case of extra padding
1466	int vx = self->vx = self->w >= sw	1646	memset (&skey, 0, sizeof (skey));
1467	? self->x + (self->w - sw) / 2
1468	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1469
1470	int vy = self->vy = self->h >= sh
1471	? self->y + (self->h - sh) / 2
1472	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1473	*/
1474		1647
1475	glColor4ub (255, 255, 255, 255);	1648	glColor4ub (255, 255, 255, 255);
1476		1649
1477	glEnable (GL_BLEND);	1650	glEnable (GL_BLEND);
1478	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1651	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1481		1654
1482	glBegin (GL_QUADS);	1655	glBegin (GL_QUADS);
1483		1656
1484	last_name = 0;	1657	last_name = 0;
1485		1658
		1659	mx += self->x;
		1660	my += self->y;
		1661
		1662	// first pass: determine smooth_max
		1663	// rather ugly, if you ask me
		1664	// could also be stored inside mapcell and updated on change
		1665	memset (smooth_max, 0, sizeof (smooth_max));
		1666
		1667	for (y = 0; y < sh; y++)
		1668	if (0 <= y + my && y + my < self->rows)
		1669	{
		1670	maprow *row = self->row + (y + my);
		1671
		1672	for (x = 0; x < sw; x++)
		1673	if (row->c0 <= x + mx && x + mx < row->c1)
		1674	{
		1675	mapcell *cell = row->col + (x + mx - row->c0);
		1676
		1677	smooth_max[x + 1][y + 1] =
		1678	MAX (self->tex [cell->tile [0]].smoothlevel,
		1679	MAX (self->tex [cell->tile [1]].smoothlevel,
		1680	self->tex [cell->tile [2]].smoothlevel));
		1681	}
		1682	}
		1683
1486	for (z = 0; z < 3; z++)	1684	for (z = 0; z <= 2; z++)
		1685	{
		1686	memset (smooth_level, 0, sizeof (smooth_level));
		1687
1487	for (y = 0; y < sh; y++)	1688	for (y = 0; y < sh; y++)
1488	if (0 <= y + vy && y + vy < self->rows)	1689	if (0 <= y + my && y + my < self->rows)
1489	{	1690	{
1490	maprow *row = self->row + (y + vy);	1691	maprow *row = self->row + (y + my);
1491		1692
1492	for (x = 0; x < sw; x++)	1693	for (x = 0; x < sw; x++)
1493	if (row->c0 <= x + vx && x + vx < row->c1)	1694	if (row->c0 <= x + mx && x + mx < row->c1)
1494	{	1695	{
1495	mapcell *cell = row->col + (x + vx - row->c0);	1696	mapcell *cell = row->col + (x + mx - row->c0);
1496
1497	face = cell->face [z];	1697	tileid tile = cell->tile [z];
1498		1698
1499	if (face)	1699	if (tile)
		1700	{
		1701	maptex tex = self->tex [tile];
		1702	int px = (x + 1) * T - tex.w;
		1703	int py = (y + 1) * T - tex.h;
		1704
		1705	// suppressing texture state switches here
		1706	// is only moderately effective, but worth the extra effort
		1707	if (last_name != tex.name)
		1708	{
		1709	if (!tex.name)
		1710	tex = self->tex [2]; /* missing, replace by noface */
		1711
		1712	glEnd ();
		1713	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1714	glBegin (GL_QUADS);
		1715	}
		1716
		1717	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1718	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1719	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1720	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1721
		1722	if (cell->flags && z == 2)
		1723	{
		1724	if (cell->flags & 1)
		1725	{
		1726	maptex tex = self->tex [1];
		1727	int px = x * T + T * 2 / 32;
		1728	int py = y * T - T * 6 / 32;
		1729
		1730	glEnd ();
		1731	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1732	glBegin (GL_QUADS);
		1733
		1734	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1735	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1736	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1737	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1738	}
		1739	}
		1740
		1741	// update smooth hash
		1742	if (tex.smoothtile)
		1743	{
		1744	skey.tile = tex.smoothtile;
		1745	skey.level = tex.smoothlevel;
		1746
		1747	smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
		1748
		1749	// add bits to current tile and all neighbours. skey.x|y is
		1750	// shifted +1|+1 so we always stay positive.
		1751
		1752	// bits is ___n cccc CCCC bbbb
		1753	// n do not draw borders&corners
		1754	// c draw these corners, but...
		1755	// C ... not these
		1756	// b draw these borders
		1757
		1758	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1759	// ┃· ·· ·┃ ━━
		1760
		1761	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1762	// ·· ·· ·┏ ┓·
		1763
		1764	// full tile
		1765	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1766
		1767	// borders
		1768	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1769	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1770	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1771	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1772
		1773	// corners
		1774	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1775	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1776	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1777	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1778	}
		1779	}
		1780	}
		1781	}
		1782
		1783	// go through all smoothlevels, lowest to highest, then draw.
		1784	// this is basically counting sort
		1785	{
		1786	int w, b;
		1787
		1788	for (w = 0; w < 256 / 32; ++w)
		1789	{
		1790	uint32_t smask = smooth_level [w];
		1791	if (smask)
		1792	for (b = 0; b < 32; ++b)
		1793	if (smask & (((uint32_t)1) << b))
1500	{	1794	{
1501	maptex tex = self->tex [face];	1795	int level = (w << 5) | b;
		1796	HE *he;
1502		1797
1503	int px = (x + 1) * 32 - tex.w;	1798	hv_iterinit (smooth);
1504	int py = (y + 1) * 32 - tex.h;	1799	while ((he = hv_iternext (smooth)))
1505
1506	if (last_name != tex.name)
1507	{	1800	{
		1801	smooth_key *skey = (smooth_key *)HeKEY (he);
		1802	IV bits = SvIVX (HeVAL (he));
		1803
		1804	if (!(bits & 0x1000)
		1805	&& skey->level == level
		1806	&& level > smooth_max [skey->x][skey->y])
		1807	{
		1808	maptex tex = self->tex [skey->tile];
		1809	int px = (((int)skey->x) - 1) * T;
		1810	int py = (((int)skey->y) - 1) * T;
		1811	int border = bits & 15;
		1812	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1813	float dx = tex.s * .0625f; // 16 images/row
		1814	float dy = tex.t * .5f ; // 2 images/column
		1815
		1816	// this time naively avoiding texture state changes
		1817	// save gobs of state changes.
		1818	if (last_name != tex.name)
		1819	{
		1820	if (!tex.name)
		1821	continue; // smoothing not yet available
		1822
1508	glEnd ();	1823	glEnd ();
1509	last_name = tex.name;
1510	glBindTexture (GL_TEXTURE_2D, last_name);	1824	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1511	glBegin (GL_QUADS);	1825	glBegin (GL_QUADS);
		1826	}
		1827
		1828	if (border)
		1829	{
		1830	float ox = border * dx;
		1831
		1832	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1833	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1834	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1835	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1836	}
		1837
		1838	if (corner)
		1839	{
		1840	float ox = corner * dx;
		1841
		1842	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1843	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1844	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1845	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1846	}
		1847	}
1512	}	1848	}
1513
1514	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1515	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1516	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1517	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1518	}	1849	}
1519	}
1520	}	1850	}
		1851	}
		1852
		1853	hv_clear (smooth);
		1854	}
1521		1855
1522	glEnd ();	1856	glEnd ();
1523		1857
1524	glDisable (GL_TEXTURE_2D);	1858	glDisable (GL_TEXTURE_2D);
1525	glDisable (GL_BLEND);	1859	glDisable (GL_BLEND);
1526	}
1527		1860
		1861	// top layer: overlays such as the health bar
		1862	for (y = 0; y < sh; y++)
		1863	if (0 <= y + my && y + my < self->rows)
		1864	{
		1865	maprow *row = self->row + (y + my);
		1866
		1867	for (x = 0; x < sw; x++)
		1868	if (row->c0 <= x + mx && x + mx < row->c1)
		1869	{
		1870	mapcell *cell = row->col + (x + mx - row->c0);
		1871
		1872	int px = x * T;
		1873	int py = y * T;
		1874
		1875	if (cell->stat_hp)
		1876	{
		1877	int width = cell->stat_width * T;
		1878	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
		1879
		1880	glColor3ub (0, 0, 0);
		1881	glRectf (px + 1, py - thick - 2,
		1882	px + width - 1, py);
		1883
		1884	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1885	glRectf (px + 2,
		1886	py - thick - 1,
		1887	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1888	}
		1889	}
		1890	}
		1891	}
		1892
1528	void	1893	void
1529	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1894	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1530	CODE:	1895	CODE:
1531	{	1896	{
1532	static float color[16][3] = {	1897	static float color[16][3] = {
1533	{ 0.00, 0.00, 0.00 },	1898	{ 0.00F, 0.00F, 0.00F },
1534	{ 1.00, 1.00, 1.00 },	1899	{ 1.00F, 1.00F, 1.00F },
1535	{ 0.00, 0.00, 0.55 },	1900	{ 0.00F, 0.00F, 0.55F },
1536	{ 1.00, 0.00, 0.00 },	1901	{ 1.00F, 0.00F, 0.00F },
1537		1902
1538	{ 1.00, 0.54, 0.00 },	1903	{ 1.00F, 0.54F, 0.00F },
1539	{ 0.11, 0.56, 1.00 },	1904	{ 0.11F, 0.56F, 1.00F },
1540	{ 0.93, 0.46, 0.00 },	1905	{ 0.93F, 0.46F, 0.00F },
1541	{ 0.18, 0.54, 0.34 },	1906	{ 0.18F, 0.54F, 0.34F },
1542		1907
1543	{ 0.56, 0.73, 0.56 },	1908	{ 0.56F, 0.73F, 0.56F },
1544	{ 0.80, 0.80, 0.80 },	1909	{ 0.80F, 0.80F, 0.80F },
1545	{ 0.55, 0.41, 0.13 },	1910	{ 0.55F, 0.41F, 0.13F },
1546	{ 0.99, 0.77, 0.26 },	1911	{ 0.99F, 0.77F, 0.26F },
1547		1912
1548	{ 0.74, 0.65, 0.41 },	1913	{ 0.74F, 0.65F, 0.41F },
1549		1914
1550	{ 0.00, 1.00, 1.00 },	1915	{ 0.00F, 1.00F, 1.00F },
1551	{ 1.00, 0.00, 1.00 },	1916	{ 1.00F, 0.00F, 1.00F },
1552	{ 1.00, 1.00, 0.00 },	1917	{ 1.00F, 1.00F, 0.00F },
1553	};	1918	};
1554		1919
1555	int x, y;	1920	int x, y;
1556		1921
1557	glEnable (GL_TEXTURE_2D);	1922	glEnable (GL_TEXTURE_2D);
…		…
1584	glDisable (GL_BLEND);	1949	glDisable (GL_BLEND);
1585	glDisable (GL_TEXTURE_2D);	1950	glDisable (GL_TEXTURE_2D);
1586	}	1951	}
1587		1952
1588	void	1953	void
1589	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1954	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1590	PPCODE:	1955	PPCODE:
1591	{	1956	{
1592	int vx, vy;
1593	int x, y;	1957	int x, y;
1594	int sw4 = (sw + 3) & ~3;	1958	int sw4 = (sw + 3) & ~3;
1595	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));	1959	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1596	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);	1960	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1597		1961
1598	memset (darkness, 255, sw4 * sh);	1962	memset (darkness, 255, sw4 * sh);
1599	SvPOK_only (darkness_sv);	1963	SvPOK_only (darkness_sv);
1600	SvCUR_set (darkness_sv, sw4 * sh);	1964	SvCUR_set (darkness_sv, sw4 * sh);
1601		1965
1602	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1966	mx += self->x;
1603	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1967	my += self->y;
1604		1968
1605	for (y = 0; y < sh; y++)	1969	for (y = 0; y < sh; y++)
1606	if (0 <= y + vy && y + vy < self->rows)	1970	if (0 <= y + my && y + my < self->rows)
1607	{	1971	{
1608	maprow *row = self->row + (y + vy);	1972	maprow *row = self->row + (y + my);
1609		1973
1610	for (x = 0; x < sw; x++)	1974	for (x = 0; x < sw; x++)
1611	if (row->c0 <= x + vx && x + vx < row->c1)	1975	if (row->c0 <= x + mx && x + mx < row->c1)
1612	{	1976	{
1613	mapcell *cell = row->col + (x + vx - row->c0);	1977	mapcell *cell = row->col + (x + mx - row->c0);
1614		1978
1615	darkness[y * sw4 + x] = cell->darkness < 0	1979	darkness[y * sw4 + x] = cell->darkness
		1980	? 255 - (cell->darkness - 1)
1616	? 255 - FOW_DARKNESS	1981	: 255 - FOW_DARKNESS;
1617	: 255 - cell->darkness;
1618	}	1982	}
1619	}	1983	}
1620		1984
1621	EXTEND (SP, 3);	1985	EXTEND (SP, 3);
1622	PUSHs (sv_2mortal (newSViv (sw4)));	1986	PUSHs (sv_2mortal (newSViv (sw4)));
1623	PUSHs (sv_2mortal (newSViv (sh)));	1987	PUSHs (sv_2mortal (newSViv (sh)));
1624	PUSHs (darkness_sv);	1988	PUSHs (darkness_sv);
1625	}	1989	}
1626		1990
1627	SV *	1991	SV *
1628	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1992	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1629	CODE:	1993	CODE:
1630	{	1994	{
1631	int x, y, x1, y1;	1995	int x, y, x1, y1;
1632	SV *data_sv = newSV (w * h * 7 + 5);	1996	SV *data_sv = newSV (w * h * 7 + 5);
1633	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1997	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1658	if (row && row->c0 <= x && x < row->c1)	2022	if (row && row->c0 <= x && x < row->c1)
1659	{	2023	{
1660	mapcell *cell = row->col + (x - row->c0);	2024	mapcell *cell = row->col + (x - row->c0);
1661	uint8_t flags = 0;	2025	uint8_t flags = 0;
1662		2026
1663	if (cell->face [0]) flags |= 1;	2027	if (cell->tile [0]) flags |= 1;
1664	if (cell->face [1]) flags |= 2;	2028	if (cell->tile [1]) flags |= 2;
1665	if (cell->face [2]) flags |= 4;	2029	if (cell->tile [2]) flags |= 4;
1666		2030
1667	*data++ = flags;	2031	*data++ = flags;
1668		2032
1669	if (flags & 1)	2033	if (flags & 1)
1670	{	2034	{
		2035	tileid tile = cell->tile [0];
1671	*data++ = cell->face [0] >> 8;	2036	*data++ = tile >> 8;
1672	*data++ = cell->face [0];	2037	*data++ = tile;
1673	}	2038	}
1674		2039
1675	if (flags & 2)	2040	if (flags & 2)
1676	{	2041	{
		2042	tileid tile = cell->tile [1];
1677	*data++ = cell->face [1] >> 8;	2043	*data++ = tile >> 8;
1678	*data++ = cell->face [1];	2044	*data++ = tile;
1679	}	2045	}
1680		2046
1681	if (flags & 4)	2047	if (flags & 4)
1682	{	2048	{
		2049	tileid tile = cell->tile [2];
1683	*data++ = cell->face [2] >> 8;	2050	*data++ = tile >> 8;
1684	*data++ = cell->face [2];	2051	*data++ = tile;
1685	}	2052	}
1686	}	2053	}
1687	else	2054	else
1688	*data++ = 0;	2055	*data++ = 0;
1689	}	2056	}
…		…
1695	}	2062	}
1696	OUTPUT:	2063	OUTPUT:
1697	RETVAL	2064	RETVAL
1698		2065
1699	void	2066	void
1700	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	2067	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1701	PPCODE:	2068	PPCODE:
1702	{	2069	{
1703	int x, y, z;	2070	int x, y, z;
1704	int w, h;	2071	int w, h;
1705	int x1, y1;	2072	int x1, y1;
…		…
1729	{	2096	{
1730	uint8_t flags = *data++;	2097	uint8_t flags = *data++;
1731		2098
1732	if (flags)	2099	if (flags)
1733	{	2100	{
1734	mapface face[3] = { 0, 0, 0 };
1735
1736	mapcell *cell = row_get_cell (row, x);	2101	mapcell *cell = row_get_cell (row, x);
		2102	tileid tile[3] = { 0, 0, 0 };
1737		2103
1738	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	2104	if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1739	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	2105	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1740	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	2106	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1741		2107
1742	if (cell->darkness <= 0)	2108	if (cell->darkness == 0)
1743	{	2109	{
1744	cell->darkness = -1;	2110	cell->darkness = 0;
1745		2111
1746	for (z = 0; z <= 2; z++)	2112	for (z = 0; z <= 2; z++)
1747	{	2113	{
1748	cell->face[z] = face[z];	2114	tileid t = tile [z];
1749		2115
1750	if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name))	2116	if (t >= self->texs || (t && !self->tex [t].name))
		2117	{
1751	XPUSHs (sv_2mortal (newSViv (face[z])));	2118	XPUSHs (sv_2mortal (newSViv (t)));
		2119	need_texid (self, t);
		2120	}
		2121
		2122	cell->tile [z] = t;
1752	}	2123	}
1753	}	2124	}
1754	}	2125	}
1755	}	2126	}
1756	}	2127	}
1757	}	2128	}
1758		2129
1759	MODULE = CFClient PACKAGE = CFClient::MixChunk	2130	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1760		2131
1761	CFClient::MixChunk	2132	CFPlus::MixChunk
1762	new_from_file (SV *class, char *path)	2133	new_from_file (SV *class, char *path)
1763	CODE:	2134	CODE:
1764	RETVAL = Mix_LoadWAV (path);	2135	RETVAL = Mix_LoadWAV (path);
1765	OUTPUT:	2136	OUTPUT:
1766	RETVAL	2137	RETVAL
1767		2138
1768	void	2139	void
1769	DESTROY (CFClient::MixChunk self)	2140	DESTROY (CFPlus::MixChunk self)
1770	CODE:	2141	CODE:
1771	Mix_FreeChunk (self);	2142	Mix_FreeChunk (self);
1772		2143
1773	int	2144	int
1774	volume (CFClient::MixChunk self, int volume = -1)	2145	volume (CFPlus::MixChunk self, int volume = -1)
1775	CODE:	2146	CODE:
1776	RETVAL = Mix_VolumeChunk (self, volume);	2147	RETVAL = Mix_VolumeChunk (self, volume);
1777	OUTPUT:	2148	OUTPUT:
1778	RETVAL	2149	RETVAL
1779		2150
1780	int	2151	int
1781	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	2152	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1782	CODE:	2153	CODE:
1783	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2154	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1784	OUTPUT:	2155	OUTPUT:
1785	RETVAL	2156	RETVAL
1786		2157
1787	MODULE = CFClient PACKAGE = CFClient::MixMusic	2158	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1788		2159
1789	int	2160	int
1790	volume (int volume = -1)	2161	volume (int volume = -1)
1791	CODE:	2162	CODE:
1792	RETVAL = Mix_VolumeMusic (volume);	2163	RETVAL = Mix_VolumeMusic (volume);
1793	OUTPUT:	2164	OUTPUT:
1794	RETVAL	2165	RETVAL
1795		2166
		2167	int
		2168	fade_out (int ms)
		2169	CODE:
		2170	RETVAL = Mix_FadeOutMusic (ms);
		2171	OUTPUT:
		2172	RETVAL
		2173
1796	CFClient::MixMusic	2174	CFPlus::MixMusic
1797	new_from_file (SV *class, char *path)	2175	new_from_file (SV *class, char *path)
1798	CODE:	2176	CODE:
1799	RETVAL = Mix_LoadMUS (path);	2177	RETVAL = Mix_LoadMUS (path);
1800	OUTPUT:	2178	OUTPUT:
1801	RETVAL	2179	RETVAL
1802		2180
1803	void	2181	void
1804	DESTROY (CFClient::MixMusic self)	2182	DESTROY (CFPlus::MixMusic self)
1805	CODE:	2183	CODE:
1806	Mix_FreeMusic (self);	2184	Mix_FreeMusic (self);
1807		2185
1808	int	2186	int
1809	play (CFClient::MixMusic self, int loops = -1)	2187	play (CFPlus::MixMusic self, int loops = -1)
1810	CODE:	2188	CODE:
1811	RETVAL = Mix_PlayMusic (self, loops);	2189	RETVAL = Mix_PlayMusic (self, loops);
1812	OUTPUT:	2190	OUTPUT:
1813	RETVAL	2191	RETVAL
1814		2192
		2193	int
		2194	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2195	CODE:
		2196	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
		2197	OUTPUT:
		2198	RETVAL
		2199
1815	MODULE = CFClient PACKAGE = CFClient::OpenGL	2200	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1816		2201
1817	BOOT:	2202	BOOT:
1818	{	2203	{
1819	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	2204	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1820	static const struct {	2205	static const struct {
1821	const char *name;	2206	const char *name;
1822	IV iv;	2207	IV iv;
1823	} *civ, const_iv[] = {	2208	} *civ, const_iv[] = {
1824	# define const_iv(name) { # name, (IV)name }	2209	# define const_iv(name) { # name, (IV)name }
…		…
1887	const_iv (GL_SEPARABLE_2D),	2272	const_iv (GL_SEPARABLE_2D),
1888	const_iv (GL_CONVOLUTION_2D),	2273	const_iv (GL_CONVOLUTION_2D),
1889	const_iv (GL_CONVOLUTION_BORDER_MODE),	2274	const_iv (GL_CONVOLUTION_BORDER_MODE),
1890	const_iv (GL_CONSTANT_BORDER),	2275	const_iv (GL_CONSTANT_BORDER),
1891	const_iv (GL_LINES),	2276	const_iv (GL_LINES),
		2277	const_iv (GL_LINE_STRIP),
1892	const_iv (GL_LINE_LOOP),	2278	const_iv (GL_LINE_LOOP),
1893	const_iv (GL_QUADS),	2279	const_iv (GL_QUADS),
1894	const_iv (GL_QUAD_STRIP),	2280	const_iv (GL_QUAD_STRIP),
1895	const_iv (GL_TRIANGLES),	2281	const_iv (GL_TRIANGLES),
1896	const_iv (GL_TRIANGLE_STRIP),	2282	const_iv (GL_TRIANGLE_STRIP),
…		…
1904	# undef const_iv	2290	# undef const_iv
1905	};	2291	};
1906		2292
1907	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2293	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1908	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2294	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2295
		2296	texture_av = newAV ();
		2297	AvREAL_off (texture_av);
1909	}	2298	}
1910		2299
1911	char *	2300	char *
1912	gl_vendor ()	2301	gl_vendor ()
1913	CODE:	2302	CODE:
…		…
2006	r *= a;	2395	r *= a;
2007	g *= a;	2396	g *= a;
2008	b *= a;	2397	b *= a;
2009	}	2398	}
2010	// microsoft visual "c" rounds instead of truncating...	2399	// microsoft visual "c" rounds instead of truncating...
2011	glColor4ub (MIN ((int)(r * 256.f), 255),	2400	glColor4f (r, g, b, a);
2012	MIN ((int)(g * 256.f), 255),
2013	MIN ((int)(b * 256.f), 255),
2014	MIN ((int)(a * 256.f), 255));
2015		2401
2016	void glInterleavedArrays (int format, int stride, char *data)	2402	void glInterleavedArrays (int format, int stride, char *data)
2017		2403
2018	void glDrawElements (int mode, int count, int type, char *indices)	2404	void glDrawElements (int mode, int count, int type, char *indices)
2019		2405
…		…
2065		2451
2066	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2452	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2067		2453
2068	int glGenTexture ()	2454	int glGenTexture ()
2069	CODE:	2455	CODE:
2070	{	2456	RETVAL = gen_texture ();
2071	GLuint name;
2072	glGenTextures (1, &name);
2073	RETVAL = name;
2074	}
2075	OUTPUT:	2457	OUTPUT:
2076	RETVAL	2458	RETVAL
2077		2459
2078	void glDeleteTexture (int name)	2460	void glDeleteTexture (int name)
2079	CODE:	2461	CODE:
2080	{
2081	GLuint name_ = name;
2082	glDeleteTextures (1, &name_);	2462	del_texture (name);
2083	}	2463
2084
2085	int glGenList ()	2464	int glGenList ()
2086	CODE:	2465	CODE:
2087	RETVAL = glGenLists (1);	2466	RETVAL = glGenLists (1);
2088	OUTPUT:	2467	OUTPUT:
2089	RETVAL	2468	RETVAL
…		…
2096		2475
2097	void glEndList ()	2476	void glEndList ()
2098		2477
2099	void glCallList (int list)	2478	void glCallList (int list)
2100		2479
2101

Diff Legend

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