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.98 by root, Mon May 29 02:01:56 2006 UTC vs.
Revision 1.142 by root, Fri Aug 18 01:27:15 2006 UTC

1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3	# include <malloc.h>	4	# include <malloc.h>
4	# include <windows.h>	5	# include <windows.h>
5	# pragma warning(disable:4244)	6	# pragma warning(disable:4244)
6	#endif	7	#endif
7		8
8	#include "EXTERN.h"	9	#include "EXTERN.h"
9	#include "perl.h"	10	#include "perl.h"
10	#include "XSUB.h"	11	#include "XSUB.h"
11		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
12	#include <math.h>	17	#include <math.h>
13	#include <string.h>	18	#include <string.h>
14	#include <stdio.h>	19	#include <stdio.h>
		20	#include <stdlib.h>
15		21
16	#include <SDL.h>	22	#include <SDL.h>
17	#include <SDL_endian.h>	23	#include <SDL_endian.h>
18	#include <SDL_image.h>	24	#include <SDL_image.h>
19	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
21		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
22	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
23		32
24	#include <pango/pango.h>	33	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		34
29	#ifndef _WIN32	35	#ifndef _WIN32
30	# include <sys/types.h>	36	# include <sys/types.h>
31	# include <sys/socket.h>	37	# include <sys/socket.h>
32	# include <netinet/in.h>	38	# include <netinet/in.h>
…		…
39	typedef signed char int8_t;	45	typedef signed char int8_t;
40	typedef signed short int16_t;	46	typedef signed short int16_t;
41	typedef signed int int32_t;	47	typedef signed int int32_t;
42	#endif	48	#endif
43		49
44	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45		51
46	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
47		53
48	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
50		56
51	#define MIN_FONT_HEIGHT 10	57	#define MIN_FONT_HEIGHT 10
52		58
53	#define GL_CALL(type,func,args) \	59	#if 0
54	{ \	60	# define PARACHUTE SDL_INIT_NOPARACHUTE
55	static int init_; \	61	#else
56	static type fptr_; \	62	# define PARACHUTE 0
57	\	63	#endif
58	if (!init_) \
59	{ \
60	init_ = 1; \
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62	} \
63	\
64	if (fptr_) \
65	fptr_ args; \
66	}
67		64
		65	static struct
		66	{
		67	#define GL_FUNC(ptr,name) ptr name;
		68	#include "glfunc.h"
		69	#undef GL_FUNC
		70	} gl;
		71
		72	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
		73	{
		74	if (gl.BlendFuncSeparate)
		75	gl.BlendFuncSeparate (sa, da, saa, daa);
		76	else if (gl.BlendFuncSeparateEXT)
		77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
		78	else
		79	glBlendFunc (sa, da);
		80	}
		81
		82	#include "texcache.c"
		83
		84	#include "pango-font.c"
		85	#include "pango-fontmap.c"
		86	#include "pango-render.c"
		87
68	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
70		90
71	typedef PangoFontDescription *CFClient__Font;	91	typedef PangoFontDescription *CFPlus__Font;
		92
		93	static int
		94	shape_attr_p (PangoLayoutRun *run)
		95	{
		96	GSList *attrs = run->item->analysis.extra_attrs;
		97
		98	while (attrs)
		99	{
		100	PangoAttribute *attr = attrs->data;
		101
		102	if (attr->klass->type == PANGO_ATTR_SHAPE)
		103	return 1;
		104
		105	attrs = attrs->next;
		106	}
		107
		108	return 0;
		109	}
72		110
73	typedef struct cf_layout {	111	typedef struct cf_layout {
74	PangoLayout *pl; // either derived from a cairo or ft2 context	112	PangoLayout *pl;
75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
77	int base_height;	114	int base_height;
78	CFClient__Font font;	115	CFPlus__Font font;
79	} *CFClient__Layout;	116	} *CFPlus__Layout;
80		117
81	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
82	static PangoContext *ft2_context, *cairo_context;	119	static PangoContext *opengl_context;
83	static PangoFontMap *ft2_fontmap, *cairo_fontmap;	120	static PangoFontMap *opengl_fontmap;
84		121
85	static void	122	static void
86	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
87	{	124	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
89	#ifdef _WIN32	126	#ifdef FC_HINT_STYLE
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91	#else	128	#endif
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif
94	}	130	}
95		131
96	static void	132	static void
97	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
98	{	134	{
99	/* use a random scale factor to account for unknown descenders, 0.8 works	135	/* use a random scale factor to account for unknown descenders, 0.8 works
100	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
101	*/	137	*/
102	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
106		142
107	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
108	}	144	}
109		145
110	static void	146	static void
111	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	147	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
112	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
113	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
114		153
115	if (!*w) *w = 1;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
116	if (!*h) *h = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
117		156
118	*w = (*w + 3) & ~3;	157	if (!rect.width) rect.width = 1;
		158	if (!rect.height) rect.height = 1;
		159
		160	*w = rect.width;
		161	*h = rect.height;
119	}	162	}
120		163
121	typedef uint16_t mapface;	164	typedef uint16_t mapface;
122		165
123	typedef struct {	166	typedef struct {
…		…
126	float s, t;	169	float s, t;
127	uint8_t r, g, b, a;	170	uint8_t r, g, b, a;
128	} maptex;	171	} maptex;
129		172
130	typedef struct {	173	typedef struct {
131	int16_t darkness;	174	uint16_t darkness;
132	mapface face[3];	175	mapface face[3];
		176	uint8_t stat_hp;
133	} mapcell;	177	} mapcell;
134		178
135	typedef struct {	179	typedef struct {
136	int32_t c0, c1;	180	int32_t c0, c1;
137	mapcell *col;	181	mapcell *col;
…		…
146	int texs;	190	int texs;
147	maptex *tex;	191	maptex *tex;
148		192
149	int32_t rows;	193	int32_t rows;
150	maprow *row;	194	maprow *row;
151	} *CFClient__Map;	195	} *CFPlus__Map;
152		196
153	static char *	197	static char *
154	prepend (char *ptr, int sze, int inc)	198	prepend (char *ptr, int sze, int inc)
155	{	199	{
156	char *p;	200	char *p;
…		…
174		218
175	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	219	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
176	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	220	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
177		221
178	static maprow *	222	static maprow *
179	map_get_row (CFClient__Map self, int y)	223	map_get_row (CFPlus__Map self, int y)
180	{	224	{
181	if (0 > y)	225	if (0 > y)
182	{	226	{
183	int extend = - y + MAP_EXTEND_Y;	227	int extend = - y + MAP_EXTEND_Y;
184	Prepend (maprow, self->row, self->rows, extend);	228	Prepend (maprow, self->row, self->rows, extend);
…		…
222		266
223	return row->col + (x - row->c0);	267	return row->col + (x - row->c0);
224	}	268	}
225		269
226	static mapcell *	270	static mapcell *
227	map_get_cell (CFClient__Map self, int x, int y)	271	map_get_cell (CFPlus__Map self, int x, int y)
228	{	272	{
229	return row_get_cell (map_get_row (self, y), x);	273	return row_get_cell (map_get_row (self, y), x);
230	}	274	}
231		275
232	static void	276	static void
233	map_clear (CFClient__Map self)	277	map_clear (CFPlus__Map self)
234	{	278	{
235	int r;	279	int r;
236		280
237	for (r = 0; r < self->rows; r++)	281	for (r = 0; r < self->rows; r++)
238	Safefree (self->row[r].col);	282	Safefree (self->row[r].col);
…		…
246	self->row = 0;	290	self->row = 0;
247	self->rows = 0;	291	self->rows = 0;
248	}	292	}
249		293
250	static void	294	static void
251	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	295	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
252	{	296	{
253	int x, y;	297	int x, y;
254	maprow *row;	298	maprow *row;
255		299
256	for (y = y0; y < y0 + h; y++)	300	for (y = y0; y < y0 + h; y++)
…		…
265	if (x >= row->c0)	309	if (x >= row->c0)
266	{	310	{
267	if (x >= row->c1)	311	if (x >= row->c1)
268	break;	312	break;
269		313
270	row->col[x - row->c0].darkness = -1;	314	row->col[x - row->c0].darkness = 0;
271	}	315	}
272	}	316	}
273	}	317	}
274		318
275	static void	319	static void
…		…
296	ev.data2 = 0;	340	ev.data2 = 0;
297		341
298	SDL_PushEvent ((SDL_Event *)&ev);	342	SDL_PushEvent ((SDL_Event *)&ev);
299	}	343	}
300		344
		345	static unsigned int
		346	minpot (unsigned int n)
		347	{
		348	if (!n)
		349	return 0;
		350
		351	--n;
		352
		353	n |= n >> 1;
		354	n |= n >> 2;
		355	n |= n >> 4;
		356	n |= n >> 8;
		357	n |= n >> 16;
		358
		359	return n + 1;
		360	}
		361
301	MODULE = CFClient PACKAGE = CFClient	362	MODULE = CFPlus PACKAGE = CFPlus
302		363
303	PROTOTYPES: ENABLE	364	PROTOTYPES: ENABLE
304		365
305	BOOT:	366	BOOT:
306	{	367	{
307	HV *stash = gv_stashpv ("CFClient", 1);	368	HV *stash = gv_stashpv ("CFPlus", 1);
308	static const struct {	369	static const struct {
309	const char *name;	370	const char *name;
310	IV iv;	371	IV iv;
311	} *civ, const_iv[] = {	372	} *civ, const_iv[] = {
312	# define const_iv(name) { # name, (IV)name }	373	# define const_iv(name) { # name, (IV)name }
…		…
413		474
414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	475	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	476	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416	}	477	}
417		478
		479	int
		480	in_destruct ()
		481	CODE:
		482	RETVAL = PL_main_cv == Nullcv;
		483	OUTPUT:
		484	RETVAL
		485
		486	NV floor (NV x)
		487
		488	NV ceil (NV x)
		489
418	void	490	void
419	pango_init ()	491	pango_init ()
420	CODE:	492	CODE:
421	{	493	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx
423	ft2_fontmap = pango_ft2_font_map_new ();	494	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	495	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	496	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426
427	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
429	}	497	}
430		498
431	int	499	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	500	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
433		501
434	void	502	void
435	SDL_Quit ()	503	SDL_Quit ()
436		504
437	void	505	void
…		…
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	512	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	513	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	514	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		515
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	516	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	517	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450		518
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	519	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	520	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	522	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455		523
456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	524	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		525	#if SDL_VERSION_ATLEAST(1,2,10)
		526	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		527	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		528	#endif
457		529
458	SDL_EnableUNICODE (1);	530	SDL_EnableUNICODE (1);
459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	531	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460		532
461	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	533	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	551	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	552	CODE:
481	RETVAL = !!SDL_SetVideoMode (	553	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)	554	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483	);	555	);
		556	if (RETVAL)
		557	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	558	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		559	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		560	# include "glfunc.h"
		561	# undef GL_FUNC
		562	}
485	OUTPUT:	563	OUTPUT:
486	RETVAL	564	RETVAL
487		565
488	void	566	void
489	SDL_GL_SwapBuffers ()	567	SDL_GL_SwapBuffers ()
…		…
542	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	620	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
543	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	621	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
544	break;	622	break;
545	}	623	}
546		624
547	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	625	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
548	}	626	}
549	}	627	}
550		628
551	int	629	int
552	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	630	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
568	#endif	646	#endif
569		647
570	void	648	void
571	add_font (char *file)	649	add_font (char *file)
572	CODE:	650	CODE:
573	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	651	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
574	#ifdef _WIN32
575	// cairo... sigh... requires win2000
576	AddFontResourceEx (file, FR_PRIVATE, 0);
577	#endif
578		652
579	void	653	void
580	load_image_inline (SV *image_)	654	load_image_inline (SV *image_)
581	ALIAS:	655	ALIAS:
582	load_image_file = 1	656	load_image_file = 1
…		…
624		698
625	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	699	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
626		700
627	assert (surface2->pitch == surface2->w * 4);	701	assert (surface2->pitch == surface2->w * 4);
628		702
		703	SDL_LockSurface (surface2);
629	EXTEND (SP, 5);	704	EXTEND (SP, 6);
630	PUSHs (sv_2mortal (newSViv (surface2->w)));	705	PUSHs (sv_2mortal (newSViv (surface2->w)));
631	PUSHs (sv_2mortal (newSViv (surface2->h)));	706	PUSHs (sv_2mortal (newSViv (surface2->h)));
632	SDL_LockSurface (surface2);
633	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	707	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
634	SDL_UnlockSurface (surface2);
635	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	708	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
636	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	709	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
637	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	710	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		711	SDL_UnlockSurface (surface2);
638		712
639	SDL_FreeSurface (surface);	713	SDL_FreeSurface (surface);
640	SDL_FreeSurface (surface2);	714	SDL_FreeSurface (surface2);
641	}	715	}
642		716
…		…
678	CODE:	752	CODE:
679	fprintf (stderr, "FATAL: %s\n", message);	753	fprintf (stderr, "FATAL: %s\n", message);
680	#ifdef _WIN32	754	#ifdef _WIN32
681	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	755	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
682	#endif	756	#endif
683	exit (1);	757	_exit (1);
684		758
		759	void
		760	_exit (int retval)
		761	CODE:
		762	_exit (retval);
		763
685	MODULE = CFClient PACKAGE = CFClient::Font	764	MODULE = CFPlus PACKAGE = CFPlus::Font
686		765
687	CFClient::Font	766	CFPlus::Font
688	new_from_file (SV *class, char *path, int id = 0)	767	new_from_file (SV *class, char *path, int id = 0)
689	CODE:	768	CODE:
690	{	769	{
691	int count;	770	int count;
692	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	771	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
695	}	774	}
696	OUTPUT:	775	OUTPUT:
697	RETVAL	776	RETVAL
698		777
699	void	778	void
700	DESTROY (CFClient::Font self)	779	DESTROY (CFPlus::Font self)
701	CODE:	780	CODE:
702	pango_font_description_free (self);	781	pango_font_description_free (self);
703		782
704	void	783	void
705	make_default (CFClient::Font self)	784	make_default (CFPlus::Font self)
706	CODE:	785	CODE:
707	default_font = self;	786	default_font = self;
708		787
709	MODULE = CFClient PACKAGE = CFClient::Layout	788	MODULE = CFPlus PACKAGE = CFPlus::Layout
710		789
711	CFClient::Layout	790	void
712	new (SV *class, int rgba = 0)	791	reset_glyph_cache ()
713	CODE:	792	CODE:
714	#if _WIN32	793	tc_clear ();
715	//rgba = 0;//D make stext nicer, breaks TextView	794
716	#endif	795	CFPlus::Layout
		796	new (SV *class)
		797	CODE:
717	New (0, RETVAL, 1, struct cf_layout);	798	New (0, RETVAL, 1, struct cf_layout);
718		799
719	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	800	RETVAL->pl = pango_layout_new (opengl_context);
720	RETVAL->rgba = rgba;
721	RETVAL->r = 1.;	801	RETVAL->r = 1.;
722	RETVAL->g = 1.;	802	RETVAL->g = 1.;
723	RETVAL->b = 1.;	803	RETVAL->b = 1.;
724	RETVAL->a = 1.;	804	RETVAL->a = 1.;
725	RETVAL->base_height = MIN_FONT_HEIGHT;	805	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
729	layout_update_font (RETVAL);	809	layout_update_font (RETVAL);
730	OUTPUT:	810	OUTPUT:
731	RETVAL	811	RETVAL
732		812
733	void	813	void
734	DESTROY (CFClient::Layout self)	814	DESTROY (CFPlus::Layout self)
735	CODE:	815	CODE:
736	g_object_unref (self->pl);	816	g_object_unref (self->pl);
737	Safefree (self);	817	Safefree (self);
738		818
739	int
740	is_rgba (CFClient::Layout self)
741	CODE:
742	RETVAL = self->rgba;
743	OUTPUT:
744	RETVAL
745
746	void	819	void
747	set_text (CFClient::Layout self, SV *text_)	820	set_text (CFPlus::Layout self, SV *text_)
748	CODE:	821	CODE:
749	{	822	{
750	STRLEN textlen;	823	STRLEN textlen;
751	char *text = SvPVutf8 (text_, textlen);	824	char *text = SvPVutf8 (text_, textlen);
752		825
753	pango_layout_set_text (self->pl, text, textlen);	826	pango_layout_set_text (self->pl, text, textlen);
754	}	827	}
755		828
756	void	829	void
757	set_markup (CFClient::Layout self, SV *text_)	830	set_markup (CFPlus::Layout self, SV *text_)
758	CODE:	831	CODE:
759	{	832	{
760	STRLEN textlen;	833	STRLEN textlen;
761	char *text = SvPVutf8 (text_, textlen);	834	char *text = SvPVutf8 (text_, textlen);
762		835
763	pango_layout_set_markup (self->pl, text, textlen);	836	pango_layout_set_markup (self->pl, text, textlen);
764	}	837	}
765		838
		839	void
		840	set_shapes (CFPlus::Layout self, ...)
		841	CODE:
		842	{
		843	PangoAttrList *attrs = 0;
		844	const char *text = pango_layout_get_text (self->pl);
		845	const char *pos = text;
		846	int arg = 4;
		847
		848	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		849	{
		850	PangoRectangle inkrect, rect;
		851	PangoAttribute *attr;
		852
		853	int x = SvIV (ST (arg - 3));
		854	int y = SvIV (ST (arg - 2));
		855	int w = SvIV (ST (arg - 1));
		856	int h = SvIV (ST (arg ));
		857
		858	inkrect.x = 0;
		859	inkrect.y = 0;
		860	inkrect.width = 0;
		861	inkrect.height = 0;
		862
		863	rect.x = x * PANGO_SCALE;
		864	rect.y = y * PANGO_SCALE;
		865	rect.width = w * PANGO_SCALE;
		866	rect.height = h * PANGO_SCALE;
		867
		868	if (!attrs)
		869	attrs = pango_layout_get_attributes (self->pl);
		870
		871	attr = pango_attr_shape_new (&inkrect, &rect);
		872	attr->start_index = pos - text;
		873	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		874	pango_attr_list_insert (attrs, attr);
		875
		876	arg += 4;
		877	pos += sizeof (OBJ_STR) - 1;
		878	}
		879
		880	if (attrs)
		881	pango_layout_set_attributes (self->pl, attrs);
		882	}
		883
		884	void
		885	get_shapes (CFPlus::Layout self)
		886	PPCODE:
		887	{
		888	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		889
		890	do
		891	{
		892	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		893
		894	if (run && shape_attr_p (run))
		895	{
		896	PangoRectangle extents;
		897	pango_layout_iter_get_run_extents (iter, 0, &extents);
		898
		899	EXTEND (SP, 2);
		900	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		901	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		902	}
		903	}
		904	while (pango_layout_iter_next_run (iter));
		905
		906	pango_layout_iter_free (iter);
		907	}
		908
		909	int
		910	has_wrapped (CFPlus::Layout self)
		911	CODE:
		912	{
		913	int lines = 1;
		914	const char *text = pango_layout_get_text (self->pl);
		915
		916	while (*text)
		917	lines += *text++ == '\n';
		918
		919	RETVAL = lines < pango_layout_get_line_count (self->pl);
		920	}
		921	OUTPUT:
		922	RETVAL
		923
766	SV *	924	SV *
767	get_text (CFClient::Layout self)	925	get_text (CFPlus::Layout self)
768	CODE:	926	CODE:
769	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	927	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
770	SvUTF8_on (RETVAL);	928	sv_utf8_decode (RETVAL);
771	OUTPUT:	929	OUTPUT:
772	RETVAL	930	RETVAL
773		931
774	void	932	void
775	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	933	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
776	CODE:	934	CODE:
777	self->r = r;	935	self->r = r;
778	self->g = g;	936	self->g = g;
779	self->b = b;	937	self->b = b;
780	self->a = a;	938	self->a = a;
781		939
782	void	940	void
783	set_font (CFClient::Layout self, CFClient::Font font = 0)	941	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
784	CODE:	942	CODE:
785	if (self->font != font)	943	if (self->font != font)
786	{	944	{
787	self->font = font;	945	self->font = font;
788	layout_update_font (self);	946	layout_update_font (self);
789	}	947	}
790		948
791	void	949	void
792	set_height (CFClient::Layout self, int base_height)	950	set_height (CFPlus::Layout self, int base_height)
793	CODE:	951	CODE:
794	if (self->base_height != base_height)	952	if (self->base_height != base_height)
795	{	953	{
796	self->base_height = base_height;	954	self->base_height = base_height;
797	layout_update_font (self);	955	layout_update_font (self);
798	}	956	}
799		957
800	void	958	void
801	set_width (CFClient::Layout self, int max_width = -1)	959	set_width (CFPlus::Layout self, int max_width = -1)
802	CODE:	960	CODE:
803	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	961	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
804		962
805	void	963	void
806	set_indent (CFClient::Layout self, int indent)	964	set_indent (CFPlus::Layout self, int indent)
807	CODE:	965	CODE:
808	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	966	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
809		967
810	void	968	void
811	set_spacing (CFClient::Layout self, int spacing)	969	set_spacing (CFPlus::Layout self, int spacing)
812	CODE:	970	CODE:
813	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	971	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
814		972
815	void	973	void
816	set_ellipsise (CFClient::Layout self, int ellipsise)	974	set_ellipsise (CFPlus::Layout self, int ellipsise)
817	CODE:	975	CODE:
818	pango_layout_set_ellipsize (self->pl,	976	pango_layout_set_ellipsize (self->pl,
819	ellipsise == 1 ? PANGO_ELLIPSIZE_START	977	ellipsise == 1 ? PANGO_ELLIPSIZE_START
820	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	978	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
821	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	979	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
822	: PANGO_ELLIPSIZE_NONE	980	: PANGO_ELLIPSIZE_NONE
823	);	981	);
824		982
825	void	983	void
826	set_single_paragraph_mode (CFClient::Layout self, int spm)	984	set_single_paragraph_mode (CFPlus::Layout self, int spm)
827	CODE:	985	CODE:
828	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	986	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
829		987
830	void	988	void
831	size (CFClient::Layout self)	989	size (CFPlus::Layout self)
832	PPCODE:	990	PPCODE:
833	{	991	{
834	int w, h;	992	int w, h;
835		993
836	layout_get_pixel_size (self, &w, &h);	994	layout_get_pixel_size (self, &w, &h);
…		…
839	PUSHs (sv_2mortal (newSViv (w)));	997	PUSHs (sv_2mortal (newSViv (w)));
840	PUSHs (sv_2mortal (newSViv (h)));	998	PUSHs (sv_2mortal (newSViv (h)));
841	}	999	}
842		1000
843	int	1001	int
		1002	descent (CFPlus::Layout self)
		1003	CODE:
		1004	{
		1005	PangoRectangle rect;
		1006	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1007	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1008	RETVAL = PANGO_DESCENT (rect);
		1009	}
		1010	OUTPUT:
		1011	RETVAL
		1012
		1013	int
844	xy_to_index (CFClient::Layout self, int x, int y)	1014	xy_to_index (CFPlus::Layout self, int x, int y)
845	CODE:	1015	CODE:
846	{	1016	{
847	int index, trailing;	1017	int index, trailing;
848	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1018	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
849	RETVAL = index;	1019	RETVAL = index;
850	}	1020	}
851	OUTPUT:	1021	OUTPUT:
852	RETVAL	1022	RETVAL
853		1023
854	void	1024	void
855	cursor_pos (CFClient::Layout self, int index)	1025	cursor_pos (CFPlus::Layout self, int index)
856	PPCODE:	1026	PPCODE:
857	{	1027	{
858	PangoRectangle strong_pos;	1028	PangoRectangle strong_pos;
859	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1029	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
860		1030
…		…
863	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1033	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
864	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1034	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
865	}	1035	}
866		1036
867	void	1037	void
868	render (CFClient::Layout self)	1038	render (CFPlus::Layout self, float x, float y, int flags = 0)
869	PPCODE:	1039	PPCODE:
870	{	1040	pango_opengl_render_layout_subpixel (
871	SV *retval;	1041	self->pl,
872	int w, h;	1042	x * PANGO_SCALE, y * PANGO_SCALE,
		1043	self->r, self->g, self->b, self->a,
		1044	flags
		1045	);
873		1046
874	layout_get_pixel_size (self, &w, &h);	1047	MODULE = CFPlus PACKAGE = CFPlus::Texture
875		1048
876	if (self->rgba)	1049	void
		1050	pad2pot (SV *data_, SV *w_, SV *h_)
		1051	CODE:
		1052	{
		1053	int ow = SvIV (w_);
		1054	int oh = SvIV (h_);
		1055
		1056	if (ow && oh)
877	{	1057	{
878	cairo_surface_t *surface;	1058	int nw = minpot (ow);
879	cairo_t *cairo;	1059	int nh = minpot (oh);
880		1060
881	retval = newSV (w * h * 4);	1061	if (nw != ow || nh != oh)
882	SvPOK_only (retval);
883	SvCUR_set (retval, w * h * 4);
884
885	memset (SvPVX (retval), 0, w * h * 4);
886
887	surface = cairo_image_surface_create_for_data (
888	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
889	cairo = cairo_create (surface);
890	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
891
892	pango_cairo_show_layout (cairo, self->pl);
893
894	cairo_destroy (cairo);
895	cairo_surface_destroy (surface);
896
897	// what a mess, and its premultiplied, too :(
898	{	1062	{
899	uint32_t *p = (uint32_t *)SvPVX (retval);	1063	if (SvOK (data_))
900	uint32_t *e = p + w * h;
901
902	while (p < e)
903	{	1064	{
904	uint32_t rgba = *p;	1065	STRLEN datalen;
905	rgba = (rgba >> 24) | (rgba << 8);	1066	char *data = SvPVbyte (data_, datalen);
906	#if 0	1067	int bpp = datalen / (ow * oh);
907	#ifdef _WIN32	1068	SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
908	{//D
909	uint8_t r = rgba >> 24;
910	uint8_t g = rgba >> 16;
911	uint8_t b = rgba >> 8;
912	uint8_t a = rgba >> 0;
913		1069
914	rgba = (rgba & 0xffffff00) | a;	1070	SvPOK_only (result_);
		1071	SvCUR_set (result_, nw * nh * bpp);
		1072
		1073	memset (SvPVX (result_), 0, nw * nh * bpp);
		1074	while (oh--)
		1075	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1076
		1077	sv_setsv (data_, result_);
915	}	1078	}
916	#endif	1079
917	#endif	1080	sv_setiv (w_, nw);
918	rgba = SDL_SwapBE32 (rgba);	1081	sv_setiv (h_, nh);
919	*p++ = rgba;
920	}	1082	}
921	}
922
923	EXTEND (SP, 5);
924	PUSHs (sv_2mortal (newSViv (w)));
925	PUSHs (sv_2mortal (newSViv (h)));
926	PUSHs (sv_2mortal (retval));
927	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
928	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
929	}	1083	}
930	else
931	{
932	FT_Bitmap bitmap;
933
934	retval = newSV (w * h);
935	SvPOK_only (retval);
936	SvCUR_set (retval, w * h);
937
938	bitmap.rows = h;
939	bitmap.width = w;
940	bitmap.pitch = w;
941	bitmap.buffer = (unsigned char*)SvPVX (retval);
942	bitmap.num_grays = 256;
943	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
944
945	memset (bitmap.buffer, 0, w * h);
946
947	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
948
949	EXTEND (SP, 5);
950	PUSHs (sv_2mortal (newSViv (w)));
951	PUSHs (sv_2mortal (newSViv (h)));
952	PUSHs (sv_2mortal (retval));
953	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
954	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
955	}
956	}	1084	}
957		1085
958	MODULE = CFClient PACKAGE = CFClient::Texture
959
960	void	1086	void
961	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1087	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
962	PROTOTYPE: $$$;$$	1088	PROTOTYPE: $$$;$$
963	ALIAS:	1089	ALIAS:
964	draw_quad_alpha = 1	1090	draw_quad_alpha = 1
965	draw_quad_alpha_premultiplied = 2	1091	draw_quad_alpha_premultiplied = 2
966	CODE:	1092	CODE:
…		…
977	}	1103	}
978		1104
979	if (ix)	1105	if (ix)
980	{	1106	{
981	glEnable (GL_BLEND);	1107	glEnable (GL_BLEND);
		1108
		1109	if (ix == 2)
982	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1110	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1111	else
		1112	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1113	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1114
983	glEnable (GL_ALPHA_TEST);	1115	glEnable (GL_ALPHA_TEST);
984	glAlphaFunc (GL_GREATER, 0.01f);	1116	glAlphaFunc (GL_GREATER, 0.01f);
985	}	1117	}
986		1118
987	glBindTexture (GL_TEXTURE_2D, name);	1119	glBindTexture (GL_TEXTURE_2D, name);
…		…
998	glDisable (GL_ALPHA_TEST);	1130	glDisable (GL_ALPHA_TEST);
999	glDisable (GL_BLEND);	1131	glDisable (GL_BLEND);
1000	}	1132	}
1001	}	1133	}
1002		1134
1003	MODULE = CFClient PACKAGE = CFClient::Map	1135	MODULE = CFPlus PACKAGE = CFPlus::Map
1004		1136
1005	CFClient::Map	1137	CFPlus::Map
1006	new (SV *class, int map_width, int map_height)	1138	new (SV *class, int map_width, int map_height)
1007	CODE:	1139	CODE:
1008	New (0, RETVAL, 1, struct map);	1140	New (0, RETVAL, 1, struct map);
1009	RETVAL->x = 0;	1141	RETVAL->x = 0;
1010	RETVAL->y = 0;	1142	RETVAL->y = 0;
…		…
1020	RETVAL->row = 0;	1152	RETVAL->row = 0;
1021	OUTPUT:	1153	OUTPUT:
1022	RETVAL	1154	RETVAL
1023		1155
1024	void	1156	void
1025	DESTROY (CFClient::Map self)	1157	DESTROY (CFPlus::Map self)
1026	CODE:	1158	CODE:
1027	{	1159	{
1028	map_clear (self);	1160	map_clear (self);
1029	Safefree (self->face);	1161	Safefree (self->face);
		1162	Safefree (self->tex);
1030	Safefree (self);	1163	Safefree (self);
1031	}	1164	}
1032		1165
1033	void	1166	void
1034	clear (CFClient::Map self)	1167	clear (CFPlus::Map self)
1035	CODE:	1168	CODE:
1036	map_clear (self);	1169	map_clear (self);
1037		1170
1038	void	1171	void
1039	set_face (CFClient::Map self, int face, int texid)	1172	set_face (CFPlus::Map self, int face, int texid)
1040	CODE:	1173	CODE:
1041	{	1174	{
1042	while (self->faces <= face)	1175	while (self->faces <= face)
1043	{	1176	{
1044	Append (mapface, self->face, self->faces, self->faces);	1177	Append (mapface, self->face, self->faces, self->faces);
…		…
1047		1180
1048	self->face [face] = texid;	1181	self->face [face] = texid;
1049	}	1182	}
1050		1183
1051	void	1184	void
1052	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)	1185	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)
1053	CODE:	1186	CODE:
1054	{	1187	{
1055	while (self->texs <= texid)	1188	while (self->texs <= texid)
1056	{	1189	{
1057	Append (maptex, self->tex, self->texs, self->texs);	1190	Append (maptex, self->tex, self->texs, self->texs);
…		…
1073	}	1206	}
1074		1207
1075	// somewhat hackish, but for textures that require it, it really	1208	// somewhat hackish, but for textures that require it, it really
1076	// improves the look, and most others don't suffer.	1209	// improves the look, and most others don't suffer.
1077	glBindTexture (GL_TEXTURE_2D, name);	1210	glBindTexture (GL_TEXTURE_2D, name);
1078	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	1211	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1079	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	1212	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1213	// use uglier nearest interpolation because linear suffers
		1214	// from transparent color bleeding and ugly wrapping effects.
		1215	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1080	}	1216	}
1081		1217
1082	int	1218	int
1083	ox (CFClient::Map self)	1219	ox (CFPlus::Map self)
1084	ALIAS:	1220	ALIAS:
1085	oy = 1	1221	oy = 1
		1222	x = 2
		1223	y = 3
		1224	w = 4
		1225	h = 5
1086	CODE:	1226	CODE:
1087	switch (ix)	1227	switch (ix)
1088	{	1228	{
1089	case 0: RETVAL = self->ox; break;	1229	case 0: RETVAL = self->ox; break;
1090	case 1: RETVAL = self->oy; break;	1230	case 1: RETVAL = self->oy; break;
		1231	case 2: RETVAL = self->x; break;
		1232	case 3: RETVAL = self->y; break;
		1233	case 4: RETVAL = self->w; break;
		1234	case 5: RETVAL = self->h; break;
1091	}	1235	}
1092	OUTPUT:	1236	OUTPUT:
1093	RETVAL	1237	RETVAL
1094		1238
1095	void	1239	void
1096	scroll (CFClient::Map self, int dx, int dy)	1240	scroll (CFPlus::Map self, int dx, int dy)
1097	CODE:	1241	CODE:
1098	{	1242	{
1099	if (dx > 0)	1243	if (dx > 0)
1100	map_blank (self, self->x, self->y, dx - 1, self->h);	1244	map_blank (self, self->x, self->y, dx - 1, self->h);
1101	else if (dx < 0)	1245	else if (dx < 0)
…		…
1117	self->y += MAP_EXTEND_Y;	1261	self->y += MAP_EXTEND_Y;
1118	}	1262	}
1119	}	1263	}
1120		1264
1121	void	1265	void
1122	map1a_update (CFClient::Map self, SV *data_)	1266	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1123	CODE:	1267	CODE:
1124	{	1268	{
1125	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1269	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1126	uint8_t *data_end = (uint8_t *)SvEND (data_);	1270	uint8_t *data_end = (uint8_t *)SvEND (data_);
1127	mapcell *cell;	1271	mapcell *cell;
…		…
1129		1273
1130	while (data < data_end)	1274	while (data < data_end)
1131	{	1275	{
1132	flags = (data [0] << 8) + data [1]; data += 2;	1276	flags = (data [0] << 8) + data [1]; data += 2;
1133		1277
1134	x = ((flags >> 10) & 63) + self->x;	1278	x = self->x + ((flags >> 10) & 63);
1135	y = ((flags >> 4) & 63) + self->y;	1279	y = self->y + ((flags >> 4) & 63);
1136		1280
1137	cell = map_get_cell (self, x, y);	1281	cell = map_get_cell (self, x, y);
1138		1282
1139	if (flags & 15)	1283	if (flags & 15)
1140	{	1284	{
1141	if (cell->darkness < 0)	1285	if (!cell->darkness)
1142	{	1286	{
1143	cell->darkness = 0;	1287	cell->darkness = 256;
1144	cell->face [0] = 0;	1288	cell->face [0] = 0;
1145	cell->face [1] = 0;	1289	cell->face [1] = 0;
1146	cell->face [2] = 0;	1290	cell->face [2] = 0;
1147	}	1291	}
1148		1292
1149	cell->darkness = flags & 8 ? *data++ : 255;
1150
1151	//TODO: don't trust server data to be in-range(!)	1293	//TODO: don't trust server data to be in-range(!)
		1294
		1295	if (flags & 8)
		1296	{
		1297	if (extmap)
		1298	{
		1299	uint8_t ext, cmd;
		1300
		1301	do
		1302	{
		1303	ext = *data++;
		1304	cmd = ext & 0x7f;
		1305
		1306	if (ext < 4)
		1307	cell->darkness = 255 - ext * 64 + 1;
		1308	else if (ext == 5) // health
		1309	cell->stat_hp = *data++;
		1310	}
		1311	while (cmd & 0x80);
		1312	}
		1313	else
		1314	cell->darkness = *data++ + 1;
		1315	}
1152		1316
1153	if (flags & 4)	1317	if (flags & 4)
1154	{	1318	{
1155	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1319	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1156	}	1320	}
…		…
1164	{	1328	{
1165	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1329	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1166	}	1330	}
1167	}	1331	}
1168	else	1332	else
1169	cell->darkness = -1;	1333	cell->darkness = 0;
1170	}	1334	}
1171	}	1335	}
1172		1336
1173	SV *	1337	SV *
1174	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1338	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1175	CODE:	1339	CODE:
1176	{	1340	{
1177	int x1, x;	1341	int x1, x;
1178	int y1, y;	1342	int y1, y;
1179	int z;	1343	int z;
…		…
1229	}	1393	}
1230	OUTPUT:	1394	OUTPUT:
1231	RETVAL	1395	RETVAL
1232		1396
1233	void	1397	void
1234	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1398	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1235	PPCODE:	1399	CODE:
1236	{	1400	{
1237	int vx, vy;	1401	int vx, vy;
1238	int x, y, z;	1402	int x, y, z;
1239	int last_name;	1403	int last_name;
1240	mapface face;	1404	mapface face;
1241	int sw4 = (sw + 3) & ~3;
1242	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1243	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1244		1405
1245	memset (darkness, 255, sw4 * sh);
1246	SvPOK_only (darkness_sv);
1247	SvCUR_set (darkness_sv, sw4 * sh);
1248
1249	vx = self->x + (self->w - sw) / 2 - shift_x;	1406	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1250	vy = self->y + (self->h - sh) / 2 - shift_y;	1407	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1251		1408
1252	/*	1409	/*
1253	int vx = self->vx = self->w >= sw	1410	int vx = self->vx = self->w >= sw
1254	? self->x + (self->w - sw) / 2	1411	? self->x + (self->w - sw) / 2
1255	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1412	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1259	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1416	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1260	*/	1417	*/
1261		1418
1262	glColor4ub (255, 255, 255, 255);	1419	glColor4ub (255, 255, 255, 255);
1263		1420
		1421	glEnable (GL_BLEND);
1264	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1422	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1265	glEnable (GL_BLEND);
1266	glEnable (GL_TEXTURE_2D);	1423	glEnable (GL_TEXTURE_2D);
1267	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1424	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1268		1425
1269	glBegin (GL_QUADS);	1426	glBegin (GL_QUADS);
1270		1427
…		…
1278		1435
1279	for (x = 0; x < sw; x++)	1436	for (x = 0; x < sw; x++)
1280	if (row->c0 <= x + vx && x + vx < row->c1)	1437	if (row->c0 <= x + vx && x + vx < row->c1)
1281	{	1438	{
1282	mapcell *cell = row->col + (x + vx - row->c0);	1439	mapcell *cell = row->col + (x + vx - row->c0);
1283
1284	darkness[y * sw4 + x] = cell->darkness < 0
1285	? 255 - FOW_DARKNESS
1286	: 255 - cell->darkness;
1287		1440
1288	face = cell->face [z];	1441	face = cell->face [z];
1289		1442
1290	if (face)	1443	if (face)
1291	{	1444	{
…		…
1312		1465
1313	glEnd ();	1466	glEnd ();
1314		1467
1315	glDisable (GL_TEXTURE_2D);	1468	glDisable (GL_TEXTURE_2D);
1316	glDisable (GL_BLEND);	1469	glDisable (GL_BLEND);
		1470	}
		1471
		1472	void
		1473	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1474	CODE:
		1475	{
		1476	static float color[16][3] = {
		1477	{ 0.00F, 0.00F, 0.00F },
		1478	{ 1.00F, 1.00F, 1.00F },
		1479	{ 0.00F, 0.00F, 0.55F },
		1480	{ 1.00F, 0.00F, 0.00F },
		1481
		1482	{ 1.00F, 0.54F, 0.00F },
		1483	{ 0.11F, 0.56F, 1.00F },
		1484	{ 0.93F, 0.46F, 0.00F },
		1485	{ 0.18F, 0.54F, 0.34F },
		1486
		1487	{ 0.56F, 0.73F, 0.56F },
		1488	{ 0.80F, 0.80F, 0.80F },
		1489	{ 0.55F, 0.41F, 0.13F },
		1490	{ 0.99F, 0.77F, 0.26F },
		1491
		1492	{ 0.74F, 0.65F, 0.41F },
		1493
		1494	{ 0.00F, 1.00F, 1.00F },
		1495	{ 1.00F, 0.00F, 1.00F },
		1496	{ 1.00F, 1.00F, 0.00F },
		1497	};
		1498
		1499	int x, y;
		1500
		1501	glEnable (GL_TEXTURE_2D);
		1502	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1503	glEnable (GL_BLEND);
		1504	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1505	glBegin (GL_QUADS);
		1506
		1507	for (y = 0; y < h; y++)
		1508	for (x = 0; x < w; x++)
		1509	{
		1510	unsigned char m = data [x + y * w];
		1511
		1512	if (m)
		1513	{
		1514	float *c = color [m & 15];
		1515
		1516	float tx1 = m & 0x40 ? 0.5 : 0.;
		1517	float tx2 = tx1 + 0.5;
		1518
		1519	glColor4f (c[0], c[1], c[2], 0.75);
		1520	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1521	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1522	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1523	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1524	}
		1525	}
		1526
		1527	glEnd ();
		1528	glDisable (GL_BLEND);
		1529	glDisable (GL_TEXTURE_2D);
		1530	}
		1531
		1532	void
		1533	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1534	PPCODE:
		1535	{
		1536	int vx, vy;
		1537	int x, y;
		1538	int sw4 = (sw + 3) & ~3;
		1539	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
		1540	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
		1541
		1542	memset (darkness, 255, sw4 * sh);
		1543	SvPOK_only (darkness_sv);
		1544	SvCUR_set (darkness_sv, sw4 * sh);
		1545
		1546	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1547	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1548
		1549	for (y = 0; y < sh; y++)
		1550	if (0 <= y + vy && y + vy < self->rows)
		1551	{
		1552	maprow *row = self->row + (y + vy);
		1553
		1554	for (x = 0; x < sw; x++)
		1555	if (row->c0 <= x + vx && x + vx < row->c1)
		1556	{
		1557	mapcell *cell = row->col + (x + vx - row->c0);
		1558
		1559	darkness[y * sw4 + x] = cell->darkness
		1560	? 255 - cell->darkness + 1
		1561	: 255 - FOW_DARKNESS;
		1562	}
		1563	}
1317		1564
1318	EXTEND (SP, 3);	1565	EXTEND (SP, 3);
1319	PUSHs (sv_2mortal (newSViv (sw4)));	1566	PUSHs (sv_2mortal (newSViv (sw4)));
1320	PUSHs (sv_2mortal (newSViv (sh)));	1567	PUSHs (sv_2mortal (newSViv (sh)));
1321	PUSHs (darkness_sv);	1568	PUSHs (darkness_sv);
1322	}	1569	}
1323		1570
1324	SV *	1571	SV *
1325	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1572	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1326	CODE:	1573	CODE:
1327	{	1574	{
1328	int x, y, x1, y1;	1575	int x, y, x1, y1;
1329	SV *data_sv = newSV (w * h * 7 + 5);	1576	SV *data_sv = newSV (w * h * 7 + 5);
1330	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1577	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1392	}	1639	}
1393	OUTPUT:	1640	OUTPUT:
1394	RETVAL	1641	RETVAL
1395		1642
1396	void	1643	void
1397	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1644	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1398	PPCODE:	1645	PPCODE:
1399	{	1646	{
1400	int x, y, z;	1647	int x, y, z;
1401	int w, h;	1648	int w, h;
1402	int x1, y1;	1649	int x1, y1;
…		…
1434		1681
1435	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	1682	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1436	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	1683	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1437	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	1684	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1438		1685
1439	if (cell->darkness <= 0)	1686	if (cell->darkness <= 1)
1440	{	1687	{
1441	cell->darkness = -1;	1688	cell->darkness = 0;
1442		1689
1443	for (z = 0; z <= 2; z++)	1690	for (z = 0; z <= 2; z++)
1444	{	1691	{
1445	cell->face[z] = face[z];	1692	cell->face[z] = face[z];
1446		1693
…		…
1451	}	1698	}
1452	}	1699	}
1453	}	1700	}
1454	}	1701	}
1455		1702
1456	MODULE = CFClient PACKAGE = CFClient::MixChunk	1703	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1457		1704
1458	CFClient::MixChunk	1705	CFPlus::MixChunk
1459	new_from_file (SV *class, char *path)	1706	new_from_file (SV *class, char *path)
1460	CODE:	1707	CODE:
1461	RETVAL = Mix_LoadWAV (path);	1708	RETVAL = Mix_LoadWAV (path);
1462	OUTPUT:	1709	OUTPUT:
1463	RETVAL	1710	RETVAL
1464		1711
1465	void	1712	void
1466	DESTROY (CFClient::MixChunk self)	1713	DESTROY (CFPlus::MixChunk self)
1467	CODE:	1714	CODE:
1468	Mix_FreeChunk (self);	1715	Mix_FreeChunk (self);
1469		1716
1470	int	1717	int
1471	volume (CFClient::MixChunk self, int volume = -1)	1718	volume (CFPlus::MixChunk self, int volume = -1)
1472	CODE:	1719	CODE:
1473	RETVAL = Mix_VolumeChunk (self, volume);	1720	RETVAL = Mix_VolumeChunk (self, volume);
1474	OUTPUT:	1721	OUTPUT:
1475	RETVAL	1722	RETVAL
1476		1723
1477	int	1724	int
1478	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1725	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1479	CODE:	1726	CODE:
1480	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1727	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1481	OUTPUT:	1728	OUTPUT:
1482	RETVAL	1729	RETVAL
1483		1730
1484	MODULE = CFClient PACKAGE = CFClient::MixMusic	1731	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1485		1732
1486	int	1733	int
1487	volume (int volume = -1)	1734	volume (int volume = -1)
1488	CODE:	1735	CODE:
1489	RETVAL = Mix_VolumeMusic (volume);	1736	RETVAL = Mix_VolumeMusic (volume);
1490	OUTPUT:	1737	OUTPUT:
1491	RETVAL	1738	RETVAL
1492		1739
1493	CFClient::MixMusic	1740	CFPlus::MixMusic
1494	new_from_file (SV *class, char *path)	1741	new_from_file (SV *class, char *path)
1495	CODE:	1742	CODE:
1496	RETVAL = Mix_LoadMUS (path);	1743	RETVAL = Mix_LoadMUS (path);
1497	OUTPUT:	1744	OUTPUT:
1498	RETVAL	1745	RETVAL
1499		1746
1500	void	1747	void
1501	DESTROY (CFClient::MixMusic self)	1748	DESTROY (CFPlus::MixMusic self)
1502	CODE:	1749	CODE:
1503	Mix_FreeMusic (self);	1750	Mix_FreeMusic (self);
1504		1751
1505	int	1752	int
1506	play (CFClient::MixMusic self, int loops = -1)	1753	play (CFPlus::MixMusic self, int loops = -1)
1507	CODE:	1754	CODE:
1508	RETVAL = Mix_PlayMusic (self, loops);	1755	RETVAL = Mix_PlayMusic (self, loops);
1509	OUTPUT:	1756	OUTPUT:
1510	RETVAL	1757	RETVAL
1511		1758
1512	MODULE = CFClient PACKAGE = CFClient::OpenGL	1759	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1513		1760
1514	BOOT:	1761	BOOT:
1515	{	1762	{
1516	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1763	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1517	static const struct {	1764	static const struct {
1518	const char *name;	1765	const char *name;
1519	IV iv;	1766	IV iv;
1520	} *civ, const_iv[] = {	1767	} *civ, const_iv[] = {
1521	# define const_iv(name) { # name, (IV)name }	1768	# define const_iv(name) { # name, (IV)name }
…		…
1528	const_iv (GL_SCISSOR_TEST),	1775	const_iv (GL_SCISSOR_TEST),
1529	const_iv (GL_DEPTH_TEST),	1776	const_iv (GL_DEPTH_TEST),
1530	const_iv (GL_ALPHA_TEST),	1777	const_iv (GL_ALPHA_TEST),
1531	const_iv (GL_NORMALIZE),	1778	const_iv (GL_NORMALIZE),
1532	const_iv (GL_RESCALE_NORMAL),	1779	const_iv (GL_RESCALE_NORMAL),
		1780	const_iv (GL_FRONT),
		1781	const_iv (GL_BACK),
1533	const_iv (GL_AND),	1782	const_iv (GL_AND),
1534	const_iv (GL_ONE),	1783	const_iv (GL_ONE),
1535	const_iv (GL_ZERO),	1784	const_iv (GL_ZERO),
1536	const_iv (GL_SRC_ALPHA),	1785	const_iv (GL_SRC_ALPHA),
1537	const_iv (GL_SRC_ALPHA_SATURATE),	1786	const_iv (GL_DST_ALPHA),
1538	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1787	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1539	const_iv (GL_ONE_MINUS_DST_ALPHA),	1788	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1789	const_iv (GL_SRC_ALPHA_SATURATE),
1540	const_iv (GL_RGB),	1790	const_iv (GL_RGB),
1541	const_iv (GL_RGBA),	1791	const_iv (GL_RGBA),
		1792	const_iv (GL_RGBA4),
		1793	const_iv (GL_RGBA8),
		1794	const_iv (GL_RGB5_A1),
1542	const_iv (GL_UNSIGNED_BYTE),	1795	const_iv (GL_UNSIGNED_BYTE),
1543	const_iv (GL_UNSIGNED_SHORT),	1796	const_iv (GL_UNSIGNED_SHORT),
1544	const_iv (GL_UNSIGNED_INT),	1797	const_iv (GL_UNSIGNED_INT),
1545	const_iv (GL_ALPHA),	1798	const_iv (GL_ALPHA),
1546	const_iv (GL_INTENSITY),	1799	const_iv (GL_INTENSITY),
…		…
1578	const_iv (GL_SEPARABLE_2D),	1831	const_iv (GL_SEPARABLE_2D),
1579	const_iv (GL_CONVOLUTION_2D),	1832	const_iv (GL_CONVOLUTION_2D),
1580	const_iv (GL_CONVOLUTION_BORDER_MODE),	1833	const_iv (GL_CONVOLUTION_BORDER_MODE),
1581	const_iv (GL_CONSTANT_BORDER),	1834	const_iv (GL_CONSTANT_BORDER),
1582	const_iv (GL_LINES),	1835	const_iv (GL_LINES),
		1836	const_iv (GL_LINE_STRIP),
1583	const_iv (GL_LINE_LOOP),	1837	const_iv (GL_LINE_LOOP),
1584	const_iv (GL_QUADS),	1838	const_iv (GL_QUADS),
1585	const_iv (GL_QUAD_STRIP),	1839	const_iv (GL_QUAD_STRIP),
1586	const_iv (GL_TRIANGLES),	1840	const_iv (GL_TRIANGLES),
1587	const_iv (GL_TRIANGLE_STRIP),	1841	const_iv (GL_TRIANGLE_STRIP),
…		…
1620	OUTPUT:	1874	OUTPUT:
1621	RETVAL	1875	RETVAL
1622		1876
1623	int glGetError ()	1877	int glGetError ()
1624		1878
		1879	void glFinish ()
		1880
1625	void glClear (int mask)	1881	void glClear (int mask)
1626		1882
1627	void glClearColor (float r, float g, float b, float a = 1.0)	1883	void glClearColor (float r, float g, float b, float a = 1.0)
1628	PROTOTYPE: @	1884	PROTOTYPE: @
1629		1885
…		…
1635		1891
1636	void glHint (int target, int mode)	1892	void glHint (int target, int mode)
1637		1893
1638	void glBlendFunc (int sfactor, int dfactor)	1894	void glBlendFunc (int sfactor, int dfactor)
1639		1895
		1896	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1897	CODE:
		1898	gl_BlendFuncSeparate (sa, da, saa, daa);
		1899
1640	void glDepthMask (int flag)	1900	void glDepthMask (int flag)
1641		1901
1642	void glLogicOp (int opcode)	1902	void glLogicOp (int opcode)
1643		1903
1644	void glColorMask (int red, int green, int blue, int alpha)	1904	void glColorMask (int red, int green, int blue, int alpha)
…		…
1648	void glPushMatrix ()	1908	void glPushMatrix ()
1649		1909
1650	void glPopMatrix ()	1910	void glPopMatrix ()
1651		1911
1652	void glLoadIdentity ()	1912	void glLoadIdentity ()
		1913
		1914	void glDrawBuffer (int buffer)
		1915
		1916	void glReadBuffer (int buffer)
1653		1917
1654	# near_ and far_ are due to microsofts buggy "c" compiler	1918	# near_ and far_ are due to microsofts buggy "c" compiler
1655	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1919	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1656		1920
1657	# near_ and far_ are due to microsofts buggy "c" compiler	1921	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1677		1941
1678	void glEnd ()	1942	void glEnd ()
1679		1943
1680	void glColor (float r, float g, float b, float a = 1.0)	1944	void glColor (float r, float g, float b, float a = 1.0)
1681	PROTOTYPE: @	1945	PROTOTYPE: @
		1946	ALIAS:
		1947	glColor_premultiply = 1
1682	CODE:	1948	CODE:
		1949	if (ix)
		1950	{
		1951	r *= a;
		1952	g *= a;
		1953	b *= a;
		1954	}
1683	// microsoft visual "c" rounds instead of truncating...	1955	// microsoft visual "c" rounds instead of truncating...
1684	glColor4ub (MIN ((int)(r * 255.f), 255),	1956	glColor4f (r, g, b, a);
1685	MIN ((int)(g * 255.f), 255),
1686	MIN ((int)(b * 255.f), 255),
1687	MIN ((int)(a * 255.f), 255));
1688		1957
1689	void glInterleavedArrays (int format, int stride, char *data)	1958	void glInterleavedArrays (int format, int stride, char *data)
1690		1959
1691	void glDrawElements (int mode, int count, int type, char *indices)	1960	void glDrawElements (int mode, int count, int type, char *indices)
1692		1961
…		…
1715		1984
1716	void glBindTexture (int target, int name)	1985	void glBindTexture (int target, int name)
1717		1986
1718	void glConvolutionParameter (int target, int pname, float params)	1987	void glConvolutionParameter (int target, int pname, float params)
1719	CODE:	1988	CODE:
1720	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1989	if (gl.ConvolutionParameterf)
		1990	gl.ConvolutionParameterf (target, pname, params);
1721		1991
1722	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1992	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1723	CODE:	1993	CODE:
1724	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1994	if (gl.ConvolutionFilter2D)
1725	(target, internalformat, width, height, format, type, data));	1995	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1726		1996
1727	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	1997	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1728	CODE:	1998	CODE:
1729	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1999	if (gl.SeparableFilter2D)
1730	(target, internalformat, width, height, format, type, row, column));	2000	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1731		2001
1732	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2002	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1733		2003
1734	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2004	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1735		2005
…		…
1768		2038
1769	void glEndList ()	2039	void glEndList ()
1770		2040
1771	void glCallList (int list)	2041	void glCallList (int list)
1772		2042
1773

Diff Legend

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