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.76 by root, Thu May 11 23:41:45 2006 UTC vs.
Revision 1.134 by root, Fri Aug 4 16:49:58 2006 UTC

1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
		3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2	# include <malloc.h>	4	# include <malloc.h>
		5	# include <windows.h>
3	# pragma warning(disable:4244)	6	# pragma warning(disable:4244)
4	#endif	7	#endif
5		8
6	#include "EXTERN.h"	9	#include "EXTERN.h"
7	#include "perl.h"	10	#include "perl.h"
8	#include "XSUB.h"	11	#include "XSUB.h"
9		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
		17	#include <math.h>
10	#include <string.h>	18	#include <string.h>
11	#include <stdio.h>	19	#include <stdio.h>
		20	#include <stdlib.h>
12		21
13	#include <SDL.h>	22	#include <SDL.h>
14	#include <SDL_endian.h>	23	#include <SDL_endian.h>
15	#include <SDL_image.h>	24	#include <SDL_image.h>
16	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
17	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
18		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
19	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
20		32
21	#include <pango/pango.h>	33	#include <pango/pango.h>
22	#include <pango/pangofc-fontmap.h>
23	#include <pango/pangoft2.h>
24	#include <pango/pangocairo.h>
25		34
26	#ifndef _WIN32	35	#ifndef _WIN32
27	# include <sys/types.h>	36	# include <sys/types.h>
28	# include <sys/socket.h>	37	# include <sys/socket.h>
29	# include <netinet/in.h>	38	# include <netinet/in.h>
…		…
36	typedef signed char int8_t;	45	typedef signed char int8_t;
37	typedef signed short int16_t;	46	typedef signed short int16_t;
38	typedef signed int int32_t;	47	typedef signed int int32_t;
39	#endif	48	#endif
40		49
41	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
42		51
43	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
44		53
45	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
46	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
47		56
48	#define MIN_FONT_HEIGHT 10	57	#define MIN_FONT_HEIGHT 10
49		58
50	#define GL_CALL(type,func,args) \	59	#if 0
51	{ \	60	# define PARACHUTE SDL_INIT_NOPARACHUTE
52	static int init_; \	61	#else
53	static type fptr_; \	62	# define PARACHUTE 0
54	\	63	#endif
55	if (!init_) \
56	{ \
57	init_ = 1; \
58	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
59	} \
60	\
61	if (fptr_) \
62	fptr_ args; \
63	}
64		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
65	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
66	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
67		90
68	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	}
69		110
70	typedef struct cf_layout {	111	typedef struct cf_layout {
71	PangoLayout *pl; // either derived from a cairo or ft2 context	112	PangoLayout *pl;
72	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
73	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
74	int base_height;	114	int base_height;
75	CFClient__Font font;	115	CFPlus__Font font;
76	} *CFClient__Layout;	116	} *CFPlus__Layout;
77		117
78	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
79	static PangoContext *ft2_context, *cairo_context;	119	static PangoContext *opengl_context;
80	static PangoFontMap *ft2_fontmap, *cairo_fontmap;	120	static PangoFontMap *opengl_fontmap;
81		121
82	static void	122	static void
83	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
84	{	124	{
85	FcPatternAddBool (pattern, FC_HINTING , 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
		126	#ifdef FC_HINT_STYLE
		127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		128	#endif
86	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
87	}	130	}
88		131
89	static void	132	static void
90	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
91	{	134	{
92	/* 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
93	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
94	*/	137	*/
95	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
99		142
100	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
101	}	144	}
102		145
103	static void	146	static void
104	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	147	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
105	{	148	{
106	pango_layout_get_pixel_size (self->pl, w, h);	149	pango_layout_get_pixel_size (self->pl, w, h);
107		150
108	if (!*w) *w = 1;	151	if (!*w) *w = 1;
109	if (!*h) *h = 1;	152	if (!*h) *h = 1;
…		…
139	int texs;	182	int texs;
140	maptex *tex;	183	maptex *tex;
141		184
142	int32_t rows;	185	int32_t rows;
143	maprow *row;	186	maprow *row;
144	} *CFClient__Map;	187	} *CFPlus__Map;
145		188
146	static char *	189	static char *
147	prepend (char *ptr, int sze, int inc)	190	prepend (char *ptr, int sze, int inc)
148	{	191	{
149	char *p;	192	char *p;
…		…
167		210
168	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	211	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
169	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	212	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
170		213
171	static maprow *	214	static maprow *
172	map_get_row (CFClient__Map self, int y)	215	map_get_row (CFPlus__Map self, int y)
173	{	216	{
174	if (0 > y)	217	if (0 > y)
175	{	218	{
176	int extend = - y + MAP_EXTEND_Y;	219	int extend = - y + MAP_EXTEND_Y;
177	Prepend (maprow, self->row, self->rows, extend);	220	Prepend (maprow, self->row, self->rows, extend);
…		…
215		258
216	return row->col + (x - row->c0);	259	return row->col + (x - row->c0);
217	}	260	}
218		261
219	static mapcell *	262	static mapcell *
220	map_get_cell (CFClient__Map self, int x, int y)	263	map_get_cell (CFPlus__Map self, int x, int y)
221	{	264	{
222	return row_get_cell (map_get_row (self, y), x);	265	return row_get_cell (map_get_row (self, y), x);
223	}	266	}
224		267
225	static void	268	static void
226	map_clear (CFClient__Map self)	269	map_clear (CFPlus__Map self)
227	{	270	{
228	int r;	271	int r;
229		272
230	for (r = 0; r < self->rows; r++)	273	for (r = 0; r < self->rows; r++)
231	Safefree (self->row[r].col);	274	Safefree (self->row[r].col);
…		…
239	self->row = 0;	282	self->row = 0;
240	self->rows = 0;	283	self->rows = 0;
241	}	284	}
242		285
243	static void	286	static void
244	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	287	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
245	{	288	{
246	int x, y;	289	int x, y;
247	maprow *row;	290	maprow *row;
248		291
249	for (y = y0; y < y0 + h; y++)	292	for (y = y0; y < y0 + h; y++)
…		…
289	ev.data2 = 0;	332	ev.data2 = 0;
290		333
291	SDL_PushEvent ((SDL_Event *)&ev);	334	SDL_PushEvent ((SDL_Event *)&ev);
292	}	335	}
293		336
		337	static unsigned int
		338	minpot (unsigned int n)
		339	{
		340	if (!n)
		341	return 0;
		342
		343	--n;
		344
		345	n |= n >> 1;
		346	n |= n >> 2;
		347	n |= n >> 4;
		348	n |= n >> 8;
		349	n |= n >> 16;
		350
		351	return n + 1;
		352	}
		353
294	MODULE = CFClient PACKAGE = CFClient	354	MODULE = CFPlus PACKAGE = CFPlus
295		355
296	PROTOTYPES: ENABLE	356	PROTOTYPES: ENABLE
297		357
298	BOOT:	358	BOOT:
299	{	359	{
300	HV *stash = gv_stashpv ("CFClient", 1);	360	HV *stash = gv_stashpv ("CFPlus", 1);
301	static const struct {	361	static const struct {
302	const char *name;	362	const char *name;
303	IV iv;	363	IV iv;
304	} *civ, const_iv[] = {	364	} *civ, const_iv[] = {
305	# define const_iv(name) { # name, (IV)name }	365	# define const_iv(name) { # name, (IV)name }
…		…
404	# undef const_iv	464	# undef const_iv
405	};	465	};
406		466
407	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	467	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
408	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	468	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
409
410	ft2_fontmap = pango_ft2_font_map_new ();
411	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
412	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
413
414	cairo_fontmap = pango_cairo_font_map_get_default ();
415	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
416	}	469	}
417		470
418	int	471	int
		472	in_destruct ()
		473	CODE:
		474	RETVAL = PL_main_cv == Nullcv;
		475	OUTPUT:
		476	RETVAL
		477
		478	NV floor (NV x)
		479
		480	NV ceil (NV x)
		481
		482	void
		483	pango_init ()
		484	CODE:
		485	{
		486	opengl_fontmap = pango_opengl_font_map_new ();
		487	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
		488	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		489	}
		490
		491	int
419	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	492	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
420		493
421	void	494	void
422	SDL_Quit ()	495	SDL_Quit ()
423		496
424	void	497	void
…		…
430	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	503	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
431	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	504	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
432	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	505	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
433	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	506	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
434		507
		508	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		509	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		510
435	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	511	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
436	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	512	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
437	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	513	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
438	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	514	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
439		515
440	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	516	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		517	#if SDL_VERSION_ATLEAST(1,2,10)
441	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	518	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
442	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	519	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		520	#endif
443		521
444	SDL_EnableUNICODE (1);	522	SDL_EnableUNICODE (1);
445	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	523	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
446		524
447	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	525	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
456		534
457	++m;	535	++m;
458	}	536	}
459	}	537	}
460		538
		539	char *
		540	SDL_GetError ()
		541
461	int	542	int
462	SDL_SetVideoMode (int w, int h, int fullscreen)	543	SDL_SetVideoMode (int w, int h, int fullscreen)
463	CODE:	544	CODE:
464	RETVAL = !!SDL_SetVideoMode (	545	RETVAL = !!SDL_SetVideoMode (
465	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)	546	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
466	);	547	);
		548	if (RETVAL)
		549	{
467	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	550	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		551	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		552	# include "glfunc.h"
		553	# undef GL_FUNC
		554	}
468	OUTPUT:	555	OUTPUT:
469	RETVAL	556	RETVAL
470		557
471	void	558	void
472	SDL_GL_SwapBuffers ()	559	SDL_GL_SwapBuffers ()
		560
		561	char *
		562	SDL_GetKeyName (int sym)
473		563
474	void	564	void
475	SDL_PollEvent ()	565	SDL_PollEvent ()
476	PPCODE:	566	PPCODE:
477	{	567	{
…		…
496	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	586	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
497	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	587	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
498	break;	588	break;
499		589
500	case SDL_MOUSEMOTION:	590	case SDL_MOUSEMOTION:
		591	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		592
501	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	593	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
502	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	594	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
503	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	595	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
504	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	596	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
505	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	597	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
506	break;	598	break;
507		599
508	case SDL_MOUSEBUTTONDOWN:	600	case SDL_MOUSEBUTTONDOWN:
509	case SDL_MOUSEBUTTONUP:	601	case SDL_MOUSEBUTTONUP:
		602	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		603
510	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	604	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
511	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	605	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
512	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	606	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
513	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	607	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
514	break;	608	break;
…		…
518	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	612	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
519	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	613	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
520	break;	614	break;
521	}	615	}
522		616
523	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	617	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
524	}	618	}
525	}	619	}
526		620
527	int	621	int
528	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	622	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
541	CODE:	635	CODE:
542	#ifndef _WIN32	636	#ifndef _WIN32
543	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	637	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
544	#endif	638	#endif
545		639
546	char *
547	gl_version ()
548	CODE:
549	RETVAL = (char *)glGetString (GL_VERSION);
550	OUTPUT:
551	RETVAL
552
553	char *
554	gl_extensions ()
555	CODE:
556	RETVAL = (char *)glGetString (GL_EXTENSIONS);
557	OUTPUT:
558	RETVAL
559
560	void	640	void
561	add_font (char *file)	641	add_font (char *file)
562	CODE:	642	CODE:
563	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	643	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
564		644
565	void	645	void
566	load_image_inline (SV *image_)	646	load_image_inline (SV *image_)
567	ALIAS:	647	ALIAS:
568	load_image_file = 1	648	load_image_file = 1
…		…
610		690
611	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	691	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
612		692
613	assert (surface2->pitch == surface2->w * 4);	693	assert (surface2->pitch == surface2->w * 4);
614		694
		695	SDL_LockSurface (surface2);
615	EXTEND (SP, 5);	696	EXTEND (SP, 6);
616	PUSHs (sv_2mortal (newSViv (surface2->w)));	697	PUSHs (sv_2mortal (newSViv (surface2->w)));
617	PUSHs (sv_2mortal (newSViv (surface2->h)));	698	PUSHs (sv_2mortal (newSViv (surface2->h)));
618	SDL_LockSurface (surface2);
619	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	699	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
620	SDL_UnlockSurface (surface2);
621	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	700	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
622	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	701	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
623	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	702	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		703	SDL_UnlockSurface (surface2);
624		704
625	SDL_FreeSurface (surface);	705	SDL_FreeSurface (surface);
626	SDL_FreeSurface (surface2);	706	SDL_FreeSurface (surface2);
627	}	707	}
628		708
…		…
652	}	732	}
653		733
654	void	734	void
655	error (char *message)	735	error (char *message)
656	CODE:	736	CODE:
		737	fprintf (stderr, "ERROR: %s\n", message);
657	#ifdef _WIN32	738	#ifdef _WIN32
658	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);	739	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
659	#else
660	fprintf (stderr, "ERROR: %s\n", message);
661	#endif	740	#endif
662		741
663	void	742	void
664	fatal (char *message)	743	fatal (char *message)
665	CODE:	744	CODE:
		745	fprintf (stderr, "FATAL: %s\n", message);
666	#ifdef _WIN32	746	#ifdef _WIN32
667	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);	747	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
668	#else
669	fprintf (stderr, "FATAL: %s\n", message);
670	#endif	748	#endif
671	exit (1);	749	_exit (1);
672		750
		751	void
		752	_exit (int retval)
		753	CODE:
		754	_exit (retval);
		755
673	MODULE = CFClient PACKAGE = CFClient::Font	756	MODULE = CFPlus PACKAGE = CFPlus::Font
674		757
675	CFClient::Font	758	CFPlus::Font
676	new_from_file (SV *class, char *path, int id = 0)	759	new_from_file (SV *class, char *path, int id = 0)
677	CODE:	760	CODE:
678	{	761	{
679	int count;	762	int count;
680	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	763	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
683	}	766	}
684	OUTPUT:	767	OUTPUT:
685	RETVAL	768	RETVAL
686		769
687	void	770	void
688	DESTROY (CFClient::Font self)	771	DESTROY (CFPlus::Font self)
689	CODE:	772	CODE:
690	pango_font_description_free (self);	773	pango_font_description_free (self);
691		774
692	void	775	void
693	make_default (CFClient::Font self)	776	make_default (CFPlus::Font self)
694	CODE:	777	CODE:
695	default_font = self;	778	default_font = self;
696		779
697	MODULE = CFClient PACKAGE = CFClient::Layout	780	MODULE = CFPlus PACKAGE = CFPlus::Layout
698		781
699	CFClient::Layout	782	void
700	new (SV *class, int rgba = 0)	783	reset_glyph_cache ()
		784	CODE:
		785	tc_clear ();
		786
		787	CFPlus::Layout
		788	new (SV *class)
701	CODE:	789	CODE:
702	New (0, RETVAL, 1, struct cf_layout);	790	New (0, RETVAL, 1, struct cf_layout);
703		791
704	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	792	RETVAL->pl = pango_layout_new (opengl_context);
705	RETVAL->rgba = rgba;
706	RETVAL->r = 1.;	793	RETVAL->r = 1.;
707	RETVAL->g = 1.;	794	RETVAL->g = 1.;
708	RETVAL->b = 1.;	795	RETVAL->b = 1.;
709	RETVAL->a = 1.;	796	RETVAL->a = 1.;
710	RETVAL->base_height = MIN_FONT_HEIGHT;	797	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
714	layout_update_font (RETVAL);	801	layout_update_font (RETVAL);
715	OUTPUT:	802	OUTPUT:
716	RETVAL	803	RETVAL
717		804
718	void	805	void
719	DESTROY (CFClient::Layout self)	806	DESTROY (CFPlus::Layout self)
720	CODE:	807	CODE:
721	g_object_unref (self->pl);	808	g_object_unref (self->pl);
722	Safefree (self);	809	Safefree (self);
723		810
724	int
725	is_rgba (CFClient::Layout self)
726	CODE:
727	RETVAL = self->rgba;
728	OUTPUT:
729	RETVAL
730
731	void	811	void
732	set_text (CFClient::Layout self, SV *text_)	812	set_text (CFPlus::Layout self, SV *text_)
733	CODE:	813	CODE:
734	{	814	{
735	STRLEN textlen;	815	STRLEN textlen;
736	char *text = SvPVutf8 (text_, textlen);	816	char *text = SvPVutf8 (text_, textlen);
737		817
738	pango_layout_set_text (self->pl, text, textlen);	818	pango_layout_set_text (self->pl, text, textlen);
739	}	819	}
740		820
741	void	821	void
742	set_markup (CFClient::Layout self, SV *text_)	822	set_markup (CFPlus::Layout self, SV *text_)
743	CODE:	823	CODE:
744	{	824	{
745	STRLEN textlen;	825	STRLEN textlen;
746	char *text = SvPVutf8 (text_, textlen);	826	char *text = SvPVutf8 (text_, textlen);
747		827
748	pango_layout_set_markup (self->pl, text, textlen);	828	pango_layout_set_markup (self->pl, text, textlen);
749	}	829	}
750		830
		831	void
		832	set_shapes (CFPlus::Layout self, ...)
		833	CODE:
		834	{
		835	PangoAttrList *attrs = 0;
		836	const char *text = pango_layout_get_text (self->pl);
		837	const char *pos = text;
		838	int arg = 4;
		839
		840	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		841	{
		842	PangoRectangle inkrect, rect;
		843	PangoAttribute *attr;
		844
		845	int x = SvIV (ST (arg - 3));
		846	int y = SvIV (ST (arg - 2));
		847	int w = SvIV (ST (arg - 1));
		848	int h = SvIV (ST (arg ));
		849
		850	inkrect.x = 0;
		851	inkrect.y = 0;
		852	inkrect.width = 0;
		853	inkrect.height = 0;
		854
		855	rect.x = x * PANGO_SCALE;
		856	rect.y = y * PANGO_SCALE;
		857	rect.width = w * PANGO_SCALE;
		858	rect.height = h * PANGO_SCALE;
		859
		860	if (!attrs)
		861	attrs = pango_layout_get_attributes (self->pl);
		862
		863	attr = pango_attr_shape_new (&inkrect, &rect);
		864	attr->start_index = pos - text;
		865	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		866	pango_attr_list_insert (attrs, attr);
		867
		868	arg += 4;
		869	pos += sizeof (OBJ_STR) - 1;
		870	}
		871
		872	if (attrs)
		873	pango_layout_set_attributes (self->pl, attrs);
		874	}
		875
		876	void
		877	get_shapes (CFPlus::Layout self)
		878	PPCODE:
		879	{
		880	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		881
		882	do
		883	{
		884	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		885
		886	if (run && shape_attr_p (run))
		887	{
		888	PangoRectangle extents;
		889	pango_layout_iter_get_run_extents (iter, 0, &extents);
		890
		891	EXTEND (SP, 2);
		892	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		893	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		894	}
		895	}
		896	while (pango_layout_iter_next_run (iter));
		897
		898	pango_layout_iter_free (iter);
		899	}
		900
		901	int
		902	has_wrapped (CFPlus::Layout self)
		903	CODE:
		904	{
		905	int lines = 1;
		906	const char *text = pango_layout_get_text (self->pl);
		907
		908	while (*text)
		909	lines += *text++ == '\n';
		910
		911	RETVAL = lines < pango_layout_get_line_count (self->pl);
		912	}
		913	OUTPUT:
		914	RETVAL
		915
751	SV *	916	SV *
752	get_text (CFClient::Layout self)	917	get_text (CFPlus::Layout self)
753	CODE:	918	CODE:
754	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	919	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
755	SvUTF8_on (RETVAL);	920	sv_utf8_decode (RETVAL);
756	OUTPUT:	921	OUTPUT:
757	RETVAL	922	RETVAL
758		923
759	void	924	void
760	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	925	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
761	CODE:	926	CODE:
762	self->r = r;	927	self->r = r;
763	self->g = g;	928	self->g = g;
764	self->b = b;	929	self->b = b;
765	self->a = a;	930	self->a = a;
766		931
767	void	932	void
768	set_font (CFClient::Layout self, CFClient::Font font = 0)	933	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
769	CODE:	934	CODE:
770	if (self->font != font)	935	if (self->font != font)
771	{	936	{
772	self->font = font;	937	self->font = font;
773	layout_update_font (self);	938	layout_update_font (self);
774	}	939	}
775		940
776	void	941	void
777	set_height (CFClient::Layout self, int base_height)	942	set_height (CFPlus::Layout self, int base_height)
778	CODE:	943	CODE:
779	if (self->base_height != base_height)	944	if (self->base_height != base_height)
780	{	945	{
781	self->base_height = base_height;	946	self->base_height = base_height;
782	layout_update_font (self);	947	layout_update_font (self);
783	}	948	}
784		949
785	void	950	void
786	set_width (CFClient::Layout self, int max_width = -1)	951	set_width (CFPlus::Layout self, int max_width = -1)
787	CODE:	952	CODE:
788	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	953	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
789		954
790	void	955	void
		956	set_indent (CFPlus::Layout self, int indent)
		957	CODE:
		958	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		959
		960	void
		961	set_spacing (CFPlus::Layout self, int spacing)
		962	CODE:
		963	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		964
		965	void
		966	set_ellipsise (CFPlus::Layout self, int ellipsise)
		967	CODE:
		968	pango_layout_set_ellipsize (self->pl,
		969	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		970	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		971	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		972	: PANGO_ELLIPSIZE_NONE
		973	);
		974
		975	void
		976	set_single_paragraph_mode (CFPlus::Layout self, int spm)
		977	CODE:
		978	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		979
		980	void
791	size (CFClient::Layout self)	981	size (CFPlus::Layout self)
792	PPCODE:	982	PPCODE:
793	{	983	{
794	int w, h;	984	int w, h;
795		985
796	layout_get_pixel_size (self, &w, &h);	986	layout_get_pixel_size (self, &w, &h);
…		…
799	PUSHs (sv_2mortal (newSViv (w)));	989	PUSHs (sv_2mortal (newSViv (w)));
800	PUSHs (sv_2mortal (newSViv (h)));	990	PUSHs (sv_2mortal (newSViv (h)));
801	}	991	}
802		992
803	int	993	int
		994	descent (CFPlus::Layout self)
		995	CODE:
		996	{
		997	PangoRectangle rect;
		998	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		999	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1000	RETVAL = PANGO_DESCENT (rect);
		1001	}
		1002	OUTPUT:
		1003	RETVAL
		1004
		1005	int
804	xy_to_index (CFClient::Layout self, int x, int y)	1006	xy_to_index (CFPlus::Layout self, int x, int y)
805	CODE:	1007	CODE:
806	{	1008	{
807	int index, trailing;	1009	int index, trailing;
808	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1010	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
809	RETVAL = index;	1011	RETVAL = index;
810	}	1012	}
811	OUTPUT:	1013	OUTPUT:
812	RETVAL	1014	RETVAL
813		1015
814	void	1016	void
815	cursor_pos (CFClient::Layout self, int index)	1017	cursor_pos (CFPlus::Layout self, int index)
816	PPCODE:	1018	PPCODE:
817	{	1019	{
818	PangoRectangle strong_pos;	1020	PangoRectangle strong_pos;
819	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1021	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
820		1022
…		…
823	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1025	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
824	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1026	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
825	}	1027	}
826		1028
827	void	1029	void
828	render (CFClient::Layout self)	1030	render (CFPlus::Layout self, float x, float y)
829	PPCODE:	1031	PPCODE:
830	{	1032	pango_opengl_render_layout_subpixel (
831	SV *retval;	1033	self->pl,
832	int w, h;	1034	x * PANGO_SCALE, y * PANGO_SCALE,
		1035	self->r, self->g, self->b, self->a
		1036	);
833		1037
834	layout_get_pixel_size (self, &w, &h);	1038	MODULE = CFPlus PACKAGE = CFPlus::Texture
835		1039
836	if (self->rgba)	1040	void
		1041	pad2pot (SV *data_, SV *w_, SV *h_)
		1042	CODE:
		1043	{
		1044	int ow = SvIV (w_);
		1045	int oh = SvIV (h_);
		1046
		1047	if (ow && oh)
837	{	1048	{
838	cairo_surface_t *surface;	1049	int nw = minpot (ow);
839	cairo_t *cairo;	1050	int nh = minpot (oh);
840		1051
841	retval = newSV (w * h * 4);	1052	if (nw != ow || nh != oh)
842	SvPOK_only (retval);
843	SvCUR_set (retval, w * h * 4);
844
845	memset (SvPVX (retval), 0, w * h * 4);
846
847	surface = cairo_image_surface_create_for_data (
848	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
849	cairo = cairo_create (surface);
850	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
851
852	pango_cairo_show_layout (cairo, self->pl);
853
854	cairo_destroy (cairo);
855	cairo_surface_destroy (surface);
856
857	// what a mess, and its premultiplied, too :(
858	{	1053	{
859	uint32_t *p = (uint32_t *)SvPVX (retval);	1054	if (SvOK (data_))
860	uint32_t *e = p + w * h;
861
862	while (p < e)
863	{	1055	{
864	uint32_t rgba = *p;	1056	STRLEN datalen;
865	rgba = (rgba >> 24) | (rgba << 8);	1057	char *data = SvPVbyte (data_, datalen);
866	rgba = SDL_SwapBE32 (rgba);	1058	int bpp = datalen / (ow * oh);
867	*p++ = rgba;	1059	SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
		1060
		1061	SvPOK_only (result_);
		1062	SvCUR_set (result_, nw * nh * bpp);
		1063
		1064	memset (SvPVX (result_), 0, nw * nh * bpp);
		1065	while (oh--)
		1066	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1067
		1068	sv_setsv (data_, result_);
868	}	1069	}
		1070
		1071	sv_setiv (w_, nw);
		1072	sv_setiv (h_, nh);
869	}	1073	}
870
871	EXTEND (SP, 5);
872	PUSHs (sv_2mortal (newSViv (w)));
873	PUSHs (sv_2mortal (newSViv (h)));
874	PUSHs (sv_2mortal (retval));
875	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
876	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
877	}	1074	}
878	else
879	{
880	FT_Bitmap bitmap;
881
882	retval = newSV (w * h);
883	SvPOK_only (retval);
884	SvCUR_set (retval, w * h);
885
886	bitmap.rows = h;
887	bitmap.width = w;
888	bitmap.pitch = w;
889	bitmap.buffer = (unsigned char*)SvPVX (retval);
890	bitmap.num_grays = 256;
891	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
892
893	memset (bitmap.buffer, 0, w * h);
894
895	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
896
897	EXTEND (SP, 5);
898	PUSHs (sv_2mortal (newSViv (w)));
899	PUSHs (sv_2mortal (newSViv (h)));
900	PUSHs (sv_2mortal (retval));
901	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
902	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
903	}
904	}	1075	}
905		1076
906	MODULE = CFClient PACKAGE = CFClient::Texture
907
908	void	1077	void
909	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1078	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
910	PROTOTYPE: $$$;$$	1079	PROTOTYPE: $$$;$$
911	ALIAS:	1080	ALIAS:
912	draw_quad_alpha = 1	1081	draw_quad_alpha = 1
913	draw_quad_alpha_premultiplied = 2	1082	draw_quad_alpha_premultiplied = 2
914	CODE:	1083	CODE:
915	{	1084	{
916	HV *hv = (HV *)SvRV (self);	1085	HV *hv = (HV *)SvRV (self);
917	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1086	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
918	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1087	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
919	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1088	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
920	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
921		1089
922	if (items < 5)	1090	if (items < 5)
923	{	1091	{
924	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1092	w = SvNV (*hv_fetch (hv, "w", 1, 1));
925	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1093	h = SvNV (*hv_fetch (hv, "h", 1, 1));
926	}	1094	}
927		1095
928	if (ix)	1096	if (ix)
929	{	1097	{
930	glEnable (GL_BLEND);	1098	glEnable (GL_BLEND);
		1099
		1100	if (ix == 2)
931	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1101	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1102	else
		1103	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1104	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1105
		1106	glEnable (GL_ALPHA_TEST);
		1107	glAlphaFunc (GL_GREATER, 0.01f);
932	}	1108	}
933		1109
934	glBindTexture (GL_TEXTURE_2D, name);	1110	glBindTexture (GL_TEXTURE_2D, name);
935
936	if (wrap_mode)
937	{
938	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
939	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
940	}
941		1111
942	glBegin (GL_QUADS);	1112	glBegin (GL_QUADS);
943	glTexCoord2f (0, 0); glVertex2f (x , y );	1113	glTexCoord2f (0, 0); glVertex2f (x , y );
944	glTexCoord2f (0, t); glVertex2f (x , y + h);	1114	glTexCoord2f (0, t); glVertex2f (x , y + h);
945	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1115	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
946	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1116	glTexCoord2f (s, 0); glVertex2f (x + w, y );
947	glEnd ();	1117	glEnd ();
948		1118
949	if (ix)	1119	if (ix)
		1120	{
		1121	glDisable (GL_ALPHA_TEST);
950	glDisable (GL_BLEND);	1122	glDisable (GL_BLEND);
		1123	}
951	}	1124	}
952		1125
953	MODULE = CFClient PACKAGE = CFClient::Map	1126	MODULE = CFPlus PACKAGE = CFPlus::Map
954		1127
955	CFClient::Map	1128	CFPlus::Map
956	new (SV *class, int map_width, int map_height)	1129	new (SV *class, int map_width, int map_height)
957	CODE:	1130	CODE:
958	New (0, RETVAL, 1, struct map);	1131	New (0, RETVAL, 1, struct map);
959	RETVAL->x = 0;	1132	RETVAL->x = 0;
960	RETVAL->y = 0;	1133	RETVAL->y = 0;
…		…
970	RETVAL->row = 0;	1143	RETVAL->row = 0;
971	OUTPUT:	1144	OUTPUT:
972	RETVAL	1145	RETVAL
973		1146
974	void	1147	void
975	DESTROY (CFClient::Map self)	1148	DESTROY (CFPlus::Map self)
976	CODE:	1149	CODE:
977	{	1150	{
978	map_clear (self);	1151	map_clear (self);
979	Safefree (self->face);	1152	Safefree (self->face);
		1153	Safefree (self->tex);
980	Safefree (self);	1154	Safefree (self);
981	}	1155	}
982		1156
983	void	1157	void
984	clear (CFClient::Map self)	1158	clear (CFPlus::Map self)
985	CODE:	1159	CODE:
986	map_clear (self);	1160	map_clear (self);
987		1161
988	void	1162	void
989	set_face (CFClient::Map self, int face, int texid)	1163	set_face (CFPlus::Map self, int face, int texid)
990	CODE:	1164	CODE:
991	{	1165	{
992	while (self->faces <= face)	1166	while (self->faces <= face)
993	{	1167	{
994	Append (mapface, self->face, self->faces, self->faces);	1168	Append (mapface, self->face, self->faces, self->faces);
…		…
997		1171
998	self->face [face] = texid;	1172	self->face [face] = texid;
999	}	1173	}
1000		1174
1001	void	1175	void
1002	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)	1176	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)
1003	CODE:	1177	CODE:
1004	{	1178	{
1005	while (self->texs <= texid)	1179	while (self->texs <= texid)
1006	{	1180	{
1007	Append (maptex, self->tex, self->texs, self->texs);	1181	Append (maptex, self->tex, self->texs, self->texs);
…		…
1019	tex->r = r;	1193	tex->r = r;
1020	tex->g = g;	1194	tex->g = g;
1021	tex->b = b;	1195	tex->b = b;
1022	tex->a = a;	1196	tex->a = a;
1023	}	1197	}
		1198
		1199	// somewhat hackish, but for textures that require it, it really
		1200	// improves the look, and most others don't suffer.
		1201	glBindTexture (GL_TEXTURE_2D, name);
		1202	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1203	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1204	// use uglier nearest interpolation because linear suffers
		1205	// from transparent color bleeding and ugly wrapping effects.
		1206	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1024	}	1207	}
1025		1208
1026	int	1209	int
1027	ox (CFClient::Map self)	1210	ox (CFPlus::Map self)
1028	ALIAS:	1211	ALIAS:
1029	oy = 1	1212	oy = 1
		1213	x = 2
		1214	y = 3
		1215	w = 4
		1216	h = 5
1030	CODE:	1217	CODE:
1031	switch (ix)	1218	switch (ix)
1032	{	1219	{
1033	case 0: RETVAL = self->ox; break;	1220	case 0: RETVAL = self->ox; break;
1034	case 1: RETVAL = self->oy; break;	1221	case 1: RETVAL = self->oy; break;
		1222	case 2: RETVAL = self->x; break;
		1223	case 3: RETVAL = self->y; break;
		1224	case 4: RETVAL = self->w; break;
		1225	case 5: RETVAL = self->h; break;
1035	}	1226	}
1036	OUTPUT:	1227	OUTPUT:
1037	RETVAL	1228	RETVAL
1038		1229
1039	void	1230	void
1040	scroll (CFClient::Map self, int dx, int dy)	1231	scroll (CFPlus::Map self, int dx, int dy)
1041	CODE:	1232	CODE:
1042	{	1233	{
1043	if (dx > 0)	1234	if (dx > 0)
1044	map_blank (self, self->x, self->y, dx - 1, self->h);	1235	map_blank (self, self->x, self->y, dx - 1, self->h);
1045	else if (dx < 0)	1236	else if (dx < 0)
…		…
1061	self->y += MAP_EXTEND_Y;	1252	self->y += MAP_EXTEND_Y;
1062	}	1253	}
1063	}	1254	}
1064		1255
1065	void	1256	void
1066	map1a_update (CFClient::Map self, SV *data_)	1257	map1a_update (CFPlus::Map self, SV *data_)
1067	CODE:	1258	CODE:
1068	{	1259	{
1069	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1260	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1070	uint8_t *data_end = (uint8_t *)SvEND (data_);	1261	uint8_t *data_end = (uint8_t *)SvEND (data_);
1071	mapcell *cell;	1262	mapcell *cell;
…		…
1073		1264
1074	while (data < data_end)	1265	while (data < data_end)
1075	{	1266	{
1076	flags = (data [0] << 8) + data [1]; data += 2;	1267	flags = (data [0] << 8) + data [1]; data += 2;
1077		1268
1078	x = ((flags >> 10) & 63) + self->x;	1269	x = self->x + ((flags >> 10) & 63);
1079	y = ((flags >> 4) & 63) + self->y;	1270	y = self->y + ((flags >> 4) & 63);
1080		1271
1081	cell = map_get_cell (self, x, y);	1272	cell = map_get_cell (self, x, y);
1082		1273
1083	if (flags & 15)	1274	if (flags & 15)
1084	{	1275	{
…		…
1113	cell->darkness = -1;	1304	cell->darkness = -1;
1114	}	1305	}
1115	}	1306	}
1116		1307
1117	SV *	1308	SV *
1118	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1309	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1119	CODE:	1310	CODE:
1120	{	1311	{
1121	int x1, x;	1312	int x1, x;
1122	int y1, y;	1313	int y1, y;
1123	int z;	1314	int z;
…		…
1173	}	1364	}
1174	OUTPUT:	1365	OUTPUT:
1175	RETVAL	1366	RETVAL
1176		1367
1177	void	1368	void
1178	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1369	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1179	PPCODE:	1370	CODE:
1180	{	1371	{
1181	int vx, vy;	1372	int vx, vy;
1182	int x, y, z;	1373	int x, y, z;
1183	int last_name;	1374	int last_name;
1184	mapface face;	1375	mapface face;
1185	int sw4 = (sw + 3) & ~3;
1186	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1187	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1188		1376
1189	memset (darkness, 255, sw4 * sh);
1190	SvPOK_only (darkness_sv);
1191	SvCUR_set (darkness_sv, sw4 * sh);
1192
1193	vx = self->x + (self->w - sw) / 2 - shift_x;	1377	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1194	vy = self->y + (self->h - sh) / 2 - shift_y;	1378	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1195		1379
1196	/*	1380	/*
1197	int vx = self->vx = self->w >= sw	1381	int vx = self->vx = self->w >= sw
1198	? self->x + (self->w - sw) / 2	1382	? self->x + (self->w - sw) / 2
1199	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1383	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1203	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1387	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1204	*/	1388	*/
1205		1389
1206	glColor4ub (255, 255, 255, 255);	1390	glColor4ub (255, 255, 255, 255);
1207		1391
		1392	glEnable (GL_BLEND);
1208	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1393	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1209	glEnable (GL_BLEND);
1210	glEnable (GL_TEXTURE_2D);	1394	glEnable (GL_TEXTURE_2D);
1211	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1395	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1212		1396
1213	glBegin (GL_QUADS);	1397	glBegin (GL_QUADS);
1214		1398
…		…
1222		1406
1223	for (x = 0; x < sw; x++)	1407	for (x = 0; x < sw; x++)
1224	if (row->c0 <= x + vx && x + vx < row->c1)	1408	if (row->c0 <= x + vx && x + vx < row->c1)
1225	{	1409	{
1226	mapcell *cell = row->col + (x + vx - row->c0);	1410	mapcell *cell = row->col + (x + vx - row->c0);
1227
1228	darkness[y * sw4 + x] = cell->darkness < 0
1229	? 255 - FOW_DARKNESS
1230	: 255 - cell->darkness;
1231		1411
1232	face = cell->face [z];	1412	face = cell->face [z];
1233		1413
1234	if (face)	1414	if (face)
1235	{	1415	{
…		…
1256		1436
1257	glEnd ();	1437	glEnd ();
1258		1438
1259	glDisable (GL_TEXTURE_2D);	1439	glDisable (GL_TEXTURE_2D);
1260	glDisable (GL_BLEND);	1440	glDisable (GL_BLEND);
		1441	}
		1442
		1443	void
		1444	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1445	CODE:
		1446	{
		1447	static float color[16][3] = {
		1448	{ 0.00F, 0.00F, 0.00F },
		1449	{ 1.00F, 1.00F, 1.00F },
		1450	{ 0.00F, 0.00F, 0.55F },
		1451	{ 1.00F, 0.00F, 0.00F },
		1452
		1453	{ 1.00F, 0.54F, 0.00F },
		1454	{ 0.11F, 0.56F, 1.00F },
		1455	{ 0.93F, 0.46F, 0.00F },
		1456	{ 0.18F, 0.54F, 0.34F },
		1457
		1458	{ 0.56F, 0.73F, 0.56F },
		1459	{ 0.80F, 0.80F, 0.80F },
		1460	{ 0.55F, 0.41F, 0.13F },
		1461	{ 0.99F, 0.77F, 0.26F },
		1462
		1463	{ 0.74F, 0.65F, 0.41F },
		1464
		1465	{ 0.00F, 1.00F, 1.00F },
		1466	{ 1.00F, 0.00F, 1.00F },
		1467	{ 1.00F, 1.00F, 0.00F },
		1468	};
		1469
		1470	int x, y;
		1471
		1472	glEnable (GL_TEXTURE_2D);
		1473	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1474	glEnable (GL_BLEND);
		1475	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1476	glBegin (GL_QUADS);
		1477
		1478	for (y = 0; y < h; y++)
		1479	for (x = 0; x < w; x++)
		1480	{
		1481	unsigned char m = data [x + y * w];
		1482
		1483	if (m)
		1484	{
		1485	float *c = color [m & 15];
		1486
		1487	float tx1 = m & 0x40 ? 0.5 : 0.;
		1488	float tx2 = tx1 + 0.5;
		1489
		1490	glColor4f (c[0], c[1], c[2], 0.75);
		1491	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1492	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1493	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1494	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1495	}
		1496	}
		1497
		1498	glEnd ();
		1499	glDisable (GL_BLEND);
		1500	glDisable (GL_TEXTURE_2D);
		1501	}
		1502
		1503	void
		1504	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1505	PPCODE:
		1506	{
		1507	int vx, vy;
		1508	int x, y;
		1509	int sw4 = (sw + 3) & ~3;
		1510	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
		1511	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
		1512
		1513	memset (darkness, 255, sw4 * sh);
		1514	SvPOK_only (darkness_sv);
		1515	SvCUR_set (darkness_sv, sw4 * sh);
		1516
		1517	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1518	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1519
		1520	for (y = 0; y < sh; y++)
		1521	if (0 <= y + vy && y + vy < self->rows)
		1522	{
		1523	maprow *row = self->row + (y + vy);
		1524
		1525	for (x = 0; x < sw; x++)
		1526	if (row->c0 <= x + vx && x + vx < row->c1)
		1527	{
		1528	mapcell *cell = row->col + (x + vx - row->c0);
		1529
		1530	darkness[y * sw4 + x] = cell->darkness < 0
		1531	? 255 - FOW_DARKNESS
		1532	: 255 - cell->darkness;
		1533	}
		1534	}
1261		1535
1262	EXTEND (SP, 3);	1536	EXTEND (SP, 3);
1263	PUSHs (sv_2mortal (newSViv (sw4)));	1537	PUSHs (sv_2mortal (newSViv (sw4)));
1264	PUSHs (sv_2mortal (newSViv (sh)));	1538	PUSHs (sv_2mortal (newSViv (sh)));
1265	PUSHs (darkness_sv);	1539	PUSHs (darkness_sv);
1266	}	1540	}
1267		1541
1268	SV *	1542	SV *
1269	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1543	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1270	CODE:	1544	CODE:
1271	{	1545	{
1272	int x, y, x1, y1;	1546	int x, y, x1, y1;
1273	SV *data_sv = newSV (w * h * 7 + 5);	1547	SV *data_sv = newSV (w * h * 7 + 5);
1274	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1548	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1336	}	1610	}
1337	OUTPUT:	1611	OUTPUT:
1338	RETVAL	1612	RETVAL
1339		1613
1340	void	1614	void
1341	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1615	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1342	PPCODE:	1616	PPCODE:
1343	{	1617	{
1344	int x, y, z;	1618	int x, y, z;
1345	int w, h;	1619	int w, h;
1346	int x1, y1;	1620	int x1, y1;
…		…
1395	}	1669	}
1396	}	1670	}
1397	}	1671	}
1398	}	1672	}
1399		1673
1400	MODULE = CFClient PACKAGE = CFClient::MixChunk	1674	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1401		1675
1402	CFClient::MixChunk	1676	CFPlus::MixChunk
1403	new_from_file (SV *class, char *path)	1677	new_from_file (SV *class, char *path)
1404	CODE:	1678	CODE:
1405	RETVAL = Mix_LoadWAV (path);	1679	RETVAL = Mix_LoadWAV (path);
1406	OUTPUT:	1680	OUTPUT:
1407	RETVAL	1681	RETVAL
1408		1682
1409	void	1683	void
1410	DESTROY (CFClient::MixChunk self)	1684	DESTROY (CFPlus::MixChunk self)
1411	CODE:	1685	CODE:
1412	Mix_FreeChunk (self);	1686	Mix_FreeChunk (self);
1413		1687
1414	int	1688	int
1415	volume (CFClient::MixChunk self, int volume = -1)	1689	volume (CFPlus::MixChunk self, int volume = -1)
1416	CODE:	1690	CODE:
1417	RETVAL = Mix_VolumeChunk (self, volume);	1691	RETVAL = Mix_VolumeChunk (self, volume);
1418	OUTPUT:	1692	OUTPUT:
1419	RETVAL	1693	RETVAL
1420		1694
1421	int	1695	int
1422	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1696	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1423	CODE:	1697	CODE:
1424	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1698	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1425	OUTPUT:	1699	OUTPUT:
1426	RETVAL	1700	RETVAL
1427		1701
1428	MODULE = CFClient PACKAGE = CFClient::MixMusic	1702	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1429		1703
1430	int	1704	int
1431	volume (int volume = -1)	1705	volume (int volume = -1)
1432	CODE:	1706	CODE:
1433	RETVAL = Mix_VolumeMusic (volume);	1707	RETVAL = Mix_VolumeMusic (volume);
1434	OUTPUT:	1708	OUTPUT:
1435	RETVAL	1709	RETVAL
1436		1710
1437	CFClient::MixMusic	1711	CFPlus::MixMusic
1438	new_from_file (SV *class, char *path)	1712	new_from_file (SV *class, char *path)
1439	CODE:	1713	CODE:
1440	RETVAL = Mix_LoadMUS (path);	1714	RETVAL = Mix_LoadMUS (path);
1441	OUTPUT:	1715	OUTPUT:
1442	RETVAL	1716	RETVAL
1443		1717
1444	void	1718	void
1445	DESTROY (CFClient::MixMusic self)	1719	DESTROY (CFPlus::MixMusic self)
1446	CODE:	1720	CODE:
1447	Mix_FreeMusic (self);	1721	Mix_FreeMusic (self);
1448		1722
1449	int	1723	int
1450	play (CFClient::MixMusic self, int loops = -1)	1724	play (CFPlus::MixMusic self, int loops = -1)
1451	CODE:	1725	CODE:
1452	RETVAL = Mix_PlayMusic (self, loops);	1726	RETVAL = Mix_PlayMusic (self, loops);
1453	OUTPUT:	1727	OUTPUT:
1454	RETVAL	1728	RETVAL
1455		1729
1456	MODULE = CFClient PACKAGE = CFClient::OpenGL	1730	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1457		1731
1458	BOOT:	1732	BOOT:
1459	{	1733	{
1460	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1734	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1461	static const struct {	1735	static const struct {
1462	const char *name;	1736	const char *name;
1463	IV iv;	1737	IV iv;
1464	} *civ, const_iv[] = {	1738	} *civ, const_iv[] = {
1465	# define const_iv(name) { # name, (IV)name }	1739	# define const_iv(name) { # name, (IV)name }
1466	const_iv (GL_COLOR_MATERIAL),	1740	const_iv (GL_COLOR_MATERIAL),
1467	const_iv (GL_SMOOTH),	1741	const_iv (GL_SMOOTH),
1468	const_iv (GL_FLAT),	1742	const_iv (GL_FLAT),
1469	const_iv (GL_DITHER),	1743	const_iv (GL_DITHER),
1470	const_iv (GL_BLEND),	1744	const_iv (GL_BLEND),
		1745	const_iv (GL_CULL_FACE),
1471	const_iv (GL_SCISSOR_TEST),	1746	const_iv (GL_SCISSOR_TEST),
		1747	const_iv (GL_DEPTH_TEST),
		1748	const_iv (GL_ALPHA_TEST),
		1749	const_iv (GL_NORMALIZE),
		1750	const_iv (GL_RESCALE_NORMAL),
		1751	const_iv (GL_FRONT),
		1752	const_iv (GL_BACK),
1472	const_iv (GL_AND),	1753	const_iv (GL_AND),
1473	const_iv (GL_ONE),	1754	const_iv (GL_ONE),
1474	const_iv (GL_ZERO),	1755	const_iv (GL_ZERO),
1475	const_iv (GL_SRC_ALPHA),	1756	const_iv (GL_SRC_ALPHA),
1476	const_iv (GL_SRC_ALPHA_SATURATE),	1757	const_iv (GL_DST_ALPHA),
1477	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1758	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1478	const_iv (GL_ONE_MINUS_DST_ALPHA),	1759	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1760	const_iv (GL_SRC_ALPHA_SATURATE),
1479	const_iv (GL_RGB),	1761	const_iv (GL_RGB),
1480	const_iv (GL_RGBA),	1762	const_iv (GL_RGBA),
		1763	const_iv (GL_RGBA4),
		1764	const_iv (GL_RGBA8),
		1765	const_iv (GL_RGB5_A1),
1481	const_iv (GL_UNSIGNED_BYTE),	1766	const_iv (GL_UNSIGNED_BYTE),
		1767	const_iv (GL_UNSIGNED_SHORT),
		1768	const_iv (GL_UNSIGNED_INT),
1482	const_iv (GL_ALPHA),	1769	const_iv (GL_ALPHA),
		1770	const_iv (GL_INTENSITY),
1483	const_iv (GL_LUMINANCE),	1771	const_iv (GL_LUMINANCE),
		1772	const_iv (GL_LUMINANCE_ALPHA),
1484	const_iv (GL_FLOAT),	1773	const_iv (GL_FLOAT),
1485	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1774	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1486	const_iv (GL_COMPILE),	1775	const_iv (GL_COMPILE),
1487	const_iv (GL_TEXTURE_1D),	1776	const_iv (GL_TEXTURE_1D),
1488	const_iv (GL_TEXTURE_2D),	1777	const_iv (GL_TEXTURE_2D),
…		…
1490	const_iv (GL_TEXTURE_MAG_FILTER),	1779	const_iv (GL_TEXTURE_MAG_FILTER),
1491	const_iv (GL_TEXTURE_MIN_FILTER),	1780	const_iv (GL_TEXTURE_MIN_FILTER),
1492	const_iv (GL_TEXTURE_ENV_MODE),	1781	const_iv (GL_TEXTURE_ENV_MODE),
1493	const_iv (GL_TEXTURE_WRAP_S),	1782	const_iv (GL_TEXTURE_WRAP_S),
1494	const_iv (GL_TEXTURE_WRAP_T),	1783	const_iv (GL_TEXTURE_WRAP_T),
		1784	const_iv (GL_REPEAT),
1495	const_iv (GL_CLAMP),	1785	const_iv (GL_CLAMP),
1496	const_iv (GL_REPEAT),	1786	const_iv (GL_CLAMP_TO_EDGE),
1497	const_iv (GL_NEAREST),	1787	const_iv (GL_NEAREST),
1498	const_iv (GL_LINEAR),	1788	const_iv (GL_LINEAR),
1499	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1789	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1500	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1790	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1501	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1791	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1502	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1792	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1503	const_iv (GL_GENERATE_MIPMAP),	1793	const_iv (GL_GENERATE_MIPMAP),
1504	const_iv (GL_MODULATE),	1794	const_iv (GL_MODULATE),
1505	const_iv (GL_DECAL),	1795	const_iv (GL_DECAL),
1506	const_iv (GL_REPLACE),	1796	const_iv (GL_REPLACE),
		1797	const_iv (GL_DEPTH_BUFFER_BIT),
1507	const_iv (GL_COLOR_BUFFER_BIT),	1798	const_iv (GL_COLOR_BUFFER_BIT),
1508	const_iv (GL_PROJECTION),	1799	const_iv (GL_PROJECTION),
1509	const_iv (GL_MODELVIEW),	1800	const_iv (GL_MODELVIEW),
1510	const_iv (GL_COLOR_LOGIC_OP),	1801	const_iv (GL_COLOR_LOGIC_OP),
1511	const_iv (GL_SEPARABLE_2D),	1802	const_iv (GL_SEPARABLE_2D),
1512	const_iv (GL_CONVOLUTION_2D),	1803	const_iv (GL_CONVOLUTION_2D),
1513	const_iv (GL_CONVOLUTION_BORDER_MODE),	1804	const_iv (GL_CONVOLUTION_BORDER_MODE),
1514	const_iv (GL_CONSTANT_BORDER),	1805	const_iv (GL_CONSTANT_BORDER),
1515	const_iv (GL_LINES),	1806	const_iv (GL_LINES),
		1807	const_iv (GL_LINE_LOOP),
1516	const_iv (GL_QUADS),	1808	const_iv (GL_QUADS),
1517	const_iv (GL_LINE_LOOP),	1809	const_iv (GL_QUAD_STRIP),
		1810	const_iv (GL_TRIANGLES),
		1811	const_iv (GL_TRIANGLE_STRIP),
		1812	const_iv (GL_TRIANGLE_FAN),
1518	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1813	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1519	const_iv (GL_FASTEST),	1814	const_iv (GL_FASTEST),
		1815	const_iv (GL_V2F),
		1816	const_iv (GL_V3F),
		1817	const_iv (GL_T2F_V3F),
		1818	const_iv (GL_T2F_N3F_V3F),
1520	# undef const_iv	1819	# undef const_iv
1521	};	1820	};
1522		1821
1523	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1822	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1524	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1823	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1525	}	1824	}
1526		1825
		1826	char *
		1827	gl_vendor ()
		1828	CODE:
		1829	RETVAL = (char *)glGetString (GL_VENDOR);
		1830	OUTPUT:
		1831	RETVAL
		1832
		1833	char *
		1834	gl_version ()
		1835	CODE:
		1836	RETVAL = (char *)glGetString (GL_VERSION);
		1837	OUTPUT:
		1838	RETVAL
		1839
		1840	char *
		1841	gl_extensions ()
		1842	CODE:
		1843	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1844	OUTPUT:
		1845	RETVAL
		1846
1527	int glGetError ()	1847	int glGetError ()
		1848
		1849	void glFinish ()
1528		1850
1529	void glClear (int mask)	1851	void glClear (int mask)
1530		1852
1531	void glClearColor (float r, float g, float b, float a = 1.0)	1853	void glClearColor (float r, float g, float b, float a = 1.0)
1532	PROTOTYPE: @	1854	PROTOTYPE: @
…		…
1539		1861
1540	void glHint (int target, int mode)	1862	void glHint (int target, int mode)
1541		1863
1542	void glBlendFunc (int sfactor, int dfactor)	1864	void glBlendFunc (int sfactor, int dfactor)
1543		1865
		1866	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1867	CODE:
		1868	gl_BlendFuncSeparate (sa, da, saa, daa);
		1869
		1870	void glDepthMask (int flag)
		1871
1544	void glLogicOp (int opcode)	1872	void glLogicOp (int opcode)
1545		1873
1546	void glColorMask (int red, int green, int blue, int alpha)	1874	void glColorMask (int red, int green, int blue, int alpha)
1547		1875
1548	void glMatrixMode (int mode)	1876	void glMatrixMode (int mode)
…		…
1551		1879
1552	void glPopMatrix ()	1880	void glPopMatrix ()
1553		1881
1554	void glLoadIdentity ()	1882	void glLoadIdentity ()
1555		1883
		1884	void glDrawBuffer (int buffer)
		1885
		1886	void glReadBuffer (int buffer)
		1887
1556	# near and far are due to microsofts buggy c compiler	1888	# near_ and far_ are due to microsofts buggy "c" compiler
		1889	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1890
		1891	# near_ and far_ are due to microsofts buggy "c" compiler
1557	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1892	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1558		1893
1559	void glViewport (int x, int y, int width, int height)	1894	void glViewport (int x, int y, int width, int height)
1560		1895
1561	void glScissor (int x, int y, int width, int height)	1896	void glScissor (int x, int y, int width, int height)
…		…
1576		1911
1577	void glEnd ()	1912	void glEnd ()
1578		1913
1579	void glColor (float r, float g, float b, float a = 1.0)	1914	void glColor (float r, float g, float b, float a = 1.0)
1580	PROTOTYPE: @	1915	PROTOTYPE: @
		1916	ALIAS:
		1917	glColor_premultiply = 1
1581	CODE:	1918	CODE:
1582	glColor4ub (r * 255., g * 255., b * 255., a * 255.);	1919	if (ix)
		1920	{
		1921	r *= a;
		1922	g *= a;
		1923	b *= a;
		1924	}
		1925	// microsoft visual "c" rounds instead of truncating...
		1926	glColor4f (r, g, b, a);
		1927
		1928	void glInterleavedArrays (int format, int stride, char *data)
		1929
		1930	void glDrawElements (int mode, int count, int type, char *indices)
		1931
		1932	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1933
		1934	void glRasterPos (float x, float y, float z = 0.)
		1935	CODE:
		1936	glRasterPos3f (0, 0, z);
		1937	glBitmap (0, 0, 0, 0, x, y, 0);
1583		1938
1584	void glVertex (float x, float y, float z = 0.)	1939	void glVertex (float x, float y, float z = 0.)
1585	CODE:	1940	CODE:
1586	glVertex3f (x, y, z);	1941	glVertex3f (x, y, z);
1587		1942
…		…
1599		1954
1600	void glBindTexture (int target, int name)	1955	void glBindTexture (int target, int name)
1601		1956
1602	void glConvolutionParameter (int target, int pname, float params)	1957	void glConvolutionParameter (int target, int pname, float params)
1603	CODE:	1958	CODE:
1604	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1959	if (gl.ConvolutionParameterf)
		1960	gl.ConvolutionParameterf (target, pname, params);
1605		1961
1606	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1962	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1607	CODE:	1963	CODE:
1608	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1964	if (gl.ConvolutionFilter2D)
1609	(target, internalformat, width, height, format, type, data));	1965	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1610		1966
1611	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	1967	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1612	CODE:	1968	CODE:
1613	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1969	if (gl.SeparableFilter2D)
1614	(target, internalformat, width, height, format, type, row, column));	1970	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1615		1971
1616	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1972	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1617		1973
1618	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1974	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1619		1975
1620	void glRasterPos (int x, int y)	1976	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1621	CODE:
1622	glRasterPos2i (x, y);
1623		1977
1624	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1978	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1625		1979
1626	int glGenTexture ()	1980	int glGenTexture ()
1627	CODE:	1981	CODE:
…		…
1654		2008
1655	void glEndList ()	2009	void glEndList ()
1656		2010
1657	void glCallList (int list)	2011	void glCallList (int list)
1658		2012
		2013

Diff Legend

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