[ViewVC] Diff of: 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.160 by root, Mon Oct 9 01:06:36 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.98 by root, Mon May 29 02:01:56 2006 UTC vs. Revision 1.160 by root, Mon Oct 9 01:06:36 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.98 by root, Mon May 29 02:01:56 2006 UTC vs.
Revision 1.160 by root, Mon Oct 9 01:06:36 2006 UTC