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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.92 by elmex, Tue May 23 17:30:18 2006 UTC vs.
Revision 1.133 by root, Sun Jul 30 13:16:44 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.92 by elmex, Tue May 23 17:30:18 2006 UTC vs. Revision 1.133 by root, Sun Jul 30 13:16:44 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.92 by elmex, Tue May 23 17:30:18 2006 UTC vs.
Revision 1.133 by root, Sun Jul 30 13:16:44 2006 UTC