[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.73 by root, Fri May 5 19:30:14 2006 UTC vs.
Revision 1.156 by root, Thu Sep 21 14:47:51 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
		3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2	# include <malloc.h>	4	# include <malloc.h>
		5	# include <windows.h>
		6	# pragma warning(disable:4244)
3	#endif	7	#endif
4		8
5	#include "EXTERN.h"	9	#include "EXTERN.h"
6	#include "perl.h"	10	#include "perl.h"
7	#include "XSUB.h"	11	#include "XSUB.h"
8		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
		17	#include <math.h>
9	#include <string.h>	18	#include <string.h>
10	#include <stdio.h>	19	#include <stdio.h>
		20	#include <stdlib.h>
11		21
12	#include <SDL.h>	22	#include <SDL.h>
		23	#include <SDL_endian.h>
13	#include <SDL_image.h>	24	#include <SDL_image.h>
14	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
15	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
16		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
17	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
18		32
19	#include <pango/pango.h>	33	#include <pango/pango.h>
20	#include <pango/pangofc-fontmap.h>
21	#include <pango/pangoft2.h>
22		34
23	#ifndef _WIN32	35	#ifndef _WIN32
24	# include <sys/types.h>	36	# include <sys/types.h>
25	# include <sys/socket.h>	37	# include <sys/socket.h>
26	# include <netinet/in.h>	38	# include <netinet/in.h>
33	typedef signed char int8_t;	45	typedef signed char int8_t;
34	typedef signed short int16_t;	46	typedef signed short int16_t;
35	typedef signed int int32_t;	47	typedef signed int int32_t;
36	#endif	48	#endif
37		49
38	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
39		51
40	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
41		53
42	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
43	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
44		56
45	#define MIN_FONT_HEIGHT 10	57	#define MIN_FONT_HEIGHT 10
46		58
47	#define GL_CALL(type,func,args) \	59	#if 0
48	{ \	60	# define PARACHUTE SDL_INIT_NOPARACHUTE
49	static int init_; \	61	#else
50	static type fptr_; \	62	# define PARACHUTE 0
51	\	63	#endif
52	if (!init_) \
53	{ \
54	init_ = 1; \
55	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
56	} \
57	\
58	if (fptr_) \
59	fptr_ args; \
60	}
61		64
		65	static struct
		66	{
		67	#define GL_FUNC(ptr,name) ptr name;
		68	#include "glfunc.h"
		69	#undef GL_FUNC
		70	} gl;
		71
		72	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
		73	{
		74	if (gl.BlendFuncSeparate)
		75	gl.BlendFuncSeparate (sa, da, saa, daa);
		76	else if (gl.BlendFuncSeparateEXT)
		77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
		78	else
		79	glBlendFunc (sa, da);
		80	}
		81
		82	#include "texcache.c"
		83
		84	#include "pango-font.c"
		85	#include "pango-fontmap.c"
		86	#include "pango-render.c"
		87
62	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
63	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
64		90
65	typedef PangoFontDescription *CFClient__Font;	91	typedef PangoFontDescription *CFPlus__Font;
		92
		93	static int
		94	shape_attr_p (PangoLayoutRun *run)
		95	{
		96	GSList *attrs = run->item->analysis.extra_attrs;
		97
		98	while (attrs)
		99	{
		100	PangoAttribute *attr = attrs->data;
		101
		102	if (attr->klass->type == PANGO_ATTR_SHAPE)
		103	return 1;
		104
		105	attrs = attrs->next;
		106	}
		107
		108	return 0;
		109	}
66		110
67	typedef struct cf_layout {	111	typedef struct cf_layout {
68	PangoLayout *pl;	112	PangoLayout *pl;
		113	float r, g, b, a; // default color for rgba mode
69	int base_height;	114	int base_height;
70	CFClient__Font font;	115	CFPlus__Font font;
71	} *CFClient__Layout;	116	} *CFPlus__Layout;
72		117
73	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
74	static PangoContext *context;	119	static PangoContext *opengl_context;
75	static PangoFontMap *fontmap;	120	static PangoFontMap *opengl_fontmap;
76		121
77	static void	122	static void
78	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
79	{	124	{
80	FcPatternAddBool (pattern, FC_HINTING , 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
		126	#ifdef FC_HINT_STYLE
		127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		128	#endif
81	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
82	}	130	}
83		131
84	static void	132	static void
85	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
86	{	134	{
87	/* use a random scale factor to account for unknown descenders, 0.8 works	135	/* use a random scale factor to account for unknown descenders, 0.8 works
88	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
89	*/	137	*/
90	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
94		142
95	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
96	}	144	}
97		145
98	static void	146	static void
99	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
100	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
101	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
102		153
103	w = (w + 3) & ~3;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
104	if (!w) w = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
105	if (!h) h = 1;	156
		157	if (!rect.width) rect.width = 1;
		158	if (!rect.height) rect.height = 1;
		159
		160	*w = rect.width;
		161	*h = rect.height;
106	}	162	}
107		163
108	typedef uint16_t mapface;	164	typedef uint16_t mapface;
109		165
110	typedef struct {	166	typedef struct {
…		…
113	float s, t;	169	float s, t;
114	uint8_t r, g, b, a;	170	uint8_t r, g, b, a;
115	} maptex;	171	} maptex;
116		172
117	typedef struct {	173	typedef struct {
118	int16_t darkness;	174	uint32_t player;
119	mapface face[3];	175	mapface face[3];
		176	uint16_t darkness;
		177	uint8_t stat_width, stat_hp, flags;
120	} mapcell;	178	} mapcell;
121		179
122	typedef struct {	180	typedef struct {
123	int32_t c0, c1;	181	int32_t c0, c1;
124	mapcell *col;	182	mapcell *col;
…		…
133	int texs;	191	int texs;
134	maptex *tex;	192	maptex *tex;
135		193
136	int32_t rows;	194	int32_t rows;
137	maprow *row;	195	maprow *row;
138	} *CFClient__Map;	196	} *CFPlus__Map;
139		197
140	static char *	198	static char *
141	prepend (char *ptr, int sze, int inc)	199	prepend (char *ptr, int sze, int inc)
142	{	200	{
143	char *p;	201	char *p;
…		…
161		219
162	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	220	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
163	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	221	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
164		222
165	static maprow *	223	static maprow *
166	map_get_row (CFClient__Map self, int y)	224	map_get_row (CFPlus__Map self, int y)
167	{	225	{
168	if (0 > y)	226	if (0 > y)
169	{	227	{
170	int extend = - y + MAP_EXTEND_Y;	228	int extend = - y + MAP_EXTEND_Y;
171	Prepend (maprow, self->row, self->rows, extend);	229	Prepend (maprow, self->row, self->rows, extend);
…		…
209		267
210	return row->col + (x - row->c0);	268	return row->col + (x - row->c0);
211	}	269	}
212		270
213	static mapcell *	271	static mapcell *
214	map_get_cell (CFClient__Map self, int x, int y)	272	map_get_cell (CFPlus__Map self, int x, int y)
215	{	273	{
216	return row_get_cell (map_get_row (self, y), x);	274	return row_get_cell (map_get_row (self, y), x);
217	}	275	}
218		276
219	static void	277	static void
220	map_clear (CFClient__Map self)	278	map_clear (CFPlus__Map self)
221	{	279	{
222	int r;	280	int r;
223		281
224	for (r = 0; r < self->rows; r++)	282	for (r = 0; r < self->rows; r++)
225	Safefree (self->row[r].col);	283	Safefree (self->row[r].col);
…		…
233	self->row = 0;	291	self->row = 0;
234	self->rows = 0;	292	self->rows = 0;
235	}	293	}
236		294
237	static void	295	static void
238	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	296	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
239	{	297	{
240	int x, y;	298	int x, y;
241	maprow *row;	299	maprow *row;
		300	mapcell *cell;
242		301
243	for (y = y0; y < y0 + h; y++)	302	for (y = y0; y < y0 + h; y++)
244	if (y >= 0)	303	if (y >= 0)
245	{	304	{
246	if (y >= self->rows)	305	if (y >= self->rows)
…		…
252	if (x >= row->c0)	311	if (x >= row->c0)
253	{	312	{
254	if (x >= row->c1)	313	if (x >= row->c1)
255	break;	314	break;
256		315
257	row->col[x - row->c0].darkness = -1;	316	cell = row->col + x - row->c0;
		317
		318	cell->darkness = 0;
		319	cell->stat_hp = 0;
		320	cell->flags = 0;
		321	cell->player = 0;
258	}	322	}
259	}	323	}
260	}	324	}
261		325
262	static void	326	static void
263	music_finished ()	327	music_finished (void)
264	{	328	{
265	SDL_UserEvent ev;	329	SDL_UserEvent ev;
266		330
267	ev.type = SDL_USEREVENT;	331	ev.type = SDL_USEREVENT;
268	ev.code = 0;	332	ev.code = 0;
…		…
277	{	341	{
278	SDL_UserEvent ev;	342	SDL_UserEvent ev;
279		343
280	ev.type = SDL_USEREVENT;	344	ev.type = SDL_USEREVENT;
281	ev.code = 1;	345	ev.code = 1;
282	ev.data1 = (void *)channel;	346	ev.data1 = (void *)(long)channel;
283	ev.data2 = 0;	347	ev.data2 = 0;
284		348
285	SDL_PushEvent ((SDL_Event *)&ev);	349	SDL_PushEvent ((SDL_Event *)&ev);
286	}	350	}
287		351
		352	static unsigned int
		353	minpot (unsigned int n)
		354	{
		355	if (!n)
		356	return 0;
		357
		358	--n;
		359
		360	n \|= n >> 1;
		361	n \|= n >> 2;
		362	n \|= n >> 4;
		363	n \|= n >> 8;
		364	n \|= n >> 16;
		365
		366	return n + 1;
		367	}
		368
288	MODULE = CFClient PACKAGE = CFClient	369	MODULE = CFPlus PACKAGE = CFPlus
289		370
290	PROTOTYPES: ENABLE	371	PROTOTYPES: ENABLE
291		372
292	BOOT:	373	BOOT:
293	{	374	{
294	HV *stash = gv_stashpv ("CFClient", 1);	375	HV *stash = gv_stashpv ("CFPlus", 1);
295	static const struct {	376	static const struct {
296	const char *name;	377	const char *name;
297	IV iv;	378	IV iv;
298	} *civ, const_iv[] = {	379	} *civ, const_iv[] = {
299	# define const_iv(name) { # name, (IV)name }	380	# define const_iv(name) { # name, (IV)name }
…		…
398	# undef const_iv	479	# undef const_iv
399	};	480	};
400		481
401	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	482	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
402	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	483	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
403
404	fontmap = pango_ft2_font_map_new ();
405	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
406	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
407	}	484	}
408		485
409	int	486	int
		487	in_destruct ()
		488	CODE:
		489	RETVAL = PL_main_cv == Nullcv;
		490	OUTPUT:
		491	RETVAL
		492
		493	NV floor (NV x)
		494
		495	NV ceil (NV x)
		496
		497	void
		498	pango_init ()
		499	CODE:
		500	{
		501	opengl_fontmap = pango_opengl_font_map_new ();
		502	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
		503	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		504	}
		505
		506	int
410	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	507	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
411		508
412	void	509	void
413	SDL_Quit ()	510	SDL_Quit ()
414		511
415	void	512	void
…		…
421	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	518	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
422	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	519	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
423	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	520	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
424	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	521	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
425		522
		523	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		524	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		525
426	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
427	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
428	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	528	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
429	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	529	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
430		530
431	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	531	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		532	#if SDL_VERSION_ATLEAST(1,2,10)
432	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	533	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
433	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	534	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		535	#endif
434		536
435	SDL_EnableUNICODE (1);	537	SDL_EnableUNICODE (1);
436	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	538	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
437		539
438	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	540	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
447		549
448	++m;	550	++m;
449	}	551	}
450	}	552	}
451		553
		554	char *
		555	SDL_GetError ()
		556
452	int	557	int
453	SDL_SetVideoMode (int w, int h, int fullscreen)	558	SDL_SetVideoMode (int w, int h, int fullscreen)
454	CODE:	559	CODE:
455	RETVAL = !!SDL_SetVideoMode (	560	RETVAL = !!SDL_SetVideoMode (
456	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	561	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
457	);	562	);
		563	if (RETVAL)
		564	{
458	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	565	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		566	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		567	# include "glfunc.h"
		568	# undef GL_FUNC
		569	}
459	OUTPUT:	570	OUTPUT:
460	RETVAL	571	RETVAL
461		572
462	void	573	void
463	SDL_GL_SwapBuffers ()	574	SDL_GL_SwapBuffers ()
		575
		576	char *
		577	SDL_GetKeyName (int sym)
464		578
465	void	579	void
466	SDL_PollEvent ()	580	SDL_PollEvent ()
467	PPCODE:	581	PPCODE:
468	{	582	{
…		…
487	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	601	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
488	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	602	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
489	break;	603	break;
490		604
491	case SDL_MOUSEMOTION:	605	case SDL_MOUSEMOTION:
		606	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		607
492	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	608	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
493	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	609	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
494	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	610	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
495	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	611	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
496	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	612	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
497	break;	613	break;
498		614
499	case SDL_MOUSEBUTTONDOWN:	615	case SDL_MOUSEBUTTONDOWN:
500	case SDL_MOUSEBUTTONUP:	616	case SDL_MOUSEBUTTONUP:
		617	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		618
501	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	619	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
502	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	620	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
503	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	621	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
504	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	622	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
505	break;	623	break;
…		…
509	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	627	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
510	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	628	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
511	break;	629	break;
512	}	630	}
513		631
514	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	632	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
515	}	633	}
516	}	634	}
517		635
518	int	636	int
519	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	637	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
532	CODE:	650	CODE:
533	#ifndef _WIN32	651	#ifndef _WIN32
534	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	652	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
535	#endif	653	#endif
536		654
537	char *
538	gl_version ()
539	CODE:
540	RETVAL = (char *)glGetString (GL_VERSION);
541	OUTPUT:
542	RETVAL
543
544	char *
545	gl_extensions ()
546	CODE:
547	RETVAL = (char *)glGetString (GL_EXTENSIONS);
548	OUTPUT:
549	RETVAL
550
551	void	655	void
552	add_font (char *file)	656	add_font (char *file)
553	CODE:	657	CODE:
554	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	658	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
555		659
556	void	660	void
557	load_image_inline (SV *image_)	661	load_image_inline (SV *image_)
558	ALIAS:	662	ALIAS:
559	load_image_file = 1	663	load_image_file = 1
…		…
601		705
602	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	706	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
603		707
604	assert (surface2->pitch == surface2->w * 4);	708	assert (surface2->pitch == surface2->w * 4);
605		709
		710	SDL_LockSurface (surface2);
606	EXTEND (SP, 5);	711	EXTEND (SP, 6);
607	PUSHs (sv_2mortal (newSViv (surface2->w)));	712	PUSHs (sv_2mortal (newSViv (surface2->w)));
608	PUSHs (sv_2mortal (newSViv (surface2->h)));	713	PUSHs (sv_2mortal (newSViv (surface2->h)));
609	SDL_LockSurface (surface2);
610	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	714	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
611	SDL_UnlockSurface (surface2);
612	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	715	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
613	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	716	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
614	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	717	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		718	SDL_UnlockSurface (surface2);
615		719
616	SDL_FreeSurface (surface);	720	SDL_FreeSurface (surface);
617	SDL_FreeSurface (surface2);	721	SDL_FreeSurface (surface2);
618	}	722	}
619		723
…		…
643	}	747	}
644		748
645	void	749	void
646	error (char *message)	750	error (char *message)
647	CODE:	751	CODE:
		752	fprintf (stderr, "ERROR: %s\n", message);
648	#ifdef _WIN32	753	#ifdef _WIN32
649	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	754	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
650	#else
651	fprintf (stderr, "ERROR: %s\n", message);
652	#endif	755	#endif
653		756
654	void	757	void
655	fatal (char *message)	758	fatal (char *message)
656	CODE:	759	CODE:
		760	fprintf (stderr, "FATAL: %s\n", message);
657	#ifdef _WIN32	761	#ifdef _WIN32
658	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	762	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
659	#else
660	fprintf (stderr, "FATAL: %s\n", message);
661	#endif	763	#endif
662	exit (1);	764	_exit (1);
663		765
		766	void
		767	_exit (int retval)
		768	CODE:
		769	_exit (retval);
		770
664	MODULE = CFClient PACKAGE = CFClient::Font	771	MODULE = CFPlus PACKAGE = CFPlus::Font
665		772
666	CFClient::Font	773	CFPlus::Font
667	new_from_file (SV class, char path, int id = 0)	774	new_from_file (SV class, char path, int id = 0)
668	CODE:	775	CODE:
669	{	776	{
670	int count;	777	int count;
671	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	778	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
674	}	781	}
675	OUTPUT:	782	OUTPUT:
676	RETVAL	783	RETVAL
677		784
678	void	785	void
679	DESTROY (CFClient::Font self)	786	DESTROY (CFPlus::Font self)
680	CODE:	787	CODE:
681	pango_font_description_free (self);	788	pango_font_description_free (self);
682		789
683	void	790	void
684	make_default (CFClient::Font self)	791	make_default (CFPlus::Font self)
685	CODE:	792	CODE:
686	default_font = self;	793	default_font = self;
687		794
688	MODULE = CFClient PACKAGE = CFClient::Layout	795	MODULE = CFPlus PACKAGE = CFPlus::Layout
689		796
690	CFClient::Layout	797	void
691	new (SV *class, int base_height = MIN_FONT_HEIGHT)	798	reset_glyph_cache ()
		799	CODE:
		800	tc_clear ();
		801
		802	CFPlus::Layout
		803	new (SV *class)
692	CODE:	804	CODE:
693	New (0, RETVAL, 1, struct cf_layout);	805	New (0, RETVAL, 1, struct cf_layout);
		806
694	RETVAL->pl = pango_layout_new (context);	807	RETVAL->pl = pango_layout_new (opengl_context);
695	RETVAL->base_height = base_height;	808	RETVAL->r = 1.;
		809	RETVAL->g = 1.;
		810	RETVAL->b = 1.;
		811	RETVAL->a = 1.;
		812	RETVAL->base_height = MIN_FONT_HEIGHT;
696	RETVAL->font = 0;	813	RETVAL->font = 0;
		814
697	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	815	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
698	pango_layout_set_font_description (RETVAL->pl, default_font);	816	layout_update_font (RETVAL);
699	OUTPUT:	817	OUTPUT:
700	RETVAL	818	RETVAL
701		819
702	void	820	void
703	DESTROY (CFClient::Layout self)	821	DESTROY (CFPlus::Layout self)
704	CODE:	822	CODE:
705	g_object_unref (self->pl);	823	g_object_unref (self->pl);
706	Safefree (self);	824	Safefree (self);
707		825
708	void	826	void
709	set_text (CFClient::Layout self, SV *text_)	827	set_text (CFPlus::Layout self, SV *text_)
710	CODE:	828	CODE:
711	{	829	{
712	STRLEN textlen;	830	STRLEN textlen;
713	char *text = SvPVutf8 (text_, textlen);	831	char *text = SvPVutf8 (text_, textlen);
714		832
715	pango_layout_set_text (self->pl, text, textlen);	833	pango_layout_set_text (self->pl, text, textlen);
716	}	834	}
717		835
718	void	836	void
719	set_markup (CFClient::Layout self, SV *text_)	837	set_markup (CFPlus::Layout self, SV *text_)
720	CODE:	838	CODE:
721	{	839	{
722	STRLEN textlen;	840	STRLEN textlen;
723	char *text = SvPVutf8 (text_, textlen);	841	char *text = SvPVutf8 (text_, textlen);
724		842
725	pango_layout_set_markup (self->pl, text, textlen);	843	pango_layout_set_markup (self->pl, text, textlen);
726	}	844	}
727		845
		846	void
		847	set_shapes (CFPlus::Layout self, ...)
		848	CODE:
		849	{
		850	PangoAttrList *attrs = 0;
		851	const char *text = pango_layout_get_text (self->pl);
		852	const char *pos = text;
		853	int arg = 4;
		854
		855	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		856	{
		857	PangoRectangle inkrect, rect;
		858	PangoAttribute *attr;
		859
		860	int x = SvIV (ST (arg - 3));
		861	int y = SvIV (ST (arg - 2));
		862	int w = SvIV (ST (arg - 1));
		863	int h = SvIV (ST (arg ));
		864
		865	inkrect.x = 0;
		866	inkrect.y = 0;
		867	inkrect.width = 0;
		868	inkrect.height = 0;
		869
		870	rect.x = x * PANGO_SCALE;
		871	rect.y = y * PANGO_SCALE;
		872	rect.width = w * PANGO_SCALE;
		873	rect.height = h * PANGO_SCALE;
		874
		875	if (!attrs)
		876	attrs = pango_layout_get_attributes (self->pl);
		877
		878	attr = pango_attr_shape_new (&inkrect, &rect);
		879	attr->start_index = pos - text;
		880	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		881	pango_attr_list_insert (attrs, attr);
		882
		883	arg += 4;
		884	pos += sizeof (OBJ_STR) - 1;
		885	}
		886
		887	if (attrs)
		888	pango_layout_set_attributes (self->pl, attrs);
		889	}
		890
		891	void
		892	get_shapes (CFPlus::Layout self)
		893	PPCODE:
		894	{
		895	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		896
		897	do
		898	{
		899	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		900
		901	if (run && shape_attr_p (run))
		902	{
		903	PangoRectangle extents;
		904	pango_layout_iter_get_run_extents (iter, 0, &extents);
		905
		906	EXTEND (SP, 2);
		907	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		908	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		909	}
		910	}
		911	while (pango_layout_iter_next_run (iter));
		912
		913	pango_layout_iter_free (iter);
		914	}
		915
		916	int
		917	has_wrapped (CFPlus::Layout self)
		918	CODE:
		919	{
		920	int lines = 1;
		921	const char *text = pango_layout_get_text (self->pl);
		922
		923	while (*text)
		924	lines += *text++ == '\n';
		925
		926	RETVAL = lines < pango_layout_get_line_count (self->pl);
		927	}
		928	OUTPUT:
		929	RETVAL
		930
728	SV *	931	SV *
729	get_text (CFClient::Layout self)	932	get_text (CFPlus::Layout self)
730	CODE:	933	CODE:
731	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	934	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
732	SvUTF8_on (RETVAL);	935	sv_utf8_decode (RETVAL);
733	OUTPUT:	936	OUTPUT:
734	RETVAL	937	RETVAL
735		938
736	void	939	void
		940	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
		941	CODE:
		942	self->r = r;
		943	self->g = g;
		944	self->b = b;
		945	self->a = a;
		946
		947	void
737	set_font (CFClient::Layout self, CFClient::Font font = 0)	948	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
738	CODE:	949	CODE:
739	if (self->font != font)	950	if (self->font != font)
740	{	951	{
741	self->font = font;	952	self->font = font;
742	layout_update_font (self);	953	layout_update_font (self);
743	}	954	}
744		955
745	void	956	void
746	set_height (CFClient::Layout self, int base_height)	957	set_height (CFPlus::Layout self, int base_height)
747	CODE:	958	CODE:
748	if (self->base_height != base_height)	959	if (self->base_height != base_height)
749	{	960	{
750	self->base_height = base_height;	961	self->base_height = base_height;
751	layout_update_font (self);	962	layout_update_font (self);
752	}	963	}
753		964
754	void	965	void
755	set_width (CFClient::Layout self, int max_width = -1)	966	set_width (CFPlus::Layout self, int max_width = -1)
756	CODE:	967	CODE:
757	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	968	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
758		969
759	void	970	void
		971	set_indent (CFPlus::Layout self, int indent)
		972	CODE:
		973	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		974
		975	void
		976	set_spacing (CFPlus::Layout self, int spacing)
		977	CODE:
		978	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		979
		980	void
		981	set_ellipsise (CFPlus::Layout self, int ellipsise)
		982	CODE:
		983	pango_layout_set_ellipsize (self->pl,
		984	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		985	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		986	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		987	: PANGO_ELLIPSIZE_NONE
		988	);
		989
		990	void
		991	set_single_paragraph_mode (CFPlus::Layout self, int spm)
		992	CODE:
		993	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		994
		995	void
760	size (CFClient::Layout self)	996	size (CFPlus::Layout self)
761	PPCODE:	997	PPCODE:
762	{	998	{
763	int w, h;	999	int w, h;
764		1000
765	layout_get_pixel_size (self, &w, &h);	1001	layout_get_pixel_size (self, &w, &h);
…		…
768	PUSHs (sv_2mortal (newSViv (w)));	1004	PUSHs (sv_2mortal (newSViv (w)));
769	PUSHs (sv_2mortal (newSViv (h)));	1005	PUSHs (sv_2mortal (newSViv (h)));
770	}	1006	}
771		1007
772	int	1008	int
		1009	descent (CFPlus::Layout self)
		1010	CODE:
		1011	{
		1012	PangoRectangle rect;
		1013	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1014	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1015	RETVAL = PANGO_DESCENT (rect);
		1016	}
		1017	OUTPUT:
		1018	RETVAL
		1019
		1020	int
773	xy_to_index (CFClient::Layout self, int x, int y)	1021	xy_to_index (CFPlus::Layout self, int x, int y)
774	CODE:	1022	CODE:
775	{	1023	{
776	int index, trailing;	1024	int index, trailing;
777	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1025	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
778	RETVAL = index;	1026	RETVAL = index;
779	}	1027	}
780	OUTPUT:	1028	OUTPUT:
781	RETVAL	1029	RETVAL
782		1030
783	void	1031	void
784	cursor_pos (CFClient::Layout self, int index)	1032	cursor_pos (CFPlus::Layout self, int index)
785	PPCODE:	1033	PPCODE:
786	{	1034	{
787	PangoRectangle strong_pos;	1035	PangoRectangle strong_pos;
788	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1036	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
789		1037
…		…
792	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1040	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
793	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1041	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
794	}	1042	}
795		1043
796	void	1044	void
797	render (CFClient::Layout self)	1045	render (CFPlus::Layout self, float x, float y, int flags = 0)
798	PPCODE:	1046	PPCODE:
799	{	1047	pango_opengl_render_layout_subpixel (
800	SV *retval;	1048	self->pl,
801	int w, h;	1049	x * PANGO_SCALE, y * PANGO_SCALE,
802	FT_Bitmap bitmap;	1050	self->r, self->g, self->b, self->a,
		1051	flags
		1052	);
803		1053
804	layout_get_pixel_size (self, &w, &h);	1054	MODULE = CFPlus PACKAGE = CFPlus::Texture
805		1055
806	retval = newSV (w * h);	1056	void
807	SvPOK_only (retval);	1057	pad2pot (SV data_, SV w_, SV *h_)
808	SvCUR_set (retval, w * h);	1058	CODE:
		1059	{
		1060	int ow = SvIV (w_);
		1061	int oh = SvIV (h_);
809		1062
810	bitmap.rows = h;	1063	if (ow && oh)
811	bitmap.width = w;	1064	{
812	bitmap.pitch = w;	1065	int nw = minpot (ow);
813	bitmap.buffer = (unsigned char*)SvPVX (retval);	1066	int nh = minpot (oh);
814	bitmap.num_grays = 256;
815	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
816		1067
817	memset (bitmap.buffer, 0, w * h);	1068	if (nw != ow \|\| nh != oh)
818		1069	{
819	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	1070	if (SvOK (data_))
		1071	{
		1072	STRLEN datalen;
		1073	char *data = SvPVbyte (data_, datalen);
		1074	int bpp = datalen / (ow * oh);
		1075	SV result_ = sv_2mortal (newSV (nw nh * bpp));
820		1076
821	EXTEND (SP, 3);	1077	SvPOK_only (result_);
822	PUSHs (sv_2mortal (newSViv (w)));	1078	SvCUR_set (result_, nw * nh * bpp);
823	PUSHs (sv_2mortal (newSViv (h)));
824	PUSHs (sv_2mortal (retval));
825	}
826		1079
827	MODULE = CFClient PACKAGE = CFClient::Texture	1080	memset (SvPVX (result_), 0, nw * nh * bpp);
		1081	while (oh--)
		1082	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
828		1083
		1084	sv_setsv (data_, result_);
		1085	}
		1086
		1087	sv_setiv (w_, nw);
		1088	sv_setiv (h_, nh);
		1089	}
		1090	}
		1091	}
		1092
829	void	1093	void
830	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1094	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
831	PROTOTYPE: $$$;$$	1095	PROTOTYPE: $$$;$$
		1096	ALIAS:
		1097	draw_quad_alpha = 1
		1098	draw_quad_alpha_premultiplied = 2
832	CODE:	1099	CODE:
833	{	1100	{
834	HV hv = (HV )SvRV (self);	1101	HV hv = (HV )SvRV (self);
835	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1102	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
836	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1103	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
837	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1104	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
838	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
839		1105
840	if (items < 5)	1106	if (items < 5)
841	{	1107	{
842	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1108	w = SvNV (*hv_fetch (hv, "w", 1, 1));
843	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1109	h = SvNV (*hv_fetch (hv, "h", 1, 1));
844	}	1110	}
845		1111
		1112	if (ix)
		1113	{
		1114	glEnable (GL_BLEND);
		1115
		1116	if (ix == 2)
		1117	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1118	else
		1119	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1120	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1121
		1122	glEnable (GL_ALPHA_TEST);
		1123	glAlphaFunc (GL_GREATER, 0.01f);
		1124	}
		1125
846	glBindTexture (GL_TEXTURE_2D, name);	1126	glBindTexture (GL_TEXTURE_2D, name);
847	if (wrap_mode) {	1127
848	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
849	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
850	}
851	glBegin (GL_QUADS);	1128	glBegin (GL_QUADS);
852	glTexCoord2f (0, 0); glVertex2f (x , y );	1129	glTexCoord2f (0, 0); glVertex2f (x , y );
853	glTexCoord2f (0, t); glVertex2f (x , y + h);	1130	glTexCoord2f (0, t); glVertex2f (x , y + h);
854	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1131	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
855	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1132	glTexCoord2f (s, 0); glVertex2f (x + w, y );
856	glEnd ();	1133	glEnd ();
857	}
858		1134
		1135	if (ix)
		1136	{
		1137	glDisable (GL_ALPHA_TEST);
		1138	glDisable (GL_BLEND);
		1139	}
		1140	}
		1141
859	MODULE = CFClient PACKAGE = CFClient::Map	1142	MODULE = CFPlus PACKAGE = CFPlus::Map
860		1143
861	CFClient::Map	1144	CFPlus::Map
862	new (SV *class, int map_width, int map_height)	1145	new (SV *class, int map_width, int map_height)
863	CODE:	1146	CODE:
864	New (0, RETVAL, 1, struct map);	1147	New (0, RETVAL, 1, struct map);
865	RETVAL->x = 0;	1148	RETVAL->x = 0;
866	RETVAL->y = 0;	1149	RETVAL->y = 0;
…		…
876	RETVAL->row = 0;	1159	RETVAL->row = 0;
877	OUTPUT:	1160	OUTPUT:
878	RETVAL	1161	RETVAL
879		1162
880	void	1163	void
881	DESTROY (CFClient::Map self)	1164	DESTROY (CFPlus::Map self)
882	CODE:	1165	CODE:
883	{	1166	{
884	map_clear (self);	1167	map_clear (self);
885	Safefree (self->face);	1168	Safefree (self->face);
		1169	Safefree (self->tex);
886	Safefree (self);	1170	Safefree (self);
887	}	1171	}
888		1172
889	void	1173	void
890	clear (CFClient::Map self)	1174	clear (CFPlus::Map self)
891	CODE:	1175	CODE:
892	map_clear (self);	1176	map_clear (self);
893		1177
894	void	1178	void
895	set_face (CFClient::Map self, int face, int texid)	1179	set_face (CFPlus::Map self, int face, int texid)
896	CODE:	1180	CODE:
897	{	1181	{
898	while (self->faces <= face)	1182	while (self->faces <= face)
899	{	1183	{
900	Append (mapface, self->face, self->faces, self->faces);	1184	Append (mapface, self->face, self->faces, self->faces);
…		…
903		1187
904	self->face [face] = texid;	1188	self->face [face] = texid;
905	}	1189	}
906		1190
907	void	1191	void
908	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)	1192	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)
909	CODE:	1193	CODE:
910	{	1194	{
911	while (self->texs <= texid)	1195	while (self->texs <= texid)
912	{	1196	{
913	Append (maptex, self->tex, self->texs, self->texs);	1197	Append (maptex, self->tex, self->texs, self->texs);
…		…
925	tex->r = r;	1209	tex->r = r;
926	tex->g = g;	1210	tex->g = g;
927	tex->b = b;	1211	tex->b = b;
928	tex->a = a;	1212	tex->a = a;
929	}	1213	}
		1214
		1215	// somewhat hackish, but for textures that require it, it really
		1216	// improves the look, and most others don't suffer.
		1217	glBindTexture (GL_TEXTURE_2D, name);
		1218	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1219	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1220	// use uglier nearest interpolation because linear suffers
		1221	// from transparent color bleeding and ugly wrapping effects.
		1222	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
930	}	1223	}
931		1224
932	int	1225	int
933	ox (CFClient::Map self)	1226	ox (CFPlus::Map self)
934	ALIAS:	1227	ALIAS:
935	oy = 1	1228	oy = 1
		1229	x = 2
		1230	y = 3
		1231	w = 4
		1232	h = 5
936	CODE:	1233	CODE:
937	switch (ix)	1234	switch (ix)
938	{	1235	{
939	case 0: RETVAL = self->ox; break;	1236	case 0: RETVAL = self->ox; break;
940	case 1: RETVAL = self->oy; break;	1237	case 1: RETVAL = self->oy; break;
		1238	case 2: RETVAL = self->x; break;
		1239	case 3: RETVAL = self->y; break;
		1240	case 4: RETVAL = self->w; break;
		1241	case 5: RETVAL = self->h; break;
941	}	1242	}
942	OUTPUT:	1243	OUTPUT:
943	RETVAL	1244	RETVAL
944		1245
945	void	1246	void
946	scroll (CFClient::Map self, int dx, int dy)	1247	scroll (CFPlus::Map self, int dx, int dy)
947	CODE:	1248	CODE:
948	{	1249	{
949	if (dx > 0)	1250	if (dx > 0)
950	map_blank (self, self->x, self->y, dx - 1, self->h);	1251	map_blank (self, self->x, self->y, dx, self->h);
951	else if (dx < 0)	1252	else if (dx < 0)
952	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1253	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
953		1254
954	if (dy > 0)	1255	if (dy > 0)
955	map_blank (self, self->x, self->y, self->w, dy - 1);	1256	map_blank (self, self->x, self->y, self->w, dy);
956	else if (dy < 0)	1257	else if (dy < 0)
957	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1258	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
958		1259
959	self->ox += dx; self->x += dx;	1260	self->ox += dx; self->x += dx;
960	self->oy += dy; self->y += dy;	1261	self->oy += dy; self->y += dy;
961		1262
962	while (self->y < 0)	1263	while (self->y < 0)
…		…
967	self->y += MAP_EXTEND_Y;	1268	self->y += MAP_EXTEND_Y;
968	}	1269	}
969	}	1270	}
970		1271
971	void	1272	void
972	map1a_update (CFClient::Map self, SV *data_)	1273	map1a_update (CFPlus::Map self, SV *data_, int extmap)
973	CODE:	1274	CODE:
974	{	1275	{
975	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1276	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
976	uint8_t data_end = (uint8_t )SvEND (data_);	1277	uint8_t data_end = (uint8_t )SvEND (data_);
977	mapcell *cell;	1278	mapcell *cell;
978	int x, y, flags;	1279	int x, y, flags;
979		1280
980	while (data < data_end)	1281	while (data < data_end - 1)
981	{	1282	{
982	flags = (data [0] << 8) + data [1]; data += 2;	1283	flags = (data [0] << 8) + data [1]; data += 2;
983		1284
984	x = ((flags >> 10) & 63) + self->x;	1285	x = self->x + ((flags >> 10) & 63);
985	y = ((flags >> 4) & 63) + self->y;	1286	y = self->y + ((flags >> 4) & 63);
986		1287
987	cell = map_get_cell (self, x, y);	1288	cell = map_get_cell (self, x, y);
988		1289
989	if (flags & 15)	1290	if (flags & 15)
990	{	1291	{
991	if (cell->darkness < 0)	1292	if (!cell->darkness)
992	{	1293	{
		1294	memset (cell, 0, sizeof (*cell));
993	cell->darkness = 0;	1295	cell->darkness = 256;
994	cell->face [0] = 0;
995	cell->face [1] = 0;
996	cell->face [2] = 0;
997	}	1296	}
998		1297
999	cell->darkness = flags & 8 ? *data++ : 255;
1000
1001	//TODO: don't trust server data to be in-range(!)	1298	//TODO: don't trust server data to be in-range(!)
		1299
		1300	if (flags & 8)
		1301	{
		1302	if (extmap)
		1303	{
		1304	uint8_t ext, cmd;
		1305
		1306	do
		1307	{
		1308	ext = *data++;
		1309	cmd = ext & 0x3f;
		1310
		1311	if (cmd < 4)
		1312	cell->darkness = 255 - ext * 64 + 1;
		1313	else if (cmd == 5) // health
		1314	{
		1315	cell->stat_width = 1;
		1316	cell->stat_hp = *data++;
		1317	}
		1318	else if (cmd == 6) // monster width
		1319	cell->stat_width = *data++ + 1;
		1320	else if (cmd == 0x47) // monster width
		1321	{
		1322	if (*data == 4)
		1323	; // decode player tag
		1324
		1325	data += *data + 1;
		1326	}
		1327	else if (cmd == 8) // cell flags
		1328	cell->flags = *data++;
		1329	else if (ext & 0x40) // unknown, multibyte => skip
		1330	data += *data + 1;
		1331	else
		1332	data++;
		1333	}
		1334	while (ext & 0x80);
		1335	}
		1336	else
		1337	cell->darkness = *data++ + 1;
		1338	}
1002		1339
1003	if (flags & 4)	1340	if (flags & 4)
1004	{	1341	{
1005	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1342	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1006	}	1343	}
…		…
1014	{	1351	{
1015	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1352	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1016	}	1353	}
1017	}	1354	}
1018	else	1355	else
1019	cell->darkness = -1;	1356	cell->darkness = 0;
1020	}	1357	}
1021	}	1358	}
1022		1359
1023	SV *	1360	SV *
1024	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1361	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1025	CODE:	1362	CODE:
1026	{	1363	{
1027	int x1, x;	1364	int x1, x;
1028	int y1, y;	1365	int y1, y;
1029	int z;	1366	int z;
…		…
1079	}	1416	}
1080	OUTPUT:	1417	OUTPUT:
1081	RETVAL	1418	RETVAL
1082		1419
1083	void	1420	void
1084	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1421	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1085	PPCODE:	1422	CODE:
1086	{	1423	{
1087	int vx, vy;	1424	int vx, vy;
1088	int x, y, z;	1425	int x, y, z;
1089	int last_name;	1426	int last_name;
1090	mapface face;	1427	mapface face;
1091	int sw4 = (sw + 3) & ~3;
1092	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1093	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1094		1428
1095	memset (darkness, 255, sw4 * sh);
1096	SvPOK_only (darkness_sv);
1097	SvCUR_set (darkness_sv, sw4 * sh);
1098
1099	vx = self->x + (self->w - sw) / 2 - shift_x;	1429	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1100	vy = self->y + (self->h - sh) / 2 - shift_y;	1430	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1101		1431
1102	/*	1432	/*
1103	int vx = self->vx = self->w >= sw	1433	int vx = self->vx = self->w >= sw
1104	? self->x + (self->w - sw) / 2	1434	? self->x + (self->w - sw) / 2
1105	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1435	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1109	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1439	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1110	*/	1440	*/
1111		1441
1112	glColor4ub (255, 255, 255, 255);	1442	glColor4ub (255, 255, 255, 255);
1113		1443
		1444	glEnable (GL_BLEND);
1114	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1445	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1115	glEnable (GL_BLEND);
1116	glEnable (GL_TEXTURE_2D);	1446	glEnable (GL_TEXTURE_2D);
1117	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1447	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1118		1448
1119	glBegin (GL_QUADS);	1449	glBegin (GL_QUADS);
1120		1450
…		…
1129	for (x = 0; x < sw; x++)	1459	for (x = 0; x < sw; x++)
1130	if (row->c0 <= x + vx && x + vx < row->c1)	1460	if (row->c0 <= x + vx && x + vx < row->c1)
1131	{	1461	{
1132	mapcell *cell = row->col + (x + vx - row->c0);	1462	mapcell *cell = row->col + (x + vx - row->c0);
1133		1463
1134	darkness[y * sw4 + x] = cell->darkness < 0
1135	? 255 - FOW_DARKNESS
1136	: 255 - cell->darkness;
1137
1138	face = cell->face [z];	1464	face = cell->face [z];
1139		1465
1140	if (face)	1466	if (face && face < self->texs)
1141	{	1467	{
1142	maptex tex = self->tex [face];	1468	maptex tex = self->tex [face];
1143
1144	int px = (x + 1) * 32 - tex.w;	1469	int px = (x + 1) * 32 - tex.w;
1145	int py = (y + 1) * 32 - tex.h;	1470	int py = (y + 1) * 32 - tex.h;
1146		1471
1147	if (last_name != tex.name)	1472	if (last_name != tex.name)
1148	{	1473	{
1149	glEnd ();	1474	glEnd ();
1150	last_name = tex.name;
1151	glBindTexture (GL_TEXTURE_2D, last_name);	1475	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1152	glBegin (GL_QUADS);	1476	glBegin (GL_QUADS);
1153	}	1477	}
1154		1478
1155	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1479	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1156	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1480	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1157	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1481	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1158	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1482	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1159	}	1483	}
		1484
		1485	if (cell->flags && z == 2)
		1486	{
		1487	if (cell->flags & 1)
		1488	{
		1489	maptex tex = self->tex [1];
		1490	int px = (x + 1) * 32 - tex.w + 2;
		1491	int py = (y + 1) * 32 - tex.h - 6;
		1492
		1493	glEnd ();
		1494	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1495	glBegin (GL_QUADS);
		1496
		1497	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1498	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1499	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1500	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1501	}
		1502	}
1160	}	1503	}
1161	}	1504	}
1162		1505
1163	glEnd ();	1506	glEnd ();
1164		1507
1165	glDisable (GL_TEXTURE_2D);	1508	glDisable (GL_TEXTURE_2D);
1166	glDisable (GL_BLEND);	1509	glDisable (GL_BLEND);
		1510
		1511	// top layer: overlays such as the health bar
		1512	for (y = 0; y < sh; y++)
		1513	if (0 <= y + vy && y + vy < self->rows)
		1514	{
		1515	maprow *row = self->row + (y + vy);
		1516
		1517	for (x = 0; x < sw; x++)
		1518	if (row->c0 <= x + vx && x + vx < row->c1)
		1519	{
		1520	mapcell *cell = row->col + (x + vx - row->c0);
		1521
		1522	int px = x * 32;
		1523	int py = y * 32;
		1524
		1525	if (cell->stat_hp)
		1526	{
		1527	int width = cell->stat_width * 32;
		1528	int thick = sh / 28 + 1 + cell->stat_width;
		1529
		1530	glColor3ub (0, 0, 0);
		1531	glRectf (px + 1, py - thick - 2,
		1532	px + width - 1, py);
		1533
		1534	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1535	glRectf (px + 2,
		1536	py - thick - 1,
		1537	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1538	}
		1539	}
		1540	}
		1541	}
		1542
		1543	void
		1544	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1545	CODE:
		1546	{
		1547	static float color[16][3] = {
		1548	{ 0.00F, 0.00F, 0.00F },
		1549	{ 1.00F, 1.00F, 1.00F },
		1550	{ 0.00F, 0.00F, 0.55F },
		1551	{ 1.00F, 0.00F, 0.00F },
		1552
		1553	{ 1.00F, 0.54F, 0.00F },
		1554	{ 0.11F, 0.56F, 1.00F },
		1555	{ 0.93F, 0.46F, 0.00F },
		1556	{ 0.18F, 0.54F, 0.34F },
		1557
		1558	{ 0.56F, 0.73F, 0.56F },
		1559	{ 0.80F, 0.80F, 0.80F },
		1560	{ 0.55F, 0.41F, 0.13F },
		1561	{ 0.99F, 0.77F, 0.26F },
		1562
		1563	{ 0.74F, 0.65F, 0.41F },
		1564
		1565	{ 0.00F, 1.00F, 1.00F },
		1566	{ 1.00F, 0.00F, 1.00F },
		1567	{ 1.00F, 1.00F, 0.00F },
		1568	};
		1569
		1570	int x, y;
		1571
		1572	glEnable (GL_TEXTURE_2D);
		1573	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1574	glEnable (GL_BLEND);
		1575	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1576	glBegin (GL_QUADS);
		1577
		1578	for (y = 0; y < h; y++)
		1579	for (x = 0; x < w; x++)
		1580	{
		1581	unsigned char m = data [x + y * w];
		1582
		1583	if (m)
		1584	{
		1585	float *c = color [m & 15];
		1586
		1587	float tx1 = m & 0x40 ? 0.5 : 0.;
		1588	float tx2 = tx1 + 0.5;
		1589
		1590	glColor4f (c[0], c[1], c[2], 0.75);
		1591	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1592	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1593	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1594	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1595	}
		1596	}
		1597
		1598	glEnd ();
		1599	glDisable (GL_BLEND);
		1600	glDisable (GL_TEXTURE_2D);
		1601	}
		1602
		1603	void
		1604	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1605	PPCODE:
		1606	{
		1607	int vx, vy;
		1608	int x, y;
		1609	int sw4 = (sw + 3) & ~3;
		1610	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1611	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1612
		1613	memset (darkness, 255, sw4 * sh);
		1614	SvPOK_only (darkness_sv);
		1615	SvCUR_set (darkness_sv, sw4 * sh);
		1616
		1617	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1618	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1619
		1620	for (y = 0; y < sh; y++)
		1621	if (0 <= y + vy && y + vy < self->rows)
		1622	{
		1623	maprow *row = self->row + (y + vy);
		1624
		1625	for (x = 0; x < sw; x++)
		1626	if (row->c0 <= x + vx && x + vx < row->c1)
		1627	{
		1628	mapcell *cell = row->col + (x + vx - row->c0);
		1629
		1630	darkness[y * sw4 + x] = cell->darkness
		1631	? 255 - (cell->darkness - 1)
		1632	: 255 - FOW_DARKNESS;
		1633	}
		1634	}
1167		1635
1168	EXTEND (SP, 3);	1636	EXTEND (SP, 3);
1169	PUSHs (sv_2mortal (newSViv (sw4)));	1637	PUSHs (sv_2mortal (newSViv (sw4)));
1170	PUSHs (sv_2mortal (newSViv (sh)));	1638	PUSHs (sv_2mortal (newSViv (sh)));
1171	PUSHs (darkness_sv);	1639	PUSHs (darkness_sv);
1172	}	1640	}
1173		1641
1174	SV *	1642	SV *
1175	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1643	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1176	CODE:	1644	CODE:
1177	{	1645	{
1178	int x, y, x1, y1;	1646	int x, y, x1, y1;
1179	SV data_sv = newSV (w h * 7 + 5);	1647	SV data_sv = newSV (w h * 7 + 5);
1180	uint8_t data = (uint8_t )SvPVX (data_sv);	1648	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1242	}	1710	}
1243	OUTPUT:	1711	OUTPUT:
1244	RETVAL	1712	RETVAL
1245		1713
1246	void	1714	void
1247	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1715	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1248	PPCODE:	1716	PPCODE:
1249	{	1717	{
1250	int x, y, z;	1718	int x, y, z;
1251	int w, h;	1719	int w, h;
1252	int x1, y1;	1720	int x1, y1;
…		…
1284		1752
1285	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1753	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1286	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1754	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1287	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1755	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1288		1756
1289	if (cell->darkness <= 0)	1757	if (cell->darkness == 0)
1290	{	1758	{
1291	cell->darkness = -1;	1759	cell->darkness = 0;
1292		1760
1293	for (z = 0; z <= 2; z++)	1761	for (z = 0; z <= 2; z++)
1294	{	1762	{
1295	cell->face[z] = face[z];	1763	cell->face[z] = face[z];
1296		1764
…		…
1301	}	1769	}
1302	}	1770	}
1303	}	1771	}
1304	}	1772	}
1305		1773
1306	MODULE = CFClient PACKAGE = CFClient::MixChunk	1774	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1307		1775
1308	CFClient::MixChunk	1776	CFPlus::MixChunk
1309	new_from_file (SV class, char path)	1777	new_from_file (SV class, char path)
1310	CODE:	1778	CODE:
1311	RETVAL = Mix_LoadWAV (path);	1779	RETVAL = Mix_LoadWAV (path);
1312	OUTPUT:	1780	OUTPUT:
1313	RETVAL	1781	RETVAL
1314		1782
1315	void	1783	void
1316	DESTROY (CFClient::MixChunk self)	1784	DESTROY (CFPlus::MixChunk self)
1317	CODE:	1785	CODE:
1318	Mix_FreeChunk (self);	1786	Mix_FreeChunk (self);
1319		1787
1320	int	1788	int
1321	volume (CFClient::MixChunk self, int volume = -1)	1789	volume (CFPlus::MixChunk self, int volume = -1)
1322	CODE:	1790	CODE:
1323	RETVAL = Mix_VolumeChunk (self, volume);	1791	RETVAL = Mix_VolumeChunk (self, volume);
1324	OUTPUT:	1792	OUTPUT:
1325	RETVAL	1793	RETVAL
1326		1794
1327	int	1795	int
1328	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1796	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1329	CODE:	1797	CODE:
1330	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1798	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1331	OUTPUT:	1799	OUTPUT:
1332	RETVAL	1800	RETVAL
1333		1801
1334	MODULE = CFClient PACKAGE = CFClient::MixMusic	1802	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1335		1803
1336	int	1804	int
1337	volume (int volume = -1)	1805	volume (int volume = -1)
1338	CODE:	1806	CODE:
1339	RETVAL = Mix_VolumeMusic (volume);	1807	RETVAL = Mix_VolumeMusic (volume);
1340	OUTPUT:	1808	OUTPUT:
1341	RETVAL	1809	RETVAL
1342		1810
1343	CFClient::MixMusic	1811	CFPlus::MixMusic
1344	new_from_file (SV class, char path)	1812	new_from_file (SV class, char path)
1345	CODE:	1813	CODE:
1346	RETVAL = Mix_LoadMUS (path);	1814	RETVAL = Mix_LoadMUS (path);
1347	OUTPUT:	1815	OUTPUT:
1348	RETVAL	1816	RETVAL
1349		1817
1350	void	1818	void
1351	DESTROY (CFClient::MixMusic self)	1819	DESTROY (CFPlus::MixMusic self)
1352	CODE:	1820	CODE:
1353	Mix_FreeMusic (self);	1821	Mix_FreeMusic (self);
1354		1822
1355	int	1823	int
1356	play (CFClient::MixMusic self, int loops = -1)	1824	play (CFPlus::MixMusic self, int loops = -1)
1357	CODE:	1825	CODE:
1358	RETVAL = Mix_PlayMusic (self, loops);	1826	RETVAL = Mix_PlayMusic (self, loops);
1359	OUTPUT:	1827	OUTPUT:
1360	RETVAL	1828	RETVAL
1361		1829
1362	MODULE = CFClient PACKAGE = CFClient::OpenGL	1830	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1363		1831
1364	BOOT:	1832	BOOT:
1365	{	1833	{
1366	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1834	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1367	static const struct {	1835	static const struct {
1368	const char *name;	1836	const char *name;
1369	IV iv;	1837	IV iv;
1370	} *civ, const_iv[] = {	1838	} *civ, const_iv[] = {
1371	# define const_iv(name) { # name, (IV)name }	1839	# define const_iv(name) { # name, (IV)name }
1372	const_iv (GL_COLOR_MATERIAL),	1840	const_iv (GL_COLOR_MATERIAL),
1373	const_iv (GL_SMOOTH),	1841	const_iv (GL_SMOOTH),
1374	const_iv (GL_FLAT),	1842	const_iv (GL_FLAT),
1375	const_iv (GL_DITHER),	1843	const_iv (GL_DITHER),
1376	const_iv (GL_BLEND),	1844	const_iv (GL_BLEND),
		1845	const_iv (GL_CULL_FACE),
1377	const_iv (GL_SCISSOR_TEST),	1846	const_iv (GL_SCISSOR_TEST),
		1847	const_iv (GL_DEPTH_TEST),
		1848	const_iv (GL_ALPHA_TEST),
		1849	const_iv (GL_NORMALIZE),
		1850	const_iv (GL_RESCALE_NORMAL),
		1851	const_iv (GL_FRONT),
		1852	const_iv (GL_BACK),
1378	const_iv (GL_AND),	1853	const_iv (GL_AND),
1379	const_iv (GL_ONE),	1854	const_iv (GL_ONE),
1380	const_iv (GL_ZERO),	1855	const_iv (GL_ZERO),
1381	const_iv (GL_SRC_ALPHA),	1856	const_iv (GL_SRC_ALPHA),
1382	const_iv (GL_SRC_ALPHA_SATURATE),	1857	const_iv (GL_DST_ALPHA),
1383	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1858	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1384	const_iv (GL_ONE_MINUS_DST_ALPHA),	1859	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1860	const_iv (GL_SRC_ALPHA_SATURATE),
1385	const_iv (GL_RGB),	1861	const_iv (GL_RGB),
1386	const_iv (GL_RGBA),	1862	const_iv (GL_RGBA),
		1863	const_iv (GL_RGBA4),
		1864	const_iv (GL_RGBA8),
		1865	const_iv (GL_RGB5_A1),
1387	const_iv (GL_UNSIGNED_BYTE),	1866	const_iv (GL_UNSIGNED_BYTE),
		1867	const_iv (GL_UNSIGNED_SHORT),
		1868	const_iv (GL_UNSIGNED_INT),
1388	const_iv (GL_ALPHA),	1869	const_iv (GL_ALPHA),
		1870	const_iv (GL_INTENSITY),
		1871	const_iv (GL_LUMINANCE),
		1872	const_iv (GL_LUMINANCE_ALPHA),
1389	const_iv (GL_FLOAT),	1873	const_iv (GL_FLOAT),
1390	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1874	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1391	const_iv (GL_COMPILE),	1875	const_iv (GL_COMPILE),
1392	const_iv (GL_TEXTURE_1D),	1876	const_iv (GL_TEXTURE_1D),
1393	const_iv (GL_TEXTURE_2D),	1877	const_iv (GL_TEXTURE_2D),
…		…
1395	const_iv (GL_TEXTURE_MAG_FILTER),	1879	const_iv (GL_TEXTURE_MAG_FILTER),
1396	const_iv (GL_TEXTURE_MIN_FILTER),	1880	const_iv (GL_TEXTURE_MIN_FILTER),
1397	const_iv (GL_TEXTURE_ENV_MODE),	1881	const_iv (GL_TEXTURE_ENV_MODE),
1398	const_iv (GL_TEXTURE_WRAP_S),	1882	const_iv (GL_TEXTURE_WRAP_S),
1399	const_iv (GL_TEXTURE_WRAP_T),	1883	const_iv (GL_TEXTURE_WRAP_T),
		1884	const_iv (GL_REPEAT),
1400	const_iv (GL_CLAMP),	1885	const_iv (GL_CLAMP),
1401	const_iv (GL_REPEAT),	1886	const_iv (GL_CLAMP_TO_EDGE),
1402	const_iv (GL_NEAREST),	1887	const_iv (GL_NEAREST),
1403	const_iv (GL_LINEAR),	1888	const_iv (GL_LINEAR),
1404	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1889	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1405	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1890	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1406	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1891	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1407	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1892	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1408	const_iv (GL_GENERATE_MIPMAP),	1893	const_iv (GL_GENERATE_MIPMAP),
1409	const_iv (GL_MODULATE),	1894	const_iv (GL_MODULATE),
1410	const_iv (GL_DECAL),	1895	const_iv (GL_DECAL),
1411	const_iv (GL_REPLACE),	1896	const_iv (GL_REPLACE),
		1897	const_iv (GL_DEPTH_BUFFER_BIT),
1412	const_iv (GL_COLOR_BUFFER_BIT),	1898	const_iv (GL_COLOR_BUFFER_BIT),
1413	const_iv (GL_PROJECTION),	1899	const_iv (GL_PROJECTION),
1414	const_iv (GL_MODELVIEW),	1900	const_iv (GL_MODELVIEW),
1415	const_iv (GL_COLOR_LOGIC_OP),	1901	const_iv (GL_COLOR_LOGIC_OP),
1416	const_iv (GL_SEPARABLE_2D),	1902	const_iv (GL_SEPARABLE_2D),
1417	const_iv (GL_CONVOLUTION_2D),	1903	const_iv (GL_CONVOLUTION_2D),
1418	const_iv (GL_CONVOLUTION_BORDER_MODE),	1904	const_iv (GL_CONVOLUTION_BORDER_MODE),
1419	const_iv (GL_CONSTANT_BORDER),	1905	const_iv (GL_CONSTANT_BORDER),
1420	const_iv (GL_LINES),	1906	const_iv (GL_LINES),
		1907	const_iv (GL_LINE_STRIP),
		1908	const_iv (GL_LINE_LOOP),
1421	const_iv (GL_QUADS),	1909	const_iv (GL_QUADS),
1422	const_iv (GL_LINE_LOOP),	1910	const_iv (GL_QUAD_STRIP),
		1911	const_iv (GL_TRIANGLES),
		1912	const_iv (GL_TRIANGLE_STRIP),
		1913	const_iv (GL_TRIANGLE_FAN),
1423	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1914	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1424	const_iv (GL_FASTEST),	1915	const_iv (GL_FASTEST),
		1916	const_iv (GL_V2F),
		1917	const_iv (GL_V3F),
		1918	const_iv (GL_T2F_V3F),
		1919	const_iv (GL_T2F_N3F_V3F),
1425	# undef const_iv	1920	# undef const_iv
1426	};	1921	};
1427		1922
1428	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1923	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1429	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1924	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1430	}	1925	}
1431		1926
		1927	char *
		1928	gl_vendor ()
		1929	CODE:
		1930	RETVAL = (char *)glGetString (GL_VENDOR);
		1931	OUTPUT:
		1932	RETVAL
		1933
		1934	char *
		1935	gl_version ()
		1936	CODE:
		1937	RETVAL = (char *)glGetString (GL_VERSION);
		1938	OUTPUT:
		1939	RETVAL
		1940
		1941	char *
		1942	gl_extensions ()
		1943	CODE:
		1944	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1945	OUTPUT:
		1946	RETVAL
		1947
1432	int glGetError ()	1948	int glGetError ()
		1949
		1950	void glFinish ()
1433		1951
1434	void glClear (int mask)	1952	void glClear (int mask)
1435		1953
1436	void glClearColor (float r, float g, float b, float a = 1.0)	1954	void glClearColor (float r, float g, float b, float a = 1.0)
1437	PROTOTYPE: @	1955	PROTOTYPE: @
…		…
1444		1962
1445	void glHint (int target, int mode)	1963	void glHint (int target, int mode)
1446		1964
1447	void glBlendFunc (int sfactor, int dfactor)	1965	void glBlendFunc (int sfactor, int dfactor)
1448		1966
		1967	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1968	CODE:
		1969	gl_BlendFuncSeparate (sa, da, saa, daa);
		1970
		1971	void glDepthMask (int flag)
		1972
1449	void glLogicOp (int opcode)	1973	void glLogicOp (int opcode)
1450		1974
1451	void glColorMask (int red, int green, int blue, int alpha)	1975	void glColorMask (int red, int green, int blue, int alpha)
1452		1976
1453	void glMatrixMode (int mode)	1977	void glMatrixMode (int mode)
…		…
1456		1980
1457	void glPopMatrix ()	1981	void glPopMatrix ()
1458		1982
1459	void glLoadIdentity ()	1983	void glLoadIdentity ()
1460		1984
		1985	void glDrawBuffer (int buffer)
		1986
		1987	void glReadBuffer (int buffer)
		1988
1461	# near and far are due to microsofts buggy c compiler	1989	# near_ and far_ are due to microsofts buggy "c" compiler
		1990	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1991
		1992	# near_ and far_ are due to microsofts buggy "c" compiler
1462	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1993	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1463		1994
1464	void glViewport (int x, int y, int width, int height)	1995	void glViewport (int x, int y, int width, int height)
1465		1996
1466	void glScissor (int x, int y, int width, int height)	1997	void glScissor (int x, int y, int width, int height)
…		…
1481		2012
1482	void glEnd ()	2013	void glEnd ()
1483		2014
1484	void glColor (float r, float g, float b, float a = 1.0)	2015	void glColor (float r, float g, float b, float a = 1.0)
1485	PROTOTYPE: @	2016	PROTOTYPE: @
		2017	ALIAS:
		2018	glColor_premultiply = 1
1486	CODE:	2019	CODE:
1487	glColor4ub (r * 255., g * 255., b * 255., a * 255.);	2020	if (ix)
		2021	{
		2022	r *= a;
		2023	g *= a;
		2024	b *= a;
		2025	}
		2026	// microsoft visual "c" rounds instead of truncating...
		2027	glColor4f (r, g, b, a);
		2028
		2029	void glInterleavedArrays (int format, int stride, char *data)
		2030
		2031	void glDrawElements (int mode, int count, int type, char *indices)
		2032
		2033	# 1.2 void glDrawRangeElements (int mode, int start, int end
		2034
		2035	void glRasterPos (float x, float y, float z = 0.)
		2036	CODE:
		2037	glRasterPos3f (0, 0, z);
		2038	glBitmap (0, 0, 0, 0, x, y, 0);
1488		2039
1489	void glVertex (float x, float y, float z = 0.)	2040	void glVertex (float x, float y, float z = 0.)
1490	CODE:	2041	CODE:
1491	glVertex3f (x, y, z);	2042	glVertex3f (x, y, z);
1492		2043
…		…
1504		2055
1505	void glBindTexture (int target, int name)	2056	void glBindTexture (int target, int name)
1506		2057
1507	void glConvolutionParameter (int target, int pname, float params)	2058	void glConvolutionParameter (int target, int pname, float params)
1508	CODE:	2059	CODE:
1509	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2060	if (gl.ConvolutionParameterf)
		2061	gl.ConvolutionParameterf (target, pname, params);
1510		2062
1511	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2063	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1512	CODE:	2064	CODE:
1513	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2065	if (gl.ConvolutionFilter2D)
1514	(target, internalformat, width, height, format, type, data));	2066	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1515		2067
1516	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2068	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1517	CODE:	2069	CODE:
1518	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2070	if (gl.SeparableFilter2D)
1519	(target, internalformat, width, height, format, type, row, column));	2071	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1520		2072
1521	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2073	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1522		2074
1523	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2075	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1524		2076
1525	void glRasterPos (int x, int y)	2077	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1526	CODE:
1527	glRasterPos2i (x, y);
1528		2078
1529	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2079	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1530		2080
1531	int glGenTexture ()	2081	int glGenTexture ()
1532	CODE:	2082	CODE:

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.73 by root, Fri May 5 19:30:14 2006 UTC vs. Revision 1.156 by root, Thu Sep 21 14:47:51 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.73 by root, Fri May 5 19:30:14 2006 UTC vs.
Revision 1.156 by root, Thu Sep 21 14:47:51 2006 UTC