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.105 by root, Mon Jun 5 03:33:09 2006 UTC vs.
Revision 1.153 by root, Tue Sep 19 22:02:38 2006 UTC

1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3	# include <malloc.h>	4	# include <malloc.h>
4	# include <windows.h>	5	# include <windows.h>
5	# pragma warning(disable:4244)	6	# pragma warning(disable:4244)
6	#endif	7	#endif
7		8
8	#include "EXTERN.h"	9	#include "EXTERN.h"
9	#include "perl.h"	10	#include "perl.h"
10	#include "XSUB.h"	11	#include "XSUB.h"
11		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
12	#include <math.h>	17	#include <math.h>
13	#include <string.h>	18	#include <string.h>
14	#include <stdio.h>	19	#include <stdio.h>
		20	#include <stdlib.h>
15		21
16	#include <SDL.h>	22	#include <SDL.h>
17	#include <SDL_endian.h>	23	#include <SDL_endian.h>
18	#include <SDL_image.h>	24	#include <SDL_image.h>
19	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
21		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
22	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
23		32
24	#include <pango/pango.h>	33	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		34
29	#ifndef _WIN32	35	#ifndef _WIN32
30	# include <sys/types.h>	36	# include <sys/types.h>
31	# include <sys/socket.h>	37	# include <sys/socket.h>
32	# include <netinet/in.h>	38	# include <netinet/in.h>
…		…
39	typedef signed char int8_t;	45	typedef signed char int8_t;
40	typedef signed short int16_t;	46	typedef signed short int16_t;
41	typedef signed int int32_t;	47	typedef signed int int32_t;
42	#endif	48	#endif
43		49
44	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45		51
46	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
47		53
48	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
50		56
51	#define MIN_FONT_HEIGHT 10	57	#define MIN_FONT_HEIGHT 10
		58
		59	#if 0
		60	# define PARACHUTE SDL_INIT_NOPARACHUTE
		61	#else
		62	# define PARACHUTE 0
		63	#endif
52		64
53	static struct	65	static struct
54	{	66	{
55	#define GL_FUNC(ptr,name) ptr name;	67	#define GL_FUNC(ptr,name) ptr name;
56	#include "glfunc.h"	68	#include "glfunc.h"
…		…
65	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	else	78	else
67	glBlendFunc (sa, da);	79	glBlendFunc (sa, da);
68	}	80	}
69		81
		82	#include "texcache.c"
		83
		84	#include "pango-font.c"
		85	#include "pango-fontmap.c"
		86	#include "pango-render.c"
		87
70	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
71	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
72		90
73	typedef PangoFontDescription *CFClient__Font;	91	typedef PangoFontDescription *CFPlus__Font;
		92
		93	static int
		94	shape_attr_p (PangoLayoutRun *run)
		95	{
		96	GSList *attrs = run->item->analysis.extra_attrs;
		97
		98	while (attrs)
		99	{
		100	PangoAttribute *attr = attrs->data;
		101
		102	if (attr->klass->type == PANGO_ATTR_SHAPE)
		103	return 1;
		104
		105	attrs = attrs->next;
		106	}
		107
		108	return 0;
		109	}
74		110
75	typedef struct cf_layout {	111	typedef struct cf_layout {
76	PangoLayout *pl; // either derived from a cairo or ft2 context	112	PangoLayout *pl;
77	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
79	int base_height;	114	int base_height;
80	CFClient__Font font;	115	CFPlus__Font font;
81	} *CFClient__Layout;	116	} *CFPlus__Layout;
82		117
83	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
84	static PangoContext *ft2_context, *cairo_context;	119	static PangoContext *opengl_context;
85	static PangoFontMap *ft2_fontmap, *cairo_fontmap;	120	static PangoFontMap *opengl_fontmap;
86		121
87	static void	122	static void
88	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
89	{	124	{
90	FcPatternAddBool (pattern, FC_HINTING , 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
		126	#ifdef FC_HINT_STYLE
91	//FcPatternAddBool (pattern, FC_AUTOHINT, 1);	127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		128	#endif
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	}	130	}
94		131
95	static void	132	static void
96	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
97	{	134	{
98	/* use a random scale factor to account for unknown descenders, 0.8 works	135	/* use a random scale factor to account for unknown descenders, 0.8 works
99	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
100	*/	137	*/
101	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
105		142
106	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
107	}	144	}
108		145
109	static void	146	static void
110	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	147	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
111	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
112	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
113		153
114	if (!*w) *w = 1;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
115	if (!*h) *h = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
116		156
117	*w = (*w + 3) & ~3;	157	if (!rect.width) rect.width = 1;
		158	if (!rect.height) rect.height = 1;
		159
		160	*w = rect.width;
		161	*h = rect.height;
118	}	162	}
119		163
120	typedef uint16_t mapface;	164	typedef uint16_t mapface;
121		165
122	typedef struct {	166	typedef struct {
…		…
125	float s, t;	169	float s, t;
126	uint8_t r, g, b, a;	170	uint8_t r, g, b, a;
127	} maptex;	171	} maptex;
128		172
129	typedef struct {	173	typedef struct {
130	int16_t darkness;	174	uint32_t player;
131	mapface face[3];	175	mapface face[3];
		176	uint16_t darkness;
		177	uint8_t stat_width, stat_hp, flags;
132	} mapcell;	178	} mapcell;
133		179
134	typedef struct {	180	typedef struct {
135	int32_t c0, c1;	181	int32_t c0, c1;
136	mapcell *col;	182	mapcell *col;
…		…
145	int texs;	191	int texs;
146	maptex *tex;	192	maptex *tex;
147		193
148	int32_t rows;	194	int32_t rows;
149	maprow *row;	195	maprow *row;
150	} *CFClient__Map;	196	} *CFPlus__Map;
151		197
152	static char *	198	static char *
153	prepend (char *ptr, int sze, int inc)	199	prepend (char *ptr, int sze, int inc)
154	{	200	{
155	char *p;	201	char *p;
…		…
173		219
174	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	220	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
175	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	221	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
176		222
177	static maprow *	223	static maprow *
178	map_get_row (CFClient__Map self, int y)	224	map_get_row (CFPlus__Map self, int y)
179	{	225	{
180	if (0 > y)	226	if (0 > y)
181	{	227	{
182	int extend = - y + MAP_EXTEND_Y;	228	int extend = - y + MAP_EXTEND_Y;
183	Prepend (maprow, self->row, self->rows, extend);	229	Prepend (maprow, self->row, self->rows, extend);
…		…
221		267
222	return row->col + (x - row->c0);	268	return row->col + (x - row->c0);
223	}	269	}
224		270
225	static mapcell *	271	static mapcell *
226	map_get_cell (CFClient__Map self, int x, int y)	272	map_get_cell (CFPlus__Map self, int x, int y)
227	{	273	{
228	return row_get_cell (map_get_row (self, y), x);	274	return row_get_cell (map_get_row (self, y), x);
229	}	275	}
230		276
231	static void	277	static void
232	map_clear (CFClient__Map self)	278	map_clear (CFPlus__Map self)
233	{	279	{
234	int r;	280	int r;
235		281
236	for (r = 0; r < self->rows; r++)	282	for (r = 0; r < self->rows; r++)
237	Safefree (self->row[r].col);	283	Safefree (self->row[r].col);
…		…
245	self->row = 0;	291	self->row = 0;
246	self->rows = 0;	292	self->rows = 0;
247	}	293	}
248		294
249	static void	295	static void
250	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	296	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
251	{	297	{
252	int x, y;	298	int x, y;
253	maprow *row;	299	maprow *row;
		300	mapcell *cell;
254		301
255	for (y = y0; y < y0 + h; y++)	302	for (y = y0; y < y0 + h; y++)
256	if (y >= 0)	303	if (y >= 0)
257	{	304	{
258	if (y >= self->rows)	305	if (y >= self->rows)
…		…
264	if (x >= row->c0)	311	if (x >= row->c0)
265	{	312	{
266	if (x >= row->c1)	313	if (x >= row->c1)
267	break;	314	break;
268		315
269	row->col[x - row->c0].darkness = -1;	316	cell = row->col + x - row->c0;
		317
		318	cell->darkness = 0;
		319	cell->stat_hp = 0;
270	}	320	}
271	}	321	}
272	}	322	}
273		323
274	static void	324	static void
…		…
295	ev.data2 = 0;	345	ev.data2 = 0;
296		346
297	SDL_PushEvent ((SDL_Event *)&ev);	347	SDL_PushEvent ((SDL_Event *)&ev);
298	}	348	}
299		349
		350	static unsigned int
		351	minpot (unsigned int n)
		352	{
		353	if (!n)
		354	return 0;
		355
		356	--n;
		357
		358	n |= n >> 1;
		359	n |= n >> 2;
		360	n |= n >> 4;
		361	n |= n >> 8;
		362	n |= n >> 16;
		363
		364	return n + 1;
		365	}
		366
300	MODULE = CFClient PACKAGE = CFClient	367	MODULE = CFPlus PACKAGE = CFPlus
301		368
302	PROTOTYPES: ENABLE	369	PROTOTYPES: ENABLE
303		370
304	BOOT:	371	BOOT:
305	{	372	{
306	HV *stash = gv_stashpv ("CFClient", 1);	373	HV *stash = gv_stashpv ("CFPlus", 1);
307	static const struct {	374	static const struct {
308	const char *name;	375	const char *name;
309	IV iv;	376	IV iv;
310	} *civ, const_iv[] = {	377	} *civ, const_iv[] = {
311	# define const_iv(name) { # name, (IV)name }	378	# define const_iv(name) { # name, (IV)name }
…		…
412		479
413	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	480	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
414	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	481	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
415	}	482	}
416		483
		484	int
		485	in_destruct ()
		486	CODE:
		487	RETVAL = PL_main_cv == Nullcv;
		488	OUTPUT:
		489	RETVAL
		490
		491	NV floor (NV x)
		492
		493	NV ceil (NV x)
		494
417	void	495	void
418	pango_init ()	496	pango_init ()
419	CODE:	497	CODE:
420	// delayed, so it can pick up new fonts added by AddFontResourceEx
421	{	498	{
422	{
423	ft2_fontmap = pango_ft2_font_map_new ();	499	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	500	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	501	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426	}
427
428	{
429	cairo_font_options_t *fopt = cairo_font_options_create ();
430	cairo_fontmap = pango_cairo_font_map_get_default ();
431	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
432	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
433	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
434	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
435	pango_cairo_context_set_font_options (cairo_context, fopt);
436	cairo_font_options_destroy (fopt);
437	}
438	}	502	}
439		503
440	int	504	int
441	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	505	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
442		506
443	void	507	void
444	SDL_Quit ()	508	SDL_Quit ()
445		509
446	void	510	void
…		…
453	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	517	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
454	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	518	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
455	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	519	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
456		520
457	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	521	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
458	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	522	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
459		523
460	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	524	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
461	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	525	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
462	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
463	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
464		528
465	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	529	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		530	#if SDL_VERSION_ATLEAST(1,2,10)
		531	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		532	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		533	#endif
466		534
467	SDL_EnableUNICODE (1);	535	SDL_EnableUNICODE (1);
468	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	536	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
469		537
470	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	538	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
557	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	625	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
558	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	626	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
559	break;	627	break;
560	}	628	}
561		629
562	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	630	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
563	}	631	}
564	}	632	}
565		633
566	int	634	int
567	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	635	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
583	#endif	651	#endif
584		652
585	void	653	void
586	add_font (char *file)	654	add_font (char *file)
587	CODE:	655	CODE:
588	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	656	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
589	#ifdef _WIN32
590	// cairo... sigh... requires win2000
591	AddFontResourceEx (file, FR_PRIVATE, 0);
592	#endif
593		657
594	void	658	void
595	load_image_inline (SV *image_)	659	load_image_inline (SV *image_)
596	ALIAS:	660	ALIAS:
597	load_image_file = 1	661	load_image_file = 1
…		…
639		703
640	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	704	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
641		705
642	assert (surface2->pitch == surface2->w * 4);	706	assert (surface2->pitch == surface2->w * 4);
643		707
		708	SDL_LockSurface (surface2);
644	EXTEND (SP, 5);	709	EXTEND (SP, 6);
645	PUSHs (sv_2mortal (newSViv (surface2->w)));	710	PUSHs (sv_2mortal (newSViv (surface2->w)));
646	PUSHs (sv_2mortal (newSViv (surface2->h)));	711	PUSHs (sv_2mortal (newSViv (surface2->h)));
647	SDL_LockSurface (surface2);
648	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	712	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
649	SDL_UnlockSurface (surface2);
650	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	713	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
651	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	714	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
652	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	715	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		716	SDL_UnlockSurface (surface2);
653		717
654	SDL_FreeSurface (surface);	718	SDL_FreeSurface (surface);
655	SDL_FreeSurface (surface2);	719	SDL_FreeSurface (surface2);
656	}	720	}
657		721
…		…
693	CODE:	757	CODE:
694	fprintf (stderr, "FATAL: %s\n", message);	758	fprintf (stderr, "FATAL: %s\n", message);
695	#ifdef _WIN32	759	#ifdef _WIN32
696	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	760	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
697	#endif	761	#endif
698	exit (1);	762	_exit (1);
699		763
		764	void
		765	_exit (int retval)
		766	CODE:
		767	_exit (retval);
		768
700	MODULE = CFClient PACKAGE = CFClient::Font	769	MODULE = CFPlus PACKAGE = CFPlus::Font
701		770
702	CFClient::Font	771	CFPlus::Font
703	new_from_file (SV *class, char *path, int id = 0)	772	new_from_file (SV *class, char *path, int id = 0)
704	CODE:	773	CODE:
705	{	774	{
706	int count;	775	int count;
707	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	776	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
710	}	779	}
711	OUTPUT:	780	OUTPUT:
712	RETVAL	781	RETVAL
713		782
714	void	783	void
715	DESTROY (CFClient::Font self)	784	DESTROY (CFPlus::Font self)
716	CODE:	785	CODE:
717	pango_font_description_free (self);	786	pango_font_description_free (self);
718		787
719	void	788	void
720	make_default (CFClient::Font self)	789	make_default (CFPlus::Font self)
721	CODE:	790	CODE:
722	default_font = self;	791	default_font = self;
723		792
724	MODULE = CFClient PACKAGE = CFClient::Layout	793	MODULE = CFPlus PACKAGE = CFPlus::Layout
725		794
726	CFClient::Layout	795	void
727	new (SV *class, int rgba = 0)	796	reset_glyph_cache ()
728	CODE:	797	CODE:
729	#if _WIN32	798	tc_clear ();
730	//rgba = 0;//D makes text nicer, breaks TextView	799
731	#endif	800	CFPlus::Layout
732	rgba=1;//D	801	new (SV *class)
		802	CODE:
733	New (0, RETVAL, 1, struct cf_layout);	803	New (0, RETVAL, 1, struct cf_layout);
734		804
735	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	805	RETVAL->pl = pango_layout_new (opengl_context);
736	RETVAL->rgba = rgba;
737	RETVAL->r = 1.;	806	RETVAL->r = 1.;
738	RETVAL->g = 1.;	807	RETVAL->g = 1.;
739	RETVAL->b = 1.;	808	RETVAL->b = 1.;
740	RETVAL->a = 1.;	809	RETVAL->a = 1.;
741	RETVAL->base_height = MIN_FONT_HEIGHT;	810	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
745	layout_update_font (RETVAL);	814	layout_update_font (RETVAL);
746	OUTPUT:	815	OUTPUT:
747	RETVAL	816	RETVAL
748		817
749	void	818	void
750	DESTROY (CFClient::Layout self)	819	DESTROY (CFPlus::Layout self)
751	CODE:	820	CODE:
752	g_object_unref (self->pl);	821	g_object_unref (self->pl);
753	Safefree (self);	822	Safefree (self);
754		823
755	int
756	is_rgba (CFClient::Layout self)
757	CODE:
758	RETVAL = self->rgba;
759	OUTPUT:
760	RETVAL
761
762	void	824	void
763	set_text (CFClient::Layout self, SV *text_)	825	set_text (CFPlus::Layout self, SV *text_)
764	CODE:	826	CODE:
765	{	827	{
766	STRLEN textlen;	828	STRLEN textlen;
767	char *text = SvPVutf8 (text_, textlen);	829	char *text = SvPVutf8 (text_, textlen);
768		830
769	pango_layout_set_text (self->pl, text, textlen);	831	pango_layout_set_text (self->pl, text, textlen);
770	}	832	}
771		833
772	void	834	void
773	set_markup (CFClient::Layout self, SV *text_)	835	set_markup (CFPlus::Layout self, SV *text_)
774	CODE:	836	CODE:
775	{	837	{
776	STRLEN textlen;	838	STRLEN textlen;
777	char *text = SvPVutf8 (text_, textlen);	839	char *text = SvPVutf8 (text_, textlen);
778		840
779	pango_layout_set_markup (self->pl, text, textlen);	841	pango_layout_set_markup (self->pl, text, textlen);
780	}	842	}
781		843
		844	void
		845	set_shapes (CFPlus::Layout self, ...)
		846	CODE:
		847	{
		848	PangoAttrList *attrs = 0;
		849	const char *text = pango_layout_get_text (self->pl);
		850	const char *pos = text;
		851	int arg = 4;
		852
		853	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		854	{
		855	PangoRectangle inkrect, rect;
		856	PangoAttribute *attr;
		857
		858	int x = SvIV (ST (arg - 3));
		859	int y = SvIV (ST (arg - 2));
		860	int w = SvIV (ST (arg - 1));
		861	int h = SvIV (ST (arg ));
		862
		863	inkrect.x = 0;
		864	inkrect.y = 0;
		865	inkrect.width = 0;
		866	inkrect.height = 0;
		867
		868	rect.x = x * PANGO_SCALE;
		869	rect.y = y * PANGO_SCALE;
		870	rect.width = w * PANGO_SCALE;
		871	rect.height = h * PANGO_SCALE;
		872
		873	if (!attrs)
		874	attrs = pango_layout_get_attributes (self->pl);
		875
		876	attr = pango_attr_shape_new (&inkrect, &rect);
		877	attr->start_index = pos - text;
		878	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		879	pango_attr_list_insert (attrs, attr);
		880
		881	arg += 4;
		882	pos += sizeof (OBJ_STR) - 1;
		883	}
		884
		885	if (attrs)
		886	pango_layout_set_attributes (self->pl, attrs);
		887	}
		888
		889	void
		890	get_shapes (CFPlus::Layout self)
		891	PPCODE:
		892	{
		893	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		894
		895	do
		896	{
		897	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		898
		899	if (run && shape_attr_p (run))
		900	{
		901	PangoRectangle extents;
		902	pango_layout_iter_get_run_extents (iter, 0, &extents);
		903
		904	EXTEND (SP, 2);
		905	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		906	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		907	}
		908	}
		909	while (pango_layout_iter_next_run (iter));
		910
		911	pango_layout_iter_free (iter);
		912	}
		913
		914	int
		915	has_wrapped (CFPlus::Layout self)
		916	CODE:
		917	{
		918	int lines = 1;
		919	const char *text = pango_layout_get_text (self->pl);
		920
		921	while (*text)
		922	lines += *text++ == '\n';
		923
		924	RETVAL = lines < pango_layout_get_line_count (self->pl);
		925	}
		926	OUTPUT:
		927	RETVAL
		928
782	SV *	929	SV *
783	get_text (CFClient::Layout self)	930	get_text (CFPlus::Layout self)
784	CODE:	931	CODE:
785	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	932	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
786	SvUTF8_on (RETVAL);	933	sv_utf8_decode (RETVAL);
787	OUTPUT:	934	OUTPUT:
788	RETVAL	935	RETVAL
789		936
790	void	937	void
791	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	938	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
792	CODE:	939	CODE:
793	self->r = r;	940	self->r = r;
794	self->g = g;	941	self->g = g;
795	self->b = b;	942	self->b = b;
796	self->a = a;	943	self->a = a;
797		944
798	void	945	void
799	set_font (CFClient::Layout self, CFClient::Font font = 0)	946	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
800	CODE:	947	CODE:
801	if (self->font != font)	948	if (self->font != font)
802	{	949	{
803	self->font = font;	950	self->font = font;
804	layout_update_font (self);	951	layout_update_font (self);
805	}	952	}
806		953
807	void	954	void
808	set_height (CFClient::Layout self, int base_height)	955	set_height (CFPlus::Layout self, int base_height)
809	CODE:	956	CODE:
810	if (self->base_height != base_height)	957	if (self->base_height != base_height)
811	{	958	{
812	self->base_height = base_height;	959	self->base_height = base_height;
813	layout_update_font (self);	960	layout_update_font (self);
814	}	961	}
815		962
816	void	963	void
817	set_width (CFClient::Layout self, int max_width = -1)	964	set_width (CFPlus::Layout self, int max_width = -1)
818	CODE:	965	CODE:
819	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	966	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
820		967
821	void	968	void
822	set_indent (CFClient::Layout self, int indent)	969	set_indent (CFPlus::Layout self, int indent)
823	CODE:	970	CODE:
824	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	971	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
825		972
826	void	973	void
827	set_spacing (CFClient::Layout self, int spacing)	974	set_spacing (CFPlus::Layout self, int spacing)
828	CODE:	975	CODE:
829	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	976	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
830		977
831	void	978	void
832	set_ellipsise (CFClient::Layout self, int ellipsise)	979	set_ellipsise (CFPlus::Layout self, int ellipsise)
833	CODE:	980	CODE:
834	pango_layout_set_ellipsize (self->pl,	981	pango_layout_set_ellipsize (self->pl,
835	ellipsise == 1 ? PANGO_ELLIPSIZE_START	982	ellipsise == 1 ? PANGO_ELLIPSIZE_START
836	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	983	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
837	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	984	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
838	: PANGO_ELLIPSIZE_NONE	985	: PANGO_ELLIPSIZE_NONE
839	);	986	);
840		987
841	void	988	void
842	set_single_paragraph_mode (CFClient::Layout self, int spm)	989	set_single_paragraph_mode (CFPlus::Layout self, int spm)
843	CODE:	990	CODE:
844	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	991	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
845		992
846	void	993	void
847	size (CFClient::Layout self)	994	size (CFPlus::Layout self)
848	PPCODE:	995	PPCODE:
849	{	996	{
850	int w, h;	997	int w, h;
851		998
852	layout_get_pixel_size (self, &w, &h);	999	layout_get_pixel_size (self, &w, &h);
…		…
855	PUSHs (sv_2mortal (newSViv (w)));	1002	PUSHs (sv_2mortal (newSViv (w)));
856	PUSHs (sv_2mortal (newSViv (h)));	1003	PUSHs (sv_2mortal (newSViv (h)));
857	}	1004	}
858		1005
859	int	1006	int
		1007	descent (CFPlus::Layout self)
		1008	CODE:
		1009	{
		1010	PangoRectangle rect;
		1011	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1012	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1013	RETVAL = PANGO_DESCENT (rect);
		1014	}
		1015	OUTPUT:
		1016	RETVAL
		1017
		1018	int
860	xy_to_index (CFClient::Layout self, int x, int y)	1019	xy_to_index (CFPlus::Layout self, int x, int y)
861	CODE:	1020	CODE:
862	{	1021	{
863	int index, trailing;	1022	int index, trailing;
864	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1023	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
865	RETVAL = index;	1024	RETVAL = index;
866	}	1025	}
867	OUTPUT:	1026	OUTPUT:
868	RETVAL	1027	RETVAL
869		1028
870	void	1029	void
871	cursor_pos (CFClient::Layout self, int index)	1030	cursor_pos (CFPlus::Layout self, int index)
872	PPCODE:	1031	PPCODE:
873	{	1032	{
874	PangoRectangle strong_pos;	1033	PangoRectangle strong_pos;
875	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1034	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
876		1035
…		…
879	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1038	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
880	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1039	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
881	}	1040	}
882		1041
883	void	1042	void
884	render (CFClient::Layout self)	1043	render (CFPlus::Layout self, float x, float y, int flags = 0)
885	PPCODE:	1044	PPCODE:
886	{	1045	pango_opengl_render_layout_subpixel (
887	SV *retval;	1046	self->pl,
888	int w, h;	1047	x * PANGO_SCALE, y * PANGO_SCALE,
		1048	self->r, self->g, self->b, self->a,
		1049	flags
		1050	);
889		1051
890	layout_get_pixel_size (self, &w, &h);	1052	MODULE = CFPlus PACKAGE = CFPlus::Texture
891		1053
892	if (self->rgba)	1054	void
		1055	pad2pot (SV *data_, SV *w_, SV *h_)
		1056	CODE:
		1057	{
		1058	int ow = SvIV (w_);
		1059	int oh = SvIV (h_);
		1060
		1061	if (ow && oh)
893	{	1062	{
894	cairo_surface_t *surface;	1063	int nw = minpot (ow);
895	cairo_t *cairo;	1064	int nh = minpot (oh);
896		1065
897	retval = newSV (w * h * 4);	1066	if (nw != ow || nh != oh)
898	SvPOK_only (retval);
899	SvCUR_set (retval, w * h * 4);
900
901	memset (SvPVX (retval), 0, w * h * 4);
902
903	surface = cairo_image_surface_create_for_data (
904	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
905	cairo = cairo_create (surface);
906	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
907
908	pango_cairo_show_layout (cairo, self->pl);
909
910	cairo_destroy (cairo);
911	cairo_surface_destroy (surface);
912
913	// what a mess, and its premultiplied, too :(
914	{	1067	{
915	uint32_t *p = (uint32_t *)SvPVX (retval);	1068	if (SvOK (data_))
916	uint32_t *e = p + w * h;
917
918	while (p < e)
919	{	1069	{
920	uint32_t rgba = *p;	1070	STRLEN datalen;
921	rgba = (rgba >> 24) | (rgba << 8);	1071	char *data = SvPVbyte (data_, datalen);
922	#if 0	1072	int bpp = datalen / (ow * oh);
923	#ifdef _WIN32	1073	SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
924	{//D
925	uint8_t r = rgba >> 24;
926	uint8_t g = rgba >> 16;
927	uint8_t b = rgba >> 8;
928	uint8_t a = rgba >> 0;
929		1074
930	rgba = (rgba & 0xffffff00) | a;	1075	SvPOK_only (result_);
		1076	SvCUR_set (result_, nw * nh * bpp);
		1077
		1078	memset (SvPVX (result_), 0, nw * nh * bpp);
		1079	while (oh--)
		1080	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1081
		1082	sv_setsv (data_, result_);
931	}	1083	}
932	#endif	1084
933	#endif	1085	sv_setiv (w_, nw);
934	rgba = SDL_SwapBE32 (rgba);	1086	sv_setiv (h_, nh);
935	*p++ = rgba;
936	}	1087	}
937	}
938
939	EXTEND (SP, 5);
940	PUSHs (sv_2mortal (newSViv (w)));
941	PUSHs (sv_2mortal (newSViv (h)));
942	PUSHs (sv_2mortal (retval));
943	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
944	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
945	}	1088	}
946	else
947	{
948	FT_Bitmap bitmap;
949
950	retval = newSV (w * h);
951	SvPOK_only (retval);
952	SvCUR_set (retval, w * h);
953
954	bitmap.rows = h;
955	bitmap.width = w;
956	bitmap.pitch = w;
957	bitmap.buffer = (unsigned char*)SvPVX (retval);
958	bitmap.num_grays = 256;
959	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
960
961	memset (bitmap.buffer, 0, w * h);
962
963	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
964
965	EXTEND (SP, 5);
966	PUSHs (sv_2mortal (newSViv (w)));
967	PUSHs (sv_2mortal (newSViv (h)));
968	PUSHs (sv_2mortal (retval));
969	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
970	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
971	}
972	}	1089	}
973		1090
974	MODULE = CFClient PACKAGE = CFClient::Texture
975
976	void	1091	void
977	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1092	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
978	PROTOTYPE: $$$;$$	1093	PROTOTYPE: $$$;$$
979	ALIAS:	1094	ALIAS:
980	draw_quad_alpha = 1	1095	draw_quad_alpha = 1
981	draw_quad_alpha_premultiplied = 2	1096	draw_quad_alpha_premultiplied = 2
982	CODE:	1097	CODE:
…		…
1020	glDisable (GL_ALPHA_TEST);	1135	glDisable (GL_ALPHA_TEST);
1021	glDisable (GL_BLEND);	1136	glDisable (GL_BLEND);
1022	}	1137	}
1023	}	1138	}
1024		1139
1025	MODULE = CFClient PACKAGE = CFClient::Map	1140	MODULE = CFPlus PACKAGE = CFPlus::Map
1026		1141
1027	CFClient::Map	1142	CFPlus::Map
1028	new (SV *class, int map_width, int map_height)	1143	new (SV *class, int map_width, int map_height)
1029	CODE:	1144	CODE:
1030	New (0, RETVAL, 1, struct map);	1145	New (0, RETVAL, 1, struct map);
1031	RETVAL->x = 0;	1146	RETVAL->x = 0;
1032	RETVAL->y = 0;	1147	RETVAL->y = 0;
…		…
1042	RETVAL->row = 0;	1157	RETVAL->row = 0;
1043	OUTPUT:	1158	OUTPUT:
1044	RETVAL	1159	RETVAL
1045		1160
1046	void	1161	void
1047	DESTROY (CFClient::Map self)	1162	DESTROY (CFPlus::Map self)
1048	CODE:	1163	CODE:
1049	{	1164	{
1050	map_clear (self);	1165	map_clear (self);
1051	Safefree (self->face);	1166	Safefree (self->face);
		1167	Safefree (self->tex);
1052	Safefree (self);	1168	Safefree (self);
1053	}	1169	}
1054		1170
1055	void	1171	void
1056	clear (CFClient::Map self)	1172	clear (CFPlus::Map self)
1057	CODE:	1173	CODE:
1058	map_clear (self);	1174	map_clear (self);
1059		1175
1060	void	1176	void
1061	set_face (CFClient::Map self, int face, int texid)	1177	set_face (CFPlus::Map self, int face, int texid)
1062	CODE:	1178	CODE:
1063	{	1179	{
1064	while (self->faces <= face)	1180	while (self->faces <= face)
1065	{	1181	{
1066	Append (mapface, self->face, self->faces, self->faces);	1182	Append (mapface, self->face, self->faces, self->faces);
…		…
1069		1185
1070	self->face [face] = texid;	1186	self->face [face] = texid;
1071	}	1187	}
1072		1188
1073	void	1189	void
1074	set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1190	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1075	CODE:	1191	CODE:
1076	{	1192	{
1077	while (self->texs <= texid)	1193	while (self->texs <= texid)
1078	{	1194	{
1079	Append (maptex, self->tex, self->texs, self->texs);	1195	Append (maptex, self->tex, self->texs, self->texs);
…		…
1103	// from transparent color bleeding and ugly wrapping effects.	1219	// from transparent color bleeding and ugly wrapping effects.
1104	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1220	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1105	}	1221	}
1106		1222
1107	int	1223	int
1108	ox (CFClient::Map self)	1224	ox (CFPlus::Map self)
1109	ALIAS:	1225	ALIAS:
1110	oy = 1	1226	oy = 1
1111	x = 2	1227	x = 2
1112	y = 3	1228	y = 3
1113	w = 4	1229	w = 4
…		…
1124	}	1240	}
1125	OUTPUT:	1241	OUTPUT:
1126	RETVAL	1242	RETVAL
1127		1243
1128	void	1244	void
1129	scroll (CFClient::Map self, int dx, int dy)	1245	scroll (CFPlus::Map self, int dx, int dy)
1130	CODE:	1246	CODE:
1131	{	1247	{
1132	if (dx > 0)	1248	if (dx > 0)
1133	map_blank (self, self->x, self->y, dx - 1, self->h);	1249	map_blank (self, self->x, self->y, dx - 1, self->h);
1134	else if (dx < 0)	1250	else if (dx < 0)
…		…
1150	self->y += MAP_EXTEND_Y;	1266	self->y += MAP_EXTEND_Y;
1151	}	1267	}
1152	}	1268	}
1153		1269
1154	void	1270	void
1155	map1a_update (CFClient::Map self, SV *data_)	1271	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1156	CODE:	1272	CODE:
1157	{	1273	{
1158	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1274	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1159	uint8_t *data_end = (uint8_t *)SvEND (data_);	1275	uint8_t *data_end = (uint8_t *)SvEND (data_);
1160	mapcell *cell;	1276	mapcell *cell;
1161	int x, y, flags;	1277	int x, y, flags;
1162		1278
1163	while (data < data_end)	1279	while (data < data_end - 1)
1164	{	1280	{
1165	flags = (data [0] << 8) + data [1]; data += 2;	1281	flags = (data [0] << 8) + data [1]; data += 2;
1166		1282
1167	x = ((flags >> 10) & 63) + self->x;	1283	x = self->x + ((flags >> 10) & 63);
1168	y = ((flags >> 4) & 63) + self->y;	1284	y = self->y + ((flags >> 4) & 63);
1169		1285
1170	cell = map_get_cell (self, x, y);	1286	cell = map_get_cell (self, x, y);
1171		1287
1172	if (flags & 15)	1288	if (flags & 15)
1173	{	1289	{
1174	if (cell->darkness < 0)	1290	if (!cell->darkness)
1175	{	1291	{
1176	cell->darkness = 0;	1292	cell->darkness = 256;
1177	cell->face [0] = 0;	1293	cell->face [0] = 0;
1178	cell->face [1] = 0;	1294	cell->face [1] = 0;
1179	cell->face [2] = 0;	1295	cell->face [2] = 0;
1180	}	1296	}
1181		1297
1182	cell->darkness = flags & 8 ? *data++ : 255;
1183
1184	//TODO: don't trust server data to be in-range(!)	1298	//TODO: don't trust server data to be in-range(!)
		1299
		1300	if (flags & 8)
		1301	{
		1302	if (extmap)
		1303	{
		1304	uint8_t ext, cmd;
		1305
		1306	do
		1307	{
		1308	ext = *data++;
		1309	cmd = ext & 0x3f;
		1310
		1311	if (cmd < 4)
		1312	cell->darkness = 255 - ext * 64 + 1;
		1313	else if (cmd == 5) // health
		1314	{
		1315	cell->stat_width = 1;
		1316	cell->stat_hp = *data++;
		1317	}
		1318	else if (cmd == 6) // monster width
		1319	cell->stat_width = *data++ + 1;
		1320	else if (cmd == 0x47) // monster width
		1321	{
		1322	if (*data == 4)
		1323	; // decode player tag
		1324
		1325	data += *data + 1;
		1326	}
		1327	else if (cmd == 8) // cell flags
		1328	cell->flags = *data++;
		1329	else if (ext & 0x40) // unknown, multibyte => skip
		1330	data += *data + 1;
		1331	else
		1332	data++;
		1333	}
		1334	while (ext & 0x80);
		1335	}
		1336	else
		1337	cell->darkness = *data++ + 1;
		1338	}
1185		1339
1186	if (flags & 4)	1340	if (flags & 4)
1187	{	1341	{
1188	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1342	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1189	}	1343	}
…		…
1197	{	1351	{
1198	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1352	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1199	}	1353	}
1200	}	1354	}
1201	else	1355	else
		1356	{
1202	cell->darkness = -1;	1357	cell->darkness = 0;
		1358	cell->stat_hp = 0;
		1359	}
1203	}	1360	}
1204	}	1361	}
1205		1362
1206	SV *	1363	SV *
1207	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1364	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1208	CODE:	1365	CODE:
1209	{	1366	{
1210	int x1, x;	1367	int x1, x;
1211	int y1, y;	1368	int y1, y;
1212	int z;	1369	int z;
…		…
1262	}	1419	}
1263	OUTPUT:	1420	OUTPUT:
1264	RETVAL	1421	RETVAL
1265		1422
1266	void	1423	void
1267	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1424	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1268	PPCODE:	1425	CODE:
1269	{	1426	{
1270	int vx, vy;	1427	int vx, vy;
1271	int x, y, z;	1428	int x, y, z;
1272	int last_name;	1429	int last_name;
1273	mapface face;	1430	mapface face;
1274	int sw4 = (sw + 3) & ~3;
1275	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1276	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1277		1431
1278	memset (darkness, 255, sw4 * sh);
1279	SvPOK_only (darkness_sv);
1280	SvCUR_set (darkness_sv, sw4 * sh);
1281
1282	vx = self->x + (self->w - sw) / 2 - shift_x;	1432	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1283	vy = self->y + (self->h - sh) / 2 - shift_y;	1433	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1284		1434
1285	/*	1435	/*
1286	int vx = self->vx = self->w >= sw	1436	int vx = self->vx = self->w >= sw
1287	? self->x + (self->w - sw) / 2	1437	? self->x + (self->w - sw) / 2
1288	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1438	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1292	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1442	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1293	*/	1443	*/
1294		1444
1295	glColor4ub (255, 255, 255, 255);	1445	glColor4ub (255, 255, 255, 255);
1296		1446
		1447	glEnable (GL_BLEND);
1297	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1448	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1298	glEnable (GL_BLEND);
1299	glEnable (GL_TEXTURE_2D);	1449	glEnable (GL_TEXTURE_2D);
1300	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1450	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1301		1451
1302	glBegin (GL_QUADS);	1452	glBegin (GL_QUADS);
1303		1453
…		…
1312	for (x = 0; x < sw; x++)	1462	for (x = 0; x < sw; x++)
1313	if (row->c0 <= x + vx && x + vx < row->c1)	1463	if (row->c0 <= x + vx && x + vx < row->c1)
1314	{	1464	{
1315	mapcell *cell = row->col + (x + vx - row->c0);	1465	mapcell *cell = row->col + (x + vx - row->c0);
1316		1466
1317	darkness[y * sw4 + x] = cell->darkness < 0
1318	? 255 - FOW_DARKNESS
1319	: 255 - cell->darkness;
1320
1321	face = cell->face [z];	1467	face = cell->face [z];
1322		1468
1323	if (face)	1469	if (face && face < self->texs)
1324	{	1470	{
1325	maptex tex = self->tex [face];	1471	maptex tex = self->tex [face];
1326
1327	int px = (x + 1) * 32 - tex.w;	1472	int px = (x + 1) * 32 - tex.w;
1328	int py = (y + 1) * 32 - tex.h;	1473	int py = (y + 1) * 32 - tex.h;
1329		1474
1330	if (last_name != tex.name)	1475	if (last_name != tex.name)
1331	{	1476	{
1332	glEnd ();	1477	glEnd ();
1333	last_name = tex.name;
1334	glBindTexture (GL_TEXTURE_2D, last_name);	1478	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1335	glBegin (GL_QUADS);	1479	glBegin (GL_QUADS);
1336	}	1480	}
1337		1481
1338	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1482	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1339	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1483	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1340	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1484	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1341	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1485	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1342	}	1486	}
		1487
		1488	if (cell->flags && z == 2)
		1489	{
		1490	if (cell->flags & 1)
		1491	{
		1492	maptex tex = self->tex [1];
		1493	int px = (x + 1) * 32 - tex.w + 2;
		1494	int py = (y + 1) * 32 - tex.h - 6;
		1495
		1496	glEnd ();
		1497	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1498	glBegin (GL_QUADS);
		1499
		1500	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1501	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1502	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1503	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1504	}
		1505	}
1343	}	1506	}
1344	}	1507	}
1345		1508
1346	glEnd ();	1509	glEnd ();
1347		1510
1348	glDisable (GL_TEXTURE_2D);	1511	glDisable (GL_TEXTURE_2D);
1349	glDisable (GL_BLEND);	1512	glDisable (GL_BLEND);
		1513
		1514	// top layer: overlays such as the health bar
		1515	for (y = 0; y < sh; y++)
		1516	if (0 <= y + vy && y + vy < self->rows)
		1517	{
		1518	maprow *row = self->row + (y + vy);
		1519
		1520	for (x = 0; x < sw; x++)
		1521	if (row->c0 <= x + vx && x + vx < row->c1)
		1522	{
		1523	mapcell *cell = row->col + (x + vx - row->c0);
		1524
		1525	int px = x * 32;
		1526	int py = y * 32;
		1527
		1528	if (cell->stat_hp)
		1529	{
		1530	int width = cell->stat_width * 32;
		1531	int thick = sh / 28 + 1 + cell->stat_width;
		1532
		1533	glColor3ub (0, 0, 0);
		1534	glRectf (px + 1, py - thick - 2,
		1535	px + width - 1, py);
		1536
		1537	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1538	glRectf (px + 2,
		1539	py - thick - 1,
		1540	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1541	}
		1542	}
		1543	}
		1544	}
		1545
		1546	void
		1547	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1548	CODE:
		1549	{
		1550	static float color[16][3] = {
		1551	{ 0.00F, 0.00F, 0.00F },
		1552	{ 1.00F, 1.00F, 1.00F },
		1553	{ 0.00F, 0.00F, 0.55F },
		1554	{ 1.00F, 0.00F, 0.00F },
		1555
		1556	{ 1.00F, 0.54F, 0.00F },
		1557	{ 0.11F, 0.56F, 1.00F },
		1558	{ 0.93F, 0.46F, 0.00F },
		1559	{ 0.18F, 0.54F, 0.34F },
		1560
		1561	{ 0.56F, 0.73F, 0.56F },
		1562	{ 0.80F, 0.80F, 0.80F },
		1563	{ 0.55F, 0.41F, 0.13F },
		1564	{ 0.99F, 0.77F, 0.26F },
		1565
		1566	{ 0.74F, 0.65F, 0.41F },
		1567
		1568	{ 0.00F, 1.00F, 1.00F },
		1569	{ 1.00F, 0.00F, 1.00F },
		1570	{ 1.00F, 1.00F, 0.00F },
		1571	};
		1572
		1573	int x, y;
		1574
		1575	glEnable (GL_TEXTURE_2D);
		1576	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1577	glEnable (GL_BLEND);
		1578	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1579	glBegin (GL_QUADS);
		1580
		1581	for (y = 0; y < h; y++)
		1582	for (x = 0; x < w; x++)
		1583	{
		1584	unsigned char m = data [x + y * w];
		1585
		1586	if (m)
		1587	{
		1588	float *c = color [m & 15];
		1589
		1590	float tx1 = m & 0x40 ? 0.5 : 0.;
		1591	float tx2 = tx1 + 0.5;
		1592
		1593	glColor4f (c[0], c[1], c[2], 0.75);
		1594	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1595	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1596	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1597	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1598	}
		1599	}
		1600
		1601	glEnd ();
		1602	glDisable (GL_BLEND);
		1603	glDisable (GL_TEXTURE_2D);
		1604	}
		1605
		1606	void
		1607	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1608	PPCODE:
		1609	{
		1610	int vx, vy;
		1611	int x, y;
		1612	int sw4 = (sw + 3) & ~3;
		1613	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
		1614	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
		1615
		1616	memset (darkness, 255, sw4 * sh);
		1617	SvPOK_only (darkness_sv);
		1618	SvCUR_set (darkness_sv, sw4 * sh);
		1619
		1620	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1621	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1622
		1623	for (y = 0; y < sh; y++)
		1624	if (0 <= y + vy && y + vy < self->rows)
		1625	{
		1626	maprow *row = self->row + (y + vy);
		1627
		1628	for (x = 0; x < sw; x++)
		1629	if (row->c0 <= x + vx && x + vx < row->c1)
		1630	{
		1631	mapcell *cell = row->col + (x + vx - row->c0);
		1632
		1633	darkness[y * sw4 + x] = cell->darkness
		1634	? 255 - (cell->darkness - 1)
		1635	: 255 - FOW_DARKNESS;
		1636	}
		1637	}
1350		1638
1351	EXTEND (SP, 3);	1639	EXTEND (SP, 3);
1352	PUSHs (sv_2mortal (newSViv (sw4)));	1640	PUSHs (sv_2mortal (newSViv (sw4)));
1353	PUSHs (sv_2mortal (newSViv (sh)));	1641	PUSHs (sv_2mortal (newSViv (sh)));
1354	PUSHs (darkness_sv);	1642	PUSHs (darkness_sv);
1355	}	1643	}
1356		1644
1357	SV *	1645	SV *
1358	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1646	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1359	CODE:	1647	CODE:
1360	{	1648	{
1361	int x, y, x1, y1;	1649	int x, y, x1, y1;
1362	SV *data_sv = newSV (w * h * 7 + 5);	1650	SV *data_sv = newSV (w * h * 7 + 5);
1363	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1651	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1425	}	1713	}
1426	OUTPUT:	1714	OUTPUT:
1427	RETVAL	1715	RETVAL
1428		1716
1429	void	1717	void
1430	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1718	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1431	PPCODE:	1719	PPCODE:
1432	{	1720	{
1433	int x, y, z;	1721	int x, y, z;
1434	int w, h;	1722	int w, h;
1435	int x1, y1;	1723	int x1, y1;
…		…
1467		1755
1468	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	1756	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1469	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	1757	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1470	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	1758	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1471		1759
1472	if (cell->darkness <= 0)	1760	if (cell->darkness == 0)
1473	{	1761	{
1474	cell->darkness = -1;	1762	cell->darkness = 0;
1475		1763
1476	for (z = 0; z <= 2; z++)	1764	for (z = 0; z <= 2; z++)
1477	{	1765	{
1478	cell->face[z] = face[z];	1766	cell->face[z] = face[z];
1479		1767
…		…
1484	}	1772	}
1485	}	1773	}
1486	}	1774	}
1487	}	1775	}
1488		1776
1489	MODULE = CFClient PACKAGE = CFClient::MixChunk	1777	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1490		1778
1491	CFClient::MixChunk	1779	CFPlus::MixChunk
1492	new_from_file (SV *class, char *path)	1780	new_from_file (SV *class, char *path)
1493	CODE:	1781	CODE:
1494	RETVAL = Mix_LoadWAV (path);	1782	RETVAL = Mix_LoadWAV (path);
1495	OUTPUT:	1783	OUTPUT:
1496	RETVAL	1784	RETVAL
1497		1785
1498	void	1786	void
1499	DESTROY (CFClient::MixChunk self)	1787	DESTROY (CFPlus::MixChunk self)
1500	CODE:	1788	CODE:
1501	Mix_FreeChunk (self);	1789	Mix_FreeChunk (self);
1502		1790
1503	int	1791	int
1504	volume (CFClient::MixChunk self, int volume = -1)	1792	volume (CFPlus::MixChunk self, int volume = -1)
1505	CODE:	1793	CODE:
1506	RETVAL = Mix_VolumeChunk (self, volume);	1794	RETVAL = Mix_VolumeChunk (self, volume);
1507	OUTPUT:	1795	OUTPUT:
1508	RETVAL	1796	RETVAL
1509		1797
1510	int	1798	int
1511	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1799	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1512	CODE:	1800	CODE:
1513	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1801	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1514	OUTPUT:	1802	OUTPUT:
1515	RETVAL	1803	RETVAL
1516		1804
1517	MODULE = CFClient PACKAGE = CFClient::MixMusic	1805	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1518		1806
1519	int	1807	int
1520	volume (int volume = -1)	1808	volume (int volume = -1)
1521	CODE:	1809	CODE:
1522	RETVAL = Mix_VolumeMusic (volume);	1810	RETVAL = Mix_VolumeMusic (volume);
1523	OUTPUT:	1811	OUTPUT:
1524	RETVAL	1812	RETVAL
1525		1813
1526	CFClient::MixMusic	1814	CFPlus::MixMusic
1527	new_from_file (SV *class, char *path)	1815	new_from_file (SV *class, char *path)
1528	CODE:	1816	CODE:
1529	RETVAL = Mix_LoadMUS (path);	1817	RETVAL = Mix_LoadMUS (path);
1530	OUTPUT:	1818	OUTPUT:
1531	RETVAL	1819	RETVAL
1532		1820
1533	void	1821	void
1534	DESTROY (CFClient::MixMusic self)	1822	DESTROY (CFPlus::MixMusic self)
1535	CODE:	1823	CODE:
1536	Mix_FreeMusic (self);	1824	Mix_FreeMusic (self);
1537		1825
1538	int	1826	int
1539	play (CFClient::MixMusic self, int loops = -1)	1827	play (CFPlus::MixMusic self, int loops = -1)
1540	CODE:	1828	CODE:
1541	RETVAL = Mix_PlayMusic (self, loops);	1829	RETVAL = Mix_PlayMusic (self, loops);
1542	OUTPUT:	1830	OUTPUT:
1543	RETVAL	1831	RETVAL
1544		1832
1545	MODULE = CFClient PACKAGE = CFClient::OpenGL	1833	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1546		1834
1547	BOOT:	1835	BOOT:
1548	{	1836	{
1549	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1837	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1550	static const struct {	1838	static const struct {
1551	const char *name;	1839	const char *name;
1552	IV iv;	1840	IV iv;
1553	} *civ, const_iv[] = {	1841	} *civ, const_iv[] = {
1554	# define const_iv(name) { # name, (IV)name }	1842	# define const_iv(name) { # name, (IV)name }
…		…
1561	const_iv (GL_SCISSOR_TEST),	1849	const_iv (GL_SCISSOR_TEST),
1562	const_iv (GL_DEPTH_TEST),	1850	const_iv (GL_DEPTH_TEST),
1563	const_iv (GL_ALPHA_TEST),	1851	const_iv (GL_ALPHA_TEST),
1564	const_iv (GL_NORMALIZE),	1852	const_iv (GL_NORMALIZE),
1565	const_iv (GL_RESCALE_NORMAL),	1853	const_iv (GL_RESCALE_NORMAL),
		1854	const_iv (GL_FRONT),
		1855	const_iv (GL_BACK),
1566	const_iv (GL_AND),	1856	const_iv (GL_AND),
1567	const_iv (GL_ONE),	1857	const_iv (GL_ONE),
1568	const_iv (GL_ZERO),	1858	const_iv (GL_ZERO),
1569	const_iv (GL_SRC_ALPHA),	1859	const_iv (GL_SRC_ALPHA),
1570	const_iv (GL_DST_ALPHA),	1860	const_iv (GL_DST_ALPHA),
1571	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1861	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1572	const_iv (GL_ONE_MINUS_DST_ALPHA),	1862	const_iv (GL_ONE_MINUS_DST_ALPHA),
1573	const_iv (GL_SRC_ALPHA_SATURATE),	1863	const_iv (GL_SRC_ALPHA_SATURATE),
1574	const_iv (GL_RGB),	1864	const_iv (GL_RGB),
1575	const_iv (GL_RGBA),	1865	const_iv (GL_RGBA),
		1866	const_iv (GL_RGBA4),
		1867	const_iv (GL_RGBA8),
		1868	const_iv (GL_RGB5_A1),
1576	const_iv (GL_UNSIGNED_BYTE),	1869	const_iv (GL_UNSIGNED_BYTE),
1577	const_iv (GL_UNSIGNED_SHORT),	1870	const_iv (GL_UNSIGNED_SHORT),
1578	const_iv (GL_UNSIGNED_INT),	1871	const_iv (GL_UNSIGNED_INT),
1579	const_iv (GL_ALPHA),	1872	const_iv (GL_ALPHA),
1580	const_iv (GL_INTENSITY),	1873	const_iv (GL_INTENSITY),
…		…
1612	const_iv (GL_SEPARABLE_2D),	1905	const_iv (GL_SEPARABLE_2D),
1613	const_iv (GL_CONVOLUTION_2D),	1906	const_iv (GL_CONVOLUTION_2D),
1614	const_iv (GL_CONVOLUTION_BORDER_MODE),	1907	const_iv (GL_CONVOLUTION_BORDER_MODE),
1615	const_iv (GL_CONSTANT_BORDER),	1908	const_iv (GL_CONSTANT_BORDER),
1616	const_iv (GL_LINES),	1909	const_iv (GL_LINES),
		1910	const_iv (GL_LINE_STRIP),
1617	const_iv (GL_LINE_LOOP),	1911	const_iv (GL_LINE_LOOP),
1618	const_iv (GL_QUADS),	1912	const_iv (GL_QUADS),
1619	const_iv (GL_QUAD_STRIP),	1913	const_iv (GL_QUAD_STRIP),
1620	const_iv (GL_TRIANGLES),	1914	const_iv (GL_TRIANGLES),
1621	const_iv (GL_TRIANGLE_STRIP),	1915	const_iv (GL_TRIANGLE_STRIP),
…		…
1654	OUTPUT:	1948	OUTPUT:
1655	RETVAL	1949	RETVAL
1656		1950
1657	int glGetError ()	1951	int glGetError ()
1658		1952
		1953	void glFinish ()
		1954
1659	void glClear (int mask)	1955	void glClear (int mask)
1660		1956
1661	void glClearColor (float r, float g, float b, float a = 1.0)	1957	void glClearColor (float r, float g, float b, float a = 1.0)
1662	PROTOTYPE: @	1958	PROTOTYPE: @
1663		1959
…		…
1686	void glPushMatrix ()	1982	void glPushMatrix ()
1687		1983
1688	void glPopMatrix ()	1984	void glPopMatrix ()
1689		1985
1690	void glLoadIdentity ()	1986	void glLoadIdentity ()
		1987
		1988	void glDrawBuffer (int buffer)
		1989
		1990	void glReadBuffer (int buffer)
1691		1991
1692	# near_ and far_ are due to microsofts buggy "c" compiler	1992	# near_ and far_ are due to microsofts buggy "c" compiler
1693	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1993	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1694		1994
1695	# near_ and far_ are due to microsofts buggy "c" compiler	1995	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1725	r *= a;	2025	r *= a;
1726	g *= a;	2026	g *= a;
1727	b *= a;	2027	b *= a;
1728	}	2028	}
1729	// microsoft visual "c" rounds instead of truncating...	2029	// microsoft visual "c" rounds instead of truncating...
1730	glColor4ub (MIN ((int)(r * 256.f), 255),	2030	glColor4f (r, g, b, a);
1731	MIN ((int)(g * 256.f), 255),
1732	MIN ((int)(b * 256.f), 255),
1733	MIN ((int)(a * 256.f), 255));
1734		2031
1735	void glInterleavedArrays (int format, int stride, char *data)	2032	void glInterleavedArrays (int format, int stride, char *data)
1736		2033
1737	void glDrawElements (int mode, int count, int type, char *indices)	2034	void glDrawElements (int mode, int count, int type, char *indices)
1738		2035
…		…
1815		2112
1816	void glEndList ()	2113	void glEndList ()
1817		2114
1818	void glCallList (int list)	2115	void glCallList (int list)
1819		2116
1820

Diff Legend

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