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

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.133 by root, Sun Jul 30 13:16:44 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.133 by root, Sun Jul 30 13:16:44 2006 UTC