ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.98 by root, Mon May 29 02:01:56 2006 UTC vs.
Revision 1.163 by root, Wed Oct 18 12:53:45 2006 UTC

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

Diff Legend

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