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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.75 by root, Mon May 8 18:28:40 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
		3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2	# include <malloc.h>	4	# include <malloc.h>
		5	# include <windows.h>
3	# pragma warning(disable:4244)	6	# pragma warning(disable:4244)
4	#endif	7	#endif
5		8
6	#include "EXTERN.h"	9	#include "EXTERN.h"
7	#include "perl.h"	10	#include "perl.h"
8	#include "XSUB.h"	11	#include "XSUB.h"
9		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
		17	#include <math.h>
10	#include <string.h>	18	#include <string.h>
11	#include <stdio.h>	19	#include <stdio.h>
		20	#include <stdlib.h>
12		21
13	#include <SDL.h>	22	#include <SDL.h>
		23	#include <SDL_endian.h>
14	#include <SDL_image.h>	24	#include <SDL_image.h>
15	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
16	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
17		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
18	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
19		32
20	#include <pango/pango.h>	33	#include <pango/pango.h>
21	#include <pango/pangofc-fontmap.h>
22	#include <pango/pangoft2.h>
23		34
24	#ifndef _WIN32	35	#ifndef _WIN32
25	# include <sys/types.h>	36	# include <sys/types.h>
26	# include <sys/socket.h>	37	# include <sys/socket.h>
27	# include <netinet/in.h>	38	# include <netinet/in.h>
34	typedef signed char int8_t;	45	typedef signed char int8_t;
35	typedef signed short int16_t;	46	typedef signed short int16_t;
36	typedef signed int int32_t;	47	typedef signed int int32_t;
37	#endif	48	#endif
38		49
39	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
40		51
41	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
42		53
43	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
44	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
45		56
46	#define MIN_FONT_HEIGHT 10	57	#define MIN_FONT_HEIGHT 10
47		58
48	#define GL_CALL(type,func,args) \	59	#if 0
49	{ \	60	# define PARACHUTE SDL_INIT_NOPARACHUTE
50	static int init_; \	61	#else
51	static type fptr_; \	62	# define PARACHUTE 0
52	\	63	#endif
53	if (!init_) \
54	{ \
55	init_ = 1; \
56	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
57	} \
58	\
59	if (fptr_) \
60	fptr_ args; \
61	}
62		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
63	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
64	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
65		90
66	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	}
67		110
68	typedef struct cf_layout {	111	typedef struct cf_layout {
69	PangoLayout *pl;	112	PangoLayout *pl;
		113	float r, g, b, a; // default color for rgba mode
70	int base_height;	114	int base_height;
71	CFClient__Font font;	115	CFPlus__Font font;
72	} *CFClient__Layout;	116	} *CFPlus__Layout;
73		117
74	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
75	static PangoContext *context;	119	static PangoContext *opengl_context;
76	static PangoFontMap *fontmap;	120	static PangoFontMap *opengl_fontmap;
77		121
78	static void	122	static void
79	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
80	{	124	{
81	FcPatternAddBool (pattern, FC_HINTING , 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
		126	#ifdef FC_HINT_STYLE
		127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		128	#endif
82	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
83	}	130	}
84		131
85	static void	132	static void
86	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
87	{	134	{
88	/* 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
89	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
90	*/	137	*/
91	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
95		142
96	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
97	}	144	}
98		145
99	static void	146	static void
100	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
101	{	148	{
102	pango_layout_get_pixel_size (self->pl, w, h);	149	pango_layout_get_pixel_size (self->pl, w, h);
103		150
104	w = (w + 3) & ~3;
105	if (!w) w = 1;	151	if (!w) w = 1;
106	if (!h) h = 1;	152	if (!h) h = 1;
		153
		154	w = (w + 3) & ~3;
107	}	155	}
108		156
109	typedef uint16_t mapface;	157	typedef uint16_t mapface;
110		158
111	typedef struct {	159	typedef struct {
…		…
134	int texs;	182	int texs;
135	maptex *tex;	183	maptex *tex;
136		184
137	int32_t rows;	185	int32_t rows;
138	maprow *row;	186	maprow *row;
139	} *CFClient__Map;	187	} *CFPlus__Map;
140		188
141	static char *	189	static char *
142	prepend (char *ptr, int sze, int inc)	190	prepend (char *ptr, int sze, int inc)
143	{	191	{
144	char *p;	192	char *p;
…		…
162		210
163	#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))
164	#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))
165		213
166	static maprow *	214	static maprow *
167	map_get_row (CFClient__Map self, int y)	215	map_get_row (CFPlus__Map self, int y)
168	{	216	{
169	if (0 > y)	217	if (0 > y)
170	{	218	{
171	int extend = - y + MAP_EXTEND_Y;	219	int extend = - y + MAP_EXTEND_Y;
172	Prepend (maprow, self->row, self->rows, extend);	220	Prepend (maprow, self->row, self->rows, extend);
…		…
210		258
211	return row->col + (x - row->c0);	259	return row->col + (x - row->c0);
212	}	260	}
213		261
214	static mapcell *	262	static mapcell *
215	map_get_cell (CFClient__Map self, int x, int y)	263	map_get_cell (CFPlus__Map self, int x, int y)
216	{	264	{
217	return row_get_cell (map_get_row (self, y), x);	265	return row_get_cell (map_get_row (self, y), x);
218	}	266	}
219		267
220	static void	268	static void
221	map_clear (CFClient__Map self)	269	map_clear (CFPlus__Map self)
222	{	270	{
223	int r;	271	int r;
224		272
225	for (r = 0; r < self->rows; r++)	273	for (r = 0; r < self->rows; r++)
226	Safefree (self->row[r].col);	274	Safefree (self->row[r].col);
…		…
234	self->row = 0;	282	self->row = 0;
235	self->rows = 0;	283	self->rows = 0;
236	}	284	}
237		285
238	static void	286	static void
239	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)
240	{	288	{
241	int x, y;	289	int x, y;
242	maprow *row;	290	maprow *row;
243		291
244	for (y = y0; y < y0 + h; y++)	292	for (y = y0; y < y0 + h; y++)
…		…
284	ev.data2 = 0;	332	ev.data2 = 0;
285		333
286	SDL_PushEvent ((SDL_Event *)&ev);	334	SDL_PushEvent ((SDL_Event *)&ev);
287	}	335	}
288		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
289	MODULE = CFClient PACKAGE = CFClient	354	MODULE = CFPlus PACKAGE = CFPlus
290		355
291	PROTOTYPES: ENABLE	356	PROTOTYPES: ENABLE
292		357
293	BOOT:	358	BOOT:
294	{	359	{
295	HV *stash = gv_stashpv ("CFClient", 1);	360	HV *stash = gv_stashpv ("CFPlus", 1);
296	static const struct {	361	static const struct {
297	const char *name;	362	const char *name;
298	IV iv;	363	IV iv;
299	} *civ, const_iv[] = {	364	} *civ, const_iv[] = {
300	# define const_iv(name) { # name, (IV)name }	365	# define const_iv(name) { # name, (IV)name }
…		…
399	# undef const_iv	464	# undef const_iv
400	};	465	};
401		466
402	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; )
403	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	468	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
404
405	fontmap = pango_ft2_font_map_new ();
406	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
407	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
408	}	469	}
409		470
410	int	471	int
		472	in_destruct ()
		473	CODE:
		474	RETVAL = PL_main_cv == Nullcv;
		475	OUTPUT:
		476	RETVAL
		477
		478	NV floor (NV x)
		479
		480	NV ceil (NV x)
		481
		482	void
		483	pango_init ()
		484	CODE:
		485	{
		486	opengl_fontmap = pango_opengl_font_map_new ();
		487	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
		488	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		489	}
		490
		491	int
411	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	492	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
412		493
413	void	494	void
414	SDL_Quit ()	495	SDL_Quit ()
415		496
416	void	497	void
…		…
422	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	503	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
423	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	504	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
424	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	505	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
425	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	506	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
426		507
		508	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		509	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		510
427	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	511	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
428	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	512	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
429	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	513	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
430	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	514	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
431		515
432	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	516	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		517	#if SDL_VERSION_ATLEAST(1,2,10)
433	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	518	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
434	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	519	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		520	#endif
435		521
436	SDL_EnableUNICODE (1);	522	SDL_EnableUNICODE (1);
437	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	523	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
438		524
439	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	525	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
448		534
449	++m;	535	++m;
450	}	536	}
451	}	537	}
452		538
		539	char *
		540	SDL_GetError ()
		541
453	int	542	int
454	SDL_SetVideoMode (int w, int h, int fullscreen)	543	SDL_SetVideoMode (int w, int h, int fullscreen)
455	CODE:	544	CODE:
456	RETVAL = !!SDL_SetVideoMode (	545	RETVAL = !!SDL_SetVideoMode (
457	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	546	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
458	);	547	);
		548	if (RETVAL)
		549	{
459	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	}
460	OUTPUT:	555	OUTPUT:
461	RETVAL	556	RETVAL
462		557
463	void	558	void
464	SDL_GL_SwapBuffers ()	559	SDL_GL_SwapBuffers ()
		560
		561	char *
		562	SDL_GetKeyName (int sym)
465		563
466	void	564	void
467	SDL_PollEvent ()	565	SDL_PollEvent ()
468	PPCODE:	566	PPCODE:
469	{	567	{
…		…
488	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	586	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
489	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	587	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
490	break;	588	break;
491		589
492	case SDL_MOUSEMOTION:	590	case SDL_MOUSEMOTION:
		591	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		592
493	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	593	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
494	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	594	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
495	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	595	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
496	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	596	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
497	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	597	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
498	break;	598	break;
499		599
500	case SDL_MOUSEBUTTONDOWN:	600	case SDL_MOUSEBUTTONDOWN:
501	case SDL_MOUSEBUTTONUP:	601	case SDL_MOUSEBUTTONUP:
		602	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		603
502	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	604	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
503	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	605	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
504	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	606	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
505	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	607	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
506	break;	608	break;
…		…
510	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	612	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
511	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	613	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
512	break;	614	break;
513	}	615	}
514		616
515	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	617	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
516	}	618	}
517	}	619	}
518		620
519	int	621	int
520	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)
…		…
533	CODE:	635	CODE:
534	#ifndef _WIN32	636	#ifndef _WIN32
535	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	637	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
536	#endif	638	#endif
537		639
538	char *
539	gl_version ()
540	CODE:
541	RETVAL = (char *)glGetString (GL_VERSION);
542	OUTPUT:
543	RETVAL
544
545	char *
546	gl_extensions ()
547	CODE:
548	RETVAL = (char *)glGetString (GL_EXTENSIONS);
549	OUTPUT:
550	RETVAL
551
552	void	640	void
553	add_font (char *file)	641	add_font (char *file)
554	CODE:	642	CODE:
555	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	643	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
556		644
557	void	645	void
558	load_image_inline (SV *image_)	646	load_image_inline (SV *image_)
559	ALIAS:	647	ALIAS:
560	load_image_file = 1	648	load_image_file = 1
…		…
602		690
603	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	691	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
604		692
605	assert (surface2->pitch == surface2->w * 4);	693	assert (surface2->pitch == surface2->w * 4);
606		694
		695	SDL_LockSurface (surface2);
607	EXTEND (SP, 5);	696	EXTEND (SP, 6);
608	PUSHs (sv_2mortal (newSViv (surface2->w)));	697	PUSHs (sv_2mortal (newSViv (surface2->w)));
609	PUSHs (sv_2mortal (newSViv (surface2->h)));	698	PUSHs (sv_2mortal (newSViv (surface2->h)));
610	SDL_LockSurface (surface2);
611	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	699	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
612	SDL_UnlockSurface (surface2);
613	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)));
614	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	701	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
615	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	702	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		703	SDL_UnlockSurface (surface2);
616		704
617	SDL_FreeSurface (surface);	705	SDL_FreeSurface (surface);
618	SDL_FreeSurface (surface2);	706	SDL_FreeSurface (surface2);
619	}	707	}
620		708
…		…
644	}	732	}
645		733
646	void	734	void
647	error (char *message)	735	error (char *message)
648	CODE:	736	CODE:
		737	fprintf (stderr, "ERROR: %s\n", message);
649	#ifdef _WIN32	738	#ifdef _WIN32
650	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	739	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
651	#else
652	fprintf (stderr, "ERROR: %s\n", message);
653	#endif	740	#endif
654		741
655	void	742	void
656	fatal (char *message)	743	fatal (char *message)
657	CODE:	744	CODE:
		745	fprintf (stderr, "FATAL: %s\n", message);
658	#ifdef _WIN32	746	#ifdef _WIN32
659	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	747	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
660	#else
661	fprintf (stderr, "FATAL: %s\n", message);
662	#endif	748	#endif
663	exit (1);	749	_exit (1);
664		750
		751	void
		752	_exit (int retval)
		753	CODE:
		754	_exit (retval);
		755
665	MODULE = CFClient PACKAGE = CFClient::Font	756	MODULE = CFPlus PACKAGE = CFPlus::Font
666		757
667	CFClient::Font	758	CFPlus::Font
668	new_from_file (SV class, char path, int id = 0)	759	new_from_file (SV class, char path, int id = 0)
669	CODE:	760	CODE:
670	{	761	{
671	int count;	762	int count;
672	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	763	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
675	}	766	}
676	OUTPUT:	767	OUTPUT:
677	RETVAL	768	RETVAL
678		769
679	void	770	void
680	DESTROY (CFClient::Font self)	771	DESTROY (CFPlus::Font self)
681	CODE:	772	CODE:
682	pango_font_description_free (self);	773	pango_font_description_free (self);
683		774
684	void	775	void
685	make_default (CFClient::Font self)	776	make_default (CFPlus::Font self)
686	CODE:	777	CODE:
687	default_font = self;	778	default_font = self;
688		779
689	MODULE = CFClient PACKAGE = CFClient::Layout	780	MODULE = CFPlus PACKAGE = CFPlus::Layout
690		781
691	CFClient::Layout	782	void
692	new (SV *class, int base_height = MIN_FONT_HEIGHT)	783	reset_glyph_cache ()
		784	CODE:
		785	tc_clear ();
		786
		787	CFPlus::Layout
		788	new (SV *class)
693	CODE:	789	CODE:
694	New (0, RETVAL, 1, struct cf_layout);	790	New (0, RETVAL, 1, struct cf_layout);
		791
695	RETVAL->pl = pango_layout_new (context);	792	RETVAL->pl = pango_layout_new (opengl_context);
696	RETVAL->base_height = base_height;	793	RETVAL->r = 1.;
		794	RETVAL->g = 1.;
		795	RETVAL->b = 1.;
		796	RETVAL->a = 1.;
		797	RETVAL->base_height = MIN_FONT_HEIGHT;
697	RETVAL->font = 0;	798	RETVAL->font = 0;
		799
698	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	800	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
699	pango_layout_set_font_description (RETVAL->pl, default_font);	801	layout_update_font (RETVAL);
700	OUTPUT:	802	OUTPUT:
701	RETVAL	803	RETVAL
702		804
703	void	805	void
704	DESTROY (CFClient::Layout self)	806	DESTROY (CFPlus::Layout self)
705	CODE:	807	CODE:
706	g_object_unref (self->pl);	808	g_object_unref (self->pl);
707	Safefree (self);	809	Safefree (self);
708		810
709	void	811	void
710	set_text (CFClient::Layout self, SV *text_)	812	set_text (CFPlus::Layout self, SV *text_)
711	CODE:	813	CODE:
712	{	814	{
713	STRLEN textlen;	815	STRLEN textlen;
714	char *text = SvPVutf8 (text_, textlen);	816	char *text = SvPVutf8 (text_, textlen);
715		817
716	pango_layout_set_text (self->pl, text, textlen);	818	pango_layout_set_text (self->pl, text, textlen);
717	}	819	}
718		820
719	void	821	void
720	set_markup (CFClient::Layout self, SV *text_)	822	set_markup (CFPlus::Layout self, SV *text_)
721	CODE:	823	CODE:
722	{	824	{
723	STRLEN textlen;	825	STRLEN textlen;
724	char *text = SvPVutf8 (text_, textlen);	826	char *text = SvPVutf8 (text_, textlen);
725		827
726	pango_layout_set_markup (self->pl, text, textlen);	828	pango_layout_set_markup (self->pl, text, textlen);
727	}	829	}
728		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
729	SV *	916	SV *
730	get_text (CFClient::Layout self)	917	get_text (CFPlus::Layout self)
731	CODE:	918	CODE:
732	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	919	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
733	SvUTF8_on (RETVAL);	920	sv_utf8_decode (RETVAL);
734	OUTPUT:	921	OUTPUT:
735	RETVAL	922	RETVAL
736		923
737	void	924	void
		925	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
		926	CODE:
		927	self->r = r;
		928	self->g = g;
		929	self->b = b;
		930	self->a = a;
		931
		932	void
738	set_font (CFClient::Layout self, CFClient::Font font = 0)	933	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
739	CODE:	934	CODE:
740	if (self->font != font)	935	if (self->font != font)
741	{	936	{
742	self->font = font;	937	self->font = font;
743	layout_update_font (self);	938	layout_update_font (self);
744	}	939	}
745		940
746	void	941	void
747	set_height (CFClient::Layout self, int base_height)	942	set_height (CFPlus::Layout self, int base_height)
748	CODE:	943	CODE:
749	if (self->base_height != base_height)	944	if (self->base_height != base_height)
750	{	945	{
751	self->base_height = base_height;	946	self->base_height = base_height;
752	layout_update_font (self);	947	layout_update_font (self);
753	}	948	}
754		949
755	void	950	void
756	set_width (CFClient::Layout self, int max_width = -1)	951	set_width (CFPlus::Layout self, int max_width = -1)
757	CODE:	952	CODE:
758	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);
759		954
760	void	955	void
		956	set_indent (CFPlus::Layout self, int indent)
		957	CODE:
		958	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		959
		960	void
		961	set_spacing (CFPlus::Layout self, int spacing)
		962	CODE:
		963	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		964
		965	void
		966	set_ellipsise (CFPlus::Layout self, int ellipsise)
		967	CODE:
		968	pango_layout_set_ellipsize (self->pl,
		969	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		970	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		971	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		972	: PANGO_ELLIPSIZE_NONE
		973	);
		974
		975	void
		976	set_single_paragraph_mode (CFPlus::Layout self, int spm)
		977	CODE:
		978	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		979
		980	void
761	size (CFClient::Layout self)	981	size (CFPlus::Layout self)
762	PPCODE:	982	PPCODE:
763	{	983	{
764	int w, h;	984	int w, h;
765		985
766	layout_get_pixel_size (self, &w, &h);	986	layout_get_pixel_size (self, &w, &h);
…		…
769	PUSHs (sv_2mortal (newSViv (w)));	989	PUSHs (sv_2mortal (newSViv (w)));
770	PUSHs (sv_2mortal (newSViv (h)));	990	PUSHs (sv_2mortal (newSViv (h)));
771	}	991	}
772		992
773	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
774	xy_to_index (CFClient::Layout self, int x, int y)	1006	xy_to_index (CFPlus::Layout self, int x, int y)
775	CODE:	1007	CODE:
776	{	1008	{
777	int index, trailing;	1009	int index, trailing;
778	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);
779	RETVAL = index;	1011	RETVAL = index;
780	}	1012	}
781	OUTPUT:	1013	OUTPUT:
782	RETVAL	1014	RETVAL
783		1015
784	void	1016	void
785	cursor_pos (CFClient::Layout self, int index)	1017	cursor_pos (CFPlus::Layout self, int index)
786	PPCODE:	1018	PPCODE:
787	{	1019	{
788	PangoRectangle strong_pos;	1020	PangoRectangle strong_pos;
789	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1021	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
790		1022
…		…
793	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1025	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
794	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1026	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
795	}	1027	}
796		1028
797	void	1029	void
798	render (CFClient::Layout self)	1030	render (CFPlus::Layout self, float x, float y)
799	PPCODE:	1031	PPCODE:
800	{	1032	pango_opengl_render_layout_subpixel (
801	SV *retval;	1033	self->pl,
802	int w, h;	1034	x * PANGO_SCALE, y * PANGO_SCALE,
803	FT_Bitmap bitmap;	1035	self->r, self->g, self->b, self->a
		1036	);
804		1037
805	layout_get_pixel_size (self, &w, &h);	1038	MODULE = CFPlus PACKAGE = CFPlus::Texture
806		1039
807	retval = newSV (w * h);	1040	void
808	SvPOK_only (retval);	1041	pad2pot (SV data_, SV w_, SV *h_)
809	SvCUR_set (retval, w * h);	1042	CODE:
		1043	{
		1044	int ow = SvIV (w_);
		1045	int oh = SvIV (h_);
810		1046
811	bitmap.rows = h;	1047	if (ow && oh)
812	bitmap.width = w;	1048	{
813	bitmap.pitch = w;	1049	int nw = minpot (ow);
814	bitmap.buffer = (unsigned char*)SvPVX (retval);	1050	int nh = minpot (oh);
815	bitmap.num_grays = 256;
816	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
817		1051
818	memset (bitmap.buffer, 0, w * h);	1052	if (nw != ow \|\| nh != oh)
819		1053	{
820	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	1054	if (SvOK (data_))
		1055	{
		1056	STRLEN datalen;
		1057	char *data = SvPVbyte (data_, datalen);
		1058	int bpp = datalen / (ow * oh);
		1059	SV result_ = sv_2mortal (newSV (nw nh * bpp));
821		1060
822	EXTEND (SP, 3);	1061	SvPOK_only (result_);
823	PUSHs (sv_2mortal (newSViv (w)));	1062	SvCUR_set (result_, nw * nh * bpp);
824	PUSHs (sv_2mortal (newSViv (h)));
825	PUSHs (sv_2mortal (retval));
826	}
827		1063
828	MODULE = CFClient PACKAGE = CFClient::Texture	1064	memset (SvPVX (result_), 0, nw * nh * bpp);
		1065	while (oh--)
		1066	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
829		1067
		1068	sv_setsv (data_, result_);
		1069	}
		1070
		1071	sv_setiv (w_, nw);
		1072	sv_setiv (h_, nh);
		1073	}
		1074	}
		1075	}
		1076
830	void	1077	void
831	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.)
832	PROTOTYPE: $$$;$$	1079	PROTOTYPE: $$$;$$
		1080	ALIAS:
		1081	draw_quad_alpha = 1
		1082	draw_quad_alpha_premultiplied = 2
833	CODE:	1083	CODE:
834	{	1084	{
835	HV hv = (HV )SvRV (self);	1085	HV hv = (HV )SvRV (self);
836	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1086	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
837	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1087	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
838	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1088	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
839	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
840		1089
841	if (items < 5)	1090	if (items < 5)
842	{	1091	{
843	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1092	w = SvNV (*hv_fetch (hv, "w", 1, 1));
844	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1093	h = SvNV (*hv_fetch (hv, "h", 1, 1));
845	}	1094	}
846		1095
		1096	if (ix)
		1097	{
		1098	glEnable (GL_BLEND);
		1099
		1100	if (ix == 2)
		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
		1106	glEnable (GL_ALPHA_TEST);
		1107	glAlphaFunc (GL_GREATER, 0.01f);
		1108	}
		1109
847	glBindTexture (GL_TEXTURE_2D, name);	1110	glBindTexture (GL_TEXTURE_2D, name);
848	if (wrap_mode) {	1111
849	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
850	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
851	}
852	glBegin (GL_QUADS);	1112	glBegin (GL_QUADS);
853	glTexCoord2f (0, 0); glVertex2f (x , y );	1113	glTexCoord2f (0, 0); glVertex2f (x , y );
854	glTexCoord2f (0, t); glVertex2f (x , y + h);	1114	glTexCoord2f (0, t); glVertex2f (x , y + h);
855	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1115	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
856	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1116	glTexCoord2f (s, 0); glVertex2f (x + w, y );
857	glEnd ();	1117	glEnd ();
858	}
859		1118
		1119	if (ix)
		1120	{
		1121	glDisable (GL_ALPHA_TEST);
		1122	glDisable (GL_BLEND);
		1123	}
		1124	}
		1125
860	MODULE = CFClient PACKAGE = CFClient::Map	1126	MODULE = CFPlus PACKAGE = CFPlus::Map
861		1127
862	CFClient::Map	1128	CFPlus::Map
863	new (SV *class, int map_width, int map_height)	1129	new (SV *class, int map_width, int map_height)
864	CODE:	1130	CODE:
865	New (0, RETVAL, 1, struct map);	1131	New (0, RETVAL, 1, struct map);
866	RETVAL->x = 0;	1132	RETVAL->x = 0;
867	RETVAL->y = 0;	1133	RETVAL->y = 0;
…		…
877	RETVAL->row = 0;	1143	RETVAL->row = 0;
878	OUTPUT:	1144	OUTPUT:
879	RETVAL	1145	RETVAL
880		1146
881	void	1147	void
882	DESTROY (CFClient::Map self)	1148	DESTROY (CFPlus::Map self)
883	CODE:	1149	CODE:
884	{	1150	{
885	map_clear (self);	1151	map_clear (self);
886	Safefree (self->face);	1152	Safefree (self->face);
		1153	Safefree (self->tex);
887	Safefree (self);	1154	Safefree (self);
888	}	1155	}
889		1156
890	void	1157	void
891	clear (CFClient::Map self)	1158	clear (CFPlus::Map self)
892	CODE:	1159	CODE:
893	map_clear (self);	1160	map_clear (self);
894		1161
895	void	1162	void
896	set_face (CFClient::Map self, int face, int texid)	1163	set_face (CFPlus::Map self, int face, int texid)
897	CODE:	1164	CODE:
898	{	1165	{
899	while (self->faces <= face)	1166	while (self->faces <= face)
900	{	1167	{
901	Append (mapface, self->face, self->faces, self->faces);	1168	Append (mapface, self->face, self->faces, self->faces);
…		…
904		1171
905	self->face [face] = texid;	1172	self->face [face] = texid;
906	}	1173	}
907		1174
908	void	1175	void
909	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)
910	CODE:	1177	CODE:
911	{	1178	{
912	while (self->texs <= texid)	1179	while (self->texs <= texid)
913	{	1180	{
914	Append (maptex, self->tex, self->texs, self->texs);	1181	Append (maptex, self->tex, self->texs, self->texs);
…		…
926	tex->r = r;	1193	tex->r = r;
927	tex->g = g;	1194	tex->g = g;
928	tex->b = b;	1195	tex->b = b;
929	tex->a = a;	1196	tex->a = a;
930	}	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);
931	}	1207	}
932		1208
933	int	1209	int
934	ox (CFClient::Map self)	1210	ox (CFPlus::Map self)
935	ALIAS:	1211	ALIAS:
936	oy = 1	1212	oy = 1
		1213	x = 2
		1214	y = 3
		1215	w = 4
		1216	h = 5
937	CODE:	1217	CODE:
938	switch (ix)	1218	switch (ix)
939	{	1219	{
940	case 0: RETVAL = self->ox; break;	1220	case 0: RETVAL = self->ox; break;
941	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;
942	}	1226	}
943	OUTPUT:	1227	OUTPUT:
944	RETVAL	1228	RETVAL
945		1229
946	void	1230	void
947	scroll (CFClient::Map self, int dx, int dy)	1231	scroll (CFPlus::Map self, int dx, int dy)
948	CODE:	1232	CODE:
949	{	1233	{
950	if (dx > 0)	1234	if (dx > 0)
951	map_blank (self, self->x, self->y, dx - 1, self->h);	1235	map_blank (self, self->x, self->y, dx - 1, self->h);
952	else if (dx < 0)	1236	else if (dx < 0)
…		…
968	self->y += MAP_EXTEND_Y;	1252	self->y += MAP_EXTEND_Y;
969	}	1253	}
970	}	1254	}
971		1255
972	void	1256	void
973	map1a_update (CFClient::Map self, SV *data_)	1257	map1a_update (CFPlus::Map self, SV *data_)
974	CODE:	1258	CODE:
975	{	1259	{
976	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1260	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
977	uint8_t data_end = (uint8_t )SvEND (data_);	1261	uint8_t data_end = (uint8_t )SvEND (data_);
978	mapcell *cell;	1262	mapcell *cell;
…		…
980		1264
981	while (data < data_end)	1265	while (data < data_end)
982	{	1266	{
983	flags = (data [0] << 8) + data [1]; data += 2;	1267	flags = (data [0] << 8) + data [1]; data += 2;
984		1268
985	x = ((flags >> 10) & 63) + self->x;	1269	x = self->x + ((flags >> 10) & 63);
986	y = ((flags >> 4) & 63) + self->y;	1270	y = self->y + ((flags >> 4) & 63);
987		1271
988	cell = map_get_cell (self, x, y);	1272	cell = map_get_cell (self, x, y);
989		1273
990	if (flags & 15)	1274	if (flags & 15)
991	{	1275	{
…		…
1020	cell->darkness = -1;	1304	cell->darkness = -1;
1021	}	1305	}
1022	}	1306	}
1023		1307
1024	SV *	1308	SV *
1025	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)
1026	CODE:	1310	CODE:
1027	{	1311	{
1028	int x1, x;	1312	int x1, x;
1029	int y1, y;	1313	int y1, y;
1030	int z;	1314	int z;
…		…
1080	}	1364	}
1081	OUTPUT:	1365	OUTPUT:
1082	RETVAL	1366	RETVAL
1083		1367
1084	void	1368	void
1085	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)
1086	PPCODE:	1370	CODE:
1087	{	1371	{
1088	int vx, vy;	1372	int vx, vy;
1089	int x, y, z;	1373	int x, y, z;
1090	int last_name;	1374	int last_name;
1091	mapface face;	1375	mapface face;
1092	int sw4 = (sw + 3) & ~3;
1093	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1094	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1095		1376
1096	memset (darkness, 255, sw4 * sh);
1097	SvPOK_only (darkness_sv);
1098	SvCUR_set (darkness_sv, sw4 * sh);
1099
1100	vx = self->x + (self->w - sw) / 2 - shift_x;	1377	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1101	vy = self->y + (self->h - sh) / 2 - shift_y;	1378	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1102		1379
1103	/*	1380	/*
1104	int vx = self->vx = self->w >= sw	1381	int vx = self->vx = self->w >= sw
1105	? self->x + (self->w - sw) / 2	1382	? self->x + (self->w - sw) / 2
1106	: 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));
…		…
1110	: 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));
1111	*/	1388	*/
1112		1389
1113	glColor4ub (255, 255, 255, 255);	1390	glColor4ub (255, 255, 255, 255);
1114		1391
		1392	glEnable (GL_BLEND);
1115	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1393	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1116	glEnable (GL_BLEND);
1117	glEnable (GL_TEXTURE_2D);	1394	glEnable (GL_TEXTURE_2D);
1118	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1395	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1119		1396
1120	glBegin (GL_QUADS);	1397	glBegin (GL_QUADS);
1121		1398
…		…
1129		1406
1130	for (x = 0; x < sw; x++)	1407	for (x = 0; x < sw; x++)
1131	if (row->c0 <= x + vx && x + vx < row->c1)	1408	if (row->c0 <= x + vx && x + vx < row->c1)
1132	{	1409	{
1133	mapcell *cell = row->col + (x + vx - row->c0);	1410	mapcell *cell = row->col + (x + vx - row->c0);
1134
1135	darkness[y * sw4 + x] = cell->darkness < 0
1136	? 255 - FOW_DARKNESS
1137	: 255 - cell->darkness;
1138		1411
1139	face = cell->face [z];	1412	face = cell->face [z];
1140		1413
1141	if (face)	1414	if (face)
1142	{	1415	{
…		…
1163		1436
1164	glEnd ();	1437	glEnd ();
1165		1438
1166	glDisable (GL_TEXTURE_2D);	1439	glDisable (GL_TEXTURE_2D);
1167	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	}
1168		1535
1169	EXTEND (SP, 3);	1536	EXTEND (SP, 3);
1170	PUSHs (sv_2mortal (newSViv (sw4)));	1537	PUSHs (sv_2mortal (newSViv (sw4)));
1171	PUSHs (sv_2mortal (newSViv (sh)));	1538	PUSHs (sv_2mortal (newSViv (sh)));
1172	PUSHs (darkness_sv);	1539	PUSHs (darkness_sv);
1173	}	1540	}
1174		1541
1175	SV *	1542	SV *
1176	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)
1177	CODE:	1544	CODE:
1178	{	1545	{
1179	int x, y, x1, y1;	1546	int x, y, x1, y1;
1180	SV data_sv = newSV (w h * 7 + 5);	1547	SV data_sv = newSV (w h * 7 + 5);
1181	uint8_t data = (uint8_t )SvPVX (data_sv);	1548	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1243	}	1610	}
1244	OUTPUT:	1611	OUTPUT:
1245	RETVAL	1612	RETVAL
1246		1613
1247	void	1614	void
1248	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)
1249	PPCODE:	1616	PPCODE:
1250	{	1617	{
1251	int x, y, z;	1618	int x, y, z;
1252	int w, h;	1619	int w, h;
1253	int x1, y1;	1620	int x1, y1;
…		…
1302	}	1669	}
1303	}	1670	}
1304	}	1671	}
1305	}	1672	}
1306		1673
1307	MODULE = CFClient PACKAGE = CFClient::MixChunk	1674	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1308		1675
1309	CFClient::MixChunk	1676	CFPlus::MixChunk
1310	new_from_file (SV class, char path)	1677	new_from_file (SV class, char path)
1311	CODE:	1678	CODE:
1312	RETVAL = Mix_LoadWAV (path);	1679	RETVAL = Mix_LoadWAV (path);
1313	OUTPUT:	1680	OUTPUT:
1314	RETVAL	1681	RETVAL
1315		1682
1316	void	1683	void
1317	DESTROY (CFClient::MixChunk self)	1684	DESTROY (CFPlus::MixChunk self)
1318	CODE:	1685	CODE:
1319	Mix_FreeChunk (self);	1686	Mix_FreeChunk (self);
1320		1687
1321	int	1688	int
1322	volume (CFClient::MixChunk self, int volume = -1)	1689	volume (CFPlus::MixChunk self, int volume = -1)
1323	CODE:	1690	CODE:
1324	RETVAL = Mix_VolumeChunk (self, volume);	1691	RETVAL = Mix_VolumeChunk (self, volume);
1325	OUTPUT:	1692	OUTPUT:
1326	RETVAL	1693	RETVAL
1327		1694
1328	int	1695	int
1329	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)
1330	CODE:	1697	CODE:
1331	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1698	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1332	OUTPUT:	1699	OUTPUT:
1333	RETVAL	1700	RETVAL
1334		1701
1335	MODULE = CFClient PACKAGE = CFClient::MixMusic	1702	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1336		1703
1337	int	1704	int
1338	volume (int volume = -1)	1705	volume (int volume = -1)
1339	CODE:	1706	CODE:
1340	RETVAL = Mix_VolumeMusic (volume);	1707	RETVAL = Mix_VolumeMusic (volume);
1341	OUTPUT:	1708	OUTPUT:
1342	RETVAL	1709	RETVAL
1343		1710
1344	CFClient::MixMusic	1711	CFPlus::MixMusic
1345	new_from_file (SV class, char path)	1712	new_from_file (SV class, char path)
1346	CODE:	1713	CODE:
1347	RETVAL = Mix_LoadMUS (path);	1714	RETVAL = Mix_LoadMUS (path);
1348	OUTPUT:	1715	OUTPUT:
1349	RETVAL	1716	RETVAL
1350		1717
1351	void	1718	void
1352	DESTROY (CFClient::MixMusic self)	1719	DESTROY (CFPlus::MixMusic self)
1353	CODE:	1720	CODE:
1354	Mix_FreeMusic (self);	1721	Mix_FreeMusic (self);
1355		1722
1356	int	1723	int
1357	play (CFClient::MixMusic self, int loops = -1)	1724	play (CFPlus::MixMusic self, int loops = -1)
1358	CODE:	1725	CODE:
1359	RETVAL = Mix_PlayMusic (self, loops);	1726	RETVAL = Mix_PlayMusic (self, loops);
1360	OUTPUT:	1727	OUTPUT:
1361	RETVAL	1728	RETVAL
1362		1729
1363	MODULE = CFClient PACKAGE = CFClient::OpenGL	1730	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1364		1731
1365	BOOT:	1732	BOOT:
1366	{	1733	{
1367	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1734	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1368	static const struct {	1735	static const struct {
1369	const char *name;	1736	const char *name;
1370	IV iv;	1737	IV iv;
1371	} *civ, const_iv[] = {	1738	} *civ, const_iv[] = {
1372	# define const_iv(name) { # name, (IV)name }	1739	# define const_iv(name) { # name, (IV)name }
1373	const_iv (GL_COLOR_MATERIAL),	1740	const_iv (GL_COLOR_MATERIAL),
1374	const_iv (GL_SMOOTH),	1741	const_iv (GL_SMOOTH),
1375	const_iv (GL_FLAT),	1742	const_iv (GL_FLAT),
1376	const_iv (GL_DITHER),	1743	const_iv (GL_DITHER),
1377	const_iv (GL_BLEND),	1744	const_iv (GL_BLEND),
		1745	const_iv (GL_CULL_FACE),
1378	const_iv (GL_SCISSOR_TEST),	1746	const_iv (GL_SCISSOR_TEST),
		1747	const_iv (GL_DEPTH_TEST),
		1748	const_iv (GL_ALPHA_TEST),
		1749	const_iv (GL_NORMALIZE),
		1750	const_iv (GL_RESCALE_NORMAL),
		1751	const_iv (GL_FRONT),
		1752	const_iv (GL_BACK),
1379	const_iv (GL_AND),	1753	const_iv (GL_AND),
1380	const_iv (GL_ONE),	1754	const_iv (GL_ONE),
1381	const_iv (GL_ZERO),	1755	const_iv (GL_ZERO),
1382	const_iv (GL_SRC_ALPHA),	1756	const_iv (GL_SRC_ALPHA),
1383	const_iv (GL_SRC_ALPHA_SATURATE),	1757	const_iv (GL_DST_ALPHA),
1384	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1758	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1385	const_iv (GL_ONE_MINUS_DST_ALPHA),	1759	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1760	const_iv (GL_SRC_ALPHA_SATURATE),
1386	const_iv (GL_RGB),	1761	const_iv (GL_RGB),
1387	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),
1388	const_iv (GL_UNSIGNED_BYTE),	1766	const_iv (GL_UNSIGNED_BYTE),
		1767	const_iv (GL_UNSIGNED_SHORT),
		1768	const_iv (GL_UNSIGNED_INT),
1389	const_iv (GL_ALPHA),	1769	const_iv (GL_ALPHA),
		1770	const_iv (GL_INTENSITY),
		1771	const_iv (GL_LUMINANCE),
		1772	const_iv (GL_LUMINANCE_ALPHA),
1390	const_iv (GL_FLOAT),	1773	const_iv (GL_FLOAT),
1391	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1774	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1392	const_iv (GL_COMPILE),	1775	const_iv (GL_COMPILE),
1393	const_iv (GL_TEXTURE_1D),	1776	const_iv (GL_TEXTURE_1D),
1394	const_iv (GL_TEXTURE_2D),	1777	const_iv (GL_TEXTURE_2D),
…		…
1396	const_iv (GL_TEXTURE_MAG_FILTER),	1779	const_iv (GL_TEXTURE_MAG_FILTER),
1397	const_iv (GL_TEXTURE_MIN_FILTER),	1780	const_iv (GL_TEXTURE_MIN_FILTER),
1398	const_iv (GL_TEXTURE_ENV_MODE),	1781	const_iv (GL_TEXTURE_ENV_MODE),
1399	const_iv (GL_TEXTURE_WRAP_S),	1782	const_iv (GL_TEXTURE_WRAP_S),
1400	const_iv (GL_TEXTURE_WRAP_T),	1783	const_iv (GL_TEXTURE_WRAP_T),
		1784	const_iv (GL_REPEAT),
1401	const_iv (GL_CLAMP),	1785	const_iv (GL_CLAMP),
1402	const_iv (GL_REPEAT),	1786	const_iv (GL_CLAMP_TO_EDGE),
1403	const_iv (GL_NEAREST),	1787	const_iv (GL_NEAREST),
1404	const_iv (GL_LINEAR),	1788	const_iv (GL_LINEAR),
1405	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1789	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1406	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1790	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1407	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1791	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1408	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1792	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1409	const_iv (GL_GENERATE_MIPMAP),	1793	const_iv (GL_GENERATE_MIPMAP),
1410	const_iv (GL_MODULATE),	1794	const_iv (GL_MODULATE),
1411	const_iv (GL_DECAL),	1795	const_iv (GL_DECAL),
1412	const_iv (GL_REPLACE),	1796	const_iv (GL_REPLACE),
		1797	const_iv (GL_DEPTH_BUFFER_BIT),
1413	const_iv (GL_COLOR_BUFFER_BIT),	1798	const_iv (GL_COLOR_BUFFER_BIT),
1414	const_iv (GL_PROJECTION),	1799	const_iv (GL_PROJECTION),
1415	const_iv (GL_MODELVIEW),	1800	const_iv (GL_MODELVIEW),
1416	const_iv (GL_COLOR_LOGIC_OP),	1801	const_iv (GL_COLOR_LOGIC_OP),
1417	const_iv (GL_SEPARABLE_2D),	1802	const_iv (GL_SEPARABLE_2D),
1418	const_iv (GL_CONVOLUTION_2D),	1803	const_iv (GL_CONVOLUTION_2D),
1419	const_iv (GL_CONVOLUTION_BORDER_MODE),	1804	const_iv (GL_CONVOLUTION_BORDER_MODE),
1420	const_iv (GL_CONSTANT_BORDER),	1805	const_iv (GL_CONSTANT_BORDER),
1421	const_iv (GL_LINES),	1806	const_iv (GL_LINES),
		1807	const_iv (GL_LINE_LOOP),
1422	const_iv (GL_QUADS),	1808	const_iv (GL_QUADS),
1423	const_iv (GL_LINE_LOOP),	1809	const_iv (GL_QUAD_STRIP),
		1810	const_iv (GL_TRIANGLES),
		1811	const_iv (GL_TRIANGLE_STRIP),
		1812	const_iv (GL_TRIANGLE_FAN),
1424	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1813	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1425	const_iv (GL_FASTEST),	1814	const_iv (GL_FASTEST),
		1815	const_iv (GL_V2F),
		1816	const_iv (GL_V3F),
		1817	const_iv (GL_T2F_V3F),
		1818	const_iv (GL_T2F_N3F_V3F),
1426	# undef const_iv	1819	# undef const_iv
1427	};	1820	};
1428		1821
1429	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; )
1430	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1823	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1431	}	1824	}
1432		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
1433	int glGetError ()	1847	int glGetError ()
		1848
		1849	void glFinish ()
1434		1850
1435	void glClear (int mask)	1851	void glClear (int mask)
1436		1852
1437	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)
1438	PROTOTYPE: @	1854	PROTOTYPE: @
…		…
1445		1861
1446	void glHint (int target, int mode)	1862	void glHint (int target, int mode)
1447		1863
1448	void glBlendFunc (int sfactor, int dfactor)	1864	void glBlendFunc (int sfactor, int dfactor)
1449		1865
		1866	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1867	CODE:
		1868	gl_BlendFuncSeparate (sa, da, saa, daa);
		1869
		1870	void glDepthMask (int flag)
		1871
1450	void glLogicOp (int opcode)	1872	void glLogicOp (int opcode)
1451		1873
1452	void glColorMask (int red, int green, int blue, int alpha)	1874	void glColorMask (int red, int green, int blue, int alpha)
1453		1875
1454	void glMatrixMode (int mode)	1876	void glMatrixMode (int mode)
…		…
1457		1879
1458	void glPopMatrix ()	1880	void glPopMatrix ()
1459		1881
1460	void glLoadIdentity ()	1882	void glLoadIdentity ()
1461		1883
		1884	void glDrawBuffer (int buffer)
		1885
		1886	void glReadBuffer (int buffer)
		1887
1462	# near and far are due to microsofts buggy c compiler	1888	# near_ and far_ are due to microsofts buggy "c" compiler
		1889	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1890
		1891	# near_ and far_ are due to microsofts buggy "c" compiler
1463	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1892	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1464		1893
1465	void glViewport (int x, int y, int width, int height)	1894	void glViewport (int x, int y, int width, int height)
1466		1895
1467	void glScissor (int x, int y, int width, int height)	1896	void glScissor (int x, int y, int width, int height)
…		…
1482		1911
1483	void glEnd ()	1912	void glEnd ()
1484		1913
1485	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)
1486	PROTOTYPE: @	1915	PROTOTYPE: @
		1916	ALIAS:
		1917	glColor_premultiply = 1
1487	CODE:	1918	CODE:
1488	glColor4ub (r * 255., g * 255., b * 255., a * 255.);	1919	if (ix)
		1920	{
		1921	r *= a;
		1922	g *= a;
		1923	b *= a;
		1924	}
		1925	// microsoft visual "c" rounds instead of truncating...
		1926	glColor4f (r, g, b, a);
		1927
		1928	void glInterleavedArrays (int format, int stride, char *data)
		1929
		1930	void glDrawElements (int mode, int count, int type, char *indices)
		1931
		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);
1489		1938
1490	void glVertex (float x, float y, float z = 0.)	1939	void glVertex (float x, float y, float z = 0.)
1491	CODE:	1940	CODE:
1492	glVertex3f (x, y, z);	1941	glVertex3f (x, y, z);
1493		1942
…		…
1505		1954
1506	void glBindTexture (int target, int name)	1955	void glBindTexture (int target, int name)
1507		1956
1508	void glConvolutionParameter (int target, int pname, float params)	1957	void glConvolutionParameter (int target, int pname, float params)
1509	CODE:	1958	CODE:
1510	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1959	if (gl.ConvolutionParameterf)
		1960	gl.ConvolutionParameterf (target, pname, params);
1511		1961
1512	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)
1513	CODE:	1963	CODE:
1514	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1964	if (gl.ConvolutionFilter2D)
1515	(target, internalformat, width, height, format, type, data));	1965	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1516		1966
1517	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)
1518	CODE:	1968	CODE:
1519	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1969	if (gl.SeparableFilter2D)
1520	(target, internalformat, width, height, format, type, row, column));	1970	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1521		1971
1522	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)
1523		1973
1524	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)
1525		1975
1526	void glRasterPos (int x, int y)	1976	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1527	CODE:
1528	glRasterPos2i (x, y);
1529		1977
1530	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)
1531		1979
1532	int glGenTexture ()	1980	int glGenTexture ()
1533	CODE:	1981	CODE:
…		…
1560		2008
1561	void glEndList ()	2009	void glEndList ()
1562		2010
1563	void glCallList (int list)	2011	void glCallList (int list)
1564		2012
		2013

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.75 by root, Mon May 8 18:28:40 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.75 by root, Mon May 8 18:28:40 2006 UTC vs.
Revision 1.134 by root, Fri Aug 4 16:49:58 2006 UTC