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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.42 by root, Sun Apr 16 07:25:29 2006 UTC vs.
Revision 1.59 by root, Sun Apr 23 04:41:33 2006 UTC

…		…
		1	#ifdef _WIN32
		2	# include <malloc.h>
		3	#endif
		4
1	#include "EXTERN.h"	5	#include "EXTERN.h"
2	#include "perl.h"	6	#include "perl.h"
3	#include "XSUB.h"	7	#include "XSUB.h"
4		8
5	#include <string.h>	9	#include <string.h>
6	#include <stdio.h>	10	#include <stdio.h>
7		11
8	#include <SDL.h>	12	#include <SDL.h>
9	#include <SDL_image.h>	13	#include <SDL_image.h>
		14	#include <SDL_mixer.h>
10	#include <SDL_opengl.h>	15	#include <SDL_opengl.h>
11		16
12	#include <glib/gmacros.h>	17	#include <glib/gmacros.h>
13		18
14	#include <pango/pango.h>	19	#include <pango/pango.h>
15	#include <pango/pangofc-fontmap.h>	20	#include <pango/pangofc-fontmap.h>
16	#include <pango/pangoft2.h>	21	#include <pango/pangoft2.h>
17		22
		23	#ifndef _WIN32
18	#include <sys/types.h>	24	# include <sys/types.h>
19	#include <sys/socket.h>	25	# include <sys/socket.h>
20	#include <netinet/in.h>	26	# include <netinet/in.h>
21	#include <netinet/tcp.h>	27	# include <netinet/tcp.h>
22
23	#include <inttypes.h>	28	# include <inttypes.h>
		29	#else
		30	typedef unsigned char uint8_t;
		31	typedef unsigned short uint16_t;
		32	typedef unsigned int uint32_t;
		33	typedef signed char int8_t;
		34	typedef signed short int16_t;
		35	typedef signed int int32_t;
		36	#endif
		37
		38	#include "glext.h"
24		39
25	#define FOW_DARKNESS 32	40	#define FOW_DARKNESS 32
26		41
27	#define MAP_EXTEND_X 32	42	#define MAP_EXTEND_X 32
28	#define MAP_EXTEND_Y 512	43	#define MAP_EXTEND_Y 512
		44
		45	#define MIN_FONT_HEIGHT 8 * PANGO_SCALE
		46
		47	typedef Mix_Chunk *CFClient__MixChunk;
		48	typedef Mix_Music *CFClient__MixMusic;
29		49
30	static PangoContext *context;	50	static PangoContext *context;
31	static PangoFontMap *fontmap;	51	static PangoFontMap *fontmap;
32		52
33	typedef struct cf_layout {	53	typedef struct cf_layout {
46	layout_update (CFClient__Layout self)	66	layout_update (CFClient__Layout self)
47	{	67	{
48	/* use a random scale factor to account for unknown descenders, 0.8 works	68	/* use a random scale factor to account for unknown descenders, 0.8 works
49	* reasonably well with bitstream vera	69	* reasonably well with bitstream vera
50	*/	70	*/
51	PangoFontDescription *font = pango_context_get_font_description (context);	71	PangoFontDescription *font = pango_layout_get_font_description (self->pl);
52	pango_font_description_set_absolute_size (font, self->base_height * (PANGO_SCALE * 8 / 10));	72
		73	int height = self->base_height * (PANGO_SCALE * 8 / 10);
		74
		75	if (height < MIN_FONT_HEIGHT)
		76	height = MIN_FONT_HEIGHT;
		77
		78	if (pango_font_description_get_size (font) != height)
		79	{
		80	font = pango_font_description_copy (font);
		81	pango_font_description_set_absolute_size (font, height);
		82	pango_layout_set_font_description (self->pl, font);
		83	}
53	}	84	}
54		85
55	static void	86	static void
56	layout_get_pixel_size (CFClient__Layout self, int w, int h)	87	layout_get_pixel_size (CFClient__Layout self, int w, int h)
57	{	88	{
…		…
90	mapface *face;	121	mapface *face;
91		122
92	int texs;	123	int texs;
93	maptex *tex;	124	maptex *tex;
94		125
95	uint32_t rows;	126	int32_t rows;
96	maprow *row;	127	maprow *row;
97	} *CFClient__Map;	128	} *CFClient__Map;
98		129
99	static char *	130	static char *
100	prepend (char *ptr, int sze, int inc)	131	prepend (char *ptr, int sze, int inc)
…		…
195		226
196	static void	227	static void
197	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	228	map_blank (CFClient__Map self, int x0, int y0, int w, int h)
198	{	229	{
199	int x, y;	230	int x, y;
		231	maprow *row;
200		232
201	for (y = y0; y < y0 + h; y++)	233	for (y = y0; y < y0 + h; y++)
202	if (y >= 0)	234	if (y >= 0)
203	{	235	{
204	if (y >= self->rows)	236	if (y >= self->rows)
205	break;	237	break;
206		238
207	maprow *row = self->row + y;	239	row = self->row + y;
208		240
209	for (x = x0; x < x0 + w; x++)	241	for (x = x0; x < x0 + w; x++)
210	if (x >= row->c0)	242	if (x >= row->c0)
211	{	243	{
212	if (x >= row->c1)	244	if (x >= row->c1)
…		…
215	row->col[x - row->c0].darkness = -1;	247	row->col[x - row->c0].darkness = -1;
216	}	248	}
217	}	249	}
218	}	250	}
219		251
		252	static void
		253	music_finished ()
		254	{
		255	SDL_UserEvent ev;
		256
		257	ev.type = SDL_USEREVENT;
		258	ev.code = 0;
		259	ev.data1 = 0;
		260	ev.data2 = 0;
		261
		262	SDL_PushEvent ((SDL_Event *)&ev);
		263	}
		264
220	MODULE = CFClient PACKAGE = CFClient	265	MODULE = CFClient PACKAGE = CFClient
221		266
222	PROTOTYPES: ENABLE	267	PROTOTYPES: ENABLE
223		268
224	BOOT:	269	BOOT:
225	{	270	{
		271	HV *stash = gv_stashpv ("CFClient", 1);
		272	static const struct {
		273	const char *name;
		274	IV iv;
		275	} *civ, const_iv[] = {
		276	# define const_iv(name) { # name, (IV)name }
		277	const_iv (SDL_ACTIVEEVENT),
		278	const_iv (SDL_KEYDOWN),
		279	const_iv (SDL_KEYUP),
		280	const_iv (SDL_MOUSEMOTION),
		281	const_iv (SDL_MOUSEBUTTONDOWN),
		282	const_iv (SDL_MOUSEBUTTONUP),
		283	const_iv (SDL_JOYAXISMOTION),
		284	const_iv (SDL_JOYBALLMOTION),
		285	const_iv (SDL_JOYHATMOTION),
		286	const_iv (SDL_JOYBUTTONDOWN),
		287	const_iv (SDL_JOYBUTTONUP),
		288	const_iv (SDL_QUIT),
		289	const_iv (SDL_SYSWMEVENT),
		290	const_iv (SDL_EVENT_RESERVEDA),
		291	const_iv (SDL_EVENT_RESERVEDB),
		292	const_iv (SDL_VIDEORESIZE),
		293	const_iv (SDL_VIDEOEXPOSE),
		294	const_iv (SDL_USEREVENT),
		295	const_iv (SDLK_KP0),
		296	const_iv (SDLK_KP1),
		297	const_iv (SDLK_KP2),
		298	const_iv (SDLK_KP3),
		299	const_iv (SDLK_KP4),
		300	const_iv (SDLK_KP5),
		301	const_iv (SDLK_KP6),
		302	const_iv (SDLK_KP7),
		303	const_iv (SDLK_KP8),
		304	const_iv (SDLK_KP9),
		305	const_iv (SDLK_KP_PERIOD),
		306	const_iv (SDLK_KP_DIVIDE),
		307	const_iv (SDLK_KP_MULTIPLY),
		308	const_iv (SDLK_KP_MINUS),
		309	const_iv (SDLK_KP_PLUS),
		310	const_iv (SDLK_KP_ENTER),
		311	const_iv (SDLK_KP_EQUALS),
		312	const_iv (SDLK_UP),
		313	const_iv (SDLK_DOWN),
		314	const_iv (SDLK_RIGHT),
		315	const_iv (SDLK_LEFT),
		316	const_iv (SDLK_INSERT),
		317	const_iv (SDLK_HOME),
		318	const_iv (SDLK_END),
		319	const_iv (SDLK_PAGEUP),
		320	const_iv (SDLK_PAGEDOWN),
		321	const_iv (SDLK_F1),
		322	const_iv (SDLK_F2),
		323	const_iv (SDLK_F3),
		324	const_iv (SDLK_F4),
		325	const_iv (SDLK_F5),
		326	const_iv (SDLK_F6),
		327	const_iv (SDLK_F7),
		328	const_iv (SDLK_F8),
		329	const_iv (SDLK_F9),
		330	const_iv (SDLK_F10),
		331	const_iv (SDLK_F11),
		332	const_iv (SDLK_F12),
		333	const_iv (SDLK_F13),
		334	const_iv (SDLK_F14),
		335	const_iv (SDLK_F15),
		336	const_iv (SDLK_NUMLOCK),
		337	const_iv (SDLK_CAPSLOCK),
		338	const_iv (SDLK_SCROLLOCK),
		339	const_iv (SDLK_RSHIFT),
		340	const_iv (SDLK_LSHIFT),
		341	const_iv (SDLK_RCTRL),
		342	const_iv (SDLK_LCTRL),
		343	const_iv (SDLK_RALT),
		344	const_iv (SDLK_LALT),
		345	const_iv (SDLK_RMETA),
		346	const_iv (SDLK_LMETA),
		347	const_iv (SDLK_LSUPER),
		348	const_iv (SDLK_RSUPER),
		349	const_iv (SDLK_MODE),
		350	const_iv (SDLK_COMPOSE),
		351	const_iv (SDLK_HELP),
		352	const_iv (SDLK_PRINT),
		353	const_iv (SDLK_SYSREQ),
		354	const_iv (SDLK_BREAK),
		355	const_iv (SDLK_MENU),
		356	const_iv (SDLK_POWER),
		357	const_iv (SDLK_EURO),
		358	const_iv (SDLK_UNDO),
		359	const_iv (KMOD_NONE),
		360	const_iv (KMOD_LSHIFT),
		361	const_iv (KMOD_RSHIFT),
		362	const_iv (KMOD_LCTRL),
		363	const_iv (KMOD_RCTRL),
		364	const_iv (KMOD_LALT),
		365	const_iv (KMOD_RALT),
		366	const_iv (KMOD_LMETA),
		367	const_iv (KMOD_RMETA),
		368	const_iv (KMOD_NUM),
		369	const_iv (KMOD_CAPS),
		370	const_iv (KMOD_MODE),
		371	const_iv (KMOD_CTRL),
		372	const_iv (KMOD_SHIFT),
		373	const_iv (KMOD_ALT),
		374	const_iv (KMOD_META)
		375	# undef const_iv
		376	};
		377
		378	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
		379	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		380
226	fontmap = pango_ft2_font_map_new ();	381	fontmap = pango_ft2_font_map_new ();
227	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);	382	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
228	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);	383	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
229	}	384	}
		385
		386	int
		387	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
		388
		389	void
		390	SDL_Quit ()
		391
		392	void
		393	SDL_ListModes ()
		394	PPCODE:
		395	{
		396	SDL_Rect **m;
		397
		398	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
		399	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
		400	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
		401	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
		402
		403	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
		404	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
		405	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
		406	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
		407
		408	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		409	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		410	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		411
		412	SDL_EnableUNICODE (1);
		413	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
		414
		415	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
		416
		417	if (m && m != (SDL_Rect **)-1)
		418	while (*m)
		419	{
		420	AV *av = newAV ();
		421	av_push (av, newSViv ((*m)->w));
		422	av_push (av, newSViv ((*m)->h));
		423	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
		424
		425	++m;
		426	}
		427	}
		428
		429	int
		430	SDL_SetVideoMode (int w, int h, int fullscreen)
		431	CODE:
		432	RETVAL = !!SDL_SetVideoMode (
		433	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
		434	);
		435	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		436	OUTPUT:
		437	RETVAL
		438
		439	void
		440	SDL_GL_SwapBuffers ()
		441
		442	void
		443	SDL_PollEvent ()
		444	PPCODE:
		445	{
		446	SDL_Event ev;
		447
		448	while (SDL_PollEvent (&ev))
		449	{
		450	HV *hv = newHV ();
		451	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		452	switch (ev.type)
		453	{
		454	case SDL_KEYDOWN:
		455	case SDL_KEYUP:
		456	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
		457	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
		458	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		459	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
		460	break;
		461
		462	case SDL_ACTIVEEVENT:
		463	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
		464	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
		465	break;
		466
		467	case SDL_MOUSEMOTION:
		468	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
		469	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
		470	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
		471	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
		472	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
		473	break;
		474
		475	case SDL_MOUSEBUTTONDOWN:
		476	case SDL_MOUSEBUTTONUP:
		477	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
		478	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
		479	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
		480	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		481	}
		482
		483	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
		484	}
		485	}
		486
		487	int
		488	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)
		489	POSTCALL:
		490	Mix_HookMusicFinished (music_finished);
		491
		492	void
		493	Mix_CloseAudio ()
		494
		495	int
		496	Mix_AllocateChannels (int numchans = -1)
230		497
231	void	498	void
232	lowdelay (int fd, int val = 1)	499	lowdelay (int fd, int val = 1)
233	CODE:	500	CODE:
		501	#ifndef _WIN32
234	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	502	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
		503	#endif
235		504
236	char *	505	char *
237	gl_version ()	506	gl_version ()
238	CODE:	507	CODE:
239	RETVAL = (char *)glGetString (GL_VERSION);	508	RETVAL = (char *)glGetString (GL_VERSION);
…		…
258	{	527	{
259	int count;	528	int count;
260	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )file, 0, 0, &count);	529	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )file, 0, 0, &count);
261	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);	530	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
262	FcPatternDestroy (pattern);	531	FcPatternDestroy (pattern);
		532	pango_font_description_set_absolute_size (font, MIN_FONT_HEIGHT);
263	pango_context_set_font_description (context, font);	533	pango_context_set_font_description (context, font);
264	}	534	}
265		535
266	void	536	void
267	load_image_inline (SV *image_)	537	load_image_inline (SV *image_)
…		…
285	croak ("load_image: %s", SDL_GetError ());	555	croak ("load_image: %s", SDL_GetError ());
286		556
287	fmt.palette = NULL;	557	fmt.palette = NULL;
288	fmt.BitsPerPixel = 32;	558	fmt.BitsPerPixel = 32;
289	fmt.BytesPerPixel = 4;	559	fmt.BytesPerPixel = 4;
		560	#if SDL_BYTEORDER == SDL_LIL_ENDIAN
290	fmt.Rmask = 0x000000ff;	561	fmt.Rmask = 0x000000ff;
291	fmt.Gmask = 0x0000ff00;	562	fmt.Gmask = 0x0000ff00;
292	fmt.Bmask = 0x00ff0000;	563	fmt.Bmask = 0x00ff0000;
293	fmt.Amask = 0xff000000;	564	fmt.Amask = 0xff000000;
		565	#else
		566	fmt.Rmask = 0xff000000;
		567	fmt.Gmask = 0x00ff0000;
		568	fmt.Bmask = 0x0000ff00;
		569	fmt.Amask = 0x000000ff;
		570	#endif
294	fmt.Rloss = 0;	571	fmt.Rloss = 0;
295	fmt.Gloss = 0;	572	fmt.Gloss = 0;
296	fmt.Bloss = 0;	573	fmt.Bloss = 0;
297	fmt.Aloss = 0;	574	fmt.Aloss = 0;
298	fmt.Rshift = 0;	575	fmt.Rshift = 0;
…		…
312	SDL_LockSurface (surface2);	589	SDL_LockSurface (surface2);
313	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	590	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
314	SDL_UnlockSurface (surface2);	591	SDL_UnlockSurface (surface2);
315	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	592	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
316	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	593	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
317	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_INT_8_8_8_8_REV)));	594	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
318		595
319	SDL_FreeSurface (surface);	596	SDL_FreeSurface (surface);
320	SDL_FreeSurface (surface2);	597	SDL_FreeSurface (surface2);
321	}	598	}
322		599
…		…
346	}	623	}
347		624
348	void	625	void
349	fatal (char *message)	626	fatal (char *message)
350	CODE:	627	CODE:
351	#ifdef WIN32	628	#ifdef _WIN32
352	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	629	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
353	#else	630	#else
354	fprintf (stderr, "FATAL: %s\n", message);	631	fprintf (stderr, "FATAL: %s\n", message);
355	#endif	632	#endif
356	exit (1);	633	exit (1);
…		…
362	CODE:	639	CODE:
363	New (0, RETVAL, 1, struct cf_layout);	640	New (0, RETVAL, 1, struct cf_layout);
364	RETVAL->base_height = base_height;	641	RETVAL->base_height = base_height;
365	RETVAL->pl = pango_layout_new (context);	642	RETVAL->pl = pango_layout_new (context);
366	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	643	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
		644	pango_layout_set_font_description (RETVAL->pl,
		645	pango_font_description_copy (
		646	pango_context_get_font_description (context)));
367	OUTPUT:	647	OUTPUT:
368	RETVAL	648	RETVAL
369		649
370	void	650	void
371	DESTROY (CFClient::Layout self)	651	DESTROY (CFClient::Layout self)
…		…
390	STRLEN textlen;	670	STRLEN textlen;
391	char *text = SvPVutf8 (text_, textlen);	671	char *text = SvPVutf8 (text_, textlen);
392		672
393	pango_layout_set_markup (self->pl, text, textlen);	673	pango_layout_set_markup (self->pl, text, textlen);
394	}	674	}
		675
		676	SV *
		677	get_text (CFClient::Layout self)
		678	CODE:
		679	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
		680	SvUTF8_on (RETVAL);
		681	OUTPUT:
		682	RETVAL
395		683
396	void	684	void
397	set_height (CFClient::Layout self, int base_height)	685	set_height (CFClient::Layout self, int base_height)
398	CODE:	686	CODE:
399	self->base_height = base_height;	687	self->base_height = base_height;
…		…
565	{	853	{
566	Append (maptex, self->tex, self->texs, self->texs);	854	Append (maptex, self->tex, self->texs, self->texs);
567	self->texs *= 2;	855	self->texs *= 2;
568	}	856	}
569		857
		858	{
570	maptex *tex = self->tex + texid;	859	maptex *tex = self->tex + texid;
571		860
572	tex->name = name;	861	tex->name = name;
573	tex->w = w;	862	tex->w = w;
574	tex->h = h;	863	tex->h = h;
575	tex->s = s;	864	tex->s = s;
576	tex->t = t;	865	tex->t = t;
577	tex->r = r;	866	tex->r = r;
578	tex->g = g;	867	tex->g = g;
579	tex->b = b;	868	tex->b = b;
580	tex->a = a;	869	tex->a = a;
581	}
582
583	void
584	scroll (CFClient::Map self, int dx, int dy)
585	CODE:
586	{
587	if (dx > 0)
588	map_blank (self, self->x, self->y, dx - 1, self->h);
589	else if (dx < 0)
590	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);
591
592	if (dy > 0)
593	map_blank (self, self->x, self->y, self->w, dy - 1);
594	else if (dy < 0)
595	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);
596
597	self->x += dx; self->ox += dx;
598	self->y += dy; self->oy += dy;
599
600	while (self->y < 0)
601	{
602	Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y);
603
604	self->rows += MAP_EXTEND_Y;
605	self->y += MAP_EXTEND_Y;
606	}	870	}
607	}	871	}
608		872
609	int	873	int
610	ox (CFClient::Map self)	874	ox (CFClient::Map self)
611	ALIAS:	875	ALIAS:
…		…
618	}	882	}
619	OUTPUT:	883	OUTPUT:
620	RETVAL	884	RETVAL
621		885
622	void	886	void
		887	scroll (CFClient::Map self, int dx, int dy)
		888	CODE:
		889	{
		890	if (dx > 0)
		891	map_blank (self, self->x, self->y, dx - 1, self->h);
		892	else if (dx < 0)
		893	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);
		894
		895	if (dy > 0)
		896	map_blank (self, self->x, self->y, self->w, dy - 1);
		897	else if (dy < 0)
		898	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);
		899
		900	self->ox += dx; self->x += dx;
		901	self->oy += dy; self->y += dy;
		902
		903	while (self->y < 0)
		904	{
		905	Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y);
		906
		907	self->rows += MAP_EXTEND_Y;
		908	self->y += MAP_EXTEND_Y;
		909	}
		910	}
		911
		912	void
623	map1a_update (CFClient::Map self, SV *data_)	913	map1a_update (CFClient::Map self, SV *data_)
624	CODE:	914	CODE:
625	{	915	{
626	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	916	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
627	uint8_t data_end = (uint8_t )SvEND (data_);	917	uint8_t data_end = (uint8_t )SvEND (data_);
628		918	mapcell *cell;
		919	int x, y, flags;
		920
629	while (data < data_end)	921	while (data < data_end)
630	{	922	{
631	int flags = (data [0] << 8) + data [1]; data += 2;	923	flags = (data [0] << 8) + data [1]; data += 2;
632		924
633	int x = ((flags >> 10) & 63) + self->x;	925	x = ((flags >> 10) & 63) + self->x;
634	int y = ((flags >> 4) & 63) + self->y;	926	y = ((flags >> 4) & 63) + self->y;
635		927
636	mapcell *cell = map_get_cell (self, x, y);	928	cell = map_get_cell (self, x, y);
637		929
638	if (flags & 15)	930	if (flags & 15)
639	{	931	{
640	if (cell->darkness < 0) // && x < self->w && y < self->h)	932	if (cell->darkness < 0)
641	{	933	{
642	cell->darkness = 0;	934	cell->darkness = 0;
643	cell->face [0] = 0;	935	cell->face [0] = 0;
644	cell->face [1] = 0;	936	cell->face [1] = 0;
645	cell->face [2] = 0;	937	cell->face [2] = 0;
646	}	938	}
647		939
648	cell->darkness = flags & 8 ? *data++ : 255;	940	cell->darkness = flags & 8 ? *data++ : 255;
649		941
650	//TODO: don't trust server data to be in-range(!)	942	//TODO: don't trust server data to be in-range(!)
651		943
652	if (flags & 4)	944	if (flags & 4)
…		…
668	cell->darkness = -1;	960	cell->darkness = -1;
669	}	961	}
670	}	962	}
671		963
672	SV *	964	SV *
673	mapmap (CFClient::Map self, int w, int h)	965	mapmap (CFClient::Map self, int x0, int y0, int w, int h)
674	CODE:	966	CODE:
675	{	967	{
676	int x0, x1, x;	968	int x1, x;
677	int y0, y1, y;	969	int y1, y;
678	int z;	970	int z;
679	SV map_sv = newSV (w h * sizeof (uint32_t));	971	SV map_sv = newSV (w h * sizeof (uint32_t));
680	uint32_t map = (uint32_t )SvPVX (map_sv);	972	uint32_t map = (uint32_t )SvPVX (map_sv);
681		973
682	SvPOK_only (map_sv);	974	SvPOK_only (map_sv);
683	SvCUR_set (map_sv, w * h * sizeof (uint32_t));	975	SvCUR_set (map_sv, w * h * sizeof (uint32_t));
684		976
685	x0 = self->x - w / 2; x1 = x0 + w;	977	x0 += self->x; x1 = x0 + w;
686	y0 = self->y - h / 2; y1 = y0 + h;	978	y0 += self->y; y1 = y0 + h;
687		979
688	for (y = y0; y < y1; y++)	980	for (y = y0; y < y1; y++)
689	{	981	{
690	maprow *row = 0 <= y && y < self->rows	982	maprow *row = 0 <= y && y < self->rows
691	? self->row + y	983	? self->row + y
…		…
731		1023
732	void	1024	void
733	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1025	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
734	PPCODE:	1026	PPCODE:
735	{	1027	{
		1028	int vx, vy;
		1029	int x, y, z;
		1030	int last_name;
		1031	mapface face;
736	int sw4 = (sw + 3) & ~3;	1032	int sw4 = (sw + 3) & ~3;
737	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1033	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
738	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);	1034	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1035
739	memset (darkness, 255, sw4 * sh);	1036	memset (darkness, 255, sw4 * sh);
740	SvPOK_only (darkness_sv);	1037	SvPOK_only (darkness_sv);
741	SvCUR_set (darkness_sv, sw4 * sh);	1038	SvCUR_set (darkness_sv, sw4 * sh);
742		1039
743	int vx = self->x + (self->w - sw) / 2 - shift_x;	1040	vx = self->x + (self->w - sw) / 2 - shift_x;
744	int vy = self->y + (self->h - sh) / 2 - shift_y;	1041	vy = self->y + (self->h - sh) / 2 - shift_y;
745		1042
746	/*	1043	/*
747	int vx = self->vx = self->w >= sw	1044	int vx = self->vx = self->w >= sw
748	? self->x + (self->w - sw) / 2	1045	? self->x + (self->w - sw) / 2
749	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1046	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
758	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1055	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
759	glEnable (GL_BLEND);	1056	glEnable (GL_BLEND);
760	glEnable (GL_TEXTURE_2D);	1057	glEnable (GL_TEXTURE_2D);
761	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1058	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
762		1059
763	int x, y, z;
764
765	int last_name = 0;
766
767	glBegin (GL_QUADS);	1060	glBegin (GL_QUADS);
		1061
		1062	last_name = 0;
768		1063
769	for (z = 0; z < 3; z++)	1064	for (z = 0; z < 3; z++)
770	for (y = 0; y < sh; y++)	1065	for (y = 0; y < sh; y++)
771	if (0 <= y + vy && y + vy < self->rows)	1066	if (0 <= y + vy && y + vy < self->rows)
772	{	1067	{
…		…
779		1074
780	darkness[y * sw4 + x] = cell->darkness < 0	1075	darkness[y * sw4 + x] = cell->darkness < 0
781	? 255 - FOW_DARKNESS	1076	? 255 - FOW_DARKNESS
782	: 255 - cell->darkness;	1077	: 255 - cell->darkness;
783		1078
784	mapface face = cell->face [z];	1079	face = cell->face [z];
785		1080
786	if (face)	1081	if (face)
787	{	1082	{
788	maptex tex = self->tex [face];	1083	maptex tex = self->tex [face];
789		1084
…		…
828	data++ = 0; / version 0 format */	1123	data++ = 0; / version 0 format */
829	data++ = w >> 8; data++ = w;	1124	data++ = w >> 8; data++ = w;
830	data++ = h >> 8; data++ = h;	1125	data++ = h >> 8; data++ = h;
831		1126
832	// we need to do this 'cause we don't keep an absolute coord system for rows	1127	// we need to do this 'cause we don't keep an absolute coord system for rows
833	// TODO: treat rows as we treat	1128	// TODO: treat rows as we treat columns
834	map_get_row (self, y0 + self->y - self->oy);//D	1129	map_get_row (self, y0 + self->y - self->oy);//D
835	map_get_row (self, y0 + self->y - self->oy + h - 1);//D	1130	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
836		1131
837	x0 += self->x - self->ox;	1132	x0 += self->x - self->ox;
838	y0 += self->y - self->oy;	1133	y0 += self->y - self->oy;
…		…
849	for (x = x0; x < x1; x++)	1144	for (x = x0; x < x1; x++)
850	{	1145	{
851	if (row && row->c0 <= x && x < row->c1)	1146	if (row && row->c0 <= x && x < row->c1)
852	{	1147	{
853	mapcell *cell = row->col + (x - row->c0);	1148	mapcell *cell = row->col + (x - row->c0);
854
855	uint8_t flags = 0;	1149	uint8_t flags = 0;
856		1150
857	if (cell->face [0]) flags \|= 1;	1151	if (cell->face [0]) flags \|= 1;
858	if (cell->face [1]) flags \|= 2;	1152	if (cell->face [1]) flags \|= 2;
859	if (cell->face [2]) flags \|= 4;	1153	if (cell->face [2]) flags \|= 4;
…		…
893	void	1187	void
894	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1188	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)
895	PPCODE:	1189	PPCODE:
896	{	1190	{
897	int x, y, z;	1191	int x, y, z;
		1192	int w, h;
898	int x1, y1;	1193	int x1, y1;
899		1194
900	if (*data++ != 0)	1195	if (*data++ != 0)
901	return; /* version mismatch */	1196	return; /* version mismatch */
902		1197
903	int w = data++ << 8; w \|= data++;	1198	w = data++ << 8; w \|= data++;
904	int h = data++ << 8; h \|= data++;	1199	h = data++ << 8; h \|= data++;
905		1200
906	// we need to do this 'cause we don't keep an absolute coord system for rows	1201	// we need to do this 'cause we don't keep an absolute coord system for rows
907	// TODO: treat rows as we treat	1202	// TODO: treat rows as we treat columns
908	map_get_row (self, y0 + self->y - self->oy);//D	1203	map_get_row (self, y0 + self->y - self->oy);//D
909	map_get_row (self, y0 + self->y - self->oy + h - 1);//D	1204	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
910		1205
911	x0 += self->x - self->ox;	1206	x0 += self->x - self->ox;
912	y0 += self->y - self->oy;	1207	y0 += self->y - self->oy;
…		…
947	}	1242	}
948	}	1243	}
949	}	1244	}
950	}	1245	}
951		1246
		1247	MODULE = CFClient PACKAGE = CFClient::MixChunk
		1248
		1249	CFClient::MixChunk
		1250	new_from_file (SV class, char path)
		1251	CODE:
		1252	RETVAL = Mix_LoadWAV (path);
		1253	OUTPUT:
		1254	RETVAL
		1255
		1256	void
		1257	DESTROY (CFClient::MixChunk self)
		1258	CODE:
		1259	Mix_FreeChunk (self);
		1260
		1261	int
		1262	volume (CFClient::MixChunk self, int volume = -1)
		1263	CODE:
		1264	RETVAL = Mix_VolumeChunk (self, volume);
		1265	OUTPUT:
		1266	RETVAL
		1267
		1268	int
		1269	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
		1270	CODE:
		1271	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
		1272	OUTPUT:
		1273	RETVAL
		1274
		1275	MODULE = CFClient PACKAGE = CFClient::MixMusic
		1276
		1277	int
		1278	volume (int volume = -1)
		1279	CODE:
		1280	RETVAL = Mix_VolumeMusic (volume);
		1281	OUTPUT:
		1282	RETVAL
		1283
		1284	CFClient::MixMusic
		1285	new_from_file (SV class, char path)
		1286	CODE:
		1287	RETVAL = Mix_LoadMUS (path);
		1288	OUTPUT:
		1289	RETVAL
		1290
		1291	void
		1292	DESTROY (CFClient::MixMusic self)
		1293	CODE:
		1294	Mix_FreeMusic (self);
		1295
		1296	int
		1297	play (CFClient::MixMusic self, int loops = -1)
		1298	CODE:
		1299	RETVAL = Mix_PlayMusic (self, loops);
		1300	OUTPUT:
		1301	RETVAL
		1302
		1303	MODULE = CFClient PACKAGE = CFClient::OpenGL
		1304
		1305	BOOT:
		1306	{
		1307	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);
		1308	static const struct {
		1309	const char *name;
		1310	IV iv;
		1311	} *civ, const_iv[] = {
		1312	# define const_iv(name) { # name, (IV)name }
		1313	const_iv (GL_COLOR_MATERIAL),
		1314	const_iv (GL_SMOOTH),
		1315	const_iv (GL_FLAT),
		1316	const_iv (GL_BLEND),
		1317	const_iv (GL_AND),
		1318	const_iv (GL_SRC_ALPHA),
		1319	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1320	const_iv (GL_RGB),
		1321	const_iv (GL_RGBA),
		1322	const_iv (GL_UNSIGNED_BYTE),
		1323	const_iv (GL_ALPHA4),
		1324	const_iv (GL_ALPHA),
		1325	const_iv (GL_FLOAT),
		1326	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		1327	const_iv (GL_COMPILE),
		1328	const_iv (GL_TEXTURE_1D),
		1329	const_iv (GL_TEXTURE_2D),
		1330	const_iv (GL_TEXTURE_ENV),
		1331	const_iv (GL_TEXTURE_MAG_FILTER),
		1332	const_iv (GL_TEXTURE_MIN_FILTER),
		1333	const_iv (GL_TEXTURE_ENV_MODE),
		1334	const_iv (GL_TEXTURE_WRAP_S),
		1335	const_iv (GL_TEXTURE_WRAP_T),
		1336	const_iv (GL_CLAMP),
		1337	const_iv (GL_REPEAT),
		1338	const_iv (GL_NEAREST),
		1339	const_iv (GL_LINEAR),
		1340	const_iv (GL_NEAREST_MIPMAP_NEAREST),
		1341	const_iv (GL_LINEAR_MIPMAP_NEAREST),
		1342	const_iv (GL_NEAREST_MIPMAP_LINEAR),
		1343	const_iv (GL_LINEAR_MIPMAP_LINEAR),
		1344	const_iv (GL_GENERATE_MIPMAP),
		1345	const_iv (GL_LINEAR),
		1346	const_iv (GL_MODULATE),
		1347	const_iv (GL_REPLACE),
		1348	const_iv (GL_COLOR_BUFFER_BIT),
		1349	const_iv (GL_PROJECTION),
		1350	const_iv (GL_MODELVIEW),
		1351	const_iv (GL_COLOR_LOGIC_OP),
		1352	const_iv (GL_CONVOLUTION_2D),
		1353	const_iv (GL_CONVOLUTION_BORDER_MODE),
		1354	const_iv (GL_CONSTANT_BORDER),
		1355	const_iv (GL_LINES),
		1356	const_iv (GL_QUADS),
		1357	const_iv (GL_LINE_LOOP),
		1358	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
		1359	const_iv (GL_FASTEST),
		1360	# undef const_iv
		1361	};
		1362
		1363	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
		1364	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		1365	}
		1366
		1367	int glGetError ()
		1368
		1369	void glClear (int mask)
		1370
		1371	void glClearColor (float r, float g, float b, float a = 1.0)
		1372	PROTOTYPE: @
		1373
		1374	void glEnable (int cap)
		1375
		1376	void glDisable (int cap)
		1377
		1378	void glShadeModel (int mode)
		1379
		1380	void glHint (int target, int mode)
		1381
		1382	void glBlendFunc (int sfactor, int dfactor)
		1383
		1384	void glLogicOp (int opcode)
		1385
		1386	void glMatrixMode (int mode)
		1387
		1388	void glPushMatrix ()
		1389
		1390	void glPopMatrix ()
		1391
		1392	void glLoadIdentity ()
		1393
		1394	void glOrtho (double left, double right, double bottom, double top, double near, double far)
		1395
		1396	void glViewport (int x, int y, int width, int height)
		1397
		1398	void glTranslate (float x, float y, float z = 0.)
		1399	CODE:
		1400	glTranslatef (x, y, z);
		1401
		1402	void glScale (float x, float y, float z)
		1403	CODE:
		1404	glScalef (x, y, z);
		1405
		1406	void glRotate (float angle, float x, float y, float z)
		1407	CODE:
		1408	glRotatef (angle, x, y, z);
		1409
		1410	void glBegin (int mode)
		1411
		1412	void glEnd ()
		1413
		1414	void glColor (float r, float g, float b, float a = 1.0)
		1415	PROTOTYPE: @
		1416	CODE:
		1417	glColor4f (r, g, b, a);
		1418
		1419	void glVertex (float x, float y, float z = 0.)
		1420	CODE:
		1421	glVertex3f (x, y, z);
		1422
		1423	void glTexCoord (float s, float t)
		1424	CODE:
		1425	glTexCoord2f (s, t);
		1426
		1427	void glTexEnv (int target, int pname, float param)
		1428	CODE:
		1429	glTexEnvf (target, pname, param);
		1430
		1431	void glTexParameter (int target, int pname, float param)
		1432	CODE:
		1433	glTexParameterf (target, pname, param);
		1434
		1435	void glBindTexture (int target, int name)
		1436
		1437	void glConvolutionParameter (int target, int pname, float params)
		1438	CODE:
		1439	glConvolutionParameterf (target, pname, params);
		1440
		1441	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1442
		1443	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
		1444
		1445	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1446
		1447	int glGenTexture ()
		1448	CODE:
		1449	{
		1450	GLuint name;
		1451	glGenTextures (1, &name);
		1452	RETVAL = name;
		1453	}
		1454	OUTPUT:
		1455	RETVAL
		1456
		1457	void glDeleteTexture (int name)
		1458	CODE:
		1459	{
		1460	GLuint name_ = name;
		1461	glDeleteTextures (1, &name_);
		1462	}
		1463
		1464	int glGenList ()
		1465	CODE:
		1466	RETVAL = glGenLists (1);
		1467	OUTPUT:
		1468	RETVAL
		1469
		1470	void glDeleteList (int list)
		1471	CODE:
		1472	glDeleteLists (list, 1);
		1473
		1474	void glNewList (int list, int mode = GL_COMPILE)
		1475
		1476	void glEndList ()
		1477
		1478	void glCallList (int list)
		1479

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.42 by root, Sun Apr 16 07:25:29 2006 UTC vs. Revision 1.59 by root, Sun Apr 23 04:41:33 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.42 by root, Sun Apr 16 07:25:29 2006 UTC vs.
Revision 1.59 by root, Sun Apr 23 04:41:33 2006 UTC