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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.68 by root, Tue Apr 25 11:48:30 2006 UTC vs. Revision 1.140 by root, Mon Aug 14 03:41:25 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.68 by root, Tue Apr 25 11:48:30 2006 UTC vs.
Revision 1.140 by root, Mon Aug 14 03:41:25 2006 UTC