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.197 by root, Sun Jul 15 21:08:40 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
…		…
557		664
558	char *	665	char *
559	SDL_GetKeyName (int sym)	666	SDL_GetKeyName (int sym)
560		667
561	void	668	void
562	SDL_PollEvent ()	669	poll_events ()
563	PPCODE:	670	PPCODE:
564	{	671	{
565	SDL_Event ev;	672	SDL_Event ev;
566		673
567	while (SDL_PollEvent (&ev))	674	SDL_PumpEvents ();
		675	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
568	{	676	{
569	HV *hv = newHV ();	677	HV *hv = newHV ();
570	hv_store (hv, "type", 4, newSViv (ev.type), 0);	678	hv_store (hv, "type", 4, newSViv (ev.type), 0);
571		679
572	switch (ev.type)	680	switch (ev.type)
…		…
574	case SDL_KEYDOWN:	682	case SDL_KEYDOWN:
575	case SDL_KEYUP:	683	case SDL_KEYUP:
576	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	684	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
577	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	685	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
578	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	686	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		687	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
579	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	688	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
580	break;	689	break;
581		690
582	case SDL_ACTIVEEVENT:	691	case SDL_ACTIVEEVENT:
583	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	692	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
584	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	693	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
585	break;	694	break;
586		695
587	case SDL_MOUSEMOTION:	696	case SDL_MOUSEMOTION:
		697	{
		698	int state = ev.motion.state;
		699	int x = ev.motion.x;
		700	int y = ev.motion.y;
		701	int xrel = ev.motion.xrel;
		702	int yrel = ev.motion.yrel;
		703
		704	/* do simplistic event compression */
		705	while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
		706	&& state == ev.motion.state)
		707	{
		708	xrel += ev.motion.xrel;
		709	yrel += ev.motion.yrel;
		710	x = ev.motion.x;
		711	y = ev.motion.y;
		712	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
		713	}
		714
588	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	715	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
589
590	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	716	hv_store (hv, "state", 5, newSViv (state), 0);
591	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	717	hv_store (hv, "x", 1, newSViv (x), 0);
592	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	718	hv_store (hv, "y", 1, newSViv (y), 0);
593	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	719	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
594	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	720	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		721	}
595	break;	722	break;
596		723
597	case SDL_MOUSEBUTTONDOWN:	724	case SDL_MOUSEBUTTONDOWN:
598	case SDL_MOUSEBUTTONUP:	725	case SDL_MOUSEBUTTONUP:
599	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	726	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
609	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	736	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
610	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	737	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
611	break;	738	break;
612	}	739	}
613		740
614	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	741	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
615	}	742	}
616	}	743	}
617		744
618	int	745	int
619	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	746	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
628	Mix_AllocateChannels (int numchans = -1)	755	Mix_AllocateChannels (int numchans = -1)
629		756
630	void	757	void
631	lowdelay (int fd, int val = 1)	758	lowdelay (int fd, int val = 1)
632	CODE:	759	CODE:
		760	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
		761
		762	void
		763	win32_proxy_info ()
		764	PPCODE:
		765	{
633	#ifndef _WIN32	766	#ifdef _WIN32
634	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	767	char buffer[2048];
		768	DWORD buflen;
		769
		770	EXTEND (SP, 3);
		771
		772	buflen = sizeof (buffer);
		773	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		774	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		775	{
		776	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		777
		778	buflen = sizeof (buffer);
		779	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		780	{
		781	PUSHs (newSVpv (buffer, 0));
		782
		783	buflen = sizeof (buffer);
		784	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		785	PUSHs (newSVpv (buffer, 0));
		786	}
		787	}
635	#endif	788	#endif
		789	}
636		790
637	void	791	void
638	add_font (char *file)	792	add_font (char *file)
639	CODE:	793	CODE:
640	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	794	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
641	#ifdef _WIN32
642	// cairo... sigh... requires win2000
643	AddFontResourceEx (file, FR_PRIVATE, 0);
644	#endif
645		795
646	void	796	void
647	load_image_inline (SV *image_)	797	load_image_inline (SV *image_)
648	ALIAS:	798	ALIAS:
649	load_image_file = 1	799	load_image_file = 1
…		…
691		841
692	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	842	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
693		843
694	assert (surface2->pitch == surface2->w * 4);	844	assert (surface2->pitch == surface2->w * 4);
695		845
		846	SDL_LockSurface (surface2);
696	EXTEND (SP, 5);	847	EXTEND (SP, 6);
697	PUSHs (sv_2mortal (newSViv (surface2->w)));	848	PUSHs (sv_2mortal (newSViv (surface2->w)));
698	PUSHs (sv_2mortal (newSViv (surface2->h)));	849	PUSHs (sv_2mortal (newSViv (surface2->h)));
699	SDL_LockSurface (surface2);
700	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	850	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)));	851	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
703	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	852	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
704	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	853	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		854	SDL_UnlockSurface (surface2);
705		855
706	SDL_FreeSurface (surface);	856	SDL_FreeSurface (surface);
707	SDL_FreeSurface (surface2);	857	SDL_FreeSurface (surface2);
708	}	858	}
709		859
…		…
748	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	898	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
749	#endif	899	#endif
750	_exit (1);	900	_exit (1);
751		901
752	void	902	void
753	_exit (int retval)	903	_exit (int retval = 0)
754	CODE:	904	CODE:
		905	#ifdef WIN32
		906	ExitThread (retval); // unclean, please beam me up
		907	#else
755	_exit (retval);	908	_exit (retval);
		909	#endif
756		910
		911	void
		912	debug ()
		913	CODE:
		914	{
		915	#if DEBUG
		916	VALGRIND_DO_LEAK_CHECK;
		917	#endif
		918	}
		919
757	MODULE = CFClient PACKAGE = CFClient::Font	920	MODULE = CFPlus PACKAGE = CFPlus::Font
758		921
759	CFClient::Font	922	CFPlus::Font
760	new_from_file (SV *class, char *path, int id = 0)	923	new_from_file (SV *class, char *path, int id = 0)
761	CODE:	924	CODE:
762	{	925	{
763	int count;	926	int count;
764	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	927	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
767	}	930	}
768	OUTPUT:	931	OUTPUT:
769	RETVAL	932	RETVAL
770		933
771	void	934	void
772	DESTROY (CFClient::Font self)	935	DESTROY (CFPlus::Font self)
773	CODE:	936	CODE:
774	pango_font_description_free (self);	937	pango_font_description_free (self);
775		938
776	void	939	void
777	make_default (CFClient::Font self)	940	make_default (CFPlus::Font self)
778	CODE:	941	CODE:
779	default_font = self;	942	default_font = self;
780		943
781	MODULE = CFClient PACKAGE = CFClient::Layout	944	MODULE = CFPlus PACKAGE = CFPlus::Layout
782		945
783	CFClient::Layout	946	void
784	new (SV *class, int rgba = 0)	947	reset_glyph_cache ()
		948	CODE:
		949	tc_clear ();
		950
		951	CFPlus::Layout
		952	new (SV *class)
785	CODE:	953	CODE:
786	New (0, RETVAL, 1, struct cf_layout);	954	New (0, RETVAL, 1, struct cf_layout);
787		955
788	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	956	RETVAL->pl = pango_layout_new (opengl_context);
789	RETVAL->rgba = rgba;
790	RETVAL->r = 1.;	957	RETVAL->r = 1.;
791	RETVAL->g = 1.;	958	RETVAL->g = 1.;
792	RETVAL->b = 1.;	959	RETVAL->b = 1.;
793	RETVAL->a = 1.;	960	RETVAL->a = 1.;
794	RETVAL->base_height = MIN_FONT_HEIGHT;	961	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
798	layout_update_font (RETVAL);	965	layout_update_font (RETVAL);
799	OUTPUT:	966	OUTPUT:
800	RETVAL	967	RETVAL
801		968
802	void	969	void
803	DESTROY (CFClient::Layout self)	970	DESTROY (CFPlus::Layout self)
804	CODE:	971	CODE:
805	g_object_unref (self->pl);	972	g_object_unref (self->pl);
806	Safefree (self);	973	Safefree (self);
807		974
808	int
809	is_rgba (CFClient::Layout self)
810	CODE:
811	RETVAL = self->rgba;
812	OUTPUT:
813	RETVAL
814
815	void	975	void
816	set_text (CFClient::Layout self, SV *text_)	976	set_text (CFPlus::Layout self, SV *text_)
817	CODE:	977	CODE:
818	{	978	{
819	STRLEN textlen;	979	STRLEN textlen;
820	char *text = SvPVutf8 (text_, textlen);	980	char *text = SvPVutf8 (text_, textlen);
821		981
822	pango_layout_set_text (self->pl, text, textlen);	982	pango_layout_set_text (self->pl, text, textlen);
823	}	983	}
824		984
825	void	985	void
826	set_markup (CFClient::Layout self, SV *text_)	986	set_markup (CFPlus::Layout self, SV *text_)
827	CODE:	987	CODE:
828	{	988	{
829	STRLEN textlen;	989	STRLEN textlen;
830	char *text = SvPVutf8 (text_, textlen);	990	char *text = SvPVutf8 (text_, textlen);
831		991
832	pango_layout_set_markup (self->pl, text, textlen);	992	pango_layout_set_markup (self->pl, text, textlen);
833	}	993	}
834		994
835	void	995	void
836	set_shapes (CFClient::Layout self, ...)	996	set_shapes (CFPlus::Layout self, ...)
837	CODE:	997	CODE:
838	{	998	{
839	PangoAttrList *attrs = 0;	999	PangoAttrList *attrs = 0;
840	const char *text = pango_layout_get_text (self->pl);	1000	const char *text = pango_layout_get_text (self->pl);
841	const char *pos = text;	1001	const char *pos = text;
…		…
876	if (attrs)	1036	if (attrs)
877	pango_layout_set_attributes (self->pl, attrs);	1037	pango_layout_set_attributes (self->pl, attrs);
878	}	1038	}
879		1039
880	void	1040	void
881	get_shapes (CFClient::Layout self)	1041	get_shapes (CFPlus::Layout self)
882	PPCODE:	1042	PPCODE:
883	{	1043	{
884	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1044	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
885		1045
886	do	1046	do
…		…
890	if (run && shape_attr_p (run))	1050	if (run && shape_attr_p (run))
891	{	1051	{
892	PangoRectangle extents;	1052	PangoRectangle extents;
893	pango_layout_iter_get_run_extents (iter, 0, &extents);	1053	pango_layout_iter_get_run_extents (iter, 0, &extents);
894		1054
		1055	EXTEND (SP, 2);
895	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));	1056	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
896	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));	1057	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
897	}	1058	}
898	}	1059	}
899	while (pango_layout_iter_next_run (iter));	1060	while (pango_layout_iter_next_run (iter));
900		1061
901	pango_layout_iter_free (iter);	1062	pango_layout_iter_free (iter);
902	}	1063	}
903		1064
904	int	1065	int
905	has_wrapped (CFClient::Layout self)	1066	has_wrapped (CFPlus::Layout self)
906	CODE:	1067	CODE:
907	{	1068	{
908	int lines = 1;	1069	int lines = 1;
909	const char *text = pango_layout_get_text (self->pl);	1070	const char *text = pango_layout_get_text (self->pl);
910		1071
…		…
915	}	1076	}
916	OUTPUT:	1077	OUTPUT:
917	RETVAL	1078	RETVAL
918		1079
919	SV *	1080	SV *
920	get_text (CFClient::Layout self)	1081	get_text (CFPlus::Layout self)
921	CODE:	1082	CODE:
922	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1083	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
923	sv_utf8_decode (RETVAL);	1084	sv_utf8_decode (RETVAL);
924	OUTPUT:	1085	OUTPUT:
925	RETVAL	1086	RETVAL
926		1087
927	void	1088	void
928	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	1089	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
929	CODE:	1090	CODE:
930	self->r = r;	1091	self->r = r;
931	self->g = g;	1092	self->g = g;
932	self->b = b;	1093	self->b = b;
933	self->a = a;	1094	self->a = a;
934		1095
935	void	1096	void
936	set_font (CFClient::Layout self, CFClient::Font font = 0)	1097	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
937	CODE:	1098	CODE:
938	if (self->font != font)	1099	if (self->font != font)
939	{	1100	{
940	self->font = font;	1101	self->font = font;
941	layout_update_font (self);	1102	layout_update_font (self);
942	}	1103	}
943		1104
944	void	1105	void
945	set_height (CFClient::Layout self, int base_height)	1106	set_height (CFPlus::Layout self, int base_height)
946	CODE:	1107	CODE:
947	if (self->base_height != base_height)	1108	if (self->base_height != base_height)
948	{	1109	{
949	self->base_height = base_height;	1110	self->base_height = base_height;
950	layout_update_font (self);	1111	layout_update_font (self);
951	}	1112	}
952		1113
953	void	1114	void
954	set_width (CFClient::Layout self, int max_width = -1)	1115	set_width (CFPlus::Layout self, int max_width = -1)
955	CODE:	1116	CODE:
956	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1117	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
957		1118
958	void	1119	void
959	set_indent (CFClient::Layout self, int indent)	1120	set_indent (CFPlus::Layout self, int indent)
960	CODE:	1121	CODE:
961	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1122	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
962		1123
963	void	1124	void
964	set_spacing (CFClient::Layout self, int spacing)	1125	set_spacing (CFPlus::Layout self, int spacing)
965	CODE:	1126	CODE:
966	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1127	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
967		1128
968	void	1129	void
969	set_ellipsise (CFClient::Layout self, int ellipsise)	1130	set_ellipsise (CFPlus::Layout self, int ellipsise)
970	CODE:	1131	CODE:
971	pango_layout_set_ellipsize (self->pl,	1132	pango_layout_set_ellipsize (self->pl,
972	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1133	ellipsise == 1 ? PANGO_ELLIPSIZE_START
973	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1134	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
974	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1135	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
975	: PANGO_ELLIPSIZE_NONE	1136	: PANGO_ELLIPSIZE_NONE
976	);	1137	);
977		1138
978	void	1139	void
979	set_single_paragraph_mode (CFClient::Layout self, int spm)	1140	set_single_paragraph_mode (CFPlus::Layout self, int spm)
980	CODE:	1141	CODE:
981	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1142	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
982		1143
983	void	1144	void
984	size (CFClient::Layout self)	1145	size (CFPlus::Layout self)
985	PPCODE:	1146	PPCODE:
986	{	1147	{
987	int w, h;	1148	int w, h;
988		1149
989	layout_get_pixel_size (self, &w, &h);	1150	layout_get_pixel_size (self, &w, &h);
…		…
992	PUSHs (sv_2mortal (newSViv (w)));	1153	PUSHs (sv_2mortal (newSViv (w)));
993	PUSHs (sv_2mortal (newSViv (h)));	1154	PUSHs (sv_2mortal (newSViv (h)));
994	}	1155	}
995		1156
996	int	1157	int
997	descent (CFClient::Layout self)	1158	descent (CFPlus::Layout self)
998	CODE:	1159	CODE:
999	{	1160	{
1000	PangoRectangle rect;	1161	PangoRectangle rect;
1001	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1162	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1002	pango_layout_line_get_pixel_extents (line, 0, &rect);	1163	pango_layout_line_get_pixel_extents (line, 0, &rect);
…		…
1004	}	1165	}
1005	OUTPUT:	1166	OUTPUT:
1006	RETVAL	1167	RETVAL
1007		1168
1008	int	1169	int
1009	xy_to_index (CFClient::Layout self, int x, int y)	1170	xy_to_index (CFPlus::Layout self, int x, int y)
1010	CODE:	1171	CODE:
1011	{	1172	{
1012	int index, trailing;	1173	int index, trailing;
1013	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1174	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1014	RETVAL = index;	1175	RETVAL = index + trailing;
1015	}	1176	}
1016	OUTPUT:	1177	OUTPUT:
1017	RETVAL	1178	RETVAL
1018		1179
1019	void	1180	void
1020	cursor_pos (CFClient::Layout self, int index)	1181	cursor_pos (CFPlus::Layout self, int index)
1021	PPCODE:	1182	PPCODE:
1022	{	1183	{
1023	PangoRectangle strong_pos;	1184	PangoRectangle strong_pos;
1024	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1185	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1025		1186
…		…
1028	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1189	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1029	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1190	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1030	}	1191	}
1031		1192
1032	void	1193	void
1033	render (CFClient::Layout self)	1194	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1034	PPCODE:	1195	PPCODE:
1035	{	1196	{
1036	SV *retval;	1197	int line, x;
1037	int w, h;
1038		1198
1039	layout_get_pixel_size (self, &w, &h);	1199	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1200	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1040		1201
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);	1202	EXTEND (SP, 2);
1089	PUSHs (sv_2mortal (newSViv (w)));	1203	PUSHs (sv_2mortal (newSViv (line - 1)));
		1204	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
		1205	}
		1206
		1207	void
		1208	line_x_to_index (CFPlus::Layout self, int line, int x)
		1209	PPCODE:
		1210	{
		1211	PangoLayoutLine *lp;
		1212	int index, trailing;
		1213
		1214	if (line < 0)
		1215	XSRETURN_EMPTY;
		1216
		1217	if (!(lp = pango_layout_get_line (self->pl, line)))
		1218	XSRETURN_EMPTY; /* do better */
		1219
		1220	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
		1221
		1222	EXTEND (SP, 2);
		1223	if (GIMME_V == G_SCALAR)
1090	PUSHs (sv_2mortal (newSViv (h)));	1224	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	1225	else
1096	{	1226	{
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)));	1227	PUSHs (sv_2mortal (newSViv (index)));
1116	PUSHs (sv_2mortal (newSViv (h)));	1228	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	}	1229	}
1121	}	1230	}
1122		1231
		1232	void
		1233	render (CFPlus::Layout self, float x, float y, int flags = 0)
		1234	PPCODE:
		1235	pango_opengl_render_layout_subpixel (
		1236	self->pl,
		1237	x * PANGO_SCALE, y * PANGO_SCALE,
		1238	self->r, self->g, self->b, self->a,
		1239	flags
		1240	);
		1241
1123	MODULE = CFClient PACKAGE = CFClient::Texture	1242	MODULE = CFPlus PACKAGE = CFPlus::Texture
1124		1243
1125	void	1244	void
1126	pad2pot (SV *data_, SV *w_, SV *h_)	1245	pad2pot (SV *data_, SV *w_, SV *h_)
1127	CODE:	1246	CODE:
1128	{	1247	{
…		…
1206	glDisable (GL_ALPHA_TEST);	1325	glDisable (GL_ALPHA_TEST);
1207	glDisable (GL_BLEND);	1326	glDisable (GL_BLEND);
1208	}	1327	}
1209	}	1328	}
1210		1329
1211	MODULE = CFClient PACKAGE = CFClient::Map	1330	MODULE = CFPlus PACKAGE = CFPlus::Map
1212		1331
1213	CFClient::Map	1332	CFPlus::Map
1214	new (SV *class, int map_width, int map_height)	1333	new (SV *class)
1215	CODE:	1334	CODE:
1216	New (0, RETVAL, 1, struct map);	1335	New (0, RETVAL, 1, struct map);
1217	RETVAL->x = 0;	1336	RETVAL->x = 0;
1218	RETVAL->y = 0;	1337	RETVAL->y = 0;
1219	RETVAL->w = map_width;	1338	RETVAL->w = 0;
1220	RETVAL->h = map_height;	1339	RETVAL->h = 0;
1221	RETVAL->ox = 0;	1340	RETVAL->ox = 0;
1222	RETVAL->oy = 0;	1341	RETVAL->oy = 0;
1223	RETVAL->faces = 8192;	1342	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1224	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1343	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;	1344	RETVAL->rows = 0;
1228	RETVAL->row = 0;	1345	RETVAL->row = 0;
1229	OUTPUT:	1346	OUTPUT:
1230	RETVAL	1347	RETVAL
1231		1348
1232	void	1349	void
1233	DESTROY (CFClient::Map self)	1350	DESTROY (CFPlus::Map self)
1234	CODE:	1351	CODE:
1235	{	1352	{
1236	map_clear (self);	1353	map_clear (self);
1237	Safefree (self->face);	1354	Safefree (self->face2tile);
1238	Safefree (self->tex);	1355	Safefree (self->tex);
1239	Safefree (self);	1356	Safefree (self);
1240	}	1357	}
1241		1358
1242	void	1359	void
		1360	resize (CFPlus::Map self, int map_width, int map_height)
		1361	CODE:
		1362	self->w = map_width;
		1363	self->h = map_height;
		1364
		1365	void
1243	clear (CFClient::Map self)	1366	clear (CFPlus::Map self)
1244	CODE:	1367	CODE:
1245	map_clear (self);	1368	map_clear (self);
1246		1369
1247	void	1370	void
1248	set_face (CFClient::Map self, int face, int texid)	1371	set_tileid (CFPlus::Map self, int face, int tile)
1249	CODE:	1372	CODE:
1250	{	1373	{
1251	while (self->faces <= face)	1374	need_facenum (self, face); self->face2tile [face] = tile;
1252	{	1375	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	}	1376	}
1259		1377
1260	void	1378	void
		1379	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1380	CODE:
		1381	{
		1382	tileid texid;
		1383	maptex *tex;
		1384
		1385	if (face < 0 || face >= self->faces)
		1386	return;
		1387
		1388	if (smooth < 0 || smooth >= self->faces)
		1389	return;
		1390
		1391	texid = self->face2tile [face];
		1392
		1393	if (!texid)
		1394	return;
		1395
		1396	tex = self->tex + texid;
		1397	tex->smoothtile = self->face2tile [smooth];
		1398	tex->smoothlevel = level;
		1399	}
		1400
		1401	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)	1402	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:	1403	CODE:
1263	{	1404	{
1264	while (self->texs <= texid)	1405	need_texid (self, texid);
1265	{
1266	Append (maptex, self->tex, self->texs, self->texs);
1267	self->texs *= 2;
1268	}
1269		1406
1270	{	1407	{
1271	maptex *tex = self->tex + texid;	1408	maptex *tex = self->tex + texid;
1272		1409
1273	tex->name = name;	1410	tex->name = name;
…		…
1290	// from transparent color bleeding and ugly wrapping effects.	1427	// from transparent color bleeding and ugly wrapping effects.
1291	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1428	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1292	}	1429	}
1293		1430
1294	int	1431	int
1295	ox (CFClient::Map self)	1432	ox (CFPlus::Map self)
1296	ALIAS:	1433	ALIAS:
1297	oy = 1	1434	oy = 1
1298	x = 2	1435	x = 2
1299	y = 3	1436	y = 3
1300	w = 4	1437	w = 4
…		…
1311	}	1448	}
1312	OUTPUT:	1449	OUTPUT:
1313	RETVAL	1450	RETVAL
1314		1451
1315	void	1452	void
1316	scroll (CFClient::Map self, int dx, int dy)	1453	scroll (CFPlus::Map self, int dx, int dy)
1317	CODE:	1454	CODE:
1318	{	1455	{
1319	if (dx > 0)	1456	if (dx > 0)
1320	map_blank (self, self->x, self->y, dx - 1, self->h);	1457	map_blank (self, self->x, self->y, dx, self->h);
1321	else if (dx < 0)	1458	else if (dx < 0)
1322	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1459	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1323		1460
1324	if (dy > 0)	1461	if (dy > 0)
1325	map_blank (self, self->x, self->y, self->w, dy - 1);	1462	map_blank (self, self->x, self->y, self->w, dy);
1326	else if (dy < 0)	1463	else if (dy < 0)
1327	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1464	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1328		1465
1329	self->ox += dx; self->x += dx;	1466	self->ox += dx; self->x += dx;
1330	self->oy += dy; self->y += dy;	1467	self->oy += dy; self->y += dy;
1331		1468
1332	while (self->y < 0)	1469	while (self->y < 0)
…		…
1337	self->y += MAP_EXTEND_Y;	1474	self->y += MAP_EXTEND_Y;
1338	}	1475	}
1339	}	1476	}
1340		1477
1341	void	1478	void
1342	map1a_update (CFClient::Map self, SV *data_)	1479	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1343	CODE:	1480	CODE:
1344	{	1481	{
1345	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1482	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1346	uint8_t *data_end = (uint8_t *)SvEND (data_);	1483	uint8_t *data_end = (uint8_t *)SvEND (data_);
1347	mapcell *cell;	1484	mapcell *cell;
1348	int x, y, flags;	1485	int x, y, flags;
1349		1486
1350	while (data < data_end)	1487	while (data < data_end - 1)
1351	{	1488	{
1352	flags = (data [0] << 8) + data [1]; data += 2;	1489	flags = (data [0] << 8) + data [1]; data += 2;
1353		1490
1354	x = self->x + ((flags >> 10) & 63);	1491	x = self->x + ((flags >> 10) & 63);
1355	y = self->y + ((flags >> 4) & 63);	1492	y = self->y + ((flags >> 4) & 63);
1356		1493
1357	cell = map_get_cell (self, x, y);	1494	cell = map_get_cell (self, x, y);
1358		1495
1359	if (flags & 15)	1496	if (flags & 15)
1360	{	1497	{
1361	if (cell->darkness < 0)	1498	if (!cell->darkness)
1362	{	1499	{
		1500	memset (cell, 0, sizeof (*cell));
1363	cell->darkness = 0;	1501	cell->darkness = 256;
1364	cell->face [0] = 0;
1365	cell->face [1] = 0;
1366	cell->face [2] = 0;
1367	}	1502	}
1368		1503
1369	cell->darkness = flags & 8 ? *data++ : 255;
1370
1371	//TODO: don't trust server data to be in-range(!)	1504	//TODO: don't trust server data to be in-range(!)
		1505
		1506	if (flags & 8)
		1507	{
		1508	if (extmap)
		1509	{
		1510	uint8_t ext, cmd;
		1511
		1512	do
		1513	{
		1514	ext = *data++;
		1515	cmd = ext & 0x3f;
		1516
		1517	if (cmd < 4)
		1518	cell->darkness = 255 - ext * 64 + 1;
		1519	else if (cmd == 5) // health
		1520	{
		1521	cell->stat_width = 1;
		1522	cell->stat_hp = *data++;
		1523	}
		1524	else if (cmd == 6) // monster width
		1525	cell->stat_width = *data++ + 1;
		1526	else if (cmd == 0x47)
		1527	{
		1528	if (*data == 4)
		1529	; // decode player count
		1530
		1531	data += *data + 1;
		1532	}
		1533	else if (cmd == 8) // cell flags
		1534	cell->flags = *data++;
		1535	else if (ext & 0x40) // unknown, multibyte => skip
		1536	data += *data + 1;
		1537	else
		1538	data++;
		1539	}
		1540	while (ext & 0x80);
		1541	}
		1542	else
		1543	cell->darkness = *data++ + 1;
		1544	}
1372		1545
1373	if (flags & 4)	1546	if (flags & 4)
1374	{	1547	{
1375	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1548	faceid face = (data [0] << 8) + data [1]; data += 2;
		1549	need_facenum (self, face);
		1550	cell->tile [0] = self->face2tile [face];
1376	}	1551	}
1377		1552
1378	if (flags & 2)	1553	if (flags & 2)
1379	{	1554	{
1380	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1555	faceid face = (data [0] << 8) + data [1]; data += 2;
		1556	need_facenum (self, face);
		1557	cell->tile [1] = self->face2tile [face];
1381	}	1558	}
1382		1559
1383	if (flags & 1)	1560	if (flags & 1)
1384	{	1561	{
1385	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1562	faceid face = (data [0] << 8) + data [1]; data += 2;
		1563	need_facenum (self, face);
		1564	cell->tile [2] = self->face2tile [face];
1386	}	1565	}
1387	}	1566	}
1388	else	1567	else
1389	cell->darkness = -1;	1568	cell->darkness = 0;
1390	}	1569	}
1391	}	1570	}
1392		1571
1393	SV *	1572	SV *
1394	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1573	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1395	CODE:	1574	CODE:
1396	{	1575	{
1397	int x1, x;	1576	int x1, x;
1398	int y1, y;	1577	int y1, y;
1399	int z;	1578	int z;
…		…
1420	{	1599	{
1421	mapcell *cell = row->col + (x - row->c0);	1600	mapcell *cell = row->col + (x - row->c0);
1422		1601
1423	for (z = 0; z <= 0; z++)	1602	for (z = 0; z <= 0; z++)
1424	{	1603	{
1425	mapface face = cell->face [z];
1426
1427	if (face)
1428	{
1429	maptex tex = self->tex [face];	1604	maptex tex = self->tex [cell->tile [z]];
1430	int a0 = 255 - tex.a;	1605	int a0 = 255 - tex.a;
1431	int a1 = tex.a;	1606	int a1 = tex.a;
1432		1607
1433	r = (r * a0 + tex.r * a1) / 255;	1608	r = (r * a0 + tex.r * a1) / 255;
1434	g = (g * a0 + tex.g * a1) / 255;	1609	g = (g * a0 + tex.g * a1) / 255;
1435	b = (b * a0 + tex.b * a1) / 255;	1610	b = (b * a0 + tex.b * a1) / 255;
1436	a = (a * a0 + tex.a * a1) / 255;	1611	a = (a * a0 + tex.a * a1) / 255;
1437	}
1438	}	1612	}
1439	}	1613	}
1440		1614
1441	*map++ = (r )	1615	*map++ = (r )
1442	| (g << 8)	1616	| (g << 8)
…		…
1449	}	1623	}
1450	OUTPUT:	1624	OUTPUT:
1451	RETVAL	1625	RETVAL
1452		1626
1453	void	1627	void
1454	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1628	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1455	CODE:	1629	CODE:
1456	{	1630	{
1457	int vx, vy;	1631	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
		1632	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1633	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1634	smooth_key skey;
1458	int x, y, z;	1635	int x, y, z;
1459	int last_name;	1636	int last_name;
1460	mapface face;
1461		1637
1462	vx = self->x + self->w / 2 - sw / 2 - shift_x;	1638	// thats current max. sorry.
1463	vy = self->y + self->h / 2 - sh / 2 - shift_y;	1639	if (sw > 255) sw = 255;
		1640	if (sh > 255) sh = 255;
1464		1641
1465	/*	1642	// clear key, in case of extra padding
1466	int vx = self->vx = self->w >= sw	1643	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		1644
1475	glColor4ub (255, 255, 255, 255);	1645	glColor4ub (255, 255, 255, 255);
1476		1646
1477	glEnable (GL_BLEND);	1647	glEnable (GL_BLEND);
1478	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1648	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1481		1651
1482	glBegin (GL_QUADS);	1652	glBegin (GL_QUADS);
1483		1653
1484	last_name = 0;	1654	last_name = 0;
1485		1655
		1656	mx += self->x;
		1657	my += self->y;
		1658
		1659	// first pass: determine smooth_max
		1660	// rather ugly, if you ask me
		1661	// could also be stored inside mapcell and updated on change
		1662	memset (smooth_max, 0, sizeof (smooth_max));
		1663
		1664	for (y = 0; y < sh; y++)
		1665	if (0 <= y + my && y + my < self->rows)
		1666	{
		1667	maprow *row = self->row + (y + my);
		1668
		1669	for (x = 0; x < sw; x++)
		1670	if (row->c0 <= x + mx && x + mx < row->c1)
		1671	{
		1672	mapcell *cell = row->col + (x + mx - row->c0);
		1673
		1674	smooth_max[x + 1][y + 1] =
		1675	MAX (self->tex [cell->tile [0]].smoothlevel,
		1676	MAX (self->tex [cell->tile [1]].smoothlevel,
		1677	self->tex [cell->tile [2]].smoothlevel));
		1678	}
		1679	}
		1680
1486	for (z = 0; z < 3; z++)	1681	for (z = 0; z <= 2; z++)
		1682	{
		1683	memset (smooth_level, 0, sizeof (smooth_level));
		1684
1487	for (y = 0; y < sh; y++)	1685	for (y = 0; y < sh; y++)
1488	if (0 <= y + vy && y + vy < self->rows)	1686	if (0 <= y + my && y + my < self->rows)
1489	{	1687	{
1490	maprow *row = self->row + (y + vy);	1688	maprow *row = self->row + (y + my);
1491		1689
1492	for (x = 0; x < sw; x++)	1690	for (x = 0; x < sw; x++)
1493	if (row->c0 <= x + vx && x + vx < row->c1)	1691	if (row->c0 <= x + mx && x + mx < row->c1)
1494	{	1692	{
1495	mapcell *cell = row->col + (x + vx - row->c0);	1693	mapcell *cell = row->col + (x + mx - row->c0);
1496
1497	face = cell->face [z];	1694	tileid tile = cell->tile [z];
1498		1695
1499	if (face)	1696	if (tile)
		1697	{
		1698	maptex tex = self->tex [tile];
		1699	int px = (x + 1) * T - tex.w;
		1700	int py = (y + 1) * T - tex.h;
		1701
		1702	// suppressing texture state switches here
		1703	// is only moderately effective, but worth the extra effort
		1704	if (last_name != tex.name)
		1705	{
		1706	if (!tex.name)
		1707	tex = self->tex [2]; /* missing, replace by noface */
		1708
		1709	glEnd ();
		1710	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1711	glBegin (GL_QUADS);
		1712	}
		1713
		1714	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1715	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1716	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1717	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1718
		1719	if (cell->flags && z == 2)
		1720	{
		1721	if (cell->flags & 1)
		1722	{
		1723	maptex tex = self->tex [1];
		1724	int px = x * T + T * 2 / 32;
		1725	int py = y * T - T * 6 / 32;
		1726
		1727	glEnd ();
		1728	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1729	glBegin (GL_QUADS);
		1730
		1731	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1732	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1733	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1734	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1735	}
		1736	}
		1737
		1738	// update smooth hash
		1739	if (tex.smoothtile)
		1740	{
		1741	skey.tile = tex.smoothtile;
		1742	skey.level = tex.smoothlevel;
		1743
		1744	smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
		1745
		1746	// add bits to current tile and all neighbours. skey.x|y is
		1747	// shifted +1|+1 so we always stay positive.
		1748
		1749	// bits is ___n cccc CCCC bbbb
		1750	// n do not draw borders&corners
		1751	// c draw these corners, but...
		1752	// C ... not these
		1753	// b draw these borders
		1754
		1755	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1756	// ┃· ·· ·┃ ━━
		1757
		1758	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1759	// ·· ·· ·┏ ┓·
		1760
		1761	// full tile
		1762	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1763
		1764	// borders
		1765	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1766	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1767	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1768	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1769
		1770	// corners
		1771	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1772	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1773	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1774	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1775	}
		1776	}
		1777	}
		1778	}
		1779
		1780	// go through all smoothlevels, lowest to highest, then draw.
		1781	// this is basically counting sort
		1782	{
		1783	int w, b;
		1784
		1785	for (w = 0; w < 256 / 32; ++w)
		1786	{
		1787	uint32_t smask = smooth_level [w];
		1788	if (smask)
		1789	for (b = 0; b < 32; ++b)
		1790	if (smask & (((uint32_t)1) << b))
1500	{	1791	{
1501	maptex tex = self->tex [face];	1792	int level = (w << 5) | b;
		1793	HE *he;
1502		1794
1503	int px = (x + 1) * 32 - tex.w;	1795	hv_iterinit (smooth);
1504	int py = (y + 1) * 32 - tex.h;	1796	while ((he = hv_iternext (smooth)))
1505
1506	if (last_name != tex.name)
1507	{	1797	{
		1798	smooth_key *skey = (smooth_key *)HeKEY (he);
		1799	IV bits = SvIVX (HeVAL (he));
		1800
		1801	if (!(bits & 0x1000)
		1802	&& skey->level == level
		1803	&& level > smooth_max [skey->x][skey->y])
		1804	{
		1805	maptex tex = self->tex [skey->tile];
		1806	int px = (((int)skey->x) - 1) * T;
		1807	int py = (((int)skey->y) - 1) * T;
		1808	int border = bits & 15;
		1809	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1810	float dx = tex.s * .0625f; // 16 images/row
		1811	float dy = tex.t * .5f ; // 2 images/column
		1812
		1813	// this time naively avoiding texture state changes
		1814	// save gobs of state changes.
		1815	if (last_name != tex.name)
		1816	{
		1817	if (!tex.name)
		1818	continue; // smoothing not yet available
		1819
1508	glEnd ();	1820	glEnd ();
1509	last_name = tex.name;
1510	glBindTexture (GL_TEXTURE_2D, last_name);	1821	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1511	glBegin (GL_QUADS);	1822	glBegin (GL_QUADS);
		1823	}
		1824
		1825	if (border)
		1826	{
		1827	float ox = border * dx;
		1828
		1829	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1830	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1831	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1832	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1833	}
		1834
		1835	if (corner)
		1836	{
		1837	float ox = corner * dx;
		1838
		1839	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1840	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1841	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1842	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1843	}
		1844	}
1512	}	1845	}
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	}	1846	}
1519	}
1520	}	1847	}
		1848	}
		1849
		1850	hv_clear (smooth);
		1851	}
1521		1852
1522	glEnd ();	1853	glEnd ();
1523		1854
1524	glDisable (GL_TEXTURE_2D);	1855	glDisable (GL_TEXTURE_2D);
1525	glDisable (GL_BLEND);	1856	glDisable (GL_BLEND);
1526	}
1527		1857
		1858	// top layer: overlays such as the health bar
		1859	for (y = 0; y < sh; y++)
		1860	if (0 <= y + my && y + my < self->rows)
		1861	{
		1862	maprow *row = self->row + (y + my);
		1863
		1864	for (x = 0; x < sw; x++)
		1865	if (row->c0 <= x + mx && x + mx < row->c1)
		1866	{
		1867	mapcell *cell = row->col + (x + mx - row->c0);
		1868
		1869	int px = x * T;
		1870	int py = y * T;
		1871
		1872	if (cell->stat_hp)
		1873	{
		1874	int width = cell->stat_width * T;
		1875	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
		1876
		1877	glColor3ub (0, 0, 0);
		1878	glRectf (px + 1, py - thick - 2,
		1879	px + width - 1, py);
		1880
		1881	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1882	glRectf (px + 2,
		1883	py - thick - 1,
		1884	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1885	}
		1886	}
		1887	}
		1888	}
		1889
1528	void	1890	void
1529	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1891	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1530	CODE:	1892	CODE:
1531	{	1893	{
1532	static float color[16][3] = {	1894	static float color[16][3] = {
1533	{ 0.00, 0.00, 0.00 },	1895	{ 0.00F, 0.00F, 0.00F },
1534	{ 1.00, 1.00, 1.00 },	1896	{ 1.00F, 1.00F, 1.00F },
1535	{ 0.00, 0.00, 0.55 },	1897	{ 0.00F, 0.00F, 0.55F },
1536	{ 1.00, 0.00, 0.00 },	1898	{ 1.00F, 0.00F, 0.00F },
1537		1899
1538	{ 1.00, 0.54, 0.00 },	1900	{ 1.00F, 0.54F, 0.00F },
1539	{ 0.11, 0.56, 1.00 },	1901	{ 0.11F, 0.56F, 1.00F },
1540	{ 0.93, 0.46, 0.00 },	1902	{ 0.93F, 0.46F, 0.00F },
1541	{ 0.18, 0.54, 0.34 },	1903	{ 0.18F, 0.54F, 0.34F },
1542		1904
1543	{ 0.56, 0.73, 0.56 },	1905	{ 0.56F, 0.73F, 0.56F },
1544	{ 0.80, 0.80, 0.80 },	1906	{ 0.80F, 0.80F, 0.80F },
1545	{ 0.55, 0.41, 0.13 },	1907	{ 0.55F, 0.41F, 0.13F },
1546	{ 0.99, 0.77, 0.26 },	1908	{ 0.99F, 0.77F, 0.26F },
1547		1909
1548	{ 0.74, 0.65, 0.41 },	1910	{ 0.74F, 0.65F, 0.41F },
1549		1911
1550	{ 0.00, 1.00, 1.00 },	1912	{ 0.00F, 1.00F, 1.00F },
1551	{ 1.00, 0.00, 1.00 },	1913	{ 1.00F, 0.00F, 1.00F },
1552	{ 1.00, 1.00, 0.00 },	1914	{ 1.00F, 1.00F, 0.00F },
1553	};	1915	};
1554		1916
1555	int x, y;	1917	int x, y;
1556		1918
1557	glEnable (GL_TEXTURE_2D);	1919	glEnable (GL_TEXTURE_2D);
…		…
1584	glDisable (GL_BLEND);	1946	glDisable (GL_BLEND);
1585	glDisable (GL_TEXTURE_2D);	1947	glDisable (GL_TEXTURE_2D);
1586	}	1948	}
1587		1949
1588	void	1950	void
1589	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1951	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1590	PPCODE:	1952	PPCODE:
1591	{	1953	{
1592	int vx, vy;
1593	int x, y;	1954	int x, y;
1594	int sw4 = (sw + 3) & ~3;	1955	int sw4 = (sw + 3) & ~3;
1595	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));	1956	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1596	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);	1957	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1597		1958
1598	memset (darkness, 255, sw4 * sh);	1959	memset (darkness, 255, sw4 * sh);
1599	SvPOK_only (darkness_sv);	1960	SvPOK_only (darkness_sv);
1600	SvCUR_set (darkness_sv, sw4 * sh);	1961	SvCUR_set (darkness_sv, sw4 * sh);
1601		1962
1602	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1963	mx += self->x;
1603	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1964	my += self->y;
1604		1965
1605	for (y = 0; y < sh; y++)	1966	for (y = 0; y < sh; y++)
1606	if (0 <= y + vy && y + vy < self->rows)	1967	if (0 <= y + my && y + my < self->rows)
1607	{	1968	{
1608	maprow *row = self->row + (y + vy);	1969	maprow *row = self->row + (y + my);
1609		1970
1610	for (x = 0; x < sw; x++)	1971	for (x = 0; x < sw; x++)
1611	if (row->c0 <= x + vx && x + vx < row->c1)	1972	if (row->c0 <= x + mx && x + mx < row->c1)
1612	{	1973	{
1613	mapcell *cell = row->col + (x + vx - row->c0);	1974	mapcell *cell = row->col + (x + mx - row->c0);
1614		1975
1615	darkness[y * sw4 + x] = cell->darkness < 0	1976	darkness[y * sw4 + x] = cell->darkness
		1977	? 255 - (cell->darkness - 1)
1616	? 255 - FOW_DARKNESS	1978	: 255 - FOW_DARKNESS;
1617	: 255 - cell->darkness;
1618	}	1979	}
1619	}	1980	}
1620		1981
1621	EXTEND (SP, 3);	1982	EXTEND (SP, 3);
1622	PUSHs (sv_2mortal (newSViv (sw4)));	1983	PUSHs (sv_2mortal (newSViv (sw4)));
1623	PUSHs (sv_2mortal (newSViv (sh)));	1984	PUSHs (sv_2mortal (newSViv (sh)));
1624	PUSHs (darkness_sv);	1985	PUSHs (darkness_sv);
1625	}	1986	}
1626		1987
1627	SV *	1988	SV *
1628	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1989	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1629	CODE:	1990	CODE:
1630	{	1991	{
1631	int x, y, x1, y1;	1992	int x, y, x1, y1;
1632	SV *data_sv = newSV (w * h * 7 + 5);	1993	SV *data_sv = newSV (w * h * 7 + 5);
1633	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1994	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1658	if (row && row->c0 <= x && x < row->c1)	2019	if (row && row->c0 <= x && x < row->c1)
1659	{	2020	{
1660	mapcell *cell = row->col + (x - row->c0);	2021	mapcell *cell = row->col + (x - row->c0);
1661	uint8_t flags = 0;	2022	uint8_t flags = 0;
1662		2023
1663	if (cell->face [0]) flags |= 1;	2024	if (cell->tile [0]) flags |= 1;
1664	if (cell->face [1]) flags |= 2;	2025	if (cell->tile [1]) flags |= 2;
1665	if (cell->face [2]) flags |= 4;	2026	if (cell->tile [2]) flags |= 4;
1666		2027
1667	*data++ = flags;	2028	*data++ = flags;
1668		2029
1669	if (flags & 1)	2030	if (flags & 1)
1670	{	2031	{
		2032	tileid tile = cell->tile [0];
1671	*data++ = cell->face [0] >> 8;	2033	*data++ = tile >> 8;
1672	*data++ = cell->face [0];	2034	*data++ = tile;
1673	}	2035	}
1674		2036
1675	if (flags & 2)	2037	if (flags & 2)
1676	{	2038	{
		2039	tileid tile = cell->tile [1];
1677	*data++ = cell->face [1] >> 8;	2040	*data++ = tile >> 8;
1678	*data++ = cell->face [1];	2041	*data++ = tile;
1679	}	2042	}
1680		2043
1681	if (flags & 4)	2044	if (flags & 4)
1682	{	2045	{
		2046	tileid tile = cell->tile [2];
1683	*data++ = cell->face [2] >> 8;	2047	*data++ = tile >> 8;
1684	*data++ = cell->face [2];	2048	*data++ = tile;
1685	}	2049	}
1686	}	2050	}
1687	else	2051	else
1688	*data++ = 0;	2052	*data++ = 0;
1689	}	2053	}
…		…
1695	}	2059	}
1696	OUTPUT:	2060	OUTPUT:
1697	RETVAL	2061	RETVAL
1698		2062
1699	void	2063	void
1700	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	2064	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1701	PPCODE:	2065	PPCODE:
1702	{	2066	{
1703	int x, y, z;	2067	int x, y, z;
1704	int w, h;	2068	int w, h;
1705	int x1, y1;	2069	int x1, y1;
…		…
1729	{	2093	{
1730	uint8_t flags = *data++;	2094	uint8_t flags = *data++;
1731		2095
1732	if (flags)	2096	if (flags)
1733	{	2097	{
1734	mapface face[3] = { 0, 0, 0 };
1735
1736	mapcell *cell = row_get_cell (row, x);	2098	mapcell *cell = row_get_cell (row, x);
		2099	tileid tile[3] = { 0, 0, 0 };
1737		2100
1738	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	2101	if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1739	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	2102	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1740	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	2103	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1741		2104
1742	if (cell->darkness <= 0)	2105	if (cell->darkness == 0)
1743	{	2106	{
1744	cell->darkness = -1;	2107	cell->darkness = 0;
1745		2108
1746	for (z = 0; z <= 2; z++)	2109	for (z = 0; z <= 2; z++)
1747	{	2110	{
1748	cell->face[z] = face[z];	2111	tileid t = tile [z];
1749		2112
1750	if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name))	2113	if (t >= self->texs || (t && !self->tex [t].name))
		2114	{
1751	XPUSHs (sv_2mortal (newSViv (face[z])));	2115	XPUSHs (sv_2mortal (newSViv (t)));
		2116	need_texid (self, t);
		2117	}
		2118
		2119	cell->tile [z] = t;
1752	}	2120	}
1753	}	2121	}
1754	}	2122	}
1755	}	2123	}
1756	}	2124	}
1757	}	2125	}
1758		2126
1759	MODULE = CFClient PACKAGE = CFClient::MixChunk	2127	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1760		2128
1761	CFClient::MixChunk	2129	CFPlus::MixChunk
1762	new_from_file (SV *class, char *path)	2130	new_from_file (SV *class, char *path)
1763	CODE:	2131	CODE:
1764	RETVAL = Mix_LoadWAV (path);	2132	RETVAL = Mix_LoadWAV (path);
1765	OUTPUT:	2133	OUTPUT:
1766	RETVAL	2134	RETVAL
1767		2135
1768	void	2136	void
1769	DESTROY (CFClient::MixChunk self)	2137	DESTROY (CFPlus::MixChunk self)
1770	CODE:	2138	CODE:
1771	Mix_FreeChunk (self);	2139	Mix_FreeChunk (self);
1772		2140
1773	int	2141	int
1774	volume (CFClient::MixChunk self, int volume = -1)	2142	volume (CFPlus::MixChunk self, int volume = -1)
1775	CODE:	2143	CODE:
1776	RETVAL = Mix_VolumeChunk (self, volume);	2144	RETVAL = Mix_VolumeChunk (self, volume);
1777	OUTPUT:	2145	OUTPUT:
1778	RETVAL	2146	RETVAL
1779		2147
1780	int	2148	int
1781	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	2149	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1782	CODE:	2150	CODE:
1783	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2151	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1784	OUTPUT:	2152	OUTPUT:
1785	RETVAL	2153	RETVAL
1786		2154
1787	MODULE = CFClient PACKAGE = CFClient::MixMusic	2155	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1788		2156
1789	int	2157	int
1790	volume (int volume = -1)	2158	volume (int volume = -1)
1791	CODE:	2159	CODE:
1792	RETVAL = Mix_VolumeMusic (volume);	2160	RETVAL = Mix_VolumeMusic (volume);
1793	OUTPUT:	2161	OUTPUT:
1794	RETVAL	2162	RETVAL
1795		2163
		2164	int
		2165	fade_out (int ms)
		2166	CODE:
		2167	RETVAL = Mix_FadeOutMusic (ms);
		2168	OUTPUT:
		2169	RETVAL
		2170
1796	CFClient::MixMusic	2171	CFPlus::MixMusic
1797	new_from_file (SV *class, char *path)	2172	new_from_file (SV *class, char *path)
1798	CODE:	2173	CODE:
1799	RETVAL = Mix_LoadMUS (path);	2174	RETVAL = Mix_LoadMUS (path);
1800	OUTPUT:	2175	OUTPUT:
1801	RETVAL	2176	RETVAL
1802		2177
1803	void	2178	void
1804	DESTROY (CFClient::MixMusic self)	2179	DESTROY (CFPlus::MixMusic self)
1805	CODE:	2180	CODE:
1806	Mix_FreeMusic (self);	2181	Mix_FreeMusic (self);
1807		2182
1808	int	2183	int
1809	play (CFClient::MixMusic self, int loops = -1)	2184	play (CFPlus::MixMusic self, int loops = -1)
1810	CODE:	2185	CODE:
1811	RETVAL = Mix_PlayMusic (self, loops);	2186	RETVAL = Mix_PlayMusic (self, loops);
1812	OUTPUT:	2187	OUTPUT:
1813	RETVAL	2188	RETVAL
1814		2189
		2190	int
		2191	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2192	CODE:
		2193	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
		2194	OUTPUT:
		2195	RETVAL
		2196
1815	MODULE = CFClient PACKAGE = CFClient::OpenGL	2197	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1816		2198
1817	BOOT:	2199	BOOT:
1818	{	2200	{
1819	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	2201	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1820	static const struct {	2202	static const struct {
1821	const char *name;	2203	const char *name;
1822	IV iv;	2204	IV iv;
1823	} *civ, const_iv[] = {	2205	} *civ, const_iv[] = {
1824	# define const_iv(name) { # name, (IV)name }	2206	# define const_iv(name) { # name, (IV)name }
…		…
1887	const_iv (GL_SEPARABLE_2D),	2269	const_iv (GL_SEPARABLE_2D),
1888	const_iv (GL_CONVOLUTION_2D),	2270	const_iv (GL_CONVOLUTION_2D),
1889	const_iv (GL_CONVOLUTION_BORDER_MODE),	2271	const_iv (GL_CONVOLUTION_BORDER_MODE),
1890	const_iv (GL_CONSTANT_BORDER),	2272	const_iv (GL_CONSTANT_BORDER),
1891	const_iv (GL_LINES),	2273	const_iv (GL_LINES),
		2274	const_iv (GL_LINE_STRIP),
1892	const_iv (GL_LINE_LOOP),	2275	const_iv (GL_LINE_LOOP),
1893	const_iv (GL_QUADS),	2276	const_iv (GL_QUADS),
1894	const_iv (GL_QUAD_STRIP),	2277	const_iv (GL_QUAD_STRIP),
1895	const_iv (GL_TRIANGLES),	2278	const_iv (GL_TRIANGLES),
1896	const_iv (GL_TRIANGLE_STRIP),	2279	const_iv (GL_TRIANGLE_STRIP),
…		…
1904	# undef const_iv	2287	# undef const_iv
1905	};	2288	};
1906		2289
1907	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2290	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1908	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2291	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2292
		2293	texture_av = newAV ();
		2294	AvREAL_off (texture_av);
1909	}	2295	}
1910		2296
1911	char *	2297	char *
1912	gl_vendor ()	2298	gl_vendor ()
1913	CODE:	2299	CODE:
…		…
2006	r *= a;	2392	r *= a;
2007	g *= a;	2393	g *= a;
2008	b *= a;	2394	b *= a;
2009	}	2395	}
2010	// microsoft visual "c" rounds instead of truncating...	2396	// microsoft visual "c" rounds instead of truncating...
2011	glColor4ub (MIN ((int)(r * 256.f), 255),	2397	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		2398
2016	void glInterleavedArrays (int format, int stride, char *data)	2399	void glInterleavedArrays (int format, int stride, char *data)
2017		2400
2018	void glDrawElements (int mode, int count, int type, char *indices)	2401	void glDrawElements (int mode, int count, int type, char *indices)
2019		2402
…		…
2065		2448
2066	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2449	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2067		2450
2068	int glGenTexture ()	2451	int glGenTexture ()
2069	CODE:	2452	CODE:
2070	{	2453	RETVAL = gen_texture ();
2071	GLuint name;
2072	glGenTextures (1, &name);
2073	RETVAL = name;
2074	}
2075	OUTPUT:	2454	OUTPUT:
2076	RETVAL	2455	RETVAL
2077		2456
2078	void glDeleteTexture (int name)	2457	void glDeleteTexture (int name)
2079	CODE:	2458	CODE:
2080	{
2081	GLuint name_ = name;
2082	glDeleteTextures (1, &name_);	2459	del_texture (name);
2083	}	2460
2084
2085	int glGenList ()	2461	int glGenList ()
2086	CODE:	2462	CODE:
2087	RETVAL = glGenLists (1);	2463	RETVAL = glGenLists (1);
2088	OUTPUT:	2464	OUTPUT:
2089	RETVAL	2465	RETVAL
…		…
2096		2472
2097	void glEndList ()	2473	void glEndList ()
2098		2474
2099	void glCallList (int list)	2475	void glCallList (int list)
2100		2476
2101

Diff Legend

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