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

Diff Legend

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