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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.43 by root, Mon Apr 17 06:50:26 2006 UTC vs. Revision 1.58 by root, Sun Apr 23 00:57:38 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.43 by root, Mon Apr 17 06:50:26 2006 UTC vs.
Revision 1.58 by root, Sun Apr 23 00:57:38 2006 UTC