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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.87 by root, Fri May 19 18:39:06 2006 UTC vs.
Revision 1.138 by root, Mon Aug 14 01:21:01 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3	# include <malloc.h>	4	# include <malloc.h>
4	# include <windows.h>	5	# include <windows.h>
5	# pragma warning(disable:4244)	6	# pragma warning(disable:4244)
6	#endif	7	#endif
7		8
8	#include "EXTERN.h"	9	#include "EXTERN.h"
9	#include "perl.h"	10	#include "perl.h"
10	#include "XSUB.h"	11	#include "XSUB.h"
11		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
12	#include <math.h>	17	#include <math.h>
13	#include <string.h>	18	#include <string.h>
14	#include <stdio.h>	19	#include <stdio.h>
		20	#include <stdlib.h>
15		21
16	#include <SDL.h>	22	#include <SDL.h>
17	#include <SDL_endian.h>	23	#include <SDL_endian.h>
18	#include <SDL_image.h>	24	#include <SDL_image.h>
19	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
21		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
22	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
23		32
24	#include <pango/pango.h>	33	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		34
29	#ifndef _WIN32	35	#ifndef _WIN32
30	# include <sys/types.h>	36	# include <sys/types.h>
31	# include <sys/socket.h>	37	# include <sys/socket.h>
32	# include <netinet/in.h>	38	# include <netinet/in.h>
39	typedef signed char int8_t;	45	typedef signed char int8_t;
40	typedef signed short int16_t;	46	typedef signed short int16_t;
41	typedef signed int int32_t;	47	typedef signed int int32_t;
42	#endif	48	#endif
43		49
44	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45		51
46	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
47		53
48	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
50		56
51	#define MIN_FONT_HEIGHT 10	57	#define MIN_FONT_HEIGHT 10
52		58
53	#define GL_CALL(type,func,args) \	59	#if 0
54	{ \	60	# define PARACHUTE SDL_INIT_NOPARACHUTE
55	static int init_; \	61	#else
56	static type fptr_; \	62	# define PARACHUTE 0
57	\	63	#endif
58	if (!init_) \
59	{ \
60	init_ = 1; \
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62	} \
63	\
64	if (fptr_) \
65	fptr_ args; \
66	}
67		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
68	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
70		90
71	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	}
72		110
73	typedef struct cf_layout {	111	typedef struct cf_layout {
74	PangoLayout *pl; // either derived from a cairo or ft2 context	112	PangoLayout *pl;
75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
77	int base_height;	114	int base_height;
78	CFClient__Font font;	115	CFPlus__Font font;
79	} *CFClient__Layout;	116	} *CFPlus__Layout;
80		117
81	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
82	static PangoContext ft2_context, cairo_context;	119	static PangoContext *opengl_context;
83	static PangoFontMap ft2_fontmap, cairo_fontmap;	120	static PangoFontMap *opengl_fontmap;
84		121
85	static void	122	static void
86	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
87	{	124	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
89	#ifdef _WIN32	126	#ifdef FC_HINT_STYLE
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91	#else	128	#endif
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif
94	}	130	}
95		131
96	static void	132	static void
97	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
98	{	134	{
99	/* 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
100	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
101	*/	137	*/
102	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
106		142
107	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
108	}	144	}
109		145
110	static void	146	static void
111	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
112	{	148	{
113	pango_layout_get_pixel_size (self->pl, w, h);	149	pango_layout_get_pixel_size (self->pl, w, h);
114		150
115	if (!w) w = 1;	151	if (!w) w = 1;
116	if (!h) h = 1;	152	if (!h) h = 1;
…		…
146	int texs;	182	int texs;
147	maptex *tex;	183	maptex *tex;
148		184
149	int32_t rows;	185	int32_t rows;
150	maprow *row;	186	maprow *row;
151	} *CFClient__Map;	187	} *CFPlus__Map;
152		188
153	static char *	189	static char *
154	prepend (char *ptr, int sze, int inc)	190	prepend (char *ptr, int sze, int inc)
155	{	191	{
156	char *p;	192	char *p;
…		…
174		210
175	#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))
176	#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))
177		213
178	static maprow *	214	static maprow *
179	map_get_row (CFClient__Map self, int y)	215	map_get_row (CFPlus__Map self, int y)
180	{	216	{
181	if (0 > y)	217	if (0 > y)
182	{	218	{
183	int extend = - y + MAP_EXTEND_Y;	219	int extend = - y + MAP_EXTEND_Y;
184	Prepend (maprow, self->row, self->rows, extend);	220	Prepend (maprow, self->row, self->rows, extend);
…		…
222		258
223	return row->col + (x - row->c0);	259	return row->col + (x - row->c0);
224	}	260	}
225		261
226	static mapcell *	262	static mapcell *
227	map_get_cell (CFClient__Map self, int x, int y)	263	map_get_cell (CFPlus__Map self, int x, int y)
228	{	264	{
229	return row_get_cell (map_get_row (self, y), x);	265	return row_get_cell (map_get_row (self, y), x);
230	}	266	}
231		267
232	static void	268	static void
233	map_clear (CFClient__Map self)	269	map_clear (CFPlus__Map self)
234	{	270	{
235	int r;	271	int r;
236		272
237	for (r = 0; r < self->rows; r++)	273	for (r = 0; r < self->rows; r++)
238	Safefree (self->row[r].col);	274	Safefree (self->row[r].col);
…		…
246	self->row = 0;	282	self->row = 0;
247	self->rows = 0;	283	self->rows = 0;
248	}	284	}
249		285
250	static void	286	static void
251	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)
252	{	288	{
253	int x, y;	289	int x, y;
254	maprow *row;	290	maprow *row;
255		291
256	for (y = y0; y < y0 + h; y++)	292	for (y = y0; y < y0 + h; y++)
…		…
296	ev.data2 = 0;	332	ev.data2 = 0;
297		333
298	SDL_PushEvent ((SDL_Event *)&ev);	334	SDL_PushEvent ((SDL_Event *)&ev);
299	}	335	}
300		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
301	MODULE = CFClient PACKAGE = CFClient	354	MODULE = CFPlus PACKAGE = CFPlus
302		355
303	PROTOTYPES: ENABLE	356	PROTOTYPES: ENABLE
304		357
305	BOOT:	358	BOOT:
306	{	359	{
307	HV *stash = gv_stashpv ("CFClient", 1);	360	HV *stash = gv_stashpv ("CFPlus", 1);
308	static const struct {	361	static const struct {
309	const char *name;	362	const char *name;
310	IV iv;	363	IV iv;
311	} *civ, const_iv[] = {	364	} *civ, const_iv[] = {
312	# define const_iv(name) { # name, (IV)name }	365	# define const_iv(name) { # name, (IV)name }
…		…
413		466
414	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; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	468	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416	}	469	}
417		470
		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
418	void	482	void
419	pango_init ()	483	pango_init ()
420	CODE:	484	CODE:
421	{	485	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx
423	ft2_fontmap = pango_ft2_font_map_new ();	486	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	487	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	488	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426
427	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
429	}	489	}
430		490
431	int	491	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	492	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
433		493
434	void	494	void
435	SDL_Quit ()	495	SDL_Quit ()
436		496
437	void	497	void
…		…
441	SDL_Rect **m;	501	SDL_Rect **m;
442		502
443	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	503	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	504	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	505	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 16);	506	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		507
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 64);	508	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	509	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450		510
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	511	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	512	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	513	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	514	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455		515
456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	516	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		517	#if SDL_VERSION_ATLEAST(1,2,10)
		518	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		519	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		520	#endif
457		521
458	SDL_EnableUNICODE (1);	522	SDL_EnableUNICODE (1);
459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	523	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460		524
461	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	525	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
470		534
471	++m;	535	++m;
472	}	536	}
473	}	537	}
474		538
		539	char *
		540	SDL_GetError ()
		541
475	int	542	int
476	SDL_SetVideoMode (int w, int h, int fullscreen)	543	SDL_SetVideoMode (int w, int h, int fullscreen)
477	CODE:	544	CODE:
478	RETVAL = !!SDL_SetVideoMode (	545	RETVAL = !!SDL_SetVideoMode (
479	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	546	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
480	);	547	);
		548	if (RETVAL)
		549	{
481	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	}
482	OUTPUT:	555	OUTPUT:
483	RETVAL	556	RETVAL
484		557
485	void	558	void
486	SDL_GL_SwapBuffers ()	559	SDL_GL_SwapBuffers ()
		560
		561	char *
		562	SDL_GetKeyName (int sym)
487		563
488	void	564	void
489	SDL_PollEvent ()	565	SDL_PollEvent ()
490	PPCODE:	566	PPCODE:
491	{	567	{
…		…
510	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	586	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
511	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	587	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
512	break;	588	break;
513		589
514	case SDL_MOUSEMOTION:	590	case SDL_MOUSEMOTION:
		591	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		592
515	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	593	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
516	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	594	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
517	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	595	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
518	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	596	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
519	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	597	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
520	break;	598	break;
521		599
522	case SDL_MOUSEBUTTONDOWN:	600	case SDL_MOUSEBUTTONDOWN:
523	case SDL_MOUSEBUTTONUP:	601	case SDL_MOUSEBUTTONUP:
		602	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		603
524	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	604	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
525	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	605	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
526	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	606	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
527	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	607	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
528	break;	608	break;
…		…
532	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	612	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
533	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	613	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
534	break;	614	break;
535	}	615	}
536		616
537	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	617	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
538	}	618	}
539	}	619	}
540		620
541	int	621	int
542	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	622	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
555	CODE:	635	CODE:
556	#ifndef _WIN32	636	#ifndef _WIN32
557	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	637	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
558	#endif	638	#endif
559		639
560	char *
561	gl_version ()
562	CODE:
563	RETVAL = (char *)glGetString (GL_VERSION);
564	OUTPUT:
565	RETVAL
566
567	char *
568	gl_extensions ()
569	CODE:
570	RETVAL = (char *)glGetString (GL_EXTENSIONS);
571	OUTPUT:
572	RETVAL
573
574	void	640	void
575	add_font (char *file)	641	add_font (char *file)
576	CODE:	642	CODE:
577	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	643	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
578	#ifdef _WIN32
579	// cairo... sigh... requires win2000
580	AddFontResourceEx (file, FR_PRIVATE, 0);
581	#endif
582		644
583	void	645	void
584	load_image_inline (SV *image_)	646	load_image_inline (SV *image_)
585	ALIAS:	647	ALIAS:
586	load_image_file = 1	648	load_image_file = 1
…		…
628		690
629	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	691	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
630		692
631	assert (surface2->pitch == surface2->w * 4);	693	assert (surface2->pitch == surface2->w * 4);
632		694
		695	SDL_LockSurface (surface2);
633	EXTEND (SP, 5);	696	EXTEND (SP, 6);
634	PUSHs (sv_2mortal (newSViv (surface2->w)));	697	PUSHs (sv_2mortal (newSViv (surface2->w)));
635	PUSHs (sv_2mortal (newSViv (surface2->h)));	698	PUSHs (sv_2mortal (newSViv (surface2->h)));
636	SDL_LockSurface (surface2);
637	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	699	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
638	SDL_UnlockSurface (surface2);
639	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)));
640	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	701	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
641	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	702	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		703	SDL_UnlockSurface (surface2);
642		704
643	SDL_FreeSurface (surface);	705	SDL_FreeSurface (surface);
644	SDL_FreeSurface (surface2);	706	SDL_FreeSurface (surface2);
645	}	707	}
646		708
…		…
682	CODE:	744	CODE:
683	fprintf (stderr, "FATAL: %s\n", message);	745	fprintf (stderr, "FATAL: %s\n", message);
684	#ifdef _WIN32	746	#ifdef _WIN32
685	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	747	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
686	#endif	748	#endif
687	exit (1);	749	_exit (1);
688		750
		751	void
		752	_exit (int retval)
		753	CODE:
		754	_exit (retval);
		755
689	MODULE = CFClient PACKAGE = CFClient::Font	756	MODULE = CFPlus PACKAGE = CFPlus::Font
690		757
691	CFClient::Font	758	CFPlus::Font
692	new_from_file (SV class, char path, int id = 0)	759	new_from_file (SV class, char path, int id = 0)
693	CODE:	760	CODE:
694	{	761	{
695	int count;	762	int count;
696	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	763	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
699	}	766	}
700	OUTPUT:	767	OUTPUT:
701	RETVAL	768	RETVAL
702		769
703	void	770	void
704	DESTROY (CFClient::Font self)	771	DESTROY (CFPlus::Font self)
705	CODE:	772	CODE:
706	pango_font_description_free (self);	773	pango_font_description_free (self);
707		774
708	void	775	void
709	make_default (CFClient::Font self)	776	make_default (CFPlus::Font self)
710	CODE:	777	CODE:
711	default_font = self;	778	default_font = self;
712		779
713	MODULE = CFClient PACKAGE = CFClient::Layout	780	MODULE = CFPlus PACKAGE = CFPlus::Layout
714		781
715	CFClient::Layout	782	void
716	new (SV *class, int rgba = 0)	783	reset_glyph_cache ()
717	CODE:	784	CODE:
718	#if _WIN32	785	tc_clear ();
719	rgba = 0;//D	786
720	#endif	787	CFPlus::Layout
		788	new (SV *class)
		789	CODE:
721	New (0, RETVAL, 1, struct cf_layout);	790	New (0, RETVAL, 1, struct cf_layout);
722		791
723	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	792	RETVAL->pl = pango_layout_new (opengl_context);
724	RETVAL->rgba = rgba;
725	RETVAL->r = 1.;	793	RETVAL->r = 1.;
726	RETVAL->g = 1.;	794	RETVAL->g = 1.;
727	RETVAL->b = 1.;	795	RETVAL->b = 1.;
728	RETVAL->a = 1.;	796	RETVAL->a = 1.;
729	RETVAL->base_height = MIN_FONT_HEIGHT;	797	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
733	layout_update_font (RETVAL);	801	layout_update_font (RETVAL);
734	OUTPUT:	802	OUTPUT:
735	RETVAL	803	RETVAL
736		804
737	void	805	void
738	DESTROY (CFClient::Layout self)	806	DESTROY (CFPlus::Layout self)
739	CODE:	807	CODE:
740	g_object_unref (self->pl);	808	g_object_unref (self->pl);
741	Safefree (self);	809	Safefree (self);
742		810
743	int
744	is_rgba (CFClient::Layout self)
745	CODE:
746	RETVAL = self->rgba;
747	OUTPUT:
748	RETVAL
749
750	void	811	void
751	set_text (CFClient::Layout self, SV *text_)	812	set_text (CFPlus::Layout self, SV *text_)
752	CODE:	813	CODE:
753	{	814	{
754	STRLEN textlen;	815	STRLEN textlen;
755	char *text = SvPVutf8 (text_, textlen);	816	char *text = SvPVutf8 (text_, textlen);
756		817
757	pango_layout_set_text (self->pl, text, textlen);	818	pango_layout_set_text (self->pl, text, textlen);
758	}	819	}
759		820
760	void	821	void
761	set_markup (CFClient::Layout self, SV *text_)	822	set_markup (CFPlus::Layout self, SV *text_)
762	CODE:	823	CODE:
763	{	824	{
764	STRLEN textlen;	825	STRLEN textlen;
765	char *text = SvPVutf8 (text_, textlen);	826	char *text = SvPVutf8 (text_, textlen);
766		827
767	pango_layout_set_markup (self->pl, text, textlen);	828	pango_layout_set_markup (self->pl, text, textlen);
768	}	829	}
769		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
770	SV *	916	SV *
771	get_text (CFClient::Layout self)	917	get_text (CFPlus::Layout self)
772	CODE:	918	CODE:
773	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	919	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
774	SvUTF8_on (RETVAL);	920	sv_utf8_decode (RETVAL);
775	OUTPUT:	921	OUTPUT:
776	RETVAL	922	RETVAL
777		923
778	void	924	void
779	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	925	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
780	CODE:	926	CODE:
781	self->r = r;	927	self->r = r;
782	self->g = g;	928	self->g = g;
783	self->b = b;	929	self->b = b;
784	self->a = a;	930	self->a = a;
785		931
786	void	932	void
787	set_font (CFClient::Layout self, CFClient::Font font = 0)	933	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
788	CODE:	934	CODE:
789	if (self->font != font)	935	if (self->font != font)
790	{	936	{
791	self->font = font;	937	self->font = font;
792	layout_update_font (self);	938	layout_update_font (self);
793	}	939	}
794		940
795	void	941	void
796	set_height (CFClient::Layout self, int base_height)	942	set_height (CFPlus::Layout self, int base_height)
797	CODE:	943	CODE:
798	if (self->base_height != base_height)	944	if (self->base_height != base_height)
799	{	945	{
800	self->base_height = base_height;	946	self->base_height = base_height;
801	layout_update_font (self);	947	layout_update_font (self);
802	}	948	}
803		949
804	void	950	void
805	set_width (CFClient::Layout self, int max_width = -1)	951	set_width (CFPlus::Layout self, int max_width = -1)
806	CODE:	952	CODE:
807	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);
808		954
809	void	955	void
810	set_indent (CFClient::Layout self, int indent)	956	set_indent (CFPlus::Layout self, int indent)
811	CODE:	957	CODE:
812	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	958	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
813		959
814	void	960	void
815	set_spacing (CFClient::Layout self, int spacing)	961	set_spacing (CFPlus::Layout self, int spacing)
816	CODE:	962	CODE:
817	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	963	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
818		964
819	void	965	void
820	set_ellipsise (CFClient::Layout self, int ellipsise)	966	set_ellipsise (CFPlus::Layout self, int ellipsise)
821	CODE:	967	CODE:
822	pango_layout_set_ellipsize (self->pl,	968	pango_layout_set_ellipsize (self->pl,
823	ellipsise == 1 ? PANGO_ELLIPSIZE_START	969	ellipsise == 1 ? PANGO_ELLIPSIZE_START
824	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	970	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
825	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	971	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
826	: PANGO_ELLIPSIZE_NONE	972	: PANGO_ELLIPSIZE_NONE
827	);	973	);
828		974
829	void	975	void
830	set_single_paragraph_mode (CFClient::Layout self, int spm)	976	set_single_paragraph_mode (CFPlus::Layout self, int spm)
831	CODE:	977	CODE:
832	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	978	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
833		979
834	void	980	void
835	size (CFClient::Layout self)	981	size (CFPlus::Layout self)
836	PPCODE:	982	PPCODE:
837	{	983	{
838	int w, h;	984	int w, h;
839		985
840	layout_get_pixel_size (self, &w, &h);	986	layout_get_pixel_size (self, &w, &h);
…		…
843	PUSHs (sv_2mortal (newSViv (w)));	989	PUSHs (sv_2mortal (newSViv (w)));
844	PUSHs (sv_2mortal (newSViv (h)));	990	PUSHs (sv_2mortal (newSViv (h)));
845	}	991	}
846		992
847	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
848	xy_to_index (CFClient::Layout self, int x, int y)	1006	xy_to_index (CFPlus::Layout self, int x, int y)
849	CODE:	1007	CODE:
850	{	1008	{
851	int index, trailing;	1009	int index, trailing;
852	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);
853	RETVAL = index;	1011	RETVAL = index;
854	}	1012	}
855	OUTPUT:	1013	OUTPUT:
856	RETVAL	1014	RETVAL
857		1015
858	void	1016	void
859	cursor_pos (CFClient::Layout self, int index)	1017	cursor_pos (CFPlus::Layout self, int index)
860	PPCODE:	1018	PPCODE:
861	{	1019	{
862	PangoRectangle strong_pos;	1020	PangoRectangle strong_pos;
863	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1021	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
864		1022
…		…
867	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1025	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
868	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1026	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
869	}	1027	}
870		1028
871	void	1029	void
872	render (CFClient::Layout self)	1030	render (CFPlus::Layout self, float x, float y, int flags = 0)
873	PPCODE:	1031	PPCODE:
874	{	1032	pango_opengl_render_layout_subpixel (
875	SV *retval;	1033	self->pl,
876	int w, h;	1034	x * PANGO_SCALE, y * PANGO_SCALE,
		1035	self->r, self->g, self->b, self->a,
		1036	flags
		1037	);
877		1038
878	layout_get_pixel_size (self, &w, &h);	1039	MODULE = CFPlus PACKAGE = CFPlus::Texture
879		1040
880	if (self->rgba)	1041	void
		1042	pad2pot (SV data_, SV w_, SV *h_)
		1043	CODE:
		1044	{
		1045	int ow = SvIV (w_);
		1046	int oh = SvIV (h_);
		1047
		1048	if (ow && oh)
881	{	1049	{
882	cairo_surface_t *surface;	1050	int nw = minpot (ow);
883	cairo_t *cairo;	1051	int nh = minpot (oh);
884		1052
885	retval = newSV (w * h * 4);	1053	if (nw != ow \|\| nh != oh)
886	SvPOK_only (retval);
887	SvCUR_set (retval, w * h * 4);
888
889	memset (SvPVX (retval), 0, w * h * 4);
890
891	surface = cairo_image_surface_create_for_data (
892	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
893	cairo = cairo_create (surface);
894	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
895
896	pango_cairo_show_layout (cairo, self->pl);
897
898	cairo_destroy (cairo);
899	cairo_surface_destroy (surface);
900
901	// what a mess, and its premultiplied, too :(
902	{	1054	{
903	uint32_t p = (uint32_t )SvPVX (retval);	1055	if (SvOK (data_))
904	uint32_t e = p + w h;
905
906	while (p < e)
907	{	1056	{
908	uint32_t rgba = *p;	1057	STRLEN datalen;
909	rgba = (rgba >> 24) \| (rgba << 8);	1058	char *data = SvPVbyte (data_, datalen);
910	#if 0	1059	int bpp = datalen / (ow * oh);
911	#ifdef _WIN32	1060	SV result_ = sv_2mortal (newSV (nw nh * bpp));
912	{//D
913	uint8_t r = rgba >> 24;
914	uint8_t g = rgba >> 16;
915	uint8_t b = rgba >> 8;
916	uint8_t a = rgba >> 0;
917		1061
918	rgba = (rgba & 0xffffff00) \| a;	1062	SvPOK_only (result_);
		1063	SvCUR_set (result_, nw * nh * bpp);
		1064
		1065	memset (SvPVX (result_), 0, nw * nh * bpp);
		1066	while (oh--)
		1067	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1068
		1069	sv_setsv (data_, result_);
919	}	1070	}
920	#endif	1071
921	#endif	1072	sv_setiv (w_, nw);
922	rgba = SDL_SwapBE32 (rgba);	1073	sv_setiv (h_, nh);
923	*p++ = rgba;
924	}	1074	}
925	}
926
927	EXTEND (SP, 5);
928	PUSHs (sv_2mortal (newSViv (w)));
929	PUSHs (sv_2mortal (newSViv (h)));
930	PUSHs (sv_2mortal (retval));
931	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
932	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
933	}	1075	}
934	else
935	{
936	FT_Bitmap bitmap;
937
938	retval = newSV (w * h);
939	SvPOK_only (retval);
940	SvCUR_set (retval, w * h);
941
942	bitmap.rows = h;
943	bitmap.width = w;
944	bitmap.pitch = w;
945	bitmap.buffer = (unsigned char*)SvPVX (retval);
946	bitmap.num_grays = 256;
947	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
948
949	memset (bitmap.buffer, 0, w * h);
950
951	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
952
953	EXTEND (SP, 5);
954	PUSHs (sv_2mortal (newSViv (w)));
955	PUSHs (sv_2mortal (newSViv (h)));
956	PUSHs (sv_2mortal (retval));
957	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
958	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
959	}
960	}	1076	}
961		1077
962	MODULE = CFClient PACKAGE = CFClient::Texture
963
964	void	1078	void
965	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1079	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
966	PROTOTYPE: $$$;$$	1080	PROTOTYPE: $$$;$$
967	ALIAS:	1081	ALIAS:
968	draw_quad_alpha = 1	1082	draw_quad_alpha = 1
969	draw_quad_alpha_premultiplied = 2	1083	draw_quad_alpha_premultiplied = 2
970	CODE:	1084	CODE:
971	{	1085	{
972	HV hv = (HV )SvRV (self);	1086	HV hv = (HV )SvRV (self);
973	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1087	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
974	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1088	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
975	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1089	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
976	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
977		1090
978	if (items < 5)	1091	if (items < 5)
979	{	1092	{
980	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1093	w = SvNV (*hv_fetch (hv, "w", 1, 1));
981	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1094	h = SvNV (*hv_fetch (hv, "h", 1, 1));
982	}	1095	}
983		1096
984	if (ix)	1097	if (ix)
985	{	1098	{
986	glEnable (GL_BLEND);	1099	glEnable (GL_BLEND);
		1100
		1101	if (ix == 2)
987	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1102	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1103	else
		1104	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1105	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1106
988	glEnable (GL_ALPHA_TEST);	1107	glEnable (GL_ALPHA_TEST);
989	glAlphaFunc (GL_GREATER, 0.01f);	1108	glAlphaFunc (GL_GREATER, 0.01f);
990	}	1109	}
991		1110
992	glBindTexture (GL_TEXTURE_2D, name);	1111	glBindTexture (GL_TEXTURE_2D, name);
993
994	if (wrap_mode)
995	{
996	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
997	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
998	}
999		1112
1000	glBegin (GL_QUADS);	1113	glBegin (GL_QUADS);
1001	glTexCoord2f (0, 0); glVertex2f (x , y );	1114	glTexCoord2f (0, 0); glVertex2f (x , y );
1002	glTexCoord2f (0, t); glVertex2f (x , y + h);	1115	glTexCoord2f (0, t); glVertex2f (x , y + h);
1003	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1116	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1009	glDisable (GL_ALPHA_TEST);	1122	glDisable (GL_ALPHA_TEST);
1010	glDisable (GL_BLEND);	1123	glDisable (GL_BLEND);
1011	}	1124	}
1012	}	1125	}
1013		1126
1014	MODULE = CFClient PACKAGE = CFClient::Map	1127	MODULE = CFPlus PACKAGE = CFPlus::Map
1015		1128
1016	CFClient::Map	1129	CFPlus::Map
1017	new (SV *class, int map_width, int map_height)	1130	new (SV *class, int map_width, int map_height)
1018	CODE:	1131	CODE:
1019	New (0, RETVAL, 1, struct map);	1132	New (0, RETVAL, 1, struct map);
1020	RETVAL->x = 0;	1133	RETVAL->x = 0;
1021	RETVAL->y = 0;	1134	RETVAL->y = 0;
…		…
1031	RETVAL->row = 0;	1144	RETVAL->row = 0;
1032	OUTPUT:	1145	OUTPUT:
1033	RETVAL	1146	RETVAL
1034		1147
1035	void	1148	void
1036	DESTROY (CFClient::Map self)	1149	DESTROY (CFPlus::Map self)
1037	CODE:	1150	CODE:
1038	{	1151	{
1039	map_clear (self);	1152	map_clear (self);
1040	Safefree (self->face);	1153	Safefree (self->face);
		1154	Safefree (self->tex);
1041	Safefree (self);	1155	Safefree (self);
1042	}	1156	}
1043		1157
1044	void	1158	void
1045	clear (CFClient::Map self)	1159	clear (CFPlus::Map self)
1046	CODE:	1160	CODE:
1047	map_clear (self);	1161	map_clear (self);
1048		1162
1049	void	1163	void
1050	set_face (CFClient::Map self, int face, int texid)	1164	set_face (CFPlus::Map self, int face, int texid)
1051	CODE:	1165	CODE:
1052	{	1166	{
1053	while (self->faces <= face)	1167	while (self->faces <= face)
1054	{	1168	{
1055	Append (mapface, self->face, self->faces, self->faces);	1169	Append (mapface, self->face, self->faces, self->faces);
…		…
1058		1172
1059	self->face [face] = texid;	1173	self->face [face] = texid;
1060	}	1174	}
1061		1175
1062	void	1176	void
1063	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)	1177	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)
1064	CODE:	1178	CODE:
1065	{	1179	{
1066	while (self->texs <= texid)	1180	while (self->texs <= texid)
1067	{	1181	{
1068	Append (maptex, self->tex, self->texs, self->texs);	1182	Append (maptex, self->tex, self->texs, self->texs);
…		…
1080	tex->r = r;	1194	tex->r = r;
1081	tex->g = g;	1195	tex->g = g;
1082	tex->b = b;	1196	tex->b = b;
1083	tex->a = a;	1197	tex->a = a;
1084	}	1198	}
		1199
		1200	// somewhat hackish, but for textures that require it, it really
		1201	// improves the look, and most others don't suffer.
		1202	glBindTexture (GL_TEXTURE_2D, name);
		1203	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1204	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1205	// use uglier nearest interpolation because linear suffers
		1206	// from transparent color bleeding and ugly wrapping effects.
		1207	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1085	}	1208	}
1086		1209
1087	int	1210	int
1088	ox (CFClient::Map self)	1211	ox (CFPlus::Map self)
1089	ALIAS:	1212	ALIAS:
1090	oy = 1	1213	oy = 1
		1214	x = 2
		1215	y = 3
		1216	w = 4
		1217	h = 5
1091	CODE:	1218	CODE:
1092	switch (ix)	1219	switch (ix)
1093	{	1220	{
1094	case 0: RETVAL = self->ox; break;	1221	case 0: RETVAL = self->ox; break;
1095	case 1: RETVAL = self->oy; break;	1222	case 1: RETVAL = self->oy; break;
		1223	case 2: RETVAL = self->x; break;
		1224	case 3: RETVAL = self->y; break;
		1225	case 4: RETVAL = self->w; break;
		1226	case 5: RETVAL = self->h; break;
1096	}	1227	}
1097	OUTPUT:	1228	OUTPUT:
1098	RETVAL	1229	RETVAL
1099		1230
1100	void	1231	void
1101	scroll (CFClient::Map self, int dx, int dy)	1232	scroll (CFPlus::Map self, int dx, int dy)
1102	CODE:	1233	CODE:
1103	{	1234	{
1104	if (dx > 0)	1235	if (dx > 0)
1105	map_blank (self, self->x, self->y, dx - 1, self->h);	1236	map_blank (self, self->x, self->y, dx - 1, self->h);
1106	else if (dx < 0)	1237	else if (dx < 0)
…		…
1122	self->y += MAP_EXTEND_Y;	1253	self->y += MAP_EXTEND_Y;
1123	}	1254	}
1124	}	1255	}
1125		1256
1126	void	1257	void
1127	map1a_update (CFClient::Map self, SV *data_)	1258	map1a_update (CFPlus::Map self, SV *data_)
1128	CODE:	1259	CODE:
1129	{	1260	{
1130	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1261	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1131	uint8_t data_end = (uint8_t )SvEND (data_);	1262	uint8_t data_end = (uint8_t )SvEND (data_);
1132	mapcell *cell;	1263	mapcell *cell;
…		…
1134		1265
1135	while (data < data_end)	1266	while (data < data_end)
1136	{	1267	{
1137	flags = (data [0] << 8) + data [1]; data += 2;	1268	flags = (data [0] << 8) + data [1]; data += 2;
1138		1269
1139	x = ((flags >> 10) & 63) + self->x;	1270	x = self->x + ((flags >> 10) & 63);
1140	y = ((flags >> 4) & 63) + self->y;	1271	y = self->y + ((flags >> 4) & 63);
1141		1272
1142	cell = map_get_cell (self, x, y);	1273	cell = map_get_cell (self, x, y);
1143		1274
1144	if (flags & 15)	1275	if (flags & 15)
1145	{	1276	{
…		…
1174	cell->darkness = -1;	1305	cell->darkness = -1;
1175	}	1306	}
1176	}	1307	}
1177		1308
1178	SV *	1309	SV *
1179	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1310	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1180	CODE:	1311	CODE:
1181	{	1312	{
1182	int x1, x;	1313	int x1, x;
1183	int y1, y;	1314	int y1, y;
1184	int z;	1315	int z;
…		…
1234	}	1365	}
1235	OUTPUT:	1366	OUTPUT:
1236	RETVAL	1367	RETVAL
1237		1368
1238	void	1369	void
1239	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1370	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1240	PPCODE:	1371	CODE:
1241	{	1372	{
1242	int vx, vy;	1373	int vx, vy;
1243	int x, y, z;	1374	int x, y, z;
1244	int last_name;	1375	int last_name;
1245	mapface face;	1376	mapface face;
1246	int sw4 = (sw + 3) & ~3;
1247	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1248	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1249		1377
1250	memset (darkness, 255, sw4 * sh);
1251	SvPOK_only (darkness_sv);
1252	SvCUR_set (darkness_sv, sw4 * sh);
1253
1254	vx = self->x + (self->w - sw) / 2 - shift_x;	1378	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1255	vy = self->y + (self->h - sh) / 2 - shift_y;	1379	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1256		1380
1257	/*	1381	/*
1258	int vx = self->vx = self->w >= sw	1382	int vx = self->vx = self->w >= sw
1259	? self->x + (self->w - sw) / 2	1383	? self->x + (self->w - sw) / 2
1260	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1384	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1264	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1388	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1265	*/	1389	*/
1266		1390
1267	glColor4ub (255, 255, 255, 255);	1391	glColor4ub (255, 255, 255, 255);
1268		1392
		1393	glEnable (GL_BLEND);
1269	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1394	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1270	glEnable (GL_BLEND);
1271	glEnable (GL_TEXTURE_2D);	1395	glEnable (GL_TEXTURE_2D);
1272	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1396	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1273		1397
1274	glBegin (GL_QUADS);	1398	glBegin (GL_QUADS);
1275		1399
…		…
1283		1407
1284	for (x = 0; x < sw; x++)	1408	for (x = 0; x < sw; x++)
1285	if (row->c0 <= x + vx && x + vx < row->c1)	1409	if (row->c0 <= x + vx && x + vx < row->c1)
1286	{	1410	{
1287	mapcell *cell = row->col + (x + vx - row->c0);	1411	mapcell *cell = row->col + (x + vx - row->c0);
1288
1289	darkness[y * sw4 + x] = cell->darkness < 0
1290	? 255 - FOW_DARKNESS
1291	: 255 - cell->darkness;
1292		1412
1293	face = cell->face [z];	1413	face = cell->face [z];
1294		1414
1295	if (face)	1415	if (face)
1296	{	1416	{
…		…
1317		1437
1318	glEnd ();	1438	glEnd ();
1319		1439
1320	glDisable (GL_TEXTURE_2D);	1440	glDisable (GL_TEXTURE_2D);
1321	glDisable (GL_BLEND);	1441	glDisable (GL_BLEND);
		1442	}
		1443
		1444	void
		1445	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1446	CODE:
		1447	{
		1448	static float color[16][3] = {
		1449	{ 0.00F, 0.00F, 0.00F },
		1450	{ 1.00F, 1.00F, 1.00F },
		1451	{ 0.00F, 0.00F, 0.55F },
		1452	{ 1.00F, 0.00F, 0.00F },
		1453
		1454	{ 1.00F, 0.54F, 0.00F },
		1455	{ 0.11F, 0.56F, 1.00F },
		1456	{ 0.93F, 0.46F, 0.00F },
		1457	{ 0.18F, 0.54F, 0.34F },
		1458
		1459	{ 0.56F, 0.73F, 0.56F },
		1460	{ 0.80F, 0.80F, 0.80F },
		1461	{ 0.55F, 0.41F, 0.13F },
		1462	{ 0.99F, 0.77F, 0.26F },
		1463
		1464	{ 0.74F, 0.65F, 0.41F },
		1465
		1466	{ 0.00F, 1.00F, 1.00F },
		1467	{ 1.00F, 0.00F, 1.00F },
		1468	{ 1.00F, 1.00F, 0.00F },
		1469	};
		1470
		1471	int x, y;
		1472
		1473	glEnable (GL_TEXTURE_2D);
		1474	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1475	glEnable (GL_BLEND);
		1476	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1477	glBegin (GL_QUADS);
		1478
		1479	for (y = 0; y < h; y++)
		1480	for (x = 0; x < w; x++)
		1481	{
		1482	unsigned char m = data [x + y * w];
		1483
		1484	if (m)
		1485	{
		1486	float *c = color [m & 15];
		1487
		1488	float tx1 = m & 0x40 ? 0.5 : 0.;
		1489	float tx2 = tx1 + 0.5;
		1490
		1491	glColor4f (c[0], c[1], c[2], 0.75);
		1492	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1493	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1494	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1495	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1496	}
		1497	}
		1498
		1499	glEnd ();
		1500	glDisable (GL_BLEND);
		1501	glDisable (GL_TEXTURE_2D);
		1502	}
		1503
		1504	void
		1505	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1506	PPCODE:
		1507	{
		1508	int vx, vy;
		1509	int x, y;
		1510	int sw4 = (sw + 3) & ~3;
		1511	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1512	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1513
		1514	memset (darkness, 255, sw4 * sh);
		1515	SvPOK_only (darkness_sv);
		1516	SvCUR_set (darkness_sv, sw4 * sh);
		1517
		1518	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1519	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1520
		1521	for (y = 0; y < sh; y++)
		1522	if (0 <= y + vy && y + vy < self->rows)
		1523	{
		1524	maprow *row = self->row + (y + vy);
		1525
		1526	for (x = 0; x < sw; x++)
		1527	if (row->c0 <= x + vx && x + vx < row->c1)
		1528	{
		1529	mapcell *cell = row->col + (x + vx - row->c0);
		1530
		1531	darkness[y * sw4 + x] = cell->darkness < 0
		1532	? 255 - FOW_DARKNESS
		1533	: 255 - cell->darkness;
		1534	}
		1535	}
1322		1536
1323	EXTEND (SP, 3);	1537	EXTEND (SP, 3);
1324	PUSHs (sv_2mortal (newSViv (sw4)));	1538	PUSHs (sv_2mortal (newSViv (sw4)));
1325	PUSHs (sv_2mortal (newSViv (sh)));	1539	PUSHs (sv_2mortal (newSViv (sh)));
1326	PUSHs (darkness_sv);	1540	PUSHs (darkness_sv);
1327	}	1541	}
1328		1542
1329	SV *	1543	SV *
1330	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1544	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1331	CODE:	1545	CODE:
1332	{	1546	{
1333	int x, y, x1, y1;	1547	int x, y, x1, y1;
1334	SV data_sv = newSV (w h * 7 + 5);	1548	SV data_sv = newSV (w h * 7 + 5);
1335	uint8_t data = (uint8_t )SvPVX (data_sv);	1549	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1397	}	1611	}
1398	OUTPUT:	1612	OUTPUT:
1399	RETVAL	1613	RETVAL
1400		1614
1401	void	1615	void
1402	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1616	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1403	PPCODE:	1617	PPCODE:
1404	{	1618	{
1405	int x, y, z;	1619	int x, y, z;
1406	int w, h;	1620	int w, h;
1407	int x1, y1;	1621	int x1, y1;
…		…
1456	}	1670	}
1457	}	1671	}
1458	}	1672	}
1459	}	1673	}
1460		1674
1461	MODULE = CFClient PACKAGE = CFClient::MixChunk	1675	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1462		1676
1463	CFClient::MixChunk	1677	CFPlus::MixChunk
1464	new_from_file (SV class, char path)	1678	new_from_file (SV class, char path)
1465	CODE:	1679	CODE:
1466	RETVAL = Mix_LoadWAV (path);	1680	RETVAL = Mix_LoadWAV (path);
1467	OUTPUT:	1681	OUTPUT:
1468	RETVAL	1682	RETVAL
1469		1683
1470	void	1684	void
1471	DESTROY (CFClient::MixChunk self)	1685	DESTROY (CFPlus::MixChunk self)
1472	CODE:	1686	CODE:
1473	Mix_FreeChunk (self);	1687	Mix_FreeChunk (self);
1474		1688
1475	int	1689	int
1476	volume (CFClient::MixChunk self, int volume = -1)	1690	volume (CFPlus::MixChunk self, int volume = -1)
1477	CODE:	1691	CODE:
1478	RETVAL = Mix_VolumeChunk (self, volume);	1692	RETVAL = Mix_VolumeChunk (self, volume);
1479	OUTPUT:	1693	OUTPUT:
1480	RETVAL	1694	RETVAL
1481		1695
1482	int	1696	int
1483	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1697	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1484	CODE:	1698	CODE:
1485	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1699	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1486	OUTPUT:	1700	OUTPUT:
1487	RETVAL	1701	RETVAL
1488		1702
1489	MODULE = CFClient PACKAGE = CFClient::MixMusic	1703	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1490		1704
1491	int	1705	int
1492	volume (int volume = -1)	1706	volume (int volume = -1)
1493	CODE:	1707	CODE:
1494	RETVAL = Mix_VolumeMusic (volume);	1708	RETVAL = Mix_VolumeMusic (volume);
1495	OUTPUT:	1709	OUTPUT:
1496	RETVAL	1710	RETVAL
1497		1711
1498	CFClient::MixMusic	1712	CFPlus::MixMusic
1499	new_from_file (SV class, char path)	1713	new_from_file (SV class, char path)
1500	CODE:	1714	CODE:
1501	RETVAL = Mix_LoadMUS (path);	1715	RETVAL = Mix_LoadMUS (path);
1502	OUTPUT:	1716	OUTPUT:
1503	RETVAL	1717	RETVAL
1504		1718
1505	void	1719	void
1506	DESTROY (CFClient::MixMusic self)	1720	DESTROY (CFPlus::MixMusic self)
1507	CODE:	1721	CODE:
1508	Mix_FreeMusic (self);	1722	Mix_FreeMusic (self);
1509		1723
1510	int	1724	int
1511	play (CFClient::MixMusic self, int loops = -1)	1725	play (CFPlus::MixMusic self, int loops = -1)
1512	CODE:	1726	CODE:
1513	RETVAL = Mix_PlayMusic (self, loops);	1727	RETVAL = Mix_PlayMusic (self, loops);
1514	OUTPUT:	1728	OUTPUT:
1515	RETVAL	1729	RETVAL
1516		1730
1517	MODULE = CFClient PACKAGE = CFClient::OpenGL	1731	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1518		1732
1519	BOOT:	1733	BOOT:
1520	{	1734	{
1521	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1735	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1522	static const struct {	1736	static const struct {
1523	const char *name;	1737	const char *name;
1524	IV iv;	1738	IV iv;
1525	} *civ, const_iv[] = {	1739	} *civ, const_iv[] = {
1526	# define const_iv(name) { # name, (IV)name }	1740	# define const_iv(name) { # name, (IV)name }
1527	const_iv (GL_COLOR_MATERIAL),	1741	const_iv (GL_COLOR_MATERIAL),
1528	const_iv (GL_SMOOTH),	1742	const_iv (GL_SMOOTH),
1529	const_iv (GL_FLAT),	1743	const_iv (GL_FLAT),
1530	const_iv (GL_DITHER),	1744	const_iv (GL_DITHER),
1531	const_iv (GL_BLEND),	1745	const_iv (GL_BLEND),
		1746	const_iv (GL_CULL_FACE),
1532	const_iv (GL_SCISSOR_TEST),	1747	const_iv (GL_SCISSOR_TEST),
		1748	const_iv (GL_DEPTH_TEST),
		1749	const_iv (GL_ALPHA_TEST),
		1750	const_iv (GL_NORMALIZE),
		1751	const_iv (GL_RESCALE_NORMAL),
		1752	const_iv (GL_FRONT),
		1753	const_iv (GL_BACK),
1533	const_iv (GL_AND),	1754	const_iv (GL_AND),
1534	const_iv (GL_ONE),	1755	const_iv (GL_ONE),
1535	const_iv (GL_ZERO),	1756	const_iv (GL_ZERO),
1536	const_iv (GL_SRC_ALPHA),	1757	const_iv (GL_SRC_ALPHA),
1537	const_iv (GL_SRC_ALPHA_SATURATE),	1758	const_iv (GL_DST_ALPHA),
1538	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1759	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1539	const_iv (GL_ONE_MINUS_DST_ALPHA),	1760	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1761	const_iv (GL_SRC_ALPHA_SATURATE),
1540	const_iv (GL_RGB),	1762	const_iv (GL_RGB),
1541	const_iv (GL_RGBA),	1763	const_iv (GL_RGBA),
		1764	const_iv (GL_RGBA4),
		1765	const_iv (GL_RGBA8),
		1766	const_iv (GL_RGB5_A1),
1542	const_iv (GL_UNSIGNED_BYTE),	1767	const_iv (GL_UNSIGNED_BYTE),
		1768	const_iv (GL_UNSIGNED_SHORT),
		1769	const_iv (GL_UNSIGNED_INT),
1543	const_iv (GL_ALPHA),	1770	const_iv (GL_ALPHA),
1544	const_iv (GL_INTENSITY),	1771	const_iv (GL_INTENSITY),
1545	const_iv (GL_LUMINANCE),	1772	const_iv (GL_LUMINANCE),
1546	const_iv (GL_LUMINANCE_ALPHA),	1773	const_iv (GL_LUMINANCE_ALPHA),
1547	const_iv (GL_FLOAT),	1774	const_iv (GL_FLOAT),
…		…
1553	const_iv (GL_TEXTURE_MAG_FILTER),	1780	const_iv (GL_TEXTURE_MAG_FILTER),
1554	const_iv (GL_TEXTURE_MIN_FILTER),	1781	const_iv (GL_TEXTURE_MIN_FILTER),
1555	const_iv (GL_TEXTURE_ENV_MODE),	1782	const_iv (GL_TEXTURE_ENV_MODE),
1556	const_iv (GL_TEXTURE_WRAP_S),	1783	const_iv (GL_TEXTURE_WRAP_S),
1557	const_iv (GL_TEXTURE_WRAP_T),	1784	const_iv (GL_TEXTURE_WRAP_T),
		1785	const_iv (GL_REPEAT),
1558	const_iv (GL_CLAMP),	1786	const_iv (GL_CLAMP),
1559	const_iv (GL_REPEAT),	1787	const_iv (GL_CLAMP_TO_EDGE),
1560	const_iv (GL_NEAREST),	1788	const_iv (GL_NEAREST),
1561	const_iv (GL_LINEAR),	1789	const_iv (GL_LINEAR),
1562	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1790	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1563	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1791	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1564	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1792	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1565	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1793	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1566	const_iv (GL_GENERATE_MIPMAP),	1794	const_iv (GL_GENERATE_MIPMAP),
1567	const_iv (GL_MODULATE),	1795	const_iv (GL_MODULATE),
1568	const_iv (GL_DECAL),	1796	const_iv (GL_DECAL),
1569	const_iv (GL_REPLACE),	1797	const_iv (GL_REPLACE),
		1798	const_iv (GL_DEPTH_BUFFER_BIT),
1570	const_iv (GL_COLOR_BUFFER_BIT),	1799	const_iv (GL_COLOR_BUFFER_BIT),
1571	const_iv (GL_PROJECTION),	1800	const_iv (GL_PROJECTION),
1572	const_iv (GL_MODELVIEW),	1801	const_iv (GL_MODELVIEW),
1573	const_iv (GL_COLOR_LOGIC_OP),	1802	const_iv (GL_COLOR_LOGIC_OP),
1574	const_iv (GL_SEPARABLE_2D),	1803	const_iv (GL_SEPARABLE_2D),
1575	const_iv (GL_CONVOLUTION_2D),	1804	const_iv (GL_CONVOLUTION_2D),
1576	const_iv (GL_CONVOLUTION_BORDER_MODE),	1805	const_iv (GL_CONVOLUTION_BORDER_MODE),
1577	const_iv (GL_CONSTANT_BORDER),	1806	const_iv (GL_CONSTANT_BORDER),
1578	const_iv (GL_LINES),	1807	const_iv (GL_LINES),
		1808	const_iv (GL_LINE_STRIP),
		1809	const_iv (GL_LINE_LOOP),
1579	const_iv (GL_QUADS),	1810	const_iv (GL_QUADS),
1580	const_iv (GL_LINE_LOOP),	1811	const_iv (GL_QUAD_STRIP),
		1812	const_iv (GL_TRIANGLES),
		1813	const_iv (GL_TRIANGLE_STRIP),
		1814	const_iv (GL_TRIANGLE_FAN),
1581	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1815	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1582	const_iv (GL_FASTEST),	1816	const_iv (GL_FASTEST),
		1817	const_iv (GL_V2F),
		1818	const_iv (GL_V3F),
		1819	const_iv (GL_T2F_V3F),
		1820	const_iv (GL_T2F_N3F_V3F),
1583	# undef const_iv	1821	# undef const_iv
1584	};	1822	};
1585		1823
1586	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1824	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1587	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1825	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1588	}	1826	}
1589		1827
		1828	char *
		1829	gl_vendor ()
		1830	CODE:
		1831	RETVAL = (char *)glGetString (GL_VENDOR);
		1832	OUTPUT:
		1833	RETVAL
		1834
		1835	char *
		1836	gl_version ()
		1837	CODE:
		1838	RETVAL = (char *)glGetString (GL_VERSION);
		1839	OUTPUT:
		1840	RETVAL
		1841
		1842	char *
		1843	gl_extensions ()
		1844	CODE:
		1845	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1846	OUTPUT:
		1847	RETVAL
		1848
1590	int glGetError ()	1849	int glGetError ()
		1850
		1851	void glFinish ()
1591		1852
1592	void glClear (int mask)	1853	void glClear (int mask)
1593		1854
1594	void glClearColor (float r, float g, float b, float a = 1.0)	1855	void glClearColor (float r, float g, float b, float a = 1.0)
1595	PROTOTYPE: @	1856	PROTOTYPE: @
…		…
1602		1863
1603	void glHint (int target, int mode)	1864	void glHint (int target, int mode)
1604		1865
1605	void glBlendFunc (int sfactor, int dfactor)	1866	void glBlendFunc (int sfactor, int dfactor)
1606		1867
		1868	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1869	CODE:
		1870	gl_BlendFuncSeparate (sa, da, saa, daa);
		1871
		1872	void glDepthMask (int flag)
		1873
1607	void glLogicOp (int opcode)	1874	void glLogicOp (int opcode)
1608		1875
1609	void glColorMask (int red, int green, int blue, int alpha)	1876	void glColorMask (int red, int green, int blue, int alpha)
1610		1877
1611	void glMatrixMode (int mode)	1878	void glMatrixMode (int mode)
…		…
1614		1881
1615	void glPopMatrix ()	1882	void glPopMatrix ()
1616		1883
1617	void glLoadIdentity ()	1884	void glLoadIdentity ()
1618		1885
		1886	void glDrawBuffer (int buffer)
		1887
		1888	void glReadBuffer (int buffer)
		1889
1619	# near and far are due to microsofts buggy c compiler	1890	# near_ and far_ are due to microsofts buggy "c" compiler
		1891	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1892
		1893	# near_ and far_ are due to microsofts buggy "c" compiler
1620	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1894	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1621		1895
1622	void glViewport (int x, int y, int width, int height)	1896	void glViewport (int x, int y, int width, int height)
1623		1897
1624	void glScissor (int x, int y, int width, int height)	1898	void glScissor (int x, int y, int width, int height)
…		…
1639		1913
1640	void glEnd ()	1914	void glEnd ()
1641		1915
1642	void glColor (float r, float g, float b, float a = 1.0)	1916	void glColor (float r, float g, float b, float a = 1.0)
1643	PROTOTYPE: @	1917	PROTOTYPE: @
		1918	ALIAS:
		1919	glColor_premultiply = 1
1644	CODE:	1920	CODE:
1645	glColor4ub (MIN ((int)(r * 255.f), 255),	1921	if (ix)
1646	MIN ((int)(g * 255.f), 255),	1922	{
1647	MIN ((int)(b * 255.f), 255),	1923	r *= a;
1648	MIN ((int)(a * 255.f), 255));	1924	g *= a;
		1925	b *= a;
		1926	}
		1927	// microsoft visual "c" rounds instead of truncating...
		1928	glColor4f (r, g, b, a);
		1929
		1930	void glInterleavedArrays (int format, int stride, char *data)
		1931
		1932	void glDrawElements (int mode, int count, int type, char *indices)
		1933
		1934	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1935
		1936	void glRasterPos (float x, float y, float z = 0.)
		1937	CODE:
		1938	glRasterPos3f (0, 0, z);
		1939	glBitmap (0, 0, 0, 0, x, y, 0);
1649		1940
1650	void glVertex (float x, float y, float z = 0.)	1941	void glVertex (float x, float y, float z = 0.)
1651	CODE:	1942	CODE:
1652	glVertex3f (x, y, z);	1943	glVertex3f (x, y, z);
1653		1944
…		…
1665		1956
1666	void glBindTexture (int target, int name)	1957	void glBindTexture (int target, int name)
1667		1958
1668	void glConvolutionParameter (int target, int pname, float params)	1959	void glConvolutionParameter (int target, int pname, float params)
1669	CODE:	1960	CODE:
1670	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1961	if (gl.ConvolutionParameterf)
		1962	gl.ConvolutionParameterf (target, pname, params);
1671		1963
1672	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1964	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1673	CODE:	1965	CODE:
1674	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1966	if (gl.ConvolutionFilter2D)
1675	(target, internalformat, width, height, format, type, data));	1967	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1676		1968
1677	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1969	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1678	CODE:	1970	CODE:
1679	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1971	if (gl.SeparableFilter2D)
1680	(target, internalformat, width, height, format, type, row, column));	1972	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1681		1973
1682	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1974	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1683		1975
1684	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1976	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1685		1977
1686	void glRasterPos (int x, int y)	1978	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1687	CODE:
1688	glRasterPos2i (x, y);
1689		1979
1690	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1980	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1691		1981
1692	int glGenTexture ()	1982	int glGenTexture ()
1693	CODE:	1983	CODE:

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.87 by root, Fri May 19 18:39:06 2006 UTC vs. Revision 1.138 by root, Mon Aug 14 01:21:01 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.87 by root, Fri May 19 18:39:06 2006 UTC vs.
Revision 1.138 by root, Mon Aug 14 01:21:01 2006 UTC