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.111 by root, Mon Jun 12 13:26:14 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>
15	#include <stdlib.h>	20	#include <stdlib.h>
16		21
…		…
18	#include <SDL_endian.h>	23	#include <SDL_endian.h>
19	#include <SDL_image.h>	24	#include <SDL_image.h>
20	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
21	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
22		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
23	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
24		32
25	#include <pango/pango.h>	33	#include <pango/pango.h>
26	#include <pango/pangofc-fontmap.h>
27	#include <pango/pangoft2.h>
28	#include <pango/pangocairo.h>
29		34
30	#ifndef _WIN32	35	#ifndef _WIN32
31	# include <sys/types.h>	36	# include <sys/types.h>
32	# include <sys/socket.h>	37	# include <sys/socket.h>
33	# include <netinet/in.h>	38	# include <netinet/in.h>
…		…
40	typedef signed char int8_t;	45	typedef signed char int8_t;
41	typedef signed short int16_t;	46	typedef signed short int16_t;
42	typedef signed int int32_t;	47	typedef signed int int32_t;
43	#endif	48	#endif
44		49
45	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
46		51
47	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
48		53
49	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
50	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
51		56
52	#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
53		64
54	static struct	65	static struct
55	{	66	{
56	#define GL_FUNC(ptr,name) ptr name;	67	#define GL_FUNC(ptr,name) ptr name;
57	#include "glfunc.h"	68	#include "glfunc.h"
…		…
66	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67	else	78	else
68	glBlendFunc (sa, da);	79	glBlendFunc (sa, da);
69	}	80	}
70		81
		82	#include "texcache.c"
		83
		84	#include "pango-font.c"
		85	#include "pango-fontmap.c"
		86	#include "pango-render.c"
		87
71	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
72	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
73		90
74	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	}
75		110
76	typedef struct cf_layout {	111	typedef struct cf_layout {
77	PangoLayout *pl; // either derived from a cairo or ft2 context	112	PangoLayout *pl;
78	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
80	int base_height;	114	int base_height;
81	CFClient__Font font;	115	CFPlus__Font font;
82	} *CFClient__Layout;	116	} *CFPlus__Layout;
83		117
84	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
85	static PangoContext *ft2_context, *cairo_context;	119	static PangoContext *opengl_context;
86	static PangoFontMap *ft2_fontmap, *cairo_fontmap;	120	static PangoFontMap *opengl_fontmap;
87		121
88	static void	122	static void
89	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
90	{	124	{
91	FcPatternAddBool (pattern, FC_HINTING, 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
92	#ifdef FC_HINT_STYLE	126	#ifdef FC_HINT_STYLE
93	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94	#endif	128	#endif
95	#ifdef _WIN32
96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97	#else
98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99	#endif
100	}	130	}
101		131
102	static void	132	static void
103	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
104	{	134	{
105	/* 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
106	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
107	*/	137	*/
108	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
112		142
113	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
114	}	144	}
115		145
116	static void	146	static void
117	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	147	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
118	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
119	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
120		153
121	if (!*w) *w = 1;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
122	if (!*h) *h = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
123		156
124	*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;
125	}	162	}
126		163
127	typedef uint16_t mapface;	164	typedef uint16_t mapface;
128		165
129	typedef struct {	166	typedef struct {
…		…
132	float s, t;	169	float s, t;
133	uint8_t r, g, b, a;	170	uint8_t r, g, b, a;
134	} maptex;	171	} maptex;
135		172
136	typedef struct {	173	typedef struct {
137	int16_t darkness;	174	uint32_t player;
138	mapface face[3];	175	mapface face[3];
		176	uint16_t darkness;
		177	uint8_t stat_width, stat_hp, flags;
139	} mapcell;	178	} mapcell;
140		179
141	typedef struct {	180	typedef struct {
142	int32_t c0, c1;	181	int32_t c0, c1;
143	mapcell *col;	182	mapcell *col;
…		…
152	int texs;	191	int texs;
153	maptex *tex;	192	maptex *tex;
154		193
155	int32_t rows;	194	int32_t rows;
156	maprow *row;	195	maprow *row;
157	} *CFClient__Map;	196	} *CFPlus__Map;
158		197
159	static char *	198	static char *
160	prepend (char *ptr, int sze, int inc)	199	prepend (char *ptr, int sze, int inc)
161	{	200	{
162	char *p;	201	char *p;
…		…
180		219
181	#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))
182	#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))
183		222
184	static maprow *	223	static maprow *
185	map_get_row (CFClient__Map self, int y)	224	map_get_row (CFPlus__Map self, int y)
186	{	225	{
187	if (0 > y)	226	if (0 > y)
188	{	227	{
189	int extend = - y + MAP_EXTEND_Y;	228	int extend = - y + MAP_EXTEND_Y;
190	Prepend (maprow, self->row, self->rows, extend);	229	Prepend (maprow, self->row, self->rows, extend);
…		…
228		267
229	return row->col + (x - row->c0);	268	return row->col + (x - row->c0);
230	}	269	}
231		270
232	static mapcell *	271	static mapcell *
233	map_get_cell (CFClient__Map self, int x, int y)	272	map_get_cell (CFPlus__Map self, int x, int y)
234	{	273	{
235	return row_get_cell (map_get_row (self, y), x);	274	return row_get_cell (map_get_row (self, y), x);
236	}	275	}
237		276
238	static void	277	static void
239	map_clear (CFClient__Map self)	278	map_clear (CFPlus__Map self)
240	{	279	{
241	int r;	280	int r;
242		281
243	for (r = 0; r < self->rows; r++)	282	for (r = 0; r < self->rows; r++)
244	Safefree (self->row[r].col);	283	Safefree (self->row[r].col);
…		…
252	self->row = 0;	291	self->row = 0;
253	self->rows = 0;	292	self->rows = 0;
254	}	293	}
255		294
256	static void	295	static void
257	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)
258	{	297	{
259	int x, y;	298	int x, y;
260	maprow *row;	299	maprow *row;
		300	mapcell *cell;
261		301
262	for (y = y0; y < y0 + h; y++)	302	for (y = y0; y < y0 + h; y++)
263	if (y >= 0)	303	if (y >= 0)
264	{	304	{
265	if (y >= self->rows)	305	if (y >= self->rows)
…		…
271	if (x >= row->c0)	311	if (x >= row->c0)
272	{	312	{
273	if (x >= row->c1)	313	if (x >= row->c1)
274	break;	314	break;
275		315
276	row->col[x - row->c0].darkness = -1;	316	cell = row->col + x - row->c0;
		317
		318	cell->darkness = 0;
		319	cell->stat_hp = 0;
277	}	320	}
278	}	321	}
279	}	322	}
280		323
281	static void	324	static void
…		…
302	ev.data2 = 0;	345	ev.data2 = 0;
303		346
304	SDL_PushEvent ((SDL_Event *)&ev);	347	SDL_PushEvent ((SDL_Event *)&ev);
305	}	348	}
306		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
307	MODULE = CFClient PACKAGE = CFClient	367	MODULE = CFPlus PACKAGE = CFPlus
308		368
309	PROTOTYPES: ENABLE	369	PROTOTYPES: ENABLE
310		370
311	BOOT:	371	BOOT:
312	{	372	{
313	HV *stash = gv_stashpv ("CFClient", 1);	373	HV *stash = gv_stashpv ("CFPlus", 1);
314	static const struct {	374	static const struct {
315	const char *name;	375	const char *name;
316	IV iv;	376	IV iv;
317	} *civ, const_iv[] = {	377	} *civ, const_iv[] = {
318	# define const_iv(name) { # name, (IV)name }	378	# define const_iv(name) { # name, (IV)name }
…		…
419		479
420	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; )
421	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	481	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
422	}	482	}
423		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
424	void	495	void
425	pango_init ()	496	pango_init ()
426	CODE:	497	CODE:
427	// delayed, so it can pick up new fonts added by AddFontResourceEx
428	{	498	{
429	{
430	ft2_fontmap = pango_ft2_font_map_new ();	499	opengl_fontmap = pango_opengl_font_map_new ();
431	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);
432	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	501	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
433	}
434	{
435	cairo_font_options_t *fopt = cairo_font_options_create ();
436	cairo_fontmap = pango_cairo_font_map_get_default ();
437	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
438	#ifdef _WIN32
439	// cairo looks like shit eaten twice on windows
440	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
441	#else
442	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
443	#endif
444	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
445	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
446	pango_cairo_context_set_font_options (cairo_context, fopt);
447	cairo_font_options_destroy (fopt);
448	}
449	}	502	}
450		503
451	int	504	int
452	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	505	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
453		506
454	void	507	void
455	SDL_Quit ()	508	SDL_Quit ()
456		509
457	void	510	void
…		…
464	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	517	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
465	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	518	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
466	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	519	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
467		520
468	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	521	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
469	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	522	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
470		523
471	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	524	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
472	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	525	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
473	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
474	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
475		528
476	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
477		534
478	SDL_EnableUNICODE (1);	535	SDL_EnableUNICODE (1);
479	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	536	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
480		537
481	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	538	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
568	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	625	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
569	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	626	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
570	break;	627	break;
571	}	628	}
572		629
573	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	630	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
574	}	631	}
575	}	632	}
576		633
577	int	634	int
578	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)
…		…
594	#endif	651	#endif
595		652
596	void	653	void
597	add_font (char *file)	654	add_font (char *file)
598	CODE:	655	CODE:
599	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	656	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
600	#ifdef _WIN32
601	// cairo... sigh... requires win2000
602	AddFontResourceEx (file, FR_PRIVATE, 0);
603	#endif
604		657
605	void	658	void
606	load_image_inline (SV *image_)	659	load_image_inline (SV *image_)
607	ALIAS:	660	ALIAS:
608	load_image_file = 1	661	load_image_file = 1
…		…
650		703
651	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	704	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
652		705
653	assert (surface2->pitch == surface2->w * 4);	706	assert (surface2->pitch == surface2->w * 4);
654		707
		708	SDL_LockSurface (surface2);
655	EXTEND (SP, 5);	709	EXTEND (SP, 6);
656	PUSHs (sv_2mortal (newSViv (surface2->w)));	710	PUSHs (sv_2mortal (newSViv (surface2->w)));
657	PUSHs (sv_2mortal (newSViv (surface2->h)));	711	PUSHs (sv_2mortal (newSViv (surface2->h)));
658	SDL_LockSurface (surface2);
659	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	712	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
660	SDL_UnlockSurface (surface2);
661	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)));
662	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	714	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
663	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	715	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		716	SDL_UnlockSurface (surface2);
664		717
665	SDL_FreeSurface (surface);	718	SDL_FreeSurface (surface);
666	SDL_FreeSurface (surface2);	719	SDL_FreeSurface (surface2);
667	}	720	}
668		721
…		…
704	CODE:	757	CODE:
705	fprintf (stderr, "FATAL: %s\n", message);	758	fprintf (stderr, "FATAL: %s\n", message);
706	#ifdef _WIN32	759	#ifdef _WIN32
707	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	760	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
708	#endif	761	#endif
709	_Exit (1);	762	_exit (1);
710		763
711	void	764	void
712	_exit (int retval)	765	_exit (int retval)
713	CODE:	766	CODE:
714	_Exit (retval);	767	_exit (retval);
715		768
716	MODULE = CFClient PACKAGE = CFClient::Font	769	MODULE = CFPlus PACKAGE = CFPlus::Font
717		770
718	CFClient::Font	771	CFPlus::Font
719	new_from_file (SV *class, char *path, int id = 0)	772	new_from_file (SV *class, char *path, int id = 0)
720	CODE:	773	CODE:
721	{	774	{
722	int count;	775	int count;
723	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	776	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
726	}	779	}
727	OUTPUT:	780	OUTPUT:
728	RETVAL	781	RETVAL
729		782
730	void	783	void
731	DESTROY (CFClient::Font self)	784	DESTROY (CFPlus::Font self)
732	CODE:	785	CODE:
733	pango_font_description_free (self);	786	pango_font_description_free (self);
734		787
735	void	788	void
736	make_default (CFClient::Font self)	789	make_default (CFPlus::Font self)
737	CODE:	790	CODE:
738	default_font = self;	791	default_font = self;
739		792
740	MODULE = CFClient PACKAGE = CFClient::Layout	793	MODULE = CFPlus PACKAGE = CFPlus::Layout
741		794
742	CFClient::Layout	795	void
743	new (SV *class, int rgba = 0)	796	reset_glyph_cache ()
		797	CODE:
		798	tc_clear ();
		799
		800	CFPlus::Layout
		801	new (SV *class)
744	CODE:	802	CODE:
745	New (0, RETVAL, 1, struct cf_layout);	803	New (0, RETVAL, 1, struct cf_layout);
746		804
747	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	805	RETVAL->pl = pango_layout_new (opengl_context);
748	RETVAL->rgba = rgba;
749	RETVAL->r = 1.;	806	RETVAL->r = 1.;
750	RETVAL->g = 1.;	807	RETVAL->g = 1.;
751	RETVAL->b = 1.;	808	RETVAL->b = 1.;
752	RETVAL->a = 1.;	809	RETVAL->a = 1.;
753	RETVAL->base_height = MIN_FONT_HEIGHT;	810	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
757	layout_update_font (RETVAL);	814	layout_update_font (RETVAL);
758	OUTPUT:	815	OUTPUT:
759	RETVAL	816	RETVAL
760		817
761	void	818	void
762	DESTROY (CFClient::Layout self)	819	DESTROY (CFPlus::Layout self)
763	CODE:	820	CODE:
764	g_object_unref (self->pl);	821	g_object_unref (self->pl);
765	Safefree (self);	822	Safefree (self);
766		823
767	int
768	is_rgba (CFClient::Layout self)
769	CODE:
770	RETVAL = self->rgba;
771	OUTPUT:
772	RETVAL
773
774	void	824	void
775	set_text (CFClient::Layout self, SV *text_)	825	set_text (CFPlus::Layout self, SV *text_)
776	CODE:	826	CODE:
777	{	827	{
778	STRLEN textlen;	828	STRLEN textlen;
779	char *text = SvPVutf8 (text_, textlen);	829	char *text = SvPVutf8 (text_, textlen);
780		830
781	pango_layout_set_text (self->pl, text, textlen);	831	pango_layout_set_text (self->pl, text, textlen);
782	}	832	}
783		833
784	void	834	void
785	set_markup (CFClient::Layout self, SV *text_)	835	set_markup (CFPlus::Layout self, SV *text_)
786	CODE:	836	CODE:
787	{	837	{
788	STRLEN textlen;	838	STRLEN textlen;
789	char *text = SvPVutf8 (text_, textlen);	839	char *text = SvPVutf8 (text_, textlen);
790		840
791	pango_layout_set_markup (self->pl, text, textlen);	841	pango_layout_set_markup (self->pl, text, textlen);
792	}	842	}
793		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
794	SV *	929	SV *
795	get_text (CFClient::Layout self)	930	get_text (CFPlus::Layout self)
796	CODE:	931	CODE:
797	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	932	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
798	sv_utf8_decode (RETVAL);	933	sv_utf8_decode (RETVAL);
799	OUTPUT:	934	OUTPUT:
800	RETVAL	935	RETVAL
801		936
802	void	937	void
803	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.)
804	CODE:	939	CODE:
805	self->r = r;	940	self->r = r;
806	self->g = g;	941	self->g = g;
807	self->b = b;	942	self->b = b;
808	self->a = a;	943	self->a = a;
809		944
810	void	945	void
811	set_font (CFClient::Layout self, CFClient::Font font = 0)	946	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
812	CODE:	947	CODE:
813	if (self->font != font)	948	if (self->font != font)
814	{	949	{
815	self->font = font;	950	self->font = font;
816	layout_update_font (self);	951	layout_update_font (self);
817	}	952	}
818		953
819	void	954	void
820	set_height (CFClient::Layout self, int base_height)	955	set_height (CFPlus::Layout self, int base_height)
821	CODE:	956	CODE:
822	if (self->base_height != base_height)	957	if (self->base_height != base_height)
823	{	958	{
824	self->base_height = base_height;	959	self->base_height = base_height;
825	layout_update_font (self);	960	layout_update_font (self);
826	}	961	}
827		962
828	void	963	void
829	set_width (CFClient::Layout self, int max_width = -1)	964	set_width (CFPlus::Layout self, int max_width = -1)
830	CODE:	965	CODE:
831	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);
832		967
833	void	968	void
834	set_indent (CFClient::Layout self, int indent)	969	set_indent (CFPlus::Layout self, int indent)
835	CODE:	970	CODE:
836	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	971	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
837		972
838	void	973	void
839	set_spacing (CFClient::Layout self, int spacing)	974	set_spacing (CFPlus::Layout self, int spacing)
840	CODE:	975	CODE:
841	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	976	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
842		977
843	void	978	void
844	set_ellipsise (CFClient::Layout self, int ellipsise)	979	set_ellipsise (CFPlus::Layout self, int ellipsise)
845	CODE:	980	CODE:
846	pango_layout_set_ellipsize (self->pl,	981	pango_layout_set_ellipsize (self->pl,
847	ellipsise == 1 ? PANGO_ELLIPSIZE_START	982	ellipsise == 1 ? PANGO_ELLIPSIZE_START
848	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	983	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
849	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	984	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
850	: PANGO_ELLIPSIZE_NONE	985	: PANGO_ELLIPSIZE_NONE
851	);	986	);
852		987
853	void	988	void
854	set_single_paragraph_mode (CFClient::Layout self, int spm)	989	set_single_paragraph_mode (CFPlus::Layout self, int spm)
855	CODE:	990	CODE:
856	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	991	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
857		992
858	void	993	void
859	size (CFClient::Layout self)	994	size (CFPlus::Layout self)
860	PPCODE:	995	PPCODE:
861	{	996	{
862	int w, h;	997	int w, h;
863		998
864	layout_get_pixel_size (self, &w, &h);	999	layout_get_pixel_size (self, &w, &h);
…		…
867	PUSHs (sv_2mortal (newSViv (w)));	1002	PUSHs (sv_2mortal (newSViv (w)));
868	PUSHs (sv_2mortal (newSViv (h)));	1003	PUSHs (sv_2mortal (newSViv (h)));
869	}	1004	}
870		1005
871	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
872	xy_to_index (CFClient::Layout self, int x, int y)	1019	xy_to_index (CFPlus::Layout self, int x, int y)
873	CODE:	1020	CODE:
874	{	1021	{
875	int index, trailing;	1022	int index, trailing;
876	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);
877	RETVAL = index;	1024	RETVAL = index;
878	}	1025	}
879	OUTPUT:	1026	OUTPUT:
880	RETVAL	1027	RETVAL
881		1028
882	void	1029	void
883	cursor_pos (CFClient::Layout self, int index)	1030	cursor_pos (CFPlus::Layout self, int index)
884	PPCODE:	1031	PPCODE:
885	{	1032	{
886	PangoRectangle strong_pos;	1033	PangoRectangle strong_pos;
887	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1034	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
888		1035
…		…
891	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1038	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
892	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1039	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
893	}	1040	}
894		1041
895	void	1042	void
896	render (CFClient::Layout self)	1043	render (CFPlus::Layout self, float x, float y, int flags = 0)
897	PPCODE:	1044	PPCODE:
898	{	1045	pango_opengl_render_layout_subpixel (
899	SV *retval;	1046	self->pl,
900	int w, h;	1047	x * PANGO_SCALE, y * PANGO_SCALE,
		1048	self->r, self->g, self->b, self->a,
		1049	flags
		1050	);
901		1051
902	layout_get_pixel_size (self, &w, &h);	1052	MODULE = CFPlus PACKAGE = CFPlus::Texture
903		1053
904	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)
905	{	1062	{
906	cairo_surface_t *surface;	1063	int nw = minpot (ow);
907	cairo_t *cairo;	1064	int nh = minpot (oh);
908		1065
909	retval = newSV (w * h * 4);	1066	if (nw != ow || nh != oh)
910	SvPOK_only (retval);
911	SvCUR_set (retval, w * h * 4);
912
913	memset (SvPVX (retval), 0, w * h * 4);
914
915	surface = cairo_image_surface_create_for_data (
916	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
917	cairo = cairo_create (surface);
918	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
919
920	pango_cairo_show_layout (cairo, self->pl);
921
922	cairo_destroy (cairo);
923	cairo_surface_destroy (surface);
924
925	// what a mess, and its premultiplied, too :(
926	{	1067	{
927	uint32_t *p = (uint32_t *)SvPVX (retval);	1068	if (SvOK (data_))
928	uint32_t *e = p + w * h;
929
930	while (p < e)
931	{	1069	{
932	uint32_t rgba = *p;	1070	STRLEN datalen;
933	rgba = (rgba >> 24) | (rgba << 8);	1071	char *data = SvPVbyte (data_, datalen);
934	#if 0	1072	int bpp = datalen / (ow * oh);
935	#ifdef _WIN32	1073	SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
936	{//D
937	uint8_t r = rgba >> 24;
938	uint8_t g = rgba >> 16;
939	uint8_t b = rgba >> 8;
940	uint8_t a = rgba >> 0;
941		1074
942	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_);
943	}	1083	}
944	#endif	1084
945	#endif	1085	sv_setiv (w_, nw);
946	rgba = SDL_SwapBE32 (rgba);	1086	sv_setiv (h_, nh);
947	*p++ = rgba;
948	}	1087	}
949	}
950
951	EXTEND (SP, 5);
952	PUSHs (sv_2mortal (newSViv (w)));
953	PUSHs (sv_2mortal (newSViv (h)));
954	PUSHs (sv_2mortal (retval));
955	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
956	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
957	}	1088	}
958	else
959	{
960	FT_Bitmap bitmap;
961
962	retval = newSV (w * h);
963	SvPOK_only (retval);
964	SvCUR_set (retval, w * h);
965
966	bitmap.rows = h;
967	bitmap.width = w;
968	bitmap.pitch = w;
969	bitmap.buffer = (unsigned char*)SvPVX (retval);
970	bitmap.num_grays = 256;
971	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
972
973	memset (bitmap.buffer, 0, w * h);
974
975	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
976
977	EXTEND (SP, 5);
978	PUSHs (sv_2mortal (newSViv (w)));
979	PUSHs (sv_2mortal (newSViv (h)));
980	PUSHs (sv_2mortal (retval));
981	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
982	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
983	}
984	}	1089	}
985		1090
986	MODULE = CFClient PACKAGE = CFClient::Texture
987
988	void	1091	void
989	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.)
990	PROTOTYPE: $$$;$$	1093	PROTOTYPE: $$$;$$
991	ALIAS:	1094	ALIAS:
992	draw_quad_alpha = 1	1095	draw_quad_alpha = 1
993	draw_quad_alpha_premultiplied = 2	1096	draw_quad_alpha_premultiplied = 2
994	CODE:	1097	CODE:
…		…
1032	glDisable (GL_ALPHA_TEST);	1135	glDisable (GL_ALPHA_TEST);
1033	glDisable (GL_BLEND);	1136	glDisable (GL_BLEND);
1034	}	1137	}
1035	}	1138	}
1036		1139
1037	MODULE = CFClient PACKAGE = CFClient::Map	1140	MODULE = CFPlus PACKAGE = CFPlus::Map
1038		1141
1039	CFClient::Map	1142	CFPlus::Map
1040	new (SV *class, int map_width, int map_height)	1143	new (SV *class, int map_width, int map_height)
1041	CODE:	1144	CODE:
1042	New (0, RETVAL, 1, struct map);	1145	New (0, RETVAL, 1, struct map);
1043	RETVAL->x = 0;	1146	RETVAL->x = 0;
1044	RETVAL->y = 0;	1147	RETVAL->y = 0;
…		…
1054	RETVAL->row = 0;	1157	RETVAL->row = 0;
1055	OUTPUT:	1158	OUTPUT:
1056	RETVAL	1159	RETVAL
1057		1160
1058	void	1161	void
1059	DESTROY (CFClient::Map self)	1162	DESTROY (CFPlus::Map self)
1060	CODE:	1163	CODE:
1061	{	1164	{
1062	map_clear (self);	1165	map_clear (self);
1063	Safefree (self->face);	1166	Safefree (self->face);
1064	Safefree (self->tex);	1167	Safefree (self->tex);
1065	Safefree (self);	1168	Safefree (self);
1066	}	1169	}
1067		1170
1068	void	1171	void
1069	clear (CFClient::Map self)	1172	clear (CFPlus::Map self)
1070	CODE:	1173	CODE:
1071	map_clear (self);	1174	map_clear (self);
1072		1175
1073	void	1176	void
1074	set_face (CFClient::Map self, int face, int texid)	1177	set_face (CFPlus::Map self, int face, int texid)
1075	CODE:	1178	CODE:
1076	{	1179	{
1077	while (self->faces <= face)	1180	while (self->faces <= face)
1078	{	1181	{
1079	Append (mapface, self->face, self->faces, self->faces);	1182	Append (mapface, self->face, self->faces, self->faces);
…		…
1082		1185
1083	self->face [face] = texid;	1186	self->face [face] = texid;
1084	}	1187	}
1085		1188
1086	void	1189	void
1087	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)
1088	CODE:	1191	CODE:
1089	{	1192	{
1090	while (self->texs <= texid)	1193	while (self->texs <= texid)
1091	{	1194	{
1092	Append (maptex, self->tex, self->texs, self->texs);	1195	Append (maptex, self->tex, self->texs, self->texs);
…		…
1116	// from transparent color bleeding and ugly wrapping effects.	1219	// from transparent color bleeding and ugly wrapping effects.
1117	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1220	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1118	}	1221	}
1119		1222
1120	int	1223	int
1121	ox (CFClient::Map self)	1224	ox (CFPlus::Map self)
1122	ALIAS:	1225	ALIAS:
1123	oy = 1	1226	oy = 1
1124	x = 2	1227	x = 2
1125	y = 3	1228	y = 3
1126	w = 4	1229	w = 4
…		…
1137	}	1240	}
1138	OUTPUT:	1241	OUTPUT:
1139	RETVAL	1242	RETVAL
1140		1243
1141	void	1244	void
1142	scroll (CFClient::Map self, int dx, int dy)	1245	scroll (CFPlus::Map self, int dx, int dy)
1143	CODE:	1246	CODE:
1144	{	1247	{
1145	if (dx > 0)	1248	if (dx > 0)
1146	map_blank (self, self->x, self->y, dx - 1, self->h);	1249	map_blank (self, self->x, self->y, dx - 1, self->h);
1147	else if (dx < 0)	1250	else if (dx < 0)
…		…
1163	self->y += MAP_EXTEND_Y;	1266	self->y += MAP_EXTEND_Y;
1164	}	1267	}
1165	}	1268	}
1166		1269
1167	void	1270	void
1168	map1a_update (CFClient::Map self, SV *data_)	1271	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1169	CODE:	1272	CODE:
1170	{	1273	{
1171	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1274	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1172	uint8_t *data_end = (uint8_t *)SvEND (data_);	1275	uint8_t *data_end = (uint8_t *)SvEND (data_);
1173	mapcell *cell;	1276	mapcell *cell;
1174	int x, y, flags;	1277	int x, y, flags;
1175		1278
1176	while (data < data_end)	1279	while (data < data_end - 1)
1177	{	1280	{
1178	flags = (data [0] << 8) + data [1]; data += 2;	1281	flags = (data [0] << 8) + data [1]; data += 2;
1179		1282
1180	x = ((flags >> 10) & 63) + self->x;	1283	x = self->x + ((flags >> 10) & 63);
1181	y = ((flags >> 4) & 63) + self->y;	1284	y = self->y + ((flags >> 4) & 63);
1182		1285
1183	cell = map_get_cell (self, x, y);	1286	cell = map_get_cell (self, x, y);
1184		1287
1185	if (flags & 15)	1288	if (flags & 15)
1186	{	1289	{
1187	if (cell->darkness < 0)	1290	if (!cell->darkness)
1188	{	1291	{
1189	cell->darkness = 0;	1292	cell->darkness = 256;
1190	cell->face [0] = 0;	1293	cell->face [0] = 0;
1191	cell->face [1] = 0;	1294	cell->face [1] = 0;
1192	cell->face [2] = 0;	1295	cell->face [2] = 0;
1193	}	1296	}
1194		1297
1195	cell->darkness = flags & 8 ? *data++ : 255;
1196
1197	//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	}
1198		1339
1199	if (flags & 4)	1340	if (flags & 4)
1200	{	1341	{
1201	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;
1202	}	1343	}
…		…
1210	{	1351	{
1211	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;
1212	}	1353	}
1213	}	1354	}
1214	else	1355	else
		1356	{
1215	cell->darkness = -1;	1357	cell->darkness = 0;
		1358	cell->stat_hp = 0;
		1359	}
1216	}	1360	}
1217	}	1361	}
1218		1362
1219	SV *	1363	SV *
1220	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)
1221	CODE:	1365	CODE:
1222	{	1366	{
1223	int x1, x;	1367	int x1, x;
1224	int y1, y;	1368	int y1, y;
1225	int z;	1369	int z;
…		…
1275	}	1419	}
1276	OUTPUT:	1420	OUTPUT:
1277	RETVAL	1421	RETVAL
1278		1422
1279	void	1423	void
1280	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)
1281	PPCODE:	1425	CODE:
1282	{	1426	{
1283	int vx, vy;	1427	int vx, vy;
1284	int x, y, z;	1428	int x, y, z;
1285	int last_name;	1429	int last_name;
1286	mapface face;	1430	mapface face;
1287	int sw4 = (sw + 3) & ~3;
1288	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1289	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1290		1431
1291	memset (darkness, 255, sw4 * sh);
1292	SvPOK_only (darkness_sv);
1293	SvCUR_set (darkness_sv, sw4 * sh);
1294
1295	vx = self->x + (self->w - sw) / 2 - shift_x;	1432	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1296	vy = self->y + (self->h - sh) / 2 - shift_y;	1433	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1297		1434
1298	/*	1435	/*
1299	int vx = self->vx = self->w >= sw	1436	int vx = self->vx = self->w >= sw
1300	? self->x + (self->w - sw) / 2	1437	? self->x + (self->w - sw) / 2
1301	: 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));
…		…
1305	: 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));
1306	*/	1443	*/
1307		1444
1308	glColor4ub (255, 255, 255, 255);	1445	glColor4ub (255, 255, 255, 255);
1309		1446
		1447	glEnable (GL_BLEND);
1310	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1448	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1311	glEnable (GL_BLEND);
1312	glEnable (GL_TEXTURE_2D);	1449	glEnable (GL_TEXTURE_2D);
1313	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1450	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1314		1451
1315	glBegin (GL_QUADS);	1452	glBegin (GL_QUADS);
1316		1453
…		…
1325	for (x = 0; x < sw; x++)	1462	for (x = 0; x < sw; x++)
1326	if (row->c0 <= x + vx && x + vx < row->c1)	1463	if (row->c0 <= x + vx && x + vx < row->c1)
1327	{	1464	{
1328	mapcell *cell = row->col + (x + vx - row->c0);	1465	mapcell *cell = row->col + (x + vx - row->c0);
1329		1466
1330	darkness[y * sw4 + x] = cell->darkness < 0
1331	? 255 - FOW_DARKNESS
1332	: 255 - cell->darkness;
1333
1334	face = cell->face [z];	1467	face = cell->face [z];
1335		1468
1336	if (face)	1469	if (face && face < self->texs)
1337	{	1470	{
1338	maptex tex = self->tex [face];	1471	maptex tex = self->tex [face];
1339
1340	int px = (x + 1) * 32 - tex.w;	1472	int px = (x + 1) * 32 - tex.w;
1341	int py = (y + 1) * 32 - tex.h;	1473	int py = (y + 1) * 32 - tex.h;
1342		1474
1343	if (last_name != tex.name)	1475	if (last_name != tex.name)
1344	{	1476	{
1345	glEnd ();	1477	glEnd ();
1346	last_name = tex.name;
1347	glBindTexture (GL_TEXTURE_2D, last_name);	1478	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1348	glBegin (GL_QUADS);	1479	glBegin (GL_QUADS);
1349	}	1480	}
1350		1481
1351	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1482	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1352	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1483	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1353	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);
1354	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1485	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1355	}	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	}
1356	}	1506	}
1357	}	1507	}
1358		1508
1359	glEnd ();	1509	glEnd ();
1360		1510
1361	glDisable (GL_TEXTURE_2D);	1511	glDisable (GL_TEXTURE_2D);
1362	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	}
1363		1638
1364	EXTEND (SP, 3);	1639	EXTEND (SP, 3);
1365	PUSHs (sv_2mortal (newSViv (sw4)));	1640	PUSHs (sv_2mortal (newSViv (sw4)));
1366	PUSHs (sv_2mortal (newSViv (sh)));	1641	PUSHs (sv_2mortal (newSViv (sh)));
1367	PUSHs (darkness_sv);	1642	PUSHs (darkness_sv);
1368	}	1643	}
1369		1644
1370	SV *	1645	SV *
1371	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)
1372	CODE:	1647	CODE:
1373	{	1648	{
1374	int x, y, x1, y1;	1649	int x, y, x1, y1;
1375	SV *data_sv = newSV (w * h * 7 + 5);	1650	SV *data_sv = newSV (w * h * 7 + 5);
1376	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1651	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1438	}	1713	}
1439	OUTPUT:	1714	OUTPUT:
1440	RETVAL	1715	RETVAL
1441		1716
1442	void	1717	void
1443	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)
1444	PPCODE:	1719	PPCODE:
1445	{	1720	{
1446	int x, y, z;	1721	int x, y, z;
1447	int w, h;	1722	int w, h;
1448	int x1, y1;	1723	int x1, y1;
…		…
1480		1755
1481	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	1756	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1482	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	1757	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1483	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	1758	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1484		1759
1485	if (cell->darkness <= 0)	1760	if (cell->darkness == 0)
1486	{	1761	{
1487	cell->darkness = -1;	1762	cell->darkness = 0;
1488		1763
1489	for (z = 0; z <= 2; z++)	1764	for (z = 0; z <= 2; z++)
1490	{	1765	{
1491	cell->face[z] = face[z];	1766	cell->face[z] = face[z];
1492		1767
…		…
1497	}	1772	}
1498	}	1773	}
1499	}	1774	}
1500	}	1775	}
1501		1776
1502	MODULE = CFClient PACKAGE = CFClient::MixChunk	1777	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1503		1778
1504	CFClient::MixChunk	1779	CFPlus::MixChunk
1505	new_from_file (SV *class, char *path)	1780	new_from_file (SV *class, char *path)
1506	CODE:	1781	CODE:
1507	RETVAL = Mix_LoadWAV (path);	1782	RETVAL = Mix_LoadWAV (path);
1508	OUTPUT:	1783	OUTPUT:
1509	RETVAL	1784	RETVAL
1510		1785
1511	void	1786	void
1512	DESTROY (CFClient::MixChunk self)	1787	DESTROY (CFPlus::MixChunk self)
1513	CODE:	1788	CODE:
1514	Mix_FreeChunk (self);	1789	Mix_FreeChunk (self);
1515		1790
1516	int	1791	int
1517	volume (CFClient::MixChunk self, int volume = -1)	1792	volume (CFPlus::MixChunk self, int volume = -1)
1518	CODE:	1793	CODE:
1519	RETVAL = Mix_VolumeChunk (self, volume);	1794	RETVAL = Mix_VolumeChunk (self, volume);
1520	OUTPUT:	1795	OUTPUT:
1521	RETVAL	1796	RETVAL
1522		1797
1523	int	1798	int
1524	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)
1525	CODE:	1800	CODE:
1526	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1801	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1527	OUTPUT:	1802	OUTPUT:
1528	RETVAL	1803	RETVAL
1529		1804
1530	MODULE = CFClient PACKAGE = CFClient::MixMusic	1805	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1531		1806
1532	int	1807	int
1533	volume (int volume = -1)	1808	volume (int volume = -1)
1534	CODE:	1809	CODE:
1535	RETVAL = Mix_VolumeMusic (volume);	1810	RETVAL = Mix_VolumeMusic (volume);
1536	OUTPUT:	1811	OUTPUT:
1537	RETVAL	1812	RETVAL
1538		1813
1539	CFClient::MixMusic	1814	CFPlus::MixMusic
1540	new_from_file (SV *class, char *path)	1815	new_from_file (SV *class, char *path)
1541	CODE:	1816	CODE:
1542	RETVAL = Mix_LoadMUS (path);	1817	RETVAL = Mix_LoadMUS (path);
1543	OUTPUT:	1818	OUTPUT:
1544	RETVAL	1819	RETVAL
1545		1820
1546	void	1821	void
1547	DESTROY (CFClient::MixMusic self)	1822	DESTROY (CFPlus::MixMusic self)
1548	CODE:	1823	CODE:
1549	Mix_FreeMusic (self);	1824	Mix_FreeMusic (self);
1550		1825
1551	int	1826	int
1552	play (CFClient::MixMusic self, int loops = -1)	1827	play (CFPlus::MixMusic self, int loops = -1)
1553	CODE:	1828	CODE:
1554	RETVAL = Mix_PlayMusic (self, loops);	1829	RETVAL = Mix_PlayMusic (self, loops);
1555	OUTPUT:	1830	OUTPUT:
1556	RETVAL	1831	RETVAL
1557		1832
1558	MODULE = CFClient PACKAGE = CFClient::OpenGL	1833	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1559		1834
1560	BOOT:	1835	BOOT:
1561	{	1836	{
1562	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1837	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1563	static const struct {	1838	static const struct {
1564	const char *name;	1839	const char *name;
1565	IV iv;	1840	IV iv;
1566	} *civ, const_iv[] = {	1841	} *civ, const_iv[] = {
1567	# define const_iv(name) { # name, (IV)name }	1842	# define const_iv(name) { # name, (IV)name }
…		…
1574	const_iv (GL_SCISSOR_TEST),	1849	const_iv (GL_SCISSOR_TEST),
1575	const_iv (GL_DEPTH_TEST),	1850	const_iv (GL_DEPTH_TEST),
1576	const_iv (GL_ALPHA_TEST),	1851	const_iv (GL_ALPHA_TEST),
1577	const_iv (GL_NORMALIZE),	1852	const_iv (GL_NORMALIZE),
1578	const_iv (GL_RESCALE_NORMAL),	1853	const_iv (GL_RESCALE_NORMAL),
		1854	const_iv (GL_FRONT),
		1855	const_iv (GL_BACK),
1579	const_iv (GL_AND),	1856	const_iv (GL_AND),
1580	const_iv (GL_ONE),	1857	const_iv (GL_ONE),
1581	const_iv (GL_ZERO),	1858	const_iv (GL_ZERO),
1582	const_iv (GL_SRC_ALPHA),	1859	const_iv (GL_SRC_ALPHA),
1583	const_iv (GL_DST_ALPHA),	1860	const_iv (GL_DST_ALPHA),
1584	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1861	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1585	const_iv (GL_ONE_MINUS_DST_ALPHA),	1862	const_iv (GL_ONE_MINUS_DST_ALPHA),
1586	const_iv (GL_SRC_ALPHA_SATURATE),	1863	const_iv (GL_SRC_ALPHA_SATURATE),
1587	const_iv (GL_RGB),	1864	const_iv (GL_RGB),
1588	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),
1589	const_iv (GL_UNSIGNED_BYTE),	1869	const_iv (GL_UNSIGNED_BYTE),
1590	const_iv (GL_UNSIGNED_SHORT),	1870	const_iv (GL_UNSIGNED_SHORT),
1591	const_iv (GL_UNSIGNED_INT),	1871	const_iv (GL_UNSIGNED_INT),
1592	const_iv (GL_ALPHA),	1872	const_iv (GL_ALPHA),
1593	const_iv (GL_INTENSITY),	1873	const_iv (GL_INTENSITY),
…		…
1625	const_iv (GL_SEPARABLE_2D),	1905	const_iv (GL_SEPARABLE_2D),
1626	const_iv (GL_CONVOLUTION_2D),	1906	const_iv (GL_CONVOLUTION_2D),
1627	const_iv (GL_CONVOLUTION_BORDER_MODE),	1907	const_iv (GL_CONVOLUTION_BORDER_MODE),
1628	const_iv (GL_CONSTANT_BORDER),	1908	const_iv (GL_CONSTANT_BORDER),
1629	const_iv (GL_LINES),	1909	const_iv (GL_LINES),
		1910	const_iv (GL_LINE_STRIP),
1630	const_iv (GL_LINE_LOOP),	1911	const_iv (GL_LINE_LOOP),
1631	const_iv (GL_QUADS),	1912	const_iv (GL_QUADS),
1632	const_iv (GL_QUAD_STRIP),	1913	const_iv (GL_QUAD_STRIP),
1633	const_iv (GL_TRIANGLES),	1914	const_iv (GL_TRIANGLES),
1634	const_iv (GL_TRIANGLE_STRIP),	1915	const_iv (GL_TRIANGLE_STRIP),
…		…
1667	OUTPUT:	1948	OUTPUT:
1668	RETVAL	1949	RETVAL
1669		1950
1670	int glGetError ()	1951	int glGetError ()
1671		1952
		1953	void glFinish ()
		1954
1672	void glClear (int mask)	1955	void glClear (int mask)
1673		1956
1674	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)
1675	PROTOTYPE: @	1958	PROTOTYPE: @
1676		1959
…		…
1699	void glPushMatrix ()	1982	void glPushMatrix ()
1700		1983
1701	void glPopMatrix ()	1984	void glPopMatrix ()
1702		1985
1703	void glLoadIdentity ()	1986	void glLoadIdentity ()
		1987
		1988	void glDrawBuffer (int buffer)
		1989
		1990	void glReadBuffer (int buffer)
1704		1991
1705	# near_ and far_ are due to microsofts buggy "c" compiler	1992	# near_ and far_ are due to microsofts buggy "c" compiler
1706	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_)
1707		1994
1708	# near_ and far_ are due to microsofts buggy "c" compiler	1995	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1738	r *= a;	2025	r *= a;
1739	g *= a;	2026	g *= a;
1740	b *= a;	2027	b *= a;
1741	}	2028	}
1742	// microsoft visual "c" rounds instead of truncating...	2029	// microsoft visual "c" rounds instead of truncating...
1743	glColor4ub (MIN ((int)(r * 256.f), 255),	2030	glColor4f (r, g, b, a);
1744	MIN ((int)(g * 256.f), 255),
1745	MIN ((int)(b * 256.f), 255),
1746	MIN ((int)(a * 256.f), 255));
1747		2031
1748	void glInterleavedArrays (int format, int stride, char *data)	2032	void glInterleavedArrays (int format, int stride, char *data)
1749		2033
1750	void glDrawElements (int mode, int count, int type, char *indices)	2034	void glDrawElements (int mode, int count, int type, char *indices)
1751		2035
…		…
1828		2112
1829	void glEndList ()	2113	void glEndList ()
1830		2114
1831	void glCallList (int list)	2115	void glCallList (int list)
1832		2116
1833

Diff Legend

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