[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.155 by root, Thu Sep 21 00:16:42 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	*w = rect.width;
		161	*h = rect.height;
107	}	162	}
108		163
109	typedef uint16_t mapface;	164	typedef uint16_t mapface;
110		165
111	typedef struct {	166	typedef struct {
…		…
114	float s, t;	169	float s, t;
115	uint8_t r, g, b, a;	170	uint8_t r, g, b, a;
116	} maptex;	171	} maptex;
117		172
118	typedef struct {	173	typedef struct {
119	int16_t darkness;	174	uint32_t player;
120	mapface face[3];	175	mapface face[3];
		176	uint16_t darkness;
		177	uint8_t stat_width, stat_hp, flags;
121	} mapcell;	178	} mapcell;
122		179
123	typedef struct {	180	typedef struct {
124	int32_t c0, c1;	181	int32_t c0, c1;
125	mapcell *col;	182	mapcell *col;
…		…
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;
		300	mapcell *cell;
243		301
244	for (y = y0; y < y0 + h; y++)	302	for (y = y0; y < y0 + h; y++)
245	if (y >= 0)	303	if (y >= 0)
246	{	304	{
247	if (y >= self->rows)	305	if (y >= self->rows)
…		…
253	if (x >= row->c0)	311	if (x >= row->c0)
254	{	312	{
255	if (x >= row->c1)	313	if (x >= row->c1)
256	break;	314	break;
257		315
258	row->col[x - row->c0].darkness = -1;	316	cell = row->col + x - row->c0;
		317
		318	cell->darkness = 0;
		319	cell->stat_hp = 0;
		320	cell->flags = 0;
		321	cell->player = 0;
259	}	322	}
260	}	323	}
261	}	324	}
262		325
263	static void	326	static void
…		…
284	ev.data2 = 0;	347	ev.data2 = 0;
285		348
286	SDL_PushEvent ((SDL_Event *)&ev);	349	SDL_PushEvent ((SDL_Event *)&ev);
287	}	350	}
288		351
		352	static unsigned int
		353	minpot (unsigned int n)
		354	{
		355	if (!n)
		356	return 0;
		357
		358	--n;
		359
		360	n \|= n >> 1;
		361	n \|= n >> 2;
		362	n \|= n >> 4;
		363	n \|= n >> 8;
		364	n \|= n >> 16;
		365
		366	return n + 1;
		367	}
		368
289	MODULE = CFClient PACKAGE = CFClient	369	MODULE = CFPlus PACKAGE = CFPlus
290		370
291	PROTOTYPES: ENABLE	371	PROTOTYPES: ENABLE
292		372
293	BOOT:	373	BOOT:
294	{	374	{
295	HV *stash = gv_stashpv ("CFClient", 1);	375	HV *stash = gv_stashpv ("CFPlus", 1);
296	static const struct {	376	static const struct {
297	const char *name;	377	const char *name;
298	IV iv;	378	IV iv;
299	} *civ, const_iv[] = {	379	} *civ, const_iv[] = {
300	# define const_iv(name) { # name, (IV)name }	380	# define const_iv(name) { # name, (IV)name }
…		…
399	# undef const_iv	479	# undef const_iv
400	};	480	};
401		481
402	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	482	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
403	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	483	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	}	484	}
409		485
410	int	486	int
		487	in_destruct ()
		488	CODE:
		489	RETVAL = PL_main_cv == Nullcv;
		490	OUTPUT:
		491	RETVAL
		492
		493	NV floor (NV x)
		494
		495	NV ceil (NV x)
		496
		497	void
		498	pango_init ()
		499	CODE:
		500	{
		501	opengl_fontmap = pango_opengl_font_map_new ();
		502	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
		503	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		504	}
		505
		506	int
411	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	507	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
412		508
413	void	509	void
414	SDL_Quit ()	510	SDL_Quit ()
415		511
416	void	512	void
…		…
422	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	518	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
423	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	519	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
424	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	520	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
425	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	521	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
426		522
		523	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		524	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		525
427	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
428	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
429	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	528	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
430	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	529	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
431		530
432	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	531	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		532	#if SDL_VERSION_ATLEAST(1,2,10)
433	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	533	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
434	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	534	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		535	#endif
435		536
436	SDL_EnableUNICODE (1);	537	SDL_EnableUNICODE (1);
437	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	538	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
438		539
439	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	540	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
448		549
449	++m;	550	++m;
450	}	551	}
451	}	552	}
452		553
		554	char *
		555	SDL_GetError ()
		556
453	int	557	int
454	SDL_SetVideoMode (int w, int h, int fullscreen)	558	SDL_SetVideoMode (int w, int h, int fullscreen)
455	CODE:	559	CODE:
456	RETVAL = !!SDL_SetVideoMode (	560	RETVAL = !!SDL_SetVideoMode (
457	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	561	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
458	);	562	);
		563	if (RETVAL)
		564	{
459	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	565	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		566	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		567	# include "glfunc.h"
		568	# undef GL_FUNC
		569	}
460	OUTPUT:	570	OUTPUT:
461	RETVAL	571	RETVAL
462		572
463	void	573	void
464	SDL_GL_SwapBuffers ()	574	SDL_GL_SwapBuffers ()
		575
		576	char *
		577	SDL_GetKeyName (int sym)
465		578
466	void	579	void
467	SDL_PollEvent ()	580	SDL_PollEvent ()
468	PPCODE:	581	PPCODE:
469	{	582	{
…		…
488	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	601	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
489	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	602	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
490	break;	603	break;
491		604
492	case SDL_MOUSEMOTION:	605	case SDL_MOUSEMOTION:
		606	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		607
493	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	608	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
494	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	609	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
495	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	610	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
496	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	611	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
497	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	612	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
498	break;	613	break;
499		614
500	case SDL_MOUSEBUTTONDOWN:	615	case SDL_MOUSEBUTTONDOWN:
501	case SDL_MOUSEBUTTONUP:	616	case SDL_MOUSEBUTTONUP:
		617	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		618
502	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	619	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
503	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	620	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
504	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	621	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
505	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	622	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
506	break;	623	break;
…		…
510	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	627	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
511	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	628	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
512	break;	629	break;
513	}	630	}
514		631
515	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	632	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
516	}	633	}
517	}	634	}
518		635
519	int	636	int
520	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	637	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
533	CODE:	650	CODE:
534	#ifndef _WIN32	651	#ifndef _WIN32
535	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	652	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
536	#endif	653	#endif
537		654
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	655	void
553	add_font (char *file)	656	add_font (char *file)
554	CODE:	657	CODE:
555	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	658	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
556		659
557	void	660	void
558	load_image_inline (SV *image_)	661	load_image_inline (SV *image_)
559	ALIAS:	662	ALIAS:
560	load_image_file = 1	663	load_image_file = 1
…		…
602		705
603	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	706	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
604		707
605	assert (surface2->pitch == surface2->w * 4);	708	assert (surface2->pitch == surface2->w * 4);
606		709
		710	SDL_LockSurface (surface2);
607	EXTEND (SP, 5);	711	EXTEND (SP, 6);
608	PUSHs (sv_2mortal (newSViv (surface2->w)));	712	PUSHs (sv_2mortal (newSViv (surface2->w)));
609	PUSHs (sv_2mortal (newSViv (surface2->h)));	713	PUSHs (sv_2mortal (newSViv (surface2->h)));
610	SDL_LockSurface (surface2);
611	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	714	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)));	715	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
614	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	716	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
615	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	717	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		718	SDL_UnlockSurface (surface2);
616		719
617	SDL_FreeSurface (surface);	720	SDL_FreeSurface (surface);
618	SDL_FreeSurface (surface2);	721	SDL_FreeSurface (surface2);
619	}	722	}
620		723
…		…
644	}	747	}
645		748
646	void	749	void
647	error (char *message)	750	error (char *message)
648	CODE:	751	CODE:
		752	fprintf (stderr, "ERROR: %s\n", message);
649	#ifdef _WIN32	753	#ifdef _WIN32
650	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	754	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
651	#else
652	fprintf (stderr, "ERROR: %s\n", message);
653	#endif	755	#endif
654		756
655	void	757	void
656	fatal (char *message)	758	fatal (char *message)
657	CODE:	759	CODE:
		760	fprintf (stderr, "FATAL: %s\n", message);
658	#ifdef _WIN32	761	#ifdef _WIN32
659	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	762	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
660	#else
661	fprintf (stderr, "FATAL: %s\n", message);
662	#endif	763	#endif
663	exit (1);	764	_exit (1);
664		765
		766	void
		767	_exit (int retval)
		768	CODE:
		769	_exit (retval);
		770
665	MODULE = CFClient PACKAGE = CFClient::Font	771	MODULE = CFPlus PACKAGE = CFPlus::Font
666		772
667	CFClient::Font	773	CFPlus::Font
668	new_from_file (SV class, char path, int id = 0)	774	new_from_file (SV class, char path, int id = 0)
669	CODE:	775	CODE:
670	{	776	{
671	int count;	777	int count;
672	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	778	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
675	}	781	}
676	OUTPUT:	782	OUTPUT:
677	RETVAL	783	RETVAL
678		784
679	void	785	void
680	DESTROY (CFClient::Font self)	786	DESTROY (CFPlus::Font self)
681	CODE:	787	CODE:
682	pango_font_description_free (self);	788	pango_font_description_free (self);
683		789
684	void	790	void
685	make_default (CFClient::Font self)	791	make_default (CFPlus::Font self)
686	CODE:	792	CODE:
687	default_font = self;	793	default_font = self;
688		794
689	MODULE = CFClient PACKAGE = CFClient::Layout	795	MODULE = CFPlus PACKAGE = CFPlus::Layout
690		796
691	CFClient::Layout	797	void
692	new (SV *class, int base_height = MIN_FONT_HEIGHT)	798	reset_glyph_cache ()
		799	CODE:
		800	tc_clear ();
		801
		802	CFPlus::Layout
		803	new (SV *class)
693	CODE:	804	CODE:
694	New (0, RETVAL, 1, struct cf_layout);	805	New (0, RETVAL, 1, struct cf_layout);
		806
695	RETVAL->pl = pango_layout_new (context);	807	RETVAL->pl = pango_layout_new (opengl_context);
696	RETVAL->base_height = base_height;	808	RETVAL->r = 1.;
		809	RETVAL->g = 1.;
		810	RETVAL->b = 1.;
		811	RETVAL->a = 1.;
		812	RETVAL->base_height = MIN_FONT_HEIGHT;
697	RETVAL->font = 0;	813	RETVAL->font = 0;
		814
698	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	815	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
699	pango_layout_set_font_description (RETVAL->pl, default_font);	816	layout_update_font (RETVAL);
700	OUTPUT:	817	OUTPUT:
701	RETVAL	818	RETVAL
702		819
703	void	820	void
704	DESTROY (CFClient::Layout self)	821	DESTROY (CFPlus::Layout self)
705	CODE:	822	CODE:
706	g_object_unref (self->pl);	823	g_object_unref (self->pl);
707	Safefree (self);	824	Safefree (self);
708		825
709	void	826	void
710	set_text (CFClient::Layout self, SV *text_)	827	set_text (CFPlus::Layout self, SV *text_)
711	CODE:	828	CODE:
712	{	829	{
713	STRLEN textlen;	830	STRLEN textlen;
714	char *text = SvPVutf8 (text_, textlen);	831	char *text = SvPVutf8 (text_, textlen);
715		832
716	pango_layout_set_text (self->pl, text, textlen);	833	pango_layout_set_text (self->pl, text, textlen);
717	}	834	}
718		835
719	void	836	void
720	set_markup (CFClient::Layout self, SV *text_)	837	set_markup (CFPlus::Layout self, SV *text_)
721	CODE:	838	CODE:
722	{	839	{
723	STRLEN textlen;	840	STRLEN textlen;
724	char *text = SvPVutf8 (text_, textlen);	841	char *text = SvPVutf8 (text_, textlen);
725		842
726	pango_layout_set_markup (self->pl, text, textlen);	843	pango_layout_set_markup (self->pl, text, textlen);
727	}	844	}
728		845
		846	void
		847	set_shapes (CFPlus::Layout self, ...)
		848	CODE:
		849	{
		850	PangoAttrList *attrs = 0;
		851	const char *text = pango_layout_get_text (self->pl);
		852	const char *pos = text;
		853	int arg = 4;
		854
		855	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		856	{
		857	PangoRectangle inkrect, rect;
		858	PangoAttribute *attr;
		859
		860	int x = SvIV (ST (arg - 3));
		861	int y = SvIV (ST (arg - 2));
		862	int w = SvIV (ST (arg - 1));
		863	int h = SvIV (ST (arg ));
		864
		865	inkrect.x = 0;
		866	inkrect.y = 0;
		867	inkrect.width = 0;
		868	inkrect.height = 0;
		869
		870	rect.x = x * PANGO_SCALE;
		871	rect.y = y * PANGO_SCALE;
		872	rect.width = w * PANGO_SCALE;
		873	rect.height = h * PANGO_SCALE;
		874
		875	if (!attrs)
		876	attrs = pango_layout_get_attributes (self->pl);
		877
		878	attr = pango_attr_shape_new (&inkrect, &rect);
		879	attr->start_index = pos - text;
		880	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		881	pango_attr_list_insert (attrs, attr);
		882
		883	arg += 4;
		884	pos += sizeof (OBJ_STR) - 1;
		885	}
		886
		887	if (attrs)
		888	pango_layout_set_attributes (self->pl, attrs);
		889	}
		890
		891	void
		892	get_shapes (CFPlus::Layout self)
		893	PPCODE:
		894	{
		895	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		896
		897	do
		898	{
		899	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		900
		901	if (run && shape_attr_p (run))
		902	{
		903	PangoRectangle extents;
		904	pango_layout_iter_get_run_extents (iter, 0, &extents);
		905
		906	EXTEND (SP, 2);
		907	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		908	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		909	}
		910	}
		911	while (pango_layout_iter_next_run (iter));
		912
		913	pango_layout_iter_free (iter);
		914	}
		915
		916	int
		917	has_wrapped (CFPlus::Layout self)
		918	CODE:
		919	{
		920	int lines = 1;
		921	const char *text = pango_layout_get_text (self->pl);
		922
		923	while (*text)
		924	lines += *text++ == '\n';
		925
		926	RETVAL = lines < pango_layout_get_line_count (self->pl);
		927	}
		928	OUTPUT:
		929	RETVAL
		930
729	SV *	931	SV *
730	get_text (CFClient::Layout self)	932	get_text (CFPlus::Layout self)
731	CODE:	933	CODE:
732	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	934	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
733	SvUTF8_on (RETVAL);	935	sv_utf8_decode (RETVAL);
734	OUTPUT:	936	OUTPUT:
735	RETVAL	937	RETVAL
736		938
737	void	939	void
		940	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
		941	CODE:
		942	self->r = r;
		943	self->g = g;
		944	self->b = b;
		945	self->a = a;
		946
		947	void
738	set_font (CFClient::Layout self, CFClient::Font font = 0)	948	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
739	CODE:	949	CODE:
740	if (self->font != font)	950	if (self->font != font)
741	{	951	{
742	self->font = font;	952	self->font = font;
743	layout_update_font (self);	953	layout_update_font (self);
744	}	954	}
745		955
746	void	956	void
747	set_height (CFClient::Layout self, int base_height)	957	set_height (CFPlus::Layout self, int base_height)
748	CODE:	958	CODE:
749	if (self->base_height != base_height)	959	if (self->base_height != base_height)
750	{	960	{
751	self->base_height = base_height;	961	self->base_height = base_height;
752	layout_update_font (self);	962	layout_update_font (self);
753	}	963	}
754		964
755	void	965	void
756	set_width (CFClient::Layout self, int max_width = -1)	966	set_width (CFPlus::Layout self, int max_width = -1)
757	CODE:	967	CODE:
758	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	968	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
759		969
760	void	970	void
		971	set_indent (CFPlus::Layout self, int indent)
		972	CODE:
		973	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		974
		975	void
		976	set_spacing (CFPlus::Layout self, int spacing)
		977	CODE:
		978	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		979
		980	void
		981	set_ellipsise (CFPlus::Layout self, int ellipsise)
		982	CODE:
		983	pango_layout_set_ellipsize (self->pl,
		984	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		985	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		986	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		987	: PANGO_ELLIPSIZE_NONE
		988	);
		989
		990	void
		991	set_single_paragraph_mode (CFPlus::Layout self, int spm)
		992	CODE:
		993	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		994
		995	void
761	size (CFClient::Layout self)	996	size (CFPlus::Layout self)
762	PPCODE:	997	PPCODE:
763	{	998	{
764	int w, h;	999	int w, h;
765		1000
766	layout_get_pixel_size (self, &w, &h);	1001	layout_get_pixel_size (self, &w, &h);
…		…
769	PUSHs (sv_2mortal (newSViv (w)));	1004	PUSHs (sv_2mortal (newSViv (w)));
770	PUSHs (sv_2mortal (newSViv (h)));	1005	PUSHs (sv_2mortal (newSViv (h)));
771	}	1006	}
772		1007
773	int	1008	int
		1009	descent (CFPlus::Layout self)
		1010	CODE:
		1011	{
		1012	PangoRectangle rect;
		1013	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1014	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1015	RETVAL = PANGO_DESCENT (rect);
		1016	}
		1017	OUTPUT:
		1018	RETVAL
		1019
		1020	int
774	xy_to_index (CFClient::Layout self, int x, int y)	1021	xy_to_index (CFPlus::Layout self, int x, int y)
775	CODE:	1022	CODE:
776	{	1023	{
777	int index, trailing;	1024	int index, trailing;
778	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1025	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
779	RETVAL = index;	1026	RETVAL = index;
780	}	1027	}
781	OUTPUT:	1028	OUTPUT:
782	RETVAL	1029	RETVAL
783		1030
784	void	1031	void
785	cursor_pos (CFClient::Layout self, int index)	1032	cursor_pos (CFPlus::Layout self, int index)
786	PPCODE:	1033	PPCODE:
787	{	1034	{
788	PangoRectangle strong_pos;	1035	PangoRectangle strong_pos;
789	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1036	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
790		1037
…		…
793	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1040	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
794	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1041	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
795	}	1042	}
796		1043
797	void	1044	void
798	render (CFClient::Layout self)	1045	render (CFPlus::Layout self, float x, float y, int flags = 0)
799	PPCODE:	1046	PPCODE:
800	{	1047	pango_opengl_render_layout_subpixel (
801	SV *retval;	1048	self->pl,
802	int w, h;	1049	x * PANGO_SCALE, y * PANGO_SCALE,
803	FT_Bitmap bitmap;	1050	self->r, self->g, self->b, self->a,
		1051	flags
		1052	);
804		1053
805	layout_get_pixel_size (self, &w, &h);	1054	MODULE = CFPlus PACKAGE = CFPlus::Texture
806		1055
807	retval = newSV (w * h);	1056	void
808	SvPOK_only (retval);	1057	pad2pot (SV data_, SV w_, SV *h_)
809	SvCUR_set (retval, w * h);	1058	CODE:
		1059	{
		1060	int ow = SvIV (w_);
		1061	int oh = SvIV (h_);
810		1062
811	bitmap.rows = h;	1063	if (ow && oh)
812	bitmap.width = w;	1064	{
813	bitmap.pitch = w;	1065	int nw = minpot (ow);
814	bitmap.buffer = (unsigned char*)SvPVX (retval);	1066	int nh = minpot (oh);
815	bitmap.num_grays = 256;
816	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
817		1067
818	memset (bitmap.buffer, 0, w * h);	1068	if (nw != ow \|\| nh != oh)
819		1069	{
820	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	1070	if (SvOK (data_))
		1071	{
		1072	STRLEN datalen;
		1073	char *data = SvPVbyte (data_, datalen);
		1074	int bpp = datalen / (ow * oh);
		1075	SV result_ = sv_2mortal (newSV (nw nh * bpp));
821		1076
822	EXTEND (SP, 3);	1077	SvPOK_only (result_);
823	PUSHs (sv_2mortal (newSViv (w)));	1078	SvCUR_set (result_, nw * nh * bpp);
824	PUSHs (sv_2mortal (newSViv (h)));
825	PUSHs (sv_2mortal (retval));
826	}
827		1079
828	MODULE = CFClient PACKAGE = CFClient::Texture	1080	memset (SvPVX (result_), 0, nw * nh * bpp);
		1081	while (oh--)
		1082	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
829		1083
		1084	sv_setsv (data_, result_);
		1085	}
		1086
		1087	sv_setiv (w_, nw);
		1088	sv_setiv (h_, nh);
		1089	}
		1090	}
		1091	}
		1092
830	void	1093	void
831	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1094	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
832	PROTOTYPE: $$$;$$	1095	PROTOTYPE: $$$;$$
		1096	ALIAS:
		1097	draw_quad_alpha = 1
		1098	draw_quad_alpha_premultiplied = 2
833	CODE:	1099	CODE:
834	{	1100	{
835	HV hv = (HV )SvRV (self);	1101	HV hv = (HV )SvRV (self);
836	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1102	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
837	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1103	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
838	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1104	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
839	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
840		1105
841	if (items < 5)	1106	if (items < 5)
842	{	1107	{
843	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1108	w = SvNV (*hv_fetch (hv, "w", 1, 1));
844	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1109	h = SvNV (*hv_fetch (hv, "h", 1, 1));
845	}	1110	}
846		1111
		1112	if (ix)
		1113	{
		1114	glEnable (GL_BLEND);
		1115
		1116	if (ix == 2)
		1117	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1118	else
		1119	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1120	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1121
		1122	glEnable (GL_ALPHA_TEST);
		1123	glAlphaFunc (GL_GREATER, 0.01f);
		1124	}
		1125
847	glBindTexture (GL_TEXTURE_2D, name);	1126	glBindTexture (GL_TEXTURE_2D, name);
848	if (wrap_mode) {	1127
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);	1128	glBegin (GL_QUADS);
853	glTexCoord2f (0, 0); glVertex2f (x , y );	1129	glTexCoord2f (0, 0); glVertex2f (x , y );
854	glTexCoord2f (0, t); glVertex2f (x , y + h);	1130	glTexCoord2f (0, t); glVertex2f (x , y + h);
855	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1131	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
856	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1132	glTexCoord2f (s, 0); glVertex2f (x + w, y );
857	glEnd ();	1133	glEnd ();
858	}
859		1134
		1135	if (ix)
		1136	{
		1137	glDisable (GL_ALPHA_TEST);
		1138	glDisable (GL_BLEND);
		1139	}
		1140	}
		1141
860	MODULE = CFClient PACKAGE = CFClient::Map	1142	MODULE = CFPlus PACKAGE = CFPlus::Map
861		1143
862	CFClient::Map	1144	CFPlus::Map
863	new (SV *class, int map_width, int map_height)	1145	new (SV *class, int map_width, int map_height)
864	CODE:	1146	CODE:
865	New (0, RETVAL, 1, struct map);	1147	New (0, RETVAL, 1, struct map);
866	RETVAL->x = 0;	1148	RETVAL->x = 0;
867	RETVAL->y = 0;	1149	RETVAL->y = 0;
…		…
877	RETVAL->row = 0;	1159	RETVAL->row = 0;
878	OUTPUT:	1160	OUTPUT:
879	RETVAL	1161	RETVAL
880		1162
881	void	1163	void
882	DESTROY (CFClient::Map self)	1164	DESTROY (CFPlus::Map self)
883	CODE:	1165	CODE:
884	{	1166	{
885	map_clear (self);	1167	map_clear (self);
886	Safefree (self->face);	1168	Safefree (self->face);
		1169	Safefree (self->tex);
887	Safefree (self);	1170	Safefree (self);
888	}	1171	}
889		1172
890	void	1173	void
891	clear (CFClient::Map self)	1174	clear (CFPlus::Map self)
892	CODE:	1175	CODE:
893	map_clear (self);	1176	map_clear (self);
894		1177
895	void	1178	void
896	set_face (CFClient::Map self, int face, int texid)	1179	set_face (CFPlus::Map self, int face, int texid)
897	CODE:	1180	CODE:
898	{	1181	{
899	while (self->faces <= face)	1182	while (self->faces <= face)
900	{	1183	{
901	Append (mapface, self->face, self->faces, self->faces);	1184	Append (mapface, self->face, self->faces, self->faces);
…		…
904		1187
905	self->face [face] = texid;	1188	self->face [face] = texid;
906	}	1189	}
907		1190
908	void	1191	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)	1192	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:	1193	CODE:
911	{	1194	{
912	while (self->texs <= texid)	1195	while (self->texs <= texid)
913	{	1196	{
914	Append (maptex, self->tex, self->texs, self->texs);	1197	Append (maptex, self->tex, self->texs, self->texs);
…		…
926	tex->r = r;	1209	tex->r = r;
927	tex->g = g;	1210	tex->g = g;
928	tex->b = b;	1211	tex->b = b;
929	tex->a = a;	1212	tex->a = a;
930	}	1213	}
		1214
		1215	// somewhat hackish, but for textures that require it, it really
		1216	// improves the look, and most others don't suffer.
		1217	glBindTexture (GL_TEXTURE_2D, name);
		1218	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1219	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1220	// use uglier nearest interpolation because linear suffers
		1221	// from transparent color bleeding and ugly wrapping effects.
		1222	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
931	}	1223	}
932		1224
933	int	1225	int
934	ox (CFClient::Map self)	1226	ox (CFPlus::Map self)
935	ALIAS:	1227	ALIAS:
936	oy = 1	1228	oy = 1
		1229	x = 2
		1230	y = 3
		1231	w = 4
		1232	h = 5
937	CODE:	1233	CODE:
938	switch (ix)	1234	switch (ix)
939	{	1235	{
940	case 0: RETVAL = self->ox; break;	1236	case 0: RETVAL = self->ox; break;
941	case 1: RETVAL = self->oy; break;	1237	case 1: RETVAL = self->oy; break;
		1238	case 2: RETVAL = self->x; break;
		1239	case 3: RETVAL = self->y; break;
		1240	case 4: RETVAL = self->w; break;
		1241	case 5: RETVAL = self->h; break;
942	}	1242	}
943	OUTPUT:	1243	OUTPUT:
944	RETVAL	1244	RETVAL
945		1245
946	void	1246	void
947	scroll (CFClient::Map self, int dx, int dy)	1247	scroll (CFPlus::Map self, int dx, int dy)
948	CODE:	1248	CODE:
949	{	1249	{
950	if (dx > 0)	1250	if (dx > 0)
951	map_blank (self, self->x, self->y, dx - 1, self->h);	1251	map_blank (self, self->x, self->y, dx, self->h);
952	else if (dx < 0)	1252	else if (dx < 0)
953	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1253	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
954		1254
955	if (dy > 0)	1255	if (dy > 0)
956	map_blank (self, self->x, self->y, self->w, dy - 1);	1256	map_blank (self, self->x, self->y, self->w, dy);
957	else if (dy < 0)	1257	else if (dy < 0)
958	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1258	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
959		1259
960	self->ox += dx; self->x += dx;	1260	self->ox += dx; self->x += dx;
961	self->oy += dy; self->y += dy;	1261	self->oy += dy; self->y += dy;
962		1262
963	while (self->y < 0)	1263	while (self->y < 0)
…		…
968	self->y += MAP_EXTEND_Y;	1268	self->y += MAP_EXTEND_Y;
969	}	1269	}
970	}	1270	}
971		1271
972	void	1272	void
973	map1a_update (CFClient::Map self, SV *data_)	1273	map1a_update (CFPlus::Map self, SV *data_, int extmap)
974	CODE:	1274	CODE:
975	{	1275	{
976	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1276	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
977	uint8_t data_end = (uint8_t )SvEND (data_);	1277	uint8_t data_end = (uint8_t )SvEND (data_);
978	mapcell *cell;	1278	mapcell *cell;
979	int x, y, flags;	1279	int x, y, flags;
980		1280
981	while (data < data_end)	1281	while (data < data_end - 1)
982	{	1282	{
983	flags = (data [0] << 8) + data [1]; data += 2;	1283	flags = (data [0] << 8) + data [1]; data += 2;
984		1284
985	x = ((flags >> 10) & 63) + self->x;	1285	x = self->x + ((flags >> 10) & 63);
986	y = ((flags >> 4) & 63) + self->y;	1286	y = self->y + ((flags >> 4) & 63);
987		1287
988	cell = map_get_cell (self, x, y);	1288	cell = map_get_cell (self, x, y);
989		1289
990	if (flags & 15)	1290	if (flags & 15)
991	{	1291	{
992	if (cell->darkness < 0)	1292	if (!cell->darkness)
993	{	1293	{
		1294	memset (cell, 0, sizeof (*cell));
994	cell->darkness = 0;	1295	cell->darkness = 256;
995	cell->face [0] = 0;
996	cell->face [1] = 0;
997	cell->face [2] = 0;
998	}	1296	}
999		1297
1000	cell->darkness = flags & 8 ? *data++ : 255;
1001
1002	//TODO: don't trust server data to be in-range(!)	1298	//TODO: don't trust server data to be in-range(!)
		1299
		1300	if (flags & 8)
		1301	{
		1302	if (extmap)
		1303	{
		1304	uint8_t ext, cmd;
		1305
		1306	do
		1307	{
		1308	ext = *data++;
		1309	cmd = ext & 0x3f;
		1310
		1311	if (cmd < 4)
		1312	cell->darkness = 255 - ext * 64 + 1;
		1313	else if (cmd == 5) // health
		1314	{
		1315	cell->stat_width = 1;
		1316	cell->stat_hp = *data++;
		1317	}
		1318	else if (cmd == 6) // monster width
		1319	cell->stat_width = *data++ + 1;
		1320	else if (cmd == 0x47) // monster width
		1321	{
		1322	if (*data == 4)
		1323	; // decode player tag
		1324
		1325	data += *data + 1;
		1326	}
		1327	else if (cmd == 8) // cell flags
		1328	cell->flags = *data++;
		1329	else if (ext & 0x40) // unknown, multibyte => skip
		1330	data += *data + 1;
		1331	else
		1332	data++;
		1333	}
		1334	while (ext & 0x80);
		1335	}
		1336	else
		1337	cell->darkness = *data++ + 1;
		1338
		1339	}
1003		1340
1004	if (flags & 4)	1341	if (flags & 4)
1005	{	1342	{
1006	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1343	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1007	}	1344	}
…		…
1015	{	1352	{
1016	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1353	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1017	}	1354	}
1018	}	1355	}
1019	else	1356	else
1020	cell->darkness = -1;	1357	cell->darkness = 0;
1021	}	1358	}
1022	}	1359	}
1023		1360
1024	SV *	1361	SV *
1025	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1362	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1026	CODE:	1363	CODE:
1027	{	1364	{
1028	int x1, x;	1365	int x1, x;
1029	int y1, y;	1366	int y1, y;
1030	int z;	1367	int z;
…		…
1080	}	1417	}
1081	OUTPUT:	1418	OUTPUT:
1082	RETVAL	1419	RETVAL
1083		1420
1084	void	1421	void
1085	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1422	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1086	PPCODE:	1423	CODE:
1087	{	1424	{
1088	int vx, vy;	1425	int vx, vy;
1089	int x, y, z;	1426	int x, y, z;
1090	int last_name;	1427	int last_name;
1091	mapface face;	1428	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		1429
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;	1430	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1101	vy = self->y + (self->h - sh) / 2 - shift_y;	1431	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1102		1432
1103	/*	1433	/*
1104	int vx = self->vx = self->w >= sw	1434	int vx = self->vx = self->w >= sw
1105	? self->x + (self->w - sw) / 2	1435	? self->x + (self->w - sw) / 2
1106	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1436	: 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));	1440	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1111	*/	1441	*/
1112		1442
1113	glColor4ub (255, 255, 255, 255);	1443	glColor4ub (255, 255, 255, 255);
1114		1444
		1445	glEnable (GL_BLEND);
1115	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1446	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1116	glEnable (GL_BLEND);
1117	glEnable (GL_TEXTURE_2D);	1447	glEnable (GL_TEXTURE_2D);
1118	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1448	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1119		1449
1120	glBegin (GL_QUADS);	1450	glBegin (GL_QUADS);
1121		1451
…		…
1130	for (x = 0; x < sw; x++)	1460	for (x = 0; x < sw; x++)
1131	if (row->c0 <= x + vx && x + vx < row->c1)	1461	if (row->c0 <= x + vx && x + vx < row->c1)
1132	{	1462	{
1133	mapcell *cell = row->col + (x + vx - row->c0);	1463	mapcell *cell = row->col + (x + vx - row->c0);
1134		1464
1135	darkness[y * sw4 + x] = cell->darkness < 0
1136	? 255 - FOW_DARKNESS
1137	: 255 - cell->darkness;
1138
1139	face = cell->face [z];	1465	face = cell->face [z];
1140		1466
1141	if (face)	1467	if (face && face < self->texs)
1142	{	1468	{
1143	maptex tex = self->tex [face];	1469	maptex tex = self->tex [face];
1144
1145	int px = (x + 1) * 32 - tex.w;	1470	int px = (x + 1) * 32 - tex.w;
1146	int py = (y + 1) * 32 - tex.h;	1471	int py = (y + 1) * 32 - tex.h;
1147		1472
1148	if (last_name != tex.name)	1473	if (last_name != tex.name)
1149	{	1474	{
1150	glEnd ();	1475	glEnd ();
1151	last_name = tex.name;
1152	glBindTexture (GL_TEXTURE_2D, last_name);	1476	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1153	glBegin (GL_QUADS);	1477	glBegin (GL_QUADS);
1154	}	1478	}
1155		1479
1156	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1480	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1157	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1481	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1158	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1482	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1159	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1483	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1160	}	1484	}
		1485
		1486	if (cell->flags && z == 2)
		1487	{
		1488	if (cell->flags & 1)
		1489	{
		1490	maptex tex = self->tex [1];
		1491	int px = (x + 1) * 32 - tex.w + 2;
		1492	int py = (y + 1) * 32 - tex.h - 6;
		1493
		1494	glEnd ();
		1495	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1496	glBegin (GL_QUADS);
		1497
		1498	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1499	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1500	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1501	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1502	}
		1503	}
1161	}	1504	}
1162	}	1505	}
1163		1506
1164	glEnd ();	1507	glEnd ();
1165		1508
1166	glDisable (GL_TEXTURE_2D);	1509	glDisable (GL_TEXTURE_2D);
1167	glDisable (GL_BLEND);	1510	glDisable (GL_BLEND);
		1511
		1512	// top layer: overlays such as the health bar
		1513	for (y = 0; y < sh; y++)
		1514	if (0 <= y + vy && y + vy < self->rows)
		1515	{
		1516	maprow *row = self->row + (y + vy);
		1517
		1518	for (x = 0; x < sw; x++)
		1519	if (row->c0 <= x + vx && x + vx < row->c1)
		1520	{
		1521	mapcell *cell = row->col + (x + vx - row->c0);
		1522
		1523	int px = x * 32;
		1524	int py = y * 32;
		1525
		1526	if (cell->stat_hp)
		1527	{
		1528	int width = cell->stat_width * 32;
		1529	int thick = sh / 28 + 1 + cell->stat_width;
		1530
		1531	glColor3ub (0, 0, 0);
		1532	glRectf (px + 1, py - thick - 2,
		1533	px + width - 1, py);
		1534
		1535	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1536	glRectf (px + 2,
		1537	py - thick - 1,
		1538	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1539	}
		1540	}
		1541	}
		1542	}
		1543
		1544	void
		1545	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1546	CODE:
		1547	{
		1548	static float color[16][3] = {
		1549	{ 0.00F, 0.00F, 0.00F },
		1550	{ 1.00F, 1.00F, 1.00F },
		1551	{ 0.00F, 0.00F, 0.55F },
		1552	{ 1.00F, 0.00F, 0.00F },
		1553
		1554	{ 1.00F, 0.54F, 0.00F },
		1555	{ 0.11F, 0.56F, 1.00F },
		1556	{ 0.93F, 0.46F, 0.00F },
		1557	{ 0.18F, 0.54F, 0.34F },
		1558
		1559	{ 0.56F, 0.73F, 0.56F },
		1560	{ 0.80F, 0.80F, 0.80F },
		1561	{ 0.55F, 0.41F, 0.13F },
		1562	{ 0.99F, 0.77F, 0.26F },
		1563
		1564	{ 0.74F, 0.65F, 0.41F },
		1565
		1566	{ 0.00F, 1.00F, 1.00F },
		1567	{ 1.00F, 0.00F, 1.00F },
		1568	{ 1.00F, 1.00F, 0.00F },
		1569	};
		1570
		1571	int x, y;
		1572
		1573	glEnable (GL_TEXTURE_2D);
		1574	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1575	glEnable (GL_BLEND);
		1576	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1577	glBegin (GL_QUADS);
		1578
		1579	for (y = 0; y < h; y++)
		1580	for (x = 0; x < w; x++)
		1581	{
		1582	unsigned char m = data [x + y * w];
		1583
		1584	if (m)
		1585	{
		1586	float *c = color [m & 15];
		1587
		1588	float tx1 = m & 0x40 ? 0.5 : 0.;
		1589	float tx2 = tx1 + 0.5;
		1590
		1591	glColor4f (c[0], c[1], c[2], 0.75);
		1592	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1593	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1594	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1595	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1596	}
		1597	}
		1598
		1599	glEnd ();
		1600	glDisable (GL_BLEND);
		1601	glDisable (GL_TEXTURE_2D);
		1602	}
		1603
		1604	void
		1605	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1606	PPCODE:
		1607	{
		1608	int vx, vy;
		1609	int x, y;
		1610	int sw4 = (sw + 3) & ~3;
		1611	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1612	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1613
		1614	memset (darkness, 255, sw4 * sh);
		1615	SvPOK_only (darkness_sv);
		1616	SvCUR_set (darkness_sv, sw4 * sh);
		1617
		1618	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1619	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1620
		1621	for (y = 0; y < sh; y++)
		1622	if (0 <= y + vy && y + vy < self->rows)
		1623	{
		1624	maprow *row = self->row + (y + vy);
		1625
		1626	for (x = 0; x < sw; x++)
		1627	if (row->c0 <= x + vx && x + vx < row->c1)
		1628	{
		1629	mapcell *cell = row->col + (x + vx - row->c0);
		1630
		1631	darkness[y * sw4 + x] = cell->darkness
		1632	? 255 - (cell->darkness - 1)
		1633	: 255 - FOW_DARKNESS;
		1634	}
		1635	}
1168		1636
1169	EXTEND (SP, 3);	1637	EXTEND (SP, 3);
1170	PUSHs (sv_2mortal (newSViv (sw4)));	1638	PUSHs (sv_2mortal (newSViv (sw4)));
1171	PUSHs (sv_2mortal (newSViv (sh)));	1639	PUSHs (sv_2mortal (newSViv (sh)));
1172	PUSHs (darkness_sv);	1640	PUSHs (darkness_sv);
1173	}	1641	}
1174		1642
1175	SV *	1643	SV *
1176	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1644	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1177	CODE:	1645	CODE:
1178	{	1646	{
1179	int x, y, x1, y1;	1647	int x, y, x1, y1;
1180	SV data_sv = newSV (w h * 7 + 5);	1648	SV data_sv = newSV (w h * 7 + 5);
1181	uint8_t data = (uint8_t )SvPVX (data_sv);	1649	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1243	}	1711	}
1244	OUTPUT:	1712	OUTPUT:
1245	RETVAL	1713	RETVAL
1246		1714
1247	void	1715	void
1248	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1716	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1249	PPCODE:	1717	PPCODE:
1250	{	1718	{
1251	int x, y, z;	1719	int x, y, z;
1252	int w, h;	1720	int w, h;
1253	int x1, y1;	1721	int x1, y1;
…		…
1285		1753
1286	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1754	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1287	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1755	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1288	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1756	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1289		1757
1290	if (cell->darkness <= 0)	1758	if (cell->darkness == 0)
1291	{	1759	{
1292	cell->darkness = -1;	1760	cell->darkness = 0;
1293		1761
1294	for (z = 0; z <= 2; z++)	1762	for (z = 0; z <= 2; z++)
1295	{	1763	{
1296	cell->face[z] = face[z];	1764	cell->face[z] = face[z];
1297		1765
…		…
1302	}	1770	}
1303	}	1771	}
1304	}	1772	}
1305	}	1773	}
1306		1774
1307	MODULE = CFClient PACKAGE = CFClient::MixChunk	1775	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1308		1776
1309	CFClient::MixChunk	1777	CFPlus::MixChunk
1310	new_from_file (SV class, char path)	1778	new_from_file (SV class, char path)
1311	CODE:	1779	CODE:
1312	RETVAL = Mix_LoadWAV (path);	1780	RETVAL = Mix_LoadWAV (path);
1313	OUTPUT:	1781	OUTPUT:
1314	RETVAL	1782	RETVAL
1315		1783
1316	void	1784	void
1317	DESTROY (CFClient::MixChunk self)	1785	DESTROY (CFPlus::MixChunk self)
1318	CODE:	1786	CODE:
1319	Mix_FreeChunk (self);	1787	Mix_FreeChunk (self);
1320		1788
1321	int	1789	int
1322	volume (CFClient::MixChunk self, int volume = -1)	1790	volume (CFPlus::MixChunk self, int volume = -1)
1323	CODE:	1791	CODE:
1324	RETVAL = Mix_VolumeChunk (self, volume);	1792	RETVAL = Mix_VolumeChunk (self, volume);
1325	OUTPUT:	1793	OUTPUT:
1326	RETVAL	1794	RETVAL
1327		1795
1328	int	1796	int
1329	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1797	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1330	CODE:	1798	CODE:
1331	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1799	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1332	OUTPUT:	1800	OUTPUT:
1333	RETVAL	1801	RETVAL
1334		1802
1335	MODULE = CFClient PACKAGE = CFClient::MixMusic	1803	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1336		1804
1337	int	1805	int
1338	volume (int volume = -1)	1806	volume (int volume = -1)
1339	CODE:	1807	CODE:
1340	RETVAL = Mix_VolumeMusic (volume);	1808	RETVAL = Mix_VolumeMusic (volume);
1341	OUTPUT:	1809	OUTPUT:
1342	RETVAL	1810	RETVAL
1343		1811
1344	CFClient::MixMusic	1812	CFPlus::MixMusic
1345	new_from_file (SV class, char path)	1813	new_from_file (SV class, char path)
1346	CODE:	1814	CODE:
1347	RETVAL = Mix_LoadMUS (path);	1815	RETVAL = Mix_LoadMUS (path);
1348	OUTPUT:	1816	OUTPUT:
1349	RETVAL	1817	RETVAL
1350		1818
1351	void	1819	void
1352	DESTROY (CFClient::MixMusic self)	1820	DESTROY (CFPlus::MixMusic self)
1353	CODE:	1821	CODE:
1354	Mix_FreeMusic (self);	1822	Mix_FreeMusic (self);
1355		1823
1356	int	1824	int
1357	play (CFClient::MixMusic self, int loops = -1)	1825	play (CFPlus::MixMusic self, int loops = -1)
1358	CODE:	1826	CODE:
1359	RETVAL = Mix_PlayMusic (self, loops);	1827	RETVAL = Mix_PlayMusic (self, loops);
1360	OUTPUT:	1828	OUTPUT:
1361	RETVAL	1829	RETVAL
1362		1830
1363	MODULE = CFClient PACKAGE = CFClient::OpenGL	1831	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1364		1832
1365	BOOT:	1833	BOOT:
1366	{	1834	{
1367	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1835	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1368	static const struct {	1836	static const struct {
1369	const char *name;	1837	const char *name;
1370	IV iv;	1838	IV iv;
1371	} *civ, const_iv[] = {	1839	} *civ, const_iv[] = {
1372	# define const_iv(name) { # name, (IV)name }	1840	# define const_iv(name) { # name, (IV)name }
1373	const_iv (GL_COLOR_MATERIAL),	1841	const_iv (GL_COLOR_MATERIAL),
1374	const_iv (GL_SMOOTH),	1842	const_iv (GL_SMOOTH),
1375	const_iv (GL_FLAT),	1843	const_iv (GL_FLAT),
1376	const_iv (GL_DITHER),	1844	const_iv (GL_DITHER),
1377	const_iv (GL_BLEND),	1845	const_iv (GL_BLEND),
		1846	const_iv (GL_CULL_FACE),
1378	const_iv (GL_SCISSOR_TEST),	1847	const_iv (GL_SCISSOR_TEST),
		1848	const_iv (GL_DEPTH_TEST),
		1849	const_iv (GL_ALPHA_TEST),
		1850	const_iv (GL_NORMALIZE),
		1851	const_iv (GL_RESCALE_NORMAL),
		1852	const_iv (GL_FRONT),
		1853	const_iv (GL_BACK),
1379	const_iv (GL_AND),	1854	const_iv (GL_AND),
1380	const_iv (GL_ONE),	1855	const_iv (GL_ONE),
1381	const_iv (GL_ZERO),	1856	const_iv (GL_ZERO),
1382	const_iv (GL_SRC_ALPHA),	1857	const_iv (GL_SRC_ALPHA),
1383	const_iv (GL_SRC_ALPHA_SATURATE),	1858	const_iv (GL_DST_ALPHA),
1384	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1859	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1385	const_iv (GL_ONE_MINUS_DST_ALPHA),	1860	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1861	const_iv (GL_SRC_ALPHA_SATURATE),
1386	const_iv (GL_RGB),	1862	const_iv (GL_RGB),
1387	const_iv (GL_RGBA),	1863	const_iv (GL_RGBA),
		1864	const_iv (GL_RGBA4),
		1865	const_iv (GL_RGBA8),
		1866	const_iv (GL_RGB5_A1),
1388	const_iv (GL_UNSIGNED_BYTE),	1867	const_iv (GL_UNSIGNED_BYTE),
		1868	const_iv (GL_UNSIGNED_SHORT),
		1869	const_iv (GL_UNSIGNED_INT),
1389	const_iv (GL_ALPHA),	1870	const_iv (GL_ALPHA),
		1871	const_iv (GL_INTENSITY),
		1872	const_iv (GL_LUMINANCE),
		1873	const_iv (GL_LUMINANCE_ALPHA),
1390	const_iv (GL_FLOAT),	1874	const_iv (GL_FLOAT),
1391	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1875	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1392	const_iv (GL_COMPILE),	1876	const_iv (GL_COMPILE),
1393	const_iv (GL_TEXTURE_1D),	1877	const_iv (GL_TEXTURE_1D),
1394	const_iv (GL_TEXTURE_2D),	1878	const_iv (GL_TEXTURE_2D),
…		…
1396	const_iv (GL_TEXTURE_MAG_FILTER),	1880	const_iv (GL_TEXTURE_MAG_FILTER),
1397	const_iv (GL_TEXTURE_MIN_FILTER),	1881	const_iv (GL_TEXTURE_MIN_FILTER),
1398	const_iv (GL_TEXTURE_ENV_MODE),	1882	const_iv (GL_TEXTURE_ENV_MODE),
1399	const_iv (GL_TEXTURE_WRAP_S),	1883	const_iv (GL_TEXTURE_WRAP_S),
1400	const_iv (GL_TEXTURE_WRAP_T),	1884	const_iv (GL_TEXTURE_WRAP_T),
		1885	const_iv (GL_REPEAT),
1401	const_iv (GL_CLAMP),	1886	const_iv (GL_CLAMP),
1402	const_iv (GL_REPEAT),	1887	const_iv (GL_CLAMP_TO_EDGE),
1403	const_iv (GL_NEAREST),	1888	const_iv (GL_NEAREST),
1404	const_iv (GL_LINEAR),	1889	const_iv (GL_LINEAR),
1405	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1890	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1406	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1891	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1407	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1892	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1408	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1893	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1409	const_iv (GL_GENERATE_MIPMAP),	1894	const_iv (GL_GENERATE_MIPMAP),
1410	const_iv (GL_MODULATE),	1895	const_iv (GL_MODULATE),
1411	const_iv (GL_DECAL),	1896	const_iv (GL_DECAL),
1412	const_iv (GL_REPLACE),	1897	const_iv (GL_REPLACE),
		1898	const_iv (GL_DEPTH_BUFFER_BIT),
1413	const_iv (GL_COLOR_BUFFER_BIT),	1899	const_iv (GL_COLOR_BUFFER_BIT),
1414	const_iv (GL_PROJECTION),	1900	const_iv (GL_PROJECTION),
1415	const_iv (GL_MODELVIEW),	1901	const_iv (GL_MODELVIEW),
1416	const_iv (GL_COLOR_LOGIC_OP),	1902	const_iv (GL_COLOR_LOGIC_OP),
1417	const_iv (GL_SEPARABLE_2D),	1903	const_iv (GL_SEPARABLE_2D),
1418	const_iv (GL_CONVOLUTION_2D),	1904	const_iv (GL_CONVOLUTION_2D),
1419	const_iv (GL_CONVOLUTION_BORDER_MODE),	1905	const_iv (GL_CONVOLUTION_BORDER_MODE),
1420	const_iv (GL_CONSTANT_BORDER),	1906	const_iv (GL_CONSTANT_BORDER),
1421	const_iv (GL_LINES),	1907	const_iv (GL_LINES),
		1908	const_iv (GL_LINE_STRIP),
		1909	const_iv (GL_LINE_LOOP),
1422	const_iv (GL_QUADS),	1910	const_iv (GL_QUADS),
1423	const_iv (GL_LINE_LOOP),	1911	const_iv (GL_QUAD_STRIP),
		1912	const_iv (GL_TRIANGLES),
		1913	const_iv (GL_TRIANGLE_STRIP),
		1914	const_iv (GL_TRIANGLE_FAN),
1424	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1915	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1425	const_iv (GL_FASTEST),	1916	const_iv (GL_FASTEST),
		1917	const_iv (GL_V2F),
		1918	const_iv (GL_V3F),
		1919	const_iv (GL_T2F_V3F),
		1920	const_iv (GL_T2F_N3F_V3F),
1426	# undef const_iv	1921	# undef const_iv
1427	};	1922	};
1428		1923
1429	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1924	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1430	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1925	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1431	}	1926	}
1432		1927
		1928	char *
		1929	gl_vendor ()
		1930	CODE:
		1931	RETVAL = (char *)glGetString (GL_VENDOR);
		1932	OUTPUT:
		1933	RETVAL
		1934
		1935	char *
		1936	gl_version ()
		1937	CODE:
		1938	RETVAL = (char *)glGetString (GL_VERSION);
		1939	OUTPUT:
		1940	RETVAL
		1941
		1942	char *
		1943	gl_extensions ()
		1944	CODE:
		1945	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1946	OUTPUT:
		1947	RETVAL
		1948
1433	int glGetError ()	1949	int glGetError ()
		1950
		1951	void glFinish ()
1434		1952
1435	void glClear (int mask)	1953	void glClear (int mask)
1436		1954
1437	void glClearColor (float r, float g, float b, float a = 1.0)	1955	void glClearColor (float r, float g, float b, float a = 1.0)
1438	PROTOTYPE: @	1956	PROTOTYPE: @
…		…
1445		1963
1446	void glHint (int target, int mode)	1964	void glHint (int target, int mode)
1447		1965
1448	void glBlendFunc (int sfactor, int dfactor)	1966	void glBlendFunc (int sfactor, int dfactor)
1449		1967
		1968	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1969	CODE:
		1970	gl_BlendFuncSeparate (sa, da, saa, daa);
		1971
		1972	void glDepthMask (int flag)
		1973
1450	void glLogicOp (int opcode)	1974	void glLogicOp (int opcode)
1451		1975
1452	void glColorMask (int red, int green, int blue, int alpha)	1976	void glColorMask (int red, int green, int blue, int alpha)
1453		1977
1454	void glMatrixMode (int mode)	1978	void glMatrixMode (int mode)
…		…
1457		1981
1458	void glPopMatrix ()	1982	void glPopMatrix ()
1459		1983
1460	void glLoadIdentity ()	1984	void glLoadIdentity ()
1461		1985
		1986	void glDrawBuffer (int buffer)
		1987
		1988	void glReadBuffer (int buffer)
		1989
1462	# near and far are due to microsofts buggy c compiler	1990	# near_ and far_ are due to microsofts buggy "c" compiler
		1991	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1992
		1993	# 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_)	1994	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1464		1995
1465	void glViewport (int x, int y, int width, int height)	1996	void glViewport (int x, int y, int width, int height)
1466		1997
1467	void glScissor (int x, int y, int width, int height)	1998	void glScissor (int x, int y, int width, int height)
…		…
1482		2013
1483	void glEnd ()	2014	void glEnd ()
1484		2015
1485	void glColor (float r, float g, float b, float a = 1.0)	2016	void glColor (float r, float g, float b, float a = 1.0)
1486	PROTOTYPE: @	2017	PROTOTYPE: @
		2018	ALIAS:
		2019	glColor_premultiply = 1
1487	CODE:	2020	CODE:
1488	glColor4ub (r * 255., g * 255., b * 255., a * 255.);	2021	if (ix)
		2022	{
		2023	r *= a;
		2024	g *= a;
		2025	b *= a;
		2026	}
		2027	// microsoft visual "c" rounds instead of truncating...
		2028	glColor4f (r, g, b, a);
		2029
		2030	void glInterleavedArrays (int format, int stride, char *data)
		2031
		2032	void glDrawElements (int mode, int count, int type, char *indices)
		2033
		2034	# 1.2 void glDrawRangeElements (int mode, int start, int end
		2035
		2036	void glRasterPos (float x, float y, float z = 0.)
		2037	CODE:
		2038	glRasterPos3f (0, 0, z);
		2039	glBitmap (0, 0, 0, 0, x, y, 0);
1489		2040
1490	void glVertex (float x, float y, float z = 0.)	2041	void glVertex (float x, float y, float z = 0.)
1491	CODE:	2042	CODE:
1492	glVertex3f (x, y, z);	2043	glVertex3f (x, y, z);
1493		2044
…		…
1505		2056
1506	void glBindTexture (int target, int name)	2057	void glBindTexture (int target, int name)
1507		2058
1508	void glConvolutionParameter (int target, int pname, float params)	2059	void glConvolutionParameter (int target, int pname, float params)
1509	CODE:	2060	CODE:
1510	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2061	if (gl.ConvolutionParameterf)
		2062	gl.ConvolutionParameterf (target, pname, params);
1511		2063
1512	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2064	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1513	CODE:	2065	CODE:
1514	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2066	if (gl.ConvolutionFilter2D)
1515	(target, internalformat, width, height, format, type, data));	2067	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1516		2068
1517	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2069	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1518	CODE:	2070	CODE:
1519	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2071	if (gl.SeparableFilter2D)
1520	(target, internalformat, width, height, format, type, row, column));	2072	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1521		2073
1522	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2074	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1523		2075
1524	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2076	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1525		2077
1526	void glRasterPos (int x, int y)	2078	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1527	CODE:
1528	glRasterPos2i (x, y);
1529		2079
1530	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2080	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1531		2081
1532	int glGenTexture ()	2082	int glGenTexture ()
1533	CODE:	2083	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.155 by root, Thu Sep 21 00:16:42 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.155 by root, Thu Sep 21 00:16:42 2006 UTC