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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.113 by root, Wed Jun 14 16:20:21 2006 UTC vs. Revision 1.186 by root, Sat Apr 21 09:25:31 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.113 by root, Wed Jun 14 16:20:21 2006 UTC vs.
Revision 1.186 by root, Sat Apr 21 09:25:31 2007 UTC