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

Diff Legend

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