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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.47 by root, Mon Apr 17 21:52:42 2006 UTC vs. Revision 1.60 by root, Sun Apr 23 04:47:02 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.47 by root, Mon Apr 17 21:52:42 2006 UTC vs.
Revision 1.60 by root, Sun Apr 23 04:47:02 2006 UTC