[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.139 by root, Mon Aug 14 03:04:17 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	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
102	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
103		153
104	w = (w + 3) & ~3;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
105	if (!w) w = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
106	if (!h) h = 1;	156
		157	if (!rect.width) rect.width = 1;
		158	if (!rect.height) rect.height = 1;
		159
		160	rect.width = (rect.width + 3) & ~3;
		161
		162	*w = rect.width;
		163	*h = rect.height;
107	}	164	}
108		165
109	typedef uint16_t mapface;	166	typedef uint16_t mapface;
110		167
111	typedef struct {	168	typedef struct {
…		…
134	int texs;	191	int texs;
135	maptex *tex;	192	maptex *tex;
136		193
137	int32_t rows;	194	int32_t rows;
138	maprow *row;	195	maprow *row;
139	} *CFClient__Map;	196	} *CFPlus__Map;
140		197
141	static char *	198	static char *
142	prepend (char *ptr, int sze, int inc)	199	prepend (char *ptr, int sze, int inc)
143	{	200	{
144	char *p;	201	char *p;
…		…
162		219
163	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	220	#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))	221	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
165		222
166	static maprow *	223	static maprow *
167	map_get_row (CFClient__Map self, int y)	224	map_get_row (CFPlus__Map self, int y)
168	{	225	{
169	if (0 > y)	226	if (0 > y)
170	{	227	{
171	int extend = - y + MAP_EXTEND_Y;	228	int extend = - y + MAP_EXTEND_Y;
172	Prepend (maprow, self->row, self->rows, extend);	229	Prepend (maprow, self->row, self->rows, extend);
…		…
210		267
211	return row->col + (x - row->c0);	268	return row->col + (x - row->c0);
212	}	269	}
213		270
214	static mapcell *	271	static mapcell *
215	map_get_cell (CFClient__Map self, int x, int y)	272	map_get_cell (CFPlus__Map self, int x, int y)
216	{	273	{
217	return row_get_cell (map_get_row (self, y), x);	274	return row_get_cell (map_get_row (self, y), x);
218	}	275	}
219		276
220	static void	277	static void
221	map_clear (CFClient__Map self)	278	map_clear (CFPlus__Map self)
222	{	279	{
223	int r;	280	int r;
224		281
225	for (r = 0; r < self->rows; r++)	282	for (r = 0; r < self->rows; r++)
226	Safefree (self->row[r].col);	283	Safefree (self->row[r].col);
…		…
234	self->row = 0;	291	self->row = 0;
235	self->rows = 0;	292	self->rows = 0;
236	}	293	}
237		294
238	static void	295	static void
239	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	296	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
240	{	297	{
241	int x, y;	298	int x, y;
242	maprow *row;	299	maprow *row;
243		300
244	for (y = y0; y < y0 + h; y++)	301	for (y = y0; y < y0 + h; y++)
…		…
284	ev.data2 = 0;	341	ev.data2 = 0;
285		342
286	SDL_PushEvent ((SDL_Event *)&ev);	343	SDL_PushEvent ((SDL_Event *)&ev);
287	}	344	}
288		345
		346	static unsigned int
		347	minpot (unsigned int n)
		348	{
		349	if (!n)
		350	return 0;
		351
		352	--n;
		353
		354	n \|= n >> 1;
		355	n \|= n >> 2;
		356	n \|= n >> 4;
		357	n \|= n >> 8;
		358	n \|= n >> 16;
		359
		360	return n + 1;
		361	}
		362
289	MODULE = CFClient PACKAGE = CFClient	363	MODULE = CFPlus PACKAGE = CFPlus
290		364
291	PROTOTYPES: ENABLE	365	PROTOTYPES: ENABLE
292		366
293	BOOT:	367	BOOT:
294	{	368	{
295	HV *stash = gv_stashpv ("CFClient", 1);	369	HV *stash = gv_stashpv ("CFPlus", 1);
296	static const struct {	370	static const struct {
297	const char *name;	371	const char *name;
298	IV iv;	372	IV iv;
299	} *civ, const_iv[] = {	373	} *civ, const_iv[] = {
300	# define const_iv(name) { # name, (IV)name }	374	# define const_iv(name) { # name, (IV)name }
…		…
399	# undef const_iv	473	# undef const_iv
400	};	474	};
401		475
402	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	476	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
403	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	477	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	}	478	}
409		479
410	int	480	int
		481	in_destruct ()
		482	CODE:
		483	RETVAL = PL_main_cv == Nullcv;
		484	OUTPUT:
		485	RETVAL
		486
		487	NV floor (NV x)
		488
		489	NV ceil (NV x)
		490
		491	void
		492	pango_init ()
		493	CODE:
		494	{
		495	opengl_fontmap = pango_opengl_font_map_new ();
		496	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
		497	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		498	}
		499
		500	int
411	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	501	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
412		502
413	void	503	void
414	SDL_Quit ()	504	SDL_Quit ()
415		505
416	void	506	void
…		…
422	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	512	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
423	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	513	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
424	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	514	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
425	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	515	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
426		516
		517	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		518	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		519
427	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	520	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
428	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
429	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	522	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
430	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	523	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
431		524
432	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	525	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		526	#if SDL_VERSION_ATLEAST(1,2,10)
433	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	527	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
434	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	528	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		529	#endif
435		530
436	SDL_EnableUNICODE (1);	531	SDL_EnableUNICODE (1);
437	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	532	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
438		533
439	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	534	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
448		543
449	++m;	544	++m;
450	}	545	}
451	}	546	}
452		547
		548	char *
		549	SDL_GetError ()
		550
453	int	551	int
454	SDL_SetVideoMode (int w, int h, int fullscreen)	552	SDL_SetVideoMode (int w, int h, int fullscreen)
455	CODE:	553	CODE:
456	RETVAL = !!SDL_SetVideoMode (	554	RETVAL = !!SDL_SetVideoMode (
457	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	555	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
458	);	556	);
		557	if (RETVAL)
		558	{
459	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	559	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		560	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		561	# include "glfunc.h"
		562	# undef GL_FUNC
		563	}
460	OUTPUT:	564	OUTPUT:
461	RETVAL	565	RETVAL
462		566
463	void	567	void
464	SDL_GL_SwapBuffers ()	568	SDL_GL_SwapBuffers ()
		569
		570	char *
		571	SDL_GetKeyName (int sym)
465		572
466	void	573	void
467	SDL_PollEvent ()	574	SDL_PollEvent ()
468	PPCODE:	575	PPCODE:
469	{	576	{
…		…
488	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	595	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
489	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	596	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
490	break;	597	break;
491		598
492	case SDL_MOUSEMOTION:	599	case SDL_MOUSEMOTION:
		600	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		601
493	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	602	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
494	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	603	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
495	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	604	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
496	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	605	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
497	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	606	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
498	break;	607	break;
499		608
500	case SDL_MOUSEBUTTONDOWN:	609	case SDL_MOUSEBUTTONDOWN:
501	case SDL_MOUSEBUTTONUP:	610	case SDL_MOUSEBUTTONUP:
		611	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		612
502	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	613	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
503	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	614	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
504	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	615	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
505	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	616	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
506	break;	617	break;
…		…
510	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	621	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
511	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	622	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
512	break;	623	break;
513	}	624	}
514		625
515	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	626	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
516	}	627	}
517	}	628	}
518		629
519	int	630	int
520	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	631	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
533	CODE:	644	CODE:
534	#ifndef _WIN32	645	#ifndef _WIN32
535	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	646	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
536	#endif	647	#endif
537		648
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	649	void
553	add_font (char *file)	650	add_font (char *file)
554	CODE:	651	CODE:
555	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	652	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
556		653
557	void	654	void
558	load_image_inline (SV *image_)	655	load_image_inline (SV *image_)
559	ALIAS:	656	ALIAS:
560	load_image_file = 1	657	load_image_file = 1
…		…
602		699
603	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	700	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
604		701
605	assert (surface2->pitch == surface2->w * 4);	702	assert (surface2->pitch == surface2->w * 4);
606		703
		704	SDL_LockSurface (surface2);
607	EXTEND (SP, 5);	705	EXTEND (SP, 6);
608	PUSHs (sv_2mortal (newSViv (surface2->w)));	706	PUSHs (sv_2mortal (newSViv (surface2->w)));
609	PUSHs (sv_2mortal (newSViv (surface2->h)));	707	PUSHs (sv_2mortal (newSViv (surface2->h)));
610	SDL_LockSurface (surface2);
611	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	708	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)));	709	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
614	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	710	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
615	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	711	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		712	SDL_UnlockSurface (surface2);
616		713
617	SDL_FreeSurface (surface);	714	SDL_FreeSurface (surface);
618	SDL_FreeSurface (surface2);	715	SDL_FreeSurface (surface2);
619	}	716	}
620		717
…		…
644	}	741	}
645		742
646	void	743	void
647	error (char *message)	744	error (char *message)
648	CODE:	745	CODE:
		746	fprintf (stderr, "ERROR: %s\n", message);
649	#ifdef _WIN32	747	#ifdef _WIN32
650	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	748	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
651	#else
652	fprintf (stderr, "ERROR: %s\n", message);
653	#endif	749	#endif
654		750
655	void	751	void
656	fatal (char *message)	752	fatal (char *message)
657	CODE:	753	CODE:
		754	fprintf (stderr, "FATAL: %s\n", message);
658	#ifdef _WIN32	755	#ifdef _WIN32
659	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	756	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
660	#else
661	fprintf (stderr, "FATAL: %s\n", message);
662	#endif	757	#endif
663	exit (1);	758	_exit (1);
664		759
		760	void
		761	_exit (int retval)
		762	CODE:
		763	_exit (retval);
		764
665	MODULE = CFClient PACKAGE = CFClient::Font	765	MODULE = CFPlus PACKAGE = CFPlus::Font
666		766
667	CFClient::Font	767	CFPlus::Font
668	new_from_file (SV class, char path, int id = 0)	768	new_from_file (SV class, char path, int id = 0)
669	CODE:	769	CODE:
670	{	770	{
671	int count;	771	int count;
672	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	772	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
675	}	775	}
676	OUTPUT:	776	OUTPUT:
677	RETVAL	777	RETVAL
678		778
679	void	779	void
680	DESTROY (CFClient::Font self)	780	DESTROY (CFPlus::Font self)
681	CODE:	781	CODE:
682	pango_font_description_free (self);	782	pango_font_description_free (self);
683		783
684	void	784	void
685	make_default (CFClient::Font self)	785	make_default (CFPlus::Font self)
686	CODE:	786	CODE:
687	default_font = self;	787	default_font = self;
688		788
689	MODULE = CFClient PACKAGE = CFClient::Layout	789	MODULE = CFPlus PACKAGE = CFPlus::Layout
690		790
691	CFClient::Layout	791	void
692	new (SV *class, int base_height = MIN_FONT_HEIGHT)	792	reset_glyph_cache ()
		793	CODE:
		794	tc_clear ();
		795
		796	CFPlus::Layout
		797	new (SV *class)
693	CODE:	798	CODE:
694	New (0, RETVAL, 1, struct cf_layout);	799	New (0, RETVAL, 1, struct cf_layout);
		800
695	RETVAL->pl = pango_layout_new (context);	801	RETVAL->pl = pango_layout_new (opengl_context);
696	RETVAL->base_height = base_height;	802	RETVAL->r = 1.;
		803	RETVAL->g = 1.;
		804	RETVAL->b = 1.;
		805	RETVAL->a = 1.;
		806	RETVAL->base_height = MIN_FONT_HEIGHT;
697	RETVAL->font = 0;	807	RETVAL->font = 0;
		808
698	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	809	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
699	pango_layout_set_font_description (RETVAL->pl, default_font);	810	layout_update_font (RETVAL);
700	OUTPUT:	811	OUTPUT:
701	RETVAL	812	RETVAL
702		813
703	void	814	void
704	DESTROY (CFClient::Layout self)	815	DESTROY (CFPlus::Layout self)
705	CODE:	816	CODE:
706	g_object_unref (self->pl);	817	g_object_unref (self->pl);
707	Safefree (self);	818	Safefree (self);
708		819
709	void	820	void
710	set_text (CFClient::Layout self, SV *text_)	821	set_text (CFPlus::Layout self, SV *text_)
711	CODE:	822	CODE:
712	{	823	{
713	STRLEN textlen;	824	STRLEN textlen;
714	char *text = SvPVutf8 (text_, textlen);	825	char *text = SvPVutf8 (text_, textlen);
715		826
716	pango_layout_set_text (self->pl, text, textlen);	827	pango_layout_set_text (self->pl, text, textlen);
717	}	828	}
718		829
719	void	830	void
720	set_markup (CFClient::Layout self, SV *text_)	831	set_markup (CFPlus::Layout self, SV *text_)
721	CODE:	832	CODE:
722	{	833	{
723	STRLEN textlen;	834	STRLEN textlen;
724	char *text = SvPVutf8 (text_, textlen);	835	char *text = SvPVutf8 (text_, textlen);
725		836
726	pango_layout_set_markup (self->pl, text, textlen);	837	pango_layout_set_markup (self->pl, text, textlen);
727	}	838	}
728		839
		840	void
		841	set_shapes (CFPlus::Layout self, ...)
		842	CODE:
		843	{
		844	PangoAttrList *attrs = 0;
		845	const char *text = pango_layout_get_text (self->pl);
		846	const char *pos = text;
		847	int arg = 4;
		848
		849	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		850	{
		851	PangoRectangle inkrect, rect;
		852	PangoAttribute *attr;
		853
		854	int x = SvIV (ST (arg - 3));
		855	int y = SvIV (ST (arg - 2));
		856	int w = SvIV (ST (arg - 1));
		857	int h = SvIV (ST (arg ));
		858
		859	inkrect.x = 0;
		860	inkrect.y = 0;
		861	inkrect.width = 0;
		862	inkrect.height = 0;
		863
		864	rect.x = x * PANGO_SCALE;
		865	rect.y = y * PANGO_SCALE;
		866	rect.width = w * PANGO_SCALE;
		867	rect.height = h * PANGO_SCALE;
		868
		869	if (!attrs)
		870	attrs = pango_layout_get_attributes (self->pl);
		871
		872	attr = pango_attr_shape_new (&inkrect, &rect);
		873	attr->start_index = pos - text;
		874	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		875	pango_attr_list_insert (attrs, attr);
		876
		877	arg += 4;
		878	pos += sizeof (OBJ_STR) - 1;
		879	}
		880
		881	if (attrs)
		882	pango_layout_set_attributes (self->pl, attrs);
		883	}
		884
		885	void
		886	get_shapes (CFPlus::Layout self)
		887	PPCODE:
		888	{
		889	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		890
		891	do
		892	{
		893	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		894
		895	if (run && shape_attr_p (run))
		896	{
		897	PangoRectangle extents;
		898	pango_layout_iter_get_run_extents (iter, 0, &extents);
		899
		900	EXTEND (SP, 2);
		901	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		902	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		903	}
		904	}
		905	while (pango_layout_iter_next_run (iter));
		906
		907	pango_layout_iter_free (iter);
		908	}
		909
		910	int
		911	has_wrapped (CFPlus::Layout self)
		912	CODE:
		913	{
		914	int lines = 1;
		915	const char *text = pango_layout_get_text (self->pl);
		916
		917	while (*text)
		918	lines += *text++ == '\n';
		919
		920	RETVAL = lines < pango_layout_get_line_count (self->pl);
		921	}
		922	OUTPUT:
		923	RETVAL
		924
729	SV *	925	SV *
730	get_text (CFClient::Layout self)	926	get_text (CFPlus::Layout self)
731	CODE:	927	CODE:
732	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	928	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
733	SvUTF8_on (RETVAL);	929	sv_utf8_decode (RETVAL);
734	OUTPUT:	930	OUTPUT:
735	RETVAL	931	RETVAL
736		932
737	void	933	void
		934	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
		935	CODE:
		936	self->r = r;
		937	self->g = g;
		938	self->b = b;
		939	self->a = a;
		940
		941	void
738	set_font (CFClient::Layout self, CFClient::Font font = 0)	942	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
739	CODE:	943	CODE:
740	if (self->font != font)	944	if (self->font != font)
741	{	945	{
742	self->font = font;	946	self->font = font;
743	layout_update_font (self);	947	layout_update_font (self);
744	}	948	}
745		949
746	void	950	void
747	set_height (CFClient::Layout self, int base_height)	951	set_height (CFPlus::Layout self, int base_height)
748	CODE:	952	CODE:
749	if (self->base_height != base_height)	953	if (self->base_height != base_height)
750	{	954	{
751	self->base_height = base_height;	955	self->base_height = base_height;
752	layout_update_font (self);	956	layout_update_font (self);
753	}	957	}
754		958
755	void	959	void
756	set_width (CFClient::Layout self, int max_width = -1)	960	set_width (CFPlus::Layout self, int max_width = -1)
757	CODE:	961	CODE:
758	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	962	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
759		963
760	void	964	void
		965	set_indent (CFPlus::Layout self, int indent)
		966	CODE:
		967	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		968
		969	void
		970	set_spacing (CFPlus::Layout self, int spacing)
		971	CODE:
		972	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		973
		974	void
		975	set_ellipsise (CFPlus::Layout self, int ellipsise)
		976	CODE:
		977	pango_layout_set_ellipsize (self->pl,
		978	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		979	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		980	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		981	: PANGO_ELLIPSIZE_NONE
		982	);
		983
		984	void
		985	set_single_paragraph_mode (CFPlus::Layout self, int spm)
		986	CODE:
		987	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		988
		989	void
761	size (CFClient::Layout self)	990	size (CFPlus::Layout self)
762	PPCODE:	991	PPCODE:
763	{	992	{
764	int w, h;	993	int w, h;
765		994
766	layout_get_pixel_size (self, &w, &h);	995	layout_get_pixel_size (self, &w, &h);
…		…
769	PUSHs (sv_2mortal (newSViv (w)));	998	PUSHs (sv_2mortal (newSViv (w)));
770	PUSHs (sv_2mortal (newSViv (h)));	999	PUSHs (sv_2mortal (newSViv (h)));
771	}	1000	}
772		1001
773	int	1002	int
		1003	descent (CFPlus::Layout self)
		1004	CODE:
		1005	{
		1006	PangoRectangle rect;
		1007	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1008	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1009	RETVAL = PANGO_DESCENT (rect);
		1010	}
		1011	OUTPUT:
		1012	RETVAL
		1013
		1014	int
774	xy_to_index (CFClient::Layout self, int x, int y)	1015	xy_to_index (CFPlus::Layout self, int x, int y)
775	CODE:	1016	CODE:
776	{	1017	{
777	int index, trailing;	1018	int index, trailing;
778	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1019	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
779	RETVAL = index;	1020	RETVAL = index;
780	}	1021	}
781	OUTPUT:	1022	OUTPUT:
782	RETVAL	1023	RETVAL
783		1024
784	void	1025	void
785	cursor_pos (CFClient::Layout self, int index)	1026	cursor_pos (CFPlus::Layout self, int index)
786	PPCODE:	1027	PPCODE:
787	{	1028	{
788	PangoRectangle strong_pos;	1029	PangoRectangle strong_pos;
789	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1030	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
790		1031
…		…
793	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1034	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
794	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1035	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
795	}	1036	}
796		1037
797	void	1038	void
798	render (CFClient::Layout self)	1039	render (CFPlus::Layout self, float x, float y, int flags = 0)
799	PPCODE:	1040	PPCODE:
800	{	1041	pango_opengl_render_layout_subpixel (
801	SV *retval;	1042	self->pl,
802	int w, h;	1043	x * PANGO_SCALE, y * PANGO_SCALE,
803	FT_Bitmap bitmap;	1044	self->r, self->g, self->b, self->a,
		1045	flags
		1046	);
804		1047
805	layout_get_pixel_size (self, &w, &h);	1048	MODULE = CFPlus PACKAGE = CFPlus::Texture
806		1049
807	retval = newSV (w * h);	1050	void
808	SvPOK_only (retval);	1051	pad2pot (SV data_, SV w_, SV *h_)
809	SvCUR_set (retval, w * h);	1052	CODE:
		1053	{
		1054	int ow = SvIV (w_);
		1055	int oh = SvIV (h_);
810		1056
811	bitmap.rows = h;	1057	if (ow && oh)
812	bitmap.width = w;	1058	{
813	bitmap.pitch = w;	1059	int nw = minpot (ow);
814	bitmap.buffer = (unsigned char*)SvPVX (retval);	1060	int nh = minpot (oh);
815	bitmap.num_grays = 256;
816	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
817		1061
818	memset (bitmap.buffer, 0, w * h);	1062	if (nw != ow \|\| nh != oh)
819		1063	{
820	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	1064	if (SvOK (data_))
		1065	{
		1066	STRLEN datalen;
		1067	char *data = SvPVbyte (data_, datalen);
		1068	int bpp = datalen / (ow * oh);
		1069	SV result_ = sv_2mortal (newSV (nw nh * bpp));
821		1070
822	EXTEND (SP, 3);	1071	SvPOK_only (result_);
823	PUSHs (sv_2mortal (newSViv (w)));	1072	SvCUR_set (result_, nw * nh * bpp);
824	PUSHs (sv_2mortal (newSViv (h)));
825	PUSHs (sv_2mortal (retval));
826	}
827		1073
828	MODULE = CFClient PACKAGE = CFClient::Texture	1074	memset (SvPVX (result_), 0, nw * nh * bpp);
		1075	while (oh--)
		1076	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
829		1077
		1078	sv_setsv (data_, result_);
		1079	}
		1080
		1081	sv_setiv (w_, nw);
		1082	sv_setiv (h_, nh);
		1083	}
		1084	}
		1085	}
		1086
830	void	1087	void
831	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1088	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
832	PROTOTYPE: $$$;$$	1089	PROTOTYPE: $$$;$$
		1090	ALIAS:
		1091	draw_quad_alpha = 1
		1092	draw_quad_alpha_premultiplied = 2
833	CODE:	1093	CODE:
834	{	1094	{
835	HV hv = (HV )SvRV (self);	1095	HV hv = (HV )SvRV (self);
836	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1096	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
837	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1097	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
838	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1098	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
839	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
840		1099
841	if (items < 5)	1100	if (items < 5)
842	{	1101	{
843	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1102	w = SvNV (*hv_fetch (hv, "w", 1, 1));
844	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1103	h = SvNV (*hv_fetch (hv, "h", 1, 1));
845	}	1104	}
846		1105
		1106	if (ix)
		1107	{
		1108	glEnable (GL_BLEND);
		1109
		1110	if (ix == 2)
		1111	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1112	else
		1113	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1114	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1115
		1116	glEnable (GL_ALPHA_TEST);
		1117	glAlphaFunc (GL_GREATER, 0.01f);
		1118	}
		1119
847	glBindTexture (GL_TEXTURE_2D, name);	1120	glBindTexture (GL_TEXTURE_2D, name);
848	if (wrap_mode) {	1121
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);	1122	glBegin (GL_QUADS);
853	glTexCoord2f (0, 0); glVertex2f (x , y );	1123	glTexCoord2f (0, 0); glVertex2f (x , y );
854	glTexCoord2f (0, t); glVertex2f (x , y + h);	1124	glTexCoord2f (0, t); glVertex2f (x , y + h);
855	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1125	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
856	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1126	glTexCoord2f (s, 0); glVertex2f (x + w, y );
857	glEnd ();	1127	glEnd ();
858	}
859		1128
		1129	if (ix)
		1130	{
		1131	glDisable (GL_ALPHA_TEST);
		1132	glDisable (GL_BLEND);
		1133	}
		1134	}
		1135
860	MODULE = CFClient PACKAGE = CFClient::Map	1136	MODULE = CFPlus PACKAGE = CFPlus::Map
861		1137
862	CFClient::Map	1138	CFPlus::Map
863	new (SV *class, int map_width, int map_height)	1139	new (SV *class, int map_width, int map_height)
864	CODE:	1140	CODE:
865	New (0, RETVAL, 1, struct map);	1141	New (0, RETVAL, 1, struct map);
866	RETVAL->x = 0;	1142	RETVAL->x = 0;
867	RETVAL->y = 0;	1143	RETVAL->y = 0;
…		…
877	RETVAL->row = 0;	1153	RETVAL->row = 0;
878	OUTPUT:	1154	OUTPUT:
879	RETVAL	1155	RETVAL
880		1156
881	void	1157	void
882	DESTROY (CFClient::Map self)	1158	DESTROY (CFPlus::Map self)
883	CODE:	1159	CODE:
884	{	1160	{
885	map_clear (self);	1161	map_clear (self);
886	Safefree (self->face);	1162	Safefree (self->face);
		1163	Safefree (self->tex);
887	Safefree (self);	1164	Safefree (self);
888	}	1165	}
889		1166
890	void	1167	void
891	clear (CFClient::Map self)	1168	clear (CFPlus::Map self)
892	CODE:	1169	CODE:
893	map_clear (self);	1170	map_clear (self);
894		1171
895	void	1172	void
896	set_face (CFClient::Map self, int face, int texid)	1173	set_face (CFPlus::Map self, int face, int texid)
897	CODE:	1174	CODE:
898	{	1175	{
899	while (self->faces <= face)	1176	while (self->faces <= face)
900	{	1177	{
901	Append (mapface, self->face, self->faces, self->faces);	1178	Append (mapface, self->face, self->faces, self->faces);
…		…
904		1181
905	self->face [face] = texid;	1182	self->face [face] = texid;
906	}	1183	}
907		1184
908	void	1185	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)	1186	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:	1187	CODE:
911	{	1188	{
912	while (self->texs <= texid)	1189	while (self->texs <= texid)
913	{	1190	{
914	Append (maptex, self->tex, self->texs, self->texs);	1191	Append (maptex, self->tex, self->texs, self->texs);
…		…
926	tex->r = r;	1203	tex->r = r;
927	tex->g = g;	1204	tex->g = g;
928	tex->b = b;	1205	tex->b = b;
929	tex->a = a;	1206	tex->a = a;
930	}	1207	}
		1208
		1209	// somewhat hackish, but for textures that require it, it really
		1210	// improves the look, and most others don't suffer.
		1211	glBindTexture (GL_TEXTURE_2D, name);
		1212	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1213	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1214	// use uglier nearest interpolation because linear suffers
		1215	// from transparent color bleeding and ugly wrapping effects.
		1216	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
931	}	1217	}
932		1218
933	int	1219	int
934	ox (CFClient::Map self)	1220	ox (CFPlus::Map self)
935	ALIAS:	1221	ALIAS:
936	oy = 1	1222	oy = 1
		1223	x = 2
		1224	y = 3
		1225	w = 4
		1226	h = 5
937	CODE:	1227	CODE:
938	switch (ix)	1228	switch (ix)
939	{	1229	{
940	case 0: RETVAL = self->ox; break;	1230	case 0: RETVAL = self->ox; break;
941	case 1: RETVAL = self->oy; break;	1231	case 1: RETVAL = self->oy; break;
		1232	case 2: RETVAL = self->x; break;
		1233	case 3: RETVAL = self->y; break;
		1234	case 4: RETVAL = self->w; break;
		1235	case 5: RETVAL = self->h; break;
942	}	1236	}
943	OUTPUT:	1237	OUTPUT:
944	RETVAL	1238	RETVAL
945		1239
946	void	1240	void
947	scroll (CFClient::Map self, int dx, int dy)	1241	scroll (CFPlus::Map self, int dx, int dy)
948	CODE:	1242	CODE:
949	{	1243	{
950	if (dx > 0)	1244	if (dx > 0)
951	map_blank (self, self->x, self->y, dx - 1, self->h);	1245	map_blank (self, self->x, self->y, dx - 1, self->h);
952	else if (dx < 0)	1246	else if (dx < 0)
…		…
968	self->y += MAP_EXTEND_Y;	1262	self->y += MAP_EXTEND_Y;
969	}	1263	}
970	}	1264	}
971		1265
972	void	1266	void
973	map1a_update (CFClient::Map self, SV *data_)	1267	map1a_update (CFPlus::Map self, SV *data_)
974	CODE:	1268	CODE:
975	{	1269	{
976	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1270	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
977	uint8_t data_end = (uint8_t )SvEND (data_);	1271	uint8_t data_end = (uint8_t )SvEND (data_);
978	mapcell *cell;	1272	mapcell *cell;
…		…
980		1274
981	while (data < data_end)	1275	while (data < data_end)
982	{	1276	{
983	flags = (data [0] << 8) + data [1]; data += 2;	1277	flags = (data [0] << 8) + data [1]; data += 2;
984		1278
985	x = ((flags >> 10) & 63) + self->x;	1279	x = self->x + ((flags >> 10) & 63);
986	y = ((flags >> 4) & 63) + self->y;	1280	y = self->y + ((flags >> 4) & 63);
987		1281
988	cell = map_get_cell (self, x, y);	1282	cell = map_get_cell (self, x, y);
989		1283
990	if (flags & 15)	1284	if (flags & 15)
991	{	1285	{
…		…
1020	cell->darkness = -1;	1314	cell->darkness = -1;
1021	}	1315	}
1022	}	1316	}
1023		1317
1024	SV *	1318	SV *
1025	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1319	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1026	CODE:	1320	CODE:
1027	{	1321	{
1028	int x1, x;	1322	int x1, x;
1029	int y1, y;	1323	int y1, y;
1030	int z;	1324	int z;
…		…
1080	}	1374	}
1081	OUTPUT:	1375	OUTPUT:
1082	RETVAL	1376	RETVAL
1083		1377
1084	void	1378	void
1085	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1379	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1086	PPCODE:	1380	CODE:
1087	{	1381	{
1088	int vx, vy;	1382	int vx, vy;
1089	int x, y, z;	1383	int x, y, z;
1090	int last_name;	1384	int last_name;
1091	mapface face;	1385	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		1386
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;	1387	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1101	vy = self->y + (self->h - sh) / 2 - shift_y;	1388	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1102		1389
1103	/*	1390	/*
1104	int vx = self->vx = self->w >= sw	1391	int vx = self->vx = self->w >= sw
1105	? self->x + (self->w - sw) / 2	1392	? self->x + (self->w - sw) / 2
1106	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1393	: 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));	1397	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1111	*/	1398	*/
1112		1399
1113	glColor4ub (255, 255, 255, 255);	1400	glColor4ub (255, 255, 255, 255);
1114		1401
		1402	glEnable (GL_BLEND);
1115	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1403	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1116	glEnable (GL_BLEND);
1117	glEnable (GL_TEXTURE_2D);	1404	glEnable (GL_TEXTURE_2D);
1118	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1405	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1119		1406
1120	glBegin (GL_QUADS);	1407	glBegin (GL_QUADS);
1121		1408
…		…
1129		1416
1130	for (x = 0; x < sw; x++)	1417	for (x = 0; x < sw; x++)
1131	if (row->c0 <= x + vx && x + vx < row->c1)	1418	if (row->c0 <= x + vx && x + vx < row->c1)
1132	{	1419	{
1133	mapcell *cell = row->col + (x + vx - row->c0);	1420	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		1421
1139	face = cell->face [z];	1422	face = cell->face [z];
1140		1423
1141	if (face)	1424	if (face)
1142	{	1425	{
…		…
1163		1446
1164	glEnd ();	1447	glEnd ();
1165		1448
1166	glDisable (GL_TEXTURE_2D);	1449	glDisable (GL_TEXTURE_2D);
1167	glDisable (GL_BLEND);	1450	glDisable (GL_BLEND);
		1451	}
		1452
		1453	void
		1454	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1455	CODE:
		1456	{
		1457	static float color[16][3] = {
		1458	{ 0.00F, 0.00F, 0.00F },
		1459	{ 1.00F, 1.00F, 1.00F },
		1460	{ 0.00F, 0.00F, 0.55F },
		1461	{ 1.00F, 0.00F, 0.00F },
		1462
		1463	{ 1.00F, 0.54F, 0.00F },
		1464	{ 0.11F, 0.56F, 1.00F },
		1465	{ 0.93F, 0.46F, 0.00F },
		1466	{ 0.18F, 0.54F, 0.34F },
		1467
		1468	{ 0.56F, 0.73F, 0.56F },
		1469	{ 0.80F, 0.80F, 0.80F },
		1470	{ 0.55F, 0.41F, 0.13F },
		1471	{ 0.99F, 0.77F, 0.26F },
		1472
		1473	{ 0.74F, 0.65F, 0.41F },
		1474
		1475	{ 0.00F, 1.00F, 1.00F },
		1476	{ 1.00F, 0.00F, 1.00F },
		1477	{ 1.00F, 1.00F, 0.00F },
		1478	};
		1479
		1480	int x, y;
		1481
		1482	glEnable (GL_TEXTURE_2D);
		1483	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1484	glEnable (GL_BLEND);
		1485	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1486	glBegin (GL_QUADS);
		1487
		1488	for (y = 0; y < h; y++)
		1489	for (x = 0; x < w; x++)
		1490	{
		1491	unsigned char m = data [x + y * w];
		1492
		1493	if (m)
		1494	{
		1495	float *c = color [m & 15];
		1496
		1497	float tx1 = m & 0x40 ? 0.5 : 0.;
		1498	float tx2 = tx1 + 0.5;
		1499
		1500	glColor4f (c[0], c[1], c[2], 0.75);
		1501	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1502	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1503	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1504	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1505	}
		1506	}
		1507
		1508	glEnd ();
		1509	glDisable (GL_BLEND);
		1510	glDisable (GL_TEXTURE_2D);
		1511	}
		1512
		1513	void
		1514	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1515	PPCODE:
		1516	{
		1517	int vx, vy;
		1518	int x, y;
		1519	int sw4 = (sw + 3) & ~3;
		1520	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1521	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1522
		1523	memset (darkness, 255, sw4 * sh);
		1524	SvPOK_only (darkness_sv);
		1525	SvCUR_set (darkness_sv, sw4 * sh);
		1526
		1527	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1528	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1529
		1530	for (y = 0; y < sh; y++)
		1531	if (0 <= y + vy && y + vy < self->rows)
		1532	{
		1533	maprow *row = self->row + (y + vy);
		1534
		1535	for (x = 0; x < sw; x++)
		1536	if (row->c0 <= x + vx && x + vx < row->c1)
		1537	{
		1538	mapcell *cell = row->col + (x + vx - row->c0);
		1539
		1540	darkness[y * sw4 + x] = cell->darkness < 0
		1541	? 255 - FOW_DARKNESS
		1542	: 255 - cell->darkness;
		1543	}
		1544	}
1168		1545
1169	EXTEND (SP, 3);	1546	EXTEND (SP, 3);
1170	PUSHs (sv_2mortal (newSViv (sw4)));	1547	PUSHs (sv_2mortal (newSViv (sw4)));
1171	PUSHs (sv_2mortal (newSViv (sh)));	1548	PUSHs (sv_2mortal (newSViv (sh)));
1172	PUSHs (darkness_sv);	1549	PUSHs (darkness_sv);
1173	}	1550	}
1174		1551
1175	SV *	1552	SV *
1176	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1553	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1177	CODE:	1554	CODE:
1178	{	1555	{
1179	int x, y, x1, y1;	1556	int x, y, x1, y1;
1180	SV data_sv = newSV (w h * 7 + 5);	1557	SV data_sv = newSV (w h * 7 + 5);
1181	uint8_t data = (uint8_t )SvPVX (data_sv);	1558	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1243	}	1620	}
1244	OUTPUT:	1621	OUTPUT:
1245	RETVAL	1622	RETVAL
1246		1623
1247	void	1624	void
1248	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1625	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1249	PPCODE:	1626	PPCODE:
1250	{	1627	{
1251	int x, y, z;	1628	int x, y, z;
1252	int w, h;	1629	int w, h;
1253	int x1, y1;	1630	int x1, y1;
…		…
1302	}	1679	}
1303	}	1680	}
1304	}	1681	}
1305	}	1682	}
1306		1683
1307	MODULE = CFClient PACKAGE = CFClient::MixChunk	1684	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1308		1685
1309	CFClient::MixChunk	1686	CFPlus::MixChunk
1310	new_from_file (SV class, char path)	1687	new_from_file (SV class, char path)
1311	CODE:	1688	CODE:
1312	RETVAL = Mix_LoadWAV (path);	1689	RETVAL = Mix_LoadWAV (path);
1313	OUTPUT:	1690	OUTPUT:
1314	RETVAL	1691	RETVAL
1315		1692
1316	void	1693	void
1317	DESTROY (CFClient::MixChunk self)	1694	DESTROY (CFPlus::MixChunk self)
1318	CODE:	1695	CODE:
1319	Mix_FreeChunk (self);	1696	Mix_FreeChunk (self);
1320		1697
1321	int	1698	int
1322	volume (CFClient::MixChunk self, int volume = -1)	1699	volume (CFPlus::MixChunk self, int volume = -1)
1323	CODE:	1700	CODE:
1324	RETVAL = Mix_VolumeChunk (self, volume);	1701	RETVAL = Mix_VolumeChunk (self, volume);
1325	OUTPUT:	1702	OUTPUT:
1326	RETVAL	1703	RETVAL
1327		1704
1328	int	1705	int
1329	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1706	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1330	CODE:	1707	CODE:
1331	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1708	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1332	OUTPUT:	1709	OUTPUT:
1333	RETVAL	1710	RETVAL
1334		1711
1335	MODULE = CFClient PACKAGE = CFClient::MixMusic	1712	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1336		1713
1337	int	1714	int
1338	volume (int volume = -1)	1715	volume (int volume = -1)
1339	CODE:	1716	CODE:
1340	RETVAL = Mix_VolumeMusic (volume);	1717	RETVAL = Mix_VolumeMusic (volume);
1341	OUTPUT:	1718	OUTPUT:
1342	RETVAL	1719	RETVAL
1343		1720
1344	CFClient::MixMusic	1721	CFPlus::MixMusic
1345	new_from_file (SV class, char path)	1722	new_from_file (SV class, char path)
1346	CODE:	1723	CODE:
1347	RETVAL = Mix_LoadMUS (path);	1724	RETVAL = Mix_LoadMUS (path);
1348	OUTPUT:	1725	OUTPUT:
1349	RETVAL	1726	RETVAL
1350		1727
1351	void	1728	void
1352	DESTROY (CFClient::MixMusic self)	1729	DESTROY (CFPlus::MixMusic self)
1353	CODE:	1730	CODE:
1354	Mix_FreeMusic (self);	1731	Mix_FreeMusic (self);
1355		1732
1356	int	1733	int
1357	play (CFClient::MixMusic self, int loops = -1)	1734	play (CFPlus::MixMusic self, int loops = -1)
1358	CODE:	1735	CODE:
1359	RETVAL = Mix_PlayMusic (self, loops);	1736	RETVAL = Mix_PlayMusic (self, loops);
1360	OUTPUT:	1737	OUTPUT:
1361	RETVAL	1738	RETVAL
1362		1739
1363	MODULE = CFClient PACKAGE = CFClient::OpenGL	1740	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1364		1741
1365	BOOT:	1742	BOOT:
1366	{	1743	{
1367	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1744	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1368	static const struct {	1745	static const struct {
1369	const char *name;	1746	const char *name;
1370	IV iv;	1747	IV iv;
1371	} *civ, const_iv[] = {	1748	} *civ, const_iv[] = {
1372	# define const_iv(name) { # name, (IV)name }	1749	# define const_iv(name) { # name, (IV)name }
1373	const_iv (GL_COLOR_MATERIAL),	1750	const_iv (GL_COLOR_MATERIAL),
1374	const_iv (GL_SMOOTH),	1751	const_iv (GL_SMOOTH),
1375	const_iv (GL_FLAT),	1752	const_iv (GL_FLAT),
1376	const_iv (GL_DITHER),	1753	const_iv (GL_DITHER),
1377	const_iv (GL_BLEND),	1754	const_iv (GL_BLEND),
		1755	const_iv (GL_CULL_FACE),
1378	const_iv (GL_SCISSOR_TEST),	1756	const_iv (GL_SCISSOR_TEST),
		1757	const_iv (GL_DEPTH_TEST),
		1758	const_iv (GL_ALPHA_TEST),
		1759	const_iv (GL_NORMALIZE),
		1760	const_iv (GL_RESCALE_NORMAL),
		1761	const_iv (GL_FRONT),
		1762	const_iv (GL_BACK),
1379	const_iv (GL_AND),	1763	const_iv (GL_AND),
1380	const_iv (GL_ONE),	1764	const_iv (GL_ONE),
1381	const_iv (GL_ZERO),	1765	const_iv (GL_ZERO),
1382	const_iv (GL_SRC_ALPHA),	1766	const_iv (GL_SRC_ALPHA),
1383	const_iv (GL_SRC_ALPHA_SATURATE),	1767	const_iv (GL_DST_ALPHA),
1384	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1768	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1385	const_iv (GL_ONE_MINUS_DST_ALPHA),	1769	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1770	const_iv (GL_SRC_ALPHA_SATURATE),
1386	const_iv (GL_RGB),	1771	const_iv (GL_RGB),
1387	const_iv (GL_RGBA),	1772	const_iv (GL_RGBA),
		1773	const_iv (GL_RGBA4),
		1774	const_iv (GL_RGBA8),
		1775	const_iv (GL_RGB5_A1),
1388	const_iv (GL_UNSIGNED_BYTE),	1776	const_iv (GL_UNSIGNED_BYTE),
		1777	const_iv (GL_UNSIGNED_SHORT),
		1778	const_iv (GL_UNSIGNED_INT),
1389	const_iv (GL_ALPHA),	1779	const_iv (GL_ALPHA),
		1780	const_iv (GL_INTENSITY),
		1781	const_iv (GL_LUMINANCE),
		1782	const_iv (GL_LUMINANCE_ALPHA),
1390	const_iv (GL_FLOAT),	1783	const_iv (GL_FLOAT),
1391	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1784	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1392	const_iv (GL_COMPILE),	1785	const_iv (GL_COMPILE),
1393	const_iv (GL_TEXTURE_1D),	1786	const_iv (GL_TEXTURE_1D),
1394	const_iv (GL_TEXTURE_2D),	1787	const_iv (GL_TEXTURE_2D),
…		…
1396	const_iv (GL_TEXTURE_MAG_FILTER),	1789	const_iv (GL_TEXTURE_MAG_FILTER),
1397	const_iv (GL_TEXTURE_MIN_FILTER),	1790	const_iv (GL_TEXTURE_MIN_FILTER),
1398	const_iv (GL_TEXTURE_ENV_MODE),	1791	const_iv (GL_TEXTURE_ENV_MODE),
1399	const_iv (GL_TEXTURE_WRAP_S),	1792	const_iv (GL_TEXTURE_WRAP_S),
1400	const_iv (GL_TEXTURE_WRAP_T),	1793	const_iv (GL_TEXTURE_WRAP_T),
		1794	const_iv (GL_REPEAT),
1401	const_iv (GL_CLAMP),	1795	const_iv (GL_CLAMP),
1402	const_iv (GL_REPEAT),	1796	const_iv (GL_CLAMP_TO_EDGE),
1403	const_iv (GL_NEAREST),	1797	const_iv (GL_NEAREST),
1404	const_iv (GL_LINEAR),	1798	const_iv (GL_LINEAR),
1405	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1799	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1406	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1800	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1407	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1801	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1408	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1802	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1409	const_iv (GL_GENERATE_MIPMAP),	1803	const_iv (GL_GENERATE_MIPMAP),
1410	const_iv (GL_MODULATE),	1804	const_iv (GL_MODULATE),
1411	const_iv (GL_DECAL),	1805	const_iv (GL_DECAL),
1412	const_iv (GL_REPLACE),	1806	const_iv (GL_REPLACE),
		1807	const_iv (GL_DEPTH_BUFFER_BIT),
1413	const_iv (GL_COLOR_BUFFER_BIT),	1808	const_iv (GL_COLOR_BUFFER_BIT),
1414	const_iv (GL_PROJECTION),	1809	const_iv (GL_PROJECTION),
1415	const_iv (GL_MODELVIEW),	1810	const_iv (GL_MODELVIEW),
1416	const_iv (GL_COLOR_LOGIC_OP),	1811	const_iv (GL_COLOR_LOGIC_OP),
1417	const_iv (GL_SEPARABLE_2D),	1812	const_iv (GL_SEPARABLE_2D),
1418	const_iv (GL_CONVOLUTION_2D),	1813	const_iv (GL_CONVOLUTION_2D),
1419	const_iv (GL_CONVOLUTION_BORDER_MODE),	1814	const_iv (GL_CONVOLUTION_BORDER_MODE),
1420	const_iv (GL_CONSTANT_BORDER),	1815	const_iv (GL_CONSTANT_BORDER),
1421	const_iv (GL_LINES),	1816	const_iv (GL_LINES),
		1817	const_iv (GL_LINE_STRIP),
		1818	const_iv (GL_LINE_LOOP),
1422	const_iv (GL_QUADS),	1819	const_iv (GL_QUADS),
1423	const_iv (GL_LINE_LOOP),	1820	const_iv (GL_QUAD_STRIP),
		1821	const_iv (GL_TRIANGLES),
		1822	const_iv (GL_TRIANGLE_STRIP),
		1823	const_iv (GL_TRIANGLE_FAN),
1424	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1824	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1425	const_iv (GL_FASTEST),	1825	const_iv (GL_FASTEST),
		1826	const_iv (GL_V2F),
		1827	const_iv (GL_V3F),
		1828	const_iv (GL_T2F_V3F),
		1829	const_iv (GL_T2F_N3F_V3F),
1426	# undef const_iv	1830	# undef const_iv
1427	};	1831	};
1428		1832
1429	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1833	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1430	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1834	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1431	}	1835	}
1432		1836
		1837	char *
		1838	gl_vendor ()
		1839	CODE:
		1840	RETVAL = (char *)glGetString (GL_VENDOR);
		1841	OUTPUT:
		1842	RETVAL
		1843
		1844	char *
		1845	gl_version ()
		1846	CODE:
		1847	RETVAL = (char *)glGetString (GL_VERSION);
		1848	OUTPUT:
		1849	RETVAL
		1850
		1851	char *
		1852	gl_extensions ()
		1853	CODE:
		1854	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1855	OUTPUT:
		1856	RETVAL
		1857
1433	int glGetError ()	1858	int glGetError ()
		1859
		1860	void glFinish ()
1434		1861
1435	void glClear (int mask)	1862	void glClear (int mask)
1436		1863
1437	void glClearColor (float r, float g, float b, float a = 1.0)	1864	void glClearColor (float r, float g, float b, float a = 1.0)
1438	PROTOTYPE: @	1865	PROTOTYPE: @
…		…
1445		1872
1446	void glHint (int target, int mode)	1873	void glHint (int target, int mode)
1447		1874
1448	void glBlendFunc (int sfactor, int dfactor)	1875	void glBlendFunc (int sfactor, int dfactor)
1449		1876
		1877	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1878	CODE:
		1879	gl_BlendFuncSeparate (sa, da, saa, daa);
		1880
		1881	void glDepthMask (int flag)
		1882
1450	void glLogicOp (int opcode)	1883	void glLogicOp (int opcode)
1451		1884
1452	void glColorMask (int red, int green, int blue, int alpha)	1885	void glColorMask (int red, int green, int blue, int alpha)
1453		1886
1454	void glMatrixMode (int mode)	1887	void glMatrixMode (int mode)
…		…
1457		1890
1458	void glPopMatrix ()	1891	void glPopMatrix ()
1459		1892
1460	void glLoadIdentity ()	1893	void glLoadIdentity ()
1461		1894
		1895	void glDrawBuffer (int buffer)
		1896
		1897	void glReadBuffer (int buffer)
		1898
1462	# near and far are due to microsofts buggy c compiler	1899	# near_ and far_ are due to microsofts buggy "c" compiler
		1900	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1901
		1902	# 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_)	1903	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1464		1904
1465	void glViewport (int x, int y, int width, int height)	1905	void glViewport (int x, int y, int width, int height)
1466		1906
1467	void glScissor (int x, int y, int width, int height)	1907	void glScissor (int x, int y, int width, int height)
…		…
1482		1922
1483	void glEnd ()	1923	void glEnd ()
1484		1924
1485	void glColor (float r, float g, float b, float a = 1.0)	1925	void glColor (float r, float g, float b, float a = 1.0)
1486	PROTOTYPE: @	1926	PROTOTYPE: @
		1927	ALIAS:
		1928	glColor_premultiply = 1
1487	CODE:	1929	CODE:
1488	glColor4ub (r * 255., g * 255., b * 255., a * 255.);	1930	if (ix)
		1931	{
		1932	r *= a;
		1933	g *= a;
		1934	b *= a;
		1935	}
		1936	// microsoft visual "c" rounds instead of truncating...
		1937	glColor4f (r, g, b, a);
		1938
		1939	void glInterleavedArrays (int format, int stride, char *data)
		1940
		1941	void glDrawElements (int mode, int count, int type, char *indices)
		1942
		1943	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1944
		1945	void glRasterPos (float x, float y, float z = 0.)
		1946	CODE:
		1947	glRasterPos3f (0, 0, z);
		1948	glBitmap (0, 0, 0, 0, x, y, 0);
1489		1949
1490	void glVertex (float x, float y, float z = 0.)	1950	void glVertex (float x, float y, float z = 0.)
1491	CODE:	1951	CODE:
1492	glVertex3f (x, y, z);	1952	glVertex3f (x, y, z);
1493		1953
…		…
1505		1965
1506	void glBindTexture (int target, int name)	1966	void glBindTexture (int target, int name)
1507		1967
1508	void glConvolutionParameter (int target, int pname, float params)	1968	void glConvolutionParameter (int target, int pname, float params)
1509	CODE:	1969	CODE:
1510	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1970	if (gl.ConvolutionParameterf)
		1971	gl.ConvolutionParameterf (target, pname, params);
1511		1972
1512	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1973	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1513	CODE:	1974	CODE:
1514	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1975	if (gl.ConvolutionFilter2D)
1515	(target, internalformat, width, height, format, type, data));	1976	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1516		1977
1517	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1978	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1518	CODE:	1979	CODE:
1519	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1980	if (gl.SeparableFilter2D)
1520	(target, internalformat, width, height, format, type, row, column));	1981	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1521		1982
1522	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1983	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1523		1984
1524	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1985	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1525		1986
1526	void glRasterPos (int x, int y)	1987	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1527	CODE:
1528	glRasterPos2i (x, y);
1529		1988
1530	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1989	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1531		1990
1532	int glGenTexture ()	1991	int glGenTexture ()
1533	CODE:	1992	CODE:

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.139 by root, Mon Aug 14 03:04:17 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.139 by root, Mon Aug 14 03:04:17 2006 UTC