[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.54 by root, Wed Apr 19 23:37:48 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
24		37
25	#define FOW_DARKNESS 32	38	#define FOW_DARKNESS 32
26		39
27	#define MAP_EXTEND_X 32	40	#define MAP_EXTEND_X 32
28	#define MAP_EXTEND_Y 512	41	#define MAP_EXTEND_Y 512
		42
		43	typedef Mix_Chunk *CFClient__MixChunk;
		44	typedef Mix_Music *CFClient__MixMusic;
29		45
30	static PangoContext *context;	46	static PangoContext *context;
31	static PangoFontMap *fontmap;	47	static PangoFontMap *fontmap;
32		48
33	typedef struct cf_layout {	49	typedef struct cf_layout {
47	{	63	{
48	/* use a random scale factor to account for unknown descenders, 0.8 works	64	/* use a random scale factor to account for unknown descenders, 0.8 works
49	* reasonably well with bitstream vera	65	* reasonably well with bitstream vera
50	*/	66	*/
51	PangoFontDescription *font = pango_context_get_font_description (context);	67	PangoFontDescription *font = pango_context_get_font_description (context);
52	pango_font_description_set_absolute_size (font, self->base_height * (PANGO_SCALE * 8 / 10));	68
		69	int height = self->base_height * (PANGO_SCALE * 8 / 10);
		70
		71	if (pango_font_description_get_size (font) != height)
		72	{
		73	pango_font_description_set_absolute_size (font, height);
		74	pango_layout_context_changed (self->pl);
		75	}
53	}	76	}
54		77
55	static void	78	static void
56	layout_get_pixel_size (CFClient__Layout self, int w, int h)	79	layout_get_pixel_size (CFClient__Layout self, int w, int h)
57	{	80	{
…		…
90	mapface *face;	113	mapface *face;
91		114
92	int texs;	115	int texs;
93	maptex *tex;	116	maptex *tex;
94		117
95	uint32_t rows;	118	int32_t rows;
96	maprow *row;	119	maprow *row;
97	} *CFClient__Map;	120	} *CFClient__Map;
98		121
99	static char *	122	static char *
100	prepend (char *ptr, int sze, int inc)	123	prepend (char *ptr, int sze, int inc)
…		…
195		218
196	static void	219	static void
197	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	220	map_blank (CFClient__Map self, int x0, int y0, int w, int h)
198	{	221	{
199	int x, y;	222	int x, y;
		223	maprow *row;
200		224
201	for (y = y0; y < y0 + h; y++)	225	for (y = y0; y < y0 + h; y++)
202	if (y >= 0)	226	if (y >= 0)
203	{	227	{
204	if (y >= self->rows)	228	if (y >= self->rows)
205	break;	229	break;
206		230
207	maprow *row = self->row + y;	231	row = self->row + y;
208		232
209	for (x = x0; x < x0 + w; x++)	233	for (x = x0; x < x0 + w; x++)
210	if (x >= row->c0)	234	if (x >= row->c0)
211	{	235	{
212	if (x >= row->c1)	236	if (x >= row->c1)
…		…
221		245
222	PROTOTYPES: ENABLE	246	PROTOTYPES: ENABLE
223		247
224	BOOT:	248	BOOT:
225	{	249	{
		250	HV *stash = gv_stashpv ("CFClient", 1);
		251	static const struct {
		252	const char *name;
		253	IV iv;
		254	} *civ, const_iv[] = {
		255	# define const_iv(name) { # name, (IV)name }
		256	const_iv (SDL_ACTIVEEVENT),
		257	const_iv (SDL_KEYDOWN),
		258	const_iv (SDL_KEYUP),
		259	const_iv (SDL_MOUSEMOTION),
		260	const_iv (SDL_MOUSEBUTTONDOWN),
		261	const_iv (SDL_MOUSEBUTTONUP),
		262	const_iv (SDL_JOYAXISMOTION),
		263	const_iv (SDL_JOYBALLMOTION),
		264	const_iv (SDL_JOYHATMOTION),
		265	const_iv (SDL_JOYBUTTONDOWN),
		266	const_iv (SDL_JOYBUTTONUP),
		267	const_iv (SDL_QUIT),
		268	const_iv (SDL_SYSWMEVENT),
		269	const_iv (SDL_EVENT_RESERVEDA),
		270	const_iv (SDL_EVENT_RESERVEDB),
		271	const_iv (SDL_VIDEORESIZE),
		272	const_iv (SDL_VIDEOEXPOSE),
		273	const_iv (SDL_USEREVENT),
		274	const_iv (SDLK_KP0),
		275	const_iv (SDLK_KP1),
		276	const_iv (SDLK_KP2),
		277	const_iv (SDLK_KP3),
		278	const_iv (SDLK_KP4),
		279	const_iv (SDLK_KP5),
		280	const_iv (SDLK_KP6),
		281	const_iv (SDLK_KP7),
		282	const_iv (SDLK_KP8),
		283	const_iv (SDLK_KP9),
		284	const_iv (SDLK_KP_PERIOD),
		285	const_iv (SDLK_KP_DIVIDE),
		286	const_iv (SDLK_KP_MULTIPLY),
		287	const_iv (SDLK_KP_MINUS),
		288	const_iv (SDLK_KP_PLUS),
		289	const_iv (SDLK_KP_ENTER),
		290	const_iv (SDLK_KP_EQUALS),
		291	const_iv (SDLK_UP),
		292	const_iv (SDLK_DOWN),
		293	const_iv (SDLK_RIGHT),
		294	const_iv (SDLK_LEFT),
		295	const_iv (SDLK_INSERT),
		296	const_iv (SDLK_HOME),
		297	const_iv (SDLK_END),
		298	const_iv (SDLK_PAGEUP),
		299	const_iv (SDLK_PAGEDOWN),
		300	const_iv (SDLK_F1),
		301	const_iv (SDLK_F2),
		302	const_iv (SDLK_F3),
		303	const_iv (SDLK_F4),
		304	const_iv (SDLK_F5),
		305	const_iv (SDLK_F6),
		306	const_iv (SDLK_F7),
		307	const_iv (SDLK_F8),
		308	const_iv (SDLK_F9),
		309	const_iv (SDLK_F10),
		310	const_iv (SDLK_F11),
		311	const_iv (SDLK_F12),
		312	const_iv (SDLK_F13),
		313	const_iv (SDLK_F14),
		314	const_iv (SDLK_F15),
		315	const_iv (SDLK_NUMLOCK),
		316	const_iv (SDLK_CAPSLOCK),
		317	const_iv (SDLK_SCROLLOCK),
		318	const_iv (SDLK_RSHIFT),
		319	const_iv (SDLK_LSHIFT),
		320	const_iv (SDLK_RCTRL),
		321	const_iv (SDLK_LCTRL),
		322	const_iv (SDLK_RALT),
		323	const_iv (SDLK_LALT),
		324	const_iv (SDLK_RMETA),
		325	const_iv (SDLK_LMETA),
		326	const_iv (SDLK_LSUPER),
		327	const_iv (SDLK_RSUPER),
		328	const_iv (SDLK_MODE),
		329	const_iv (SDLK_COMPOSE),
		330	const_iv (SDLK_HELP),
		331	const_iv (SDLK_PRINT),
		332	const_iv (SDLK_SYSREQ),
		333	const_iv (SDLK_BREAK),
		334	const_iv (SDLK_MENU),
		335	const_iv (SDLK_POWER),
		336	const_iv (SDLK_EURO),
		337	const_iv (SDLK_UNDO),
		338	const_iv (KMOD_NONE),
		339	const_iv (KMOD_LSHIFT),
		340	const_iv (KMOD_RSHIFT),
		341	const_iv (KMOD_LCTRL),
		342	const_iv (KMOD_RCTRL),
		343	const_iv (KMOD_LALT),
		344	const_iv (KMOD_RALT),
		345	const_iv (KMOD_LMETA),
		346	const_iv (KMOD_RMETA),
		347	const_iv (KMOD_NUM),
		348	const_iv (KMOD_CAPS),
		349	const_iv (KMOD_MODE),
		350	const_iv (KMOD_CTRL),
		351	const_iv (KMOD_SHIFT),
		352	const_iv (KMOD_ALT),
		353	const_iv (KMOD_META)
		354	# undef const_iv
		355	};
		356
		357	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
		358	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		359
226	fontmap = pango_ft2_font_map_new ();	360	fontmap = pango_ft2_font_map_new ();
227	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);	361	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
228	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);	362	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
229	}	363	}
		364
		365	int
		366	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
		367
		368	void
		369	SDL_Quit ()
		370
		371	void
		372	SDL_ListModes ()
		373	PPCODE:
		374	{
		375	SDL_Rect **m;
		376
		377	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
		378	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
		379	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
		380	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
		381
		382	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
		383	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
		384	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
		385	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
		386
		387	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		388	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		389	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		390
		391	SDL_EnableUNICODE (1);
		392	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
		393
		394	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
		395
		396	if (m && m != (SDL_Rect **)-1)
		397	while (*m)
		398	{
		399	AV *av = newAV ();
		400	av_push (av, newSViv ((*m)->w));
		401	av_push (av, newSViv ((*m)->h));
		402	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
		403
		404	++m;
		405	}
		406	}
		407
		408	int
		409	SDL_SetVideoMode (int w, int h, int fullscreen)
		410	CODE:
		411	RETVAL = !!SDL_SetVideoMode (
		412	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
		413	);
		414	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		415	OUTPUT:
		416	RETVAL
		417
		418	void
		419	SDL_GL_SwapBuffers ()
		420
		421	void
		422	SDL_PollEvent ()
		423	PPCODE:
		424	{
		425	SDL_Event ev;
		426
		427	while (SDL_PollEvent (&ev))
		428	{
		429	HV *hv = newHV ();
		430	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		431	switch (ev.type)
		432	{
		433	case SDL_KEYDOWN:
		434	case SDL_KEYUP:
		435	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
		436	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
		437	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		438	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
		439	break;
		440
		441	case SDL_ACTIVEEVENT:
		442	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
		443	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
		444	break;
		445
		446	case SDL_MOUSEMOTION:
		447	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
		448	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
		449	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
		450	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
		451	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
		452	break;
		453
		454	case SDL_MOUSEBUTTONDOWN:
		455	case SDL_MOUSEBUTTONUP:
		456	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
		457	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
		458	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
		459	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		460	}
		461
		462	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
		463	}
		464	}
		465
		466	int
		467	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)
		468
		469	void
		470	Mix_CloseAudio ()
		471
		472	int
		473	Mix_AllocateChannels (int numchans = -1)
230		474
231	void	475	void
232	lowdelay (int fd, int val = 1)	476	lowdelay (int fd, int val = 1)
233	CODE:	477	CODE:
		478	#ifndef _WIN32
234	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	479	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
		480	#endif
235		481
236	char *	482	char *
237	gl_version ()	483	gl_version ()
238	CODE:	484	CODE:
239	RETVAL = (char *)glGetString (GL_VERSION);	485	RETVAL = (char *)glGetString (GL_VERSION);
…		…
285	croak ("load_image: %s", SDL_GetError ());	531	croak ("load_image: %s", SDL_GetError ());
286		532
287	fmt.palette = NULL;	533	fmt.palette = NULL;
288	fmt.BitsPerPixel = 32;	534	fmt.BitsPerPixel = 32;
289	fmt.BytesPerPixel = 4;	535	fmt.BytesPerPixel = 4;
		536	#if SDL_BYTEORDER == SDL_LIL_ENDIAN
290	fmt.Rmask = 0x000000ff;	537	fmt.Rmask = 0x000000ff;
291	fmt.Gmask = 0x0000ff00;	538	fmt.Gmask = 0x0000ff00;
292	fmt.Bmask = 0x00ff0000;	539	fmt.Bmask = 0x00ff0000;
293	fmt.Amask = 0xff000000;	540	fmt.Amask = 0xff000000;
		541	#else
		542	fmt.Rmask = 0xff000000;
		543	fmt.Gmask = 0x00ff0000;
		544	fmt.Bmask = 0x0000ff00;
		545	fmt.Amask = 0x000000ff;
		546	#endif
294	fmt.Rloss = 0;	547	fmt.Rloss = 0;
295	fmt.Gloss = 0;	548	fmt.Gloss = 0;
296	fmt.Bloss = 0;	549	fmt.Bloss = 0;
297	fmt.Aloss = 0;	550	fmt.Aloss = 0;
298	fmt.Rshift = 0;	551	fmt.Rshift = 0;
…		…
312	SDL_LockSurface (surface2);	565	SDL_LockSurface (surface2);
313	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	566	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
314	SDL_UnlockSurface (surface2);	567	SDL_UnlockSurface (surface2);
315	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	568	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
316	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	569	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
317	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_INT_8_8_8_8_REV)));	570	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
318		571
319	SDL_FreeSurface (surface);	572	SDL_FreeSurface (surface);
320	SDL_FreeSurface (surface2);	573	SDL_FreeSurface (surface2);
321	}	574	}
322		575
…		…
346	}	599	}
347		600
348	void	601	void
349	fatal (char *message)	602	fatal (char *message)
350	CODE:	603	CODE:
351	#ifdef WIN32	604	#ifdef _WIN32
352	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	605	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
353	#else	606	#else
354	fprintf (stderr, "FATAL: %s\n", message);	607	fprintf (stderr, "FATAL: %s\n", message);
355	#endif	608	#endif
356	exit (1);	609	exit (1);
…		…
390	STRLEN textlen;	643	STRLEN textlen;
391	char *text = SvPVutf8 (text_, textlen);	644	char *text = SvPVutf8 (text_, textlen);
392		645
393	pango_layout_set_markup (self->pl, text, textlen);	646	pango_layout_set_markup (self->pl, text, textlen);
394	}	647	}
		648
		649	SV *
		650	get_text (CFClient::Layout self)
		651	CODE:
		652	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
		653	SvUTF8_on (RETVAL);
		654	OUTPUT:
		655	RETVAL
395		656
396	void	657	void
397	set_height (CFClient::Layout self, int base_height)	658	set_height (CFClient::Layout self, int base_height)
398	CODE:	659	CODE:
399	self->base_height = base_height;	660	self->base_height = base_height;
…		…
565	{	826	{
566	Append (maptex, self->tex, self->texs, self->texs);	827	Append (maptex, self->tex, self->texs, self->texs);
567	self->texs *= 2;	828	self->texs *= 2;
568	}	829	}
569		830
		831	{
570	maptex *tex = self->tex + texid;	832	maptex *tex = self->tex + texid;
571		833
572	tex->name = name;	834	tex->name = name;
573	tex->w = w;	835	tex->w = w;
574	tex->h = h;	836	tex->h = h;
575	tex->s = s;	837	tex->s = s;
576	tex->t = t;	838	tex->t = t;
577	tex->r = r;	839	tex->r = r;
578	tex->g = g;	840	tex->g = g;
579	tex->b = b;	841	tex->b = b;
580	tex->a = a;	842	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	}	843	}
607	}	844	}
608		845
609	int	846	int
610	ox (CFClient::Map self)	847	ox (CFClient::Map self)
611	ALIAS:	848	ALIAS:
…		…
618	}	855	}
619	OUTPUT:	856	OUTPUT:
620	RETVAL	857	RETVAL
621		858
622	void	859	void
		860	scroll (CFClient::Map self, int dx, int dy)
		861	CODE:
		862	{
		863	if (dx > 0)
		864	map_blank (self, self->x, self->y, dx - 1, self->h);
		865	else if (dx < 0)
		866	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);
		867
		868	if (dy > 0)
		869	map_blank (self, self->x, self->y, self->w, dy - 1);
		870	else if (dy < 0)
		871	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);
		872
		873	self->ox += dx; self->x += dx;
		874	self->oy += dy; self->y += dy;
		875
		876	while (self->y < 0)
		877	{
		878	Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y);
		879
		880	self->rows += MAP_EXTEND_Y;
		881	self->y += MAP_EXTEND_Y;
		882	}
		883	}
		884
		885	void
623	map1a_update (CFClient::Map self, SV *data_)	886	map1a_update (CFClient::Map self, SV *data_)
624	CODE:	887	CODE:
625	{	888	{
626	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	889	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
627	uint8_t data_end = (uint8_t )SvEND (data_);	890	uint8_t data_end = (uint8_t )SvEND (data_);
628		891	mapcell *cell;
		892	int x, y, flags;
		893
629	while (data < data_end)	894	while (data < data_end)
630	{	895	{
631	int flags = (data [0] << 8) + data [1]; data += 2;	896	flags = (data [0] << 8) + data [1]; data += 2;
632		897
633	int x = ((flags >> 10) & 63) + self->x;	898	x = ((flags >> 10) & 63) + self->x;
634	int y = ((flags >> 4) & 63) + self->y;	899	y = ((flags >> 4) & 63) + self->y;
635		900
636	mapcell *cell = map_get_cell (self, x, y);	901	cell = map_get_cell (self, x, y);
637		902
638	if (flags & 15)	903	if (flags & 15)
639	{	904	{
640	if (cell->darkness < 0) // && x < self->w && y < self->h)	905	if (cell->darkness < 0)
641	{	906	{
642	cell->darkness = 0;	907	cell->darkness = 0;
643	cell->face [0] = 0;	908	cell->face [0] = 0;
644	cell->face [1] = 0;	909	cell->face [1] = 0;
645	cell->face [2] = 0;	910	cell->face [2] = 0;
646	}	911	}
647		912
648	cell->darkness = flags & 8 ? *data++ : 255;	913	cell->darkness = flags & 8 ? *data++ : 255;
649		914
650	//TODO: don't trust server data to be in-range(!)	915	//TODO: don't trust server data to be in-range(!)
651		916
652	if (flags & 4)	917	if (flags & 4)
…		…
731		996
732	void	997	void
733	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	998	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
734	PPCODE:	999	PPCODE:
735	{	1000	{
		1001	int vx, vy;
		1002	int x, y, z;
		1003	int last_name;
		1004	mapface face;
736	int sw4 = (sw + 3) & ~3;	1005	int sw4 = (sw + 3) & ~3;
737	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1006	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
738	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);	1007	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1008
739	memset (darkness, 255, sw4 * sh);	1009	memset (darkness, 255, sw4 * sh);
740	SvPOK_only (darkness_sv);	1010	SvPOK_only (darkness_sv);
741	SvCUR_set (darkness_sv, sw4 * sh);	1011	SvCUR_set (darkness_sv, sw4 * sh);
742		1012
743	int vx = self->x + (self->w - sw) / 2 - shift_x;	1013	vx = self->x + (self->w - sw) / 2 - shift_x;
744	int vy = self->y + (self->h - sh) / 2 - shift_y;	1014	vy = self->y + (self->h - sh) / 2 - shift_y;
745		1015
746	/*	1016	/*
747	int vx = self->vx = self->w >= sw	1017	int vx = self->vx = self->w >= sw
748	? self->x + (self->w - sw) / 2	1018	? self->x + (self->w - sw) / 2
749	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1019	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
758	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1028	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
759	glEnable (GL_BLEND);	1029	glEnable (GL_BLEND);
760	glEnable (GL_TEXTURE_2D);	1030	glEnable (GL_TEXTURE_2D);
761	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1031	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
762		1032
763	int x, y, z;
764
765	int last_name = 0;
766
767	glBegin (GL_QUADS);	1033	glBegin (GL_QUADS);
		1034
		1035	last_name = 0;
768		1036
769	for (z = 0; z < 3; z++)	1037	for (z = 0; z < 3; z++)
770	for (y = 0; y < sh; y++)	1038	for (y = 0; y < sh; y++)
771	if (0 <= y + vy && y + vy < self->rows)	1039	if (0 <= y + vy && y + vy < self->rows)
772	{	1040	{
…		…
779		1047
780	darkness[y * sw4 + x] = cell->darkness < 0	1048	darkness[y * sw4 + x] = cell->darkness < 0
781	? 255 - FOW_DARKNESS	1049	? 255 - FOW_DARKNESS
782	: 255 - cell->darkness;	1050	: 255 - cell->darkness;
783		1051
784	mapface face = cell->face [z];	1052	face = cell->face [z];
785		1053
786	if (face)	1054	if (face)
787	{	1055	{
788	maptex tex = self->tex [face];	1056	maptex tex = self->tex [face];
789		1057
…		…
849	for (x = x0; x < x1; x++)	1117	for (x = x0; x < x1; x++)
850	{	1118	{
851	if (row && row->c0 <= x && x < row->c1)	1119	if (row && row->c0 <= x && x < row->c1)
852	{	1120	{
853	mapcell *cell = row->col + (x - row->c0);	1121	mapcell *cell = row->col + (x - row->c0);
854
855	uint8_t flags = 0;	1122	uint8_t flags = 0;
856		1123
857	if (cell->face [0]) flags \|= 1;	1124	if (cell->face [0]) flags \|= 1;
858	if (cell->face [1]) flags \|= 2;	1125	if (cell->face [1]) flags \|= 2;
859	if (cell->face [2]) flags \|= 4;	1126	if (cell->face [2]) flags \|= 4;
…		…
893	void	1160	void
894	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1161	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)
895	PPCODE:	1162	PPCODE:
896	{	1163	{
897	int x, y, z;	1164	int x, y, z;
		1165	int w, h;
898	int x1, y1;	1166	int x1, y1;
899		1167
900	if (*data++ != 0)	1168	if (*data++ != 0)
901	return; /* version mismatch */	1169	return; /* version mismatch */
902		1170
903	int w = data++ << 8; w \|= data++;	1171	w = data++ << 8; w \|= data++;
904	int h = data++ << 8; h \|= data++;	1172	h = data++ << 8; h \|= data++;
905		1173
906	// we need to do this 'cause we don't keep an absolute coord system for rows	1174	// we need to do this 'cause we don't keep an absolute coord system for rows
907	// TODO: treat rows as we treat	1175	// TODO: treat rows as we treat
908	map_get_row (self, y0 + self->y - self->oy);//D	1176	map_get_row (self, y0 + self->y - self->oy);//D
909	map_get_row (self, y0 + self->y - self->oy + h - 1);//D	1177	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
…		…
947	}	1215	}
948	}	1216	}
949	}	1217	}
950	}	1218	}
951		1219
		1220	MODULE = CFClient PACKAGE = CFClient::MixChunk
		1221
		1222	CFClient::MixChunk
		1223	new_from_file (SV class, char path)
		1224	CODE:
		1225	RETVAL = Mix_LoadWAV (path);
		1226	OUTPUT:
		1227	RETVAL
		1228
		1229	void
		1230	DESTROY (CFClient::MixChunk self)
		1231	CODE:
		1232	Mix_FreeChunk (self);
		1233
		1234	int
		1235	volume (CFClient::MixChunk self, int volume = -1)
		1236	CODE:
		1237	RETVAL = Mix_VolumeChunk (self, volume);
		1238	OUTPUT:
		1239	RETVAL
		1240
		1241	int
		1242	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
		1243	CODE:
		1244	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
		1245	OUTPUT:
		1246	RETVAL
		1247
		1248	MODULE = CFClient PACKAGE = CFClient::MixMusic
		1249
		1250	int
		1251	volume (int volume = -1)
		1252	CODE:
		1253	RETVAL = Mix_VolumeMusic (volume);
		1254	OUTPUT:
		1255	RETVAL
		1256
		1257	CFClient::MixMusic
		1258	new_from_file (SV class, char path)
		1259	CODE:
		1260	RETVAL = Mix_LoadMUS (path);
		1261	OUTPUT:
		1262	RETVAL
		1263
		1264	void
		1265	DESTROY (CFClient::MixMusic self)
		1266	CODE:
		1267	Mix_FreeMusic (self);
		1268
		1269	int
		1270	play (CFClient::MixMusic self, int loops = -1)
		1271	CODE:
		1272	RETVAL = Mix_PlayMusic (self, loops);
		1273	OUTPUT:
		1274	RETVAL
		1275
		1276	MODULE = CFClient PACKAGE = CFClient::OpenGL
		1277
		1278	BOOT:
		1279	{
		1280	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);
		1281	static const struct {
		1282	const char *name;
		1283	IV iv;
		1284	} *civ, const_iv[] = {
		1285	# define const_iv(name) { # name, (IV)name }
		1286	const_iv (GL_COLOR_MATERIAL),
		1287	const_iv (GL_SMOOTH),
		1288	const_iv (GL_FLAT),
		1289	const_iv (GL_BLEND),
		1290	const_iv (GL_AND),
		1291	const_iv (GL_SRC_ALPHA),
		1292	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1293	const_iv (GL_RGB),
		1294	const_iv (GL_RGBA),
		1295	const_iv (GL_UNSIGNED_BYTE),
		1296	const_iv (GL_ALPHA4),
		1297	const_iv (GL_ALPHA),
		1298	const_iv (GL_FLOAT),
		1299	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		1300	const_iv (GL_COMPILE),
		1301	const_iv (GL_TEXTURE_1D),
		1302	const_iv (GL_TEXTURE_2D),
		1303	const_iv (GL_TEXTURE_ENV),
		1304	const_iv (GL_TEXTURE_MAG_FILTER),
		1305	const_iv (GL_TEXTURE_MIN_FILTER),
		1306	const_iv (GL_TEXTURE_ENV_MODE),
		1307	const_iv (GL_TEXTURE_WRAP_S),
		1308	const_iv (GL_TEXTURE_WRAP_T),
		1309	const_iv (GL_CLAMP),
		1310	const_iv (GL_REPEAT),
		1311	const_iv (GL_NEAREST),
		1312	const_iv (GL_LINEAR),
		1313	const_iv (GL_MODULATE),
		1314	const_iv (GL_REPLACE),
		1315	const_iv (GL_COLOR_BUFFER_BIT),
		1316	const_iv (GL_PROJECTION),
		1317	const_iv (GL_MODELVIEW),
		1318	const_iv (GL_COLOR_LOGIC_OP),
		1319	const_iv (GL_CONVOLUTION_2D),
		1320	const_iv (GL_CONVOLUTION_BORDER_MODE),
		1321	const_iv (GL_CONSTANT_BORDER),
		1322	const_iv (GL_LINES),
		1323	const_iv (GL_QUADS),
		1324	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
		1325	const_iv (GL_FASTEST),
		1326	# undef const_iv
		1327	};
		1328
		1329	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
		1330	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		1331	}
		1332
		1333	int glGetError ()
		1334
		1335	void glClear (int mask)
		1336
		1337	void glClearColor (float r, float g, float b, float a = 1.0)
		1338	PROTOTYPE: @
		1339
		1340	void glEnable (int cap)
		1341
		1342	void glDisable (int cap)
		1343
		1344	void glShadeModel (int mode)
		1345
		1346	void glHint (int target, int mode)
		1347
		1348	void glBlendFunc (int sfactor, int dfactor)
		1349
		1350	void glLogicOp (int opcode)
		1351
		1352	void glMatrixMode (int mode)
		1353
		1354	void glPushMatrix ()
		1355
		1356	void glPopMatrix ()
		1357
		1358	void glLoadIdentity ()
		1359
		1360	void glOrtho (double left, double right, double bottom, double top, double near, double far)
		1361
		1362	void glViewport (int x, int y, int width, int height)
		1363
		1364	void glTranslate (float x, float y, float z = 0.)
		1365	CODE:
		1366	glTranslatef (x, y, z);
		1367
		1368	void glScale (float x, float y, float z)
		1369	CODE:
		1370	glScalef (x, y, z);
		1371
		1372	void glRotate (float angle, float x, float y, float z)
		1373	CODE:
		1374	glRotatef (angle, x, y, z);
		1375
		1376	void glBegin (int mode)
		1377
		1378	void glEnd ()
		1379
		1380	void glColor (float r, float g, float b, float a = 1.0)
		1381	PROTOTYPE: @
		1382	CODE:
		1383	glColor4f (r, g, b, a);
		1384
		1385	void glVertex (float x, float y, float z = 0.)
		1386	CODE:
		1387	glVertex3f (x, y, z);
		1388
		1389	void glTexCoord (float s, float t)
		1390	CODE:
		1391	glTexCoord2f (s, t);
		1392
		1393	void glTexEnv (int target, int pname, float param)
		1394	CODE:
		1395	glTexEnvf (target, pname, param);
		1396
		1397	void glTexParameter (int target, int pname, float param)
		1398	CODE:
		1399	glTexParameterf (target, pname, param);
		1400
		1401	void glBindTexture (int target, int name)
		1402
		1403	void glConvolutionParameter (int target, int pname, float params)
		1404	CODE:
		1405	glConvolutionParameterf (target, pname, params);
		1406
		1407	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1408
		1409	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
		1410
		1411	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1412
		1413	int glGenTexture ()
		1414	CODE:
		1415	{
		1416	GLuint name;
		1417	glGenTextures (1, &name);
		1418	RETVAL = name;
		1419	}
		1420	OUTPUT:
		1421	RETVAL
		1422
		1423	void glDeleteTexture (int name)
		1424	CODE:
		1425	{
		1426	GLuint name_ = name;
		1427	glDeleteTextures (1, &name_);
		1428	}
		1429
		1430	int glGenList ()
		1431	CODE:
		1432	RETVAL = glGenLists (1);
		1433	OUTPUT:
		1434	RETVAL
		1435
		1436	void glDeleteList (int list)
		1437	CODE:
		1438	glDeleteLists (list, 1);
		1439
		1440	void glNewList (int list, int mode = GL_COMPILE)
		1441
		1442	void glEndList ()
		1443
		1444	void glCallList (int list)
		1445

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.54 by root, Wed Apr 19 23:37:48 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.54 by root, Wed Apr 19 23:37:48 2006 UTC