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.155 by root, Thu Sep 21 00:16:42 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;
		320	cell->flags = 0;
		321	cell->player = 0;
270	}	322	}
271	}	323	}
272	}	324	}
273		325
274	static void	326	static void
…		…
295	ev.data2 = 0;	347	ev.data2 = 0;
296		348
297	SDL_PushEvent ((SDL_Event *)&ev);	349	SDL_PushEvent ((SDL_Event *)&ev);
298	}	350	}
299		351
		352	static unsigned int
		353	minpot (unsigned int n)
		354	{
		355	if (!n)
		356	return 0;
		357
		358	--n;
		359
		360	n |= n >> 1;
		361	n |= n >> 2;
		362	n |= n >> 4;
		363	n |= n >> 8;
		364	n |= n >> 16;
		365
		366	return n + 1;
		367	}
		368
300	MODULE = CFClient PACKAGE = CFClient	369	MODULE = CFPlus PACKAGE = CFPlus
301		370
302	PROTOTYPES: ENABLE	371	PROTOTYPES: ENABLE
303		372
304	BOOT:	373	BOOT:
305	{	374	{
306	HV *stash = gv_stashpv ("CFClient", 1);	375	HV *stash = gv_stashpv ("CFPlus", 1);
307	static const struct {	376	static const struct {
308	const char *name;	377	const char *name;
309	IV iv;	378	IV iv;
310	} *civ, const_iv[] = {	379	} *civ, const_iv[] = {
311	# define const_iv(name) { # name, (IV)name }	380	# define const_iv(name) { # name, (IV)name }
…		…
412		481
413	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	482	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
414	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	483	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
415	}	484	}
416		485
		486	int
		487	in_destruct ()
		488	CODE:
		489	RETVAL = PL_main_cv == Nullcv;
		490	OUTPUT:
		491	RETVAL
		492
		493	NV floor (NV x)
		494
		495	NV ceil (NV x)
		496
417	void	497	void
418	pango_init ()	498	pango_init ()
419	CODE:	499	CODE:
420	// delayed, so it can pick up new fonts added by AddFontResourceEx
421	{	500	{
422	{
423	ft2_fontmap = pango_ft2_font_map_new ();	501	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	502	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);	503	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	}	504	}
439		505
440	int	506	int
441	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	507	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
442		508
443	void	509	void
444	SDL_Quit ()	510	SDL_Quit ()
445		511
446	void	512	void
…		…
453	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	519	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
454	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	520	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
455	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	521	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
456		522
457	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	523	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
458	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	524	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
459		525
460	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
461	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
462	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	528	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
463	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	529	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
464		530
465	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	531	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		532	#if SDL_VERSION_ATLEAST(1,2,10)
		533	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		534	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		535	#endif
466		536
467	SDL_EnableUNICODE (1);	537	SDL_EnableUNICODE (1);
468	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	538	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
469		539
470	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	540	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
557	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	627	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
558	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	628	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
559	break;	629	break;
560	}	630	}
561		631
562	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	632	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
563	}	633	}
564	}	634	}
565		635
566	int	636	int
567	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	637	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
583	#endif	653	#endif
584		654
585	void	655	void
586	add_font (char *file)	656	add_font (char *file)
587	CODE:	657	CODE:
588	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	658	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
589	#ifdef _WIN32
590	// cairo... sigh... requires win2000
591	AddFontResourceEx (file, FR_PRIVATE, 0);
592	#endif
593		659
594	void	660	void
595	load_image_inline (SV *image_)	661	load_image_inline (SV *image_)
596	ALIAS:	662	ALIAS:
597	load_image_file = 1	663	load_image_file = 1
…		…
639		705
640	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	706	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
641		707
642	assert (surface2->pitch == surface2->w * 4);	708	assert (surface2->pitch == surface2->w * 4);
643		709
		710	SDL_LockSurface (surface2);
644	EXTEND (SP, 5);	711	EXTEND (SP, 6);
645	PUSHs (sv_2mortal (newSViv (surface2->w)));	712	PUSHs (sv_2mortal (newSViv (surface2->w)));
646	PUSHs (sv_2mortal (newSViv (surface2->h)));	713	PUSHs (sv_2mortal (newSViv (surface2->h)));
647	SDL_LockSurface (surface2);
648	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	714	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)));	715	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
651	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	716	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
652	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	717	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		718	SDL_UnlockSurface (surface2);
653		719
654	SDL_FreeSurface (surface);	720	SDL_FreeSurface (surface);
655	SDL_FreeSurface (surface2);	721	SDL_FreeSurface (surface2);
656	}	722	}
657		723
…		…
693	CODE:	759	CODE:
694	fprintf (stderr, "FATAL: %s\n", message);	760	fprintf (stderr, "FATAL: %s\n", message);
695	#ifdef _WIN32	761	#ifdef _WIN32
696	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	762	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
697	#endif	763	#endif
698	exit (1);	764	_exit (1);
699		765
		766	void
		767	_exit (int retval)
		768	CODE:
		769	_exit (retval);
		770
700	MODULE = CFClient PACKAGE = CFClient::Font	771	MODULE = CFPlus PACKAGE = CFPlus::Font
701		772
702	CFClient::Font	773	CFPlus::Font
703	new_from_file (SV *class, char *path, int id = 0)	774	new_from_file (SV *class, char *path, int id = 0)
704	CODE:	775	CODE:
705	{	776	{
706	int count;	777	int count;
707	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	778	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
710	}	781	}
711	OUTPUT:	782	OUTPUT:
712	RETVAL	783	RETVAL
713		784
714	void	785	void
715	DESTROY (CFClient::Font self)	786	DESTROY (CFPlus::Font self)
716	CODE:	787	CODE:
717	pango_font_description_free (self);	788	pango_font_description_free (self);
718		789
719	void	790	void
720	make_default (CFClient::Font self)	791	make_default (CFPlus::Font self)
721	CODE:	792	CODE:
722	default_font = self;	793	default_font = self;
723		794
724	MODULE = CFClient PACKAGE = CFClient::Layout	795	MODULE = CFPlus PACKAGE = CFPlus::Layout
725		796
726	CFClient::Layout	797	void
727	new (SV *class, int rgba = 0)	798	reset_glyph_cache ()
728	CODE:	799	CODE:
729	#if _WIN32	800	tc_clear ();
730	//rgba = 0;//D makes text nicer, breaks TextView	801
731	#endif	802	CFPlus::Layout
732	rgba=1;//D	803	new (SV *class)
		804	CODE:
733	New (0, RETVAL, 1, struct cf_layout);	805	New (0, RETVAL, 1, struct cf_layout);
734		806
735	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	807	RETVAL->pl = pango_layout_new (opengl_context);
736	RETVAL->rgba = rgba;
737	RETVAL->r = 1.;	808	RETVAL->r = 1.;
738	RETVAL->g = 1.;	809	RETVAL->g = 1.;
739	RETVAL->b = 1.;	810	RETVAL->b = 1.;
740	RETVAL->a = 1.;	811	RETVAL->a = 1.;
741	RETVAL->base_height = MIN_FONT_HEIGHT;	812	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
745	layout_update_font (RETVAL);	816	layout_update_font (RETVAL);
746	OUTPUT:	817	OUTPUT:
747	RETVAL	818	RETVAL
748		819
749	void	820	void
750	DESTROY (CFClient::Layout self)	821	DESTROY (CFPlus::Layout self)
751	CODE:	822	CODE:
752	g_object_unref (self->pl);	823	g_object_unref (self->pl);
753	Safefree (self);	824	Safefree (self);
754		825
755	int
756	is_rgba (CFClient::Layout self)
757	CODE:
758	RETVAL = self->rgba;
759	OUTPUT:
760	RETVAL
761
762	void	826	void
763	set_text (CFClient::Layout self, SV *text_)	827	set_text (CFPlus::Layout self, SV *text_)
764	CODE:	828	CODE:
765	{	829	{
766	STRLEN textlen;	830	STRLEN textlen;
767	char *text = SvPVutf8 (text_, textlen);	831	char *text = SvPVutf8 (text_, textlen);
768		832
769	pango_layout_set_text (self->pl, text, textlen);	833	pango_layout_set_text (self->pl, text, textlen);
770	}	834	}
771		835
772	void	836	void
773	set_markup (CFClient::Layout self, SV *text_)	837	set_markup (CFPlus::Layout self, SV *text_)
774	CODE:	838	CODE:
775	{	839	{
776	STRLEN textlen;	840	STRLEN textlen;
777	char *text = SvPVutf8 (text_, textlen);	841	char *text = SvPVutf8 (text_, textlen);
778		842
779	pango_layout_set_markup (self->pl, text, textlen);	843	pango_layout_set_markup (self->pl, text, textlen);
780	}	844	}
781		845
		846	void
		847	set_shapes (CFPlus::Layout self, ...)
		848	CODE:
		849	{
		850	PangoAttrList *attrs = 0;
		851	const char *text = pango_layout_get_text (self->pl);
		852	const char *pos = text;
		853	int arg = 4;
		854
		855	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		856	{
		857	PangoRectangle inkrect, rect;
		858	PangoAttribute *attr;
		859
		860	int x = SvIV (ST (arg - 3));
		861	int y = SvIV (ST (arg - 2));
		862	int w = SvIV (ST (arg - 1));
		863	int h = SvIV (ST (arg ));
		864
		865	inkrect.x = 0;
		866	inkrect.y = 0;
		867	inkrect.width = 0;
		868	inkrect.height = 0;
		869
		870	rect.x = x * PANGO_SCALE;
		871	rect.y = y * PANGO_SCALE;
		872	rect.width = w * PANGO_SCALE;
		873	rect.height = h * PANGO_SCALE;
		874
		875	if (!attrs)
		876	attrs = pango_layout_get_attributes (self->pl);
		877
		878	attr = pango_attr_shape_new (&inkrect, &rect);
		879	attr->start_index = pos - text;
		880	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		881	pango_attr_list_insert (attrs, attr);
		882
		883	arg += 4;
		884	pos += sizeof (OBJ_STR) - 1;
		885	}
		886
		887	if (attrs)
		888	pango_layout_set_attributes (self->pl, attrs);
		889	}
		890
		891	void
		892	get_shapes (CFPlus::Layout self)
		893	PPCODE:
		894	{
		895	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		896
		897	do
		898	{
		899	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		900
		901	if (run && shape_attr_p (run))
		902	{
		903	PangoRectangle extents;
		904	pango_layout_iter_get_run_extents (iter, 0, &extents);
		905
		906	EXTEND (SP, 2);
		907	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		908	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		909	}
		910	}
		911	while (pango_layout_iter_next_run (iter));
		912
		913	pango_layout_iter_free (iter);
		914	}
		915
		916	int
		917	has_wrapped (CFPlus::Layout self)
		918	CODE:
		919	{
		920	int lines = 1;
		921	const char *text = pango_layout_get_text (self->pl);
		922
		923	while (*text)
		924	lines += *text++ == '\n';
		925
		926	RETVAL = lines < pango_layout_get_line_count (self->pl);
		927	}
		928	OUTPUT:
		929	RETVAL
		930
782	SV *	931	SV *
783	get_text (CFClient::Layout self)	932	get_text (CFPlus::Layout self)
784	CODE:	933	CODE:
785	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	934	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
786	SvUTF8_on (RETVAL);	935	sv_utf8_decode (RETVAL);
787	OUTPUT:	936	OUTPUT:
788	RETVAL	937	RETVAL
789		938
790	void	939	void
791	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	940	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
792	CODE:	941	CODE:
793	self->r = r;	942	self->r = r;
794	self->g = g;	943	self->g = g;
795	self->b = b;	944	self->b = b;
796	self->a = a;	945	self->a = a;
797		946
798	void	947	void
799	set_font (CFClient::Layout self, CFClient::Font font = 0)	948	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
800	CODE:	949	CODE:
801	if (self->font != font)	950	if (self->font != font)
802	{	951	{
803	self->font = font;	952	self->font = font;
804	layout_update_font (self);	953	layout_update_font (self);
805	}	954	}
806		955
807	void	956	void
808	set_height (CFClient::Layout self, int base_height)	957	set_height (CFPlus::Layout self, int base_height)
809	CODE:	958	CODE:
810	if (self->base_height != base_height)	959	if (self->base_height != base_height)
811	{	960	{
812	self->base_height = base_height;	961	self->base_height = base_height;
813	layout_update_font (self);	962	layout_update_font (self);
814	}	963	}
815		964
816	void	965	void
817	set_width (CFClient::Layout self, int max_width = -1)	966	set_width (CFPlus::Layout self, int max_width = -1)
818	CODE:	967	CODE:
819	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	968	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
820		969
821	void	970	void
822	set_indent (CFClient::Layout self, int indent)	971	set_indent (CFPlus::Layout self, int indent)
823	CODE:	972	CODE:
824	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	973	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
825		974
826	void	975	void
827	set_spacing (CFClient::Layout self, int spacing)	976	set_spacing (CFPlus::Layout self, int spacing)
828	CODE:	977	CODE:
829	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	978	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
830		979
831	void	980	void
832	set_ellipsise (CFClient::Layout self, int ellipsise)	981	set_ellipsise (CFPlus::Layout self, int ellipsise)
833	CODE:	982	CODE:
834	pango_layout_set_ellipsize (self->pl,	983	pango_layout_set_ellipsize (self->pl,
835	ellipsise == 1 ? PANGO_ELLIPSIZE_START	984	ellipsise == 1 ? PANGO_ELLIPSIZE_START
836	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	985	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
837	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	986	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
838	: PANGO_ELLIPSIZE_NONE	987	: PANGO_ELLIPSIZE_NONE
839	);	988	);
840		989
841	void	990	void
842	set_single_paragraph_mode (CFClient::Layout self, int spm)	991	set_single_paragraph_mode (CFPlus::Layout self, int spm)
843	CODE:	992	CODE:
844	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	993	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
845		994
846	void	995	void
847	size (CFClient::Layout self)	996	size (CFPlus::Layout self)
848	PPCODE:	997	PPCODE:
849	{	998	{
850	int w, h;	999	int w, h;
851		1000
852	layout_get_pixel_size (self, &w, &h);	1001	layout_get_pixel_size (self, &w, &h);
…		…
855	PUSHs (sv_2mortal (newSViv (w)));	1004	PUSHs (sv_2mortal (newSViv (w)));
856	PUSHs (sv_2mortal (newSViv (h)));	1005	PUSHs (sv_2mortal (newSViv (h)));
857	}	1006	}
858		1007
859	int	1008	int
		1009	descent (CFPlus::Layout self)
		1010	CODE:
		1011	{
		1012	PangoRectangle rect;
		1013	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1014	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1015	RETVAL = PANGO_DESCENT (rect);
		1016	}
		1017	OUTPUT:
		1018	RETVAL
		1019
		1020	int
860	xy_to_index (CFClient::Layout self, int x, int y)	1021	xy_to_index (CFPlus::Layout self, int x, int y)
861	CODE:	1022	CODE:
862	{	1023	{
863	int index, trailing;	1024	int index, trailing;
864	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1025	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
865	RETVAL = index;	1026	RETVAL = index;
866	}	1027	}
867	OUTPUT:	1028	OUTPUT:
868	RETVAL	1029	RETVAL
869		1030
870	void	1031	void
871	cursor_pos (CFClient::Layout self, int index)	1032	cursor_pos (CFPlus::Layout self, int index)
872	PPCODE:	1033	PPCODE:
873	{	1034	{
874	PangoRectangle strong_pos;	1035	PangoRectangle strong_pos;
875	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1036	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
876		1037
…		…
879	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1040	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
880	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1041	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
881	}	1042	}
882		1043
883	void	1044	void
884	render (CFClient::Layout self)	1045	render (CFPlus::Layout self, float x, float y, int flags = 0)
885	PPCODE:	1046	PPCODE:
886	{	1047	pango_opengl_render_layout_subpixel (
887	SV *retval;	1048	self->pl,
888	int w, h;	1049	x * PANGO_SCALE, y * PANGO_SCALE,
		1050	self->r, self->g, self->b, self->a,
		1051	flags
		1052	);
889		1053
890	layout_get_pixel_size (self, &w, &h);	1054	MODULE = CFPlus PACKAGE = CFPlus::Texture
891		1055
892	if (self->rgba)	1056	void
		1057	pad2pot (SV *data_, SV *w_, SV *h_)
		1058	CODE:
		1059	{
		1060	int ow = SvIV (w_);
		1061	int oh = SvIV (h_);
		1062
		1063	if (ow && oh)
893	{	1064	{
894	cairo_surface_t *surface;	1065	int nw = minpot (ow);
895	cairo_t *cairo;	1066	int nh = minpot (oh);
896		1067
897	retval = newSV (w * h * 4);	1068	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	{	1069	{
915	uint32_t *p = (uint32_t *)SvPVX (retval);	1070	if (SvOK (data_))
916	uint32_t *e = p + w * h;
917
918	while (p < e)
919	{	1071	{
920	uint32_t rgba = *p;	1072	STRLEN datalen;
921	rgba = (rgba >> 24) | (rgba << 8);	1073	char *data = SvPVbyte (data_, datalen);
922	#if 0	1074	int bpp = datalen / (ow * oh);
923	#ifdef _WIN32	1075	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		1076
930	rgba = (rgba & 0xffffff00) | a;	1077	SvPOK_only (result_);
		1078	SvCUR_set (result_, nw * nh * bpp);
		1079
		1080	memset (SvPVX (result_), 0, nw * nh * bpp);
		1081	while (oh--)
		1082	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1083
		1084	sv_setsv (data_, result_);
931	}	1085	}
932	#endif	1086
933	#endif	1087	sv_setiv (w_, nw);
934	rgba = SDL_SwapBE32 (rgba);	1088	sv_setiv (h_, nh);
935	*p++ = rgba;
936	}	1089	}
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	}	1090	}
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	}	1091	}
973		1092
974	MODULE = CFClient PACKAGE = CFClient::Texture
975
976	void	1093	void
977	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1094	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
978	PROTOTYPE: $$$;$$	1095	PROTOTYPE: $$$;$$
979	ALIAS:	1096	ALIAS:
980	draw_quad_alpha = 1	1097	draw_quad_alpha = 1
981	draw_quad_alpha_premultiplied = 2	1098	draw_quad_alpha_premultiplied = 2
982	CODE:	1099	CODE:
…		…
1020	glDisable (GL_ALPHA_TEST);	1137	glDisable (GL_ALPHA_TEST);
1021	glDisable (GL_BLEND);	1138	glDisable (GL_BLEND);
1022	}	1139	}
1023	}	1140	}
1024		1141
1025	MODULE = CFClient PACKAGE = CFClient::Map	1142	MODULE = CFPlus PACKAGE = CFPlus::Map
1026		1143
1027	CFClient::Map	1144	CFPlus::Map
1028	new (SV *class, int map_width, int map_height)	1145	new (SV *class, int map_width, int map_height)
1029	CODE:	1146	CODE:
1030	New (0, RETVAL, 1, struct map);	1147	New (0, RETVAL, 1, struct map);
1031	RETVAL->x = 0;	1148	RETVAL->x = 0;
1032	RETVAL->y = 0;	1149	RETVAL->y = 0;
…		…
1042	RETVAL->row = 0;	1159	RETVAL->row = 0;
1043	OUTPUT:	1160	OUTPUT:
1044	RETVAL	1161	RETVAL
1045		1162
1046	void	1163	void
1047	DESTROY (CFClient::Map self)	1164	DESTROY (CFPlus::Map self)
1048	CODE:	1165	CODE:
1049	{	1166	{
1050	map_clear (self);	1167	map_clear (self);
1051	Safefree (self->face);	1168	Safefree (self->face);
		1169	Safefree (self->tex);
1052	Safefree (self);	1170	Safefree (self);
1053	}	1171	}
1054		1172
1055	void	1173	void
1056	clear (CFClient::Map self)	1174	clear (CFPlus::Map self)
1057	CODE:	1175	CODE:
1058	map_clear (self);	1176	map_clear (self);
1059		1177
1060	void	1178	void
1061	set_face (CFClient::Map self, int face, int texid)	1179	set_face (CFPlus::Map self, int face, int texid)
1062	CODE:	1180	CODE:
1063	{	1181	{
1064	while (self->faces <= face)	1182	while (self->faces <= face)
1065	{	1183	{
1066	Append (mapface, self->face, self->faces, self->faces);	1184	Append (mapface, self->face, self->faces, self->faces);
…		…
1069		1187
1070	self->face [face] = texid;	1188	self->face [face] = texid;
1071	}	1189	}
1072		1190
1073	void	1191	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)	1192	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:	1193	CODE:
1076	{	1194	{
1077	while (self->texs <= texid)	1195	while (self->texs <= texid)
1078	{	1196	{
1079	Append (maptex, self->tex, self->texs, self->texs);	1197	Append (maptex, self->tex, self->texs, self->texs);
…		…
1103	// from transparent color bleeding and ugly wrapping effects.	1221	// from transparent color bleeding and ugly wrapping effects.
1104	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1222	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1105	}	1223	}
1106		1224
1107	int	1225	int
1108	ox (CFClient::Map self)	1226	ox (CFPlus::Map self)
1109	ALIAS:	1227	ALIAS:
1110	oy = 1	1228	oy = 1
1111	x = 2	1229	x = 2
1112	y = 3	1230	y = 3
1113	w = 4	1231	w = 4
…		…
1124	}	1242	}
1125	OUTPUT:	1243	OUTPUT:
1126	RETVAL	1244	RETVAL
1127		1245
1128	void	1246	void
1129	scroll (CFClient::Map self, int dx, int dy)	1247	scroll (CFPlus::Map self, int dx, int dy)
1130	CODE:	1248	CODE:
1131	{	1249	{
1132	if (dx > 0)	1250	if (dx > 0)
1133	map_blank (self, self->x, self->y, dx - 1, self->h);	1251	map_blank (self, self->x, self->y, dx, self->h);
1134	else if (dx < 0)	1252	else if (dx < 0)
1135	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1253	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1136		1254
1137	if (dy > 0)	1255	if (dy > 0)
1138	map_blank (self, self->x, self->y, self->w, dy - 1);	1256	map_blank (self, self->x, self->y, self->w, dy);
1139	else if (dy < 0)	1257	else if (dy < 0)
1140	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1258	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1141		1259
1142	self->ox += dx; self->x += dx;	1260	self->ox += dx; self->x += dx;
1143	self->oy += dy; self->y += dy;	1261	self->oy += dy; self->y += dy;
1144		1262
1145	while (self->y < 0)	1263	while (self->y < 0)
…		…
1150	self->y += MAP_EXTEND_Y;	1268	self->y += MAP_EXTEND_Y;
1151	}	1269	}
1152	}	1270	}
1153		1271
1154	void	1272	void
1155	map1a_update (CFClient::Map self, SV *data_)	1273	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1156	CODE:	1274	CODE:
1157	{	1275	{
1158	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1276	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1159	uint8_t *data_end = (uint8_t *)SvEND (data_);	1277	uint8_t *data_end = (uint8_t *)SvEND (data_);
1160	mapcell *cell;	1278	mapcell *cell;
1161	int x, y, flags;	1279	int x, y, flags;
1162		1280
1163	while (data < data_end)	1281	while (data < data_end - 1)
1164	{	1282	{
1165	flags = (data [0] << 8) + data [1]; data += 2;	1283	flags = (data [0] << 8) + data [1]; data += 2;
1166		1284
1167	x = ((flags >> 10) & 63) + self->x;	1285	x = self->x + ((flags >> 10) & 63);
1168	y = ((flags >> 4) & 63) + self->y;	1286	y = self->y + ((flags >> 4) & 63);
1169		1287
1170	cell = map_get_cell (self, x, y);	1288	cell = map_get_cell (self, x, y);
1171		1289
1172	if (flags & 15)	1290	if (flags & 15)
1173	{	1291	{
1174	if (cell->darkness < 0)	1292	if (!cell->darkness)
1175	{	1293	{
		1294	memset (cell, 0, sizeof (*cell));
1176	cell->darkness = 0;	1295	cell->darkness = 256;
1177	cell->face [0] = 0;
1178	cell->face [1] = 0;
1179	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
		1339	}
1185		1340
1186	if (flags & 4)	1341	if (flags & 4)
1187	{	1342	{
1188	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1343	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1189	}	1344	}
…		…
1197	{	1352	{
1198	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1353	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1199	}	1354	}
1200	}	1355	}
1201	else	1356	else
1202	cell->darkness = -1;	1357	cell->darkness = 0;
1203	}	1358	}
1204	}	1359	}
1205		1360
1206	SV *	1361	SV *
1207	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1362	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1208	CODE:	1363	CODE:
1209	{	1364	{
1210	int x1, x;	1365	int x1, x;
1211	int y1, y;	1366	int y1, y;
1212	int z;	1367	int z;
…		…
1262	}	1417	}
1263	OUTPUT:	1418	OUTPUT:
1264	RETVAL	1419	RETVAL
1265		1420
1266	void	1421	void
1267	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1422	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1268	PPCODE:	1423	CODE:
1269	{	1424	{
1270	int vx, vy;	1425	int vx, vy;
1271	int x, y, z;	1426	int x, y, z;
1272	int last_name;	1427	int last_name;
1273	mapface face;	1428	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		1429
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;	1430	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1283	vy = self->y + (self->h - sh) / 2 - shift_y;	1431	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1284		1432
1285	/*	1433	/*
1286	int vx = self->vx = self->w >= sw	1434	int vx = self->vx = self->w >= sw
1287	? self->x + (self->w - sw) / 2	1435	? self->x + (self->w - sw) / 2
1288	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1436	: 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));	1440	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1293	*/	1441	*/
1294		1442
1295	glColor4ub (255, 255, 255, 255);	1443	glColor4ub (255, 255, 255, 255);
1296		1444
		1445	glEnable (GL_BLEND);
1297	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1446	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1298	glEnable (GL_BLEND);
1299	glEnable (GL_TEXTURE_2D);	1447	glEnable (GL_TEXTURE_2D);
1300	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1448	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1301		1449
1302	glBegin (GL_QUADS);	1450	glBegin (GL_QUADS);
1303		1451
…		…
1312	for (x = 0; x < sw; x++)	1460	for (x = 0; x < sw; x++)
1313	if (row->c0 <= x + vx && x + vx < row->c1)	1461	if (row->c0 <= x + vx && x + vx < row->c1)
1314	{	1462	{
1315	mapcell *cell = row->col + (x + vx - row->c0);	1463	mapcell *cell = row->col + (x + vx - row->c0);
1316		1464
1317	darkness[y * sw4 + x] = cell->darkness < 0
1318	? 255 - FOW_DARKNESS
1319	: 255 - cell->darkness;
1320
1321	face = cell->face [z];	1465	face = cell->face [z];
1322		1466
1323	if (face)	1467	if (face && face < self->texs)
1324	{	1468	{
1325	maptex tex = self->tex [face];	1469	maptex tex = self->tex [face];
1326
1327	int px = (x + 1) * 32 - tex.w;	1470	int px = (x + 1) * 32 - tex.w;
1328	int py = (y + 1) * 32 - tex.h;	1471	int py = (y + 1) * 32 - tex.h;
1329		1472
1330	if (last_name != tex.name)	1473	if (last_name != tex.name)
1331	{	1474	{
1332	glEnd ();	1475	glEnd ();
1333	last_name = tex.name;
1334	glBindTexture (GL_TEXTURE_2D, last_name);	1476	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1335	glBegin (GL_QUADS);	1477	glBegin (GL_QUADS);
1336	}	1478	}
1337		1479
1338	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1480	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1339	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1481	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1340	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1482	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1341	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1483	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1342	}	1484	}
		1485
		1486	if (cell->flags && z == 2)
		1487	{
		1488	if (cell->flags & 1)
		1489	{
		1490	maptex tex = self->tex [1];
		1491	int px = (x + 1) * 32 - tex.w + 2;
		1492	int py = (y + 1) * 32 - tex.h - 6;
		1493
		1494	glEnd ();
		1495	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1496	glBegin (GL_QUADS);
		1497
		1498	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1499	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1500	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1501	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1502	}
		1503	}
1343	}	1504	}
1344	}	1505	}
1345		1506
1346	glEnd ();	1507	glEnd ();
1347		1508
1348	glDisable (GL_TEXTURE_2D);	1509	glDisable (GL_TEXTURE_2D);
1349	glDisable (GL_BLEND);	1510	glDisable (GL_BLEND);
		1511
		1512	// top layer: overlays such as the health bar
		1513	for (y = 0; y < sh; y++)
		1514	if (0 <= y + vy && y + vy < self->rows)
		1515	{
		1516	maprow *row = self->row + (y + vy);
		1517
		1518	for (x = 0; x < sw; x++)
		1519	if (row->c0 <= x + vx && x + vx < row->c1)
		1520	{
		1521	mapcell *cell = row->col + (x + vx - row->c0);
		1522
		1523	int px = x * 32;
		1524	int py = y * 32;
		1525
		1526	if (cell->stat_hp)
		1527	{
		1528	int width = cell->stat_width * 32;
		1529	int thick = sh / 28 + 1 + cell->stat_width;
		1530
		1531	glColor3ub (0, 0, 0);
		1532	glRectf (px + 1, py - thick - 2,
		1533	px + width - 1, py);
		1534
		1535	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1536	glRectf (px + 2,
		1537	py - thick - 1,
		1538	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1539	}
		1540	}
		1541	}
		1542	}
		1543
		1544	void
		1545	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1546	CODE:
		1547	{
		1548	static float color[16][3] = {
		1549	{ 0.00F, 0.00F, 0.00F },
		1550	{ 1.00F, 1.00F, 1.00F },
		1551	{ 0.00F, 0.00F, 0.55F },
		1552	{ 1.00F, 0.00F, 0.00F },
		1553
		1554	{ 1.00F, 0.54F, 0.00F },
		1555	{ 0.11F, 0.56F, 1.00F },
		1556	{ 0.93F, 0.46F, 0.00F },
		1557	{ 0.18F, 0.54F, 0.34F },
		1558
		1559	{ 0.56F, 0.73F, 0.56F },
		1560	{ 0.80F, 0.80F, 0.80F },
		1561	{ 0.55F, 0.41F, 0.13F },
		1562	{ 0.99F, 0.77F, 0.26F },
		1563
		1564	{ 0.74F, 0.65F, 0.41F },
		1565
		1566	{ 0.00F, 1.00F, 1.00F },
		1567	{ 1.00F, 0.00F, 1.00F },
		1568	{ 1.00F, 1.00F, 0.00F },
		1569	};
		1570
		1571	int x, y;
		1572
		1573	glEnable (GL_TEXTURE_2D);
		1574	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1575	glEnable (GL_BLEND);
		1576	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1577	glBegin (GL_QUADS);
		1578
		1579	for (y = 0; y < h; y++)
		1580	for (x = 0; x < w; x++)
		1581	{
		1582	unsigned char m = data [x + y * w];
		1583
		1584	if (m)
		1585	{
		1586	float *c = color [m & 15];
		1587
		1588	float tx1 = m & 0x40 ? 0.5 : 0.;
		1589	float tx2 = tx1 + 0.5;
		1590
		1591	glColor4f (c[0], c[1], c[2], 0.75);
		1592	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1593	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1594	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1595	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1596	}
		1597	}
		1598
		1599	glEnd ();
		1600	glDisable (GL_BLEND);
		1601	glDisable (GL_TEXTURE_2D);
		1602	}
		1603
		1604	void
		1605	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1606	PPCODE:
		1607	{
		1608	int vx, vy;
		1609	int x, y;
		1610	int sw4 = (sw + 3) & ~3;
		1611	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
		1612	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
		1613
		1614	memset (darkness, 255, sw4 * sh);
		1615	SvPOK_only (darkness_sv);
		1616	SvCUR_set (darkness_sv, sw4 * sh);
		1617
		1618	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1619	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1620
		1621	for (y = 0; y < sh; y++)
		1622	if (0 <= y + vy && y + vy < self->rows)
		1623	{
		1624	maprow *row = self->row + (y + vy);
		1625
		1626	for (x = 0; x < sw; x++)
		1627	if (row->c0 <= x + vx && x + vx < row->c1)
		1628	{
		1629	mapcell *cell = row->col + (x + vx - row->c0);
		1630
		1631	darkness[y * sw4 + x] = cell->darkness
		1632	? 255 - (cell->darkness - 1)
		1633	: 255 - FOW_DARKNESS;
		1634	}
		1635	}
1350		1636
1351	EXTEND (SP, 3);	1637	EXTEND (SP, 3);
1352	PUSHs (sv_2mortal (newSViv (sw4)));	1638	PUSHs (sv_2mortal (newSViv (sw4)));
1353	PUSHs (sv_2mortal (newSViv (sh)));	1639	PUSHs (sv_2mortal (newSViv (sh)));
1354	PUSHs (darkness_sv);	1640	PUSHs (darkness_sv);
1355	}	1641	}
1356		1642
1357	SV *	1643	SV *
1358	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1644	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1359	CODE:	1645	CODE:
1360	{	1646	{
1361	int x, y, x1, y1;	1647	int x, y, x1, y1;
1362	SV *data_sv = newSV (w * h * 7 + 5);	1648	SV *data_sv = newSV (w * h * 7 + 5);
1363	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1649	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1425	}	1711	}
1426	OUTPUT:	1712	OUTPUT:
1427	RETVAL	1713	RETVAL
1428		1714
1429	void	1715	void
1430	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1716	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1431	PPCODE:	1717	PPCODE:
1432	{	1718	{
1433	int x, y, z;	1719	int x, y, z;
1434	int w, h;	1720	int w, h;
1435	int x1, y1;	1721	int x1, y1;
…		…
1467		1753
1468	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	1754	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1469	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	1755	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1470	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	1756	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1471		1757
1472	if (cell->darkness <= 0)	1758	if (cell->darkness == 0)
1473	{	1759	{
1474	cell->darkness = -1;	1760	cell->darkness = 0;
1475		1761
1476	for (z = 0; z <= 2; z++)	1762	for (z = 0; z <= 2; z++)
1477	{	1763	{
1478	cell->face[z] = face[z];	1764	cell->face[z] = face[z];
1479		1765
…		…
1484	}	1770	}
1485	}	1771	}
1486	}	1772	}
1487	}	1773	}
1488		1774
1489	MODULE = CFClient PACKAGE = CFClient::MixChunk	1775	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1490		1776
1491	CFClient::MixChunk	1777	CFPlus::MixChunk
1492	new_from_file (SV *class, char *path)	1778	new_from_file (SV *class, char *path)
1493	CODE:	1779	CODE:
1494	RETVAL = Mix_LoadWAV (path);	1780	RETVAL = Mix_LoadWAV (path);
1495	OUTPUT:	1781	OUTPUT:
1496	RETVAL	1782	RETVAL
1497		1783
1498	void	1784	void
1499	DESTROY (CFClient::MixChunk self)	1785	DESTROY (CFPlus::MixChunk self)
1500	CODE:	1786	CODE:
1501	Mix_FreeChunk (self);	1787	Mix_FreeChunk (self);
1502		1788
1503	int	1789	int
1504	volume (CFClient::MixChunk self, int volume = -1)	1790	volume (CFPlus::MixChunk self, int volume = -1)
1505	CODE:	1791	CODE:
1506	RETVAL = Mix_VolumeChunk (self, volume);	1792	RETVAL = Mix_VolumeChunk (self, volume);
1507	OUTPUT:	1793	OUTPUT:
1508	RETVAL	1794	RETVAL
1509		1795
1510	int	1796	int
1511	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1797	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1512	CODE:	1798	CODE:
1513	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1799	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1514	OUTPUT:	1800	OUTPUT:
1515	RETVAL	1801	RETVAL
1516		1802
1517	MODULE = CFClient PACKAGE = CFClient::MixMusic	1803	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1518		1804
1519	int	1805	int
1520	volume (int volume = -1)	1806	volume (int volume = -1)
1521	CODE:	1807	CODE:
1522	RETVAL = Mix_VolumeMusic (volume);	1808	RETVAL = Mix_VolumeMusic (volume);
1523	OUTPUT:	1809	OUTPUT:
1524	RETVAL	1810	RETVAL
1525		1811
1526	CFClient::MixMusic	1812	CFPlus::MixMusic
1527	new_from_file (SV *class, char *path)	1813	new_from_file (SV *class, char *path)
1528	CODE:	1814	CODE:
1529	RETVAL = Mix_LoadMUS (path);	1815	RETVAL = Mix_LoadMUS (path);
1530	OUTPUT:	1816	OUTPUT:
1531	RETVAL	1817	RETVAL
1532		1818
1533	void	1819	void
1534	DESTROY (CFClient::MixMusic self)	1820	DESTROY (CFPlus::MixMusic self)
1535	CODE:	1821	CODE:
1536	Mix_FreeMusic (self);	1822	Mix_FreeMusic (self);
1537		1823
1538	int	1824	int
1539	play (CFClient::MixMusic self, int loops = -1)	1825	play (CFPlus::MixMusic self, int loops = -1)
1540	CODE:	1826	CODE:
1541	RETVAL = Mix_PlayMusic (self, loops);	1827	RETVAL = Mix_PlayMusic (self, loops);
1542	OUTPUT:	1828	OUTPUT:
1543	RETVAL	1829	RETVAL
1544		1830
1545	MODULE = CFClient PACKAGE = CFClient::OpenGL	1831	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1546		1832
1547	BOOT:	1833	BOOT:
1548	{	1834	{
1549	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1835	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1550	static const struct {	1836	static const struct {
1551	const char *name;	1837	const char *name;
1552	IV iv;	1838	IV iv;
1553	} *civ, const_iv[] = {	1839	} *civ, const_iv[] = {
1554	# define const_iv(name) { # name, (IV)name }	1840	# define const_iv(name) { # name, (IV)name }
…		…
1561	const_iv (GL_SCISSOR_TEST),	1847	const_iv (GL_SCISSOR_TEST),
1562	const_iv (GL_DEPTH_TEST),	1848	const_iv (GL_DEPTH_TEST),
1563	const_iv (GL_ALPHA_TEST),	1849	const_iv (GL_ALPHA_TEST),
1564	const_iv (GL_NORMALIZE),	1850	const_iv (GL_NORMALIZE),
1565	const_iv (GL_RESCALE_NORMAL),	1851	const_iv (GL_RESCALE_NORMAL),
		1852	const_iv (GL_FRONT),
		1853	const_iv (GL_BACK),
1566	const_iv (GL_AND),	1854	const_iv (GL_AND),
1567	const_iv (GL_ONE),	1855	const_iv (GL_ONE),
1568	const_iv (GL_ZERO),	1856	const_iv (GL_ZERO),
1569	const_iv (GL_SRC_ALPHA),	1857	const_iv (GL_SRC_ALPHA),
1570	const_iv (GL_DST_ALPHA),	1858	const_iv (GL_DST_ALPHA),
1571	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1859	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1572	const_iv (GL_ONE_MINUS_DST_ALPHA),	1860	const_iv (GL_ONE_MINUS_DST_ALPHA),
1573	const_iv (GL_SRC_ALPHA_SATURATE),	1861	const_iv (GL_SRC_ALPHA_SATURATE),
1574	const_iv (GL_RGB),	1862	const_iv (GL_RGB),
1575	const_iv (GL_RGBA),	1863	const_iv (GL_RGBA),
		1864	const_iv (GL_RGBA4),
		1865	const_iv (GL_RGBA8),
		1866	const_iv (GL_RGB5_A1),
1576	const_iv (GL_UNSIGNED_BYTE),	1867	const_iv (GL_UNSIGNED_BYTE),
1577	const_iv (GL_UNSIGNED_SHORT),	1868	const_iv (GL_UNSIGNED_SHORT),
1578	const_iv (GL_UNSIGNED_INT),	1869	const_iv (GL_UNSIGNED_INT),
1579	const_iv (GL_ALPHA),	1870	const_iv (GL_ALPHA),
1580	const_iv (GL_INTENSITY),	1871	const_iv (GL_INTENSITY),
…		…
1612	const_iv (GL_SEPARABLE_2D),	1903	const_iv (GL_SEPARABLE_2D),
1613	const_iv (GL_CONVOLUTION_2D),	1904	const_iv (GL_CONVOLUTION_2D),
1614	const_iv (GL_CONVOLUTION_BORDER_MODE),	1905	const_iv (GL_CONVOLUTION_BORDER_MODE),
1615	const_iv (GL_CONSTANT_BORDER),	1906	const_iv (GL_CONSTANT_BORDER),
1616	const_iv (GL_LINES),	1907	const_iv (GL_LINES),
		1908	const_iv (GL_LINE_STRIP),
1617	const_iv (GL_LINE_LOOP),	1909	const_iv (GL_LINE_LOOP),
1618	const_iv (GL_QUADS),	1910	const_iv (GL_QUADS),
1619	const_iv (GL_QUAD_STRIP),	1911	const_iv (GL_QUAD_STRIP),
1620	const_iv (GL_TRIANGLES),	1912	const_iv (GL_TRIANGLES),
1621	const_iv (GL_TRIANGLE_STRIP),	1913	const_iv (GL_TRIANGLE_STRIP),
…		…
1654	OUTPUT:	1946	OUTPUT:
1655	RETVAL	1947	RETVAL
1656		1948
1657	int glGetError ()	1949	int glGetError ()
1658		1950
		1951	void glFinish ()
		1952
1659	void glClear (int mask)	1953	void glClear (int mask)
1660		1954
1661	void glClearColor (float r, float g, float b, float a = 1.0)	1955	void glClearColor (float r, float g, float b, float a = 1.0)
1662	PROTOTYPE: @	1956	PROTOTYPE: @
1663		1957
…		…
1686	void glPushMatrix ()	1980	void glPushMatrix ()
1687		1981
1688	void glPopMatrix ()	1982	void glPopMatrix ()
1689		1983
1690	void glLoadIdentity ()	1984	void glLoadIdentity ()
		1985
		1986	void glDrawBuffer (int buffer)
		1987
		1988	void glReadBuffer (int buffer)
1691		1989
1692	# near_ and far_ are due to microsofts buggy "c" compiler	1990	# 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_)	1991	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1694		1992
1695	# near_ and far_ are due to microsofts buggy "c" compiler	1993	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1725	r *= a;	2023	r *= a;
1726	g *= a;	2024	g *= a;
1727	b *= a;	2025	b *= a;
1728	}	2026	}
1729	// microsoft visual "c" rounds instead of truncating...	2027	// microsoft visual "c" rounds instead of truncating...
1730	glColor4ub (MIN ((int)(r * 256.f), 255),	2028	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		2029
1735	void glInterleavedArrays (int format, int stride, char *data)	2030	void glInterleavedArrays (int format, int stride, char *data)
1736		2031
1737	void glDrawElements (int mode, int count, int type, char *indices)	2032	void glDrawElements (int mode, int count, int type, char *indices)
1738		2033
…		…
1815		2110
1816	void glEndList ()	2111	void glEndList ()
1817		2112
1818	void glCallList (int list)	2113	void glCallList (int list)
1819		2114
1820

Diff Legend

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