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.110 by root, Sat Jun 10 02:22:33 2006 UTC vs.
Revision 1.166 by root, Fri Dec 8 15:07:08 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>
		6	# include <wininet.h>
5	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
		8	# pragma warning(disable:4761)
6	#endif	9	#endif
7		10
8	#include "EXTERN.h"	11	#include "EXTERN.h"
9	#include "perl.h"	12	#include "perl.h"
10	#include "XSUB.h"	13	#include "XSUB.h"
11		14
		15	#ifdef _WIN32
		16	# undef pipe
		17	#endif
		18
12	#include <math.h>	19	#include <math.h>
13	#include <string.h>	20	#include <string.h>
14	#include <stdio.h>	21	#include <stdio.h>
		22	#include <stdlib.h>
15		23
16	#include <SDL.h>	24	#include <SDL.h>
17	#include <SDL_endian.h>	25	#include <SDL_endian.h>
18	#include <SDL_image.h>	26	#include <SDL_image.h>
19	#include <SDL_mixer.h>	27	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	28	#include <SDL_opengl.h>
21		29
		30	#define PANGO_ENABLE_BACKEND
		31	#define G_DISABLE_CAST_CHECKS
		32
22	#include <glib/gmacros.h>	33	#include <glib/gmacros.h>
23		34
24	#include <pango/pango.h>	35	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		36
29	#ifndef _WIN32	37	#ifndef _WIN32
30	# include <sys/types.h>	38	# include <sys/types.h>
31	# include <sys/socket.h>	39	# include <sys/socket.h>
32	# include <netinet/in.h>	40	# include <netinet/in.h>
33	# include <netinet/tcp.h>	41	# include <netinet/tcp.h>
34	# include <inttypes.h>	42	# include <inttypes.h>
35	#else
36	typedef unsigned char uint8_t;
37	typedef unsigned short uint16_t;
38	typedef unsigned int uint32_t;
39	typedef signed char int8_t;
40	typedef signed short int16_t;
41	typedef signed int int32_t;
42	#endif	43	#endif
43		44
44	#include "glext.h"	45	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
45		46
46	#define FOW_DARKNESS 32	47	#define FOW_DARKNESS 32
47		48
48	#define MAP_EXTEND_X 32	49	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	50	#define MAP_EXTEND_Y 512
50		51
51	#define MIN_FONT_HEIGHT 10	52	#define MIN_FONT_HEIGHT 10
		53
		54	#if 0
		55	# define PARACHUTE SDL_INIT_NOPARACHUTE
		56	#else
		57	# define PARACHUTE 0
		58	#endif
52		59
53	static struct	60	static struct
54	{	61	{
55	#define GL_FUNC(ptr,name) ptr name;	62	#define GL_FUNC(ptr,name) ptr name;
56	#include "glfunc.h"	63	#include "glfunc.h"
…		…
65	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	72	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	else	73	else
67	glBlendFunc (sa, da);	74	glBlendFunc (sa, da);
68	}	75	}
69		76
		77	#include "texcache.c"
		78
		79	#include "pango-font.c"
		80	#include "pango-fontmap.c"
		81	#include "pango-render.c"
		82
70	typedef Mix_Chunk *CFClient__MixChunk;	83	typedef Mix_Chunk *CFPlus__MixChunk;
71	typedef Mix_Music *CFClient__MixMusic;	84	typedef Mix_Music *CFPlus__MixMusic;
72		85
73	typedef PangoFontDescription *CFClient__Font;	86	typedef PangoFontDescription *CFPlus__Font;
		87
		88	static int
		89	shape_attr_p (PangoLayoutRun *run)
		90	{
		91	GSList *attrs = run->item->analysis.extra_attrs;
		92
		93	while (attrs)
		94	{
		95	PangoAttribute *attr = attrs->data;
		96
		97	if (attr->klass->type == PANGO_ATTR_SHAPE)
		98	return 1;
		99
		100	attrs = attrs->next;
		101	}
		102
		103	return 0;
		104	}
74		105
75	typedef struct cf_layout {	106	typedef struct cf_layout {
76	PangoLayout *pl; // either derived from a cairo or ft2 context	107	PangoLayout *pl;
77	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78	float r, g, b, a; // default color for rgba mode	108	float r, g, b, a; // default color for rgba mode
79	int base_height;	109	int base_height;
80	CFClient__Font font;	110	CFPlus__Font font;
81	} *CFClient__Layout;	111	} *CFPlus__Layout;
82		112
83	static CFClient__Font default_font;	113	static CFPlus__Font default_font;
84	static PangoContext *ft2_context, *cairo_context;	114	static PangoContext *opengl_context;
85	static PangoFontMap *ft2_fontmap, *cairo_fontmap;	115	static PangoFontMap *opengl_fontmap;
86		116
87	static void	117	static void
88	substitute_func (FcPattern *pattern, gpointer data)	118	substitute_func (FcPattern *pattern, gpointer data)
89	{	119	{
90	FcPatternAddBool (pattern, FC_HINTING, 1);	120	FcPatternAddBool (pattern, FC_HINTING, 1);
91	#ifdef FC_HINT_STYLE	121	#ifdef FC_HINT_STYLE
92	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	122	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
93	#endif	123	#endif
94	#ifdef _WIN32
95	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
96	#else
97	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	124	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
98	#endif
99	}	125	}
100		126
101	static void	127	static void
102	layout_update_font (CFClient__Layout self)	128	layout_update_font (CFPlus__Layout self)
103	{	129	{
104	/* use a random scale factor to account for unknown descenders, 0.8 works	130	/* use a random scale factor to account for unknown descenders, 0.8 works
105	* reasonably well with bitstream vera	131	* reasonably well with bitstream vera
106	*/	132	*/
107	PangoFontDescription *font = self->font ? self->font : default_font;	133	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
111		137
112	pango_layout_set_font_description (self->pl, font);	138	pango_layout_set_font_description (self->pl, font);
113	}	139	}
114		140
115	static void	141	static void
116	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	142	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
117	{	143	{
		144	PangoRectangle rect;
		145
		146	// get_pixel_* wrongly rounds down
118	pango_layout_get_pixel_size (self->pl, w, h);	147	pango_layout_get_extents (self->pl, 0, &rect);
119		148
120	if (!*w) *w = 1;	149	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
121	if (!*h) *h = 1;	150	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
122		151
123	*w = (*w + 3) & ~3;	152	if (!rect.width) rect.width = 1;
		153	if (!rect.height) rect.height = 1;
		154
		155	*w = rect.width;
		156	*h = rect.height;
124	}	157	}
125		158
126	typedef uint16_t mapface;	159	typedef uint16_t mapface;
127		160
128	typedef struct {	161	typedef struct {
…		…
131	float s, t;	164	float s, t;
132	uint8_t r, g, b, a;	165	uint8_t r, g, b, a;
133	} maptex;	166	} maptex;
134		167
135	typedef struct {	168	typedef struct {
136	int16_t darkness;	169	uint32_t player;
137	mapface face[3];	170	mapface face[3];
		171	uint16_t darkness;
		172	uint8_t stat_width, stat_hp, flags;
138	} mapcell;	173	} mapcell;
139		174
140	typedef struct {	175	typedef struct {
141	int32_t c0, c1;	176	int32_t c0, c1;
142	mapcell *col;	177	mapcell *col;
…		…
151	int texs;	186	int texs;
152	maptex *tex;	187	maptex *tex;
153		188
154	int32_t rows;	189	int32_t rows;
155	maprow *row;	190	maprow *row;
156	} *CFClient__Map;	191	} *CFPlus__Map;
157		192
158	static char *	193	static char *
159	prepend (char *ptr, int sze, int inc)	194	prepend (char *ptr, int sze, int inc)
160	{	195	{
161	char *p;	196	char *p;
…		…
179		214
180	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	215	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
181	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	216	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
182		217
183	static maprow *	218	static maprow *
184	map_get_row (CFClient__Map self, int y)	219	map_get_row (CFPlus__Map self, int y)
185	{	220	{
186	if (0 > y)	221	if (0 > y)
187	{	222	{
188	int extend = - y + MAP_EXTEND_Y;	223	int extend = - y + MAP_EXTEND_Y;
189	Prepend (maprow, self->row, self->rows, extend);	224	Prepend (maprow, self->row, self->rows, extend);
…		…
227		262
228	return row->col + (x - row->c0);	263	return row->col + (x - row->c0);
229	}	264	}
230		265
231	static mapcell *	266	static mapcell *
232	map_get_cell (CFClient__Map self, int x, int y)	267	map_get_cell (CFPlus__Map self, int x, int y)
233	{	268	{
234	return row_get_cell (map_get_row (self, y), x);	269	return row_get_cell (map_get_row (self, y), x);
235	}	270	}
236		271
237	static void	272	static void
238	map_clear (CFClient__Map self)	273	map_clear (CFPlus__Map self)
239	{	274	{
240	int r;	275	int r;
241		276
242	for (r = 0; r < self->rows; r++)	277	for (r = 0; r < self->rows; r++)
243	Safefree (self->row[r].col);	278	Safefree (self->row[r].col);
…		…
251	self->row = 0;	286	self->row = 0;
252	self->rows = 0;	287	self->rows = 0;
253	}	288	}
254		289
255	static void	290	static void
256	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	291	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
257	{	292	{
258	int x, y;	293	int x, y;
259	maprow *row;	294	maprow *row;
		295	mapcell *cell;
260		296
261	for (y = y0; y < y0 + h; y++)	297	for (y = y0; y < y0 + h; y++)
262	if (y >= 0)	298	if (y >= 0)
263	{	299	{
264	if (y >= self->rows)	300	if (y >= self->rows)
…		…
270	if (x >= row->c0)	306	if (x >= row->c0)
271	{	307	{
272	if (x >= row->c1)	308	if (x >= row->c1)
273	break;	309	break;
274		310
275	row->col[x - row->c0].darkness = -1;	311	cell = row->col + x - row->c0;
		312
		313	cell->darkness = 0;
		314	cell->stat_hp = 0;
		315	cell->flags = 0;
		316	cell->player = 0;
276	}	317	}
277	}	318	}
278	}	319	}
279		320
280	static void	321	static void
…		…
301	ev.data2 = 0;	342	ev.data2 = 0;
302		343
303	SDL_PushEvent ((SDL_Event *)&ev);	344	SDL_PushEvent ((SDL_Event *)&ev);
304	}	345	}
305		346
		347	static unsigned int
		348	minpot (unsigned int n)
		349	{
		350	if (!n)
		351	return 0;
		352
		353	--n;
		354
		355	n |= n >> 1;
		356	n |= n >> 2;
		357	n |= n >> 4;
		358	n |= n >> 8;
		359	n |= n >> 16;
		360
		361	return n + 1;
		362	}
		363
306	MODULE = CFClient PACKAGE = CFClient	364	MODULE = CFPlus PACKAGE = CFPlus
307		365
308	PROTOTYPES: ENABLE	366	PROTOTYPES: ENABLE
309		367
310	BOOT:	368	BOOT:
311	{	369	{
312	HV *stash = gv_stashpv ("CFClient", 1);	370	HV *stash = gv_stashpv ("CFPlus", 1);
313	static const struct {	371	static const struct {
314	const char *name;	372	const char *name;
315	IV iv;	373	IV iv;
316	} *civ, const_iv[] = {	374	} *civ, const_iv[] = {
317	# define const_iv(name) { # name, (IV)name }	375	# define const_iv(name) { # name, (IV)name }
…		…
418		476
419	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	477	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
420	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	478	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
421	}	479	}
422		480
		481	int
		482	in_destruct ()
		483	CODE:
		484	RETVAL = PL_main_cv == Nullcv;
		485	OUTPUT:
		486	RETVAL
		487
		488	NV floor (NV x)
		489
		490	NV ceil (NV x)
		491
423	void	492	void
424	pango_init ()	493	pango_init ()
425	CODE:	494	CODE:
426	// delayed, so it can pick up new fonts added by AddFontResourceEx
427	{	495	{
428	{
429	ft2_fontmap = pango_ft2_font_map_new ();	496	opengl_fontmap = pango_opengl_font_map_new ();
430	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	497	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
431	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	498	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
432	}
433	{
434	cairo_font_options_t *fopt = cairo_font_options_create ();
435	cairo_fontmap = pango_cairo_font_map_get_default ();
436	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
437	#ifdef _WIN32
438	// cairo looks like shit eaten twice on windows
439	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
440	#else
441	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
442	#endif
443	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
444	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
445	pango_cairo_context_set_font_options (cairo_context, fopt);
446	cairo_font_options_destroy (fopt);
447	}
448	}	499	}
449		500
450	int	501	int
451	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	502	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
452		503
453	void	504	void
454	SDL_Quit ()	505	SDL_Quit ()
455		506
456	void	507	void
…		…
463	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	514	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
464	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	515	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
465	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	516	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
466		517
467	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	518	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
468	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	519	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
469		520
470	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
471	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	522	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
472	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	523	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
473	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	524	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
474		525
475	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	526	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		527	#if SDL_VERSION_ATLEAST(1,2,10)
		528	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		529	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		530	#endif
476		531
477	SDL_EnableUNICODE (1);	532	SDL_EnableUNICODE (1);
478	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	533	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
479		534
480	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	535	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
567	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	622	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
568	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	623	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
569	break;	624	break;
570	}	625	}
571		626
572	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	627	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
573	}	628	}
574	}	629	}
575		630
576	int	631	int
577	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	632	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
591	#ifndef _WIN32	646	#ifndef _WIN32
592	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	647	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
593	#endif	648	#endif
594		649
595	void	650	void
		651	win32_proxy_info ()
		652	PPCODE:
		653	{
		654	#ifdef _WIN32
		655	char buffer[2048];
		656	DWORD buflen;
		657
		658	EXTEND (SP, 3);
		659
		660	buflen = sizeof (buffer);
		661	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		662	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		663	{
		664	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		665
		666	buflen = sizeof (buffer);
		667	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		668	{
		669	PUSHs (newSVpv (buffer, 0));
		670
		671	buflen = sizeof (buffer);
		672	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		673	PUSHs (newSVpv (buffer, 0));
		674	}
		675	}
		676	#endif
		677	}
		678
		679	void
596	add_font (char *file)	680	add_font (char *file)
597	CODE:	681	CODE:
598	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	682	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
599	#ifdef _WIN32
600	// cairo... sigh... requires win2000
601	AddFontResourceEx (file, FR_PRIVATE, 0);
602	#endif
603		683
604	void	684	void
605	load_image_inline (SV *image_)	685	load_image_inline (SV *image_)
606	ALIAS:	686	ALIAS:
607	load_image_file = 1	687	load_image_file = 1
…		…
649		729
650	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	730	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
651		731
652	assert (surface2->pitch == surface2->w * 4);	732	assert (surface2->pitch == surface2->w * 4);
653		733
		734	SDL_LockSurface (surface2);
654	EXTEND (SP, 5);	735	EXTEND (SP, 6);
655	PUSHs (sv_2mortal (newSViv (surface2->w)));	736	PUSHs (sv_2mortal (newSViv (surface2->w)));
656	PUSHs (sv_2mortal (newSViv (surface2->h)));	737	PUSHs (sv_2mortal (newSViv (surface2->h)));
657	SDL_LockSurface (surface2);
658	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	738	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
659	SDL_UnlockSurface (surface2);
660	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	739	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
661	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	740	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
662	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	741	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		742	SDL_UnlockSurface (surface2);
663		743
664	SDL_FreeSurface (surface);	744	SDL_FreeSurface (surface);
665	SDL_FreeSurface (surface2);	745	SDL_FreeSurface (surface2);
666	}	746	}
667		747
…		…
703	CODE:	783	CODE:
704	fprintf (stderr, "FATAL: %s\n", message);	784	fprintf (stderr, "FATAL: %s\n", message);
705	#ifdef _WIN32	785	#ifdef _WIN32
706	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	786	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
707	#endif	787	#endif
708	exit (1);	788	_exit (1);
709		789
		790	void
		791	_exit (int retval = 0)
		792	CODE:
		793	#ifdef WIN32
		794	ExitThread (retval); // unclean, please beam me up
		795	#else
		796	_exit (retval);
		797	#endif
		798
710	MODULE = CFClient PACKAGE = CFClient::Font	799	MODULE = CFPlus PACKAGE = CFPlus::Font
711		800
712	CFClient::Font	801	CFPlus::Font
713	new_from_file (SV *class, char *path, int id = 0)	802	new_from_file (SV *class, char *path, int id = 0)
714	CODE:	803	CODE:
715	{	804	{
716	int count;	805	int count;
717	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	806	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
720	}	809	}
721	OUTPUT:	810	OUTPUT:
722	RETVAL	811	RETVAL
723		812
724	void	813	void
725	DESTROY (CFClient::Font self)	814	DESTROY (CFPlus::Font self)
726	CODE:	815	CODE:
727	pango_font_description_free (self);	816	pango_font_description_free (self);
728		817
729	void	818	void
730	make_default (CFClient::Font self)	819	make_default (CFPlus::Font self)
731	CODE:	820	CODE:
732	default_font = self;	821	default_font = self;
733		822
734	MODULE = CFClient PACKAGE = CFClient::Layout	823	MODULE = CFPlus PACKAGE = CFPlus::Layout
735		824
736	CFClient::Layout	825	void
737	new (SV *class, int rgba = 0)	826	reset_glyph_cache ()
		827	CODE:
		828	tc_clear ();
		829
		830	CFPlus::Layout
		831	new (SV *class)
738	CODE:	832	CODE:
739	New (0, RETVAL, 1, struct cf_layout);	833	New (0, RETVAL, 1, struct cf_layout);
740		834
741	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	835	RETVAL->pl = pango_layout_new (opengl_context);
742	RETVAL->rgba = rgba;
743	RETVAL->r = 1.;	836	RETVAL->r = 1.;
744	RETVAL->g = 1.;	837	RETVAL->g = 1.;
745	RETVAL->b = 1.;	838	RETVAL->b = 1.;
746	RETVAL->a = 1.;	839	RETVAL->a = 1.;
747	RETVAL->base_height = MIN_FONT_HEIGHT;	840	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
751	layout_update_font (RETVAL);	844	layout_update_font (RETVAL);
752	OUTPUT:	845	OUTPUT:
753	RETVAL	846	RETVAL
754		847
755	void	848	void
756	DESTROY (CFClient::Layout self)	849	DESTROY (CFPlus::Layout self)
757	CODE:	850	CODE:
758	g_object_unref (self->pl);	851	g_object_unref (self->pl);
759	Safefree (self);	852	Safefree (self);
760		853
761	int
762	is_rgba (CFClient::Layout self)
763	CODE:
764	RETVAL = self->rgba;
765	OUTPUT:
766	RETVAL
767
768	void	854	void
769	set_text (CFClient::Layout self, SV *text_)	855	set_text (CFPlus::Layout self, SV *text_)
770	CODE:	856	CODE:
771	{	857	{
772	STRLEN textlen;	858	STRLEN textlen;
773	char *text = SvPVutf8 (text_, textlen);	859	char *text = SvPVutf8 (text_, textlen);
774		860
775	pango_layout_set_text (self->pl, text, textlen);	861	pango_layout_set_text (self->pl, text, textlen);
776	}	862	}
777		863
778	void	864	void
779	set_markup (CFClient::Layout self, SV *text_)	865	set_markup (CFPlus::Layout self, SV *text_)
780	CODE:	866	CODE:
781	{	867	{
782	STRLEN textlen;	868	STRLEN textlen;
783	char *text = SvPVutf8 (text_, textlen);	869	char *text = SvPVutf8 (text_, textlen);
784		870
785	pango_layout_set_markup (self->pl, text, textlen);	871	pango_layout_set_markup (self->pl, text, textlen);
786	}	872	}
787		873
		874	void
		875	set_shapes (CFPlus::Layout self, ...)
		876	CODE:
		877	{
		878	PangoAttrList *attrs = 0;
		879	const char *text = pango_layout_get_text (self->pl);
		880	const char *pos = text;
		881	int arg = 4;
		882
		883	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		884	{
		885	PangoRectangle inkrect, rect;
		886	PangoAttribute *attr;
		887
		888	int x = SvIV (ST (arg - 3));
		889	int y = SvIV (ST (arg - 2));
		890	int w = SvIV (ST (arg - 1));
		891	int h = SvIV (ST (arg ));
		892
		893	inkrect.x = 0;
		894	inkrect.y = 0;
		895	inkrect.width = 0;
		896	inkrect.height = 0;
		897
		898	rect.x = x * PANGO_SCALE;
		899	rect.y = y * PANGO_SCALE;
		900	rect.width = w * PANGO_SCALE;
		901	rect.height = h * PANGO_SCALE;
		902
		903	if (!attrs)
		904	attrs = pango_layout_get_attributes (self->pl);
		905
		906	attr = pango_attr_shape_new (&inkrect, &rect);
		907	attr->start_index = pos - text;
		908	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		909	pango_attr_list_insert (attrs, attr);
		910
		911	arg += 4;
		912	pos += sizeof (OBJ_STR) - 1;
		913	}
		914
		915	if (attrs)
		916	pango_layout_set_attributes (self->pl, attrs);
		917	}
		918
		919	void
		920	get_shapes (CFPlus::Layout self)
		921	PPCODE:
		922	{
		923	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		924
		925	do
		926	{
		927	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		928
		929	if (run && shape_attr_p (run))
		930	{
		931	PangoRectangle extents;
		932	pango_layout_iter_get_run_extents (iter, 0, &extents);
		933
		934	EXTEND (SP, 2);
		935	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		936	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		937	}
		938	}
		939	while (pango_layout_iter_next_run (iter));
		940
		941	pango_layout_iter_free (iter);
		942	}
		943
		944	int
		945	has_wrapped (CFPlus::Layout self)
		946	CODE:
		947	{
		948	int lines = 1;
		949	const char *text = pango_layout_get_text (self->pl);
		950
		951	while (*text)
		952	lines += *text++ == '\n';
		953
		954	RETVAL = lines < pango_layout_get_line_count (self->pl);
		955	}
		956	OUTPUT:
		957	RETVAL
		958
788	SV *	959	SV *
789	get_text (CFClient::Layout self)	960	get_text (CFPlus::Layout self)
790	CODE:	961	CODE:
791	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	962	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
792	sv_utf8_decode (RETVAL);	963	sv_utf8_decode (RETVAL);
793	OUTPUT:	964	OUTPUT:
794	RETVAL	965	RETVAL
795		966
796	void	967	void
797	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	968	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
798	CODE:	969	CODE:
799	self->r = r;	970	self->r = r;
800	self->g = g;	971	self->g = g;
801	self->b = b;	972	self->b = b;
802	self->a = a;	973	self->a = a;
803		974
804	void	975	void
805	set_font (CFClient::Layout self, CFClient::Font font = 0)	976	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
806	CODE:	977	CODE:
807	if (self->font != font)	978	if (self->font != font)
808	{	979	{
809	self->font = font;	980	self->font = font;
810	layout_update_font (self);	981	layout_update_font (self);
811	}	982	}
812		983
813	void	984	void
814	set_height (CFClient::Layout self, int base_height)	985	set_height (CFPlus::Layout self, int base_height)
815	CODE:	986	CODE:
816	if (self->base_height != base_height)	987	if (self->base_height != base_height)
817	{	988	{
818	self->base_height = base_height;	989	self->base_height = base_height;
819	layout_update_font (self);	990	layout_update_font (self);
820	}	991	}
821		992
822	void	993	void
823	set_width (CFClient::Layout self, int max_width = -1)	994	set_width (CFPlus::Layout self, int max_width = -1)
824	CODE:	995	CODE:
825	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	996	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
826		997
827	void	998	void
828	set_indent (CFClient::Layout self, int indent)	999	set_indent (CFPlus::Layout self, int indent)
829	CODE:	1000	CODE:
830	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1001	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
831		1002
832	void	1003	void
833	set_spacing (CFClient::Layout self, int spacing)	1004	set_spacing (CFPlus::Layout self, int spacing)
834	CODE:	1005	CODE:
835	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1006	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
836		1007
837	void	1008	void
838	set_ellipsise (CFClient::Layout self, int ellipsise)	1009	set_ellipsise (CFPlus::Layout self, int ellipsise)
839	CODE:	1010	CODE:
840	pango_layout_set_ellipsize (self->pl,	1011	pango_layout_set_ellipsize (self->pl,
841	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1012	ellipsise == 1 ? PANGO_ELLIPSIZE_START
842	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1013	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
843	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1014	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
844	: PANGO_ELLIPSIZE_NONE	1015	: PANGO_ELLIPSIZE_NONE
845	);	1016	);
846		1017
847	void	1018	void
848	set_single_paragraph_mode (CFClient::Layout self, int spm)	1019	set_single_paragraph_mode (CFPlus::Layout self, int spm)
849	CODE:	1020	CODE:
850	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1021	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
851		1022
852	void	1023	void
853	size (CFClient::Layout self)	1024	size (CFPlus::Layout self)
854	PPCODE:	1025	PPCODE:
855	{	1026	{
856	int w, h;	1027	int w, h;
857		1028
858	layout_get_pixel_size (self, &w, &h);	1029	layout_get_pixel_size (self, &w, &h);
…		…
861	PUSHs (sv_2mortal (newSViv (w)));	1032	PUSHs (sv_2mortal (newSViv (w)));
862	PUSHs (sv_2mortal (newSViv (h)));	1033	PUSHs (sv_2mortal (newSViv (h)));
863	}	1034	}
864		1035
865	int	1036	int
		1037	descent (CFPlus::Layout self)
		1038	CODE:
		1039	{
		1040	PangoRectangle rect;
		1041	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1042	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1043	RETVAL = PANGO_DESCENT (rect);
		1044	}
		1045	OUTPUT:
		1046	RETVAL
		1047
		1048	int
866	xy_to_index (CFClient::Layout self, int x, int y)	1049	xy_to_index (CFPlus::Layout self, int x, int y)
867	CODE:	1050	CODE:
868	{	1051	{
869	int index, trailing;	1052	int index, trailing;
870	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1053	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
871	RETVAL = index;	1054	RETVAL = index + trailing;
872	}	1055	}
873	OUTPUT:	1056	OUTPUT:
874	RETVAL	1057	RETVAL
875		1058
876	void	1059	void
877	cursor_pos (CFClient::Layout self, int index)	1060	cursor_pos (CFPlus::Layout self, int index)
878	PPCODE:	1061	PPCODE:
879	{	1062	{
880	PangoRectangle strong_pos;	1063	PangoRectangle strong_pos;
881	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1064	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
882		1065
…		…
885	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1068	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
886	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1069	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
887	}	1070	}
888		1071
889	void	1072	void
890	render (CFClient::Layout self)	1073	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
891	PPCODE:	1074	PPCODE:
892	{	1075	{
893	SV *retval;	1076	int line, x;
894	int w, h;
895		1077
896	layout_get_pixel_size (self, &w, &h);	1078	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1079	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
897		1080
898	if (self->rgba)
899	{
900	cairo_surface_t *surface;
901	cairo_t *cairo;
902
903	retval = newSV (w * h * 4);
904	SvPOK_only (retval);
905	SvCUR_set (retval, w * h * 4);
906
907	memset (SvPVX (retval), 0, w * h * 4);
908
909	surface = cairo_image_surface_create_for_data (
910	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
911	cairo = cairo_create (surface);
912	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
913
914	pango_cairo_show_layout (cairo, self->pl);
915
916	cairo_destroy (cairo);
917	cairo_surface_destroy (surface);
918
919	// what a mess, and its premultiplied, too :(
920	{
921	uint32_t *p = (uint32_t *)SvPVX (retval);
922	uint32_t *e = p + w * h;
923
924	while (p < e)
925	{
926	uint32_t rgba = *p;
927	rgba = (rgba >> 24) | (rgba << 8);
928	#if 0
929	#ifdef _WIN32
930	{//D
931	uint8_t r = rgba >> 24;
932	uint8_t g = rgba >> 16;
933	uint8_t b = rgba >> 8;
934	uint8_t a = rgba >> 0;
935
936	rgba = (rgba & 0xffffff00) | a;
937	}
938	#endif
939	#endif
940	rgba = SDL_SwapBE32 (rgba);
941	*p++ = rgba;
942	}
943	}
944
945	EXTEND (SP, 5);	1081	EXTEND (SP, 2);
946	PUSHs (sv_2mortal (newSViv (w)));	1082	PUSHs (sv_2mortal (newSViv (line - 1)));
		1083	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
		1084	}
		1085
		1086	void
		1087	line_x_to_index (CFPlus::Layout self, int line, int x)
		1088	PPCODE:
		1089	{
		1090	PangoLayoutLine *lp;
		1091	int index, trailing;
		1092
		1093	if (line < 0)
		1094	XSRETURN_EMPTY;
		1095
		1096	if (!(lp = pango_layout_get_line (self->pl, line)))
		1097	XSRETURN_EMPTY; /* do better */
		1098
		1099	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
		1100
		1101	EXTEND (SP, 2);
		1102	if (GIMME_V == G_SCALAR)
947	PUSHs (sv_2mortal (newSViv (h)));	1103	PUSHs (sv_2mortal (newSViv (index + trailing)));
948	PUSHs (sv_2mortal (retval));
949	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
950	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
951	}
952	else	1104	else
953	{	1105	{
954	FT_Bitmap bitmap;
955
956	retval = newSV (w * h);
957	SvPOK_only (retval);
958	SvCUR_set (retval, w * h);
959
960	bitmap.rows = h;
961	bitmap.width = w;
962	bitmap.pitch = w;
963	bitmap.buffer = (unsigned char*)SvPVX (retval);
964	bitmap.num_grays = 256;
965	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
966
967	memset (bitmap.buffer, 0, w * h);
968
969	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
970
971	EXTEND (SP, 5);
972	PUSHs (sv_2mortal (newSViv (w)));	1106	PUSHs (sv_2mortal (newSViv (index)));
973	PUSHs (sv_2mortal (newSViv (h)));	1107	PUSHs (sv_2mortal (newSViv (trailing)));
974	PUSHs (sv_2mortal (retval));
975	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
976	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
977	}	1108	}
978	}	1109	}
979		1110
		1111	void
		1112	render (CFPlus::Layout self, float x, float y, int flags = 0)
		1113	PPCODE:
		1114	pango_opengl_render_layout_subpixel (
		1115	self->pl,
		1116	x * PANGO_SCALE, y * PANGO_SCALE,
		1117	self->r, self->g, self->b, self->a,
		1118	flags
		1119	);
		1120
980	MODULE = CFClient PACKAGE = CFClient::Texture	1121	MODULE = CFPlus PACKAGE = CFPlus::Texture
981		1122
982	void	1123	void
		1124	pad2pot (SV *data_, SV *w_, SV *h_)
		1125	CODE:
		1126	{
		1127	int ow = SvIV (w_);
		1128	int oh = SvIV (h_);
		1129
		1130	if (ow && oh)
		1131	{
		1132	int nw = minpot (ow);
		1133	int nh = minpot (oh);
		1134
		1135	if (nw != ow || nh != oh)
		1136	{
		1137	if (SvOK (data_))
		1138	{
		1139	STRLEN datalen;
		1140	char *data = SvPVbyte (data_, datalen);
		1141	int bpp = datalen / (ow * oh);
		1142	SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
		1143
		1144	SvPOK_only (result_);
		1145	SvCUR_set (result_, nw * nh * bpp);
		1146
		1147	memset (SvPVX (result_), 0, nw * nh * bpp);
		1148	while (oh--)
		1149	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1150
		1151	sv_setsv (data_, result_);
		1152	}
		1153
		1154	sv_setiv (w_, nw);
		1155	sv_setiv (h_, nh);
		1156	}
		1157	}
		1158	}
		1159
		1160	void
983	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1161	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
984	PROTOTYPE: $$$;$$	1162	PROTOTYPE: $$$;$$
985	ALIAS:	1163	ALIAS:
986	draw_quad_alpha = 1	1164	draw_quad_alpha = 1
987	draw_quad_alpha_premultiplied = 2	1165	draw_quad_alpha_premultiplied = 2
988	CODE:	1166	CODE:
…		…
1026	glDisable (GL_ALPHA_TEST);	1204	glDisable (GL_ALPHA_TEST);
1027	glDisable (GL_BLEND);	1205	glDisable (GL_BLEND);
1028	}	1206	}
1029	}	1207	}
1030		1208
1031	MODULE = CFClient PACKAGE = CFClient::Map	1209	MODULE = CFPlus PACKAGE = CFPlus::Map
1032		1210
1033	CFClient::Map	1211	CFPlus::Map
1034	new (SV *class, int map_width, int map_height)	1212	new (SV *class)
1035	CODE:	1213	CODE:
1036	New (0, RETVAL, 1, struct map);	1214	New (0, RETVAL, 1, struct map);
1037	RETVAL->x = 0;	1215	RETVAL->x = 0;
1038	RETVAL->y = 0;	1216	RETVAL->y = 0;
1039	RETVAL->w = map_width;	1217	RETVAL->w = 0;
1040	RETVAL->h = map_height;	1218	RETVAL->h = 0;
1041	RETVAL->ox = 0;	1219	RETVAL->ox = 0;
1042	RETVAL->oy = 0;	1220	RETVAL->oy = 0;
1043	RETVAL->faces = 8192;	1221	RETVAL->faces = 8192;
1044	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1222	Newz (0, RETVAL->face, RETVAL->faces, mapface);
1045	RETVAL->texs = 8192;	1223	RETVAL->texs = 8192;
…		…
1048	RETVAL->row = 0;	1226	RETVAL->row = 0;
1049	OUTPUT:	1227	OUTPUT:
1050	RETVAL	1228	RETVAL
1051		1229
1052	void	1230	void
1053	DESTROY (CFClient::Map self)	1231	DESTROY (CFPlus::Map self)
1054	CODE:	1232	CODE:
1055	{	1233	{
1056	map_clear (self);	1234	map_clear (self);
1057	Safefree (self->face);	1235	Safefree (self->face);
		1236	Safefree (self->tex);
1058	Safefree (self);	1237	Safefree (self);
1059	}	1238	}
1060		1239
1061	void	1240	void
		1241	resize (CFPlus::Map self, int map_width, int map_height)
		1242	CODE:
		1243	self->w = map_width;
		1244	self->h = map_height;
		1245
		1246	void
1062	clear (CFClient::Map self)	1247	clear (CFPlus::Map self)
1063	CODE:	1248	CODE:
1064	map_clear (self);	1249	map_clear (self);
1065		1250
1066	void	1251	void
1067	set_face (CFClient::Map self, int face, int texid)	1252	set_face (CFPlus::Map self, int face, int texid)
1068	CODE:	1253	CODE:
1069	{	1254	{
1070	while (self->faces <= face)	1255	while (self->faces <= face)
1071	{	1256	{
1072	Append (mapface, self->face, self->faces, self->faces);	1257	Append (mapface, self->face, self->faces, self->faces);
…		…
1075		1260
1076	self->face [face] = texid;	1261	self->face [face] = texid;
1077	}	1262	}
1078		1263
1079	void	1264	void
1080	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)	1265	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)
1081	CODE:	1266	CODE:
1082	{	1267	{
1083	while (self->texs <= texid)	1268	while (self->texs <= texid)
1084	{	1269	{
1085	Append (maptex, self->tex, self->texs, self->texs);	1270	Append (maptex, self->tex, self->texs, self->texs);
…		…
1109	// from transparent color bleeding and ugly wrapping effects.	1294	// from transparent color bleeding and ugly wrapping effects.
1110	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1295	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1111	}	1296	}
1112		1297
1113	int	1298	int
1114	ox (CFClient::Map self)	1299	ox (CFPlus::Map self)
1115	ALIAS:	1300	ALIAS:
1116	oy = 1	1301	oy = 1
1117	x = 2	1302	x = 2
1118	y = 3	1303	y = 3
1119	w = 4	1304	w = 4
…		…
1130	}	1315	}
1131	OUTPUT:	1316	OUTPUT:
1132	RETVAL	1317	RETVAL
1133		1318
1134	void	1319	void
1135	scroll (CFClient::Map self, int dx, int dy)	1320	scroll (CFPlus::Map self, int dx, int dy)
1136	CODE:	1321	CODE:
1137	{	1322	{
1138	if (dx > 0)	1323	if (dx > 0)
1139	map_blank (self, self->x, self->y, dx - 1, self->h);	1324	map_blank (self, self->x, self->y, dx, self->h);
1140	else if (dx < 0)	1325	else if (dx < 0)
1141	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1326	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1142		1327
1143	if (dy > 0)	1328	if (dy > 0)
1144	map_blank (self, self->x, self->y, self->w, dy - 1);	1329	map_blank (self, self->x, self->y, self->w, dy);
1145	else if (dy < 0)	1330	else if (dy < 0)
1146	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1331	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1147		1332
1148	self->ox += dx; self->x += dx;	1333	self->ox += dx; self->x += dx;
1149	self->oy += dy; self->y += dy;	1334	self->oy += dy; self->y += dy;
1150		1335
1151	while (self->y < 0)	1336	while (self->y < 0)
…		…
1156	self->y += MAP_EXTEND_Y;	1341	self->y += MAP_EXTEND_Y;
1157	}	1342	}
1158	}	1343	}
1159		1344
1160	void	1345	void
1161	map1a_update (CFClient::Map self, SV *data_)	1346	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1162	CODE:	1347	CODE:
1163	{	1348	{
1164	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1349	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1165	uint8_t *data_end = (uint8_t *)SvEND (data_);	1350	uint8_t *data_end = (uint8_t *)SvEND (data_);
1166	mapcell *cell;	1351	mapcell *cell;
1167	int x, y, flags;	1352	int x, y, flags;
1168		1353
1169	while (data < data_end)	1354	while (data < data_end - 1)
1170	{	1355	{
1171	flags = (data [0] << 8) + data [1]; data += 2;	1356	flags = (data [0] << 8) + data [1]; data += 2;
1172		1357
1173	x = ((flags >> 10) & 63) + self->x;	1358	x = self->x + ((flags >> 10) & 63);
1174	y = ((flags >> 4) & 63) + self->y;	1359	y = self->y + ((flags >> 4) & 63);
1175		1360
1176	cell = map_get_cell (self, x, y);	1361	cell = map_get_cell (self, x, y);
1177		1362
1178	if (flags & 15)	1363	if (flags & 15)
1179	{	1364	{
1180	if (cell->darkness < 0)	1365	if (!cell->darkness)
1181	{	1366	{
		1367	memset (cell, 0, sizeof (*cell));
1182	cell->darkness = 0;	1368	cell->darkness = 256;
1183	cell->face [0] = 0;
1184	cell->face [1] = 0;
1185	cell->face [2] = 0;
1186	}	1369	}
1187		1370
1188	cell->darkness = flags & 8 ? *data++ : 255;
1189
1190	//TODO: don't trust server data to be in-range(!)	1371	//TODO: don't trust server data to be in-range(!)
		1372
		1373	if (flags & 8)
		1374	{
		1375	if (extmap)
		1376	{
		1377	uint8_t ext, cmd;
		1378
		1379	do
		1380	{
		1381	ext = *data++;
		1382	cmd = ext & 0x3f;
		1383
		1384	if (cmd < 4)
		1385	cell->darkness = 255 - ext * 64 + 1;
		1386	else if (cmd == 5) // health
		1387	{
		1388	cell->stat_width = 1;
		1389	cell->stat_hp = *data++;
		1390	}
		1391	else if (cmd == 6) // monster width
		1392	cell->stat_width = *data++ + 1;
		1393	else if (cmd == 0x47) // monster width
		1394	{
		1395	if (*data == 4)
		1396	; // decode player tag
		1397
		1398	data += *data + 1;
		1399	}
		1400	else if (cmd == 8) // cell flags
		1401	cell->flags = *data++;
		1402	else if (ext & 0x40) // unknown, multibyte => skip
		1403	data += *data + 1;
		1404	else
		1405	data++;
		1406	}
		1407	while (ext & 0x80);
		1408	}
		1409	else
		1410	cell->darkness = *data++ + 1;
		1411	}
1191		1412
1192	if (flags & 4)	1413	if (flags & 4)
1193	{	1414	{
1194	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1415	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1195	}	1416	}
…		…
1203	{	1424	{
1204	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1425	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1205	}	1426	}
1206	}	1427	}
1207	else	1428	else
1208	cell->darkness = -1;	1429	cell->darkness = 0;
1209	}	1430	}
1210	}	1431	}
1211		1432
1212	SV *	1433	SV *
1213	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1434	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1214	CODE:	1435	CODE:
1215	{	1436	{
1216	int x1, x;	1437	int x1, x;
1217	int y1, y;	1438	int y1, y;
1218	int z;	1439	int z;
…		…
1268	}	1489	}
1269	OUTPUT:	1490	OUTPUT:
1270	RETVAL	1491	RETVAL
1271		1492
1272	void	1493	void
1273	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1494	draw (CFPlus::Map self, int mx, int my, int sw, int sh)
1274	PPCODE:	1495	CODE:
1275	{	1496	{
1276	int vx, vy;
1277	int x, y, z;	1497	int x, y, z;
1278	int last_name;	1498	int last_name;
1279	mapface face;	1499	mapface face;
1280	int sw4 = (sw + 3) & ~3;
1281	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1282	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1283
1284	memset (darkness, 255, sw4 * sh);
1285	SvPOK_only (darkness_sv);
1286	SvCUR_set (darkness_sv, sw4 * sh);
1287
1288	vx = self->x + (self->w - sw) / 2 - shift_x;
1289	vy = self->y + (self->h - sh) / 2 - shift_y;
1290
1291	/*
1292	int vx = self->vx = self->w >= sw
1293	? self->x + (self->w - sw) / 2
1294	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1295
1296	int vy = self->vy = self->h >= sh
1297	? self->y + (self->h - sh) / 2
1298	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1299	*/
1300		1500
1301	glColor4ub (255, 255, 255, 255);	1501	glColor4ub (255, 255, 255, 255);
1302		1502
		1503	glEnable (GL_BLEND);
1303	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1504	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1304	glEnable (GL_BLEND);
1305	glEnable (GL_TEXTURE_2D);	1505	glEnable (GL_TEXTURE_2D);
1306	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1506	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1307		1507
1308	glBegin (GL_QUADS);	1508	glBegin (GL_QUADS);
1309		1509
1310	last_name = 0;	1510	last_name = 0;
1311		1511
		1512	mx += self->x;
		1513	my += self->y;
		1514
1312	for (z = 0; z < 3; z++)	1515	for (z = 0; z < 3; z++)
1313	for (y = 0; y < sh; y++)	1516	for (y = 0; y < sh; y++)
1314	if (0 <= y + vy && y + vy < self->rows)	1517	if (0 <= y + my && y + my < self->rows)
1315	{	1518	{
1316	maprow *row = self->row + (y + vy);	1519	maprow *row = self->row + (y + my);
1317		1520
1318	for (x = 0; x < sw; x++)	1521	for (x = 0; x < sw; x++)
1319	if (row->c0 <= x + vx && x + vx < row->c1)	1522	if (row->c0 <= x + mx && x + mx < row->c1)
1320	{	1523	{
1321	mapcell *cell = row->col + (x + vx - row->c0);	1524	mapcell *cell = row->col + (x + mx - row->c0);
1322
1323	darkness[y * sw4 + x] = cell->darkness < 0
1324	? 255 - FOW_DARKNESS
1325	: 255 - cell->darkness;
1326		1525
1327	face = cell->face [z];	1526	face = cell->face [z];
1328		1527
1329	if (face)	1528	if (face && face < self->texs)
1330	{	1529	{
1331	maptex tex = self->tex [face];	1530	maptex tex = self->tex [face];
1332
1333	int px = (x + 1) * 32 - tex.w;	1531	int px = (x + 1) * 32 - tex.w;
1334	int py = (y + 1) * 32 - tex.h;	1532	int py = (y + 1) * 32 - tex.h;
1335		1533
1336	if (last_name != tex.name)	1534	if (last_name != tex.name)
1337	{	1535	{
1338	glEnd ();	1536	glEnd ();
1339	last_name = tex.name;
1340	glBindTexture (GL_TEXTURE_2D, last_name);	1537	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1341	glBegin (GL_QUADS);	1538	glBegin (GL_QUADS);
1342	}	1539	}
1343		1540
1344	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1541	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1345	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1542	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1346	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1543	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1347	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1544	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1348	}	1545	}
		1546
		1547	if (cell->flags && z == 2)
		1548	{
		1549	if (cell->flags & 1)
		1550	{
		1551	maptex tex = self->tex [1];
		1552	int px = (x + 1) * 32 - tex.w + 2;
		1553	int py = (y + 1) * 32 - tex.h - 6;
		1554
		1555	glEnd ();
		1556	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1557	glBegin (GL_QUADS);
		1558
		1559	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1560	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1561	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1562	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1563	}
		1564	}
1349	}	1565	}
1350	}	1566	}
1351		1567
1352	glEnd ();	1568	glEnd ();
1353		1569
1354	glDisable (GL_TEXTURE_2D);	1570	glDisable (GL_TEXTURE_2D);
1355	glDisable (GL_BLEND);	1571	glDisable (GL_BLEND);
		1572
		1573	// top layer: overlays such as the health bar
		1574	for (y = 0; y < sh; y++)
		1575	if (0 <= y + my && y + my < self->rows)
		1576	{
		1577	maprow *row = self->row + (y + my);
		1578
		1579	for (x = 0; x < sw; x++)
		1580	if (row->c0 <= x + mx && x + mx < row->c1)
		1581	{
		1582	mapcell *cell = row->col + (x + mx - row->c0);
		1583
		1584	int px = x * 32;
		1585	int py = y * 32;
		1586
		1587	if (cell->stat_hp)
		1588	{
		1589	int width = cell->stat_width * 32;
		1590	int thick = sh / 28 + 1 + cell->stat_width;
		1591
		1592	glColor3ub (0, 0, 0);
		1593	glRectf (px + 1, py - thick - 2,
		1594	px + width - 1, py);
		1595
		1596	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1597	glRectf (px + 2,
		1598	py - thick - 1,
		1599	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1600	}
		1601	}
		1602	}
		1603	}
		1604
		1605	void
		1606	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1607	CODE:
		1608	{
		1609	static float color[16][3] = {
		1610	{ 0.00F, 0.00F, 0.00F },
		1611	{ 1.00F, 1.00F, 1.00F },
		1612	{ 0.00F, 0.00F, 0.55F },
		1613	{ 1.00F, 0.00F, 0.00F },
		1614
		1615	{ 1.00F, 0.54F, 0.00F },
		1616	{ 0.11F, 0.56F, 1.00F },
		1617	{ 0.93F, 0.46F, 0.00F },
		1618	{ 0.18F, 0.54F, 0.34F },
		1619
		1620	{ 0.56F, 0.73F, 0.56F },
		1621	{ 0.80F, 0.80F, 0.80F },
		1622	{ 0.55F, 0.41F, 0.13F },
		1623	{ 0.99F, 0.77F, 0.26F },
		1624
		1625	{ 0.74F, 0.65F, 0.41F },
		1626
		1627	{ 0.00F, 1.00F, 1.00F },
		1628	{ 1.00F, 0.00F, 1.00F },
		1629	{ 1.00F, 1.00F, 0.00F },
		1630	};
		1631
		1632	int x, y;
		1633
		1634	glEnable (GL_TEXTURE_2D);
		1635	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1636	glEnable (GL_BLEND);
		1637	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1638	glBegin (GL_QUADS);
		1639
		1640	for (y = 0; y < h; y++)
		1641	for (x = 0; x < w; x++)
		1642	{
		1643	unsigned char m = data [x + y * w];
		1644
		1645	if (m)
		1646	{
		1647	float *c = color [m & 15];
		1648
		1649	float tx1 = m & 0x40 ? 0.5 : 0.;
		1650	float tx2 = tx1 + 0.5;
		1651
		1652	glColor4f (c[0], c[1], c[2], 0.75);
		1653	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1654	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1655	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1656	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1657	}
		1658	}
		1659
		1660	glEnd ();
		1661	glDisable (GL_BLEND);
		1662	glDisable (GL_TEXTURE_2D);
		1663	}
		1664
		1665	void
		1666	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
		1667	PPCODE:
		1668	{
		1669	int x, y;
		1670	int sw4 = (sw + 3) & ~3;
		1671	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
		1672	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
		1673
		1674	memset (darkness, 255, sw4 * sh);
		1675	SvPOK_only (darkness_sv);
		1676	SvCUR_set (darkness_sv, sw4 * sh);
		1677
		1678	mx += self->x;
		1679	my += self->y;
		1680
		1681	for (y = 0; y < sh; y++)
		1682	if (0 <= y + my && y + my < self->rows)
		1683	{
		1684	maprow *row = self->row + (y + my);
		1685
		1686	for (x = 0; x < sw; x++)
		1687	if (row->c0 <= x + mx && x + mx < row->c1)
		1688	{
		1689	mapcell *cell = row->col + (x + mx - row->c0);
		1690
		1691	darkness[y * sw4 + x] = cell->darkness
		1692	? 255 - (cell->darkness - 1)
		1693	: 255 - FOW_DARKNESS;
		1694	}
		1695	}
1356		1696
1357	EXTEND (SP, 3);	1697	EXTEND (SP, 3);
1358	PUSHs (sv_2mortal (newSViv (sw4)));	1698	PUSHs (sv_2mortal (newSViv (sw4)));
1359	PUSHs (sv_2mortal (newSViv (sh)));	1699	PUSHs (sv_2mortal (newSViv (sh)));
1360	PUSHs (darkness_sv);	1700	PUSHs (darkness_sv);
1361	}	1701	}
1362		1702
1363	SV *	1703	SV *
1364	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1704	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1365	CODE:	1705	CODE:
1366	{	1706	{
1367	int x, y, x1, y1;	1707	int x, y, x1, y1;
1368	SV *data_sv = newSV (w * h * 7 + 5);	1708	SV *data_sv = newSV (w * h * 7 + 5);
1369	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1709	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1431	}	1771	}
1432	OUTPUT:	1772	OUTPUT:
1433	RETVAL	1773	RETVAL
1434		1774
1435	void	1775	void
1436	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1776	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1437	PPCODE:	1777	PPCODE:
1438	{	1778	{
1439	int x, y, z;	1779	int x, y, z;
1440	int w, h;	1780	int w, h;
1441	int x1, y1;	1781	int x1, y1;
…		…
1473		1813
1474	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	1814	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1475	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	1815	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1476	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	1816	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1477		1817
1478	if (cell->darkness <= 0)	1818	if (cell->darkness == 0)
1479	{	1819	{
1480	cell->darkness = -1;	1820	cell->darkness = 0;
1481		1821
1482	for (z = 0; z <= 2; z++)	1822	for (z = 0; z <= 2; z++)
1483	{	1823	{
1484	cell->face[z] = face[z];	1824	cell->face[z] = face[z];
1485		1825
…		…
1490	}	1830	}
1491	}	1831	}
1492	}	1832	}
1493	}	1833	}
1494		1834
1495	MODULE = CFClient PACKAGE = CFClient::MixChunk	1835	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1496		1836
1497	CFClient::MixChunk	1837	CFPlus::MixChunk
1498	new_from_file (SV *class, char *path)	1838	new_from_file (SV *class, char *path)
1499	CODE:	1839	CODE:
1500	RETVAL = Mix_LoadWAV (path);	1840	RETVAL = Mix_LoadWAV (path);
1501	OUTPUT:	1841	OUTPUT:
1502	RETVAL	1842	RETVAL
1503		1843
1504	void	1844	void
1505	DESTROY (CFClient::MixChunk self)	1845	DESTROY (CFPlus::MixChunk self)
1506	CODE:	1846	CODE:
1507	Mix_FreeChunk (self);	1847	Mix_FreeChunk (self);
1508		1848
1509	int	1849	int
1510	volume (CFClient::MixChunk self, int volume = -1)	1850	volume (CFPlus::MixChunk self, int volume = -1)
1511	CODE:	1851	CODE:
1512	RETVAL = Mix_VolumeChunk (self, volume);	1852	RETVAL = Mix_VolumeChunk (self, volume);
1513	OUTPUT:	1853	OUTPUT:
1514	RETVAL	1854	RETVAL
1515		1855
1516	int	1856	int
1517	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1857	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1518	CODE:	1858	CODE:
1519	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1859	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1520	OUTPUT:	1860	OUTPUT:
1521	RETVAL	1861	RETVAL
1522		1862
1523	MODULE = CFClient PACKAGE = CFClient::MixMusic	1863	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1524		1864
1525	int	1865	int
1526	volume (int volume = -1)	1866	volume (int volume = -1)
1527	CODE:	1867	CODE:
1528	RETVAL = Mix_VolumeMusic (volume);	1868	RETVAL = Mix_VolumeMusic (volume);
1529	OUTPUT:	1869	OUTPUT:
1530	RETVAL	1870	RETVAL
1531		1871
1532	CFClient::MixMusic	1872	CFPlus::MixMusic
1533	new_from_file (SV *class, char *path)	1873	new_from_file (SV *class, char *path)
1534	CODE:	1874	CODE:
1535	RETVAL = Mix_LoadMUS (path);	1875	RETVAL = Mix_LoadMUS (path);
1536	OUTPUT:	1876	OUTPUT:
1537	RETVAL	1877	RETVAL
1538		1878
1539	void	1879	void
1540	DESTROY (CFClient::MixMusic self)	1880	DESTROY (CFPlus::MixMusic self)
1541	CODE:	1881	CODE:
1542	Mix_FreeMusic (self);	1882	Mix_FreeMusic (self);
1543		1883
1544	int	1884	int
1545	play (CFClient::MixMusic self, int loops = -1)	1885	play (CFPlus::MixMusic self, int loops = -1)
1546	CODE:	1886	CODE:
1547	RETVAL = Mix_PlayMusic (self, loops);	1887	RETVAL = Mix_PlayMusic (self, loops);
1548	OUTPUT:	1888	OUTPUT:
1549	RETVAL	1889	RETVAL
1550		1890
1551	MODULE = CFClient PACKAGE = CFClient::OpenGL	1891	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1552		1892
1553	BOOT:	1893	BOOT:
1554	{	1894	{
1555	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1895	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1556	static const struct {	1896	static const struct {
1557	const char *name;	1897	const char *name;
1558	IV iv;	1898	IV iv;
1559	} *civ, const_iv[] = {	1899	} *civ, const_iv[] = {
1560	# define const_iv(name) { # name, (IV)name }	1900	# define const_iv(name) { # name, (IV)name }
…		…
1567	const_iv (GL_SCISSOR_TEST),	1907	const_iv (GL_SCISSOR_TEST),
1568	const_iv (GL_DEPTH_TEST),	1908	const_iv (GL_DEPTH_TEST),
1569	const_iv (GL_ALPHA_TEST),	1909	const_iv (GL_ALPHA_TEST),
1570	const_iv (GL_NORMALIZE),	1910	const_iv (GL_NORMALIZE),
1571	const_iv (GL_RESCALE_NORMAL),	1911	const_iv (GL_RESCALE_NORMAL),
		1912	const_iv (GL_FRONT),
		1913	const_iv (GL_BACK),
1572	const_iv (GL_AND),	1914	const_iv (GL_AND),
1573	const_iv (GL_ONE),	1915	const_iv (GL_ONE),
1574	const_iv (GL_ZERO),	1916	const_iv (GL_ZERO),
1575	const_iv (GL_SRC_ALPHA),	1917	const_iv (GL_SRC_ALPHA),
1576	const_iv (GL_DST_ALPHA),	1918	const_iv (GL_DST_ALPHA),
1577	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1919	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1578	const_iv (GL_ONE_MINUS_DST_ALPHA),	1920	const_iv (GL_ONE_MINUS_DST_ALPHA),
1579	const_iv (GL_SRC_ALPHA_SATURATE),	1921	const_iv (GL_SRC_ALPHA_SATURATE),
1580	const_iv (GL_RGB),	1922	const_iv (GL_RGB),
1581	const_iv (GL_RGBA),	1923	const_iv (GL_RGBA),
		1924	const_iv (GL_RGBA4),
		1925	const_iv (GL_RGBA8),
		1926	const_iv (GL_RGB5_A1),
1582	const_iv (GL_UNSIGNED_BYTE),	1927	const_iv (GL_UNSIGNED_BYTE),
1583	const_iv (GL_UNSIGNED_SHORT),	1928	const_iv (GL_UNSIGNED_SHORT),
1584	const_iv (GL_UNSIGNED_INT),	1929	const_iv (GL_UNSIGNED_INT),
1585	const_iv (GL_ALPHA),	1930	const_iv (GL_ALPHA),
1586	const_iv (GL_INTENSITY),	1931	const_iv (GL_INTENSITY),
…		…
1618	const_iv (GL_SEPARABLE_2D),	1963	const_iv (GL_SEPARABLE_2D),
1619	const_iv (GL_CONVOLUTION_2D),	1964	const_iv (GL_CONVOLUTION_2D),
1620	const_iv (GL_CONVOLUTION_BORDER_MODE),	1965	const_iv (GL_CONVOLUTION_BORDER_MODE),
1621	const_iv (GL_CONSTANT_BORDER),	1966	const_iv (GL_CONSTANT_BORDER),
1622	const_iv (GL_LINES),	1967	const_iv (GL_LINES),
		1968	const_iv (GL_LINE_STRIP),
1623	const_iv (GL_LINE_LOOP),	1969	const_iv (GL_LINE_LOOP),
1624	const_iv (GL_QUADS),	1970	const_iv (GL_QUADS),
1625	const_iv (GL_QUAD_STRIP),	1971	const_iv (GL_QUAD_STRIP),
1626	const_iv (GL_TRIANGLES),	1972	const_iv (GL_TRIANGLES),
1627	const_iv (GL_TRIANGLE_STRIP),	1973	const_iv (GL_TRIANGLE_STRIP),
…		…
1660	OUTPUT:	2006	OUTPUT:
1661	RETVAL	2007	RETVAL
1662		2008
1663	int glGetError ()	2009	int glGetError ()
1664		2010
		2011	void glFinish ()
		2012
1665	void glClear (int mask)	2013	void glClear (int mask)
1666		2014
1667	void glClearColor (float r, float g, float b, float a = 1.0)	2015	void glClearColor (float r, float g, float b, float a = 1.0)
1668	PROTOTYPE: @	2016	PROTOTYPE: @
1669		2017
…		…
1692	void glPushMatrix ()	2040	void glPushMatrix ()
1693		2041
1694	void glPopMatrix ()	2042	void glPopMatrix ()
1695		2043
1696	void glLoadIdentity ()	2044	void glLoadIdentity ()
		2045
		2046	void glDrawBuffer (int buffer)
		2047
		2048	void glReadBuffer (int buffer)
1697		2049
1698	# near_ and far_ are due to microsofts buggy "c" compiler	2050	# near_ and far_ are due to microsofts buggy "c" compiler
1699	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2051	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1700		2052
1701	# near_ and far_ are due to microsofts buggy "c" compiler	2053	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1731	r *= a;	2083	r *= a;
1732	g *= a;	2084	g *= a;
1733	b *= a;	2085	b *= a;
1734	}	2086	}
1735	// microsoft visual "c" rounds instead of truncating...	2087	// microsoft visual "c" rounds instead of truncating...
1736	glColor4ub (MIN ((int)(r * 256.f), 255),	2088	glColor4f (r, g, b, a);
1737	MIN ((int)(g * 256.f), 255),
1738	MIN ((int)(b * 256.f), 255),
1739	MIN ((int)(a * 256.f), 255));
1740		2089
1741	void glInterleavedArrays (int format, int stride, char *data)	2090	void glInterleavedArrays (int format, int stride, char *data)
1742		2091
1743	void glDrawElements (int mode, int count, int type, char *indices)	2092	void glDrawElements (int mode, int count, int type, char *indices)
1744		2093
…		…
1821		2170
1822	void glEndList ()	2171	void glEndList ()
1823		2172
1824	void glCallList (int list)	2173	void glCallList (int list)
1825		2174
1826

Diff Legend

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