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.103 by root, Sun Jun 4 23:05:05 2006 UTC vs.
Revision 1.160 by root, Mon Oct 9 01:06:36 2006 UTC

1	#ifdef _WIN32	1	#ifdef _WIN32
		2	long _ftol (double); /* defined by VC6 C libs */
		3	long _ftol2 (double dblSource) { return _ftol (dblSource); }
		4	# define WIN32_LEAN_AND_MEAN
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	5	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3	# include <malloc.h>	6	# include <malloc.h>
4	# include <windows.h>	7	# include <windows.h>
		8	# include <wininet.h>
5	# pragma warning(disable:4244)	9	# pragma warning(disable:4244)
6	#endif	10	#endif
7		11
8	#include "EXTERN.h"	12	#include "EXTERN.h"
9	#include "perl.h"	13	#include "perl.h"
10	#include "XSUB.h"	14	#include "XSUB.h"
11		15
		16	#ifdef _WIN32
		17	# undef pipe
		18	#endif
		19
12	#include <math.h>	20	#include <math.h>
13	#include <string.h>	21	#include <string.h>
14	#include <stdio.h>	22	#include <stdio.h>
		23	#include <stdlib.h>
15		24
16	#include <SDL.h>	25	#include <SDL.h>
17	#include <SDL_endian.h>	26	#include <SDL_endian.h>
18	#include <SDL_image.h>	27	#include <SDL_image.h>
19	#include <SDL_mixer.h>	28	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	29	#include <SDL_opengl.h>
21		30
		31	#define PANGO_ENABLE_BACKEND
		32	#define G_DISABLE_CAST_CHECKS
		33
22	#include <glib/gmacros.h>	34	#include <glib/gmacros.h>
23		35
24	#include <pango/pango.h>	36	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		37
29	#ifndef _WIN32	38	#ifndef _WIN32
30	# include <sys/types.h>	39	# include <sys/types.h>
31	# include <sys/socket.h>	40	# include <sys/socket.h>
32	# include <netinet/in.h>	41	# include <netinet/in.h>
…		…
39	typedef signed char int8_t;	48	typedef signed char int8_t;
40	typedef signed short int16_t;	49	typedef signed short int16_t;
41	typedef signed int int32_t;	50	typedef signed int int32_t;
42	#endif	51	#endif
43		52
44	#include "glext.h"	53	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45		54
46	#define FOW_DARKNESS 32	55	#define FOW_DARKNESS 32
47		56
48	#define MAP_EXTEND_X 32	57	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	58	#define MAP_EXTEND_Y 512
50		59
51	#define MIN_FONT_HEIGHT 10	60	#define MIN_FONT_HEIGHT 10
		61
		62	#if 0
		63	# define PARACHUTE SDL_INIT_NOPARACHUTE
		64	#else
		65	# define PARACHUTE 0
		66	#endif
52		67
53	static struct	68	static struct
54	{	69	{
55	#define GL_FUNC(ptr,name) ptr name;	70	#define GL_FUNC(ptr,name) ptr name;
56	#include "glfunc.h"	71	#include "glfunc.h"
…		…
65	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	80	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	else	81	else
67	glBlendFunc (sa, da);	82	glBlendFunc (sa, da);
68	}	83	}
69		84
		85	#include "texcache.c"
		86
		87	#include "pango-font.c"
		88	#include "pango-fontmap.c"
		89	#include "pango-render.c"
		90
70	typedef Mix_Chunk *CFClient__MixChunk;	91	typedef Mix_Chunk *CFPlus__MixChunk;
71	typedef Mix_Music *CFClient__MixMusic;	92	typedef Mix_Music *CFPlus__MixMusic;
72		93
73	typedef PangoFontDescription *CFClient__Font;	94	typedef PangoFontDescription *CFPlus__Font;
		95
		96	static int
		97	shape_attr_p (PangoLayoutRun *run)
		98	{
		99	GSList *attrs = run->item->analysis.extra_attrs;
		100
		101	while (attrs)
		102	{
		103	PangoAttribute *attr = attrs->data;
		104
		105	if (attr->klass->type == PANGO_ATTR_SHAPE)
		106	return 1;
		107
		108	attrs = attrs->next;
		109	}
		110
		111	return 0;
		112	}
74		113
75	typedef struct cf_layout {	114	typedef struct cf_layout {
76	PangoLayout *pl; // either derived from a cairo or ft2 context	115	PangoLayout *pl;
77	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78	float r, g, b, a; // default color for rgba mode	116	float r, g, b, a; // default color for rgba mode
79	int base_height;	117	int base_height;
80	CFClient__Font font;	118	CFPlus__Font font;
81	} *CFClient__Layout;	119	} *CFPlus__Layout;
82		120
83	static CFClient__Font default_font;	121	static CFPlus__Font default_font;
84	static PangoContext *ft2_context, *cairo_context;	122	static PangoContext *opengl_context;
85	static PangoFontMap *ft2_fontmap, *cairo_fontmap;	123	static PangoFontMap *opengl_fontmap;
86		124
87	static void	125	static void
88	substitute_func (FcPattern *pattern, gpointer data)	126	substitute_func (FcPattern *pattern, gpointer data)
89	{	127	{
90	FcPatternAddBool (pattern, FC_HINTING , 1);	128	FcPatternAddBool (pattern, FC_HINTING, 1);
91	#ifdef _WIN32	129	#ifdef FC_HINT_STYLE
92	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	130	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
93	#else	131	#endif
94	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	132	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
95	#endif
96	}	133	}
97		134
98	static void	135	static void
99	layout_update_font (CFClient__Layout self)	136	layout_update_font (CFPlus__Layout self)
100	{	137	{
101	/* use a random scale factor to account for unknown descenders, 0.8 works	138	/* use a random scale factor to account for unknown descenders, 0.8 works
102	* reasonably well with bitstream vera	139	* reasonably well with bitstream vera
103	*/	140	*/
104	PangoFontDescription *font = self->font ? self->font : default_font;	141	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
108		145
109	pango_layout_set_font_description (self->pl, font);	146	pango_layout_set_font_description (self->pl, font);
110	}	147	}
111		148
112	static void	149	static void
113	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	150	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
114	{	151	{
		152	PangoRectangle rect;
		153
		154	// get_pixel_* wrongly rounds down
115	pango_layout_get_pixel_size (self->pl, w, h);	155	pango_layout_get_extents (self->pl, 0, &rect);
116		156
117	if (!*w) *w = 1;	157	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
118	if (!*h) *h = 1;	158	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
119		159
120	*w = (*w + 3) & ~3;	160	if (!rect.width) rect.width = 1;
		161	if (!rect.height) rect.height = 1;
		162
		163	*w = rect.width;
		164	*h = rect.height;
121	}	165	}
122		166
123	typedef uint16_t mapface;	167	typedef uint16_t mapface;
124		168
125	typedef struct {	169	typedef struct {
…		…
128	float s, t;	172	float s, t;
129	uint8_t r, g, b, a;	173	uint8_t r, g, b, a;
130	} maptex;	174	} maptex;
131		175
132	typedef struct {	176	typedef struct {
133	int16_t darkness;	177	uint32_t player;
134	mapface face[3];	178	mapface face[3];
		179	uint16_t darkness;
		180	uint8_t stat_width, stat_hp, flags;
135	} mapcell;	181	} mapcell;
136		182
137	typedef struct {	183	typedef struct {
138	int32_t c0, c1;	184	int32_t c0, c1;
139	mapcell *col;	185	mapcell *col;
…		…
148	int texs;	194	int texs;
149	maptex *tex;	195	maptex *tex;
150		196
151	int32_t rows;	197	int32_t rows;
152	maprow *row;	198	maprow *row;
153	} *CFClient__Map;	199	} *CFPlus__Map;
154		200
155	static char *	201	static char *
156	prepend (char *ptr, int sze, int inc)	202	prepend (char *ptr, int sze, int inc)
157	{	203	{
158	char *p;	204	char *p;
…		…
176		222
177	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	223	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
178	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	224	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
179		225
180	static maprow *	226	static maprow *
181	map_get_row (CFClient__Map self, int y)	227	map_get_row (CFPlus__Map self, int y)
182	{	228	{
183	if (0 > y)	229	if (0 > y)
184	{	230	{
185	int extend = - y + MAP_EXTEND_Y;	231	int extend = - y + MAP_EXTEND_Y;
186	Prepend (maprow, self->row, self->rows, extend);	232	Prepend (maprow, self->row, self->rows, extend);
…		…
224		270
225	return row->col + (x - row->c0);	271	return row->col + (x - row->c0);
226	}	272	}
227		273
228	static mapcell *	274	static mapcell *
229	map_get_cell (CFClient__Map self, int x, int y)	275	map_get_cell (CFPlus__Map self, int x, int y)
230	{	276	{
231	return row_get_cell (map_get_row (self, y), x);	277	return row_get_cell (map_get_row (self, y), x);
232	}	278	}
233		279
234	static void	280	static void
235	map_clear (CFClient__Map self)	281	map_clear (CFPlus__Map self)
236	{	282	{
237	int r;	283	int r;
238		284
239	for (r = 0; r < self->rows; r++)	285	for (r = 0; r < self->rows; r++)
240	Safefree (self->row[r].col);	286	Safefree (self->row[r].col);
…		…
248	self->row = 0;	294	self->row = 0;
249	self->rows = 0;	295	self->rows = 0;
250	}	296	}
251		297
252	static void	298	static void
253	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	299	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
254	{	300	{
255	int x, y;	301	int x, y;
256	maprow *row;	302	maprow *row;
		303	mapcell *cell;
257		304
258	for (y = y0; y < y0 + h; y++)	305	for (y = y0; y < y0 + h; y++)
259	if (y >= 0)	306	if (y >= 0)
260	{	307	{
261	if (y >= self->rows)	308	if (y >= self->rows)
…		…
267	if (x >= row->c0)	314	if (x >= row->c0)
268	{	315	{
269	if (x >= row->c1)	316	if (x >= row->c1)
270	break;	317	break;
271		318
272	row->col[x - row->c0].darkness = -1;	319	cell = row->col + x - row->c0;
		320
		321	cell->darkness = 0;
		322	cell->stat_hp = 0;
		323	cell->flags = 0;
		324	cell->player = 0;
273	}	325	}
274	}	326	}
275	}	327	}
276		328
277	static void	329	static void
…		…
298	ev.data2 = 0;	350	ev.data2 = 0;
299		351
300	SDL_PushEvent ((SDL_Event *)&ev);	352	SDL_PushEvent ((SDL_Event *)&ev);
301	}	353	}
302		354
		355	static unsigned int
		356	minpot (unsigned int n)
		357	{
		358	if (!n)
		359	return 0;
		360
		361	--n;
		362
		363	n |= n >> 1;
		364	n |= n >> 2;
		365	n |= n >> 4;
		366	n |= n >> 8;
		367	n |= n >> 16;
		368
		369	return n + 1;
		370	}
		371
303	MODULE = CFClient PACKAGE = CFClient	372	MODULE = CFPlus PACKAGE = CFPlus
304		373
305	PROTOTYPES: ENABLE	374	PROTOTYPES: ENABLE
306		375
307	BOOT:	376	BOOT:
308	{	377	{
309	HV *stash = gv_stashpv ("CFClient", 1);	378	HV *stash = gv_stashpv ("CFPlus", 1);
310	static const struct {	379	static const struct {
311	const char *name;	380	const char *name;
312	IV iv;	381	IV iv;
313	} *civ, const_iv[] = {	382	} *civ, const_iv[] = {
314	# define const_iv(name) { # name, (IV)name }	383	# define const_iv(name) { # name, (IV)name }
…		…
415		484
416	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	485	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
417	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	486	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
418	}	487	}
419		488
		489	int
		490	in_destruct ()
		491	CODE:
		492	RETVAL = PL_main_cv == Nullcv;
		493	OUTPUT:
		494	RETVAL
		495
		496	NV floor (NV x)
		497
		498	NV ceil (NV x)
		499
420	void	500	void
421	pango_init ()	501	pango_init ()
422	CODE:	502	CODE:
423	{	503	{
424	// delayed, so it can pick up new fonts added by AddFontResourceEx
425	ft2_fontmap = pango_ft2_font_map_new ();	504	opengl_fontmap = pango_opengl_font_map_new ();
426	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	505	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
427	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	506	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
428
429	cairo_fontmap = pango_cairo_font_map_get_default ();
430	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
431	}	507	}
432		508
433	int	509	int
434	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	510	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
435		511
436	void	512	void
437	SDL_Quit ()	513	SDL_Quit ()
438		514
439	void	515	void
…		…
446	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	522	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
447	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	523	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
448	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	524	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
449		525
450	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	526	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	527	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
452		528
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	529	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	530	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
455	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	531	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
456	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	532	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
457		533
458	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	534	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		535	#if SDL_VERSION_ATLEAST(1,2,10)
		536	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		537	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		538	#endif
459		539
460	SDL_EnableUNICODE (1);	540	SDL_EnableUNICODE (1);
461	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	541	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
462		542
463	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	543	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
550	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	630	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
551	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	631	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
552	break;	632	break;
553	}	633	}
554		634
555	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	635	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
556	}	636	}
557	}	637	}
558		638
559	int	639	int
560	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	640	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
574	#ifndef _WIN32	654	#ifndef _WIN32
575	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	655	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
576	#endif	656	#endif
577		657
578	void	658	void
		659	win32_proxy_info ()
		660	PPCODE:
		661	{
		662	#ifdef _WIN32
		663	char buffer[2048];
		664	DWORD buflen;
		665
		666	EXTEND (SP, 3);
		667
		668	buflen = sizeof (buffer);
		669	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		670	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		671	{
		672	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		673
		674	buflen = sizeof (buffer);
		675	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		676	{
		677	PUSHs (newSVpv (buffer, 0));
		678
		679	buflen = sizeof (buffer);
		680	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		681	PUSHs (newSVpv (buffer, 0));
		682	}
		683	}
		684	#endif
		685	}
		686
		687	void
579	add_font (char *file)	688	add_font (char *file)
580	CODE:	689	CODE:
581	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	690	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
582	#ifdef _WIN32
583	// cairo... sigh... requires win2000
584	AddFontResourceEx (file, FR_PRIVATE, 0);
585	#endif
586		691
587	void	692	void
588	load_image_inline (SV *image_)	693	load_image_inline (SV *image_)
589	ALIAS:	694	ALIAS:
590	load_image_file = 1	695	load_image_file = 1
…		…
632		737
633	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	738	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
634		739
635	assert (surface2->pitch == surface2->w * 4);	740	assert (surface2->pitch == surface2->w * 4);
636		741
		742	SDL_LockSurface (surface2);
637	EXTEND (SP, 5);	743	EXTEND (SP, 6);
638	PUSHs (sv_2mortal (newSViv (surface2->w)));	744	PUSHs (sv_2mortal (newSViv (surface2->w)));
639	PUSHs (sv_2mortal (newSViv (surface2->h)));	745	PUSHs (sv_2mortal (newSViv (surface2->h)));
640	SDL_LockSurface (surface2);
641	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	746	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
642	SDL_UnlockSurface (surface2);
643	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	747	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
644	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	748	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
645	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	749	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		750	SDL_UnlockSurface (surface2);
646		751
647	SDL_FreeSurface (surface);	752	SDL_FreeSurface (surface);
648	SDL_FreeSurface (surface2);	753	SDL_FreeSurface (surface2);
649	}	754	}
650		755
…		…
686	CODE:	791	CODE:
687	fprintf (stderr, "FATAL: %s\n", message);	792	fprintf (stderr, "FATAL: %s\n", message);
688	#ifdef _WIN32	793	#ifdef _WIN32
689	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	794	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
690	#endif	795	#endif
691	exit (1);	796	_exit (1);
692		797
		798	void
		799	_exit (int retval = 0)
		800	CODE:
		801	_exit (retval);
		802
693	MODULE = CFClient PACKAGE = CFClient::Font	803	MODULE = CFPlus PACKAGE = CFPlus::Font
694		804
695	CFClient::Font	805	CFPlus::Font
696	new_from_file (SV *class, char *path, int id = 0)	806	new_from_file (SV *class, char *path, int id = 0)
697	CODE:	807	CODE:
698	{	808	{
699	int count;	809	int count;
700	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	810	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
703	}	813	}
704	OUTPUT:	814	OUTPUT:
705	RETVAL	815	RETVAL
706		816
707	void	817	void
708	DESTROY (CFClient::Font self)	818	DESTROY (CFPlus::Font self)
709	CODE:	819	CODE:
710	pango_font_description_free (self);	820	pango_font_description_free (self);
711		821
712	void	822	void
713	make_default (CFClient::Font self)	823	make_default (CFPlus::Font self)
714	CODE:	824	CODE:
715	default_font = self;	825	default_font = self;
716		826
717	MODULE = CFClient PACKAGE = CFClient::Layout	827	MODULE = CFPlus PACKAGE = CFPlus::Layout
718		828
719	CFClient::Layout	829	void
720	new (SV *class, int rgba = 0)	830	reset_glyph_cache ()
721	CODE:	831	CODE:
722	#if _WIN32	832	tc_clear ();
723	//rgba = 0;//D makes text nicer, breaks TextView	833
724	#endif	834	CFPlus::Layout
		835	new (SV *class)
		836	CODE:
725	New (0, RETVAL, 1, struct cf_layout);	837	New (0, RETVAL, 1, struct cf_layout);
726		838
727	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	839	RETVAL->pl = pango_layout_new (opengl_context);
728	RETVAL->rgba = rgba;
729	RETVAL->r = 1.;	840	RETVAL->r = 1.;
730	RETVAL->g = 1.;	841	RETVAL->g = 1.;
731	RETVAL->b = 1.;	842	RETVAL->b = 1.;
732	RETVAL->a = 1.;	843	RETVAL->a = 1.;
733	RETVAL->base_height = MIN_FONT_HEIGHT;	844	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
737	layout_update_font (RETVAL);	848	layout_update_font (RETVAL);
738	OUTPUT:	849	OUTPUT:
739	RETVAL	850	RETVAL
740		851
741	void	852	void
742	DESTROY (CFClient::Layout self)	853	DESTROY (CFPlus::Layout self)
743	CODE:	854	CODE:
744	g_object_unref (self->pl);	855	g_object_unref (self->pl);
745	Safefree (self);	856	Safefree (self);
746		857
747	int
748	is_rgba (CFClient::Layout self)
749	CODE:
750	RETVAL = self->rgba;
751	OUTPUT:
752	RETVAL
753
754	void	858	void
755	set_text (CFClient::Layout self, SV *text_)	859	set_text (CFPlus::Layout self, SV *text_)
756	CODE:	860	CODE:
757	{	861	{
758	STRLEN textlen;	862	STRLEN textlen;
759	char *text = SvPVutf8 (text_, textlen);	863	char *text = SvPVutf8 (text_, textlen);
760		864
761	pango_layout_set_text (self->pl, text, textlen);	865	pango_layout_set_text (self->pl, text, textlen);
762	}	866	}
763		867
764	void	868	void
765	set_markup (CFClient::Layout self, SV *text_)	869	set_markup (CFPlus::Layout self, SV *text_)
766	CODE:	870	CODE:
767	{	871	{
768	STRLEN textlen;	872	STRLEN textlen;
769	char *text = SvPVutf8 (text_, textlen);	873	char *text = SvPVutf8 (text_, textlen);
770		874
771	pango_layout_set_markup (self->pl, text, textlen);	875	pango_layout_set_markup (self->pl, text, textlen);
772	}	876	}
773		877
		878	void
		879	set_shapes (CFPlus::Layout self, ...)
		880	CODE:
		881	{
		882	PangoAttrList *attrs = 0;
		883	const char *text = pango_layout_get_text (self->pl);
		884	const char *pos = text;
		885	int arg = 4;
		886
		887	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		888	{
		889	PangoRectangle inkrect, rect;
		890	PangoAttribute *attr;
		891
		892	int x = SvIV (ST (arg - 3));
		893	int y = SvIV (ST (arg - 2));
		894	int w = SvIV (ST (arg - 1));
		895	int h = SvIV (ST (arg ));
		896
		897	inkrect.x = 0;
		898	inkrect.y = 0;
		899	inkrect.width = 0;
		900	inkrect.height = 0;
		901
		902	rect.x = x * PANGO_SCALE;
		903	rect.y = y * PANGO_SCALE;
		904	rect.width = w * PANGO_SCALE;
		905	rect.height = h * PANGO_SCALE;
		906
		907	if (!attrs)
		908	attrs = pango_layout_get_attributes (self->pl);
		909
		910	attr = pango_attr_shape_new (&inkrect, &rect);
		911	attr->start_index = pos - text;
		912	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		913	pango_attr_list_insert (attrs, attr);
		914
		915	arg += 4;
		916	pos += sizeof (OBJ_STR) - 1;
		917	}
		918
		919	if (attrs)
		920	pango_layout_set_attributes (self->pl, attrs);
		921	}
		922
		923	void
		924	get_shapes (CFPlus::Layout self)
		925	PPCODE:
		926	{
		927	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		928
		929	do
		930	{
		931	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		932
		933	if (run && shape_attr_p (run))
		934	{
		935	PangoRectangle extents;
		936	pango_layout_iter_get_run_extents (iter, 0, &extents);
		937
		938	EXTEND (SP, 2);
		939	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		940	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		941	}
		942	}
		943	while (pango_layout_iter_next_run (iter));
		944
		945	pango_layout_iter_free (iter);
		946	}
		947
		948	int
		949	has_wrapped (CFPlus::Layout self)
		950	CODE:
		951	{
		952	int lines = 1;
		953	const char *text = pango_layout_get_text (self->pl);
		954
		955	while (*text)
		956	lines += *text++ == '\n';
		957
		958	RETVAL = lines < pango_layout_get_line_count (self->pl);
		959	}
		960	OUTPUT:
		961	RETVAL
		962
774	SV *	963	SV *
775	get_text (CFClient::Layout self)	964	get_text (CFPlus::Layout self)
776	CODE:	965	CODE:
777	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	966	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
778	SvUTF8_on (RETVAL);	967	sv_utf8_decode (RETVAL);
779	OUTPUT:	968	OUTPUT:
780	RETVAL	969	RETVAL
781		970
782	void	971	void
783	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	972	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
784	CODE:	973	CODE:
785	self->r = r;	974	self->r = r;
786	self->g = g;	975	self->g = g;
787	self->b = b;	976	self->b = b;
788	self->a = a;	977	self->a = a;
789		978
790	void	979	void
791	set_font (CFClient::Layout self, CFClient::Font font = 0)	980	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
792	CODE:	981	CODE:
793	if (self->font != font)	982	if (self->font != font)
794	{	983	{
795	self->font = font;	984	self->font = font;
796	layout_update_font (self);	985	layout_update_font (self);
797	}	986	}
798		987
799	void	988	void
800	set_height (CFClient::Layout self, int base_height)	989	set_height (CFPlus::Layout self, int base_height)
801	CODE:	990	CODE:
802	if (self->base_height != base_height)	991	if (self->base_height != base_height)
803	{	992	{
804	self->base_height = base_height;	993	self->base_height = base_height;
805	layout_update_font (self);	994	layout_update_font (self);
806	}	995	}
807		996
808	void	997	void
809	set_width (CFClient::Layout self, int max_width = -1)	998	set_width (CFPlus::Layout self, int max_width = -1)
810	CODE:	999	CODE:
811	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1000	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
812		1001
813	void	1002	void
814	set_indent (CFClient::Layout self, int indent)	1003	set_indent (CFPlus::Layout self, int indent)
815	CODE:	1004	CODE:
816	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1005	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
817		1006
818	void	1007	void
819	set_spacing (CFClient::Layout self, int spacing)	1008	set_spacing (CFPlus::Layout self, int spacing)
820	CODE:	1009	CODE:
821	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1010	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
822		1011
823	void	1012	void
824	set_ellipsise (CFClient::Layout self, int ellipsise)	1013	set_ellipsise (CFPlus::Layout self, int ellipsise)
825	CODE:	1014	CODE:
826	pango_layout_set_ellipsize (self->pl,	1015	pango_layout_set_ellipsize (self->pl,
827	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1016	ellipsise == 1 ? PANGO_ELLIPSIZE_START
828	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1017	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
829	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1018	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
830	: PANGO_ELLIPSIZE_NONE	1019	: PANGO_ELLIPSIZE_NONE
831	);	1020	);
832		1021
833	void	1022	void
834	set_single_paragraph_mode (CFClient::Layout self, int spm)	1023	set_single_paragraph_mode (CFPlus::Layout self, int spm)
835	CODE:	1024	CODE:
836	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1025	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
837		1026
838	void	1027	void
839	size (CFClient::Layout self)	1028	size (CFPlus::Layout self)
840	PPCODE:	1029	PPCODE:
841	{	1030	{
842	int w, h;	1031	int w, h;
843		1032
844	layout_get_pixel_size (self, &w, &h);	1033	layout_get_pixel_size (self, &w, &h);
…		…
847	PUSHs (sv_2mortal (newSViv (w)));	1036	PUSHs (sv_2mortal (newSViv (w)));
848	PUSHs (sv_2mortal (newSViv (h)));	1037	PUSHs (sv_2mortal (newSViv (h)));
849	}	1038	}
850		1039
851	int	1040	int
		1041	descent (CFPlus::Layout self)
		1042	CODE:
		1043	{
		1044	PangoRectangle rect;
		1045	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1046	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1047	RETVAL = PANGO_DESCENT (rect);
		1048	}
		1049	OUTPUT:
		1050	RETVAL
		1051
		1052	int
852	xy_to_index (CFClient::Layout self, int x, int y)	1053	xy_to_index (CFPlus::Layout self, int x, int y)
853	CODE:	1054	CODE:
854	{	1055	{
855	int index, trailing;	1056	int index, trailing;
856	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1057	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
857	RETVAL = index;	1058	RETVAL = index;
858	}	1059	}
859	OUTPUT:	1060	OUTPUT:
860	RETVAL	1061	RETVAL
861		1062
862	void	1063	void
863	cursor_pos (CFClient::Layout self, int index)	1064	cursor_pos (CFPlus::Layout self, int index)
864	PPCODE:	1065	PPCODE:
865	{	1066	{
866	PangoRectangle strong_pos;	1067	PangoRectangle strong_pos;
867	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1068	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
868		1069
…		…
871	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1072	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
872	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1073	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
873	}	1074	}
874		1075
875	void	1076	void
876	render (CFClient::Layout self)	1077	render (CFPlus::Layout self, float x, float y, int flags = 0)
877	PPCODE:	1078	PPCODE:
878	{	1079	pango_opengl_render_layout_subpixel (
879	SV *retval;	1080	self->pl,
880	int w, h;	1081	x * PANGO_SCALE, y * PANGO_SCALE,
		1082	self->r, self->g, self->b, self->a,
		1083	flags
		1084	);
881		1085
882	layout_get_pixel_size (self, &w, &h);	1086	MODULE = CFPlus PACKAGE = CFPlus::Texture
883		1087
884	if (self->rgba)	1088	void
		1089	pad2pot (SV *data_, SV *w_, SV *h_)
		1090	CODE:
		1091	{
		1092	int ow = SvIV (w_);
		1093	int oh = SvIV (h_);
		1094
		1095	if (ow && oh)
885	{	1096	{
886	cairo_surface_t *surface;	1097	int nw = minpot (ow);
887	cairo_t *cairo;	1098	int nh = minpot (oh);
888		1099
889	retval = newSV (w * h * 4);	1100	if (nw != ow || nh != oh)
890	SvPOK_only (retval);
891	SvCUR_set (retval, w * h * 4);
892
893	memset (SvPVX (retval), 0, w * h * 4);
894
895	surface = cairo_image_surface_create_for_data (
896	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
897	cairo = cairo_create (surface);
898	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
899
900	pango_cairo_show_layout (cairo, self->pl);
901
902	cairo_destroy (cairo);
903	cairo_surface_destroy (surface);
904
905	// what a mess, and its premultiplied, too :(
906	{	1101	{
907	uint32_t *p = (uint32_t *)SvPVX (retval);	1102	if (SvOK (data_))
908	uint32_t *e = p + w * h;
909
910	while (p < e)
911	{	1103	{
912	uint32_t rgba = *p;	1104	STRLEN datalen;
913	rgba = (rgba >> 24) | (rgba << 8);	1105	char *data = SvPVbyte (data_, datalen);
914	#if 0	1106	int bpp = datalen / (ow * oh);
915	#ifdef _WIN32	1107	SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
916	{//D
917	uint8_t r = rgba >> 24;
918	uint8_t g = rgba >> 16;
919	uint8_t b = rgba >> 8;
920	uint8_t a = rgba >> 0;
921		1108
922	rgba = (rgba & 0xffffff00) | a;	1109	SvPOK_only (result_);
		1110	SvCUR_set (result_, nw * nh * bpp);
		1111
		1112	memset (SvPVX (result_), 0, nw * nh * bpp);
		1113	while (oh--)
		1114	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1115
		1116	sv_setsv (data_, result_);
923	}	1117	}
924	#endif	1118
925	#endif	1119	sv_setiv (w_, nw);
926	rgba = SDL_SwapBE32 (rgba);	1120	sv_setiv (h_, nh);
927	*p++ = rgba;
928	}	1121	}
929	}
930
931	EXTEND (SP, 5);
932	PUSHs (sv_2mortal (newSViv (w)));
933	PUSHs (sv_2mortal (newSViv (h)));
934	PUSHs (sv_2mortal (retval));
935	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
936	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
937	}	1122	}
938	else
939	{
940	FT_Bitmap bitmap;
941
942	retval = newSV (w * h);
943	SvPOK_only (retval);
944	SvCUR_set (retval, w * h);
945
946	bitmap.rows = h;
947	bitmap.width = w;
948	bitmap.pitch = w;
949	bitmap.buffer = (unsigned char*)SvPVX (retval);
950	bitmap.num_grays = 256;
951	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
952
953	memset (bitmap.buffer, 0, w * h);
954
955	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
956
957	EXTEND (SP, 5);
958	PUSHs (sv_2mortal (newSViv (w)));
959	PUSHs (sv_2mortal (newSViv (h)));
960	PUSHs (sv_2mortal (retval));
961	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
962	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
963	}
964	}	1123	}
965		1124
966	MODULE = CFClient PACKAGE = CFClient::Texture
967
968	void	1125	void
969	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1126	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
970	PROTOTYPE: $$$;$$	1127	PROTOTYPE: $$$;$$
971	ALIAS:	1128	ALIAS:
972	draw_quad_alpha = 1	1129	draw_quad_alpha = 1
973	draw_quad_alpha_premultiplied = 2	1130	draw_quad_alpha_premultiplied = 2
974	CODE:	1131	CODE:
…		…
990		1147
991	if (ix == 2)	1148	if (ix == 2)
992	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1149	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
993	else	1150	else
994	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	1151	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
995	GL_ONE_MINUS_DST_ALPHA, GL_ONE);	1152	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
996		1153
997	glEnable (GL_ALPHA_TEST);	1154	glEnable (GL_ALPHA_TEST);
998	glAlphaFunc (GL_GREATER, 0.01f);	1155	glAlphaFunc (GL_GREATER, 0.01f);
999	}	1156	}
1000		1157
…		…
1012	glDisable (GL_ALPHA_TEST);	1169	glDisable (GL_ALPHA_TEST);
1013	glDisable (GL_BLEND);	1170	glDisable (GL_BLEND);
1014	}	1171	}
1015	}	1172	}
1016		1173
1017	MODULE = CFClient PACKAGE = CFClient::Map	1174	MODULE = CFPlus PACKAGE = CFPlus::Map
1018		1175
1019	CFClient::Map	1176	CFPlus::Map
1020	new (SV *class, int map_width, int map_height)	1177	new (SV *class, int map_width, int map_height)
1021	CODE:	1178	CODE:
1022	New (0, RETVAL, 1, struct map);	1179	New (0, RETVAL, 1, struct map);
1023	RETVAL->x = 0;	1180	RETVAL->x = 0;
1024	RETVAL->y = 0;	1181	RETVAL->y = 0;
…		…
1034	RETVAL->row = 0;	1191	RETVAL->row = 0;
1035	OUTPUT:	1192	OUTPUT:
1036	RETVAL	1193	RETVAL
1037		1194
1038	void	1195	void
1039	DESTROY (CFClient::Map self)	1196	DESTROY (CFPlus::Map self)
1040	CODE:	1197	CODE:
1041	{	1198	{
1042	map_clear (self);	1199	map_clear (self);
1043	Safefree (self->face);	1200	Safefree (self->face);
		1201	Safefree (self->tex);
1044	Safefree (self);	1202	Safefree (self);
1045	}	1203	}
1046		1204
1047	void	1205	void
1048	clear (CFClient::Map self)	1206	clear (CFPlus::Map self)
1049	CODE:	1207	CODE:
1050	map_clear (self);	1208	map_clear (self);
1051		1209
1052	void	1210	void
1053	set_face (CFClient::Map self, int face, int texid)	1211	set_face (CFPlus::Map self, int face, int texid)
1054	CODE:	1212	CODE:
1055	{	1213	{
1056	while (self->faces <= face)	1214	while (self->faces <= face)
1057	{	1215	{
1058	Append (mapface, self->face, self->faces, self->faces);	1216	Append (mapface, self->face, self->faces, self->faces);
…		…
1061		1219
1062	self->face [face] = texid;	1220	self->face [face] = texid;
1063	}	1221	}
1064		1222
1065	void	1223	void
1066	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)	1224	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)
1067	CODE:	1225	CODE:
1068	{	1226	{
1069	while (self->texs <= texid)	1227	while (self->texs <= texid)
1070	{	1228	{
1071	Append (maptex, self->tex, self->texs, self->texs);	1229	Append (maptex, self->tex, self->texs, self->texs);
…		…
1095	// from transparent color bleeding and ugly wrapping effects.	1253	// from transparent color bleeding and ugly wrapping effects.
1096	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1254	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1097	}	1255	}
1098		1256
1099	int	1257	int
1100	ox (CFClient::Map self)	1258	ox (CFPlus::Map self)
1101	ALIAS:	1259	ALIAS:
1102	oy = 1	1260	oy = 1
1103	x = 2	1261	x = 2
1104	y = 3	1262	y = 3
1105	w = 4	1263	w = 4
…		…
1116	}	1274	}
1117	OUTPUT:	1275	OUTPUT:
1118	RETVAL	1276	RETVAL
1119		1277
1120	void	1278	void
1121	scroll (CFClient::Map self, int dx, int dy)	1279	scroll (CFPlus::Map self, int dx, int dy)
1122	CODE:	1280	CODE:
1123	{	1281	{
1124	if (dx > 0)	1282	if (dx > 0)
1125	map_blank (self, self->x, self->y, dx - 1, self->h);	1283	map_blank (self, self->x, self->y, dx, self->h);
1126	else if (dx < 0)	1284	else if (dx < 0)
1127	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1285	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1128		1286
1129	if (dy > 0)	1287	if (dy > 0)
1130	map_blank (self, self->x, self->y, self->w, dy - 1);	1288	map_blank (self, self->x, self->y, self->w, dy);
1131	else if (dy < 0)	1289	else if (dy < 0)
1132	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1290	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1133		1291
1134	self->ox += dx; self->x += dx;	1292	self->ox += dx; self->x += dx;
1135	self->oy += dy; self->y += dy;	1293	self->oy += dy; self->y += dy;
1136		1294
1137	while (self->y < 0)	1295	while (self->y < 0)
…		…
1142	self->y += MAP_EXTEND_Y;	1300	self->y += MAP_EXTEND_Y;
1143	}	1301	}
1144	}	1302	}
1145		1303
1146	void	1304	void
1147	map1a_update (CFClient::Map self, SV *data_)	1305	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1148	CODE:	1306	CODE:
1149	{	1307	{
1150	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1308	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1151	uint8_t *data_end = (uint8_t *)SvEND (data_);	1309	uint8_t *data_end = (uint8_t *)SvEND (data_);
1152	mapcell *cell;	1310	mapcell *cell;
1153	int x, y, flags;	1311	int x, y, flags;
1154		1312
1155	while (data < data_end)	1313	while (data < data_end - 1)
1156	{	1314	{
1157	flags = (data [0] << 8) + data [1]; data += 2;	1315	flags = (data [0] << 8) + data [1]; data += 2;
1158		1316
1159	x = ((flags >> 10) & 63) + self->x;	1317	x = self->x + ((flags >> 10) & 63);
1160	y = ((flags >> 4) & 63) + self->y;	1318	y = self->y + ((flags >> 4) & 63);
1161		1319
1162	cell = map_get_cell (self, x, y);	1320	cell = map_get_cell (self, x, y);
1163		1321
1164	if (flags & 15)	1322	if (flags & 15)
1165	{	1323	{
1166	if (cell->darkness < 0)	1324	if (!cell->darkness)
1167	{	1325	{
		1326	memset (cell, 0, sizeof (*cell));
1168	cell->darkness = 0;	1327	cell->darkness = 256;
1169	cell->face [0] = 0;
1170	cell->face [1] = 0;
1171	cell->face [2] = 0;
1172	}	1328	}
1173		1329
1174	cell->darkness = flags & 8 ? *data++ : 255;
1175
1176	//TODO: don't trust server data to be in-range(!)	1330	//TODO: don't trust server data to be in-range(!)
		1331
		1332	if (flags & 8)
		1333	{
		1334	if (extmap)
		1335	{
		1336	uint8_t ext, cmd;
		1337
		1338	do
		1339	{
		1340	ext = *data++;
		1341	cmd = ext & 0x3f;
		1342
		1343	if (cmd < 4)
		1344	cell->darkness = 255 - ext * 64 + 1;
		1345	else if (cmd == 5) // health
		1346	{
		1347	cell->stat_width = 1;
		1348	cell->stat_hp = *data++;
		1349	}
		1350	else if (cmd == 6) // monster width
		1351	cell->stat_width = *data++ + 1;
		1352	else if (cmd == 0x47) // monster width
		1353	{
		1354	if (*data == 4)
		1355	; // decode player tag
		1356
		1357	data += *data + 1;
		1358	}
		1359	else if (cmd == 8) // cell flags
		1360	cell->flags = *data++;
		1361	else if (ext & 0x40) // unknown, multibyte => skip
		1362	data += *data + 1;
		1363	else
		1364	data++;
		1365	}
		1366	while (ext & 0x80);
		1367	}
		1368	else
		1369	cell->darkness = *data++ + 1;
		1370	}
1177		1371
1178	if (flags & 4)	1372	if (flags & 4)
1179	{	1373	{
1180	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1374	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1181	}	1375	}
…		…
1189	{	1383	{
1190	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1384	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1191	}	1385	}
1192	}	1386	}
1193	else	1387	else
1194	cell->darkness = -1;	1388	cell->darkness = 0;
1195	}	1389	}
1196	}	1390	}
1197		1391
1198	SV *	1392	SV *
1199	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1393	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1200	CODE:	1394	CODE:
1201	{	1395	{
1202	int x1, x;	1396	int x1, x;
1203	int y1, y;	1397	int y1, y;
1204	int z;	1398	int z;
…		…
1254	}	1448	}
1255	OUTPUT:	1449	OUTPUT:
1256	RETVAL	1450	RETVAL
1257		1451
1258	void	1452	void
1259	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1453	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1260	PPCODE:	1454	CODE:
1261	{	1455	{
1262	int vx, vy;	1456	int vx, vy;
1263	int x, y, z;	1457	int x, y, z;
1264	int last_name;	1458	int last_name;
1265	mapface face;	1459	mapface face;
1266	int sw4 = (sw + 3) & ~3;
1267	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1268	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1269		1460
1270	memset (darkness, 255, sw4 * sh);
1271	SvPOK_only (darkness_sv);
1272	SvCUR_set (darkness_sv, sw4 * sh);
1273
1274	vx = self->x + (self->w - sw) / 2 - shift_x;	1461	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1275	vy = self->y + (self->h - sh) / 2 - shift_y;	1462	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1276		1463
1277	/*	1464	/*
1278	int vx = self->vx = self->w >= sw	1465	int vx = self->vx = self->w >= sw
1279	? self->x + (self->w - sw) / 2	1466	? self->x + (self->w - sw) / 2
1280	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1467	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1284	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1471	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1285	*/	1472	*/
1286		1473
1287	glColor4ub (255, 255, 255, 255);	1474	glColor4ub (255, 255, 255, 255);
1288		1475
		1476	glEnable (GL_BLEND);
1289	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1477	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1290	glEnable (GL_BLEND);
1291	glEnable (GL_TEXTURE_2D);	1478	glEnable (GL_TEXTURE_2D);
1292	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1479	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1293		1480
1294	glBegin (GL_QUADS);	1481	glBegin (GL_QUADS);
1295		1482
…		…
1304	for (x = 0; x < sw; x++)	1491	for (x = 0; x < sw; x++)
1305	if (row->c0 <= x + vx && x + vx < row->c1)	1492	if (row->c0 <= x + vx && x + vx < row->c1)
1306	{	1493	{
1307	mapcell *cell = row->col + (x + vx - row->c0);	1494	mapcell *cell = row->col + (x + vx - row->c0);
1308		1495
1309	darkness[y * sw4 + x] = cell->darkness < 0
1310	? 255 - FOW_DARKNESS
1311	: 255 - cell->darkness;
1312
1313	face = cell->face [z];	1496	face = cell->face [z];
1314		1497
1315	if (face)	1498	if (face && face < self->texs)
1316	{	1499	{
1317	maptex tex = self->tex [face];	1500	maptex tex = self->tex [face];
1318
1319	int px = (x + 1) * 32 - tex.w;	1501	int px = (x + 1) * 32 - tex.w;
1320	int py = (y + 1) * 32 - tex.h;	1502	int py = (y + 1) * 32 - tex.h;
1321		1503
1322	if (last_name != tex.name)	1504	if (last_name != tex.name)
1323	{	1505	{
1324	glEnd ();	1506	glEnd ();
1325	last_name = tex.name;
1326	glBindTexture (GL_TEXTURE_2D, last_name);	1507	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1327	glBegin (GL_QUADS);	1508	glBegin (GL_QUADS);
1328	}	1509	}
1329		1510
1330	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1511	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1331	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1512	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1332	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1513	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1333	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1514	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1334	}	1515	}
		1516
		1517	if (cell->flags && z == 2)
		1518	{
		1519	if (cell->flags & 1)
		1520	{
		1521	maptex tex = self->tex [1];
		1522	int px = (x + 1) * 32 - tex.w + 2;
		1523	int py = (y + 1) * 32 - tex.h - 6;
		1524
		1525	glEnd ();
		1526	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1527	glBegin (GL_QUADS);
		1528
		1529	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1530	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1531	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1532	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1533	}
		1534	}
1335	}	1535	}
1336	}	1536	}
1337		1537
1338	glEnd ();	1538	glEnd ();
1339		1539
1340	glDisable (GL_TEXTURE_2D);	1540	glDisable (GL_TEXTURE_2D);
1341	glDisable (GL_BLEND);	1541	glDisable (GL_BLEND);
		1542
		1543	// top layer: overlays such as the health bar
		1544	for (y = 0; y < sh; y++)
		1545	if (0 <= y + vy && y + vy < self->rows)
		1546	{
		1547	maprow *row = self->row + (y + vy);
		1548
		1549	for (x = 0; x < sw; x++)
		1550	if (row->c0 <= x + vx && x + vx < row->c1)
		1551	{
		1552	mapcell *cell = row->col + (x + vx - row->c0);
		1553
		1554	int px = x * 32;
		1555	int py = y * 32;
		1556
		1557	if (cell->stat_hp)
		1558	{
		1559	int width = cell->stat_width * 32;
		1560	int thick = sh / 28 + 1 + cell->stat_width;
		1561
		1562	glColor3ub (0, 0, 0);
		1563	glRectf (px + 1, py - thick - 2,
		1564	px + width - 1, py);
		1565
		1566	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1567	glRectf (px + 2,
		1568	py - thick - 1,
		1569	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1570	}
		1571	}
		1572	}
		1573	}
		1574
		1575	void
		1576	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1577	CODE:
		1578	{
		1579	static float color[16][3] = {
		1580	{ 0.00F, 0.00F, 0.00F },
		1581	{ 1.00F, 1.00F, 1.00F },
		1582	{ 0.00F, 0.00F, 0.55F },
		1583	{ 1.00F, 0.00F, 0.00F },
		1584
		1585	{ 1.00F, 0.54F, 0.00F },
		1586	{ 0.11F, 0.56F, 1.00F },
		1587	{ 0.93F, 0.46F, 0.00F },
		1588	{ 0.18F, 0.54F, 0.34F },
		1589
		1590	{ 0.56F, 0.73F, 0.56F },
		1591	{ 0.80F, 0.80F, 0.80F },
		1592	{ 0.55F, 0.41F, 0.13F },
		1593	{ 0.99F, 0.77F, 0.26F },
		1594
		1595	{ 0.74F, 0.65F, 0.41F },
		1596
		1597	{ 0.00F, 1.00F, 1.00F },
		1598	{ 1.00F, 0.00F, 1.00F },
		1599	{ 1.00F, 1.00F, 0.00F },
		1600	};
		1601
		1602	int x, y;
		1603
		1604	glEnable (GL_TEXTURE_2D);
		1605	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1606	glEnable (GL_BLEND);
		1607	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1608	glBegin (GL_QUADS);
		1609
		1610	for (y = 0; y < h; y++)
		1611	for (x = 0; x < w; x++)
		1612	{
		1613	unsigned char m = data [x + y * w];
		1614
		1615	if (m)
		1616	{
		1617	float *c = color [m & 15];
		1618
		1619	float tx1 = m & 0x40 ? 0.5 : 0.;
		1620	float tx2 = tx1 + 0.5;
		1621
		1622	glColor4f (c[0], c[1], c[2], 0.75);
		1623	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1624	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1625	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1626	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1627	}
		1628	}
		1629
		1630	glEnd ();
		1631	glDisable (GL_BLEND);
		1632	glDisable (GL_TEXTURE_2D);
		1633	}
		1634
		1635	void
		1636	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1637	PPCODE:
		1638	{
		1639	int vx, vy;
		1640	int x, y;
		1641	int sw4 = (sw + 3) & ~3;
		1642	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
		1643	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
		1644
		1645	memset (darkness, 255, sw4 * sh);
		1646	SvPOK_only (darkness_sv);
		1647	SvCUR_set (darkness_sv, sw4 * sh);
		1648
		1649	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1650	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1651
		1652	for (y = 0; y < sh; y++)
		1653	if (0 <= y + vy && y + vy < self->rows)
		1654	{
		1655	maprow *row = self->row + (y + vy);
		1656
		1657	for (x = 0; x < sw; x++)
		1658	if (row->c0 <= x + vx && x + vx < row->c1)
		1659	{
		1660	mapcell *cell = row->col + (x + vx - row->c0);
		1661
		1662	darkness[y * sw4 + x] = cell->darkness
		1663	? 255 - (cell->darkness - 1)
		1664	: 255 - FOW_DARKNESS;
		1665	}
		1666	}
1342		1667
1343	EXTEND (SP, 3);	1668	EXTEND (SP, 3);
1344	PUSHs (sv_2mortal (newSViv (sw4)));	1669	PUSHs (sv_2mortal (newSViv (sw4)));
1345	PUSHs (sv_2mortal (newSViv (sh)));	1670	PUSHs (sv_2mortal (newSViv (sh)));
1346	PUSHs (darkness_sv);	1671	PUSHs (darkness_sv);
1347	}	1672	}
1348		1673
1349	SV *	1674	SV *
1350	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1675	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1351	CODE:	1676	CODE:
1352	{	1677	{
1353	int x, y, x1, y1;	1678	int x, y, x1, y1;
1354	SV *data_sv = newSV (w * h * 7 + 5);	1679	SV *data_sv = newSV (w * h * 7 + 5);
1355	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1680	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1417	}	1742	}
1418	OUTPUT:	1743	OUTPUT:
1419	RETVAL	1744	RETVAL
1420		1745
1421	void	1746	void
1422	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1747	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1423	PPCODE:	1748	PPCODE:
1424	{	1749	{
1425	int x, y, z;	1750	int x, y, z;
1426	int w, h;	1751	int w, h;
1427	int x1, y1;	1752	int x1, y1;
…		…
1459		1784
1460	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	1785	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1461	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	1786	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1462	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	1787	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1463		1788
1464	if (cell->darkness <= 0)	1789	if (cell->darkness == 0)
1465	{	1790	{
1466	cell->darkness = -1;	1791	cell->darkness = 0;
1467		1792
1468	for (z = 0; z <= 2; z++)	1793	for (z = 0; z <= 2; z++)
1469	{	1794	{
1470	cell->face[z] = face[z];	1795	cell->face[z] = face[z];
1471		1796
…		…
1476	}	1801	}
1477	}	1802	}
1478	}	1803	}
1479	}	1804	}
1480		1805
1481	MODULE = CFClient PACKAGE = CFClient::MixChunk	1806	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1482		1807
1483	CFClient::MixChunk	1808	CFPlus::MixChunk
1484	new_from_file (SV *class, char *path)	1809	new_from_file (SV *class, char *path)
1485	CODE:	1810	CODE:
1486	RETVAL = Mix_LoadWAV (path);	1811	RETVAL = Mix_LoadWAV (path);
1487	OUTPUT:	1812	OUTPUT:
1488	RETVAL	1813	RETVAL
1489		1814
1490	void	1815	void
1491	DESTROY (CFClient::MixChunk self)	1816	DESTROY (CFPlus::MixChunk self)
1492	CODE:	1817	CODE:
1493	Mix_FreeChunk (self);	1818	Mix_FreeChunk (self);
1494		1819
1495	int	1820	int
1496	volume (CFClient::MixChunk self, int volume = -1)	1821	volume (CFPlus::MixChunk self, int volume = -1)
1497	CODE:	1822	CODE:
1498	RETVAL = Mix_VolumeChunk (self, volume);	1823	RETVAL = Mix_VolumeChunk (self, volume);
1499	OUTPUT:	1824	OUTPUT:
1500	RETVAL	1825	RETVAL
1501		1826
1502	int	1827	int
1503	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1828	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1504	CODE:	1829	CODE:
1505	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1830	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1506	OUTPUT:	1831	OUTPUT:
1507	RETVAL	1832	RETVAL
1508		1833
1509	MODULE = CFClient PACKAGE = CFClient::MixMusic	1834	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1510		1835
1511	int	1836	int
1512	volume (int volume = -1)	1837	volume (int volume = -1)
1513	CODE:	1838	CODE:
1514	RETVAL = Mix_VolumeMusic (volume);	1839	RETVAL = Mix_VolumeMusic (volume);
1515	OUTPUT:	1840	OUTPUT:
1516	RETVAL	1841	RETVAL
1517		1842
1518	CFClient::MixMusic	1843	CFPlus::MixMusic
1519	new_from_file (SV *class, char *path)	1844	new_from_file (SV *class, char *path)
1520	CODE:	1845	CODE:
1521	RETVAL = Mix_LoadMUS (path);	1846	RETVAL = Mix_LoadMUS (path);
1522	OUTPUT:	1847	OUTPUT:
1523	RETVAL	1848	RETVAL
1524		1849
1525	void	1850	void
1526	DESTROY (CFClient::MixMusic self)	1851	DESTROY (CFPlus::MixMusic self)
1527	CODE:	1852	CODE:
1528	Mix_FreeMusic (self);	1853	Mix_FreeMusic (self);
1529		1854
1530	int	1855	int
1531	play (CFClient::MixMusic self, int loops = -1)	1856	play (CFPlus::MixMusic self, int loops = -1)
1532	CODE:	1857	CODE:
1533	RETVAL = Mix_PlayMusic (self, loops);	1858	RETVAL = Mix_PlayMusic (self, loops);
1534	OUTPUT:	1859	OUTPUT:
1535	RETVAL	1860	RETVAL
1536		1861
1537	MODULE = CFClient PACKAGE = CFClient::OpenGL	1862	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1538		1863
1539	BOOT:	1864	BOOT:
1540	{	1865	{
1541	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1866	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1542	static const struct {	1867	static const struct {
1543	const char *name;	1868	const char *name;
1544	IV iv;	1869	IV iv;
1545	} *civ, const_iv[] = {	1870	} *civ, const_iv[] = {
1546	# define const_iv(name) { # name, (IV)name }	1871	# define const_iv(name) { # name, (IV)name }
…		…
1553	const_iv (GL_SCISSOR_TEST),	1878	const_iv (GL_SCISSOR_TEST),
1554	const_iv (GL_DEPTH_TEST),	1879	const_iv (GL_DEPTH_TEST),
1555	const_iv (GL_ALPHA_TEST),	1880	const_iv (GL_ALPHA_TEST),
1556	const_iv (GL_NORMALIZE),	1881	const_iv (GL_NORMALIZE),
1557	const_iv (GL_RESCALE_NORMAL),	1882	const_iv (GL_RESCALE_NORMAL),
		1883	const_iv (GL_FRONT),
		1884	const_iv (GL_BACK),
1558	const_iv (GL_AND),	1885	const_iv (GL_AND),
1559	const_iv (GL_ONE),	1886	const_iv (GL_ONE),
1560	const_iv (GL_ZERO),	1887	const_iv (GL_ZERO),
1561	const_iv (GL_SRC_ALPHA),	1888	const_iv (GL_SRC_ALPHA),
1562	const_iv (GL_SRC_ALPHA_SATURATE),	1889	const_iv (GL_DST_ALPHA),
1563	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1890	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1564	const_iv (GL_ONE_MINUS_DST_ALPHA),	1891	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1892	const_iv (GL_SRC_ALPHA_SATURATE),
1565	const_iv (GL_RGB),	1893	const_iv (GL_RGB),
1566	const_iv (GL_RGBA),	1894	const_iv (GL_RGBA),
		1895	const_iv (GL_RGBA4),
		1896	const_iv (GL_RGBA8),
		1897	const_iv (GL_RGB5_A1),
1567	const_iv (GL_UNSIGNED_BYTE),	1898	const_iv (GL_UNSIGNED_BYTE),
1568	const_iv (GL_UNSIGNED_SHORT),	1899	const_iv (GL_UNSIGNED_SHORT),
1569	const_iv (GL_UNSIGNED_INT),	1900	const_iv (GL_UNSIGNED_INT),
1570	const_iv (GL_ALPHA),	1901	const_iv (GL_ALPHA),
1571	const_iv (GL_INTENSITY),	1902	const_iv (GL_INTENSITY),
…		…
1603	const_iv (GL_SEPARABLE_2D),	1934	const_iv (GL_SEPARABLE_2D),
1604	const_iv (GL_CONVOLUTION_2D),	1935	const_iv (GL_CONVOLUTION_2D),
1605	const_iv (GL_CONVOLUTION_BORDER_MODE),	1936	const_iv (GL_CONVOLUTION_BORDER_MODE),
1606	const_iv (GL_CONSTANT_BORDER),	1937	const_iv (GL_CONSTANT_BORDER),
1607	const_iv (GL_LINES),	1938	const_iv (GL_LINES),
		1939	const_iv (GL_LINE_STRIP),
1608	const_iv (GL_LINE_LOOP),	1940	const_iv (GL_LINE_LOOP),
1609	const_iv (GL_QUADS),	1941	const_iv (GL_QUADS),
1610	const_iv (GL_QUAD_STRIP),	1942	const_iv (GL_QUAD_STRIP),
1611	const_iv (GL_TRIANGLES),	1943	const_iv (GL_TRIANGLES),
1612	const_iv (GL_TRIANGLE_STRIP),	1944	const_iv (GL_TRIANGLE_STRIP),
…		…
1645	OUTPUT:	1977	OUTPUT:
1646	RETVAL	1978	RETVAL
1647		1979
1648	int glGetError ()	1980	int glGetError ()
1649		1981
		1982	void glFinish ()
		1983
1650	void glClear (int mask)	1984	void glClear (int mask)
1651		1985
1652	void glClearColor (float r, float g, float b, float a = 1.0)	1986	void glClearColor (float r, float g, float b, float a = 1.0)
1653	PROTOTYPE: @	1987	PROTOTYPE: @
1654		1988
…		…
1677	void glPushMatrix ()	2011	void glPushMatrix ()
1678		2012
1679	void glPopMatrix ()	2013	void glPopMatrix ()
1680		2014
1681	void glLoadIdentity ()	2015	void glLoadIdentity ()
		2016
		2017	void glDrawBuffer (int buffer)
		2018
		2019	void glReadBuffer (int buffer)
1682		2020
1683	# near_ and far_ are due to microsofts buggy "c" compiler	2021	# near_ and far_ are due to microsofts buggy "c" compiler
1684	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2022	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1685		2023
1686	# near_ and far_ are due to microsofts buggy "c" compiler	2024	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1716	r *= a;	2054	r *= a;
1717	g *= a;	2055	g *= a;
1718	b *= a;	2056	b *= a;
1719	}	2057	}
1720	// microsoft visual "c" rounds instead of truncating...	2058	// microsoft visual "c" rounds instead of truncating...
1721	glColor4ub (MIN ((int)(r * 256.f), 255),	2059	glColor4f (r, g, b, a);
1722	MIN ((int)(g * 256.f), 255),
1723	MIN ((int)(b * 256.f), 255),
1724	MIN ((int)(a * 256.f), 255));
1725		2060
1726	void glInterleavedArrays (int format, int stride, char *data)	2061	void glInterleavedArrays (int format, int stride, char *data)
1727		2062
1728	void glDrawElements (int mode, int count, int type, char *indices)	2063	void glDrawElements (int mode, int count, int type, char *indices)
1729		2064
…		…
1806		2141
1807	void glEndList ()	2142	void glEndList ()
1808		2143
1809	void glCallList (int list)	2144	void glCallList (int list)
1810		2145
1811

Diff Legend

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