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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.72 by root, Fri May 5 19:10:16 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;
…		…
277	{	334	{
278	SDL_UserEvent ev;	335	SDL_UserEvent ev;
279		336
280	ev.type = SDL_USEREVENT;	337	ev.type = SDL_USEREVENT;
281	ev.code = 1;	338	ev.code = 1;
282	ev.data1 = (void *)channel;	339	ev.data1 = (void *)(long)channel;
283	ev.data2 = 0;	340	ev.data2 = 0;
284		341
285	SDL_PushEvent ((SDL_Event *)&ev);	342	SDL_PushEvent ((SDL_Event *)&ev);
286	}	343	}
287		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
288	MODULE = CFClient PACKAGE = CFClient	362	MODULE = CFPlus PACKAGE = CFPlus
289		363
290	PROTOTYPES: ENABLE	364	PROTOTYPES: ENABLE
291		365
292	BOOT:	366	BOOT:
293	{	367	{
294	HV *stash = gv_stashpv ("CFClient", 1);	368	HV *stash = gv_stashpv ("CFPlus", 1);
295	static const struct {	369	static const struct {
296	const char *name;	370	const char *name;
297	IV iv;	371	IV iv;
298	} *civ, const_iv[] = {	372	} *civ, const_iv[] = {
299	# define const_iv(name) { # name, (IV)name }	373	# define const_iv(name) { # name, (IV)name }
…		…
398	# undef const_iv	472	# undef const_iv
399	};	473	};
400		474
401	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; )
402	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	476	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
403
404	fontmap = pango_ft2_font_map_new ();
405	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
406	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
407	}	477	}
408		478
409	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
410	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	500	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
411		501
412	void	502	void
413	SDL_Quit ()	503	SDL_Quit ()
414		504
415	void	505	void
…		…
421	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	511	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
422	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	512	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
423	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	513	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
424	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	514	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
425		515
		516	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		517	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		518
426	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	519	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
427	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	520	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
428	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
429	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	522	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
430		523
431	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	524	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		525	#if SDL_VERSION_ATLEAST(1,2,10)
432	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	526	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
433	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		528	#endif
434		529
435	SDL_EnableUNICODE (1);	530	SDL_EnableUNICODE (1);
436	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	531	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
437		532
438	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	533	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
447		542
448	++m;	543	++m;
449	}	544	}
450	}	545	}
451		546
		547	char *
		548	SDL_GetError ()
		549
452	int	550	int
453	SDL_SetVideoMode (int w, int h, int fullscreen)	551	SDL_SetVideoMode (int w, int h, int fullscreen)
454	CODE:	552	CODE:
455	RETVAL = !!SDL_SetVideoMode (	553	RETVAL = !!SDL_SetVideoMode (
456	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	554	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
457	);	555	);
		556	if (RETVAL)
		557	{
458	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	}
459	OUTPUT:	563	OUTPUT:
460	RETVAL	564	RETVAL
461		565
462	void	566	void
463	SDL_GL_SwapBuffers ()	567	SDL_GL_SwapBuffers ()
		568
		569	char *
		570	SDL_GetKeyName (int sym)
464		571
465	void	572	void
466	SDL_PollEvent ()	573	SDL_PollEvent ()
467	PPCODE:	574	PPCODE:
468	{	575	{
…		…
487	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	594	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
488	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	595	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
489	break;	596	break;
490		597
491	case SDL_MOUSEMOTION:	598	case SDL_MOUSEMOTION:
		599	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		600
492	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	601	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
493	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	602	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
494	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	603	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
495	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	604	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
496	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	605	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
497	break;	606	break;
498		607
499	case SDL_MOUSEBUTTONDOWN:	608	case SDL_MOUSEBUTTONDOWN:
500	case SDL_MOUSEBUTTONUP:	609	case SDL_MOUSEBUTTONUP:
		610	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		611
501	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	612	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
502	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	613	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
503	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	614	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
504	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	615	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
505	break;	616	break;
…		…
509	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	620	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
510	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	621	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
511	break;	622	break;
512	}	623	}
513		624
514	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	625	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
515	}	626	}
516	}	627	}
517		628
518	int	629	int
519	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)
520	POSTCALL:	631	POSTCALL:
521	Mix_HookMusicFinished (music_finished);	632	Mix_HookMusicFinished (music_finished);
522	Mix_ChannelFinished (channel_finished);	633	Mix_ChannelFinished (channel_finished);
523		634
524	void	635	void
…		…
532	CODE:	643	CODE:
533	#ifndef _WIN32	644	#ifndef _WIN32
534	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	645	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
535	#endif	646	#endif
536		647
537	char *
538	gl_version ()
539	CODE:
540	RETVAL = (char *)glGetString (GL_VERSION);
541	OUTPUT:
542	RETVAL
543
544	char *
545	gl_extensions ()
546	CODE:
547	RETVAL = (char *)glGetString (GL_EXTENSIONS);
548	OUTPUT:
549	RETVAL
550
551	void	648	void
552	add_font (char *file)	649	add_font (char *file)
553	CODE:	650	CODE:
554	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	651	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
555		652
556	void	653	void
557	load_image_inline (SV *image_)	654	load_image_inline (SV *image_)
558	ALIAS:	655	ALIAS:
559	load_image_file = 1	656	load_image_file = 1
…		…
601		698
602	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	699	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
603		700
604	assert (surface2->pitch == surface2->w * 4);	701	assert (surface2->pitch == surface2->w * 4);
605		702
		703	SDL_LockSurface (surface2);
606	EXTEND (SP, 5);	704	EXTEND (SP, 6);
607	PUSHs (sv_2mortal (newSViv (surface2->w)));	705	PUSHs (sv_2mortal (newSViv (surface2->w)));
608	PUSHs (sv_2mortal (newSViv (surface2->h)));	706	PUSHs (sv_2mortal (newSViv (surface2->h)));
609	SDL_LockSurface (surface2);
610	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	707	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
611	SDL_UnlockSurface (surface2);
612	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)));
613	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	709	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
614	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	710	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		711	SDL_UnlockSurface (surface2);
615		712
616	SDL_FreeSurface (surface);	713	SDL_FreeSurface (surface);
617	SDL_FreeSurface (surface2);	714	SDL_FreeSurface (surface2);
618	}	715	}
619		716
…		…
643	}	740	}
644		741
645	void	742	void
646	error (char *message)	743	error (char *message)
647	CODE:	744	CODE:
		745	fprintf (stderr, "ERROR: %s\n", message);
648	#ifdef _WIN32	746	#ifdef _WIN32
649	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	747	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
650	#else
651	fprintf (stderr, "ERROR: %s\n", message);
652	#endif	748	#endif
653		749
654	void	750	void
655	fatal (char *message)	751	fatal (char *message)
656	CODE:	752	CODE:
		753	fprintf (stderr, "FATAL: %s\n", message);
657	#ifdef _WIN32	754	#ifdef _WIN32
658	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	755	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
659	#else
660	fprintf (stderr, "FATAL: %s\n", message);
661	#endif	756	#endif
662	exit (1);	757	_exit (1);
663		758
		759	void
		760	_exit (int retval)
		761	CODE:
		762	_exit (retval);
		763
664	MODULE = CFClient PACKAGE = CFClient::Font	764	MODULE = CFPlus PACKAGE = CFPlus::Font
665		765
666	CFClient::Font	766	CFPlus::Font
667	new_from_file (SV class, char path, int id = 0)	767	new_from_file (SV class, char path, int id = 0)
668	CODE:	768	CODE:
669	{	769	{
670	int count;	770	int count;
671	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	771	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
674	}	774	}
675	OUTPUT:	775	OUTPUT:
676	RETVAL	776	RETVAL
677		777
678	void	778	void
679	DESTROY (CFClient::Font self)	779	DESTROY (CFPlus::Font self)
680	CODE:	780	CODE:
681	pango_font_description_free (self);	781	pango_font_description_free (self);
682		782
683	void	783	void
684	make_default (CFClient::Font self)	784	make_default (CFPlus::Font self)
685	CODE:	785	CODE:
686	default_font = self;	786	default_font = self;
687		787
688	MODULE = CFClient PACKAGE = CFClient::Layout	788	MODULE = CFPlus PACKAGE = CFPlus::Layout
689		789
690	CFClient::Layout	790	void
691	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)
692	CODE:	797	CODE:
693	New (0, RETVAL, 1, struct cf_layout);	798	New (0, RETVAL, 1, struct cf_layout);
		799
694	RETVAL->pl = pango_layout_new (context);	800	RETVAL->pl = pango_layout_new (opengl_context);
695	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;
696	RETVAL->font = 0;	806	RETVAL->font = 0;
		807
697	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	808	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
698	pango_layout_set_font_description (RETVAL->pl, default_font);	809	layout_update_font (RETVAL);
699	OUTPUT:	810	OUTPUT:
700	RETVAL	811	RETVAL
701		812
702	void	813	void
703	DESTROY (CFClient::Layout self)	814	DESTROY (CFPlus::Layout self)
704	CODE:	815	CODE:
705	g_object_unref (self->pl);	816	g_object_unref (self->pl);
706	Safefree (self);	817	Safefree (self);
707		818
708	void	819	void
709	set_text (CFClient::Layout self, SV *text_)	820	set_text (CFPlus::Layout self, SV *text_)
710	CODE:	821	CODE:
711	{	822	{
712	STRLEN textlen;	823	STRLEN textlen;
713	char *text = SvPVutf8 (text_, textlen);	824	char *text = SvPVutf8 (text_, textlen);
714		825
715	pango_layout_set_text (self->pl, text, textlen);	826	pango_layout_set_text (self->pl, text, textlen);
716	}	827	}
717		828
718	void	829	void
719	set_markup (CFClient::Layout self, SV *text_)	830	set_markup (CFPlus::Layout self, SV *text_)
720	CODE:	831	CODE:
721	{	832	{
722	STRLEN textlen;	833	STRLEN textlen;
723	char *text = SvPVutf8 (text_, textlen);	834	char *text = SvPVutf8 (text_, textlen);
724		835
725	pango_layout_set_markup (self->pl, text, textlen);	836	pango_layout_set_markup (self->pl, text, textlen);
726	}	837	}
727		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
728	SV *	924	SV *
729	get_text (CFClient::Layout self)	925	get_text (CFPlus::Layout self)
730	CODE:	926	CODE:
731	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	927	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
732	SvUTF8_on (RETVAL);	928	sv_utf8_decode (RETVAL);
733	OUTPUT:	929	OUTPUT:
734	RETVAL	930	RETVAL
735		931
736	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
737	set_font (CFClient::Layout self, CFClient::Font font = 0)	941	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
738	CODE:	942	CODE:
739	if (self->font != font)	943	if (self->font != font)
740	{	944	{
741	self->font = font;	945	self->font = font;
742	layout_update_font (self);	946	layout_update_font (self);
743	}	947	}
744		948
745	void	949	void
746	set_height (CFClient::Layout self, int base_height)	950	set_height (CFPlus::Layout self, int base_height)
747	CODE:	951	CODE:
748	if (self->base_height != base_height)	952	if (self->base_height != base_height)
749	{	953	{
750	self->base_height = base_height;	954	self->base_height = base_height;
751	layout_update_font (self);	955	layout_update_font (self);
752	}	956	}
753		957
754	void	958	void
755	set_width (CFClient::Layout self, int max_width = -1)	959	set_width (CFPlus::Layout self, int max_width = -1)
756	CODE:	960	CODE:
757	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);
758		962
759	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
760	size (CFClient::Layout self)	989	size (CFPlus::Layout self)
761	PPCODE:	990	PPCODE:
762	{	991	{
763	int w, h;	992	int w, h;
764		993
765	layout_get_pixel_size (self, &w, &h);	994	layout_get_pixel_size (self, &w, &h);
…		…
768	PUSHs (sv_2mortal (newSViv (w)));	997	PUSHs (sv_2mortal (newSViv (w)));
769	PUSHs (sv_2mortal (newSViv (h)));	998	PUSHs (sv_2mortal (newSViv (h)));
770	}	999	}
771		1000
772	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
773	xy_to_index (CFClient::Layout self, int x, int y)	1014	xy_to_index (CFPlus::Layout self, int x, int y)
774	CODE:	1015	CODE:
775	{	1016	{
776	int index, trailing;	1017	int index, trailing;
777	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);
778	RETVAL = index;	1019	RETVAL = index;
779	}	1020	}
780	OUTPUT:	1021	OUTPUT:
781	RETVAL	1022	RETVAL
782		1023
783	void	1024	void
784	cursor_pos (CFClient::Layout self, int index)	1025	cursor_pos (CFPlus::Layout self, int index)
785	PPCODE:	1026	PPCODE:
786	{	1027	{
787	PangoRectangle strong_pos;	1028	PangoRectangle strong_pos;
788	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1029	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
789		1030
…		…
792	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1033	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
793	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1034	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
794	}	1035	}
795		1036
796	void	1037	void
797	render (CFClient::Layout self)	1038	render (CFPlus::Layout self, float x, float y, int flags = 0)
798	PPCODE:	1039	PPCODE:
799	{	1040	pango_opengl_render_layout_subpixel (
800	SV *retval;	1041	self->pl,
801	int w, h;	1042	x * PANGO_SCALE, y * PANGO_SCALE,
802	FT_Bitmap bitmap;	1043	self->r, self->g, self->b, self->a,
		1044	flags
		1045	);
803		1046
804	layout_get_pixel_size (self, &w, &h);	1047	MODULE = CFPlus PACKAGE = CFPlus::Texture
805		1048
806	retval = newSV (w * h);	1049	void
807	SvPOK_only (retval);	1050	pad2pot (SV data_, SV w_, SV *h_)
808	SvCUR_set (retval, w * h);	1051	CODE:
		1052	{
		1053	int ow = SvIV (w_);
		1054	int oh = SvIV (h_);
809		1055
810	bitmap.rows = h;	1056	if (ow && oh)
811	bitmap.width = w;	1057	{
812	bitmap.pitch = w;	1058	int nw = minpot (ow);
813	bitmap.buffer = (unsigned char*)SvPVX (retval);	1059	int nh = minpot (oh);
814	bitmap.num_grays = 256;
815	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
816		1060
817	memset (bitmap.buffer, 0, w * h);	1061	if (nw != ow \|\| nh != oh)
818		1062	{
819	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));
820		1069
821	EXTEND (SP, 3);	1070	SvPOK_only (result_);
822	PUSHs (sv_2mortal (newSViv (w)));	1071	SvCUR_set (result_, nw * nh * bpp);
823	PUSHs (sv_2mortal (newSViv (h)));
824	PUSHs (sv_2mortal (retval));
825	}
826		1072
827	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);
828		1076
		1077	sv_setsv (data_, result_);
		1078	}
		1079
		1080	sv_setiv (w_, nw);
		1081	sv_setiv (h_, nh);
		1082	}
		1083	}
		1084	}
		1085
829	void	1086	void
830	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.)
831	PROTOTYPE: $$$;$$	1088	PROTOTYPE: $$$;$$
		1089	ALIAS:
		1090	draw_quad_alpha = 1
		1091	draw_quad_alpha_premultiplied = 2
832	CODE:	1092	CODE:
833	{	1093	{
834	HV hv = (HV )SvRV (self);	1094	HV hv = (HV )SvRV (self);
835	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1095	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
836	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1096	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
837	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1097	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
838	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
839		1098
840	if (items < 5)	1099	if (items < 5)
841	{	1100	{
842	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1101	w = SvNV (*hv_fetch (hv, "w", 1, 1));
843	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1102	h = SvNV (*hv_fetch (hv, "h", 1, 1));
844	}	1103	}
845		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
846	glBindTexture (GL_TEXTURE_2D, name);	1119	glBindTexture (GL_TEXTURE_2D, name);
847	if (wrap_mode) {	1120
848	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
849	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
850	}
851	glBegin (GL_QUADS);	1121	glBegin (GL_QUADS);
852	glTexCoord2f (0, 0); glVertex2f (x , y );	1122	glTexCoord2f (0, 0); glVertex2f (x , y );
853	glTexCoord2f (0, t); glVertex2f (x , y + h);	1123	glTexCoord2f (0, t); glVertex2f (x , y + h);
854	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1124	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
855	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1125	glTexCoord2f (s, 0); glVertex2f (x + w, y );
856	glEnd ();	1126	glEnd ();
857	}
858		1127
		1128	if (ix)
		1129	{
		1130	glDisable (GL_ALPHA_TEST);
		1131	glDisable (GL_BLEND);
		1132	}
		1133	}
		1134
859	MODULE = CFClient PACKAGE = CFClient::Map	1135	MODULE = CFPlus PACKAGE = CFPlus::Map
860		1136
861	CFClient::Map	1137	CFPlus::Map
862	new (SV *class, int map_width, int map_height)	1138	new (SV *class, int map_width, int map_height)
863	CODE:	1139	CODE:
864	New (0, RETVAL, 1, struct map);	1140	New (0, RETVAL, 1, struct map);
865	RETVAL->x = 0;	1141	RETVAL->x = 0;
866	RETVAL->y = 0;	1142	RETVAL->y = 0;
…		…
876	RETVAL->row = 0;	1152	RETVAL->row = 0;
877	OUTPUT:	1153	OUTPUT:
878	RETVAL	1154	RETVAL
879		1155
880	void	1156	void
881	DESTROY (CFClient::Map self)	1157	DESTROY (CFPlus::Map self)
882	CODE:	1158	CODE:
883	{	1159	{
884	map_clear (self);	1160	map_clear (self);
885	Safefree (self->face);	1161	Safefree (self->face);
		1162	Safefree (self->tex);
886	Safefree (self);	1163	Safefree (self);
887	}	1164	}
888		1165
889	void	1166	void
890	clear (CFClient::Map self)	1167	clear (CFPlus::Map self)
891	CODE:	1168	CODE:
892	map_clear (self);	1169	map_clear (self);
893		1170
894	void	1171	void
895	set_face (CFClient::Map self, int face, int texid)	1172	set_face (CFPlus::Map self, int face, int texid)
896	CODE:	1173	CODE:
897	{	1174	{
898	while (self->faces <= face)	1175	while (self->faces <= face)
899	{	1176	{
900	Append (mapface, self->face, self->faces, self->faces);	1177	Append (mapface, self->face, self->faces, self->faces);
…		…
903		1180
904	self->face [face] = texid;	1181	self->face [face] = texid;
905	}	1182	}
906		1183
907	void	1184	void
908	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)
909	CODE:	1186	CODE:
910	{	1187	{
911	while (self->texs <= texid)	1188	while (self->texs <= texid)
912	{	1189	{
913	Append (maptex, self->tex, self->texs, self->texs);	1190	Append (maptex, self->tex, self->texs, self->texs);
…		…
925	tex->r = r;	1202	tex->r = r;
926	tex->g = g;	1203	tex->g = g;
927	tex->b = b;	1204	tex->b = b;
928	tex->a = a;	1205	tex->a = a;
929	}	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);
930	}	1216	}
931		1217
932	int	1218	int
933	ox (CFClient::Map self)	1219	ox (CFPlus::Map self)
934	ALIAS:	1220	ALIAS:
935	oy = 1	1221	oy = 1
		1222	x = 2
		1223	y = 3
		1224	w = 4
		1225	h = 5
936	CODE:	1226	CODE:
937	switch (ix)	1227	switch (ix)
938	{	1228	{
939	case 0: RETVAL = self->ox; break;	1229	case 0: RETVAL = self->ox; break;
940	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;
941	}	1235	}
942	OUTPUT:	1236	OUTPUT:
943	RETVAL	1237	RETVAL
944		1238
945	void	1239	void
946	scroll (CFClient::Map self, int dx, int dy)	1240	scroll (CFPlus::Map self, int dx, int dy)
947	CODE:	1241	CODE:
948	{	1242	{
949	if (dx > 0)	1243	if (dx > 0)
950	map_blank (self, self->x, self->y, dx - 1, self->h);	1244	map_blank (self, self->x, self->y, dx - 1, self->h);
951	else if (dx < 0)	1245	else if (dx < 0)
…		…
967	self->y += MAP_EXTEND_Y;	1261	self->y += MAP_EXTEND_Y;
968	}	1262	}
969	}	1263	}
970		1264
971	void	1265	void
972	map1a_update (CFClient::Map self, SV *data_)	1266	map1a_update (CFPlus::Map self, SV *data_, int extmap)
973	CODE:	1267	CODE:
974	{	1268	{
975	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1269	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
976	uint8_t data_end = (uint8_t )SvEND (data_);	1270	uint8_t data_end = (uint8_t )SvEND (data_);
977	mapcell *cell;	1271	mapcell *cell;
…		…
979		1273
980	while (data < data_end)	1274	while (data < data_end)
981	{	1275	{
982	flags = (data [0] << 8) + data [1]; data += 2;	1276	flags = (data [0] << 8) + data [1]; data += 2;
983		1277
984	x = ((flags >> 10) & 63) + self->x;	1278	x = self->x + ((flags >> 10) & 63);
985	y = ((flags >> 4) & 63) + self->y;	1279	y = self->y + ((flags >> 4) & 63);
986		1280
987	cell = map_get_cell (self, x, y);	1281	cell = map_get_cell (self, x, y);
988		1282
989	if (flags & 15)	1283	if (flags & 15)
990	{	1284	{
991	if (cell->darkness < 0)	1285	if (!cell->darkness)
992	{	1286	{
993	cell->darkness = 0;	1287	cell->darkness = 256;
994	cell->face [0] = 0;	1288	cell->face [0] = 0;
995	cell->face [1] = 0;	1289	cell->face [1] = 0;
996	cell->face [2] = 0;	1290	cell->face [2] = 0;
997	}	1291	}
998		1292
999	cell->darkness = flags & 8 ? *data++ : 255;
1000
1001	//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	}
1002		1316
1003	if (flags & 4)	1317	if (flags & 4)
1004	{	1318	{
1005	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;
1006	}	1320	}
…		…
1014	{	1328	{
1015	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;
1016	}	1330	}
1017	}	1331	}
1018	else	1332	else
1019	cell->darkness = -1;	1333	cell->darkness = 0;
1020	}	1334	}
1021	}	1335	}
1022		1336
1023	SV *	1337	SV *
1024	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)
1025	CODE:	1339	CODE:
1026	{	1340	{
1027	int x1, x;	1341	int x1, x;
1028	int y1, y;	1342	int y1, y;
1029	int z;	1343	int z;
…		…
1079	}	1393	}
1080	OUTPUT:	1394	OUTPUT:
1081	RETVAL	1395	RETVAL
1082		1396
1083	void	1397	void
1084	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)
1085	PPCODE:	1399	CODE:
1086	{	1400	{
1087	int vx, vy;	1401	int vx, vy;
1088	int x, y, z;	1402	int x, y, z;
1089	int last_name;	1403	int last_name;
1090	mapface face;	1404	mapface face;
1091	int sw4 = (sw + 3) & ~3;
1092	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1093	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1094		1405
1095	memset (darkness, 255, sw4 * sh);
1096	SvPOK_only (darkness_sv);
1097	SvCUR_set (darkness_sv, sw4 * sh);
1098
1099	vx = self->x + (self->w - sw) / 2 - shift_x;	1406	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1100	vy = self->y + (self->h - sh) / 2 - shift_y;	1407	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1101		1408
1102	/*	1409	/*
1103	int vx = self->vx = self->w >= sw	1410	int vx = self->vx = self->w >= sw
1104	? self->x + (self->w - sw) / 2	1411	? self->x + (self->w - sw) / 2
1105	: 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));
…		…
1109	: 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));
1110	*/	1417	*/
1111		1418
1112	glColor4ub (255, 255, 255, 255);	1419	glColor4ub (255, 255, 255, 255);
1113		1420
		1421	glEnable (GL_BLEND);
1114	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1422	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1115	glEnable (GL_BLEND);
1116	glEnable (GL_TEXTURE_2D);	1423	glEnable (GL_TEXTURE_2D);
1117	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1424	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1118		1425
1119	glBegin (GL_QUADS);	1426	glBegin (GL_QUADS);
1120		1427
…		…
1128		1435
1129	for (x = 0; x < sw; x++)	1436	for (x = 0; x < sw; x++)
1130	if (row->c0 <= x + vx && x + vx < row->c1)	1437	if (row->c0 <= x + vx && x + vx < row->c1)
1131	{	1438	{
1132	mapcell *cell = row->col + (x + vx - row->c0);	1439	mapcell *cell = row->col + (x + vx - row->c0);
1133
1134	darkness[y * sw4 + x] = cell->darkness < 0
1135	? 255 - FOW_DARKNESS
1136	: 255 - cell->darkness;
1137		1440
1138	face = cell->face [z];	1441	face = cell->face [z];
1139		1442
1140	if (face)	1443	if (face)
1141	{	1444	{
…		…
1162		1465
1163	glEnd ();	1466	glEnd ();
1164		1467
1165	glDisable (GL_TEXTURE_2D);	1468	glDisable (GL_TEXTURE_2D);
1166	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	}
1167		1564
1168	EXTEND (SP, 3);	1565	EXTEND (SP, 3);
1169	PUSHs (sv_2mortal (newSViv (sw4)));	1566	PUSHs (sv_2mortal (newSViv (sw4)));
1170	PUSHs (sv_2mortal (newSViv (sh)));	1567	PUSHs (sv_2mortal (newSViv (sh)));
1171	PUSHs (darkness_sv);	1568	PUSHs (darkness_sv);
1172	}	1569	}
1173		1570
1174	SV *	1571	SV *
1175	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)
1176	CODE:	1573	CODE:
1177	{	1574	{
1178	int x, y, x1, y1;	1575	int x, y, x1, y1;
1179	SV data_sv = newSV (w h * 7 + 5);	1576	SV data_sv = newSV (w h * 7 + 5);
1180	uint8_t data = (uint8_t )SvPVX (data_sv);	1577	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1242	}	1639	}
1243	OUTPUT:	1640	OUTPUT:
1244	RETVAL	1641	RETVAL
1245		1642
1246	void	1643	void
1247	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)
1248	PPCODE:	1645	PPCODE:
1249	{	1646	{
1250	int x, y, z;	1647	int x, y, z;
1251	int w, h;	1648	int w, h;
1252	int x1, y1;	1649	int x1, y1;
…		…
1284		1681
1285	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1682	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1286	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1683	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1287	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1684	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1288		1685
1289	if (cell->darkness <= 0)	1686	if (cell->darkness <= 1)
1290	{	1687	{
1291	cell->darkness = -1;	1688	cell->darkness = 0;
1292		1689
1293	for (z = 0; z <= 2; z++)	1690	for (z = 0; z <= 2; z++)
1294	{	1691	{
1295	cell->face[z] = face[z];	1692	cell->face[z] = face[z];
1296		1693
…		…
1301	}	1698	}
1302	}	1699	}
1303	}	1700	}
1304	}	1701	}
1305		1702
1306	MODULE = CFClient PACKAGE = CFClient::MixChunk	1703	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1307		1704
1308	CFClient::MixChunk	1705	CFPlus::MixChunk
1309	new_from_file (SV class, char path)	1706	new_from_file (SV class, char path)
1310	CODE:	1707	CODE:
1311	RETVAL = Mix_LoadWAV (path);	1708	RETVAL = Mix_LoadWAV (path);
1312	OUTPUT:	1709	OUTPUT:
1313	RETVAL	1710	RETVAL
1314		1711
1315	void	1712	void
1316	DESTROY (CFClient::MixChunk self)	1713	DESTROY (CFPlus::MixChunk self)
1317	CODE:	1714	CODE:
1318	Mix_FreeChunk (self);	1715	Mix_FreeChunk (self);
1319		1716
1320	int	1717	int
1321	volume (CFClient::MixChunk self, int volume = -1)	1718	volume (CFPlus::MixChunk self, int volume = -1)
1322	CODE:	1719	CODE:
1323	RETVAL = Mix_VolumeChunk (self, volume);	1720	RETVAL = Mix_VolumeChunk (self, volume);
1324	OUTPUT:	1721	OUTPUT:
1325	RETVAL	1722	RETVAL
1326		1723
1327	int	1724	int
1328	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)
1329	CODE:	1726	CODE:
1330	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1727	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1331	OUTPUT:	1728	OUTPUT:
1332	RETVAL	1729	RETVAL
1333		1730
1334	MODULE = CFClient PACKAGE = CFClient::MixMusic	1731	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1335		1732
1336	int	1733	int
1337	volume (int volume = -1)	1734	volume (int volume = -1)
1338	CODE:	1735	CODE:
1339	RETVAL = Mix_VolumeMusic (volume);	1736	RETVAL = Mix_VolumeMusic (volume);
1340	OUTPUT:	1737	OUTPUT:
1341	RETVAL	1738	RETVAL
1342		1739
1343	CFClient::MixMusic	1740	CFPlus::MixMusic
1344	new_from_file (SV class, char path)	1741	new_from_file (SV class, char path)
1345	CODE:	1742	CODE:
1346	RETVAL = Mix_LoadMUS (path);	1743	RETVAL = Mix_LoadMUS (path);
1347	OUTPUT:	1744	OUTPUT:
1348	RETVAL	1745	RETVAL
1349		1746
1350	void	1747	void
1351	DESTROY (CFClient::MixMusic self)	1748	DESTROY (CFPlus::MixMusic self)
1352	CODE:	1749	CODE:
1353	Mix_FreeMusic (self);	1750	Mix_FreeMusic (self);
1354		1751
1355	int	1752	int
1356	play (CFClient::MixMusic self, int loops = -1)	1753	play (CFPlus::MixMusic self, int loops = -1)
1357	CODE:	1754	CODE:
1358	RETVAL = Mix_PlayMusic (self, loops);	1755	RETVAL = Mix_PlayMusic (self, loops);
1359	OUTPUT:	1756	OUTPUT:
1360	RETVAL	1757	RETVAL
1361		1758
1362	MODULE = CFClient PACKAGE = CFClient::OpenGL	1759	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1363		1760
1364	BOOT:	1761	BOOT:
1365	{	1762	{
1366	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1763	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1367	static const struct {	1764	static const struct {
1368	const char *name;	1765	const char *name;
1369	IV iv;	1766	IV iv;
1370	} *civ, const_iv[] = {	1767	} *civ, const_iv[] = {
1371	# define const_iv(name) { # name, (IV)name }	1768	# define const_iv(name) { # name, (IV)name }
1372	const_iv (GL_COLOR_MATERIAL),	1769	const_iv (GL_COLOR_MATERIAL),
1373	const_iv (GL_SMOOTH),	1770	const_iv (GL_SMOOTH),
1374	const_iv (GL_FLAT),	1771	const_iv (GL_FLAT),
1375	const_iv (GL_DITHER),	1772	const_iv (GL_DITHER),
1376	const_iv (GL_BLEND),	1773	const_iv (GL_BLEND),
		1774	const_iv (GL_CULL_FACE),
1377	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),
1378	const_iv (GL_AND),	1782	const_iv (GL_AND),
1379	const_iv (GL_ONE),	1783	const_iv (GL_ONE),
1380	const_iv (GL_ZERO),	1784	const_iv (GL_ZERO),
1381	const_iv (GL_SRC_ALPHA),	1785	const_iv (GL_SRC_ALPHA),
1382	const_iv (GL_SRC_ALPHA_SATURATE),	1786	const_iv (GL_DST_ALPHA),
1383	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1787	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1384	const_iv (GL_ONE_MINUS_DST_ALPHA),	1788	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1789	const_iv (GL_SRC_ALPHA_SATURATE),
1385	const_iv (GL_RGB),	1790	const_iv (GL_RGB),
1386	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),
1387	const_iv (GL_UNSIGNED_BYTE),	1795	const_iv (GL_UNSIGNED_BYTE),
		1796	const_iv (GL_UNSIGNED_SHORT),
		1797	const_iv (GL_UNSIGNED_INT),
1388	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),
1389	const_iv (GL_FLOAT),	1802	const_iv (GL_FLOAT),
1390	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1803	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1391	const_iv (GL_COMPILE),	1804	const_iv (GL_COMPILE),
1392	const_iv (GL_TEXTURE_1D),	1805	const_iv (GL_TEXTURE_1D),
1393	const_iv (GL_TEXTURE_2D),	1806	const_iv (GL_TEXTURE_2D),
…		…
1395	const_iv (GL_TEXTURE_MAG_FILTER),	1808	const_iv (GL_TEXTURE_MAG_FILTER),
1396	const_iv (GL_TEXTURE_MIN_FILTER),	1809	const_iv (GL_TEXTURE_MIN_FILTER),
1397	const_iv (GL_TEXTURE_ENV_MODE),	1810	const_iv (GL_TEXTURE_ENV_MODE),
1398	const_iv (GL_TEXTURE_WRAP_S),	1811	const_iv (GL_TEXTURE_WRAP_S),
1399	const_iv (GL_TEXTURE_WRAP_T),	1812	const_iv (GL_TEXTURE_WRAP_T),
		1813	const_iv (GL_REPEAT),
1400	const_iv (GL_CLAMP),	1814	const_iv (GL_CLAMP),
1401	const_iv (GL_REPEAT),	1815	const_iv (GL_CLAMP_TO_EDGE),
1402	const_iv (GL_NEAREST),	1816	const_iv (GL_NEAREST),
1403	const_iv (GL_LINEAR),	1817	const_iv (GL_LINEAR),
1404	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1818	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1405	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1819	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1406	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1820	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1407	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1821	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1408	const_iv (GL_GENERATE_MIPMAP),	1822	const_iv (GL_GENERATE_MIPMAP),
1409	const_iv (GL_MODULATE),	1823	const_iv (GL_MODULATE),
1410	const_iv (GL_DECAL),	1824	const_iv (GL_DECAL),
1411	const_iv (GL_REPLACE),	1825	const_iv (GL_REPLACE),
		1826	const_iv (GL_DEPTH_BUFFER_BIT),
1412	const_iv (GL_COLOR_BUFFER_BIT),	1827	const_iv (GL_COLOR_BUFFER_BIT),
1413	const_iv (GL_PROJECTION),	1828	const_iv (GL_PROJECTION),
1414	const_iv (GL_MODELVIEW),	1829	const_iv (GL_MODELVIEW),
1415	const_iv (GL_COLOR_LOGIC_OP),	1830	const_iv (GL_COLOR_LOGIC_OP),
1416	const_iv (GL_SEPARABLE_2D),	1831	const_iv (GL_SEPARABLE_2D),
1417	const_iv (GL_CONVOLUTION_2D),	1832	const_iv (GL_CONVOLUTION_2D),
1418	const_iv (GL_CONVOLUTION_BORDER_MODE),	1833	const_iv (GL_CONVOLUTION_BORDER_MODE),
1419	const_iv (GL_CONSTANT_BORDER),	1834	const_iv (GL_CONSTANT_BORDER),
1420	const_iv (GL_LINES),	1835	const_iv (GL_LINES),
		1836	const_iv (GL_LINE_STRIP),
		1837	const_iv (GL_LINE_LOOP),
1421	const_iv (GL_QUADS),	1838	const_iv (GL_QUADS),
1422	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),
1423	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1843	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1424	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),
1425	# undef const_iv	1849	# undef const_iv
1426	};	1850	};
1427		1851
1428	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; )
1429	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1853	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1430	}	1854	}
1431		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
1432	int glGetError ()	1877	int glGetError ()
		1878
		1879	void glFinish ()
1433		1880
1434	void glClear (int mask)	1881	void glClear (int mask)
1435		1882
1436	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)
1437	PROTOTYPE: @	1884	PROTOTYPE: @
…		…
1444		1891
1445	void glHint (int target, int mode)	1892	void glHint (int target, int mode)
1446		1893
1447	void glBlendFunc (int sfactor, int dfactor)	1894	void glBlendFunc (int sfactor, int dfactor)
1448		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
1449	void glLogicOp (int opcode)	1902	void glLogicOp (int opcode)
1450		1903
1451	void glColorMask (int red, int green, int blue, int alpha)	1904	void glColorMask (int red, int green, int blue, int alpha)
1452		1905
1453	void glMatrixMode (int mode)	1906	void glMatrixMode (int mode)
…		…
1456		1909
1457	void glPopMatrix ()	1910	void glPopMatrix ()
1458		1911
1459	void glLoadIdentity ()	1912	void glLoadIdentity ()
1460		1913
		1914	void glDrawBuffer (int buffer)
		1915
		1916	void glReadBuffer (int buffer)
		1917
1461	# 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
1462	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_)
1463		1923
1464	void glViewport (int x, int y, int width, int height)	1924	void glViewport (int x, int y, int width, int height)
1465		1925
1466	void glScissor (int x, int y, int width, int height)	1926	void glScissor (int x, int y, int width, int height)
…		…
1481		1941
1482	void glEnd ()	1942	void glEnd ()
1483		1943
1484	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)
1485	PROTOTYPE: @	1945	PROTOTYPE: @
		1946	ALIAS:
		1947	glColor_premultiply = 1
1486	CODE:	1948	CODE:
1487	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);
1488		1968
1489	void glVertex (float x, float y, float z = 0.)	1969	void glVertex (float x, float y, float z = 0.)
1490	CODE:	1970	CODE:
1491	glVertex3f (x, y, z);	1971	glVertex3f (x, y, z);
1492		1972
…		…
1504		1984
1505	void glBindTexture (int target, int name)	1985	void glBindTexture (int target, int name)
1506		1986
1507	void glConvolutionParameter (int target, int pname, float params)	1987	void glConvolutionParameter (int target, int pname, float params)
1508	CODE:	1988	CODE:
1509	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1989	if (gl.ConvolutionParameterf)
		1990	gl.ConvolutionParameterf (target, pname, params);
1510		1991
1511	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)
1512	CODE:	1993	CODE:
1513	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1994	if (gl.ConvolutionFilter2D)
1514	(target, internalformat, width, height, format, type, data));	1995	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1515		1996
1516	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)
1517	CODE:	1998	CODE:
1518	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1999	if (gl.SeparableFilter2D)
1519	(target, internalformat, width, height, format, type, row, column));	2000	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1520		2001
1521	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)
1522		2003
1523	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)
1524		2005
1525	void glRasterPos (int x, int y)	2006	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1526	CODE:
1527	glRasterPos2i (x, y);
1528		2007
1529	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)
1530		2009
1531	int glGenTexture ()	2010	int glGenTexture ()
1532	CODE:	2011	CODE:

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.72 by root, Fri May 5 19:10:16 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.72 by root, Fri May 5 19:10:16 2006 UTC vs.
Revision 1.142 by root, Fri Aug 18 01:27:15 2006 UTC