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

Diff Legend

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