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.97 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.143 by root, Fri Aug 18 02:23:39 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:
967	{	1093	{
968	HV *hv = (HV *)SvRV (self);	1094	HV *hv = (HV *)SvRV (self);
969	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1095	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
970	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1096	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
971	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1097	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
972	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
973		1098
974	if (items < 5)	1099	if (items < 5)
975	{	1100	{
976	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1101	w = SvNV (*hv_fetch (hv, "w", 1, 1));
977	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1102	h = SvNV (*hv_fetch (hv, "h", 1, 1));
978	}	1103	}
979		1104
980	if (ix)	1105	if (ix)
981	{	1106	{
982	glEnable (GL_BLEND);	1107	glEnable (GL_BLEND);
		1108
		1109	if (ix == 2)
983	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
984	glEnable (GL_ALPHA_TEST);	1115	glEnable (GL_ALPHA_TEST);
985	glAlphaFunc (GL_GREATER, 0.01f);	1116	glAlphaFunc (GL_GREATER, 0.01f);
986	}	1117	}
987		1118
988	glBindTexture (GL_TEXTURE_2D, name);	1119	glBindTexture (GL_TEXTURE_2D, name);
989
990	if (wrap_mode)
991	{
992	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
993	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
994	}
995		1120
996	glBegin (GL_QUADS);	1121	glBegin (GL_QUADS);
997	glTexCoord2f (0, 0); glVertex2f (x , y );	1122	glTexCoord2f (0, 0); glVertex2f (x , y );
998	glTexCoord2f (0, t); glVertex2f (x , y + h);	1123	glTexCoord2f (0, t); glVertex2f (x , y + h);
999	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1124	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1005	glDisable (GL_ALPHA_TEST);	1130	glDisable (GL_ALPHA_TEST);
1006	glDisable (GL_BLEND);	1131	glDisable (GL_BLEND);
1007	}	1132	}
1008	}	1133	}
1009		1134
1010	MODULE = CFClient PACKAGE = CFClient::Map	1135	MODULE = CFPlus PACKAGE = CFPlus::Map
1011		1136
1012	CFClient::Map	1137	CFPlus::Map
1013	new (SV *class, int map_width, int map_height)	1138	new (SV *class, int map_width, int map_height)
1014	CODE:	1139	CODE:
1015	New (0, RETVAL, 1, struct map);	1140	New (0, RETVAL, 1, struct map);
1016	RETVAL->x = 0;	1141	RETVAL->x = 0;
1017	RETVAL->y = 0;	1142	RETVAL->y = 0;
…		…
1027	RETVAL->row = 0;	1152	RETVAL->row = 0;
1028	OUTPUT:	1153	OUTPUT:
1029	RETVAL	1154	RETVAL
1030		1155
1031	void	1156	void
1032	DESTROY (CFClient::Map self)	1157	DESTROY (CFPlus::Map self)
1033	CODE:	1158	CODE:
1034	{	1159	{
1035	map_clear (self);	1160	map_clear (self);
1036	Safefree (self->face);	1161	Safefree (self->face);
		1162	Safefree (self->tex);
1037	Safefree (self);	1163	Safefree (self);
1038	}	1164	}
1039		1165
1040	void	1166	void
1041	clear (CFClient::Map self)	1167	clear (CFPlus::Map self)
1042	CODE:	1168	CODE:
1043	map_clear (self);	1169	map_clear (self);
1044		1170
1045	void	1171	void
1046	set_face (CFClient::Map self, int face, int texid)	1172	set_face (CFPlus::Map self, int face, int texid)
1047	CODE:	1173	CODE:
1048	{	1174	{
1049	while (self->faces <= face)	1175	while (self->faces <= face)
1050	{	1176	{
1051	Append (mapface, self->face, self->faces, self->faces);	1177	Append (mapface, self->face, self->faces, self->faces);
…		…
1054		1180
1055	self->face [face] = texid;	1181	self->face [face] = texid;
1056	}	1182	}
1057		1183
1058	void	1184	void
1059	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)
1060	CODE:	1186	CODE:
1061	{	1187	{
1062	while (self->texs <= texid)	1188	while (self->texs <= texid)
1063	{	1189	{
1064	Append (maptex, self->tex, self->texs, self->texs);	1190	Append (maptex, self->tex, self->texs, self->texs);
…		…
1080	}	1206	}
1081		1207
1082	// somewhat hackish, but for textures that require it, it really	1208	// somewhat hackish, but for textures that require it, it really
1083	// improves the look, and most others don't suffer.	1209	// improves the look, and most others don't suffer.
1084	glBindTexture (GL_TEXTURE_2D, name);	1210	glBindTexture (GL_TEXTURE_2D, name);
1085	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	1211	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1086	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);
1087	}	1216	}
1088		1217
1089	int	1218	int
1090	ox (CFClient::Map self)	1219	ox (CFPlus::Map self)
1091	ALIAS:	1220	ALIAS:
1092	oy = 1	1221	oy = 1
		1222	x = 2
		1223	y = 3
		1224	w = 4
		1225	h = 5
1093	CODE:	1226	CODE:
1094	switch (ix)	1227	switch (ix)
1095	{	1228	{
1096	case 0: RETVAL = self->ox; break;	1229	case 0: RETVAL = self->ox; break;
1097	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;
1098	}	1235	}
1099	OUTPUT:	1236	OUTPUT:
1100	RETVAL	1237	RETVAL
1101		1238
1102	void	1239	void
1103	scroll (CFClient::Map self, int dx, int dy)	1240	scroll (CFPlus::Map self, int dx, int dy)
1104	CODE:	1241	CODE:
1105	{	1242	{
1106	if (dx > 0)	1243	if (dx > 0)
1107	map_blank (self, self->x, self->y, dx - 1, self->h);	1244	map_blank (self, self->x, self->y, dx - 1, self->h);
1108	else if (dx < 0)	1245	else if (dx < 0)
…		…
1124	self->y += MAP_EXTEND_Y;	1261	self->y += MAP_EXTEND_Y;
1125	}	1262	}
1126	}	1263	}
1127		1264
1128	void	1265	void
1129	map1a_update (CFClient::Map self, SV *data_)	1266	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1130	CODE:	1267	CODE:
1131	{	1268	{
1132	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1269	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1133	uint8_t *data_end = (uint8_t *)SvEND (data_);	1270	uint8_t *data_end = (uint8_t *)SvEND (data_);
1134	mapcell *cell;	1271	mapcell *cell;
…		…
1136		1273
1137	while (data < data_end)	1274	while (data < data_end)
1138	{	1275	{
1139	flags = (data [0] << 8) + data [1]; data += 2;	1276	flags = (data [0] << 8) + data [1]; data += 2;
1140		1277
1141	x = ((flags >> 10) & 63) + self->x;	1278	x = self->x + ((flags >> 10) & 63);
1142	y = ((flags >> 4) & 63) + self->y;	1279	y = self->y + ((flags >> 4) & 63);
1143		1280
1144	cell = map_get_cell (self, x, y);	1281	cell = map_get_cell (self, x, y);
1145		1282
1146	if (flags & 15)	1283	if (flags & 15)
1147	{	1284	{
1148	if (cell->darkness < 0)	1285	if (!cell->darkness)
1149	{	1286	{
1150	cell->darkness = 0;	1287	cell->darkness = 256;
1151	cell->face [0] = 0;	1288	cell->face [0] = 0;
1152	cell->face [1] = 0;	1289	cell->face [1] = 0;
1153	cell->face [2] = 0;	1290	cell->face [2] = 0;
		1291	cell->stat_hp = 0;
1154	}	1292	}
1155		1293
1156	cell->darkness = flags & 8 ? *data++ : 255;
1157
1158	//TODO: don't trust server data to be in-range(!)	1294	//TODO: don't trust server data to be in-range(!)
		1295
		1296	if (flags & 8)
		1297	{
		1298	if (extmap)
		1299	{
		1300	uint8_t ext, cmd;
		1301
		1302	do
		1303	{
		1304	ext = *data++;
		1305	cmd = ext & 0x7f;
		1306
		1307	if (ext < 4)
		1308	cell->darkness = 255 - ext * 64 + 1;
		1309	else if (ext == 5) // health
		1310	cell->stat_hp = *data++;
		1311	}
		1312	while (cmd & 0x80);
		1313	}
		1314	else
		1315	cell->darkness = *data++ + 1;
		1316	}
1159		1317
1160	if (flags & 4)	1318	if (flags & 4)
1161	{	1319	{
1162	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1320	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1163	}	1321	}
…		…
1171	{	1329	{
1172	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1330	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1173	}	1331	}
1174	}	1332	}
1175	else	1333	else
1176	cell->darkness = -1;	1334	cell->darkness = 0;
1177	}	1335	}
1178	}	1336	}
1179		1337
1180	SV *	1338	SV *
1181	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1339	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1182	CODE:	1340	CODE:
1183	{	1341	{
1184	int x1, x;	1342	int x1, x;
1185	int y1, y;	1343	int y1, y;
1186	int z;	1344	int z;
…		…
1236	}	1394	}
1237	OUTPUT:	1395	OUTPUT:
1238	RETVAL	1396	RETVAL
1239		1397
1240	void	1398	void
1241	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1399	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1242	PPCODE:	1400	CODE:
1243	{	1401	{
1244	int vx, vy;	1402	int vx, vy;
1245	int x, y, z;	1403	int x, y, z;
1246	int last_name;	1404	int last_name;
1247	mapface face;	1405	mapface face;
1248	int sw4 = (sw + 3) & ~3;
1249	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1250	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1251		1406
1252	memset (darkness, 255, sw4 * sh);
1253	SvPOK_only (darkness_sv);
1254	SvCUR_set (darkness_sv, sw4 * sh);
1255
1256	vx = self->x + (self->w - sw) / 2 - shift_x;	1407	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1257	vy = self->y + (self->h - sh) / 2 - shift_y;	1408	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1258		1409
1259	/*	1410	/*
1260	int vx = self->vx = self->w >= sw	1411	int vx = self->vx = self->w >= sw
1261	? self->x + (self->w - sw) / 2	1412	? self->x + (self->w - sw) / 2
1262	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1413	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1266	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1417	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1267	*/	1418	*/
1268		1419
1269	glColor4ub (255, 255, 255, 255);	1420	glColor4ub (255, 255, 255, 255);
1270		1421
		1422	glEnable (GL_BLEND);
1271	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1423	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1272	glEnable (GL_BLEND);
1273	glEnable (GL_TEXTURE_2D);	1424	glEnable (GL_TEXTURE_2D);
1274	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1425	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1275		1426
1276	glBegin (GL_QUADS);	1427	glBegin (GL_QUADS);
1277		1428
…		…
1285		1436
1286	for (x = 0; x < sw; x++)	1437	for (x = 0; x < sw; x++)
1287	if (row->c0 <= x + vx && x + vx < row->c1)	1438	if (row->c0 <= x + vx && x + vx < row->c1)
1288	{	1439	{
1289	mapcell *cell = row->col + (x + vx - row->c0);	1440	mapcell *cell = row->col + (x + vx - row->c0);
1290
1291	darkness[y * sw4 + x] = cell->darkness < 0
1292	? 255 - FOW_DARKNESS
1293	: 255 - cell->darkness;
1294		1441
1295	face = cell->face [z];	1442	face = cell->face [z];
1296		1443
1297	if (face)	1444	if (face)
1298	{	1445	{
…		…
1320	glEnd ();	1467	glEnd ();
1321		1468
1322	glDisable (GL_TEXTURE_2D);	1469	glDisable (GL_TEXTURE_2D);
1323	glDisable (GL_BLEND);	1470	glDisable (GL_BLEND);
1324		1471
		1472	for (y = 0; y < sh; y++)
		1473	if (0 <= y + vy && y + vy < self->rows)
		1474	{
		1475	maprow *row = self->row + (y + vy);
		1476
		1477	for (x = 0; x < sw; x++)
		1478	if (row->c0 <= x + vx && x + vx < row->c1)
		1479	{
		1480	mapcell *cell = row->col + (x + vx - row->c0);
		1481
		1482	int px = x * 32;
		1483	int py = y * 32;
		1484
		1485	if (cell->stat_hp)
		1486	{
		1487	glColor3ub (0, 0, 0);
		1488	glRectf (px + 1, py + 1, px + 31, py + 4);
		1489
		1490	glColor3ub (0, 255, 0);
		1491	glBegin (GL_LINES);
		1492	glVertex2f (px + 2, py + 2.5f);
		1493	glVertex2f (px + 29.f - cell->stat_hp * (28.f / 255.f), py + 2.5f);
		1494	glEnd ();
		1495	}
		1496	}
		1497	}
		1498	}
		1499
		1500	void
		1501	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1502	CODE:
		1503	{
		1504	static float color[16][3] = {
		1505	{ 0.00F, 0.00F, 0.00F },
		1506	{ 1.00F, 1.00F, 1.00F },
		1507	{ 0.00F, 0.00F, 0.55F },
		1508	{ 1.00F, 0.00F, 0.00F },
		1509
		1510	{ 1.00F, 0.54F, 0.00F },
		1511	{ 0.11F, 0.56F, 1.00F },
		1512	{ 0.93F, 0.46F, 0.00F },
		1513	{ 0.18F, 0.54F, 0.34F },
		1514
		1515	{ 0.56F, 0.73F, 0.56F },
		1516	{ 0.80F, 0.80F, 0.80F },
		1517	{ 0.55F, 0.41F, 0.13F },
		1518	{ 0.99F, 0.77F, 0.26F },
		1519
		1520	{ 0.74F, 0.65F, 0.41F },
		1521
		1522	{ 0.00F, 1.00F, 1.00F },
		1523	{ 1.00F, 0.00F, 1.00F },
		1524	{ 1.00F, 1.00F, 0.00F },
		1525	};
		1526
		1527	int x, y;
		1528
		1529	glEnable (GL_TEXTURE_2D);
		1530	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1531	glEnable (GL_BLEND);
		1532	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1533	glBegin (GL_QUADS);
		1534
		1535	for (y = 0; y < h; y++)
		1536	for (x = 0; x < w; x++)
		1537	{
		1538	unsigned char m = data [x + y * w];
		1539
		1540	if (m)
		1541	{
		1542	float *c = color [m & 15];
		1543
		1544	float tx1 = m & 0x40 ? 0.5 : 0.;
		1545	float tx2 = tx1 + 0.5;
		1546
		1547	glColor4f (c[0], c[1], c[2], 0.75);
		1548	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1549	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1550	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1551	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1552	}
		1553	}
		1554
		1555	glEnd ();
		1556	glDisable (GL_BLEND);
		1557	glDisable (GL_TEXTURE_2D);
		1558	}
		1559
		1560	void
		1561	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1562	PPCODE:
		1563	{
		1564	int vx, vy;
		1565	int x, y;
		1566	int sw4 = (sw + 3) & ~3;
		1567	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
		1568	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
		1569
		1570	memset (darkness, 255, sw4 * sh);
		1571	SvPOK_only (darkness_sv);
		1572	SvCUR_set (darkness_sv, sw4 * sh);
		1573
		1574	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1575	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1576
		1577	for (y = 0; y < sh; y++)
		1578	if (0 <= y + vy && y + vy < self->rows)
		1579	{
		1580	maprow *row = self->row + (y + vy);
		1581
		1582	for (x = 0; x < sw; x++)
		1583	if (row->c0 <= x + vx && x + vx < row->c1)
		1584	{
		1585	mapcell *cell = row->col + (x + vx - row->c0);
		1586
		1587	darkness[y * sw4 + x] = cell->darkness
		1588	? 255 - (cell->darkness - 1)
		1589	: 255 - FOW_DARKNESS;
		1590	}
		1591	}
		1592
1325	EXTEND (SP, 3);	1593	EXTEND (SP, 3);
1326	PUSHs (sv_2mortal (newSViv (sw4)));	1594	PUSHs (sv_2mortal (newSViv (sw4)));
1327	PUSHs (sv_2mortal (newSViv (sh)));	1595	PUSHs (sv_2mortal (newSViv (sh)));
1328	PUSHs (darkness_sv);	1596	PUSHs (darkness_sv);
1329	}	1597	}
1330		1598
1331	SV *	1599	SV *
1332	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1600	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1333	CODE:	1601	CODE:
1334	{	1602	{
1335	int x, y, x1, y1;	1603	int x, y, x1, y1;
1336	SV *data_sv = newSV (w * h * 7 + 5);	1604	SV *data_sv = newSV (w * h * 7 + 5);
1337	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1605	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1399	}	1667	}
1400	OUTPUT:	1668	OUTPUT:
1401	RETVAL	1669	RETVAL
1402		1670
1403	void	1671	void
1404	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1672	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1405	PPCODE:	1673	PPCODE:
1406	{	1674	{
1407	int x, y, z;	1675	int x, y, z;
1408	int w, h;	1676	int w, h;
1409	int x1, y1;	1677	int x1, y1;
…		…
1441		1709
1442	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	1710	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1443	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	1711	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1444	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	1712	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1445		1713
1446	if (cell->darkness <= 0)	1714	if (cell->darkness == 0)
1447	{	1715	{
1448	cell->darkness = -1;	1716	cell->darkness = 0;
1449		1717
1450	for (z = 0; z <= 2; z++)	1718	for (z = 0; z <= 2; z++)
1451	{	1719	{
1452	cell->face[z] = face[z];	1720	cell->face[z] = face[z];
1453		1721
…		…
1458	}	1726	}
1459	}	1727	}
1460	}	1728	}
1461	}	1729	}
1462		1730
1463	MODULE = CFClient PACKAGE = CFClient::MixChunk	1731	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1464		1732
1465	CFClient::MixChunk	1733	CFPlus::MixChunk
1466	new_from_file (SV *class, char *path)	1734	new_from_file (SV *class, char *path)
1467	CODE:	1735	CODE:
1468	RETVAL = Mix_LoadWAV (path);	1736	RETVAL = Mix_LoadWAV (path);
1469	OUTPUT:	1737	OUTPUT:
1470	RETVAL	1738	RETVAL
1471		1739
1472	void	1740	void
1473	DESTROY (CFClient::MixChunk self)	1741	DESTROY (CFPlus::MixChunk self)
1474	CODE:	1742	CODE:
1475	Mix_FreeChunk (self);	1743	Mix_FreeChunk (self);
1476		1744
1477	int	1745	int
1478	volume (CFClient::MixChunk self, int volume = -1)	1746	volume (CFPlus::MixChunk self, int volume = -1)
1479	CODE:	1747	CODE:
1480	RETVAL = Mix_VolumeChunk (self, volume);	1748	RETVAL = Mix_VolumeChunk (self, volume);
1481	OUTPUT:	1749	OUTPUT:
1482	RETVAL	1750	RETVAL
1483		1751
1484	int	1752	int
1485	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1753	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1486	CODE:	1754	CODE:
1487	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1755	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1488	OUTPUT:	1756	OUTPUT:
1489	RETVAL	1757	RETVAL
1490		1758
1491	MODULE = CFClient PACKAGE = CFClient::MixMusic	1759	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1492		1760
1493	int	1761	int
1494	volume (int volume = -1)	1762	volume (int volume = -1)
1495	CODE:	1763	CODE:
1496	RETVAL = Mix_VolumeMusic (volume);	1764	RETVAL = Mix_VolumeMusic (volume);
1497	OUTPUT:	1765	OUTPUT:
1498	RETVAL	1766	RETVAL
1499		1767
1500	CFClient::MixMusic	1768	CFPlus::MixMusic
1501	new_from_file (SV *class, char *path)	1769	new_from_file (SV *class, char *path)
1502	CODE:	1770	CODE:
1503	RETVAL = Mix_LoadMUS (path);	1771	RETVAL = Mix_LoadMUS (path);
1504	OUTPUT:	1772	OUTPUT:
1505	RETVAL	1773	RETVAL
1506		1774
1507	void	1775	void
1508	DESTROY (CFClient::MixMusic self)	1776	DESTROY (CFPlus::MixMusic self)
1509	CODE:	1777	CODE:
1510	Mix_FreeMusic (self);	1778	Mix_FreeMusic (self);
1511		1779
1512	int	1780	int
1513	play (CFClient::MixMusic self, int loops = -1)	1781	play (CFPlus::MixMusic self, int loops = -1)
1514	CODE:	1782	CODE:
1515	RETVAL = Mix_PlayMusic (self, loops);	1783	RETVAL = Mix_PlayMusic (self, loops);
1516	OUTPUT:	1784	OUTPUT:
1517	RETVAL	1785	RETVAL
1518		1786
1519	MODULE = CFClient PACKAGE = CFClient::OpenGL	1787	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1520		1788
1521	BOOT:	1789	BOOT:
1522	{	1790	{
1523	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1791	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1524	static const struct {	1792	static const struct {
1525	const char *name;	1793	const char *name;
1526	IV iv;	1794	IV iv;
1527	} *civ, const_iv[] = {	1795	} *civ, const_iv[] = {
1528	# define const_iv(name) { # name, (IV)name }	1796	# define const_iv(name) { # name, (IV)name }
…		…
1535	const_iv (GL_SCISSOR_TEST),	1803	const_iv (GL_SCISSOR_TEST),
1536	const_iv (GL_DEPTH_TEST),	1804	const_iv (GL_DEPTH_TEST),
1537	const_iv (GL_ALPHA_TEST),	1805	const_iv (GL_ALPHA_TEST),
1538	const_iv (GL_NORMALIZE),	1806	const_iv (GL_NORMALIZE),
1539	const_iv (GL_RESCALE_NORMAL),	1807	const_iv (GL_RESCALE_NORMAL),
		1808	const_iv (GL_FRONT),
		1809	const_iv (GL_BACK),
1540	const_iv (GL_AND),	1810	const_iv (GL_AND),
1541	const_iv (GL_ONE),	1811	const_iv (GL_ONE),
1542	const_iv (GL_ZERO),	1812	const_iv (GL_ZERO),
1543	const_iv (GL_SRC_ALPHA),	1813	const_iv (GL_SRC_ALPHA),
1544	const_iv (GL_SRC_ALPHA_SATURATE),	1814	const_iv (GL_DST_ALPHA),
1545	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1815	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1546	const_iv (GL_ONE_MINUS_DST_ALPHA),	1816	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1817	const_iv (GL_SRC_ALPHA_SATURATE),
1547	const_iv (GL_RGB),	1818	const_iv (GL_RGB),
1548	const_iv (GL_RGBA),	1819	const_iv (GL_RGBA),
		1820	const_iv (GL_RGBA4),
		1821	const_iv (GL_RGBA8),
		1822	const_iv (GL_RGB5_A1),
1549	const_iv (GL_UNSIGNED_BYTE),	1823	const_iv (GL_UNSIGNED_BYTE),
1550	const_iv (GL_UNSIGNED_SHORT),	1824	const_iv (GL_UNSIGNED_SHORT),
1551	const_iv (GL_UNSIGNED_INT),	1825	const_iv (GL_UNSIGNED_INT),
1552	const_iv (GL_ALPHA),	1826	const_iv (GL_ALPHA),
1553	const_iv (GL_INTENSITY),	1827	const_iv (GL_INTENSITY),
…		…
1562	const_iv (GL_TEXTURE_MAG_FILTER),	1836	const_iv (GL_TEXTURE_MAG_FILTER),
1563	const_iv (GL_TEXTURE_MIN_FILTER),	1837	const_iv (GL_TEXTURE_MIN_FILTER),
1564	const_iv (GL_TEXTURE_ENV_MODE),	1838	const_iv (GL_TEXTURE_ENV_MODE),
1565	const_iv (GL_TEXTURE_WRAP_S),	1839	const_iv (GL_TEXTURE_WRAP_S),
1566	const_iv (GL_TEXTURE_WRAP_T),	1840	const_iv (GL_TEXTURE_WRAP_T),
		1841	const_iv (GL_REPEAT),
1567	const_iv (GL_CLAMP),	1842	const_iv (GL_CLAMP),
1568	const_iv (GL_REPEAT),	1843	const_iv (GL_CLAMP_TO_EDGE),
1569	const_iv (GL_NEAREST),	1844	const_iv (GL_NEAREST),
1570	const_iv (GL_LINEAR),	1845	const_iv (GL_LINEAR),
1571	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1846	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1572	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1847	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1573	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1848	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1584	const_iv (GL_SEPARABLE_2D),	1859	const_iv (GL_SEPARABLE_2D),
1585	const_iv (GL_CONVOLUTION_2D),	1860	const_iv (GL_CONVOLUTION_2D),
1586	const_iv (GL_CONVOLUTION_BORDER_MODE),	1861	const_iv (GL_CONVOLUTION_BORDER_MODE),
1587	const_iv (GL_CONSTANT_BORDER),	1862	const_iv (GL_CONSTANT_BORDER),
1588	const_iv (GL_LINES),	1863	const_iv (GL_LINES),
		1864	const_iv (GL_LINE_STRIP),
1589	const_iv (GL_LINE_LOOP),	1865	const_iv (GL_LINE_LOOP),
1590	const_iv (GL_QUADS),	1866	const_iv (GL_QUADS),
1591	const_iv (GL_QUAD_STRIP),	1867	const_iv (GL_QUAD_STRIP),
1592	const_iv (GL_TRIANGLES),	1868	const_iv (GL_TRIANGLES),
1593	const_iv (GL_TRIANGLE_STRIP),	1869	const_iv (GL_TRIANGLE_STRIP),
…		…
1626	OUTPUT:	1902	OUTPUT:
1627	RETVAL	1903	RETVAL
1628		1904
1629	int glGetError ()	1905	int glGetError ()
1630		1906
		1907	void glFinish ()
		1908
1631	void glClear (int mask)	1909	void glClear (int mask)
1632		1910
1633	void glClearColor (float r, float g, float b, float a = 1.0)	1911	void glClearColor (float r, float g, float b, float a = 1.0)
1634	PROTOTYPE: @	1912	PROTOTYPE: @
1635		1913
…		…
1641		1919
1642	void glHint (int target, int mode)	1920	void glHint (int target, int mode)
1643		1921
1644	void glBlendFunc (int sfactor, int dfactor)	1922	void glBlendFunc (int sfactor, int dfactor)
1645		1923
		1924	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1925	CODE:
		1926	gl_BlendFuncSeparate (sa, da, saa, daa);
		1927
1646	void glDepthMask (int flag)	1928	void glDepthMask (int flag)
1647		1929
1648	void glLogicOp (int opcode)	1930	void glLogicOp (int opcode)
1649		1931
1650	void glColorMask (int red, int green, int blue, int alpha)	1932	void glColorMask (int red, int green, int blue, int alpha)
…		…
1654	void glPushMatrix ()	1936	void glPushMatrix ()
1655		1937
1656	void glPopMatrix ()	1938	void glPopMatrix ()
1657		1939
1658	void glLoadIdentity ()	1940	void glLoadIdentity ()
		1941
		1942	void glDrawBuffer (int buffer)
		1943
		1944	void glReadBuffer (int buffer)
1659		1945
1660	# near_ and far_ are due to microsofts buggy "c" compiler	1946	# near_ and far_ are due to microsofts buggy "c" compiler
1661	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1947	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1662		1948
1663	# near_ and far_ are due to microsofts buggy "c" compiler	1949	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1683		1969
1684	void glEnd ()	1970	void glEnd ()
1685		1971
1686	void glColor (float r, float g, float b, float a = 1.0)	1972	void glColor (float r, float g, float b, float a = 1.0)
1687	PROTOTYPE: @	1973	PROTOTYPE: @
		1974	ALIAS:
		1975	glColor_premultiply = 1
1688	CODE:	1976	CODE:
		1977	if (ix)
		1978	{
		1979	r *= a;
		1980	g *= a;
		1981	b *= a;
		1982	}
1689	// microsoft visual "c" rounds instead of truncating...	1983	// microsoft visual "c" rounds instead of truncating...
1690	glColor4ub (MIN ((int)(r * 255.f), 255),	1984	glColor4f (r, g, b, a);
1691	MIN ((int)(g * 255.f), 255),
1692	MIN ((int)(b * 255.f), 255),
1693	MIN ((int)(a * 255.f), 255));
1694		1985
1695	void glInterleavedArrays (int format, int stride, char *data)	1986	void glInterleavedArrays (int format, int stride, char *data)
1696		1987
1697	void glDrawElements (int mode, int count, int type, char *indices)	1988	void glDrawElements (int mode, int count, int type, char *indices)
1698		1989
…		…
1721		2012
1722	void glBindTexture (int target, int name)	2013	void glBindTexture (int target, int name)
1723		2014
1724	void glConvolutionParameter (int target, int pname, float params)	2015	void glConvolutionParameter (int target, int pname, float params)
1725	CODE:	2016	CODE:
1726	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2017	if (gl.ConvolutionParameterf)
		2018	gl.ConvolutionParameterf (target, pname, params);
1727		2019
1728	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2020	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1729	CODE:	2021	CODE:
1730	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2022	if (gl.ConvolutionFilter2D)
1731	(target, internalformat, width, height, format, type, data));	2023	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1732		2024
1733	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	2025	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1734	CODE:	2026	CODE:
1735	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2027	if (gl.SeparableFilter2D)
1736	(target, internalformat, width, height, format, type, row, column));	2028	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1737		2029
1738	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2030	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1739		2031
1740	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2032	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1741		2033
…		…
1774		2066
1775	void glEndList ()	2067	void glEndList ()
1776		2068
1777	void glCallList (int list)	2069	void glCallList (int list)
1778		2070
1779

Diff Legend

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