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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.90 by root, Sun May 21 00:34:58 2006 UTC vs.
Revision 1.134 by root, Fri Aug 4 16:49:58 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
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
…		…
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, 1);	506	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		507
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	508	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	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);
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	543	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	544	CODE:
481	RETVAL = !!SDL_SetVideoMode (	545	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	546	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	547	);
		548	if (RETVAL)
		549	{
484	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	}
485	OUTPUT:	555	OUTPUT:
486	RETVAL	556	RETVAL
487		557
488	void	558	void
489	SDL_GL_SwapBuffers ()	559	SDL_GL_SwapBuffers ()
		560
		561	char *
		562	SDL_GetKeyName (int sym)
490		563
491	void	564	void
492	SDL_PollEvent ()	565	SDL_PollEvent ()
493	PPCODE:	566	PPCODE:
494	{	567	{
…		…
513	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	586	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
514	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	587	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
515	break;	588	break;
516		589
517	case SDL_MOUSEMOTION:	590	case SDL_MOUSEMOTION:
		591	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		592
518	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	593	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
519	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	594	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
520	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	595	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
521	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	596	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
522	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	597	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
523	break;	598	break;
524		599
525	case SDL_MOUSEBUTTONDOWN:	600	case SDL_MOUSEBUTTONDOWN:
526	case SDL_MOUSEBUTTONUP:	601	case SDL_MOUSEBUTTONUP:
		602	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		603
527	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	604	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
528	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	605	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
529	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	606	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
530	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	607	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531	break;	608	break;
…		…
535	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	612	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
536	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	613	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
537	break;	614	break;
538	}	615	}
539		616
540	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	617	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
541	}	618	}
542	}	619	}
543		620
544	int	621	int
545	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)
…		…
558	CODE:	635	CODE:
559	#ifndef _WIN32	636	#ifndef _WIN32
560	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	637	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
561	#endif	638	#endif
562		639
563	char *
564	gl_version ()
565	CODE:
566	RETVAL = (char *)glGetString (GL_VERSION);
567	OUTPUT:
568	RETVAL
569
570	char *
571	gl_extensions ()
572	CODE:
573	RETVAL = (char *)glGetString (GL_EXTENSIONS);
574	OUTPUT:
575	RETVAL
576
577	void	640	void
578	add_font (char *file)	641	add_font (char *file)
579	CODE:	642	CODE:
580	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	643	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
581	#ifdef _WIN32
582	// cairo... sigh... requires win2000
583	AddFontResourceEx (file, FR_PRIVATE, 0);
584	#endif
585		644
586	void	645	void
587	load_image_inline (SV *image_)	646	load_image_inline (SV *image_)
588	ALIAS:	647	ALIAS:
589	load_image_file = 1	648	load_image_file = 1
…		…
631		690
632	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	691	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
633		692
634	assert (surface2->pitch == surface2->w * 4);	693	assert (surface2->pitch == surface2->w * 4);
635		694
		695	SDL_LockSurface (surface2);
636	EXTEND (SP, 5);	696	EXTEND (SP, 6);
637	PUSHs (sv_2mortal (newSViv (surface2->w)));	697	PUSHs (sv_2mortal (newSViv (surface2->w)));
638	PUSHs (sv_2mortal (newSViv (surface2->h)));	698	PUSHs (sv_2mortal (newSViv (surface2->h)));
639	SDL_LockSurface (surface2);
640	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	699	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
641	SDL_UnlockSurface (surface2);
642	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)));
643	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	701	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
644	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	702	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		703	SDL_UnlockSurface (surface2);
645		704
646	SDL_FreeSurface (surface);	705	SDL_FreeSurface (surface);
647	SDL_FreeSurface (surface2);	706	SDL_FreeSurface (surface2);
648	}	707	}
649		708
…		…
685	CODE:	744	CODE:
686	fprintf (stderr, "FATAL: %s\n", message);	745	fprintf (stderr, "FATAL: %s\n", message);
687	#ifdef _WIN32	746	#ifdef _WIN32
688	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	747	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
689	#endif	748	#endif
690	exit (1);	749	_exit (1);
691		750
		751	void
		752	_exit (int retval)
		753	CODE:
		754	_exit (retval);
		755
692	MODULE = CFClient PACKAGE = CFClient::Font	756	MODULE = CFPlus PACKAGE = CFPlus::Font
693		757
694	CFClient::Font	758	CFPlus::Font
695	new_from_file (SV class, char path, int id = 0)	759	new_from_file (SV class, char path, int id = 0)
696	CODE:	760	CODE:
697	{	761	{
698	int count;	762	int count;
699	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	763	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
702	}	766	}
703	OUTPUT:	767	OUTPUT:
704	RETVAL	768	RETVAL
705		769
706	void	770	void
707	DESTROY (CFClient::Font self)	771	DESTROY (CFPlus::Font self)
708	CODE:	772	CODE:
709	pango_font_description_free (self);	773	pango_font_description_free (self);
710		774
711	void	775	void
712	make_default (CFClient::Font self)	776	make_default (CFPlus::Font self)
713	CODE:	777	CODE:
714	default_font = self;	778	default_font = self;
715		779
716	MODULE = CFClient PACKAGE = CFClient::Layout	780	MODULE = CFPlus PACKAGE = CFPlus::Layout
717		781
718	CFClient::Layout	782	void
719	new (SV *class, int rgba = 0)	783	reset_glyph_cache ()
720	CODE:	784	CODE:
721	#if _WIN32	785	tc_clear ();
722	rgba = 0;//D	786
723	#endif	787	CFPlus::Layout
		788	new (SV *class)
		789	CODE:
724	New (0, RETVAL, 1, struct cf_layout);	790	New (0, RETVAL, 1, struct cf_layout);
725		791
726	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	792	RETVAL->pl = pango_layout_new (opengl_context);
727	RETVAL->rgba = rgba;
728	RETVAL->r = 1.;	793	RETVAL->r = 1.;
729	RETVAL->g = 1.;	794	RETVAL->g = 1.;
730	RETVAL->b = 1.;	795	RETVAL->b = 1.;
731	RETVAL->a = 1.;	796	RETVAL->a = 1.;
732	RETVAL->base_height = MIN_FONT_HEIGHT;	797	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
736	layout_update_font (RETVAL);	801	layout_update_font (RETVAL);
737	OUTPUT:	802	OUTPUT:
738	RETVAL	803	RETVAL
739		804
740	void	805	void
741	DESTROY (CFClient::Layout self)	806	DESTROY (CFPlus::Layout self)
742	CODE:	807	CODE:
743	g_object_unref (self->pl);	808	g_object_unref (self->pl);
744	Safefree (self);	809	Safefree (self);
745		810
746	int
747	is_rgba (CFClient::Layout self)
748	CODE:
749	RETVAL = self->rgba;
750	OUTPUT:
751	RETVAL
752
753	void	811	void
754	set_text (CFClient::Layout self, SV *text_)	812	set_text (CFPlus::Layout self, SV *text_)
755	CODE:	813	CODE:
756	{	814	{
757	STRLEN textlen;	815	STRLEN textlen;
758	char *text = SvPVutf8 (text_, textlen);	816	char *text = SvPVutf8 (text_, textlen);
759		817
760	pango_layout_set_text (self->pl, text, textlen);	818	pango_layout_set_text (self->pl, text, textlen);
761	}	819	}
762		820
763	void	821	void
764	set_markup (CFClient::Layout self, SV *text_)	822	set_markup (CFPlus::Layout self, SV *text_)
765	CODE:	823	CODE:
766	{	824	{
767	STRLEN textlen;	825	STRLEN textlen;
768	char *text = SvPVutf8 (text_, textlen);	826	char *text = SvPVutf8 (text_, textlen);
769		827
770	pango_layout_set_markup (self->pl, text, textlen);	828	pango_layout_set_markup (self->pl, text, textlen);
771	}	829	}
772		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
773	SV *	916	SV *
774	get_text (CFClient::Layout self)	917	get_text (CFPlus::Layout self)
775	CODE:	918	CODE:
776	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	919	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
777	SvUTF8_on (RETVAL);	920	sv_utf8_decode (RETVAL);
778	OUTPUT:	921	OUTPUT:
779	RETVAL	922	RETVAL
780		923
781	void	924	void
782	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.)
783	CODE:	926	CODE:
784	self->r = r;	927	self->r = r;
785	self->g = g;	928	self->g = g;
786	self->b = b;	929	self->b = b;
787	self->a = a;	930	self->a = a;
788		931
789	void	932	void
790	set_font (CFClient::Layout self, CFClient::Font font = 0)	933	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
791	CODE:	934	CODE:
792	if (self->font != font)	935	if (self->font != font)
793	{	936	{
794	self->font = font;	937	self->font = font;
795	layout_update_font (self);	938	layout_update_font (self);
796	}	939	}
797		940
798	void	941	void
799	set_height (CFClient::Layout self, int base_height)	942	set_height (CFPlus::Layout self, int base_height)
800	CODE:	943	CODE:
801	if (self->base_height != base_height)	944	if (self->base_height != base_height)
802	{	945	{
803	self->base_height = base_height;	946	self->base_height = base_height;
804	layout_update_font (self);	947	layout_update_font (self);
805	}	948	}
806		949
807	void	950	void
808	set_width (CFClient::Layout self, int max_width = -1)	951	set_width (CFPlus::Layout self, int max_width = -1)
809	CODE:	952	CODE:
810	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);
811		954
812	void	955	void
813	set_indent (CFClient::Layout self, int indent)	956	set_indent (CFPlus::Layout self, int indent)
814	CODE:	957	CODE:
815	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	958	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
816		959
817	void	960	void
818	set_spacing (CFClient::Layout self, int spacing)	961	set_spacing (CFPlus::Layout self, int spacing)
819	CODE:	962	CODE:
820	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	963	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
821		964
822	void	965	void
823	set_ellipsise (CFClient::Layout self, int ellipsise)	966	set_ellipsise (CFPlus::Layout self, int ellipsise)
824	CODE:	967	CODE:
825	pango_layout_set_ellipsize (self->pl,	968	pango_layout_set_ellipsize (self->pl,
826	ellipsise == 1 ? PANGO_ELLIPSIZE_START	969	ellipsise == 1 ? PANGO_ELLIPSIZE_START
827	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	970	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
828	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	971	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
829	: PANGO_ELLIPSIZE_NONE	972	: PANGO_ELLIPSIZE_NONE
830	);	973	);
831		974
832	void	975	void
833	set_single_paragraph_mode (CFClient::Layout self, int spm)	976	set_single_paragraph_mode (CFPlus::Layout self, int spm)
834	CODE:	977	CODE:
835	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	978	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
836		979
837	void	980	void
838	size (CFClient::Layout self)	981	size (CFPlus::Layout self)
839	PPCODE:	982	PPCODE:
840	{	983	{
841	int w, h;	984	int w, h;
842		985
843	layout_get_pixel_size (self, &w, &h);	986	layout_get_pixel_size (self, &w, &h);
…		…
846	PUSHs (sv_2mortal (newSViv (w)));	989	PUSHs (sv_2mortal (newSViv (w)));
847	PUSHs (sv_2mortal (newSViv (h)));	990	PUSHs (sv_2mortal (newSViv (h)));
848	}	991	}
849		992
850	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
851	xy_to_index (CFClient::Layout self, int x, int y)	1006	xy_to_index (CFPlus::Layout self, int x, int y)
852	CODE:	1007	CODE:
853	{	1008	{
854	int index, trailing;	1009	int index, trailing;
855	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);
856	RETVAL = index;	1011	RETVAL = index;
857	}	1012	}
858	OUTPUT:	1013	OUTPUT:
859	RETVAL	1014	RETVAL
860		1015
861	void	1016	void
862	cursor_pos (CFClient::Layout self, int index)	1017	cursor_pos (CFPlus::Layout self, int index)
863	PPCODE:	1018	PPCODE:
864	{	1019	{
865	PangoRectangle strong_pos;	1020	PangoRectangle strong_pos;
866	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1021	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
867		1022
…		…
870	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1025	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
871	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1026	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
872	}	1027	}
873		1028
874	void	1029	void
875	render (CFClient::Layout self)	1030	render (CFPlus::Layout self, float x, float y)
876	PPCODE:	1031	PPCODE:
877	{	1032	pango_opengl_render_layout_subpixel (
878	SV *retval;	1033	self->pl,
879	int w, h;	1034	x * PANGO_SCALE, y * PANGO_SCALE,
		1035	self->r, self->g, self->b, self->a
		1036	);
880		1037
881	layout_get_pixel_size (self, &w, &h);	1038	MODULE = CFPlus PACKAGE = CFPlus::Texture
882		1039
883	if (self->rgba)	1040	void
		1041	pad2pot (SV data_, SV w_, SV *h_)
		1042	CODE:
		1043	{
		1044	int ow = SvIV (w_);
		1045	int oh = SvIV (h_);
		1046
		1047	if (ow && oh)
884	{	1048	{
885	cairo_surface_t *surface;	1049	int nw = minpot (ow);
886	cairo_t *cairo;	1050	int nh = minpot (oh);
887		1051
888	retval = newSV (w * h * 4);	1052	if (nw != ow \|\| nh != oh)
889	SvPOK_only (retval);
890	SvCUR_set (retval, w * h * 4);
891
892	memset (SvPVX (retval), 0, w * h * 4);
893
894	surface = cairo_image_surface_create_for_data (
895	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
896	cairo = cairo_create (surface);
897	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
898
899	pango_cairo_show_layout (cairo, self->pl);
900
901	cairo_destroy (cairo);
902	cairo_surface_destroy (surface);
903
904	// what a mess, and its premultiplied, too :(
905	{	1053	{
906	uint32_t p = (uint32_t )SvPVX (retval);	1054	if (SvOK (data_))
907	uint32_t e = p + w h;
908
909	while (p < e)
910	{	1055	{
911	uint32_t rgba = *p;	1056	STRLEN datalen;
912	rgba = (rgba >> 24) \| (rgba << 8);	1057	char *data = SvPVbyte (data_, datalen);
913	#if 0	1058	int bpp = datalen / (ow * oh);
914	#ifdef _WIN32	1059	SV result_ = sv_2mortal (newSV (nw nh * bpp));
915	{//D
916	uint8_t r = rgba >> 24;
917	uint8_t g = rgba >> 16;
918	uint8_t b = rgba >> 8;
919	uint8_t a = rgba >> 0;
920		1060
921	rgba = (rgba & 0xffffff00) \| a;	1061	SvPOK_only (result_);
		1062	SvCUR_set (result_, nw * nh * bpp);
		1063
		1064	memset (SvPVX (result_), 0, nw * nh * bpp);
		1065	while (oh--)
		1066	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1067
		1068	sv_setsv (data_, result_);
922	}	1069	}
923	#endif	1070
924	#endif	1071	sv_setiv (w_, nw);
925	rgba = SDL_SwapBE32 (rgba);	1072	sv_setiv (h_, nh);
926	*p++ = rgba;
927	}	1073	}
928	}
929
930	EXTEND (SP, 5);
931	PUSHs (sv_2mortal (newSViv (w)));
932	PUSHs (sv_2mortal (newSViv (h)));
933	PUSHs (sv_2mortal (retval));
934	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
935	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
936	}	1074	}
937	else
938	{
939	FT_Bitmap bitmap;
940
941	retval = newSV (w * h);
942	SvPOK_only (retval);
943	SvCUR_set (retval, w * h);
944
945	bitmap.rows = h;
946	bitmap.width = w;
947	bitmap.pitch = w;
948	bitmap.buffer = (unsigned char*)SvPVX (retval);
949	bitmap.num_grays = 256;
950	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
951
952	memset (bitmap.buffer, 0, w * h);
953
954	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
955
956	EXTEND (SP, 5);
957	PUSHs (sv_2mortal (newSViv (w)));
958	PUSHs (sv_2mortal (newSViv (h)));
959	PUSHs (sv_2mortal (retval));
960	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
961	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
962	}
963	}	1075	}
964		1076
965	MODULE = CFClient PACKAGE = CFClient::Texture
966
967	void	1077	void
968	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1078	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
969	PROTOTYPE: $$$;$$	1079	PROTOTYPE: $$$;$$
970	ALIAS:	1080	ALIAS:
971	draw_quad_alpha = 1	1081	draw_quad_alpha = 1
972	draw_quad_alpha_premultiplied = 2	1082	draw_quad_alpha_premultiplied = 2
973	CODE:	1083	CODE:
974	{	1084	{
975	HV hv = (HV )SvRV (self);	1085	HV hv = (HV )SvRV (self);
976	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1086	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
977	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1087	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
978	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1088	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
979	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
980		1089
981	if (items < 5)	1090	if (items < 5)
982	{	1091	{
983	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1092	w = SvNV (*hv_fetch (hv, "w", 1, 1));
984	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1093	h = SvNV (*hv_fetch (hv, "h", 1, 1));
985	}	1094	}
986		1095
987	if (ix)	1096	if (ix)
988	{	1097	{
989	glEnable (GL_BLEND);	1098	glEnable (GL_BLEND);
		1099
		1100	if (ix == 2)
990	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1101	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1102	else
		1103	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1104	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1105
991	glEnable (GL_ALPHA_TEST);	1106	glEnable (GL_ALPHA_TEST);
992	glAlphaFunc (GL_GREATER, 0.01f);	1107	glAlphaFunc (GL_GREATER, 0.01f);
993	}	1108	}
994		1109
995	glBindTexture (GL_TEXTURE_2D, name);	1110	glBindTexture (GL_TEXTURE_2D, name);
996
997	if (wrap_mode)
998	{
999	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1000	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1001	}
1002		1111
1003	glBegin (GL_QUADS);	1112	glBegin (GL_QUADS);
1004	glTexCoord2f (0, 0); glVertex2f (x , y );	1113	glTexCoord2f (0, 0); glVertex2f (x , y );
1005	glTexCoord2f (0, t); glVertex2f (x , y + h);	1114	glTexCoord2f (0, t); glVertex2f (x , y + h);
1006	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1115	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1012	glDisable (GL_ALPHA_TEST);	1121	glDisable (GL_ALPHA_TEST);
1013	glDisable (GL_BLEND);	1122	glDisable (GL_BLEND);
1014	}	1123	}
1015	}	1124	}
1016		1125
1017	MODULE = CFClient PACKAGE = CFClient::Map	1126	MODULE = CFPlus PACKAGE = CFPlus::Map
1018		1127
1019	CFClient::Map	1128	CFPlus::Map
1020	new (SV *class, int map_width, int map_height)	1129	new (SV *class, int map_width, int map_height)
1021	CODE:	1130	CODE:
1022	New (0, RETVAL, 1, struct map);	1131	New (0, RETVAL, 1, struct map);
1023	RETVAL->x = 0;	1132	RETVAL->x = 0;
1024	RETVAL->y = 0;	1133	RETVAL->y = 0;
…		…
1034	RETVAL->row = 0;	1143	RETVAL->row = 0;
1035	OUTPUT:	1144	OUTPUT:
1036	RETVAL	1145	RETVAL
1037		1146
1038	void	1147	void
1039	DESTROY (CFClient::Map self)	1148	DESTROY (CFPlus::Map self)
1040	CODE:	1149	CODE:
1041	{	1150	{
1042	map_clear (self);	1151	map_clear (self);
1043	Safefree (self->face);	1152	Safefree (self->face);
		1153	Safefree (self->tex);
1044	Safefree (self);	1154	Safefree (self);
1045	}	1155	}
1046		1156
1047	void	1157	void
1048	clear (CFClient::Map self)	1158	clear (CFPlus::Map self)
1049	CODE:	1159	CODE:
1050	map_clear (self);	1160	map_clear (self);
1051		1161
1052	void	1162	void
1053	set_face (CFClient::Map self, int face, int texid)	1163	set_face (CFPlus::Map self, int face, int texid)
1054	CODE:	1164	CODE:
1055	{	1165	{
1056	while (self->faces <= face)	1166	while (self->faces <= face)
1057	{	1167	{
1058	Append (mapface, self->face, self->faces, self->faces);	1168	Append (mapface, self->face, self->faces, self->faces);
…		…
1061		1171
1062	self->face [face] = texid;	1172	self->face [face] = texid;
1063	}	1173	}
1064		1174
1065	void	1175	void
1066	set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1176	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1067	CODE:	1177	CODE:
1068	{	1178	{
1069	while (self->texs <= texid)	1179	while (self->texs <= texid)
1070	{	1180	{
1071	Append (maptex, self->tex, self->texs, self->texs);	1181	Append (maptex, self->tex, self->texs, self->texs);
…		…
1083	tex->r = r;	1193	tex->r = r;
1084	tex->g = g;	1194	tex->g = g;
1085	tex->b = b;	1195	tex->b = b;
1086	tex->a = a;	1196	tex->a = a;
1087	}	1197	}
		1198
		1199	// somewhat hackish, but for textures that require it, it really
		1200	// improves the look, and most others don't suffer.
		1201	glBindTexture (GL_TEXTURE_2D, name);
		1202	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1203	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1204	// use uglier nearest interpolation because linear suffers
		1205	// from transparent color bleeding and ugly wrapping effects.
		1206	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1088	}	1207	}
1089		1208
1090	int	1209	int
1091	ox (CFClient::Map self)	1210	ox (CFPlus::Map self)
1092	ALIAS:	1211	ALIAS:
1093	oy = 1	1212	oy = 1
		1213	x = 2
		1214	y = 3
		1215	w = 4
		1216	h = 5
1094	CODE:	1217	CODE:
1095	switch (ix)	1218	switch (ix)
1096	{	1219	{
1097	case 0: RETVAL = self->ox; break;	1220	case 0: RETVAL = self->ox; break;
1098	case 1: RETVAL = self->oy; break;	1221	case 1: RETVAL = self->oy; break;
		1222	case 2: RETVAL = self->x; break;
		1223	case 3: RETVAL = self->y; break;
		1224	case 4: RETVAL = self->w; break;
		1225	case 5: RETVAL = self->h; break;
1099	}	1226	}
1100	OUTPUT:	1227	OUTPUT:
1101	RETVAL	1228	RETVAL
1102		1229
1103	void	1230	void
1104	scroll (CFClient::Map self, int dx, int dy)	1231	scroll (CFPlus::Map self, int dx, int dy)
1105	CODE:	1232	CODE:
1106	{	1233	{
1107	if (dx > 0)	1234	if (dx > 0)
1108	map_blank (self, self->x, self->y, dx - 1, self->h);	1235	map_blank (self, self->x, self->y, dx - 1, self->h);
1109	else if (dx < 0)	1236	else if (dx < 0)
…		…
1125	self->y += MAP_EXTEND_Y;	1252	self->y += MAP_EXTEND_Y;
1126	}	1253	}
1127	}	1254	}
1128		1255
1129	void	1256	void
1130	map1a_update (CFClient::Map self, SV *data_)	1257	map1a_update (CFPlus::Map self, SV *data_)
1131	CODE:	1258	CODE:
1132	{	1259	{
1133	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1260	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1134	uint8_t data_end = (uint8_t )SvEND (data_);	1261	uint8_t data_end = (uint8_t )SvEND (data_);
1135	mapcell *cell;	1262	mapcell *cell;
…		…
1137		1264
1138	while (data < data_end)	1265	while (data < data_end)
1139	{	1266	{
1140	flags = (data [0] << 8) + data [1]; data += 2;	1267	flags = (data [0] << 8) + data [1]; data += 2;
1141		1268
1142	x = ((flags >> 10) & 63) + self->x;	1269	x = self->x + ((flags >> 10) & 63);
1143	y = ((flags >> 4) & 63) + self->y;	1270	y = self->y + ((flags >> 4) & 63);
1144		1271
1145	cell = map_get_cell (self, x, y);	1272	cell = map_get_cell (self, x, y);
1146		1273
1147	if (flags & 15)	1274	if (flags & 15)
1148	{	1275	{
…		…
1177	cell->darkness = -1;	1304	cell->darkness = -1;
1178	}	1305	}
1179	}	1306	}
1180		1307
1181	SV *	1308	SV *
1182	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1309	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1183	CODE:	1310	CODE:
1184	{	1311	{
1185	int x1, x;	1312	int x1, x;
1186	int y1, y;	1313	int y1, y;
1187	int z;	1314	int z;
…		…
1237	}	1364	}
1238	OUTPUT:	1365	OUTPUT:
1239	RETVAL	1366	RETVAL
1240		1367
1241	void	1368	void
1242	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1369	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1243	PPCODE:	1370	CODE:
1244	{	1371	{
1245	int vx, vy;	1372	int vx, vy;
1246	int x, y, z;	1373	int x, y, z;
1247	int last_name;	1374	int last_name;
1248	mapface face;	1375	mapface face;
1249	int sw4 = (sw + 3) & ~3;
1250	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1251	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1252		1376
1253	memset (darkness, 255, sw4 * sh);
1254	SvPOK_only (darkness_sv);
1255	SvCUR_set (darkness_sv, sw4 * sh);
1256
1257	vx = self->x + (self->w - sw) / 2 - shift_x;	1377	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1258	vy = self->y + (self->h - sh) / 2 - shift_y;	1378	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1259		1379
1260	/*	1380	/*
1261	int vx = self->vx = self->w >= sw	1381	int vx = self->vx = self->w >= sw
1262	? self->x + (self->w - sw) / 2	1382	? self->x + (self->w - sw) / 2
1263	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1383	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1267	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1387	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1268	*/	1388	*/
1269		1389
1270	glColor4ub (255, 255, 255, 255);	1390	glColor4ub (255, 255, 255, 255);
1271		1391
		1392	glEnable (GL_BLEND);
1272	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1393	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1273	glEnable (GL_BLEND);
1274	glEnable (GL_TEXTURE_2D);	1394	glEnable (GL_TEXTURE_2D);
1275	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1395	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1276		1396
1277	glBegin (GL_QUADS);	1397	glBegin (GL_QUADS);
1278		1398
…		…
1286		1406
1287	for (x = 0; x < sw; x++)	1407	for (x = 0; x < sw; x++)
1288	if (row->c0 <= x + vx && x + vx < row->c1)	1408	if (row->c0 <= x + vx && x + vx < row->c1)
1289	{	1409	{
1290	mapcell *cell = row->col + (x + vx - row->c0);	1410	mapcell *cell = row->col + (x + vx - row->c0);
1291
1292	darkness[y * sw4 + x] = cell->darkness < 0
1293	? 255 - FOW_DARKNESS
1294	: 255 - cell->darkness;
1295		1411
1296	face = cell->face [z];	1412	face = cell->face [z];
1297		1413
1298	if (face)	1414	if (face)
1299	{	1415	{
…		…
1320		1436
1321	glEnd ();	1437	glEnd ();
1322		1438
1323	glDisable (GL_TEXTURE_2D);	1439	glDisable (GL_TEXTURE_2D);
1324	glDisable (GL_BLEND);	1440	glDisable (GL_BLEND);
		1441	}
		1442
		1443	void
		1444	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1445	CODE:
		1446	{
		1447	static float color[16][3] = {
		1448	{ 0.00F, 0.00F, 0.00F },
		1449	{ 1.00F, 1.00F, 1.00F },
		1450	{ 0.00F, 0.00F, 0.55F },
		1451	{ 1.00F, 0.00F, 0.00F },
		1452
		1453	{ 1.00F, 0.54F, 0.00F },
		1454	{ 0.11F, 0.56F, 1.00F },
		1455	{ 0.93F, 0.46F, 0.00F },
		1456	{ 0.18F, 0.54F, 0.34F },
		1457
		1458	{ 0.56F, 0.73F, 0.56F },
		1459	{ 0.80F, 0.80F, 0.80F },
		1460	{ 0.55F, 0.41F, 0.13F },
		1461	{ 0.99F, 0.77F, 0.26F },
		1462
		1463	{ 0.74F, 0.65F, 0.41F },
		1464
		1465	{ 0.00F, 1.00F, 1.00F },
		1466	{ 1.00F, 0.00F, 1.00F },
		1467	{ 1.00F, 1.00F, 0.00F },
		1468	};
		1469
		1470	int x, y;
		1471
		1472	glEnable (GL_TEXTURE_2D);
		1473	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1474	glEnable (GL_BLEND);
		1475	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1476	glBegin (GL_QUADS);
		1477
		1478	for (y = 0; y < h; y++)
		1479	for (x = 0; x < w; x++)
		1480	{
		1481	unsigned char m = data [x + y * w];
		1482
		1483	if (m)
		1484	{
		1485	float *c = color [m & 15];
		1486
		1487	float tx1 = m & 0x40 ? 0.5 : 0.;
		1488	float tx2 = tx1 + 0.5;
		1489
		1490	glColor4f (c[0], c[1], c[2], 0.75);
		1491	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1492	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1493	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1494	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1495	}
		1496	}
		1497
		1498	glEnd ();
		1499	glDisable (GL_BLEND);
		1500	glDisable (GL_TEXTURE_2D);
		1501	}
		1502
		1503	void
		1504	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1505	PPCODE:
		1506	{
		1507	int vx, vy;
		1508	int x, y;
		1509	int sw4 = (sw + 3) & ~3;
		1510	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1511	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1512
		1513	memset (darkness, 255, sw4 * sh);
		1514	SvPOK_only (darkness_sv);
		1515	SvCUR_set (darkness_sv, sw4 * sh);
		1516
		1517	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1518	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1519
		1520	for (y = 0; y < sh; y++)
		1521	if (0 <= y + vy && y + vy < self->rows)
		1522	{
		1523	maprow *row = self->row + (y + vy);
		1524
		1525	for (x = 0; x < sw; x++)
		1526	if (row->c0 <= x + vx && x + vx < row->c1)
		1527	{
		1528	mapcell *cell = row->col + (x + vx - row->c0);
		1529
		1530	darkness[y * sw4 + x] = cell->darkness < 0
		1531	? 255 - FOW_DARKNESS
		1532	: 255 - cell->darkness;
		1533	}
		1534	}
1325		1535
1326	EXTEND (SP, 3);	1536	EXTEND (SP, 3);
1327	PUSHs (sv_2mortal (newSViv (sw4)));	1537	PUSHs (sv_2mortal (newSViv (sw4)));
1328	PUSHs (sv_2mortal (newSViv (sh)));	1538	PUSHs (sv_2mortal (newSViv (sh)));
1329	PUSHs (darkness_sv);	1539	PUSHs (darkness_sv);
1330	}	1540	}
1331		1541
1332	SV *	1542	SV *
1333	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1543	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1334	CODE:	1544	CODE:
1335	{	1545	{
1336	int x, y, x1, y1;	1546	int x, y, x1, y1;
1337	SV data_sv = newSV (w h * 7 + 5);	1547	SV data_sv = newSV (w h * 7 + 5);
1338	uint8_t data = (uint8_t )SvPVX (data_sv);	1548	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1400	}	1610	}
1401	OUTPUT:	1611	OUTPUT:
1402	RETVAL	1612	RETVAL
1403		1613
1404	void	1614	void
1405	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1615	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1406	PPCODE:	1616	PPCODE:
1407	{	1617	{
1408	int x, y, z;	1618	int x, y, z;
1409	int w, h;	1619	int w, h;
1410	int x1, y1;	1620	int x1, y1;
…		…
1459	}	1669	}
1460	}	1670	}
1461	}	1671	}
1462	}	1672	}
1463		1673
1464	MODULE = CFClient PACKAGE = CFClient::MixChunk	1674	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1465		1675
1466	CFClient::MixChunk	1676	CFPlus::MixChunk
1467	new_from_file (SV class, char path)	1677	new_from_file (SV class, char path)
1468	CODE:	1678	CODE:
1469	RETVAL = Mix_LoadWAV (path);	1679	RETVAL = Mix_LoadWAV (path);
1470	OUTPUT:	1680	OUTPUT:
1471	RETVAL	1681	RETVAL
1472		1682
1473	void	1683	void
1474	DESTROY (CFClient::MixChunk self)	1684	DESTROY (CFPlus::MixChunk self)
1475	CODE:	1685	CODE:
1476	Mix_FreeChunk (self);	1686	Mix_FreeChunk (self);
1477		1687
1478	int	1688	int
1479	volume (CFClient::MixChunk self, int volume = -1)	1689	volume (CFPlus::MixChunk self, int volume = -1)
1480	CODE:	1690	CODE:
1481	RETVAL = Mix_VolumeChunk (self, volume);	1691	RETVAL = Mix_VolumeChunk (self, volume);
1482	OUTPUT:	1692	OUTPUT:
1483	RETVAL	1693	RETVAL
1484		1694
1485	int	1695	int
1486	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1696	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1487	CODE:	1697	CODE:
1488	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1698	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1489	OUTPUT:	1699	OUTPUT:
1490	RETVAL	1700	RETVAL
1491		1701
1492	MODULE = CFClient PACKAGE = CFClient::MixMusic	1702	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1493		1703
1494	int	1704	int
1495	volume (int volume = -1)	1705	volume (int volume = -1)
1496	CODE:	1706	CODE:
1497	RETVAL = Mix_VolumeMusic (volume);	1707	RETVAL = Mix_VolumeMusic (volume);
1498	OUTPUT:	1708	OUTPUT:
1499	RETVAL	1709	RETVAL
1500		1710
1501	CFClient::MixMusic	1711	CFPlus::MixMusic
1502	new_from_file (SV class, char path)	1712	new_from_file (SV class, char path)
1503	CODE:	1713	CODE:
1504	RETVAL = Mix_LoadMUS (path);	1714	RETVAL = Mix_LoadMUS (path);
1505	OUTPUT:	1715	OUTPUT:
1506	RETVAL	1716	RETVAL
1507		1717
1508	void	1718	void
1509	DESTROY (CFClient::MixMusic self)	1719	DESTROY (CFPlus::MixMusic self)
1510	CODE:	1720	CODE:
1511	Mix_FreeMusic (self);	1721	Mix_FreeMusic (self);
1512		1722
1513	int	1723	int
1514	play (CFClient::MixMusic self, int loops = -1)	1724	play (CFPlus::MixMusic self, int loops = -1)
1515	CODE:	1725	CODE:
1516	RETVAL = Mix_PlayMusic (self, loops);	1726	RETVAL = Mix_PlayMusic (self, loops);
1517	OUTPUT:	1727	OUTPUT:
1518	RETVAL	1728	RETVAL
1519		1729
1520	MODULE = CFClient PACKAGE = CFClient::OpenGL	1730	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1521		1731
1522	BOOT:	1732	BOOT:
1523	{	1733	{
1524	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1734	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1525	static const struct {	1735	static const struct {
1526	const char *name;	1736	const char *name;
1527	IV iv;	1737	IV iv;
1528	} *civ, const_iv[] = {	1738	} *civ, const_iv[] = {
1529	# define const_iv(name) { # name, (IV)name }	1739	# define const_iv(name) { # name, (IV)name }
…		…
1536	const_iv (GL_SCISSOR_TEST),	1746	const_iv (GL_SCISSOR_TEST),
1537	const_iv (GL_DEPTH_TEST),	1747	const_iv (GL_DEPTH_TEST),
1538	const_iv (GL_ALPHA_TEST),	1748	const_iv (GL_ALPHA_TEST),
1539	const_iv (GL_NORMALIZE),	1749	const_iv (GL_NORMALIZE),
1540	const_iv (GL_RESCALE_NORMAL),	1750	const_iv (GL_RESCALE_NORMAL),
		1751	const_iv (GL_FRONT),
		1752	const_iv (GL_BACK),
1541	const_iv (GL_AND),	1753	const_iv (GL_AND),
1542	const_iv (GL_ONE),	1754	const_iv (GL_ONE),
1543	const_iv (GL_ZERO),	1755	const_iv (GL_ZERO),
1544	const_iv (GL_SRC_ALPHA),	1756	const_iv (GL_SRC_ALPHA),
1545	const_iv (GL_SRC_ALPHA_SATURATE),	1757	const_iv (GL_DST_ALPHA),
1546	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1758	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1547	const_iv (GL_ONE_MINUS_DST_ALPHA),	1759	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1760	const_iv (GL_SRC_ALPHA_SATURATE),
1548	const_iv (GL_RGB),	1761	const_iv (GL_RGB),
1549	const_iv (GL_RGBA),	1762	const_iv (GL_RGBA),
		1763	const_iv (GL_RGBA4),
		1764	const_iv (GL_RGBA8),
		1765	const_iv (GL_RGB5_A1),
1550	const_iv (GL_UNSIGNED_BYTE),	1766	const_iv (GL_UNSIGNED_BYTE),
1551	const_iv (GL_UNSIGNED_SHORT),	1767	const_iv (GL_UNSIGNED_SHORT),
1552	const_iv (GL_UNSIGNED_INT),	1768	const_iv (GL_UNSIGNED_INT),
1553	const_iv (GL_ALPHA),	1769	const_iv (GL_ALPHA),
1554	const_iv (GL_INTENSITY),	1770	const_iv (GL_INTENSITY),
…		…
1563	const_iv (GL_TEXTURE_MAG_FILTER),	1779	const_iv (GL_TEXTURE_MAG_FILTER),
1564	const_iv (GL_TEXTURE_MIN_FILTER),	1780	const_iv (GL_TEXTURE_MIN_FILTER),
1565	const_iv (GL_TEXTURE_ENV_MODE),	1781	const_iv (GL_TEXTURE_ENV_MODE),
1566	const_iv (GL_TEXTURE_WRAP_S),	1782	const_iv (GL_TEXTURE_WRAP_S),
1567	const_iv (GL_TEXTURE_WRAP_T),	1783	const_iv (GL_TEXTURE_WRAP_T),
		1784	const_iv (GL_REPEAT),
1568	const_iv (GL_CLAMP),	1785	const_iv (GL_CLAMP),
1569	const_iv (GL_REPEAT),	1786	const_iv (GL_CLAMP_TO_EDGE),
1570	const_iv (GL_NEAREST),	1787	const_iv (GL_NEAREST),
1571	const_iv (GL_LINEAR),	1788	const_iv (GL_LINEAR),
1572	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1789	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1573	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1790	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1574	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1791	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1604		1821
1605	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1822	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1606	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1823	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1607	}	1824	}
1608		1825
		1826	char *
		1827	gl_vendor ()
		1828	CODE:
		1829	RETVAL = (char *)glGetString (GL_VENDOR);
		1830	OUTPUT:
		1831	RETVAL
		1832
		1833	char *
		1834	gl_version ()
		1835	CODE:
		1836	RETVAL = (char *)glGetString (GL_VERSION);
		1837	OUTPUT:
		1838	RETVAL
		1839
		1840	char *
		1841	gl_extensions ()
		1842	CODE:
		1843	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1844	OUTPUT:
		1845	RETVAL
		1846
1609	int glGetError ()	1847	int glGetError ()
		1848
		1849	void glFinish ()
1610		1850
1611	void glClear (int mask)	1851	void glClear (int mask)
1612		1852
1613	void glClearColor (float r, float g, float b, float a = 1.0)	1853	void glClearColor (float r, float g, float b, float a = 1.0)
1614	PROTOTYPE: @	1854	PROTOTYPE: @
…		…
1621		1861
1622	void glHint (int target, int mode)	1862	void glHint (int target, int mode)
1623		1863
1624	void glBlendFunc (int sfactor, int dfactor)	1864	void glBlendFunc (int sfactor, int dfactor)
1625		1865
		1866	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1867	CODE:
		1868	gl_BlendFuncSeparate (sa, da, saa, daa);
		1869
1626	void glDepthMask (int flag)	1870	void glDepthMask (int flag)
1627		1871
1628	void glLogicOp (int opcode)	1872	void glLogicOp (int opcode)
1629		1873
1630	void glColorMask (int red, int green, int blue, int alpha)	1874	void glColorMask (int red, int green, int blue, int alpha)
…		…
1634	void glPushMatrix ()	1878	void glPushMatrix ()
1635		1879
1636	void glPopMatrix ()	1880	void glPopMatrix ()
1637		1881
1638	void glLoadIdentity ()	1882	void glLoadIdentity ()
		1883
		1884	void glDrawBuffer (int buffer)
		1885
		1886	void glReadBuffer (int buffer)
1639		1887
1640	# near_ and far_ are due to microsofts buggy "c" compiler	1888	# near_ and far_ are due to microsofts buggy "c" compiler
1641	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1889	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1642		1890
1643	# near_ and far_ are due to microsofts buggy "c" compiler	1891	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1663		1911
1664	void glEnd ()	1912	void glEnd ()
1665		1913
1666	void glColor (float r, float g, float b, float a = 1.0)	1914	void glColor (float r, float g, float b, float a = 1.0)
1667	PROTOTYPE: @	1915	PROTOTYPE: @
		1916	ALIAS:
		1917	glColor_premultiply = 1
1668	CODE:	1918	CODE:
		1919	if (ix)
		1920	{
		1921	r *= a;
		1922	g *= a;
		1923	b *= a;
		1924	}
1669	// microsoft visual "c" rounds instead of truncating...	1925	// microsoft visual "c" rounds instead of truncating...
1670	glColor4ub (MIN ((int)(r * 255.f), 255),	1926	glColor4f (r, g, b, a);
1671	MIN ((int)(g * 255.f), 255),
1672	MIN ((int)(b * 255.f), 255),
1673	MIN ((int)(a * 255.f), 255));
1674		1927
1675	void glInterleavedArrays (int format, int stride, char *data)	1928	void glInterleavedArrays (int format, int stride, char *data)
1676		1929
1677	void glDrawElements (int mode, int count, int type, char *indices)	1930	void glDrawElements (int mode, int count, int type, char *indices)
1678		1931
1679	# 1.2 void glDrawRangeElements (int mode, int start, int end	1932	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1933
		1934	void glRasterPos (float x, float y, float z = 0.)
		1935	CODE:
		1936	glRasterPos3f (0, 0, z);
		1937	glBitmap (0, 0, 0, 0, x, y, 0);
1680		1938
1681	void glVertex (float x, float y, float z = 0.)	1939	void glVertex (float x, float y, float z = 0.)
1682	CODE:	1940	CODE:
1683	glVertex3f (x, y, z);	1941	glVertex3f (x, y, z);
1684		1942
…		…
1696		1954
1697	void glBindTexture (int target, int name)	1955	void glBindTexture (int target, int name)
1698		1956
1699	void glConvolutionParameter (int target, int pname, float params)	1957	void glConvolutionParameter (int target, int pname, float params)
1700	CODE:	1958	CODE:
1701	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1959	if (gl.ConvolutionParameterf)
		1960	gl.ConvolutionParameterf (target, pname, params);
1702		1961
1703	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1962	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1704	CODE:	1963	CODE:
1705	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1964	if (gl.ConvolutionFilter2D)
1706	(target, internalformat, width, height, format, type, data));	1965	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1707		1966
1708	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1967	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1709	CODE:	1968	CODE:
1710	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1969	if (gl.SeparableFilter2D)
1711	(target, internalformat, width, height, format, type, row, column));	1970	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1712		1971
1713	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1972	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1714		1973
1715	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1974	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1716		1975
1717	void glRasterPos (int x, int y)	1976	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1718	CODE:
1719	glRasterPos2i (x, y);
1720		1977
1721	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1978	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1722		1979
1723	int glGenTexture ()	1980	int glGenTexture ()
1724	CODE:	1981	CODE:

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.90 by root, Sun May 21 00:34:58 2006 UTC vs. Revision 1.134 by root, Fri Aug 4 16:49:58 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.90 by root, Sun May 21 00:34:58 2006 UTC vs.
Revision 1.134 by root, Fri Aug 4 16:49:58 2006 UTC