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.108 by root, Wed Jun 7 23:28:12 2006 UTC vs.
Revision 1.153 by root, Tue Sep 19 22:02:38 2006 UTC

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

Diff Legend

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