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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.57 by root, Fri Apr 21 07:09:10 2006 UTC vs.
Revision 1.158 by root, Sun Oct 1 18:17:37 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	# include <wininet.h>
		7	# pragma warning(disable:4244)
3	#endif	8	#endif
4		9
5	#include "EXTERN.h"	10	#include "EXTERN.h"
6	#include "perl.h"	11	#include "perl.h"
7	#include "XSUB.h"	12	#include "XSUB.h"
8		13
		14	#ifdef _WIN32
		15	# undef pipe
		16	#endif
		17
		18	#include <math.h>
9	#include <string.h>	19	#include <string.h>
10	#include <stdio.h>	20	#include <stdio.h>
		21	#include <stdlib.h>
11		22
12	#include <SDL.h>	23	#include <SDL.h>
		24	#include <SDL_endian.h>
13	#include <SDL_image.h>	25	#include <SDL_image.h>
14	#include <SDL_mixer.h>	26	#include <SDL_mixer.h>
15	#include <SDL_opengl.h>	27	#include <SDL_opengl.h>
16		28
		29	#define PANGO_ENABLE_BACKEND
		30	#define G_DISABLE_CAST_CHECKS
		31
17	#include <glib/gmacros.h>	32	#include <glib/gmacros.h>
18		33
19	#include <pango/pango.h>	34	#include <pango/pango.h>
20	#include <pango/pangofc-fontmap.h>
21	#include <pango/pangoft2.h>
22		35
23	#ifndef _WIN32	36	#ifndef _WIN32
24	# include <sys/types.h>	37	# include <sys/types.h>
25	# include <sys/socket.h>	38	# include <sys/socket.h>
26	# include <netinet/in.h>	39	# include <netinet/in.h>
33	typedef signed char int8_t;	46	typedef signed char int8_t;
34	typedef signed short int16_t;	47	typedef signed short int16_t;
35	typedef signed int int32_t;	48	typedef signed int int32_t;
36	#endif	49	#endif
37		50
38	#include "glext.h"	51	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
39		52
40	#define FOW_DARKNESS 32	53	#define FOW_DARKNESS 32
41		54
42	#define MAP_EXTEND_X 32	55	#define MAP_EXTEND_X 32
43	#define MAP_EXTEND_Y 512	56	#define MAP_EXTEND_Y 512
44		57
		58	#define MIN_FONT_HEIGHT 10
		59
		60	#if 0
		61	# define PARACHUTE SDL_INIT_NOPARACHUTE
		62	#else
		63	# define PARACHUTE 0
		64	#endif
		65
		66	static struct
		67	{
		68	#define GL_FUNC(ptr,name) ptr name;
		69	#include "glfunc.h"
		70	#undef GL_FUNC
		71	} gl;
		72
		73	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
		74	{
		75	if (gl.BlendFuncSeparate)
		76	gl.BlendFuncSeparate (sa, da, saa, daa);
		77	else if (gl.BlendFuncSeparateEXT)
		78	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
		79	else
		80	glBlendFunc (sa, da);
		81	}
		82
		83	#include "texcache.c"
		84
		85	#include "pango-font.c"
		86	#include "pango-fontmap.c"
		87	#include "pango-render.c"
		88
45	typedef Mix_Chunk *CFClient__MixChunk;	89	typedef Mix_Chunk *CFPlus__MixChunk;
46	typedef Mix_Music *CFClient__MixMusic;	90	typedef Mix_Music *CFPlus__MixMusic;
47		91
48	static PangoContext *context;	92	typedef PangoFontDescription *CFPlus__Font;
49	static PangoFontMap *fontmap;	93
		94	static int
		95	shape_attr_p (PangoLayoutRun *run)
		96	{
		97	GSList *attrs = run->item->analysis.extra_attrs;
		98
		99	while (attrs)
		100	{
		101	PangoAttribute *attr = attrs->data;
		102
		103	if (attr->klass->type == PANGO_ATTR_SHAPE)
		104	return 1;
		105
		106	attrs = attrs->next;
		107	}
		108
		109	return 0;
		110	}
50		111
51	typedef struct cf_layout {	112	typedef struct cf_layout {
52	PangoLayout *pl;	113	PangoLayout *pl;
		114	float r, g, b, a; // default color for rgba mode
53	int base_height;	115	int base_height;
		116	CFPlus__Font font;
54	} *CFClient__Layout;	117	} *CFPlus__Layout;
		118
		119	static CFPlus__Font default_font;
		120	static PangoContext *opengl_context;
		121	static PangoFontMap *opengl_fontmap;
55		122
56	static void	123	static void
57	substitute_func (FcPattern *pattern, gpointer data)	124	substitute_func (FcPattern *pattern, gpointer data)
58	{	125	{
59	FcPatternAddBool (pattern, FC_HINTING , 1);	126	FcPatternAddBool (pattern, FC_HINTING, 1);
		127	#ifdef FC_HINT_STYLE
		128	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		129	#endif
60	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	130	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
61	}	131	}
62		132
63	static void	133	static void
64	layout_update (CFClient__Layout self)	134	layout_update_font (CFPlus__Layout self)
65	{	135	{
66	/* use a random scale factor to account for unknown descenders, 0.8 works	136	/* use a random scale factor to account for unknown descenders, 0.8 works
67	* reasonably well with bitstream vera	137	* reasonably well with bitstream vera
68	*/	138	*/
69	PangoFontDescription *font = pango_context_get_font_description (context);	139	PangoFontDescription *font = self->font ? self->font : default_font;
70		140
71	int height = self->base_height * (PANGO_SCALE * 8 / 10);
72
73	if (pango_font_description_get_size (font) != height)
74	{
75	pango_font_description_set_absolute_size (font, height);	141	pango_font_description_set_absolute_size (font,
76	pango_layout_context_changed (self->pl);	142	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
77	}	143
		144	pango_layout_set_font_description (self->pl, font);
78	}	145	}
79		146
80	static void	147	static void
81	layout_get_pixel_size (CFClient__Layout self, int w, int h)	148	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
82	{	149	{
83	layout_update (self);	150	PangoRectangle rect;
84		151
		152	// get_pixel_* wrongly rounds down
85	pango_layout_get_pixel_size (self->pl, w, h);	153	pango_layout_get_extents (self->pl, 0, &rect);
86		154
87	w = (w + 3) & ~3;	155	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
88	if (!w) w = 1;	156	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
89	if (!h) h = 1;	157
		158	if (!rect.width) rect.width = 1;
		159	if (!rect.height) rect.height = 1;
		160
		161	*w = rect.width;
		162	*h = rect.height;
90	}	163	}
91		164
92	typedef uint16_t mapface;	165	typedef uint16_t mapface;
93		166
94	typedef struct {	167	typedef struct {
…		…
97	float s, t;	170	float s, t;
98	uint8_t r, g, b, a;	171	uint8_t r, g, b, a;
99	} maptex;	172	} maptex;
100		173
101	typedef struct {	174	typedef struct {
102	int16_t darkness;	175	uint32_t player;
103	mapface face[3];	176	mapface face[3];
		177	uint16_t darkness;
		178	uint8_t stat_width, stat_hp, flags;
104	} mapcell;	179	} mapcell;
105		180
106	typedef struct {	181	typedef struct {
107	int32_t c0, c1;	182	int32_t c0, c1;
108	mapcell *col;	183	mapcell *col;
…		…
117	int texs;	192	int texs;
118	maptex *tex;	193	maptex *tex;
119		194
120	int32_t rows;	195	int32_t rows;
121	maprow *row;	196	maprow *row;
122	} *CFClient__Map;	197	} *CFPlus__Map;
123		198
124	static char *	199	static char *
125	prepend (char *ptr, int sze, int inc)	200	prepend (char *ptr, int sze, int inc)
126	{	201	{
127	char *p;	202	char *p;
…		…
145		220
146	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	221	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
147	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	222	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
148		223
149	static maprow *	224	static maprow *
150	map_get_row (CFClient__Map self, int y)	225	map_get_row (CFPlus__Map self, int y)
151	{	226	{
152	if (0 > y)	227	if (0 > y)
153	{	228	{
154	int extend = - y + MAP_EXTEND_Y;	229	int extend = - y + MAP_EXTEND_Y;
155	Prepend (maprow, self->row, self->rows, extend);	230	Prepend (maprow, self->row, self->rows, extend);
…		…
193		268
194	return row->col + (x - row->c0);	269	return row->col + (x - row->c0);
195	}	270	}
196		271
197	static mapcell *	272	static mapcell *
198	map_get_cell (CFClient__Map self, int x, int y)	273	map_get_cell (CFPlus__Map self, int x, int y)
199	{	274	{
200	return row_get_cell (map_get_row (self, y), x);	275	return row_get_cell (map_get_row (self, y), x);
201	}	276	}
202		277
203	static void	278	static void
204	map_clear (CFClient__Map self)	279	map_clear (CFPlus__Map self)
205	{	280	{
206	int r;	281	int r;
207		282
208	for (r = 0; r < self->rows; r++)	283	for (r = 0; r < self->rows; r++)
209	Safefree (self->row[r].col);	284	Safefree (self->row[r].col);
…		…
217	self->row = 0;	292	self->row = 0;
218	self->rows = 0;	293	self->rows = 0;
219	}	294	}
220		295
221	static void	296	static void
222	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	297	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
223	{	298	{
224	int x, y;	299	int x, y;
225	maprow *row;	300	maprow *row;
		301	mapcell *cell;
226		302
227	for (y = y0; y < y0 + h; y++)	303	for (y = y0; y < y0 + h; y++)
228	if (y >= 0)	304	if (y >= 0)
229	{	305	{
230	if (y >= self->rows)	306	if (y >= self->rows)
…		…
236	if (x >= row->c0)	312	if (x >= row->c0)
237	{	313	{
238	if (x >= row->c1)	314	if (x >= row->c1)
239	break;	315	break;
240		316
241	row->col[x - row->c0].darkness = -1;	317	cell = row->col + x - row->c0;
		318
		319	cell->darkness = 0;
		320	cell->stat_hp = 0;
		321	cell->flags = 0;
		322	cell->player = 0;
242	}	323	}
243	}	324	}
244	}	325	}
245		326
246	static void	327	static void
247	music_finished ()	328	music_finished (void)
248	{	329	{
249	SDL_UserEvent ev;	330	SDL_UserEvent ev;
250		331
251	ev.type = SDL_USEREVENT;	332	ev.type = SDL_USEREVENT;
252	ev.code = 0;	333	ev.code = 0;
…		…
254	ev.data2 = 0;	335	ev.data2 = 0;
255		336
256	SDL_PushEvent ((SDL_Event *)&ev);	337	SDL_PushEvent ((SDL_Event *)&ev);
257	}	338	}
258		339
		340	static void
		341	channel_finished (int channel)
		342	{
		343	SDL_UserEvent ev;
		344
		345	ev.type = SDL_USEREVENT;
		346	ev.code = 1;
		347	ev.data1 = (void *)(long)channel;
		348	ev.data2 = 0;
		349
		350	SDL_PushEvent ((SDL_Event *)&ev);
		351	}
		352
		353	static unsigned int
		354	minpot (unsigned int n)
		355	{
		356	if (!n)
		357	return 0;
		358
		359	--n;
		360
		361	n \|= n >> 1;
		362	n \|= n >> 2;
		363	n \|= n >> 4;
		364	n \|= n >> 8;
		365	n \|= n >> 16;
		366
		367	return n + 1;
		368	}
		369
259	MODULE = CFClient PACKAGE = CFClient	370	MODULE = CFPlus PACKAGE = CFPlus
260		371
261	PROTOTYPES: ENABLE	372	PROTOTYPES: ENABLE
262		373
263	BOOT:	374	BOOT:
264	{	375	{
265	HV *stash = gv_stashpv ("CFClient", 1);	376	HV *stash = gv_stashpv ("CFPlus", 1);
266	static const struct {	377	static const struct {
267	const char *name;	378	const char *name;
268	IV iv;	379	IV iv;
269	} *civ, const_iv[] = {	380	} *civ, const_iv[] = {
270	# define const_iv(name) { # name, (IV)name }	381	# define const_iv(name) { # name, (IV)name }
…		…
369	# undef const_iv	480	# undef const_iv
370	};	481	};
371		482
372	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	483	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
373	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	484	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
374
375	fontmap = pango_ft2_font_map_new ();
376	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
377	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
378	}	485	}
379		486
380	int	487	int
		488	in_destruct ()
		489	CODE:
		490	RETVAL = PL_main_cv == Nullcv;
		491	OUTPUT:
		492	RETVAL
		493
		494	NV floor (NV x)
		495
		496	NV ceil (NV x)
		497
		498	void
		499	pango_init ()
		500	CODE:
		501	{
		502	opengl_fontmap = pango_opengl_font_map_new ();
		503	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
		504	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		505	}
		506
		507	int
381	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	508	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
382		509
383	void	510	void
384	SDL_Quit ()	511	SDL_Quit ()
385		512
386	void	513	void
…		…
392	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	519	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
393	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	520	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
394	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	521	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
395	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	522	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
396		523
		524	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		525	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		526
397	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
398	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	528	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
399	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	529	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
400	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	530	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
401		531
402	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	532	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		533	#if SDL_VERSION_ATLEAST(1,2,10)
403	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	534	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
404	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	535	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		536	#endif
405		537
406	SDL_EnableUNICODE (1);	538	SDL_EnableUNICODE (1);
407	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	539	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
408		540
409	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	541	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
418		550
419	++m;	551	++m;
420	}	552	}
421	}	553	}
422		554
		555	char *
		556	SDL_GetError ()
		557
423	int	558	int
424	SDL_SetVideoMode (int w, int h, int fullscreen)	559	SDL_SetVideoMode (int w, int h, int fullscreen)
425	CODE:	560	CODE:
426	RETVAL = !!SDL_SetVideoMode (	561	RETVAL = !!SDL_SetVideoMode (
427	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	562	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
428	);	563	);
		564	if (RETVAL)
		565	{
429	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	566	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		567	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		568	# include "glfunc.h"
		569	# undef GL_FUNC
		570	}
430	OUTPUT:	571	OUTPUT:
431	RETVAL	572	RETVAL
432		573
433	void	574	void
434	SDL_GL_SwapBuffers ()	575	SDL_GL_SwapBuffers ()
		576
		577	char *
		578	SDL_GetKeyName (int sym)
435		579
436	void	580	void
437	SDL_PollEvent ()	581	SDL_PollEvent ()
438	PPCODE:	582	PPCODE:
439	{	583	{
…		…
441		585
442	while (SDL_PollEvent (&ev))	586	while (SDL_PollEvent (&ev))
443	{	587	{
444	HV *hv = newHV ();	588	HV *hv = newHV ();
445	hv_store (hv, "type", 4, newSViv (ev.type), 0);	589	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		590
446	switch (ev.type)	591	switch (ev.type)
447	{	592	{
448	case SDL_KEYDOWN:	593	case SDL_KEYDOWN:
449	case SDL_KEYUP:	594	case SDL_KEYUP:
450	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	595	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
457	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	602	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
458	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	603	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
459	break;	604	break;
460		605
461	case SDL_MOUSEMOTION:	606	case SDL_MOUSEMOTION:
		607	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		608
462	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	609	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
463	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	610	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
464	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	611	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
465	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	612	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
466	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	613	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
467	break;	614	break;
468		615
469	case SDL_MOUSEBUTTONDOWN:	616	case SDL_MOUSEBUTTONDOWN:
470	case SDL_MOUSEBUTTONUP:	617	case SDL_MOUSEBUTTONUP:
		618	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		619
471	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	620	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
472	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	621	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
473	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	622	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
474	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	623	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		624	break;
		625
		626	case SDL_USEREVENT:
		627	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		628	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		629	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		630	break;
475	}	631	}
476		632
477	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	633	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
478	}	634	}
479	}	635	}
480		636
481	int	637	int
482	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	638	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
483	POSTCALL:	639	POSTCALL:
484	Mix_HookMusicFinished (music_finished);	640	Mix_HookMusicFinished (music_finished);
		641	Mix_ChannelFinished (channel_finished);
485		642
486	void	643	void
487	Mix_CloseAudio ()	644	Mix_CloseAudio ()
488		645
489	int	646	int
…		…
494	CODE:	651	CODE:
495	#ifndef _WIN32	652	#ifndef _WIN32
496	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	653	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
497	#endif	654	#endif
498		655
499	char *	656	void
500	gl_version ()	657	win32_proxy_info ()
501	CODE:	658	PPCODE:
502	RETVAL = (char *)glGetString (GL_VERSION);	659	{
503	OUTPUT:	660	#ifdef _WIN32
504	RETVAL	661	INTERNET_PROXY_INFO proxyinfo;
		662	char buffer[2048];
		663	DWORD buflen;
505		664
506	char *	665	EXTEND (SP, 3);
507	gl_extensions ()	666
508	CODE:	667	buflen = sizeof (buffer);
509	RETVAL = (char *)glGetString (GL_EXTENSIONS);	668	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
510	OUTPUT:	669	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
511	RETVAL	670	{
		671	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		672
		673	buflen = sizeof (buffer);
		674	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		675	{
		676	PUSHs (newSVpv (buffer, 0));
		677
		678	buflen = sizeof (buffer);
		679	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		680	PUSHs (newSVpv (buffer, 0));
		681	}
		682	}
		683	#endif
		684	}
512		685
513	void	686	void
514	add_font (char *file)	687	add_font (char *file)
515	CODE:	688	CODE:
516	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	689	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
517
518	void
519	set_font (char *file)
520	CODE:
521	{
522	int count;
523	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )file, 0, 0, &count);
524	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
525	FcPatternDestroy (pattern);
526	pango_context_set_font_description (context, font);
527	}
528		690
529	void	691	void
530	load_image_inline (SV *image_)	692	load_image_inline (SV *image_)
531	ALIAS:	693	ALIAS:
532	load_image_file = 1	694	load_image_file = 1
…		…
574		736
575	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	737	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
576		738
577	assert (surface2->pitch == surface2->w * 4);	739	assert (surface2->pitch == surface2->w * 4);
578		740
		741	SDL_LockSurface (surface2);
579	EXTEND (SP, 5);	742	EXTEND (SP, 6);
580	PUSHs (sv_2mortal (newSViv (surface2->w)));	743	PUSHs (sv_2mortal (newSViv (surface2->w)));
581	PUSHs (sv_2mortal (newSViv (surface2->h)));	744	PUSHs (sv_2mortal (newSViv (surface2->h)));
582	SDL_LockSurface (surface2);
583	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	745	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
584	SDL_UnlockSurface (surface2);
585	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	746	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
586	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	747	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
587	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	748	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		749	SDL_UnlockSurface (surface2);
588		750
589	SDL_FreeSurface (surface);	751	SDL_FreeSurface (surface);
590	SDL_FreeSurface (surface2);	752	SDL_FreeSurface (surface2);
591	}	753	}
592		754
…		…
614	PUSHs (sv_2mortal (newSViv (b / y)));	776	PUSHs (sv_2mortal (newSViv (b / y)));
615	PUSHs (sv_2mortal (newSViv (a / y)));	777	PUSHs (sv_2mortal (newSViv (a / y)));
616	}	778	}
617		779
618	void	780	void
		781	error (char *message)
		782	CODE:
		783	fprintf (stderr, "ERROR: %s\n", message);
		784	#ifdef _WIN32
		785	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
		786	#endif
		787
		788	void
619	fatal (char *message)	789	fatal (char *message)
620	CODE:	790	CODE:
		791	fprintf (stderr, "FATAL: %s\n", message);
621	#ifdef _WIN32	792	#ifdef _WIN32
622	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	793	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
623	#else
624	fprintf (stderr, "FATAL: %s\n", message);
625	#endif	794	#endif
626	exit (1);	795	_exit (1);
627		796
		797	void
		798	_exit (int retval = 0)
		799	CODE:
		800	_exit (retval);
		801
		802	MODULE = CFPlus PACKAGE = CFPlus::Font
		803
		804	CFPlus::Font
		805	new_from_file (SV class, char path, int id = 0)
		806	CODE:
		807	{
		808	int count;
		809	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
		810	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
		811	FcPatternDestroy (pattern);
		812	}
		813	OUTPUT:
		814	RETVAL
		815
		816	void
		817	DESTROY (CFPlus::Font self)
		818	CODE:
		819	pango_font_description_free (self);
		820
		821	void
		822	make_default (CFPlus::Font self)
		823	CODE:
		824	default_font = self;
		825
628	MODULE = CFClient PACKAGE = CFClient::Layout	826	MODULE = CFPlus PACKAGE = CFPlus::Layout
629		827
630	CFClient::Layout	828	void
631	new (SV *class, int base_height = 10)	829	reset_glyph_cache ()
		830	CODE:
		831	tc_clear ();
		832
		833	CFPlus::Layout
		834	new (SV *class)
632	CODE:	835	CODE:
633	New (0, RETVAL, 1, struct cf_layout);	836	New (0, RETVAL, 1, struct cf_layout);
634	RETVAL->base_height = base_height;	837
635	RETVAL->pl = pango_layout_new (context);	838	RETVAL->pl = pango_layout_new (opengl_context);
		839	RETVAL->r = 1.;
		840	RETVAL->g = 1.;
		841	RETVAL->b = 1.;
		842	RETVAL->a = 1.;
		843	RETVAL->base_height = MIN_FONT_HEIGHT;
		844	RETVAL->font = 0;
		845
636	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	846	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
		847	layout_update_font (RETVAL);
637	OUTPUT:	848	OUTPUT:
638	RETVAL	849	RETVAL
639		850
640	void	851	void
641	DESTROY (CFClient::Layout self)	852	DESTROY (CFPlus::Layout self)
642	CODE:	853	CODE:
643	g_object_unref (self->pl);	854	g_object_unref (self->pl);
644	Safefree (self);	855	Safefree (self);
645		856
646	void	857	void
647	set_text (CFClient::Layout self, SV *text_)	858	set_text (CFPlus::Layout self, SV *text_)
648	CODE:	859	CODE:
649	{	860	{
650	STRLEN textlen;	861	STRLEN textlen;
651	char *text = SvPVutf8 (text_, textlen);	862	char *text = SvPVutf8 (text_, textlen);
652		863
653	pango_layout_set_text (self->pl, text, textlen);	864	pango_layout_set_text (self->pl, text, textlen);
654	}	865	}
655		866
656	void	867	void
657	set_markup (CFClient::Layout self, SV *text_)	868	set_markup (CFPlus::Layout self, SV *text_)
658	CODE:	869	CODE:
659	{	870	{
660	STRLEN textlen;	871	STRLEN textlen;
661	char *text = SvPVutf8 (text_, textlen);	872	char *text = SvPVutf8 (text_, textlen);
662		873
663	pango_layout_set_markup (self->pl, text, textlen);	874	pango_layout_set_markup (self->pl, text, textlen);
664	}	875	}
665		876
		877	void
		878	set_shapes (CFPlus::Layout self, ...)
		879	CODE:
		880	{
		881	PangoAttrList *attrs = 0;
		882	const char *text = pango_layout_get_text (self->pl);
		883	const char *pos = text;
		884	int arg = 4;
		885
		886	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		887	{
		888	PangoRectangle inkrect, rect;
		889	PangoAttribute *attr;
		890
		891	int x = SvIV (ST (arg - 3));
		892	int y = SvIV (ST (arg - 2));
		893	int w = SvIV (ST (arg - 1));
		894	int h = SvIV (ST (arg ));
		895
		896	inkrect.x = 0;
		897	inkrect.y = 0;
		898	inkrect.width = 0;
		899	inkrect.height = 0;
		900
		901	rect.x = x * PANGO_SCALE;
		902	rect.y = y * PANGO_SCALE;
		903	rect.width = w * PANGO_SCALE;
		904	rect.height = h * PANGO_SCALE;
		905
		906	if (!attrs)
		907	attrs = pango_layout_get_attributes (self->pl);
		908
		909	attr = pango_attr_shape_new (&inkrect, &rect);
		910	attr->start_index = pos - text;
		911	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		912	pango_attr_list_insert (attrs, attr);
		913
		914	arg += 4;
		915	pos += sizeof (OBJ_STR) - 1;
		916	}
		917
		918	if (attrs)
		919	pango_layout_set_attributes (self->pl, attrs);
		920	}
		921
		922	void
		923	get_shapes (CFPlus::Layout self)
		924	PPCODE:
		925	{
		926	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		927
		928	do
		929	{
		930	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		931
		932	if (run && shape_attr_p (run))
		933	{
		934	PangoRectangle extents;
		935	pango_layout_iter_get_run_extents (iter, 0, &extents);
		936
		937	EXTEND (SP, 2);
		938	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		939	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		940	}
		941	}
		942	while (pango_layout_iter_next_run (iter));
		943
		944	pango_layout_iter_free (iter);
		945	}
		946
		947	int
		948	has_wrapped (CFPlus::Layout self)
		949	CODE:
		950	{
		951	int lines = 1;
		952	const char *text = pango_layout_get_text (self->pl);
		953
		954	while (*text)
		955	lines += *text++ == '\n';
		956
		957	RETVAL = lines < pango_layout_get_line_count (self->pl);
		958	}
		959	OUTPUT:
		960	RETVAL
		961
666	SV *	962	SV *
667	get_text (CFClient::Layout self)	963	get_text (CFPlus::Layout self)
668	CODE:	964	CODE:
669	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	965	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
670	SvUTF8_on (RETVAL);	966	sv_utf8_decode (RETVAL);
671	OUTPUT:	967	OUTPUT:
672	RETVAL	968	RETVAL
673		969
674	void	970	void
		971	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
		972	CODE:
		973	self->r = r;
		974	self->g = g;
		975	self->b = b;
		976	self->a = a;
		977
		978	void
		979	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
		980	CODE:
		981	if (self->font != font)
		982	{
		983	self->font = font;
		984	layout_update_font (self);
		985	}
		986
		987	void
675	set_height (CFClient::Layout self, int base_height)	988	set_height (CFPlus::Layout self, int base_height)
676	CODE:	989	CODE:
		990	if (self->base_height != base_height)
		991	{
677	self->base_height = base_height;	992	self->base_height = base_height;
		993	layout_update_font (self);
		994	}
678		995
679	void	996	void
680	set_width (CFClient::Layout self, int max_width = -1)	997	set_width (CFPlus::Layout self, int max_width = -1)
681	CODE:	998	CODE:
682	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	999	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
683		1000
684	void	1001	void
		1002	set_indent (CFPlus::Layout self, int indent)
		1003	CODE:
		1004	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		1005
		1006	void
		1007	set_spacing (CFPlus::Layout self, int spacing)
		1008	CODE:
		1009	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		1010
		1011	void
		1012	set_ellipsise (CFPlus::Layout self, int ellipsise)
		1013	CODE:
		1014	pango_layout_set_ellipsize (self->pl,
		1015	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		1016	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		1017	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		1018	: PANGO_ELLIPSIZE_NONE
		1019	);
		1020
		1021	void
		1022	set_single_paragraph_mode (CFPlus::Layout self, int spm)
		1023	CODE:
		1024	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		1025
		1026	void
685	size (CFClient::Layout self)	1027	size (CFPlus::Layout self)
686	PPCODE:	1028	PPCODE:
687	{	1029	{
688	int w, h;	1030	int w, h;
689		1031
690	layout_update (self);
691	layout_get_pixel_size (self, &w, &h);	1032	layout_get_pixel_size (self, &w, &h);
692		1033
693	EXTEND (SP, 2);	1034	EXTEND (SP, 2);
694	PUSHs (sv_2mortal (newSViv (w)));	1035	PUSHs (sv_2mortal (newSViv (w)));
695	PUSHs (sv_2mortal (newSViv (h)));	1036	PUSHs (sv_2mortal (newSViv (h)));
696	}	1037	}
697		1038
698	int	1039	int
		1040	descent (CFPlus::Layout self)
		1041	CODE:
		1042	{
		1043	PangoRectangle rect;
		1044	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1045	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1046	RETVAL = PANGO_DESCENT (rect);
		1047	}
		1048	OUTPUT:
		1049	RETVAL
		1050
		1051	int
699	xy_to_index (CFClient::Layout self, int x, int y)	1052	xy_to_index (CFPlus::Layout self, int x, int y)
700	CODE:	1053	CODE:
701	{	1054	{
702	int index, trailing;	1055	int index, trailing;
703
704	layout_update (self);
705	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1056	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
706
707	RETVAL = index;	1057	RETVAL = index;
708	}	1058	}
709	OUTPUT:	1059	OUTPUT:
710	RETVAL	1060	RETVAL
711		1061
712	void	1062	void
713	cursor_pos (CFClient::Layout self, int index)	1063	cursor_pos (CFPlus::Layout self, int index)
714	PPCODE:	1064	PPCODE:
715	{	1065	{
716	PangoRectangle strong_pos;	1066	PangoRectangle strong_pos;
717	layout_update (self);
718	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1067	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
719		1068
720	EXTEND (SP, 3);	1069	EXTEND (SP, 3);
721	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1070	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
722	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1071	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
723	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1072	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
724	}	1073	}
725		1074
726	void	1075	void
727	render (CFClient::Layout self)	1076	render (CFPlus::Layout self, float x, float y, int flags = 0)
728	PPCODE:	1077	PPCODE:
729	{	1078	pango_opengl_render_layout_subpixel (
730	SV *retval;	1079	self->pl,
731	int w, h;	1080	x * PANGO_SCALE, y * PANGO_SCALE,
732	FT_Bitmap bitmap;	1081	self->r, self->g, self->b, self->a,
		1082	flags
		1083	);
733		1084
734	layout_update (self);	1085	MODULE = CFPlus PACKAGE = CFPlus::Texture
735	layout_get_pixel_size (self, &w, &h);
736		1086
737	retval = newSV (w * h);	1087	void
738	SvPOK_only (retval);	1088	pad2pot (SV data_, SV w_, SV *h_)
739	SvCUR_set (retval, w * h);	1089	CODE:
		1090	{
		1091	int ow = SvIV (w_);
		1092	int oh = SvIV (h_);
740		1093
741	bitmap.rows = h;	1094	if (ow && oh)
742	bitmap.width = w;	1095	{
743	bitmap.pitch = w;	1096	int nw = minpot (ow);
744	bitmap.buffer = (unsigned char*)SvPVX (retval);	1097	int nh = minpot (oh);
745	bitmap.num_grays = 256;
746	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
747		1098
748	memset (bitmap.buffer, 0, w * h);	1099	if (nw != ow \|\| nh != oh)
749		1100	{
750	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	1101	if (SvOK (data_))
		1102	{
		1103	STRLEN datalen;
		1104	char *data = SvPVbyte (data_, datalen);
		1105	int bpp = datalen / (ow * oh);
		1106	SV result_ = sv_2mortal (newSV (nw nh * bpp));
751		1107
752	EXTEND (SP, 3);	1108	SvPOK_only (result_);
753	PUSHs (sv_2mortal (newSViv (w)));	1109	SvCUR_set (result_, nw * nh * bpp);
754	PUSHs (sv_2mortal (newSViv (h)));
755	PUSHs (sv_2mortal (retval));
756	}
757		1110
758	MODULE = CFClient PACKAGE = CFClient::Texture	1111	memset (SvPVX (result_), 0, nw * nh * bpp);
		1112	while (oh--)
		1113	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
759		1114
		1115	sv_setsv (data_, result_);
		1116	}
		1117
		1118	sv_setiv (w_, nw);
		1119	sv_setiv (h_, nh);
		1120	}
		1121	}
		1122	}
		1123
760	void	1124	void
761	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1125	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
762	PROTOTYPE: $$$;$$	1126	PROTOTYPE: $$$;$$
		1127	ALIAS:
		1128	draw_quad_alpha = 1
		1129	draw_quad_alpha_premultiplied = 2
763	CODE:	1130	CODE:
764	{	1131	{
765	HV hv = (HV )SvRV (self);	1132	HV hv = (HV )SvRV (self);
766	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1133	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
767	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1134	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
768	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1135	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
769	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
770		1136
771	if (items < 5)	1137	if (items < 5)
772	{	1138	{
773	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1139	w = SvNV (*hv_fetch (hv, "w", 1, 1));
774	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1140	h = SvNV (*hv_fetch (hv, "h", 1, 1));
775	}	1141	}
776		1142
		1143	if (ix)
		1144	{
		1145	glEnable (GL_BLEND);
		1146
		1147	if (ix == 2)
		1148	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1149	else
		1150	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1151	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1152
		1153	glEnable (GL_ALPHA_TEST);
		1154	glAlphaFunc (GL_GREATER, 0.01f);
		1155	}
		1156
777	glBindTexture (GL_TEXTURE_2D, name);	1157	glBindTexture (GL_TEXTURE_2D, name);
778	if (wrap_mode) {	1158
779	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
780	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
781	}
782	glBegin (GL_QUADS);	1159	glBegin (GL_QUADS);
783	glTexCoord2f (0, 0); glVertex2f (x , y );	1160	glTexCoord2f (0, 0); glVertex2f (x , y );
784	glTexCoord2f (0, t); glVertex2f (x , y + h);	1161	glTexCoord2f (0, t); glVertex2f (x , y + h);
785	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1162	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
786	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1163	glTexCoord2f (s, 0); glVertex2f (x + w, y );
787	glEnd ();	1164	glEnd ();
788	}
789		1165
		1166	if (ix)
		1167	{
		1168	glDisable (GL_ALPHA_TEST);
		1169	glDisable (GL_BLEND);
		1170	}
		1171	}
		1172
790	MODULE = CFClient PACKAGE = CFClient::Map	1173	MODULE = CFPlus PACKAGE = CFPlus::Map
791		1174
792	CFClient::Map	1175	CFPlus::Map
793	new (SV *class, int map_width, int map_height)	1176	new (SV *class, int map_width, int map_height)
794	CODE:	1177	CODE:
795	New (0, RETVAL, 1, struct map);	1178	New (0, RETVAL, 1, struct map);
796	RETVAL->x = 0;	1179	RETVAL->x = 0;
797	RETVAL->y = 0;	1180	RETVAL->y = 0;
…		…
807	RETVAL->row = 0;	1190	RETVAL->row = 0;
808	OUTPUT:	1191	OUTPUT:
809	RETVAL	1192	RETVAL
810		1193
811	void	1194	void
812	DESTROY (CFClient::Map self)	1195	DESTROY (CFPlus::Map self)
813	CODE:	1196	CODE:
814	{	1197	{
815	map_clear (self);	1198	map_clear (self);
816	Safefree (self->face);	1199	Safefree (self->face);
		1200	Safefree (self->tex);
817	Safefree (self);	1201	Safefree (self);
818	}	1202	}
819		1203
820	void	1204	void
821	clear (CFClient::Map self)	1205	clear (CFPlus::Map self)
822	CODE:	1206	CODE:
823	map_clear (self);	1207	map_clear (self);
824		1208
825	void	1209	void
826	set_face (CFClient::Map self, int face, int texid)	1210	set_face (CFPlus::Map self, int face, int texid)
827	CODE:	1211	CODE:
828	{	1212	{
829	while (self->faces <= face)	1213	while (self->faces <= face)
830	{	1214	{
831	Append (mapface, self->face, self->faces, self->faces);	1215	Append (mapface, self->face, self->faces, self->faces);
…		…
834		1218
835	self->face [face] = texid;	1219	self->face [face] = texid;
836	}	1220	}
837		1221
838	void	1222	void
839	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)	1223	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)
840	CODE:	1224	CODE:
841	{	1225	{
842	while (self->texs <= texid)	1226	while (self->texs <= texid)
843	{	1227	{
844	Append (maptex, self->tex, self->texs, self->texs);	1228	Append (maptex, self->tex, self->texs, self->texs);
…		…
856	tex->r = r;	1240	tex->r = r;
857	tex->g = g;	1241	tex->g = g;
858	tex->b = b;	1242	tex->b = b;
859	tex->a = a;	1243	tex->a = a;
860	}	1244	}
		1245
		1246	// somewhat hackish, but for textures that require it, it really
		1247	// improves the look, and most others don't suffer.
		1248	glBindTexture (GL_TEXTURE_2D, name);
		1249	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1250	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1251	// use uglier nearest interpolation because linear suffers
		1252	// from transparent color bleeding and ugly wrapping effects.
		1253	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
861	}	1254	}
862		1255
863	int	1256	int
864	ox (CFClient::Map self)	1257	ox (CFPlus::Map self)
865	ALIAS:	1258	ALIAS:
866	oy = 1	1259	oy = 1
		1260	x = 2
		1261	y = 3
		1262	w = 4
		1263	h = 5
867	CODE:	1264	CODE:
868	switch (ix)	1265	switch (ix)
869	{	1266	{
870	case 0: RETVAL = self->ox; break;	1267	case 0: RETVAL = self->ox; break;
871	case 1: RETVAL = self->oy; break;	1268	case 1: RETVAL = self->oy; break;
		1269	case 2: RETVAL = self->x; break;
		1270	case 3: RETVAL = self->y; break;
		1271	case 4: RETVAL = self->w; break;
		1272	case 5: RETVAL = self->h; break;
872	}	1273	}
873	OUTPUT:	1274	OUTPUT:
874	RETVAL	1275	RETVAL
875		1276
876	void	1277	void
877	scroll (CFClient::Map self, int dx, int dy)	1278	scroll (CFPlus::Map self, int dx, int dy)
878	CODE:	1279	CODE:
879	{	1280	{
880	if (dx > 0)	1281	if (dx > 0)
881	map_blank (self, self->x, self->y, dx - 1, self->h);	1282	map_blank (self, self->x, self->y, dx, self->h);
882	else if (dx < 0)	1283	else if (dx < 0)
883	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1284	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
884		1285
885	if (dy > 0)	1286	if (dy > 0)
886	map_blank (self, self->x, self->y, self->w, dy - 1);	1287	map_blank (self, self->x, self->y, self->w, dy);
887	else if (dy < 0)	1288	else if (dy < 0)
888	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1289	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
889		1290
890	self->ox += dx; self->x += dx;	1291	self->ox += dx; self->x += dx;
891	self->oy += dy; self->y += dy;	1292	self->oy += dy; self->y += dy;
892		1293
893	while (self->y < 0)	1294	while (self->y < 0)
…		…
898	self->y += MAP_EXTEND_Y;	1299	self->y += MAP_EXTEND_Y;
899	}	1300	}
900	}	1301	}
901		1302
902	void	1303	void
903	map1a_update (CFClient::Map self, SV *data_)	1304	map1a_update (CFPlus::Map self, SV *data_, int extmap)
904	CODE:	1305	CODE:
905	{	1306	{
906	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1307	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
907	uint8_t data_end = (uint8_t )SvEND (data_);	1308	uint8_t data_end = (uint8_t )SvEND (data_);
908	mapcell *cell;	1309	mapcell *cell;
909	int x, y, flags;	1310	int x, y, flags;
910		1311
911	while (data < data_end)	1312	while (data < data_end - 1)
912	{	1313	{
913	flags = (data [0] << 8) + data [1]; data += 2;	1314	flags = (data [0] << 8) + data [1]; data += 2;
914		1315
915	x = ((flags >> 10) & 63) + self->x;	1316	x = self->x + ((flags >> 10) & 63);
916	y = ((flags >> 4) & 63) + self->y;	1317	y = self->y + ((flags >> 4) & 63);
917		1318
918	cell = map_get_cell (self, x, y);	1319	cell = map_get_cell (self, x, y);
919		1320
920	if (flags & 15)	1321	if (flags & 15)
921	{	1322	{
922	if (cell->darkness < 0)	1323	if (!cell->darkness)
923	{	1324	{
		1325	memset (cell, 0, sizeof (*cell));
924	cell->darkness = 0;	1326	cell->darkness = 256;
925	cell->face [0] = 0;
926	cell->face [1] = 0;
927	cell->face [2] = 0;
928	}	1327	}
929		1328
930	cell->darkness = flags & 8 ? *data++ : 255;
931
932	//TODO: don't trust server data to be in-range(!)	1329	//TODO: don't trust server data to be in-range(!)
		1330
		1331	if (flags & 8)
		1332	{
		1333	if (extmap)
		1334	{
		1335	uint8_t ext, cmd;
		1336
		1337	do
		1338	{
		1339	ext = *data++;
		1340	cmd = ext & 0x3f;
		1341
		1342	if (cmd < 4)
		1343	cell->darkness = 255 - ext * 64 + 1;
		1344	else if (cmd == 5) // health
		1345	{
		1346	cell->stat_width = 1;
		1347	cell->stat_hp = *data++;
		1348	}
		1349	else if (cmd == 6) // monster width
		1350	cell->stat_width = *data++ + 1;
		1351	else if (cmd == 0x47) // monster width
		1352	{
		1353	if (*data == 4)
		1354	; // decode player tag
		1355
		1356	data += *data + 1;
		1357	}
		1358	else if (cmd == 8) // cell flags
		1359	cell->flags = *data++;
		1360	else if (ext & 0x40) // unknown, multibyte => skip
		1361	data += *data + 1;
		1362	else
		1363	data++;
		1364	}
		1365	while (ext & 0x80);
		1366	}
		1367	else
		1368	cell->darkness = *data++ + 1;
		1369	}
933		1370
934	if (flags & 4)	1371	if (flags & 4)
935	{	1372	{
936	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1373	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
937	}	1374	}
…		…
945	{	1382	{
946	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1383	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
947	}	1384	}
948	}	1385	}
949	else	1386	else
950	cell->darkness = -1;	1387	cell->darkness = 0;
951	}	1388	}
952	}	1389	}
953		1390
954	SV *	1391	SV *
955	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1392	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
956	CODE:	1393	CODE:
957	{	1394	{
958	int x1, x;	1395	int x1, x;
959	int y1, y;	1396	int y1, y;
960	int z;	1397	int z;
…		…
1010	}	1447	}
1011	OUTPUT:	1448	OUTPUT:
1012	RETVAL	1449	RETVAL
1013		1450
1014	void	1451	void
1015	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1452	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1016	PPCODE:	1453	CODE:
1017	{	1454	{
1018	int vx, vy;	1455	int vx, vy;
1019	int x, y, z;	1456	int x, y, z;
1020	int last_name;	1457	int last_name;
1021	mapface face;	1458	mapface face;
1022	int sw4 = (sw + 3) & ~3;
1023	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1024	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1025		1459
1026	memset (darkness, 255, sw4 * sh);
1027	SvPOK_only (darkness_sv);
1028	SvCUR_set (darkness_sv, sw4 * sh);
1029
1030	vx = self->x + (self->w - sw) / 2 - shift_x;	1460	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1031	vy = self->y + (self->h - sh) / 2 - shift_y;	1461	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1032		1462
1033	/*	1463	/*
1034	int vx = self->vx = self->w >= sw	1464	int vx = self->vx = self->w >= sw
1035	? self->x + (self->w - sw) / 2	1465	? self->x + (self->w - sw) / 2
1036	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1466	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1040	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1470	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1041	*/	1471	*/
1042		1472
1043	glColor4ub (255, 255, 255, 255);	1473	glColor4ub (255, 255, 255, 255);
1044		1474
		1475	glEnable (GL_BLEND);
1045	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1476	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1046	glEnable (GL_BLEND);
1047	glEnable (GL_TEXTURE_2D);	1477	glEnable (GL_TEXTURE_2D);
1048	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1478	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1049		1479
1050	glBegin (GL_QUADS);	1480	glBegin (GL_QUADS);
1051		1481
…		…
1060	for (x = 0; x < sw; x++)	1490	for (x = 0; x < sw; x++)
1061	if (row->c0 <= x + vx && x + vx < row->c1)	1491	if (row->c0 <= x + vx && x + vx < row->c1)
1062	{	1492	{
1063	mapcell *cell = row->col + (x + vx - row->c0);	1493	mapcell *cell = row->col + (x + vx - row->c0);
1064		1494
1065	darkness[y * sw4 + x] = cell->darkness < 0
1066	? 255 - FOW_DARKNESS
1067	: 255 - cell->darkness;
1068
1069	face = cell->face [z];	1495	face = cell->face [z];
1070		1496
1071	if (face)	1497	if (face && face < self->texs)
1072	{	1498	{
1073	maptex tex = self->tex [face];	1499	maptex tex = self->tex [face];
1074
1075	int px = (x + 1) * 32 - tex.w;	1500	int px = (x + 1) * 32 - tex.w;
1076	int py = (y + 1) * 32 - tex.h;	1501	int py = (y + 1) * 32 - tex.h;
1077		1502
1078	if (last_name != tex.name)	1503	if (last_name != tex.name)
1079	{	1504	{
1080	glEnd ();	1505	glEnd ();
1081	last_name = tex.name;
1082	glBindTexture (GL_TEXTURE_2D, last_name);	1506	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1083	glBegin (GL_QUADS);	1507	glBegin (GL_QUADS);
1084	}	1508	}
1085		1509
1086	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1510	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1087	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1511	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1088	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1512	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1089	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1513	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1090	}	1514	}
		1515
		1516	if (cell->flags && z == 2)
		1517	{
		1518	if (cell->flags & 1)
		1519	{
		1520	maptex tex = self->tex [1];
		1521	int px = (x + 1) * 32 - tex.w + 2;
		1522	int py = (y + 1) * 32 - tex.h - 6;
		1523
		1524	glEnd ();
		1525	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1526	glBegin (GL_QUADS);
		1527
		1528	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1529	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1530	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1531	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1532	}
		1533	}
1091	}	1534	}
1092	}	1535	}
1093		1536
1094	glEnd ();	1537	glEnd ();
1095		1538
1096	glDisable (GL_TEXTURE_2D);	1539	glDisable (GL_TEXTURE_2D);
1097	glDisable (GL_BLEND);	1540	glDisable (GL_BLEND);
		1541
		1542	// top layer: overlays such as the health bar
		1543	for (y = 0; y < sh; y++)
		1544	if (0 <= y + vy && y + vy < self->rows)
		1545	{
		1546	maprow *row = self->row + (y + vy);
		1547
		1548	for (x = 0; x < sw; x++)
		1549	if (row->c0 <= x + vx && x + vx < row->c1)
		1550	{
		1551	mapcell *cell = row->col + (x + vx - row->c0);
		1552
		1553	int px = x * 32;
		1554	int py = y * 32;
		1555
		1556	if (cell->stat_hp)
		1557	{
		1558	int width = cell->stat_width * 32;
		1559	int thick = sh / 28 + 1 + cell->stat_width;
		1560
		1561	glColor3ub (0, 0, 0);
		1562	glRectf (px + 1, py - thick - 2,
		1563	px + width - 1, py);
		1564
		1565	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1566	glRectf (px + 2,
		1567	py - thick - 1,
		1568	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1569	}
		1570	}
		1571	}
		1572	}
		1573
		1574	void
		1575	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1576	CODE:
		1577	{
		1578	static float color[16][3] = {
		1579	{ 0.00F, 0.00F, 0.00F },
		1580	{ 1.00F, 1.00F, 1.00F },
		1581	{ 0.00F, 0.00F, 0.55F },
		1582	{ 1.00F, 0.00F, 0.00F },
		1583
		1584	{ 1.00F, 0.54F, 0.00F },
		1585	{ 0.11F, 0.56F, 1.00F },
		1586	{ 0.93F, 0.46F, 0.00F },
		1587	{ 0.18F, 0.54F, 0.34F },
		1588
		1589	{ 0.56F, 0.73F, 0.56F },
		1590	{ 0.80F, 0.80F, 0.80F },
		1591	{ 0.55F, 0.41F, 0.13F },
		1592	{ 0.99F, 0.77F, 0.26F },
		1593
		1594	{ 0.74F, 0.65F, 0.41F },
		1595
		1596	{ 0.00F, 1.00F, 1.00F },
		1597	{ 1.00F, 0.00F, 1.00F },
		1598	{ 1.00F, 1.00F, 0.00F },
		1599	};
		1600
		1601	int x, y;
		1602
		1603	glEnable (GL_TEXTURE_2D);
		1604	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1605	glEnable (GL_BLEND);
		1606	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1607	glBegin (GL_QUADS);
		1608
		1609	for (y = 0; y < h; y++)
		1610	for (x = 0; x < w; x++)
		1611	{
		1612	unsigned char m = data [x + y * w];
		1613
		1614	if (m)
		1615	{
		1616	float *c = color [m & 15];
		1617
		1618	float tx1 = m & 0x40 ? 0.5 : 0.;
		1619	float tx2 = tx1 + 0.5;
		1620
		1621	glColor4f (c[0], c[1], c[2], 0.75);
		1622	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1623	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1624	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1625	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1626	}
		1627	}
		1628
		1629	glEnd ();
		1630	glDisable (GL_BLEND);
		1631	glDisable (GL_TEXTURE_2D);
		1632	}
		1633
		1634	void
		1635	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1636	PPCODE:
		1637	{
		1638	int vx, vy;
		1639	int x, y;
		1640	int sw4 = (sw + 3) & ~3;
		1641	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1642	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1643
		1644	memset (darkness, 255, sw4 * sh);
		1645	SvPOK_only (darkness_sv);
		1646	SvCUR_set (darkness_sv, sw4 * sh);
		1647
		1648	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1649	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1650
		1651	for (y = 0; y < sh; y++)
		1652	if (0 <= y + vy && y + vy < self->rows)
		1653	{
		1654	maprow *row = self->row + (y + vy);
		1655
		1656	for (x = 0; x < sw; x++)
		1657	if (row->c0 <= x + vx && x + vx < row->c1)
		1658	{
		1659	mapcell *cell = row->col + (x + vx - row->c0);
		1660
		1661	darkness[y * sw4 + x] = cell->darkness
		1662	? 255 - (cell->darkness - 1)
		1663	: 255 - FOW_DARKNESS;
		1664	}
		1665	}
1098		1666
1099	EXTEND (SP, 3);	1667	EXTEND (SP, 3);
1100	PUSHs (sv_2mortal (newSViv (sw4)));	1668	PUSHs (sv_2mortal (newSViv (sw4)));
1101	PUSHs (sv_2mortal (newSViv (sh)));	1669	PUSHs (sv_2mortal (newSViv (sh)));
1102	PUSHs (darkness_sv);	1670	PUSHs (darkness_sv);
1103	}	1671	}
1104		1672
1105	SV *	1673	SV *
1106	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1674	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1107	CODE:	1675	CODE:
1108	{	1676	{
1109	int x, y, x1, y1;	1677	int x, y, x1, y1;
1110	SV data_sv = newSV (w h * 7 + 5);	1678	SV data_sv = newSV (w h * 7 + 5);
1111	uint8_t data = (uint8_t )SvPVX (data_sv);	1679	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1173	}	1741	}
1174	OUTPUT:	1742	OUTPUT:
1175	RETVAL	1743	RETVAL
1176		1744
1177	void	1745	void
1178	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1746	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1179	PPCODE:	1747	PPCODE:
1180	{	1748	{
1181	int x, y, z;	1749	int x, y, z;
1182	int w, h;	1750	int w, h;
1183	int x1, y1;	1751	int x1, y1;
…		…
1215		1783
1216	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1784	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1217	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1785	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1218	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1786	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1219		1787
1220	if (cell->darkness <= 0)	1788	if (cell->darkness == 0)
1221	{	1789	{
1222	cell->darkness = -1;	1790	cell->darkness = 0;
1223		1791
1224	for (z = 0; z <= 2; z++)	1792	for (z = 0; z <= 2; z++)
1225	{	1793	{
1226	cell->face[z] = face[z];	1794	cell->face[z] = face[z];
1227		1795
…		…
1232	}	1800	}
1233	}	1801	}
1234	}	1802	}
1235	}	1803	}
1236		1804
1237	MODULE = CFClient PACKAGE = CFClient::MixChunk	1805	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1238		1806
1239	CFClient::MixChunk	1807	CFPlus::MixChunk
1240	new_from_file (SV class, char path)	1808	new_from_file (SV class, char path)
1241	CODE:	1809	CODE:
1242	RETVAL = Mix_LoadWAV (path);	1810	RETVAL = Mix_LoadWAV (path);
1243	OUTPUT:	1811	OUTPUT:
1244	RETVAL	1812	RETVAL
1245		1813
1246	void	1814	void
1247	DESTROY (CFClient::MixChunk self)	1815	DESTROY (CFPlus::MixChunk self)
1248	CODE:	1816	CODE:
1249	Mix_FreeChunk (self);	1817	Mix_FreeChunk (self);
1250		1818
1251	int	1819	int
1252	volume (CFClient::MixChunk self, int volume = -1)	1820	volume (CFPlus::MixChunk self, int volume = -1)
1253	CODE:	1821	CODE:
1254	RETVAL = Mix_VolumeChunk (self, volume);	1822	RETVAL = Mix_VolumeChunk (self, volume);
1255	OUTPUT:	1823	OUTPUT:
1256	RETVAL	1824	RETVAL
1257		1825
1258	int	1826	int
1259	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1827	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1260	CODE:	1828	CODE:
1261	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1829	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1262	OUTPUT:	1830	OUTPUT:
1263	RETVAL	1831	RETVAL
1264		1832
1265	MODULE = CFClient PACKAGE = CFClient::MixMusic	1833	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1266		1834
1267	int	1835	int
1268	volume (int volume = -1)	1836	volume (int volume = -1)
1269	CODE:	1837	CODE:
1270	RETVAL = Mix_VolumeMusic (volume);	1838	RETVAL = Mix_VolumeMusic (volume);
1271	OUTPUT:	1839	OUTPUT:
1272	RETVAL	1840	RETVAL
1273		1841
1274	CFClient::MixMusic	1842	CFPlus::MixMusic
1275	new_from_file (SV class, char path)	1843	new_from_file (SV class, char path)
1276	CODE:	1844	CODE:
1277	RETVAL = Mix_LoadMUS (path);	1845	RETVAL = Mix_LoadMUS (path);
1278	OUTPUT:	1846	OUTPUT:
1279	RETVAL	1847	RETVAL
1280		1848
1281	void	1849	void
1282	DESTROY (CFClient::MixMusic self)	1850	DESTROY (CFPlus::MixMusic self)
1283	CODE:	1851	CODE:
1284	Mix_FreeMusic (self);	1852	Mix_FreeMusic (self);
1285		1853
1286	int	1854	int
1287	play (CFClient::MixMusic self, int loops = -1)	1855	play (CFPlus::MixMusic self, int loops = -1)
1288	CODE:	1856	CODE:
1289	RETVAL = Mix_PlayMusic (self, loops);	1857	RETVAL = Mix_PlayMusic (self, loops);
1290	OUTPUT:	1858	OUTPUT:
1291	RETVAL	1859	RETVAL
1292		1860
1293	MODULE = CFClient PACKAGE = CFClient::OpenGL	1861	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1294		1862
1295	BOOT:	1863	BOOT:
1296	{	1864	{
1297	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1865	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1298	static const struct {	1866	static const struct {
1299	const char *name;	1867	const char *name;
1300	IV iv;	1868	IV iv;
1301	} *civ, const_iv[] = {	1869	} *civ, const_iv[] = {
1302	# define const_iv(name) { # name, (IV)name }	1870	# define const_iv(name) { # name, (IV)name }
1303	const_iv (GL_COLOR_MATERIAL),	1871	const_iv (GL_COLOR_MATERIAL),
1304	const_iv (GL_SMOOTH),	1872	const_iv (GL_SMOOTH),
1305	const_iv (GL_FLAT),	1873	const_iv (GL_FLAT),
		1874	const_iv (GL_DITHER),
1306	const_iv (GL_BLEND),	1875	const_iv (GL_BLEND),
		1876	const_iv (GL_CULL_FACE),
		1877	const_iv (GL_SCISSOR_TEST),
		1878	const_iv (GL_DEPTH_TEST),
		1879	const_iv (GL_ALPHA_TEST),
		1880	const_iv (GL_NORMALIZE),
		1881	const_iv (GL_RESCALE_NORMAL),
		1882	const_iv (GL_FRONT),
		1883	const_iv (GL_BACK),
1307	const_iv (GL_AND),	1884	const_iv (GL_AND),
		1885	const_iv (GL_ONE),
		1886	const_iv (GL_ZERO),
1308	const_iv (GL_SRC_ALPHA),	1887	const_iv (GL_SRC_ALPHA),
		1888	const_iv (GL_DST_ALPHA),
1309	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1889	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1890	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1891	const_iv (GL_SRC_ALPHA_SATURATE),
1310	const_iv (GL_RGB),	1892	const_iv (GL_RGB),
1311	const_iv (GL_RGBA),	1893	const_iv (GL_RGBA),
		1894	const_iv (GL_RGBA4),
		1895	const_iv (GL_RGBA8),
		1896	const_iv (GL_RGB5_A1),
1312	const_iv (GL_UNSIGNED_BYTE),	1897	const_iv (GL_UNSIGNED_BYTE),
1313	const_iv (GL_ALPHA4),	1898	const_iv (GL_UNSIGNED_SHORT),
		1899	const_iv (GL_UNSIGNED_INT),
1314	const_iv (GL_ALPHA),	1900	const_iv (GL_ALPHA),
		1901	const_iv (GL_INTENSITY),
		1902	const_iv (GL_LUMINANCE),
		1903	const_iv (GL_LUMINANCE_ALPHA),
1315	const_iv (GL_FLOAT),	1904	const_iv (GL_FLOAT),
1316	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1905	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1317	const_iv (GL_COMPILE),	1906	const_iv (GL_COMPILE),
1318	const_iv (GL_TEXTURE_1D),	1907	const_iv (GL_TEXTURE_1D),
1319	const_iv (GL_TEXTURE_2D),	1908	const_iv (GL_TEXTURE_2D),
…		…
1321	const_iv (GL_TEXTURE_MAG_FILTER),	1910	const_iv (GL_TEXTURE_MAG_FILTER),
1322	const_iv (GL_TEXTURE_MIN_FILTER),	1911	const_iv (GL_TEXTURE_MIN_FILTER),
1323	const_iv (GL_TEXTURE_ENV_MODE),	1912	const_iv (GL_TEXTURE_ENV_MODE),
1324	const_iv (GL_TEXTURE_WRAP_S),	1913	const_iv (GL_TEXTURE_WRAP_S),
1325	const_iv (GL_TEXTURE_WRAP_T),	1914	const_iv (GL_TEXTURE_WRAP_T),
		1915	const_iv (GL_REPEAT),
1326	const_iv (GL_CLAMP),	1916	const_iv (GL_CLAMP),
1327	const_iv (GL_REPEAT),	1917	const_iv (GL_CLAMP_TO_EDGE),
1328	const_iv (GL_NEAREST),	1918	const_iv (GL_NEAREST),
1329	const_iv (GL_LINEAR),	1919	const_iv (GL_LINEAR),
1330	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1920	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1331	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1921	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1332	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1922	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1333	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1923	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1334	const_iv (GL_GENERATE_MIPMAP),	1924	const_iv (GL_GENERATE_MIPMAP),
1335	const_iv (GL_LINEAR),
1336	const_iv (GL_MODULATE),	1925	const_iv (GL_MODULATE),
		1926	const_iv (GL_DECAL),
1337	const_iv (GL_REPLACE),	1927	const_iv (GL_REPLACE),
		1928	const_iv (GL_DEPTH_BUFFER_BIT),
1338	const_iv (GL_COLOR_BUFFER_BIT),	1929	const_iv (GL_COLOR_BUFFER_BIT),
1339	const_iv (GL_PROJECTION),	1930	const_iv (GL_PROJECTION),
1340	const_iv (GL_MODELVIEW),	1931	const_iv (GL_MODELVIEW),
1341	const_iv (GL_COLOR_LOGIC_OP),	1932	const_iv (GL_COLOR_LOGIC_OP),
		1933	const_iv (GL_SEPARABLE_2D),
1342	const_iv (GL_CONVOLUTION_2D),	1934	const_iv (GL_CONVOLUTION_2D),
1343	const_iv (GL_CONVOLUTION_BORDER_MODE),	1935	const_iv (GL_CONVOLUTION_BORDER_MODE),
1344	const_iv (GL_CONSTANT_BORDER),	1936	const_iv (GL_CONSTANT_BORDER),
1345	const_iv (GL_LINES),	1937	const_iv (GL_LINES),
		1938	const_iv (GL_LINE_STRIP),
		1939	const_iv (GL_LINE_LOOP),
1346	const_iv (GL_QUADS),	1940	const_iv (GL_QUADS),
1347	const_iv (GL_LINE_LOOP),	1941	const_iv (GL_QUAD_STRIP),
		1942	const_iv (GL_TRIANGLES),
		1943	const_iv (GL_TRIANGLE_STRIP),
		1944	const_iv (GL_TRIANGLE_FAN),
1348	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1945	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1349	const_iv (GL_FASTEST),	1946	const_iv (GL_FASTEST),
		1947	const_iv (GL_V2F),
		1948	const_iv (GL_V3F),
		1949	const_iv (GL_T2F_V3F),
		1950	const_iv (GL_T2F_N3F_V3F),
1350	# undef const_iv	1951	# undef const_iv
1351	};	1952	};
1352		1953
1353	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1954	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1354	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1955	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1355	}	1956	}
1356		1957
		1958	char *
		1959	gl_vendor ()
		1960	CODE:
		1961	RETVAL = (char *)glGetString (GL_VENDOR);
		1962	OUTPUT:
		1963	RETVAL
		1964
		1965	char *
		1966	gl_version ()
		1967	CODE:
		1968	RETVAL = (char *)glGetString (GL_VERSION);
		1969	OUTPUT:
		1970	RETVAL
		1971
		1972	char *
		1973	gl_extensions ()
		1974	CODE:
		1975	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1976	OUTPUT:
		1977	RETVAL
		1978
1357	int glGetError ()	1979	int glGetError ()
		1980
		1981	void glFinish ()
1358		1982
1359	void glClear (int mask)	1983	void glClear (int mask)
1360		1984
1361	void glClearColor (float r, float g, float b, float a = 1.0)	1985	void glClearColor (float r, float g, float b, float a = 1.0)
1362	PROTOTYPE: @	1986	PROTOTYPE: @
…		…
1369		1993
1370	void glHint (int target, int mode)	1994	void glHint (int target, int mode)
1371		1995
1372	void glBlendFunc (int sfactor, int dfactor)	1996	void glBlendFunc (int sfactor, int dfactor)
1373		1997
		1998	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1999	CODE:
		2000	gl_BlendFuncSeparate (sa, da, saa, daa);
		2001
		2002	void glDepthMask (int flag)
		2003
1374	void glLogicOp (int opcode)	2004	void glLogicOp (int opcode)
1375		2005
		2006	void glColorMask (int red, int green, int blue, int alpha)
		2007
1376	void glMatrixMode (int mode)	2008	void glMatrixMode (int mode)
1377		2009
1378	void glPushMatrix ()	2010	void glPushMatrix ()
1379		2011
1380	void glPopMatrix ()	2012	void glPopMatrix ()
1381		2013
1382	void glLoadIdentity ()	2014	void glLoadIdentity ()
1383		2015
		2016	void glDrawBuffer (int buffer)
		2017
		2018	void glReadBuffer (int buffer)
		2019
		2020	# near_ and far_ are due to microsofts buggy "c" compiler
		2021	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		2022
		2023	# near_ and far_ are due to microsofts buggy "c" compiler
1384	void glOrtho (double left, double right, double bottom, double top, double near, double far)	2024	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1385		2025
1386	void glViewport (int x, int y, int width, int height)	2026	void glViewport (int x, int y, int width, int height)
		2027
		2028	void glScissor (int x, int y, int width, int height)
1387		2029
1388	void glTranslate (float x, float y, float z = 0.)	2030	void glTranslate (float x, float y, float z = 0.)
1389	CODE:	2031	CODE:
1390	glTranslatef (x, y, z);	2032	glTranslatef (x, y, z);
1391		2033
1392	void glScale (float x, float y, float z)	2034	void glScale (float x, float y, float z = 1.)
1393	CODE:	2035	CODE:
1394	glScalef (x, y, z);	2036	glScalef (x, y, z);
1395		2037
1396	void glRotate (float angle, float x, float y, float z)	2038	void glRotate (float angle, float x, float y, float z)
1397	CODE:	2039	CODE:
…		…
1401		2043
1402	void glEnd ()	2044	void glEnd ()
1403		2045
1404	void glColor (float r, float g, float b, float a = 1.0)	2046	void glColor (float r, float g, float b, float a = 1.0)
1405	PROTOTYPE: @	2047	PROTOTYPE: @
		2048	ALIAS:
		2049	glColor_premultiply = 1
1406	CODE:	2050	CODE:
		2051	if (ix)
		2052	{
		2053	r *= a;
		2054	g *= a;
		2055	b *= a;
		2056	}
		2057	// microsoft visual "c" rounds instead of truncating...
1407	glColor4f (r, g, b, a);	2058	glColor4f (r, g, b, a);
		2059
		2060	void glInterleavedArrays (int format, int stride, char *data)
		2061
		2062	void glDrawElements (int mode, int count, int type, char *indices)
		2063
		2064	# 1.2 void glDrawRangeElements (int mode, int start, int end
		2065
		2066	void glRasterPos (float x, float y, float z = 0.)
		2067	CODE:
		2068	glRasterPos3f (0, 0, z);
		2069	glBitmap (0, 0, 0, 0, x, y, 0);
1408		2070
1409	void glVertex (float x, float y, float z = 0.)	2071	void glVertex (float x, float y, float z = 0.)
1410	CODE:	2072	CODE:
1411	glVertex3f (x, y, z);	2073	glVertex3f (x, y, z);
1412		2074
…		…
1424		2086
1425	void glBindTexture (int target, int name)	2087	void glBindTexture (int target, int name)
1426		2088
1427	void glConvolutionParameter (int target, int pname, float params)	2089	void glConvolutionParameter (int target, int pname, float params)
1428	CODE:	2090	CODE:
		2091	if (gl.ConvolutionParameterf)
1429	glConvolutionParameterf (target, pname, params);	2092	gl.ConvolutionParameterf (target, pname, params);
1430		2093
1431	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2094	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		2095	CODE:
		2096	if (gl.ConvolutionFilter2D)
		2097	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
		2098
		2099	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		2100	CODE:
		2101	if (gl.SeparableFilter2D)
		2102	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1432		2103
1433	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2104	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1434		2105
1435	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2106	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		2107
		2108	void glDrawPixels (int width, int height, int format, int type, char *pixels)
		2109
		2110	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1436		2111
1437	int glGenTexture ()	2112	int glGenTexture ()
1438	CODE:	2113	CODE:
1439	{	2114	{
1440	GLuint name;	2115	GLuint name;

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.57 by root, Fri Apr 21 07:09:10 2006 UTC vs. Revision 1.158 by root, Sun Oct 1 18:17:37 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.57 by root, Fri Apr 21 07:09:10 2006 UTC vs.
Revision 1.158 by root, Sun Oct 1 18:17:37 2006 UTC