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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.72 by root, Fri May 5 19:10:16 2006 UTC vs. Revision 1.134 by root, Fri Aug 4 16:49:58 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.72 by root, Fri May 5 19:10:16 2006 UTC vs.
Revision 1.134 by root, Fri Aug 4 16:49:58 2006 UTC