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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.71 by root, Fri May 5 19:05:47 2006 UTC vs. Revision 1.145 by root, Fri Aug 18 03:19:58 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.71 by root, Fri May 5 19:05:47 2006 UTC vs.
Revision 1.145 by root, Fri Aug 18 03:19:58 2006 UTC