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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.60 by root, Sun Apr 23 04:47:02 2006 UTC vs.
Revision 1.137 by root, Sun Aug 13 19:47:05 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 8 * PANGO_SCALE	57	#define MIN_FONT_HEIGHT 10
46		58
		59	#if 0
		60	# define PARACHUTE SDL_INIT_NOPARACHUTE
		61	#else
		62	# define PARACHUTE 0
		63	#endif
		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
47	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
48	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
49		90
50	static PangoContext *context;	91	typedef PangoFontDescription *CFPlus__Font;
51	static PangoFontMap *fontmap;	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	}
52		110
53	typedef struct cf_layout {	111	typedef struct cf_layout {
54	PangoLayout *pl;	112	PangoLayout *pl;
		113	float r, g, b, a; // default color for rgba mode
55	int base_height;	114	int base_height;
		115	CFPlus__Font font;
56	} *CFClient__Layout;	116	} *CFPlus__Layout;
		117
		118	static CFPlus__Font default_font;
		119	static PangoContext *opengl_context;
		120	static PangoFontMap *opengl_fontmap;
57		121
58	static void	122	static void
59	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
60	{	124	{
61	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
62	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
63	}	130	}
64		131
65	static void	132	static void
66	layout_update (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
67	{	134	{
68	/* 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
69	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
70	*/	137	*/
71	PangoFontDescription font = (PangoFontDescription )	138	PangoFontDescription *font = self->font ? self->font : default_font;
72	pango_layout_get_font_description (self->pl);
73		139
74	int height = self->base_height * (PANGO_SCALE * 8 / 10);
75
76	if (height < MIN_FONT_HEIGHT)
77	height = MIN_FONT_HEIGHT;
78
79	if (pango_font_description_get_size (font) != height)
80	{
81	font = pango_font_description_copy (font);
82	pango_font_description_set_absolute_size (font, height);	140	pango_font_description_set_absolute_size (font,
		141	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
		142
83	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
84	}
85	}	144	}
86		145
87	static void	146	static void
88	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
89	{	148	{
90	layout_update (self);
91
92	pango_layout_get_pixel_size (self->pl, w, h);	149	pango_layout_get_pixel_size (self->pl, w, h);
93		150
94	w = (w + 3) & ~3;
95	if (!w) w = 1;	151	if (!w) w = 1;
96	if (!h) h = 1;	152	if (!h) h = 1;
		153
		154	w = (w + 3) & ~3;
97	}	155	}
98		156
99	typedef uint16_t mapface;	157	typedef uint16_t mapface;
100		158
101	typedef struct {	159	typedef struct {
…		…
124	int texs;	182	int texs;
125	maptex *tex;	183	maptex *tex;
126		184
127	int32_t rows;	185	int32_t rows;
128	maprow *row;	186	maprow *row;
129	} *CFClient__Map;	187	} *CFPlus__Map;
130		188
131	static char *	189	static char *
132	prepend (char *ptr, int sze, int inc)	190	prepend (char *ptr, int sze, int inc)
133	{	191	{
134	char *p;	192	char *p;
…		…
152		210
153	#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))
154	#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))
155		213
156	static maprow *	214	static maprow *
157	map_get_row (CFClient__Map self, int y)	215	map_get_row (CFPlus__Map self, int y)
158	{	216	{
159	if (0 > y)	217	if (0 > y)
160	{	218	{
161	int extend = - y + MAP_EXTEND_Y;	219	int extend = - y + MAP_EXTEND_Y;
162	Prepend (maprow, self->row, self->rows, extend);	220	Prepend (maprow, self->row, self->rows, extend);
…		…
200		258
201	return row->col + (x - row->c0);	259	return row->col + (x - row->c0);
202	}	260	}
203		261
204	static mapcell *	262	static mapcell *
205	map_get_cell (CFClient__Map self, int x, int y)	263	map_get_cell (CFPlus__Map self, int x, int y)
206	{	264	{
207	return row_get_cell (map_get_row (self, y), x);	265	return row_get_cell (map_get_row (self, y), x);
208	}	266	}
209		267
210	static void	268	static void
211	map_clear (CFClient__Map self)	269	map_clear (CFPlus__Map self)
212	{	270	{
213	int r;	271	int r;
214		272
215	for (r = 0; r < self->rows; r++)	273	for (r = 0; r < self->rows; r++)
216	Safefree (self->row[r].col);	274	Safefree (self->row[r].col);
…		…
224	self->row = 0;	282	self->row = 0;
225	self->rows = 0;	283	self->rows = 0;
226	}	284	}
227		285
228	static void	286	static void
229	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)
230	{	288	{
231	int x, y;	289	int x, y;
232	maprow *row;	290	maprow *row;
233		291
234	for (y = y0; y < y0 + h; y++)	292	for (y = y0; y < y0 + h; y++)
…		…
249	}	307	}
250	}	308	}
251	}	309	}
252		310
253	static void	311	static void
254	music_finished ()	312	music_finished (void)
255	{	313	{
256	SDL_UserEvent ev;	314	SDL_UserEvent ev;
257		315
258	ev.type = SDL_USEREVENT;	316	ev.type = SDL_USEREVENT;
259	ev.code = 0;	317	ev.code = 0;
…		…
261	ev.data2 = 0;	319	ev.data2 = 0;
262		320
263	SDL_PushEvent ((SDL_Event *)&ev);	321	SDL_PushEvent ((SDL_Event *)&ev);
264	}	322	}
265		323
		324	static void
		325	channel_finished (int channel)
		326	{
		327	SDL_UserEvent ev;
		328
		329	ev.type = SDL_USEREVENT;
		330	ev.code = 1;
		331	ev.data1 = (void *)(long)channel;
		332	ev.data2 = 0;
		333
		334	SDL_PushEvent ((SDL_Event *)&ev);
		335	}
		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
266	MODULE = CFClient PACKAGE = CFClient	354	MODULE = CFPlus PACKAGE = CFPlus
267		355
268	PROTOTYPES: ENABLE	356	PROTOTYPES: ENABLE
269		357
270	BOOT:	358	BOOT:
271	{	359	{
272	HV *stash = gv_stashpv ("CFClient", 1);	360	HV *stash = gv_stashpv ("CFPlus", 1);
273	static const struct {	361	static const struct {
274	const char *name;	362	const char *name;
275	IV iv;	363	IV iv;
276	} *civ, const_iv[] = {	364	} *civ, const_iv[] = {
277	# define const_iv(name) { # name, (IV)name }	365	# define const_iv(name) { # name, (IV)name }
…		…
376	# undef const_iv	464	# undef const_iv
377	};	465	};
378		466
379	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; )
380	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	468	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
381
382	fontmap = pango_ft2_font_map_new ();
383	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
384	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
385	}	469	}
386		470
387	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
388	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	492	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
389		493
390	void	494	void
391	SDL_Quit ()	495	SDL_Quit ()
392		496
393	void	497	void
…		…
399	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	503	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
400	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	504	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
401	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	505	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
402	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	506	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
403		507
		508	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		509	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		510
404	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	511	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
405	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	512	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
406	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	513	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
407	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	514	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
408		515
409	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	516	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		517	#if SDL_VERSION_ATLEAST(1,2,10)
410	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	518	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
411	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	519	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		520	#endif
412		521
413	SDL_EnableUNICODE (1);	522	SDL_EnableUNICODE (1);
414	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	523	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
415		524
416	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	525	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
425		534
426	++m;	535	++m;
427	}	536	}
428	}	537	}
429		538
		539	char *
		540	SDL_GetError ()
		541
430	int	542	int
431	SDL_SetVideoMode (int w, int h, int fullscreen)	543	SDL_SetVideoMode (int w, int h, int fullscreen)
432	CODE:	544	CODE:
433	RETVAL = !!SDL_SetVideoMode (	545	RETVAL = !!SDL_SetVideoMode (
434	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	546	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
435	);	547	);
		548	if (RETVAL)
		549	{
436	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	}
437	OUTPUT:	555	OUTPUT:
438	RETVAL	556	RETVAL
439		557
440	void	558	void
441	SDL_GL_SwapBuffers ()	559	SDL_GL_SwapBuffers ()
		560
		561	char *
		562	SDL_GetKeyName (int sym)
442		563
443	void	564	void
444	SDL_PollEvent ()	565	SDL_PollEvent ()
445	PPCODE:	566	PPCODE:
446	{	567	{
…		…
448		569
449	while (SDL_PollEvent (&ev))	570	while (SDL_PollEvent (&ev))
450	{	571	{
451	HV *hv = newHV ();	572	HV *hv = newHV ();
452	hv_store (hv, "type", 4, newSViv (ev.type), 0);	573	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		574
453	switch (ev.type)	575	switch (ev.type)
454	{	576	{
455	case SDL_KEYDOWN:	577	case SDL_KEYDOWN:
456	case SDL_KEYUP:	578	case SDL_KEYUP:
457	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	579	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
464	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	586	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
465	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	587	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
466	break;	588	break;
467		589
468	case SDL_MOUSEMOTION:	590	case SDL_MOUSEMOTION:
		591	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		592
469	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	593	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
470	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	594	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
471	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	595	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
472	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	596	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
473	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	597	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
474	break;	598	break;
475		599
476	case SDL_MOUSEBUTTONDOWN:	600	case SDL_MOUSEBUTTONDOWN:
477	case SDL_MOUSEBUTTONUP:	601	case SDL_MOUSEBUTTONUP:
		602	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		603
478	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	604	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
479	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	605	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
480	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	606	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
481	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	607	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		608	break;
		609
		610	case SDL_USEREVENT:
		611	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		612	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		613	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		614	break;
482	}	615	}
483		616
484	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	617	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
485	}	618	}
486	}	619	}
487		620
488	int	621	int
489	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	622	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
490	POSTCALL:	623	POSTCALL:
491	Mix_HookMusicFinished (music_finished);	624	Mix_HookMusicFinished (music_finished);
		625	Mix_ChannelFinished (channel_finished);
492		626
493	void	627	void
494	Mix_CloseAudio ()	628	Mix_CloseAudio ()
495		629
496	int	630	int
…		…
501	CODE:	635	CODE:
502	#ifndef _WIN32	636	#ifndef _WIN32
503	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	637	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
504	#endif	638	#endif
505		639
506	char *
507	gl_version ()
508	CODE:
509	RETVAL = (char *)glGetString (GL_VERSION);
510	OUTPUT:
511	RETVAL
512
513	char *
514	gl_extensions ()
515	CODE:
516	RETVAL = (char *)glGetString (GL_EXTENSIONS);
517	OUTPUT:
518	RETVAL
519
520	void	640	void
521	add_font (char *file)	641	add_font (char *file)
522	CODE:	642	CODE:
523	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	643	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
524
525	void
526	set_font (char *file)
527	CODE:
528	{
529	int count;
530	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )file, 0, 0, &count);
531	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
532	FcPatternDestroy (pattern);
533	pango_font_description_set_absolute_size (font, MIN_FONT_HEIGHT);
534	pango_context_set_font_description (context, font);
535	}
536		644
537	void	645	void
538	load_image_inline (SV *image_)	646	load_image_inline (SV *image_)
539	ALIAS:	647	ALIAS:
540	load_image_file = 1	648	load_image_file = 1
…		…
582		690
583	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	691	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
584		692
585	assert (surface2->pitch == surface2->w * 4);	693	assert (surface2->pitch == surface2->w * 4);
586		694
		695	SDL_LockSurface (surface2);
587	EXTEND (SP, 5);	696	EXTEND (SP, 6);
588	PUSHs (sv_2mortal (newSViv (surface2->w)));	697	PUSHs (sv_2mortal (newSViv (surface2->w)));
589	PUSHs (sv_2mortal (newSViv (surface2->h)));	698	PUSHs (sv_2mortal (newSViv (surface2->h)));
590	SDL_LockSurface (surface2);
591	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	699	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
592	SDL_UnlockSurface (surface2);
593	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)));
594	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	701	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
595	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	702	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		703	SDL_UnlockSurface (surface2);
596		704
597	SDL_FreeSurface (surface);	705	SDL_FreeSurface (surface);
598	SDL_FreeSurface (surface2);	706	SDL_FreeSurface (surface2);
599	}	707	}
600		708
…		…
622	PUSHs (sv_2mortal (newSViv (b / y)));	730	PUSHs (sv_2mortal (newSViv (b / y)));
623	PUSHs (sv_2mortal (newSViv (a / y)));	731	PUSHs (sv_2mortal (newSViv (a / y)));
624	}	732	}
625		733
626	void	734	void
		735	error (char *message)
		736	CODE:
		737	fprintf (stderr, "ERROR: %s\n", message);
		738	#ifdef _WIN32
		739	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
		740	#endif
		741
		742	void
627	fatal (char *message)	743	fatal (char *message)
628	CODE:	744	CODE:
		745	fprintf (stderr, "FATAL: %s\n", message);
629	#ifdef _WIN32	746	#ifdef _WIN32
630	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	747	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
631	#else
632	fprintf (stderr, "FATAL: %s\n", message);
633	#endif	748	#endif
634	exit (1);	749	_exit (1);
635		750
		751	void
		752	_exit (int retval)
		753	CODE:
		754	_exit (retval);
		755
		756	MODULE = CFPlus PACKAGE = CFPlus::Font
		757
		758	CFPlus::Font
		759	new_from_file (SV class, char path, int id = 0)
		760	CODE:
		761	{
		762	int count;
		763	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
		764	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
		765	FcPatternDestroy (pattern);
		766	}
		767	OUTPUT:
		768	RETVAL
		769
		770	void
		771	DESTROY (CFPlus::Font self)
		772	CODE:
		773	pango_font_description_free (self);
		774
		775	void
		776	make_default (CFPlus::Font self)
		777	CODE:
		778	default_font = self;
		779
636	MODULE = CFClient PACKAGE = CFClient::Layout	780	MODULE = CFPlus PACKAGE = CFPlus::Layout
637		781
638	CFClient::Layout	782	void
639	new (SV *class, int base_height = 10)	783	reset_glyph_cache ()
		784	CODE:
		785	tc_clear ();
		786
		787	CFPlus::Layout
		788	new (SV *class)
640	CODE:	789	CODE:
641	New (0, RETVAL, 1, struct cf_layout);	790	New (0, RETVAL, 1, struct cf_layout);
642	RETVAL->base_height = base_height;	791
643	RETVAL->pl = pango_layout_new (context);	792	RETVAL->pl = pango_layout_new (opengl_context);
		793	RETVAL->r = 1.;
		794	RETVAL->g = 1.;
		795	RETVAL->b = 1.;
		796	RETVAL->a = 1.;
		797	RETVAL->base_height = MIN_FONT_HEIGHT;
		798	RETVAL->font = 0;
		799
644	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	800	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
645	pango_layout_set_font_description (RETVAL->pl,	801	layout_update_font (RETVAL);
646	pango_font_description_copy (
647	pango_context_get_font_description (context)));
648	OUTPUT:	802	OUTPUT:
649	RETVAL	803	RETVAL
650		804
651	void	805	void
652	DESTROY (CFClient::Layout self)	806	DESTROY (CFPlus::Layout self)
653	CODE:	807	CODE:
654	g_object_unref (self->pl);	808	g_object_unref (self->pl);
655	Safefree (self);	809	Safefree (self);
656		810
657	void	811	void
658	set_text (CFClient::Layout self, SV *text_)	812	set_text (CFPlus::Layout self, SV *text_)
659	CODE:	813	CODE:
660	{	814	{
661	STRLEN textlen;	815	STRLEN textlen;
662	char *text = SvPVutf8 (text_, textlen);	816	char *text = SvPVutf8 (text_, textlen);
663		817
664	pango_layout_set_text (self->pl, text, textlen);	818	pango_layout_set_text (self->pl, text, textlen);
665	}	819	}
666		820
667	void	821	void
668	set_markup (CFClient::Layout self, SV *text_)	822	set_markup (CFPlus::Layout self, SV *text_)
669	CODE:	823	CODE:
670	{	824	{
671	STRLEN textlen;	825	STRLEN textlen;
672	char *text = SvPVutf8 (text_, textlen);	826	char *text = SvPVutf8 (text_, textlen);
673		827
674	pango_layout_set_markup (self->pl, text, textlen);	828	pango_layout_set_markup (self->pl, text, textlen);
675	}	829	}
676		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
677	SV *	916	SV *
678	get_text (CFClient::Layout self)	917	get_text (CFPlus::Layout self)
679	CODE:	918	CODE:
680	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	919	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
681	SvUTF8_on (RETVAL);	920	sv_utf8_decode (RETVAL);
682	OUTPUT:	921	OUTPUT:
683	RETVAL	922	RETVAL
684		923
685	void	924	void
		925	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
		926	CODE:
		927	self->r = r;
		928	self->g = g;
		929	self->b = b;
		930	self->a = a;
		931
		932	void
		933	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
		934	CODE:
		935	if (self->font != font)
		936	{
		937	self->font = font;
		938	layout_update_font (self);
		939	}
		940
		941	void
686	set_height (CFClient::Layout self, int base_height)	942	set_height (CFPlus::Layout self, int base_height)
687	CODE:	943	CODE:
		944	if (self->base_height != base_height)
		945	{
688	self->base_height = base_height;	946	self->base_height = base_height;
		947	layout_update_font (self);
		948	}
689		949
690	void	950	void
691	set_width (CFClient::Layout self, int max_width = -1)	951	set_width (CFPlus::Layout self, int max_width = -1)
692	CODE:	952	CODE:
693	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);
694		954
695	void	955	void
		956	set_indent (CFPlus::Layout self, int indent)
		957	CODE:
		958	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		959
		960	void
		961	set_spacing (CFPlus::Layout self, int spacing)
		962	CODE:
		963	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		964
		965	void
		966	set_ellipsise (CFPlus::Layout self, int ellipsise)
		967	CODE:
		968	pango_layout_set_ellipsize (self->pl,
		969	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		970	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		971	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		972	: PANGO_ELLIPSIZE_NONE
		973	);
		974
		975	void
		976	set_single_paragraph_mode (CFPlus::Layout self, int spm)
		977	CODE:
		978	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		979
		980	void
696	size (CFClient::Layout self)	981	size (CFPlus::Layout self)
697	PPCODE:	982	PPCODE:
698	{	983	{
699	int w, h;	984	int w, h;
700		985
701	layout_update (self);
702	layout_get_pixel_size (self, &w, &h);	986	layout_get_pixel_size (self, &w, &h);
703		987
704	EXTEND (SP, 2);	988	EXTEND (SP, 2);
705	PUSHs (sv_2mortal (newSViv (w)));	989	PUSHs (sv_2mortal (newSViv (w)));
706	PUSHs (sv_2mortal (newSViv (h)));	990	PUSHs (sv_2mortal (newSViv (h)));
707	}	991	}
708		992
709	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
710	xy_to_index (CFClient::Layout self, int x, int y)	1006	xy_to_index (CFPlus::Layout self, int x, int y)
711	CODE:	1007	CODE:
712	{	1008	{
713	int index, trailing;	1009	int index, trailing;
714
715	layout_update (self);
716	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);
717
718	RETVAL = index;	1011	RETVAL = index;
719	}	1012	}
720	OUTPUT:	1013	OUTPUT:
721	RETVAL	1014	RETVAL
722		1015
723	void	1016	void
724	cursor_pos (CFClient::Layout self, int index)	1017	cursor_pos (CFPlus::Layout self, int index)
725	PPCODE:	1018	PPCODE:
726	{	1019	{
727	PangoRectangle strong_pos;	1020	PangoRectangle strong_pos;
728	layout_update (self);
729	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1021	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
730		1022
731	EXTEND (SP, 3);	1023	EXTEND (SP, 3);
732	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1024	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
733	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1025	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
734	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1026	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
735	}	1027	}
736		1028
737	void	1029	void
738	render (CFClient::Layout self)	1030	render (CFPlus::Layout self, float x, float y, int flags = 0)
739	PPCODE:	1031	PPCODE:
740	{	1032	pango_opengl_render_layout_subpixel (
741	SV *retval;	1033	self->pl,
742	int w, h;	1034	x * PANGO_SCALE, y * PANGO_SCALE,
743	FT_Bitmap bitmap;	1035	self->r, self->g, self->b, self->a,
		1036	flags
		1037	);
744		1038
745	layout_update (self);	1039	MODULE = CFPlus PACKAGE = CFPlus::Texture
746	layout_get_pixel_size (self, &w, &h);
747		1040
748	retval = newSV (w * h);	1041	void
749	SvPOK_only (retval);	1042	pad2pot (SV data_, SV w_, SV *h_)
750	SvCUR_set (retval, w * h);	1043	CODE:
		1044	{
		1045	int ow = SvIV (w_);
		1046	int oh = SvIV (h_);
751		1047
752	bitmap.rows = h;	1048	if (ow && oh)
753	bitmap.width = w;	1049	{
754	bitmap.pitch = w;	1050	int nw = minpot (ow);
755	bitmap.buffer = (unsigned char*)SvPVX (retval);	1051	int nh = minpot (oh);
756	bitmap.num_grays = 256;
757	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
758		1052
759	memset (bitmap.buffer, 0, w * h);	1053	if (nw != ow \|\| nh != oh)
760		1054	{
761	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	1055	if (SvOK (data_))
		1056	{
		1057	STRLEN datalen;
		1058	char *data = SvPVbyte (data_, datalen);
		1059	int bpp = datalen / (ow * oh);
		1060	SV result_ = sv_2mortal (newSV (nw nh * bpp));
762		1061
763	EXTEND (SP, 3);	1062	SvPOK_only (result_);
764	PUSHs (sv_2mortal (newSViv (w)));	1063	SvCUR_set (result_, nw * nh * bpp);
765	PUSHs (sv_2mortal (newSViv (h)));
766	PUSHs (sv_2mortal (retval));
767	}
768		1064
769	MODULE = CFClient PACKAGE = CFClient::Texture	1065	memset (SvPVX (result_), 0, nw * nh * bpp);
		1066	while (oh--)
		1067	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
770		1068
		1069	sv_setsv (data_, result_);
		1070	}
		1071
		1072	sv_setiv (w_, nw);
		1073	sv_setiv (h_, nh);
		1074	}
		1075	}
		1076	}
		1077
771	void	1078	void
772	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.)
773	PROTOTYPE: $$$;$$	1080	PROTOTYPE: $$$;$$
		1081	ALIAS:
		1082	draw_quad_alpha = 1
		1083	draw_quad_alpha_premultiplied = 2
774	CODE:	1084	CODE:
775	{	1085	{
776	HV hv = (HV )SvRV (self);	1086	HV hv = (HV )SvRV (self);
777	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1087	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
778	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1088	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
779	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1089	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
780	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
781		1090
782	if (items < 5)	1091	if (items < 5)
783	{	1092	{
784	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1093	w = SvNV (*hv_fetch (hv, "w", 1, 1));
785	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1094	h = SvNV (*hv_fetch (hv, "h", 1, 1));
786	}	1095	}
787		1096
		1097	if (ix)
		1098	{
		1099	glEnable (GL_BLEND);
		1100
		1101	if (ix == 2)
		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
		1107	glEnable (GL_ALPHA_TEST);
		1108	glAlphaFunc (GL_GREATER, 0.01f);
		1109	}
		1110
788	glBindTexture (GL_TEXTURE_2D, name);	1111	glBindTexture (GL_TEXTURE_2D, name);
789	if (wrap_mode) {	1112
790	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
791	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
792	}
793	glBegin (GL_QUADS);	1113	glBegin (GL_QUADS);
794	glTexCoord2f (0, 0); glVertex2f (x , y );	1114	glTexCoord2f (0, 0); glVertex2f (x , y );
795	glTexCoord2f (0, t); glVertex2f (x , y + h);	1115	glTexCoord2f (0, t); glVertex2f (x , y + h);
796	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1116	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
797	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1117	glTexCoord2f (s, 0); glVertex2f (x + w, y );
798	glEnd ();	1118	glEnd ();
799	}
800		1119
		1120	if (ix)
		1121	{
		1122	glDisable (GL_ALPHA_TEST);
		1123	glDisable (GL_BLEND);
		1124	}
		1125	}
		1126
801	MODULE = CFClient PACKAGE = CFClient::Map	1127	MODULE = CFPlus PACKAGE = CFPlus::Map
802		1128
803	CFClient::Map	1129	CFPlus::Map
804	new (SV *class, int map_width, int map_height)	1130	new (SV *class, int map_width, int map_height)
805	CODE:	1131	CODE:
806	New (0, RETVAL, 1, struct map);	1132	New (0, RETVAL, 1, struct map);
807	RETVAL->x = 0;	1133	RETVAL->x = 0;
808	RETVAL->y = 0;	1134	RETVAL->y = 0;
…		…
818	RETVAL->row = 0;	1144	RETVAL->row = 0;
819	OUTPUT:	1145	OUTPUT:
820	RETVAL	1146	RETVAL
821		1147
822	void	1148	void
823	DESTROY (CFClient::Map self)	1149	DESTROY (CFPlus::Map self)
824	CODE:	1150	CODE:
825	{	1151	{
826	map_clear (self);	1152	map_clear (self);
827	Safefree (self->face);	1153	Safefree (self->face);
		1154	Safefree (self->tex);
828	Safefree (self);	1155	Safefree (self);
829	}	1156	}
830		1157
831	void	1158	void
832	clear (CFClient::Map self)	1159	clear (CFPlus::Map self)
833	CODE:	1160	CODE:
834	map_clear (self);	1161	map_clear (self);
835		1162
836	void	1163	void
837	set_face (CFClient::Map self, int face, int texid)	1164	set_face (CFPlus::Map self, int face, int texid)
838	CODE:	1165	CODE:
839	{	1166	{
840	while (self->faces <= face)	1167	while (self->faces <= face)
841	{	1168	{
842	Append (mapface, self->face, self->faces, self->faces);	1169	Append (mapface, self->face, self->faces, self->faces);
…		…
845		1172
846	self->face [face] = texid;	1173	self->face [face] = texid;
847	}	1174	}
848		1175
849	void	1176	void
850	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)
851	CODE:	1178	CODE:
852	{	1179	{
853	while (self->texs <= texid)	1180	while (self->texs <= texid)
854	{	1181	{
855	Append (maptex, self->tex, self->texs, self->texs);	1182	Append (maptex, self->tex, self->texs, self->texs);
…		…
867	tex->r = r;	1194	tex->r = r;
868	tex->g = g;	1195	tex->g = g;
869	tex->b = b;	1196	tex->b = b;
870	tex->a = a;	1197	tex->a = a;
871	}	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);
872	}	1208	}
873		1209
874	int	1210	int
875	ox (CFClient::Map self)	1211	ox (CFPlus::Map self)
876	ALIAS:	1212	ALIAS:
877	oy = 1	1213	oy = 1
		1214	x = 2
		1215	y = 3
		1216	w = 4
		1217	h = 5
878	CODE:	1218	CODE:
879	switch (ix)	1219	switch (ix)
880	{	1220	{
881	case 0: RETVAL = self->ox; break;	1221	case 0: RETVAL = self->ox; break;
882	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;
883	}	1227	}
884	OUTPUT:	1228	OUTPUT:
885	RETVAL	1229	RETVAL
886		1230
887	void	1231	void
888	scroll (CFClient::Map self, int dx, int dy)	1232	scroll (CFPlus::Map self, int dx, int dy)
889	CODE:	1233	CODE:
890	{	1234	{
891	if (dx > 0)	1235	if (dx > 0)
892	map_blank (self, self->x, self->y, dx - 1, self->h);	1236	map_blank (self, self->x, self->y, dx - 1, self->h);
893	else if (dx < 0)	1237	else if (dx < 0)
…		…
909	self->y += MAP_EXTEND_Y;	1253	self->y += MAP_EXTEND_Y;
910	}	1254	}
911	}	1255	}
912		1256
913	void	1257	void
914	map1a_update (CFClient::Map self, SV *data_)	1258	map1a_update (CFPlus::Map self, SV *data_)
915	CODE:	1259	CODE:
916	{	1260	{
917	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1261	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
918	uint8_t data_end = (uint8_t )SvEND (data_);	1262	uint8_t data_end = (uint8_t )SvEND (data_);
919	mapcell *cell;	1263	mapcell *cell;
…		…
921		1265
922	while (data < data_end)	1266	while (data < data_end)
923	{	1267	{
924	flags = (data [0] << 8) + data [1]; data += 2;	1268	flags = (data [0] << 8) + data [1]; data += 2;
925		1269
926	x = ((flags >> 10) & 63) + self->x;	1270	x = self->x + ((flags >> 10) & 63);
927	y = ((flags >> 4) & 63) + self->y;	1271	y = self->y + ((flags >> 4) & 63);
928		1272
929	cell = map_get_cell (self, x, y);	1273	cell = map_get_cell (self, x, y);
930		1274
931	if (flags & 15)	1275	if (flags & 15)
932	{	1276	{
…		…
961	cell->darkness = -1;	1305	cell->darkness = -1;
962	}	1306	}
963	}	1307	}
964		1308
965	SV *	1309	SV *
966	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)
967	CODE:	1311	CODE:
968	{	1312	{
969	int x1, x;	1313	int x1, x;
970	int y1, y;	1314	int y1, y;
971	int z;	1315	int z;
…		…
1021	}	1365	}
1022	OUTPUT:	1366	OUTPUT:
1023	RETVAL	1367	RETVAL
1024		1368
1025	void	1369	void
1026	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)
1027	PPCODE:	1371	CODE:
1028	{	1372	{
1029	int vx, vy;	1373	int vx, vy;
1030	int x, y, z;	1374	int x, y, z;
1031	int last_name;	1375	int last_name;
1032	mapface face;	1376	mapface face;
1033	int sw4 = (sw + 3) & ~3;
1034	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1035	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1036		1377
1037	memset (darkness, 255, sw4 * sh);
1038	SvPOK_only (darkness_sv);
1039	SvCUR_set (darkness_sv, sw4 * sh);
1040
1041	vx = self->x + (self->w - sw) / 2 - shift_x;	1378	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1042	vy = self->y + (self->h - sh) / 2 - shift_y;	1379	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1043		1380
1044	/*	1381	/*
1045	int vx = self->vx = self->w >= sw	1382	int vx = self->vx = self->w >= sw
1046	? self->x + (self->w - sw) / 2	1383	? self->x + (self->w - sw) / 2
1047	: 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));
…		…
1051	: 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));
1052	*/	1389	*/
1053		1390
1054	glColor4ub (255, 255, 255, 255);	1391	glColor4ub (255, 255, 255, 255);
1055		1392
		1393	glEnable (GL_BLEND);
1056	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1394	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1057	glEnable (GL_BLEND);
1058	glEnable (GL_TEXTURE_2D);	1395	glEnable (GL_TEXTURE_2D);
1059	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1396	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1060		1397
1061	glBegin (GL_QUADS);	1398	glBegin (GL_QUADS);
1062		1399
…		…
1070		1407
1071	for (x = 0; x < sw; x++)	1408	for (x = 0; x < sw; x++)
1072	if (row->c0 <= x + vx && x + vx < row->c1)	1409	if (row->c0 <= x + vx && x + vx < row->c1)
1073	{	1410	{
1074	mapcell *cell = row->col + (x + vx - row->c0);	1411	mapcell *cell = row->col + (x + vx - row->c0);
1075
1076	darkness[y * sw4 + x] = cell->darkness < 0
1077	? 255 - FOW_DARKNESS
1078	: 255 - cell->darkness;
1079		1412
1080	face = cell->face [z];	1413	face = cell->face [z];
1081		1414
1082	if (face)	1415	if (face)
1083	{	1416	{
…		…
1104		1437
1105	glEnd ();	1438	glEnd ();
1106		1439
1107	glDisable (GL_TEXTURE_2D);	1440	glDisable (GL_TEXTURE_2D);
1108	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	}
1109		1536
1110	EXTEND (SP, 3);	1537	EXTEND (SP, 3);
1111	PUSHs (sv_2mortal (newSViv (sw4)));	1538	PUSHs (sv_2mortal (newSViv (sw4)));
1112	PUSHs (sv_2mortal (newSViv (sh)));	1539	PUSHs (sv_2mortal (newSViv (sh)));
1113	PUSHs (darkness_sv);	1540	PUSHs (darkness_sv);
1114	}	1541	}
1115		1542
1116	SV *	1543	SV *
1117	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)
1118	CODE:	1545	CODE:
1119	{	1546	{
1120	int x, y, x1, y1;	1547	int x, y, x1, y1;
1121	SV data_sv = newSV (w h * 7 + 5);	1548	SV data_sv = newSV (w h * 7 + 5);
1122	uint8_t data = (uint8_t )SvPVX (data_sv);	1549	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1184	}	1611	}
1185	OUTPUT:	1612	OUTPUT:
1186	RETVAL	1613	RETVAL
1187		1614
1188	void	1615	void
1189	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)
1190	PPCODE:	1617	PPCODE:
1191	{	1618	{
1192	int x, y, z;	1619	int x, y, z;
1193	int w, h;	1620	int w, h;
1194	int x1, y1;	1621	int x1, y1;
…		…
1243	}	1670	}
1244	}	1671	}
1245	}	1672	}
1246	}	1673	}
1247		1674
1248	MODULE = CFClient PACKAGE = CFClient::MixChunk	1675	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1249		1676
1250	CFClient::MixChunk	1677	CFPlus::MixChunk
1251	new_from_file (SV class, char path)	1678	new_from_file (SV class, char path)
1252	CODE:	1679	CODE:
1253	RETVAL = Mix_LoadWAV (path);	1680	RETVAL = Mix_LoadWAV (path);
1254	OUTPUT:	1681	OUTPUT:
1255	RETVAL	1682	RETVAL
1256		1683
1257	void	1684	void
1258	DESTROY (CFClient::MixChunk self)	1685	DESTROY (CFPlus::MixChunk self)
1259	CODE:	1686	CODE:
1260	Mix_FreeChunk (self);	1687	Mix_FreeChunk (self);
1261		1688
1262	int	1689	int
1263	volume (CFClient::MixChunk self, int volume = -1)	1690	volume (CFPlus::MixChunk self, int volume = -1)
1264	CODE:	1691	CODE:
1265	RETVAL = Mix_VolumeChunk (self, volume);	1692	RETVAL = Mix_VolumeChunk (self, volume);
1266	OUTPUT:	1693	OUTPUT:
1267	RETVAL	1694	RETVAL
1268		1695
1269	int	1696	int
1270	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)
1271	CODE:	1698	CODE:
1272	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1699	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1273	OUTPUT:	1700	OUTPUT:
1274	RETVAL	1701	RETVAL
1275		1702
1276	MODULE = CFClient PACKAGE = CFClient::MixMusic	1703	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1277		1704
1278	int	1705	int
1279	volume (int volume = -1)	1706	volume (int volume = -1)
1280	CODE:	1707	CODE:
1281	RETVAL = Mix_VolumeMusic (volume);	1708	RETVAL = Mix_VolumeMusic (volume);
1282	OUTPUT:	1709	OUTPUT:
1283	RETVAL	1710	RETVAL
1284		1711
1285	CFClient::MixMusic	1712	CFPlus::MixMusic
1286	new_from_file (SV class, char path)	1713	new_from_file (SV class, char path)
1287	CODE:	1714	CODE:
1288	RETVAL = Mix_LoadMUS (path);	1715	RETVAL = Mix_LoadMUS (path);
1289	OUTPUT:	1716	OUTPUT:
1290	RETVAL	1717	RETVAL
1291		1718
1292	void	1719	void
1293	DESTROY (CFClient::MixMusic self)	1720	DESTROY (CFPlus::MixMusic self)
1294	CODE:	1721	CODE:
1295	Mix_FreeMusic (self);	1722	Mix_FreeMusic (self);
1296		1723
1297	int	1724	int
1298	play (CFClient::MixMusic self, int loops = -1)	1725	play (CFPlus::MixMusic self, int loops = -1)
1299	CODE:	1726	CODE:
1300	RETVAL = Mix_PlayMusic (self, loops);	1727	RETVAL = Mix_PlayMusic (self, loops);
1301	OUTPUT:	1728	OUTPUT:
1302	RETVAL	1729	RETVAL
1303		1730
1304	MODULE = CFClient PACKAGE = CFClient::OpenGL	1731	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1305		1732
1306	BOOT:	1733	BOOT:
1307	{	1734	{
1308	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1735	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1309	static const struct {	1736	static const struct {
1310	const char *name;	1737	const char *name;
1311	IV iv;	1738	IV iv;
1312	} *civ, const_iv[] = {	1739	} *civ, const_iv[] = {
1313	# define const_iv(name) { # name, (IV)name }	1740	# define const_iv(name) { # name, (IV)name }
1314	const_iv (GL_COLOR_MATERIAL),	1741	const_iv (GL_COLOR_MATERIAL),
1315	const_iv (GL_SMOOTH),	1742	const_iv (GL_SMOOTH),
1316	const_iv (GL_FLAT),	1743	const_iv (GL_FLAT),
		1744	const_iv (GL_DITHER),
1317	const_iv (GL_BLEND),	1745	const_iv (GL_BLEND),
		1746	const_iv (GL_CULL_FACE),
		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),
1318	const_iv (GL_AND),	1754	const_iv (GL_AND),
		1755	const_iv (GL_ONE),
		1756	const_iv (GL_ZERO),
1319	const_iv (GL_SRC_ALPHA),	1757	const_iv (GL_SRC_ALPHA),
		1758	const_iv (GL_DST_ALPHA),
1320	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1759	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1760	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1761	const_iv (GL_SRC_ALPHA_SATURATE),
1321	const_iv (GL_RGB),	1762	const_iv (GL_RGB),
1322	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),
1323	const_iv (GL_UNSIGNED_BYTE),	1767	const_iv (GL_UNSIGNED_BYTE),
1324	const_iv (GL_ALPHA4),	1768	const_iv (GL_UNSIGNED_SHORT),
		1769	const_iv (GL_UNSIGNED_INT),
1325	const_iv (GL_ALPHA),	1770	const_iv (GL_ALPHA),
		1771	const_iv (GL_INTENSITY),
		1772	const_iv (GL_LUMINANCE),
		1773	const_iv (GL_LUMINANCE_ALPHA),
1326	const_iv (GL_FLOAT),	1774	const_iv (GL_FLOAT),
1327	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1775	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1328	const_iv (GL_COMPILE),	1776	const_iv (GL_COMPILE),
1329	const_iv (GL_TEXTURE_1D),	1777	const_iv (GL_TEXTURE_1D),
1330	const_iv (GL_TEXTURE_2D),	1778	const_iv (GL_TEXTURE_2D),
…		…
1332	const_iv (GL_TEXTURE_MAG_FILTER),	1780	const_iv (GL_TEXTURE_MAG_FILTER),
1333	const_iv (GL_TEXTURE_MIN_FILTER),	1781	const_iv (GL_TEXTURE_MIN_FILTER),
1334	const_iv (GL_TEXTURE_ENV_MODE),	1782	const_iv (GL_TEXTURE_ENV_MODE),
1335	const_iv (GL_TEXTURE_WRAP_S),	1783	const_iv (GL_TEXTURE_WRAP_S),
1336	const_iv (GL_TEXTURE_WRAP_T),	1784	const_iv (GL_TEXTURE_WRAP_T),
		1785	const_iv (GL_REPEAT),
1337	const_iv (GL_CLAMP),	1786	const_iv (GL_CLAMP),
1338	const_iv (GL_REPEAT),	1787	const_iv (GL_CLAMP_TO_EDGE),
1339	const_iv (GL_NEAREST),	1788	const_iv (GL_NEAREST),
1340	const_iv (GL_LINEAR),	1789	const_iv (GL_LINEAR),
1341	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1790	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1342	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1791	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1343	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1792	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1344	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1793	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1345	const_iv (GL_GENERATE_MIPMAP),	1794	const_iv (GL_GENERATE_MIPMAP),
1346	const_iv (GL_LINEAR),
1347	const_iv (GL_MODULATE),	1795	const_iv (GL_MODULATE),
		1796	const_iv (GL_DECAL),
1348	const_iv (GL_REPLACE),	1797	const_iv (GL_REPLACE),
		1798	const_iv (GL_DEPTH_BUFFER_BIT),
1349	const_iv (GL_COLOR_BUFFER_BIT),	1799	const_iv (GL_COLOR_BUFFER_BIT),
1350	const_iv (GL_PROJECTION),	1800	const_iv (GL_PROJECTION),
1351	const_iv (GL_MODELVIEW),	1801	const_iv (GL_MODELVIEW),
1352	const_iv (GL_COLOR_LOGIC_OP),	1802	const_iv (GL_COLOR_LOGIC_OP),
		1803	const_iv (GL_SEPARABLE_2D),
1353	const_iv (GL_CONVOLUTION_2D),	1804	const_iv (GL_CONVOLUTION_2D),
1354	const_iv (GL_CONVOLUTION_BORDER_MODE),	1805	const_iv (GL_CONVOLUTION_BORDER_MODE),
1355	const_iv (GL_CONSTANT_BORDER),	1806	const_iv (GL_CONSTANT_BORDER),
1356	const_iv (GL_LINES),	1807	const_iv (GL_LINES),
		1808	const_iv (GL_LINE_LOOP),
1357	const_iv (GL_QUADS),	1809	const_iv (GL_QUADS),
1358	const_iv (GL_LINE_LOOP),	1810	const_iv (GL_QUAD_STRIP),
		1811	const_iv (GL_TRIANGLES),
		1812	const_iv (GL_TRIANGLE_STRIP),
		1813	const_iv (GL_TRIANGLE_FAN),
1359	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1814	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1360	const_iv (GL_FASTEST),	1815	const_iv (GL_FASTEST),
		1816	const_iv (GL_V2F),
		1817	const_iv (GL_V3F),
		1818	const_iv (GL_T2F_V3F),
		1819	const_iv (GL_T2F_N3F_V3F),
1361	# undef const_iv	1820	# undef const_iv
1362	};	1821	};
1363		1822
1364	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1823	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1365	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1824	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1366	}	1825	}
1367		1826
		1827	char *
		1828	gl_vendor ()
		1829	CODE:
		1830	RETVAL = (char *)glGetString (GL_VENDOR);
		1831	OUTPUT:
		1832	RETVAL
		1833
		1834	char *
		1835	gl_version ()
		1836	CODE:
		1837	RETVAL = (char *)glGetString (GL_VERSION);
		1838	OUTPUT:
		1839	RETVAL
		1840
		1841	char *
		1842	gl_extensions ()
		1843	CODE:
		1844	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1845	OUTPUT:
		1846	RETVAL
		1847
1368	int glGetError ()	1848	int glGetError ()
		1849
		1850	void glFinish ()
1369		1851
1370	void glClear (int mask)	1852	void glClear (int mask)
1371		1853
1372	void glClearColor (float r, float g, float b, float a = 1.0)	1854	void glClearColor (float r, float g, float b, float a = 1.0)
1373	PROTOTYPE: @	1855	PROTOTYPE: @
…		…
1380		1862
1381	void glHint (int target, int mode)	1863	void glHint (int target, int mode)
1382		1864
1383	void glBlendFunc (int sfactor, int dfactor)	1865	void glBlendFunc (int sfactor, int dfactor)
1384		1866
		1867	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1868	CODE:
		1869	gl_BlendFuncSeparate (sa, da, saa, daa);
		1870
		1871	void glDepthMask (int flag)
		1872
1385	void glLogicOp (int opcode)	1873	void glLogicOp (int opcode)
1386		1874
		1875	void glColorMask (int red, int green, int blue, int alpha)
		1876
1387	void glMatrixMode (int mode)	1877	void glMatrixMode (int mode)
1388		1878
1389	void glPushMatrix ()	1879	void glPushMatrix ()
1390		1880
1391	void glPopMatrix ()	1881	void glPopMatrix ()
1392		1882
1393	void glLoadIdentity ()	1883	void glLoadIdentity ()
1394		1884
		1885	void glDrawBuffer (int buffer)
		1886
		1887	void glReadBuffer (int buffer)
		1888
		1889	# near_ and far_ are due to microsofts buggy "c" compiler
		1890	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1891
		1892	# near_ and far_ are due to microsofts buggy "c" compiler
1395	void glOrtho (double left, double right, double bottom, double top, double near, double far)	1893	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1396		1894
1397	void glViewport (int x, int y, int width, int height)	1895	void glViewport (int x, int y, int width, int height)
		1896
		1897	void glScissor (int x, int y, int width, int height)
1398		1898
1399	void glTranslate (float x, float y, float z = 0.)	1899	void glTranslate (float x, float y, float z = 0.)
1400	CODE:	1900	CODE:
1401	glTranslatef (x, y, z);	1901	glTranslatef (x, y, z);
1402		1902
1403	void glScale (float x, float y, float z)	1903	void glScale (float x, float y, float z = 1.)
1404	CODE:	1904	CODE:
1405	glScalef (x, y, z);	1905	glScalef (x, y, z);
1406		1906
1407	void glRotate (float angle, float x, float y, float z)	1907	void glRotate (float angle, float x, float y, float z)
1408	CODE:	1908	CODE:
…		…
1412		1912
1413	void glEnd ()	1913	void glEnd ()
1414		1914
1415	void glColor (float r, float g, float b, float a = 1.0)	1915	void glColor (float r, float g, float b, float a = 1.0)
1416	PROTOTYPE: @	1916	PROTOTYPE: @
		1917	ALIAS:
		1918	glColor_premultiply = 1
1417	CODE:	1919	CODE:
		1920	if (ix)
		1921	{
		1922	r *= a;
		1923	g *= a;
		1924	b *= a;
		1925	}
		1926	// microsoft visual "c" rounds instead of truncating...
1418	glColor4f (r, g, b, a);	1927	glColor4f (r, g, b, a);
		1928
		1929	void glInterleavedArrays (int format, int stride, char *data)
		1930
		1931	void glDrawElements (int mode, int count, int type, char *indices)
		1932
		1933	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1934
		1935	void glRasterPos (float x, float y, float z = 0.)
		1936	CODE:
		1937	glRasterPos3f (0, 0, z);
		1938	glBitmap (0, 0, 0, 0, x, y, 0);
1419		1939
1420	void glVertex (float x, float y, float z = 0.)	1940	void glVertex (float x, float y, float z = 0.)
1421	CODE:	1941	CODE:
1422	glVertex3f (x, y, z);	1942	glVertex3f (x, y, z);
1423		1943
…		…
1435		1955
1436	void glBindTexture (int target, int name)	1956	void glBindTexture (int target, int name)
1437		1957
1438	void glConvolutionParameter (int target, int pname, float params)	1958	void glConvolutionParameter (int target, int pname, float params)
1439	CODE:	1959	CODE:
		1960	if (gl.ConvolutionParameterf)
1440	glConvolutionParameterf (target, pname, params);	1961	gl.ConvolutionParameterf (target, pname, params);
1441		1962
1442	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1963	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1964	CODE:
		1965	if (gl.ConvolutionFilter2D)
		1966	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
		1967
		1968	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		1969	CODE:
		1970	if (gl.SeparableFilter2D)
		1971	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1443		1972
1444	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1973	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1445		1974
1446	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1975	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1976
		1977	void glDrawPixels (int width, int height, int format, int type, char *pixels)
		1978
		1979	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1447		1980
1448	int glGenTexture ()	1981	int glGenTexture ()
1449	CODE:	1982	CODE:
1450	{	1983	{
1451	GLuint name;	1984	GLuint name;

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.60 by root, Sun Apr 23 04:47:02 2006 UTC vs. Revision 1.137 by root, Sun Aug 13 19:47:05 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.60 by root, Sun Apr 23 04:47:02 2006 UTC vs.
Revision 1.137 by root, Sun Aug 13 19:47:05 2006 UTC