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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.70 by root, Sun Apr 30 09:21:47 2006 UTC vs.
Revision 1.142 by root, Fri Aug 18 01:27:15 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>
		6	# pragma warning(disable:4244)
3	#endif	7	#endif
4		8
5	#include "EXTERN.h"	9	#include "EXTERN.h"
6	#include "perl.h"	10	#include "perl.h"
7	#include "XSUB.h"	11	#include "XSUB.h"
8		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
		17	#include <math.h>
9	#include <string.h>	18	#include <string.h>
10	#include <stdio.h>	19	#include <stdio.h>
		20	#include <stdlib.h>
11		21
12	#include <SDL.h>	22	#include <SDL.h>
		23	#include <SDL_endian.h>
13	#include <SDL_image.h>	24	#include <SDL_image.h>
14	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
15	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
16		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
17	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
18		32
19	#include <pango/pango.h>	33	#include <pango/pango.h>
20	#include <pango/pangofc-fontmap.h>
21	#include <pango/pangoft2.h>
22		34
23	#ifndef _WIN32	35	#ifndef _WIN32
24	# include <sys/types.h>	36	# include <sys/types.h>
25	# include <sys/socket.h>	37	# include <sys/socket.h>
26	# include <netinet/in.h>	38	# include <netinet/in.h>
33	typedef signed char int8_t;	45	typedef signed char int8_t;
34	typedef signed short int16_t;	46	typedef signed short int16_t;
35	typedef signed int int32_t;	47	typedef signed int int32_t;
36	#endif	48	#endif
37		49
38	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
39		51
40	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
41		53
42	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
43	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
44		56
45	#define MIN_FONT_HEIGHT 10	57	#define MIN_FONT_HEIGHT 10
46		58
47	#define GL_CALL(type,func,args) \	59	#if 0
48	{ \	60	# define PARACHUTE SDL_INIT_NOPARACHUTE
49	static int init_; \	61	#else
50	static type fptr_; \	62	# define PARACHUTE 0
51	\	63	#endif
52	if (!init_) \
53	{ \
54	init_ = 1; \
55	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
56	} \
57	\
58	if (fptr_) \
59	fptr_ args; \
60	}
61		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
62	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
63	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
64		90
65	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	}
66		110
67	typedef struct cf_layout {	111	typedef struct cf_layout {
68	PangoLayout *pl;	112	PangoLayout *pl;
		113	float r, g, b, a; // default color for rgba mode
69	int base_height;	114	int base_height;
70	CFClient__Font font;	115	CFPlus__Font font;
71	} *CFClient__Layout;	116	} *CFPlus__Layout;
72		117
73	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
74	static PangoContext *context;	119	static PangoContext *opengl_context;
75	static PangoFontMap *fontmap;	120	static PangoFontMap *opengl_fontmap;
76		121
77	static void	122	static void
78	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
79	{	124	{
80	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
81	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
82	}	130	}
83		131
84	static void	132	static void
85	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
86	{	134	{
87	/* 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
88	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
89	*/	137	*/
90	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
94		142
95	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
96	}	144	}
97		145
98	static void	146	static void
99	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
100	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
101	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
102		153
103	w = (w + 3) & ~3;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
104	if (!w) w = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
105	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;
106	}	162	}
107		163
108	typedef uint16_t mapface;	164	typedef uint16_t mapface;
109		165
110	typedef struct {	166	typedef struct {
…		…
113	float s, t;	169	float s, t;
114	uint8_t r, g, b, a;	170	uint8_t r, g, b, a;
115	} maptex;	171	} maptex;
116		172
117	typedef struct {	173	typedef struct {
118	int16_t darkness;	174	uint16_t darkness;
119	mapface face[3];	175	mapface face[3];
		176	uint8_t stat_hp;
120	} mapcell;	177	} mapcell;
121		178
122	typedef struct {	179	typedef struct {
123	int32_t c0, c1;	180	int32_t c0, c1;
124	mapcell *col;	181	mapcell *col;
…		…
133	int texs;	190	int texs;
134	maptex *tex;	191	maptex *tex;
135		192
136	int32_t rows;	193	int32_t rows;
137	maprow *row;	194	maprow *row;
138	} *CFClient__Map;	195	} *CFPlus__Map;
139		196
140	static char *	197	static char *
141	prepend (char *ptr, int sze, int inc)	198	prepend (char *ptr, int sze, int inc)
142	{	199	{
143	char *p;	200	char *p;
…		…
161		218
162	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	219	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
163	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	220	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
164		221
165	static maprow *	222	static maprow *
166	map_get_row (CFClient__Map self, int y)	223	map_get_row (CFPlus__Map self, int y)
167	{	224	{
168	if (0 > y)	225	if (0 > y)
169	{	226	{
170	int extend = - y + MAP_EXTEND_Y;	227	int extend = - y + MAP_EXTEND_Y;
171	Prepend (maprow, self->row, self->rows, extend);	228	Prepend (maprow, self->row, self->rows, extend);
…		…
209		266
210	return row->col + (x - row->c0);	267	return row->col + (x - row->c0);
211	}	268	}
212		269
213	static mapcell *	270	static mapcell *
214	map_get_cell (CFClient__Map self, int x, int y)	271	map_get_cell (CFPlus__Map self, int x, int y)
215	{	272	{
216	return row_get_cell (map_get_row (self, y), x);	273	return row_get_cell (map_get_row (self, y), x);
217	}	274	}
218		275
219	static void	276	static void
220	map_clear (CFClient__Map self)	277	map_clear (CFPlus__Map self)
221	{	278	{
222	int r;	279	int r;
223		280
224	for (r = 0; r < self->rows; r++)	281	for (r = 0; r < self->rows; r++)
225	Safefree (self->row[r].col);	282	Safefree (self->row[r].col);
…		…
233	self->row = 0;	290	self->row = 0;
234	self->rows = 0;	291	self->rows = 0;
235	}	292	}
236		293
237	static void	294	static void
238	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	295	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
239	{	296	{
240	int x, y;	297	int x, y;
241	maprow *row;	298	maprow *row;
242		299
243	for (y = y0; y < y0 + h; y++)	300	for (y = y0; y < y0 + h; y++)
…		…
252	if (x >= row->c0)	309	if (x >= row->c0)
253	{	310	{
254	if (x >= row->c1)	311	if (x >= row->c1)
255	break;	312	break;
256		313
257	row->col[x - row->c0].darkness = -1;	314	row->col[x - row->c0].darkness = 0;
258	}	315	}
259	}	316	}
260	}	317	}
261		318
262	static void	319	static void
263	music_finished ()	320	music_finished (void)
264	{	321	{
265	SDL_UserEvent ev;	322	SDL_UserEvent ev;
266		323
267	ev.type = SDL_USEREVENT;	324	ev.type = SDL_USEREVENT;
268	ev.code = 0;	325	ev.code = 0;
…		…
270	ev.data2 = 0;	327	ev.data2 = 0;
271		328
272	SDL_PushEvent ((SDL_Event *)&ev);	329	SDL_PushEvent ((SDL_Event *)&ev);
273	}	330	}
274		331
		332	static void
		333	channel_finished (int channel)
		334	{
		335	SDL_UserEvent ev;
		336
		337	ev.type = SDL_USEREVENT;
		338	ev.code = 1;
		339	ev.data1 = (void *)(long)channel;
		340	ev.data2 = 0;
		341
		342	SDL_PushEvent ((SDL_Event *)&ev);
		343	}
		344
		345	static unsigned int
		346	minpot (unsigned int n)
		347	{
		348	if (!n)
		349	return 0;
		350
		351	--n;
		352
		353	n \|= n >> 1;
		354	n \|= n >> 2;
		355	n \|= n >> 4;
		356	n \|= n >> 8;
		357	n \|= n >> 16;
		358
		359	return n + 1;
		360	}
		361
275	MODULE = CFClient PACKAGE = CFClient	362	MODULE = CFPlus PACKAGE = CFPlus
276		363
277	PROTOTYPES: ENABLE	364	PROTOTYPES: ENABLE
278		365
279	BOOT:	366	BOOT:
280	{	367	{
281	HV *stash = gv_stashpv ("CFClient", 1);	368	HV *stash = gv_stashpv ("CFPlus", 1);
282	static const struct {	369	static const struct {
283	const char *name;	370	const char *name;
284	IV iv;	371	IV iv;
285	} *civ, const_iv[] = {	372	} *civ, const_iv[] = {
286	# define const_iv(name) { # name, (IV)name }	373	# define const_iv(name) { # name, (IV)name }
…		…
385	# undef const_iv	472	# undef const_iv
386	};	473	};
387		474
388	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	475	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
389	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	476	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
390
391	fontmap = pango_ft2_font_map_new ();
392	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
393	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
394	}	477	}
395		478
396	int	479	int
		480	in_destruct ()
		481	CODE:
		482	RETVAL = PL_main_cv == Nullcv;
		483	OUTPUT:
		484	RETVAL
		485
		486	NV floor (NV x)
		487
		488	NV ceil (NV x)
		489
		490	void
		491	pango_init ()
		492	CODE:
		493	{
		494	opengl_fontmap = pango_opengl_font_map_new ();
		495	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
		496	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		497	}
		498
		499	int
397	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	500	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
398		501
399	void	502	void
400	SDL_Quit ()	503	SDL_Quit ()
401		504
402	void	505	void
…		…
408	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	511	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
409	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	512	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
410	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	513	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
411	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	514	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
412		515
		516	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		517	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		518
413	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	519	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
414	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	520	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
415	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
416	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	522	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
417		523
418	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	524	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		525	#if SDL_VERSION_ATLEAST(1,2,10)
419	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	526	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
420	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		528	#endif
421		529
422	SDL_EnableUNICODE (1);	530	SDL_EnableUNICODE (1);
423	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	531	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
424		532
425	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	533	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
434		542
435	++m;	543	++m;
436	}	544	}
437	}	545	}
438		546
		547	char *
		548	SDL_GetError ()
		549
439	int	550	int
440	SDL_SetVideoMode (int w, int h, int fullscreen)	551	SDL_SetVideoMode (int w, int h, int fullscreen)
441	CODE:	552	CODE:
442	RETVAL = !!SDL_SetVideoMode (	553	RETVAL = !!SDL_SetVideoMode (
443	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	554	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
444	);	555	);
		556	if (RETVAL)
		557	{
445	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	558	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		559	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		560	# include "glfunc.h"
		561	# undef GL_FUNC
		562	}
446	OUTPUT:	563	OUTPUT:
447	RETVAL	564	RETVAL
448		565
449	void	566	void
450	SDL_GL_SwapBuffers ()	567	SDL_GL_SwapBuffers ()
		568
		569	char *
		570	SDL_GetKeyName (int sym)
451		571
452	void	572	void
453	SDL_PollEvent ()	573	SDL_PollEvent ()
454	PPCODE:	574	PPCODE:
455	{	575	{
…		…
474	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	594	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
475	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	595	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
476	break;	596	break;
477		597
478	case SDL_MOUSEMOTION:	598	case SDL_MOUSEMOTION:
		599	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		600
479	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	601	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
480	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	602	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
481	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	603	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
482	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	604	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
483	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	605	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
484	break;	606	break;
485		607
486	case SDL_MOUSEBUTTONDOWN:	608	case SDL_MOUSEBUTTONDOWN:
487	case SDL_MOUSEBUTTONUP:	609	case SDL_MOUSEBUTTONUP:
		610	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		611
488	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	612	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
489	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	613	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
490	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	614	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
491	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	615	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
492	break;	616	break;
		617
		618	case SDL_USEREVENT:
		619	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		620	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		621	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		622	break;
493	}	623	}
494		624
495	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	625	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
496	}	626	}
497	}	627	}
498		628
499	int	629	int
500	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	630	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
501	POSTCALL:	631	POSTCALL:
502	Mix_HookMusicFinished (music_finished);	632	Mix_HookMusicFinished (music_finished);
		633	Mix_ChannelFinished (channel_finished);
503		634
504	void	635	void
505	Mix_CloseAudio ()	636	Mix_CloseAudio ()
506		637
507	int	638	int
…		…
512	CODE:	643	CODE:
513	#ifndef _WIN32	644	#ifndef _WIN32
514	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	645	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
515	#endif	646	#endif
516		647
517	char *
518	gl_version ()
519	CODE:
520	RETVAL = (char *)glGetString (GL_VERSION);
521	OUTPUT:
522	RETVAL
523
524	char *
525	gl_extensions ()
526	CODE:
527	RETVAL = (char *)glGetString (GL_EXTENSIONS);
528	OUTPUT:
529	RETVAL
530
531	void	648	void
532	add_font (char *file)	649	add_font (char *file)
533	CODE:	650	CODE:
534	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	651	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
535		652
536	void	653	void
537	load_image_inline (SV *image_)	654	load_image_inline (SV *image_)
538	ALIAS:	655	ALIAS:
539	load_image_file = 1	656	load_image_file = 1
…		…
581		698
582	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	699	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
583		700
584	assert (surface2->pitch == surface2->w * 4);	701	assert (surface2->pitch == surface2->w * 4);
585		702
		703	SDL_LockSurface (surface2);
586	EXTEND (SP, 5);	704	EXTEND (SP, 6);
587	PUSHs (sv_2mortal (newSViv (surface2->w)));	705	PUSHs (sv_2mortal (newSViv (surface2->w)));
588	PUSHs (sv_2mortal (newSViv (surface2->h)));	706	PUSHs (sv_2mortal (newSViv (surface2->h)));
589	SDL_LockSurface (surface2);
590	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	707	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
591	SDL_UnlockSurface (surface2);
592	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	708	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
593	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	709	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
594	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	710	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		711	SDL_UnlockSurface (surface2);
595		712
596	SDL_FreeSurface (surface);	713	SDL_FreeSurface (surface);
597	SDL_FreeSurface (surface2);	714	SDL_FreeSurface (surface2);
598	}	715	}
599		716
…		…
623	}	740	}
624		741
625	void	742	void
626	error (char *message)	743	error (char *message)
627	CODE:	744	CODE:
		745	fprintf (stderr, "ERROR: %s\n", message);
628	#ifdef _WIN32	746	#ifdef _WIN32
629	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	747	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
630	#else
631	fprintf (stderr, "ERROR: %s\n", message);
632	#endif	748	#endif
633		749
634	void	750	void
635	fatal (char *message)	751	fatal (char *message)
636	CODE:	752	CODE:
		753	fprintf (stderr, "FATAL: %s\n", message);
637	#ifdef _WIN32	754	#ifdef _WIN32
638	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	755	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
639	#else
640	fprintf (stderr, "FATAL: %s\n", message);
641	#endif	756	#endif
642	exit (1);	757	_exit (1);
643		758
		759	void
		760	_exit (int retval)
		761	CODE:
		762	_exit (retval);
		763
644	MODULE = CFClient PACKAGE = CFClient::Font	764	MODULE = CFPlus PACKAGE = CFPlus::Font
645		765
646	CFClient::Font	766	CFPlus::Font
647	new_from_file (SV class, char path, int id = 0)	767	new_from_file (SV class, char path, int id = 0)
648	CODE:	768	CODE:
649	{	769	{
650	int count;	770	int count;
651	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	771	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
654	}	774	}
655	OUTPUT:	775	OUTPUT:
656	RETVAL	776	RETVAL
657		777
658	void	778	void
659	DESTROY (CFClient::Font self)	779	DESTROY (CFPlus::Font self)
660	CODE:	780	CODE:
661	pango_font_description_free (self);	781	pango_font_description_free (self);
662		782
663	void	783	void
664	make_default (CFClient::Font self)	784	make_default (CFPlus::Font self)
665	CODE:	785	CODE:
666	default_font = self;	786	default_font = self;
667		787
668	MODULE = CFClient PACKAGE = CFClient::Layout	788	MODULE = CFPlus PACKAGE = CFPlus::Layout
669		789
670	CFClient::Layout	790	void
671	new (SV *class, int base_height = MIN_FONT_HEIGHT)	791	reset_glyph_cache ()
		792	CODE:
		793	tc_clear ();
		794
		795	CFPlus::Layout
		796	new (SV *class)
672	CODE:	797	CODE:
673	New (0, RETVAL, 1, struct cf_layout);	798	New (0, RETVAL, 1, struct cf_layout);
		799
674	RETVAL->pl = pango_layout_new (context);	800	RETVAL->pl = pango_layout_new (opengl_context);
675	RETVAL->base_height = base_height;	801	RETVAL->r = 1.;
		802	RETVAL->g = 1.;
		803	RETVAL->b = 1.;
		804	RETVAL->a = 1.;
		805	RETVAL->base_height = MIN_FONT_HEIGHT;
676	RETVAL->font = 0;	806	RETVAL->font = 0;
		807
677	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	808	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
678	pango_layout_set_font_description (RETVAL->pl, default_font);	809	layout_update_font (RETVAL);
679	OUTPUT:	810	OUTPUT:
680	RETVAL	811	RETVAL
681		812
682	void	813	void
683	DESTROY (CFClient::Layout self)	814	DESTROY (CFPlus::Layout self)
684	CODE:	815	CODE:
685	g_object_unref (self->pl);	816	g_object_unref (self->pl);
686	Safefree (self);	817	Safefree (self);
687		818
688	void	819	void
689	set_text (CFClient::Layout self, SV *text_)	820	set_text (CFPlus::Layout self, SV *text_)
690	CODE:	821	CODE:
691	{	822	{
692	STRLEN textlen;	823	STRLEN textlen;
693	char *text = SvPVutf8 (text_, textlen);	824	char *text = SvPVutf8 (text_, textlen);
694		825
695	pango_layout_set_text (self->pl, text, textlen);	826	pango_layout_set_text (self->pl, text, textlen);
696	}	827	}
697		828
698	void	829	void
699	set_markup (CFClient::Layout self, SV *text_)	830	set_markup (CFPlus::Layout self, SV *text_)
700	CODE:	831	CODE:
701	{	832	{
702	STRLEN textlen;	833	STRLEN textlen;
703	char *text = SvPVutf8 (text_, textlen);	834	char *text = SvPVutf8 (text_, textlen);
704		835
705	pango_layout_set_markup (self->pl, text, textlen);	836	pango_layout_set_markup (self->pl, text, textlen);
706	}	837	}
707		838
		839	void
		840	set_shapes (CFPlus::Layout self, ...)
		841	CODE:
		842	{
		843	PangoAttrList *attrs = 0;
		844	const char *text = pango_layout_get_text (self->pl);
		845	const char *pos = text;
		846	int arg = 4;
		847
		848	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		849	{
		850	PangoRectangle inkrect, rect;
		851	PangoAttribute *attr;
		852
		853	int x = SvIV (ST (arg - 3));
		854	int y = SvIV (ST (arg - 2));
		855	int w = SvIV (ST (arg - 1));
		856	int h = SvIV (ST (arg ));
		857
		858	inkrect.x = 0;
		859	inkrect.y = 0;
		860	inkrect.width = 0;
		861	inkrect.height = 0;
		862
		863	rect.x = x * PANGO_SCALE;
		864	rect.y = y * PANGO_SCALE;
		865	rect.width = w * PANGO_SCALE;
		866	rect.height = h * PANGO_SCALE;
		867
		868	if (!attrs)
		869	attrs = pango_layout_get_attributes (self->pl);
		870
		871	attr = pango_attr_shape_new (&inkrect, &rect);
		872	attr->start_index = pos - text;
		873	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		874	pango_attr_list_insert (attrs, attr);
		875
		876	arg += 4;
		877	pos += sizeof (OBJ_STR) - 1;
		878	}
		879
		880	if (attrs)
		881	pango_layout_set_attributes (self->pl, attrs);
		882	}
		883
		884	void
		885	get_shapes (CFPlus::Layout self)
		886	PPCODE:
		887	{
		888	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		889
		890	do
		891	{
		892	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		893
		894	if (run && shape_attr_p (run))
		895	{
		896	PangoRectangle extents;
		897	pango_layout_iter_get_run_extents (iter, 0, &extents);
		898
		899	EXTEND (SP, 2);
		900	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		901	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		902	}
		903	}
		904	while (pango_layout_iter_next_run (iter));
		905
		906	pango_layout_iter_free (iter);
		907	}
		908
		909	int
		910	has_wrapped (CFPlus::Layout self)
		911	CODE:
		912	{
		913	int lines = 1;
		914	const char *text = pango_layout_get_text (self->pl);
		915
		916	while (*text)
		917	lines += *text++ == '\n';
		918
		919	RETVAL = lines < pango_layout_get_line_count (self->pl);
		920	}
		921	OUTPUT:
		922	RETVAL
		923
708	SV *	924	SV *
709	get_text (CFClient::Layout self)	925	get_text (CFPlus::Layout self)
710	CODE:	926	CODE:
711	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	927	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
712	SvUTF8_on (RETVAL);	928	sv_utf8_decode (RETVAL);
713	OUTPUT:	929	OUTPUT:
714	RETVAL	930	RETVAL
715		931
716	void	932	void
		933	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
		934	CODE:
		935	self->r = r;
		936	self->g = g;
		937	self->b = b;
		938	self->a = a;
		939
		940	void
717	set_font (CFClient::Layout self, CFClient::Font font = 0)	941	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
718	CODE:	942	CODE:
719	if (self->font != font)	943	if (self->font != font)
720	{	944	{
721	self->font = font;	945	self->font = font;
722	layout_update_font (self);	946	layout_update_font (self);
723	}	947	}
724		948
725	void	949	void
726	set_height (CFClient::Layout self, int base_height)	950	set_height (CFPlus::Layout self, int base_height)
727	CODE:	951	CODE:
728	if (self->base_height != base_height)	952	if (self->base_height != base_height)
729	{	953	{
730	self->base_height = base_height;	954	self->base_height = base_height;
731	layout_update_font (self);	955	layout_update_font (self);
732	}	956	}
733		957
734	void	958	void
735	set_width (CFClient::Layout self, int max_width = -1)	959	set_width (CFPlus::Layout self, int max_width = -1)
736	CODE:	960	CODE:
737	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	961	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
738		962
739	void	963	void
		964	set_indent (CFPlus::Layout self, int indent)
		965	CODE:
		966	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		967
		968	void
		969	set_spacing (CFPlus::Layout self, int spacing)
		970	CODE:
		971	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		972
		973	void
		974	set_ellipsise (CFPlus::Layout self, int ellipsise)
		975	CODE:
		976	pango_layout_set_ellipsize (self->pl,
		977	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		978	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		979	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		980	: PANGO_ELLIPSIZE_NONE
		981	);
		982
		983	void
		984	set_single_paragraph_mode (CFPlus::Layout self, int spm)
		985	CODE:
		986	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		987
		988	void
740	size (CFClient::Layout self)	989	size (CFPlus::Layout self)
741	PPCODE:	990	PPCODE:
742	{	991	{
743	int w, h;	992	int w, h;
744		993
745	layout_get_pixel_size (self, &w, &h);	994	layout_get_pixel_size (self, &w, &h);
…		…
748	PUSHs (sv_2mortal (newSViv (w)));	997	PUSHs (sv_2mortal (newSViv (w)));
749	PUSHs (sv_2mortal (newSViv (h)));	998	PUSHs (sv_2mortal (newSViv (h)));
750	}	999	}
751		1000
752	int	1001	int
		1002	descent (CFPlus::Layout self)
		1003	CODE:
		1004	{
		1005	PangoRectangle rect;
		1006	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1007	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1008	RETVAL = PANGO_DESCENT (rect);
		1009	}
		1010	OUTPUT:
		1011	RETVAL
		1012
		1013	int
753	xy_to_index (CFClient::Layout self, int x, int y)	1014	xy_to_index (CFPlus::Layout self, int x, int y)
754	CODE:	1015	CODE:
755	{	1016	{
756	int index, trailing;	1017	int index, trailing;
757	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1018	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
758	RETVAL = index;	1019	RETVAL = index;
759	}	1020	}
760	OUTPUT:	1021	OUTPUT:
761	RETVAL	1022	RETVAL
762		1023
763	void	1024	void
764	cursor_pos (CFClient::Layout self, int index)	1025	cursor_pos (CFPlus::Layout self, int index)
765	PPCODE:	1026	PPCODE:
766	{	1027	{
767	PangoRectangle strong_pos;	1028	PangoRectangle strong_pos;
768	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1029	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
769		1030
…		…
772	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1033	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
773	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1034	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
774	}	1035	}
775		1036
776	void	1037	void
777	render (CFClient::Layout self)	1038	render (CFPlus::Layout self, float x, float y, int flags = 0)
778	PPCODE:	1039	PPCODE:
779	{	1040	pango_opengl_render_layout_subpixel (
780	SV *retval;	1041	self->pl,
781	int w, h;	1042	x * PANGO_SCALE, y * PANGO_SCALE,
782	FT_Bitmap bitmap;	1043	self->r, self->g, self->b, self->a,
		1044	flags
		1045	);
783		1046
784	layout_get_pixel_size (self, &w, &h);	1047	MODULE = CFPlus PACKAGE = CFPlus::Texture
785		1048
786	retval = newSV (w * h);	1049	void
787	SvPOK_only (retval);	1050	pad2pot (SV data_, SV w_, SV *h_)
788	SvCUR_set (retval, w * h);	1051	CODE:
		1052	{
		1053	int ow = SvIV (w_);
		1054	int oh = SvIV (h_);
789		1055
790	bitmap.rows = h;	1056	if (ow && oh)
791	bitmap.width = w;	1057	{
792	bitmap.pitch = w;	1058	int nw = minpot (ow);
793	bitmap.buffer = (unsigned char*)SvPVX (retval);	1059	int nh = minpot (oh);
794	bitmap.num_grays = 256;
795	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
796		1060
797	memset (bitmap.buffer, 0, w * h);	1061	if (nw != ow \|\| nh != oh)
798		1062	{
799	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	1063	if (SvOK (data_))
		1064	{
		1065	STRLEN datalen;
		1066	char *data = SvPVbyte (data_, datalen);
		1067	int bpp = datalen / (ow * oh);
		1068	SV result_ = sv_2mortal (newSV (nw nh * bpp));
800		1069
801	EXTEND (SP, 3);	1070	SvPOK_only (result_);
802	PUSHs (sv_2mortal (newSViv (w)));	1071	SvCUR_set (result_, nw * nh * bpp);
803	PUSHs (sv_2mortal (newSViv (h)));
804	PUSHs (sv_2mortal (retval));
805	}
806		1072
807	MODULE = CFClient PACKAGE = CFClient::Texture	1073	memset (SvPVX (result_), 0, nw * nh * bpp);
		1074	while (oh--)
		1075	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
808		1076
		1077	sv_setsv (data_, result_);
		1078	}
		1079
		1080	sv_setiv (w_, nw);
		1081	sv_setiv (h_, nh);
		1082	}
		1083	}
		1084	}
		1085
809	void	1086	void
810	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1087	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
811	PROTOTYPE: $$$;$$	1088	PROTOTYPE: $$$;$$
		1089	ALIAS:
		1090	draw_quad_alpha = 1
		1091	draw_quad_alpha_premultiplied = 2
812	CODE:	1092	CODE:
813	{	1093	{
814	HV hv = (HV )SvRV (self);	1094	HV hv = (HV )SvRV (self);
815	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1095	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
816	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1096	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
817	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1097	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
818	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
819		1098
820	if (items < 5)	1099	if (items < 5)
821	{	1100	{
822	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1101	w = SvNV (*hv_fetch (hv, "w", 1, 1));
823	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1102	h = SvNV (*hv_fetch (hv, "h", 1, 1));
824	}	1103	}
825		1104
		1105	if (ix)
		1106	{
		1107	glEnable (GL_BLEND);
		1108
		1109	if (ix == 2)
		1110	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1111	else
		1112	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1113	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1114
		1115	glEnable (GL_ALPHA_TEST);
		1116	glAlphaFunc (GL_GREATER, 0.01f);
		1117	}
		1118
826	glBindTexture (GL_TEXTURE_2D, name);	1119	glBindTexture (GL_TEXTURE_2D, name);
827	if (wrap_mode) {	1120
828	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
829	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
830	}
831	glBegin (GL_QUADS);	1121	glBegin (GL_QUADS);
832	glTexCoord2f (0, 0); glVertex2f (x , y );	1122	glTexCoord2f (0, 0); glVertex2f (x , y );
833	glTexCoord2f (0, t); glVertex2f (x , y + h);	1123	glTexCoord2f (0, t); glVertex2f (x , y + h);
834	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1124	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
835	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1125	glTexCoord2f (s, 0); glVertex2f (x + w, y );
836	glEnd ();	1126	glEnd ();
837	}
838		1127
		1128	if (ix)
		1129	{
		1130	glDisable (GL_ALPHA_TEST);
		1131	glDisable (GL_BLEND);
		1132	}
		1133	}
		1134
839	MODULE = CFClient PACKAGE = CFClient::Map	1135	MODULE = CFPlus PACKAGE = CFPlus::Map
840		1136
841	CFClient::Map	1137	CFPlus::Map
842	new (SV *class, int map_width, int map_height)	1138	new (SV *class, int map_width, int map_height)
843	CODE:	1139	CODE:
844	New (0, RETVAL, 1, struct map);	1140	New (0, RETVAL, 1, struct map);
845	RETVAL->x = 0;	1141	RETVAL->x = 0;
846	RETVAL->y = 0;	1142	RETVAL->y = 0;
…		…
856	RETVAL->row = 0;	1152	RETVAL->row = 0;
857	OUTPUT:	1153	OUTPUT:
858	RETVAL	1154	RETVAL
859		1155
860	void	1156	void
861	DESTROY (CFClient::Map self)	1157	DESTROY (CFPlus::Map self)
862	CODE:	1158	CODE:
863	{	1159	{
864	map_clear (self);	1160	map_clear (self);
865	Safefree (self->face);	1161	Safefree (self->face);
		1162	Safefree (self->tex);
866	Safefree (self);	1163	Safefree (self);
867	}	1164	}
868		1165
869	void	1166	void
870	clear (CFClient::Map self)	1167	clear (CFPlus::Map self)
871	CODE:	1168	CODE:
872	map_clear (self);	1169	map_clear (self);
873		1170
874	void	1171	void
875	set_face (CFClient::Map self, int face, int texid)	1172	set_face (CFPlus::Map self, int face, int texid)
876	CODE:	1173	CODE:
877	{	1174	{
878	while (self->faces <= face)	1175	while (self->faces <= face)
879	{	1176	{
880	Append (mapface, self->face, self->faces, self->faces);	1177	Append (mapface, self->face, self->faces, self->faces);
…		…
883		1180
884	self->face [face] = texid;	1181	self->face [face] = texid;
885	}	1182	}
886		1183
887	void	1184	void
888	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)	1185	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)
889	CODE:	1186	CODE:
890	{	1187	{
891	while (self->texs <= texid)	1188	while (self->texs <= texid)
892	{	1189	{
893	Append (maptex, self->tex, self->texs, self->texs);	1190	Append (maptex, self->tex, self->texs, self->texs);
…		…
905	tex->r = r;	1202	tex->r = r;
906	tex->g = g;	1203	tex->g = g;
907	tex->b = b;	1204	tex->b = b;
908	tex->a = a;	1205	tex->a = a;
909	}	1206	}
		1207
		1208	// somewhat hackish, but for textures that require it, it really
		1209	// improves the look, and most others don't suffer.
		1210	glBindTexture (GL_TEXTURE_2D, name);
		1211	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1212	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1213	// use uglier nearest interpolation because linear suffers
		1214	// from transparent color bleeding and ugly wrapping effects.
		1215	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
910	}	1216	}
911		1217
912	int	1218	int
913	ox (CFClient::Map self)	1219	ox (CFPlus::Map self)
914	ALIAS:	1220	ALIAS:
915	oy = 1	1221	oy = 1
		1222	x = 2
		1223	y = 3
		1224	w = 4
		1225	h = 5
916	CODE:	1226	CODE:
917	switch (ix)	1227	switch (ix)
918	{	1228	{
919	case 0: RETVAL = self->ox; break;	1229	case 0: RETVAL = self->ox; break;
920	case 1: RETVAL = self->oy; break;	1230	case 1: RETVAL = self->oy; break;
		1231	case 2: RETVAL = self->x; break;
		1232	case 3: RETVAL = self->y; break;
		1233	case 4: RETVAL = self->w; break;
		1234	case 5: RETVAL = self->h; break;
921	}	1235	}
922	OUTPUT:	1236	OUTPUT:
923	RETVAL	1237	RETVAL
924		1238
925	void	1239	void
926	scroll (CFClient::Map self, int dx, int dy)	1240	scroll (CFPlus::Map self, int dx, int dy)
927	CODE:	1241	CODE:
928	{	1242	{
929	if (dx > 0)	1243	if (dx > 0)
930	map_blank (self, self->x, self->y, dx - 1, self->h);	1244	map_blank (self, self->x, self->y, dx - 1, self->h);
931	else if (dx < 0)	1245	else if (dx < 0)
…		…
947	self->y += MAP_EXTEND_Y;	1261	self->y += MAP_EXTEND_Y;
948	}	1262	}
949	}	1263	}
950		1264
951	void	1265	void
952	map1a_update (CFClient::Map self, SV *data_)	1266	map1a_update (CFPlus::Map self, SV *data_, int extmap)
953	CODE:	1267	CODE:
954	{	1268	{
955	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1269	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
956	uint8_t data_end = (uint8_t )SvEND (data_);	1270	uint8_t data_end = (uint8_t )SvEND (data_);
957	mapcell *cell;	1271	mapcell *cell;
…		…
959		1273
960	while (data < data_end)	1274	while (data < data_end)
961	{	1275	{
962	flags = (data [0] << 8) + data [1]; data += 2;	1276	flags = (data [0] << 8) + data [1]; data += 2;
963		1277
964	x = ((flags >> 10) & 63) + self->x;	1278	x = self->x + ((flags >> 10) & 63);
965	y = ((flags >> 4) & 63) + self->y;	1279	y = self->y + ((flags >> 4) & 63);
966		1280
967	cell = map_get_cell (self, x, y);	1281	cell = map_get_cell (self, x, y);
968		1282
969	if (flags & 15)	1283	if (flags & 15)
970	{	1284	{
971	if (cell->darkness < 0)	1285	if (!cell->darkness)
972	{	1286	{
973	cell->darkness = 0;	1287	cell->darkness = 256;
974	cell->face [0] = 0;	1288	cell->face [0] = 0;
975	cell->face [1] = 0;	1289	cell->face [1] = 0;
976	cell->face [2] = 0;	1290	cell->face [2] = 0;
977	}	1291	}
978		1292
979	cell->darkness = flags & 8 ? *data++ : 255;
980
981	//TODO: don't trust server data to be in-range(!)	1293	//TODO: don't trust server data to be in-range(!)
		1294
		1295	if (flags & 8)
		1296	{
		1297	if (extmap)
		1298	{
		1299	uint8_t ext, cmd;
		1300
		1301	do
		1302	{
		1303	ext = *data++;
		1304	cmd = ext & 0x7f;
		1305
		1306	if (ext < 4)
		1307	cell->darkness = 255 - ext * 64 + 1;
		1308	else if (ext == 5) // health
		1309	cell->stat_hp = *data++;
		1310	}
		1311	while (cmd & 0x80);
		1312	}
		1313	else
		1314	cell->darkness = *data++ + 1;
		1315	}
982		1316
983	if (flags & 4)	1317	if (flags & 4)
984	{	1318	{
985	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1319	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
986	}	1320	}
…		…
994	{	1328	{
995	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1329	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
996	}	1330	}
997	}	1331	}
998	else	1332	else
999	cell->darkness = -1;	1333	cell->darkness = 0;
1000	}	1334	}
1001	}	1335	}
1002		1336
1003	SV *	1337	SV *
1004	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1338	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1005	CODE:	1339	CODE:
1006	{	1340	{
1007	int x1, x;	1341	int x1, x;
1008	int y1, y;	1342	int y1, y;
1009	int z;	1343	int z;
…		…
1059	}	1393	}
1060	OUTPUT:	1394	OUTPUT:
1061	RETVAL	1395	RETVAL
1062		1396
1063	void	1397	void
1064	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1398	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1065	PPCODE:	1399	CODE:
1066	{	1400	{
1067	int vx, vy;	1401	int vx, vy;
1068	int x, y, z;	1402	int x, y, z;
1069	int last_name;	1403	int last_name;
1070	mapface face;	1404	mapface face;
1071	int sw4 = (sw + 3) & ~3;
1072	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1073	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1074		1405
1075	memset (darkness, 255, sw4 * sh);
1076	SvPOK_only (darkness_sv);
1077	SvCUR_set (darkness_sv, sw4 * sh);
1078
1079	vx = self->x + (self->w - sw) / 2 - shift_x;	1406	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1080	vy = self->y + (self->h - sh) / 2 - shift_y;	1407	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1081		1408
1082	/*	1409	/*
1083	int vx = self->vx = self->w >= sw	1410	int vx = self->vx = self->w >= sw
1084	? self->x + (self->w - sw) / 2	1411	? self->x + (self->w - sw) / 2
1085	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1412	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1089	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1416	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1090	*/	1417	*/
1091		1418
1092	glColor4ub (255, 255, 255, 255);	1419	glColor4ub (255, 255, 255, 255);
1093		1420
		1421	glEnable (GL_BLEND);
1094	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1422	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1095	glEnable (GL_BLEND);
1096	glEnable (GL_TEXTURE_2D);	1423	glEnable (GL_TEXTURE_2D);
1097	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1424	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1098		1425
1099	glBegin (GL_QUADS);	1426	glBegin (GL_QUADS);
1100		1427
…		…
1108		1435
1109	for (x = 0; x < sw; x++)	1436	for (x = 0; x < sw; x++)
1110	if (row->c0 <= x + vx && x + vx < row->c1)	1437	if (row->c0 <= x + vx && x + vx < row->c1)
1111	{	1438	{
1112	mapcell *cell = row->col + (x + vx - row->c0);	1439	mapcell *cell = row->col + (x + vx - row->c0);
1113
1114	darkness[y * sw4 + x] = cell->darkness < 0
1115	? 255 - FOW_DARKNESS
1116	: 255 - cell->darkness;
1117		1440
1118	face = cell->face [z];	1441	face = cell->face [z];
1119		1442
1120	if (face)	1443	if (face)
1121	{	1444	{
…		…
1142		1465
1143	glEnd ();	1466	glEnd ();
1144		1467
1145	glDisable (GL_TEXTURE_2D);	1468	glDisable (GL_TEXTURE_2D);
1146	glDisable (GL_BLEND);	1469	glDisable (GL_BLEND);
		1470	}
		1471
		1472	void
		1473	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1474	CODE:
		1475	{
		1476	static float color[16][3] = {
		1477	{ 0.00F, 0.00F, 0.00F },
		1478	{ 1.00F, 1.00F, 1.00F },
		1479	{ 0.00F, 0.00F, 0.55F },
		1480	{ 1.00F, 0.00F, 0.00F },
		1481
		1482	{ 1.00F, 0.54F, 0.00F },
		1483	{ 0.11F, 0.56F, 1.00F },
		1484	{ 0.93F, 0.46F, 0.00F },
		1485	{ 0.18F, 0.54F, 0.34F },
		1486
		1487	{ 0.56F, 0.73F, 0.56F },
		1488	{ 0.80F, 0.80F, 0.80F },
		1489	{ 0.55F, 0.41F, 0.13F },
		1490	{ 0.99F, 0.77F, 0.26F },
		1491
		1492	{ 0.74F, 0.65F, 0.41F },
		1493
		1494	{ 0.00F, 1.00F, 1.00F },
		1495	{ 1.00F, 0.00F, 1.00F },
		1496	{ 1.00F, 1.00F, 0.00F },
		1497	};
		1498
		1499	int x, y;
		1500
		1501	glEnable (GL_TEXTURE_2D);
		1502	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1503	glEnable (GL_BLEND);
		1504	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1505	glBegin (GL_QUADS);
		1506
		1507	for (y = 0; y < h; y++)
		1508	for (x = 0; x < w; x++)
		1509	{
		1510	unsigned char m = data [x + y * w];
		1511
		1512	if (m)
		1513	{
		1514	float *c = color [m & 15];
		1515
		1516	float tx1 = m & 0x40 ? 0.5 : 0.;
		1517	float tx2 = tx1 + 0.5;
		1518
		1519	glColor4f (c[0], c[1], c[2], 0.75);
		1520	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1521	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1522	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1523	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1524	}
		1525	}
		1526
		1527	glEnd ();
		1528	glDisable (GL_BLEND);
		1529	glDisable (GL_TEXTURE_2D);
		1530	}
		1531
		1532	void
		1533	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1534	PPCODE:
		1535	{
		1536	int vx, vy;
		1537	int x, y;
		1538	int sw4 = (sw + 3) & ~3;
		1539	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1540	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1541
		1542	memset (darkness, 255, sw4 * sh);
		1543	SvPOK_only (darkness_sv);
		1544	SvCUR_set (darkness_sv, sw4 * sh);
		1545
		1546	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1547	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1548
		1549	for (y = 0; y < sh; y++)
		1550	if (0 <= y + vy && y + vy < self->rows)
		1551	{
		1552	maprow *row = self->row + (y + vy);
		1553
		1554	for (x = 0; x < sw; x++)
		1555	if (row->c0 <= x + vx && x + vx < row->c1)
		1556	{
		1557	mapcell *cell = row->col + (x + vx - row->c0);
		1558
		1559	darkness[y * sw4 + x] = cell->darkness
		1560	? 255 - cell->darkness + 1
		1561	: 255 - FOW_DARKNESS;
		1562	}
		1563	}
1147		1564
1148	EXTEND (SP, 3);	1565	EXTEND (SP, 3);
1149	PUSHs (sv_2mortal (newSViv (sw4)));	1566	PUSHs (sv_2mortal (newSViv (sw4)));
1150	PUSHs (sv_2mortal (newSViv (sh)));	1567	PUSHs (sv_2mortal (newSViv (sh)));
1151	PUSHs (darkness_sv);	1568	PUSHs (darkness_sv);
1152	}	1569	}
1153		1570
1154	SV *	1571	SV *
1155	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1572	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1156	CODE:	1573	CODE:
1157	{	1574	{
1158	int x, y, x1, y1;	1575	int x, y, x1, y1;
1159	SV data_sv = newSV (w h * 7 + 5);	1576	SV data_sv = newSV (w h * 7 + 5);
1160	uint8_t data = (uint8_t )SvPVX (data_sv);	1577	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1222	}	1639	}
1223	OUTPUT:	1640	OUTPUT:
1224	RETVAL	1641	RETVAL
1225		1642
1226	void	1643	void
1227	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1644	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1228	PPCODE:	1645	PPCODE:
1229	{	1646	{
1230	int x, y, z;	1647	int x, y, z;
1231	int w, h;	1648	int w, h;
1232	int x1, y1;	1649	int x1, y1;
…		…
1264		1681
1265	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1682	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1266	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1683	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1267	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1684	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1268		1685
1269	if (cell->darkness <= 0)	1686	if (cell->darkness <= 1)
1270	{	1687	{
1271	cell->darkness = -1;	1688	cell->darkness = 0;
1272		1689
1273	for (z = 0; z <= 2; z++)	1690	for (z = 0; z <= 2; z++)
1274	{	1691	{
1275	cell->face[z] = face[z];	1692	cell->face[z] = face[z];
1276		1693
…		…
1281	}	1698	}
1282	}	1699	}
1283	}	1700	}
1284	}	1701	}
1285		1702
1286	MODULE = CFClient PACKAGE = CFClient::MixChunk	1703	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1287		1704
1288	CFClient::MixChunk	1705	CFPlus::MixChunk
1289	new_from_file (SV class, char path)	1706	new_from_file (SV class, char path)
1290	CODE:	1707	CODE:
1291	RETVAL = Mix_LoadWAV (path);	1708	RETVAL = Mix_LoadWAV (path);
1292	OUTPUT:	1709	OUTPUT:
1293	RETVAL	1710	RETVAL
1294		1711
1295	void	1712	void
1296	DESTROY (CFClient::MixChunk self)	1713	DESTROY (CFPlus::MixChunk self)
1297	CODE:	1714	CODE:
1298	Mix_FreeChunk (self);	1715	Mix_FreeChunk (self);
1299		1716
1300	int	1717	int
1301	volume (CFClient::MixChunk self, int volume = -1)	1718	volume (CFPlus::MixChunk self, int volume = -1)
1302	CODE:	1719	CODE:
1303	RETVAL = Mix_VolumeChunk (self, volume);	1720	RETVAL = Mix_VolumeChunk (self, volume);
1304	OUTPUT:	1721	OUTPUT:
1305	RETVAL	1722	RETVAL
1306		1723
1307	int	1724	int
1308	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1725	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1309	CODE:	1726	CODE:
1310	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1727	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1311	OUTPUT:	1728	OUTPUT:
1312	RETVAL	1729	RETVAL
1313		1730
1314	MODULE = CFClient PACKAGE = CFClient::MixMusic	1731	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1315		1732
1316	int	1733	int
1317	volume (int volume = -1)	1734	volume (int volume = -1)
1318	CODE:	1735	CODE:
1319	RETVAL = Mix_VolumeMusic (volume);	1736	RETVAL = Mix_VolumeMusic (volume);
1320	OUTPUT:	1737	OUTPUT:
1321	RETVAL	1738	RETVAL
1322		1739
1323	CFClient::MixMusic	1740	CFPlus::MixMusic
1324	new_from_file (SV class, char path)	1741	new_from_file (SV class, char path)
1325	CODE:	1742	CODE:
1326	RETVAL = Mix_LoadMUS (path);	1743	RETVAL = Mix_LoadMUS (path);
1327	OUTPUT:	1744	OUTPUT:
1328	RETVAL	1745	RETVAL
1329		1746
1330	void	1747	void
1331	DESTROY (CFClient::MixMusic self)	1748	DESTROY (CFPlus::MixMusic self)
1332	CODE:	1749	CODE:
1333	Mix_FreeMusic (self);	1750	Mix_FreeMusic (self);
1334		1751
1335	int	1752	int
1336	play (CFClient::MixMusic self, int loops = -1)	1753	play (CFPlus::MixMusic self, int loops = -1)
1337	CODE:	1754	CODE:
1338	RETVAL = Mix_PlayMusic (self, loops);	1755	RETVAL = Mix_PlayMusic (self, loops);
1339	OUTPUT:	1756	OUTPUT:
1340	RETVAL	1757	RETVAL
1341		1758
1342	MODULE = CFClient PACKAGE = CFClient::OpenGL	1759	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1343		1760
1344	BOOT:	1761	BOOT:
1345	{	1762	{
1346	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1763	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1347	static const struct {	1764	static const struct {
1348	const char *name;	1765	const char *name;
1349	IV iv;	1766	IV iv;
1350	} *civ, const_iv[] = {	1767	} *civ, const_iv[] = {
1351	# define const_iv(name) { # name, (IV)name }	1768	# define const_iv(name) { # name, (IV)name }
1352	const_iv (GL_COLOR_MATERIAL),	1769	const_iv (GL_COLOR_MATERIAL),
1353	const_iv (GL_SMOOTH),	1770	const_iv (GL_SMOOTH),
1354	const_iv (GL_FLAT),	1771	const_iv (GL_FLAT),
1355	const_iv (GL_DITHER),	1772	const_iv (GL_DITHER),
1356	const_iv (GL_BLEND),	1773	const_iv (GL_BLEND),
		1774	const_iv (GL_CULL_FACE),
1357	const_iv (GL_SCISSOR_TEST),	1775	const_iv (GL_SCISSOR_TEST),
		1776	const_iv (GL_DEPTH_TEST),
		1777	const_iv (GL_ALPHA_TEST),
		1778	const_iv (GL_NORMALIZE),
		1779	const_iv (GL_RESCALE_NORMAL),
		1780	const_iv (GL_FRONT),
		1781	const_iv (GL_BACK),
1358	const_iv (GL_AND),	1782	const_iv (GL_AND),
1359	const_iv (GL_ONE),	1783	const_iv (GL_ONE),
1360	const_iv (GL_ZERO),	1784	const_iv (GL_ZERO),
1361	const_iv (GL_SRC_ALPHA),	1785	const_iv (GL_SRC_ALPHA),
1362	const_iv (GL_SRC_ALPHA_SATURATE),	1786	const_iv (GL_DST_ALPHA),
1363	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1787	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1364	const_iv (GL_ONE_MINUS_DST_ALPHA),	1788	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1789	const_iv (GL_SRC_ALPHA_SATURATE),
1365	const_iv (GL_RGB),	1790	const_iv (GL_RGB),
1366	const_iv (GL_RGBA),	1791	const_iv (GL_RGBA),
		1792	const_iv (GL_RGBA4),
		1793	const_iv (GL_RGBA8),
		1794	const_iv (GL_RGB5_A1),
1367	const_iv (GL_UNSIGNED_BYTE),	1795	const_iv (GL_UNSIGNED_BYTE),
		1796	const_iv (GL_UNSIGNED_SHORT),
		1797	const_iv (GL_UNSIGNED_INT),
1368	const_iv (GL_ALPHA),	1798	const_iv (GL_ALPHA),
		1799	const_iv (GL_INTENSITY),
		1800	const_iv (GL_LUMINANCE),
		1801	const_iv (GL_LUMINANCE_ALPHA),
1369	const_iv (GL_FLOAT),	1802	const_iv (GL_FLOAT),
1370	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1803	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1371	const_iv (GL_COMPILE),	1804	const_iv (GL_COMPILE),
1372	const_iv (GL_TEXTURE_1D),	1805	const_iv (GL_TEXTURE_1D),
1373	const_iv (GL_TEXTURE_2D),	1806	const_iv (GL_TEXTURE_2D),
…		…
1375	const_iv (GL_TEXTURE_MAG_FILTER),	1808	const_iv (GL_TEXTURE_MAG_FILTER),
1376	const_iv (GL_TEXTURE_MIN_FILTER),	1809	const_iv (GL_TEXTURE_MIN_FILTER),
1377	const_iv (GL_TEXTURE_ENV_MODE),	1810	const_iv (GL_TEXTURE_ENV_MODE),
1378	const_iv (GL_TEXTURE_WRAP_S),	1811	const_iv (GL_TEXTURE_WRAP_S),
1379	const_iv (GL_TEXTURE_WRAP_T),	1812	const_iv (GL_TEXTURE_WRAP_T),
		1813	const_iv (GL_REPEAT),
1380	const_iv (GL_CLAMP),	1814	const_iv (GL_CLAMP),
1381	const_iv (GL_REPEAT),	1815	const_iv (GL_CLAMP_TO_EDGE),
1382	const_iv (GL_NEAREST),	1816	const_iv (GL_NEAREST),
1383	const_iv (GL_LINEAR),	1817	const_iv (GL_LINEAR),
1384	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1818	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1385	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1819	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1386	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1820	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1387	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1821	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1388	const_iv (GL_GENERATE_MIPMAP),	1822	const_iv (GL_GENERATE_MIPMAP),
1389	const_iv (GL_MODULATE),	1823	const_iv (GL_MODULATE),
1390	const_iv (GL_DECAL),	1824	const_iv (GL_DECAL),
1391	const_iv (GL_REPLACE),	1825	const_iv (GL_REPLACE),
		1826	const_iv (GL_DEPTH_BUFFER_BIT),
1392	const_iv (GL_COLOR_BUFFER_BIT),	1827	const_iv (GL_COLOR_BUFFER_BIT),
1393	const_iv (GL_PROJECTION),	1828	const_iv (GL_PROJECTION),
1394	const_iv (GL_MODELVIEW),	1829	const_iv (GL_MODELVIEW),
1395	const_iv (GL_COLOR_LOGIC_OP),	1830	const_iv (GL_COLOR_LOGIC_OP),
1396	const_iv (GL_SEPARABLE_2D),	1831	const_iv (GL_SEPARABLE_2D),
1397	const_iv (GL_CONVOLUTION_2D),	1832	const_iv (GL_CONVOLUTION_2D),
1398	const_iv (GL_CONVOLUTION_BORDER_MODE),	1833	const_iv (GL_CONVOLUTION_BORDER_MODE),
1399	const_iv (GL_CONSTANT_BORDER),	1834	const_iv (GL_CONSTANT_BORDER),
1400	const_iv (GL_LINES),	1835	const_iv (GL_LINES),
		1836	const_iv (GL_LINE_STRIP),
		1837	const_iv (GL_LINE_LOOP),
1401	const_iv (GL_QUADS),	1838	const_iv (GL_QUADS),
1402	const_iv (GL_LINE_LOOP),	1839	const_iv (GL_QUAD_STRIP),
		1840	const_iv (GL_TRIANGLES),
		1841	const_iv (GL_TRIANGLE_STRIP),
		1842	const_iv (GL_TRIANGLE_FAN),
1403	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1843	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1404	const_iv (GL_FASTEST),	1844	const_iv (GL_FASTEST),
		1845	const_iv (GL_V2F),
		1846	const_iv (GL_V3F),
		1847	const_iv (GL_T2F_V3F),
		1848	const_iv (GL_T2F_N3F_V3F),
1405	# undef const_iv	1849	# undef const_iv
1406	};	1850	};
1407		1851
1408	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1852	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1409	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1853	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1410	}	1854	}
1411		1855
		1856	char *
		1857	gl_vendor ()
		1858	CODE:
		1859	RETVAL = (char *)glGetString (GL_VENDOR);
		1860	OUTPUT:
		1861	RETVAL
		1862
		1863	char *
		1864	gl_version ()
		1865	CODE:
		1866	RETVAL = (char *)glGetString (GL_VERSION);
		1867	OUTPUT:
		1868	RETVAL
		1869
		1870	char *
		1871	gl_extensions ()
		1872	CODE:
		1873	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1874	OUTPUT:
		1875	RETVAL
		1876
1412	int glGetError ()	1877	int glGetError ()
		1878
		1879	void glFinish ()
1413		1880
1414	void glClear (int mask)	1881	void glClear (int mask)
1415		1882
1416	void glClearColor (float r, float g, float b, float a = 1.0)	1883	void glClearColor (float r, float g, float b, float a = 1.0)
1417	PROTOTYPE: @	1884	PROTOTYPE: @
…		…
1424		1891
1425	void glHint (int target, int mode)	1892	void glHint (int target, int mode)
1426		1893
1427	void glBlendFunc (int sfactor, int dfactor)	1894	void glBlendFunc (int sfactor, int dfactor)
1428		1895
		1896	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1897	CODE:
		1898	gl_BlendFuncSeparate (sa, da, saa, daa);
		1899
		1900	void glDepthMask (int flag)
		1901
1429	void glLogicOp (int opcode)	1902	void glLogicOp (int opcode)
1430		1903
1431	void glColorMask (int red, int green, int blue, int alpha)	1904	void glColorMask (int red, int green, int blue, int alpha)
1432		1905
1433	void glMatrixMode (int mode)	1906	void glMatrixMode (int mode)
…		…
1436		1909
1437	void glPopMatrix ()	1910	void glPopMatrix ()
1438		1911
1439	void glLoadIdentity ()	1912	void glLoadIdentity ()
1440		1913
		1914	void glDrawBuffer (int buffer)
		1915
		1916	void glReadBuffer (int buffer)
		1917
1441	# near and far are due to microsofts buggy c compiler	1918	# near_ and far_ are due to microsofts buggy "c" compiler
		1919	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1920
		1921	# near_ and far_ are due to microsofts buggy "c" compiler
1442	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1922	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1443		1923
1444	void glViewport (int x, int y, int width, int height)	1924	void glViewport (int x, int y, int width, int height)
1445		1925
1446	void glScissor (int x, int y, int width, int height)	1926	void glScissor (int x, int y, int width, int height)
…		…
1461		1941
1462	void glEnd ()	1942	void glEnd ()
1463		1943
1464	void glColor (float r, float g, float b, float a = 1.0)	1944	void glColor (float r, float g, float b, float a = 1.0)
1465	PROTOTYPE: @	1945	PROTOTYPE: @
		1946	ALIAS:
		1947	glColor_premultiply = 1
1466	CODE:	1948	CODE:
1467	glColor4ub (r * 255., g * 255., b * 255., a * 255.);	1949	if (ix)
		1950	{
		1951	r *= a;
		1952	g *= a;
		1953	b *= a;
		1954	}
		1955	// microsoft visual "c" rounds instead of truncating...
		1956	glColor4f (r, g, b, a);
		1957
		1958	void glInterleavedArrays (int format, int stride, char *data)
		1959
		1960	void glDrawElements (int mode, int count, int type, char *indices)
		1961
		1962	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1963
		1964	void glRasterPos (float x, float y, float z = 0.)
		1965	CODE:
		1966	glRasterPos3f (0, 0, z);
		1967	glBitmap (0, 0, 0, 0, x, y, 0);
1468		1968
1469	void glVertex (float x, float y, float z = 0.)	1969	void glVertex (float x, float y, float z = 0.)
1470	CODE:	1970	CODE:
1471	glVertex3f (x, y, z);	1971	glVertex3f (x, y, z);
1472		1972
…		…
1484		1984
1485	void glBindTexture (int target, int name)	1985	void glBindTexture (int target, int name)
1486		1986
1487	void glConvolutionParameter (int target, int pname, float params)	1987	void glConvolutionParameter (int target, int pname, float params)
1488	CODE:	1988	CODE:
1489	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1989	if (gl.ConvolutionParameterf)
		1990	gl.ConvolutionParameterf (target, pname, params);
1490		1991
1491	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1992	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1492	CODE:	1993	CODE:
1493	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1994	if (gl.ConvolutionFilter2D)
1494	(target, internalformat, width, height, format, type, data));	1995	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1495		1996
1496	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1997	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1497	CODE:	1998	CODE:
1498	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1999	if (gl.SeparableFilter2D)
1499	(target, internalformat, width, height, format, type, row, column));	2000	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1500		2001
1501	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2002	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1502		2003
1503	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2004	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1504		2005
1505	void glRasterPos (int x, int y)	2006	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1506	CODE:
1507	glRasterPos2i (x, y);
1508		2007
1509	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2008	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1510		2009
1511	int glGenTexture ()	2010	int glGenTexture ()
1512	CODE:	2011	CODE:

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.70 by root, Sun Apr 30 09:21:47 2006 UTC vs. Revision 1.142 by root, Fri Aug 18 01:27:15 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.70 by root, Sun Apr 30 09:21:47 2006 UTC vs.
Revision 1.142 by root, Fri Aug 18 01:27:15 2006 UTC