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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.41 by root, Sat Apr 15 01:52:53 2006 UTC vs.
Revision 1.53 by root, Wed Apr 19 21:38:04 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	{
…		…
61		84
62	w = (w + 3) & ~3;	85	w = (w + 3) & ~3;
63	if (!w) w = 1;	86	if (!w) w = 1;
64	if (!h) h = 1;	87	if (!h) h = 1;
65	}	88	}
		89
		90	typedef uint16_t mapface;
66		91
67	typedef struct {	92	typedef struct {
68	GLint name;	93	GLint name;
69	int w, h;	94	int w, h;
70	float s, t;	95	float s, t;
71	uint8_t r, g, b, a;	96	uint8_t r, g, b, a;
72	} mapface;	97	} maptex;
73		98
74	typedef struct {	99	typedef struct {
75	int16_t darkness;	100	int16_t darkness;
76	uint16_t face[3];	101	mapface face[3];
77	} mapcell;	102	} mapcell;
78		103
79	typedef struct {	104	typedef struct {
80	int32_t c0, c1;	105	int32_t c0, c1;
81	mapcell *col;	106	mapcell *col;
82	} maprow;	107	} maprow;
83		108
84	typedef struct map {	109	typedef struct map {
85	int x, y, w, h;	110	int x, y, w, h;
86	int vx, vy;	111	int ox, oy; /* offset to virtual global coordinate system */
87	int faces;	112	int faces;
88	mapface *face;	113	mapface *face;
89		114
		115	int texs;
		116	maptex *tex;
		117
90	uint32_t rows;	118	int32_t rows;
91	maprow *row;	119	maprow *row;
92	} *CFClient__Map;	120	} *CFClient__Map;
93		121
94	static char *	122	static char *
95	prepend (char *ptr, int sze, int inc)	123	prepend (char *ptr, int sze, int inc)
…		…
114	}	142	}
115		143
116	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	144	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
117	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	145	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
118		146
		147	static maprow *
		148	map_get_row (CFClient__Map self, int y)
		149	{
		150	if (0 > y)
		151	{
		152	int extend = - y + MAP_EXTEND_Y;
		153	Prepend (maprow, self->row, self->rows, extend);
		154
		155	self->rows += extend;
		156	self->y += extend;
		157	y += extend;
		158	}
		159	else if (y >= self->rows)
		160	{
		161	int extend = y - self->rows + MAP_EXTEND_Y;
		162	Append (maprow, self->row, self->rows, extend);
		163	self->rows += extend;
		164	}
		165
		166	return self->row + y;
		167	}
		168
		169	static mapcell *
		170	row_get_cell (maprow *row, int x)
		171	{
		172	if (!row->col)
		173	{
		174	Newz (0, row->col, MAP_EXTEND_X, mapcell);
		175	row->c0 = x - MAP_EXTEND_X / 4;
		176	row->c1 = row->c0 + MAP_EXTEND_X;
		177	}
		178
		179	if (row->c0 > x)
		180	{
		181	int extend = row->c0 - x + MAP_EXTEND_X;
		182	Prepend (mapcell, row->col, row->c1 - row->c0, extend);
		183	row->c0 -= extend;
		184	}
		185	else if (x >= row->c1)
		186	{
		187	int extend = x - row->c1 + MAP_EXTEND_X;
		188	Append (mapcell, row->col, row->c1 - row->c0, extend);
		189	row->c1 += extend;
		190	}
		191
		192	return row->col + (x - row->c0);
		193	}
		194
		195	static mapcell *
		196	map_get_cell (CFClient__Map self, int x, int y)
		197	{
		198	return row_get_cell (map_get_row (self, y), x);
		199	}
		200
119	static void	201	static void
120	map_clear (CFClient__Map self)	202	map_clear (CFClient__Map self)
121	{	203	{
122	int r;	204	int r;
123		205
…		…
126		208
127	Safefree (self->row);	209	Safefree (self->row);
128		210
129	self->x = 0;	211	self->x = 0;
130	self->y = 0;	212	self->y = 0;
131	self->vx = 0;	213	self->ox = 0;
132	self->vy = 0;	214	self->oy = 0;
133	self->row = 0;	215	self->row = 0;
134	self->rows = 0;	216	self->rows = 0;
135	}	217	}
136		218
137	static void	219	static void
138	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)
139	{	221	{
140	int x, y;	222	int x, y;
		223	maprow *row;
141		224
142	for (y = y0; y < y0 + h; y++)	225	for (y = y0; y < y0 + h; y++)
143	if (y >= 0)	226	if (y >= 0)
144	{	227	{
145	if (y >= self->rows)	228	if (y >= self->rows)
146	break;	229	break;
147		230
148	maprow *row = self->row + y;	231	row = self->row + y;
149		232
150	for (x = x0; x < x0 + w; x++)	233	for (x = x0; x < x0 + w; x++)
151	if (x >= row->c0)	234	if (x >= row->c0)
152	{	235	{
153	if (x >= row->c1)	236	if (x >= row->c1)
…		…
162		245
163	PROTOTYPES: ENABLE	246	PROTOTYPES: ENABLE
164		247
165	BOOT:	248	BOOT:
166	{	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
167	fontmap = pango_ft2_font_map_new ();	360	fontmap = pango_ft2_font_map_new ();
168	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);
169	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);	362	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
170	}	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_PollEvent ()
		420	PPCODE:
		421	{
		422	SDL_Event ev;
		423
		424	while (SDL_PollEvent (&ev))
		425	{
		426	HV *hv = newHV ();
		427	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		428	switch (ev.type)
		429	{
		430	case SDL_KEYDOWN:
		431	case SDL_KEYUP:
		432	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
		433	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
		434	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		435	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
		436	break;
		437
		438	case SDL_ACTIVEEVENT:
		439	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
		440	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
		441	break;
		442
		443	case SDL_MOUSEMOTION:
		444	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
		445	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
		446	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
		447	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
		448	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
		449	break;
		450
		451	case SDL_MOUSEBUTTONDOWN:
		452	case SDL_MOUSEBUTTONUP:
		453	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
		454	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
		455	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
		456	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		457	}
		458
		459	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
		460	}
		461	}
		462
		463	int
		464	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)
		465
		466	void
		467	Mix_CloseAudio ()
		468
		469	int
		470	Mix_AllocateChannels (int numchans = -1)
171		471
172	void	472	void
173	lowdelay (int fd, int val = 1)	473	lowdelay (int fd, int val = 1)
174	CODE:	474	CODE:
		475	#ifndef _WIN32
175	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	476	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
		477	#endif
176		478
177	char *	479	char *
178	gl_version ()	480	gl_version ()
179	CODE:	481	CODE:
180	RETVAL = (char *)glGetString (GL_VERSION);	482	RETVAL = (char *)glGetString (GL_VERSION);
…		…
226	croak ("load_image: %s", SDL_GetError ());	528	croak ("load_image: %s", SDL_GetError ());
227		529
228	fmt.palette = NULL;	530	fmt.palette = NULL;
229	fmt.BitsPerPixel = 32;	531	fmt.BitsPerPixel = 32;
230	fmt.BytesPerPixel = 4;	532	fmt.BytesPerPixel = 4;
		533	#if SDL_BYTEORDER == SDL_LIL_ENDIAN
231	fmt.Rmask = 0x000000ff;	534	fmt.Rmask = 0x000000ff;
232	fmt.Gmask = 0x0000ff00;	535	fmt.Gmask = 0x0000ff00;
233	fmt.Bmask = 0x00ff0000;	536	fmt.Bmask = 0x00ff0000;
234	fmt.Amask = 0xff000000;	537	fmt.Amask = 0xff000000;
		538	#else
		539	fmt.Rmask = 0xff000000;
		540	fmt.Gmask = 0x00ff0000;
		541	fmt.Bmask = 0x0000ff00;
		542	fmt.Amask = 0x000000ff;
		543	#endif
235	fmt.Rloss = 0;	544	fmt.Rloss = 0;
236	fmt.Gloss = 0;	545	fmt.Gloss = 0;
237	fmt.Bloss = 0;	546	fmt.Bloss = 0;
238	fmt.Aloss = 0;	547	fmt.Aloss = 0;
239	fmt.Rshift = 0;	548	fmt.Rshift = 0;
…		…
253	SDL_LockSurface (surface2);	562	SDL_LockSurface (surface2);
254	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	563	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
255	SDL_UnlockSurface (surface2);	564	SDL_UnlockSurface (surface2);
256	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	565	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
257	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	566	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
258	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_INT_8_8_8_8_REV)));	567	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
259		568
260	SDL_FreeSurface (surface);	569	SDL_FreeSurface (surface);
261	SDL_FreeSurface (surface2);	570	SDL_FreeSurface (surface2);
262	}	571	}
263		572
…		…
287	}	596	}
288		597
289	void	598	void
290	fatal (char *message)	599	fatal (char *message)
291	CODE:	600	CODE:
292	#ifdef WIN32	601	#ifdef _WIN32
293	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	602	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
294	#else	603	#else
295	fprintf (stderr, "FATAL: %s\n", message);	604	fprintf (stderr, "FATAL: %s\n", message);
296	#endif	605	#endif
297	exit (1);	606	exit (1);
…		…
331	STRLEN textlen;	640	STRLEN textlen;
332	char *text = SvPVutf8 (text_, textlen);	641	char *text = SvPVutf8 (text_, textlen);
333		642
334	pango_layout_set_markup (self->pl, text, textlen);	643	pango_layout_set_markup (self->pl, text, textlen);
335	}	644	}
		645
		646	SV *
		647	get_text (CFClient::Layout self)
		648	CODE:
		649	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
		650	SvUTF8_on (RETVAL);
		651	OUTPUT:
		652	RETVAL
336		653
337	void	654	void
338	set_height (CFClient::Layout self, int base_height)	655	set_height (CFClient::Layout self, int base_height)
339	CODE:	656	CODE:
340	self->base_height = base_height;	657	self->base_height = base_height;
…		…
454		771
455	CFClient::Map	772	CFClient::Map
456	new (SV *class, int map_width, int map_height)	773	new (SV *class, int map_width, int map_height)
457	CODE:	774	CODE:
458	New (0, RETVAL, 1, struct map);	775	New (0, RETVAL, 1, struct map);
459	RETVAL->x = 0;	776	RETVAL->x = 0;
460	RETVAL->y = 0;	777	RETVAL->y = 0;
461	RETVAL->w = map_width;	778	RETVAL->w = map_width;
462	RETVAL->h = map_height;	779	RETVAL->h = map_height;
463	RETVAL->vx = 0;	780	RETVAL->ox = 0;
464	RETVAL->vy = 0;	781	RETVAL->oy = 0;
465	RETVAL->faces = 8192;	782	RETVAL->faces = 8192;
466	Newz (0, RETVAL->face, RETVAL->faces, mapface);	783	Newz (0, RETVAL->face, RETVAL->faces, mapface);
		784	RETVAL->texs = 8192;
		785	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
467	RETVAL->rows = 0;	786	RETVAL->rows = 0;
468	RETVAL->row = 0;	787	RETVAL->row = 0;
469	OUTPUT:	788	OUTPUT:
470	RETVAL	789	RETVAL
471		790
…		…
482	clear (CFClient::Map self)	801	clear (CFClient::Map self)
483	CODE:	802	CODE:
484	map_clear (self);	803	map_clear (self);
485		804
486	void	805	void
487	set_texture (CFClient::Map self, int face, int name, int w, int h, float s, float t, int r, int g, int b, int a)	806	set_face (CFClient::Map self, int face, int texid)
488	CODE:	807	CODE:
489	{	808	{
490	while (self->faces < face)	809	while (self->faces <= face)
491	{	810	{
492	Append (mapface, self->face, self->faces, self->faces);	811	Append (mapface, self->face, self->faces, self->faces);
493	self->faces *= 2;	812	self->faces *= 2;
494	}	813	}
495		814
496	mapface *f = self->face + face;	815	self->face [face] = texid;
		816	}
497		817
		818	void
		819	set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
		820	CODE:
		821	{
		822	while (self->texs <= texid)
		823	{
		824	Append (maptex, self->tex, self->texs, self->texs);
		825	self->texs *= 2;
		826	}
		827
		828	{
		829	maptex *tex = self->tex + texid;
		830
498	f->name = name;	831	tex->name = name;
499	f->w = w;	832	tex->w = w;
500	f->h = h;	833	tex->h = h;
501	f->s = s;	834	tex->s = s;
502	f->t = t;	835	tex->t = t;
503	f->r = r;	836	tex->r = r;
504	f->g = g;	837	tex->g = g;
505	f->b = b;	838	tex->b = b;
506	f->a = a;	839	tex->a = a;
		840	}
507	}	841	}
		842
		843	int
		844	ox (CFClient::Map self)
		845	ALIAS:
		846	oy = 1
		847	CODE:
		848	switch (ix)
		849	{
		850	case 0: RETVAL = self->ox; break;
		851	case 1: RETVAL = self->oy; break;
		852	}
		853	OUTPUT:
		854	RETVAL
508		855
509	void	856	void
510	scroll (CFClient::Map self, int dx, int dy)	857	scroll (CFClient::Map self, int dx, int dy)
511	CODE:	858	CODE:
512	{	859	{
…		…
518	if (dy > 0)	865	if (dy > 0)
519	map_blank (self, self->x, self->y, self->w, dy - 1);	866	map_blank (self, self->x, self->y, self->w, dy - 1);
520	else if (dy < 0)	867	else if (dy < 0)
521	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	868	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);
522		869
523	self->x += dx;	870	self->ox += dx; self->x += dx;
524	self->y += dy;	871	self->oy += dy; self->y += dy;
525		872
526	while (self->y < 0)	873	while (self->y < 0)
527	{	874	{
528	Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y);	875	Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y);
529		876
…		…
536	map1a_update (CFClient::Map self, SV *data_)	883	map1a_update (CFClient::Map self, SV *data_)
537	CODE:	884	CODE:
538	{	885	{
539	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	886	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
540	uint8_t data_end = (uint8_t )SvEND (data_);	887	uint8_t data_end = (uint8_t )SvEND (data_);
541		888	mapcell *cell;
		889	int x, y, flags;
		890
542	while (data < data_end)	891	while (data < data_end)
543	{	892	{
544	int flags = (data [0] << 8) + data [1]; data += 2;	893	flags = (data [0] << 8) + data [1]; data += 2;
545		894
546	int x = ((flags >> 10) & 63) + self->x;	895	x = ((flags >> 10) & 63) + self->x;
547	int y = ((flags >> 4) & 63) + self->y;	896	y = ((flags >> 4) & 63) + self->y;
548		897
549	while (y >= self->rows)	898	cell = map_get_cell (self, x, y);
550	{
551	Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y);
552
553	self->rows += MAP_EXTEND_Y;
554	}
555
556	maprow *row = self->row + y;
557
558	if (!row->col)
559	{
560	Newz (0, row->col, MAP_EXTEND_X, mapcell);
561	row->c0 = self->x - MAP_EXTEND_X / 4;
562	row->c1 = row->c0 + MAP_EXTEND_X;
563	}
564
565	if (row->c0 > x)
566	{
567	int extend = row->c0 - x + MAP_EXTEND_X;
568	Prepend (mapcell, row->col, row->c1 - row->c0, extend);
569	row->c0 -= extend;
570	}
571	else if (x >= row->c1)
572	{
573	int extend = x - row->c1 + MAP_EXTEND_X;
574	Append (mapcell, row->col, row->c1 - row->c0, extend);
575	row->c1 += extend;
576	}
577
578	assert (y >= 0);
579	assert (y < self->rows);
580	assert (x >= row->c0);
581	assert (x < row->c1);
582	mapcell *cell = row->col + (x - row->c0);
583		899
584	if (flags & 15)	900	if (flags & 15)
585	{	901	{
586	if (cell->darkness < 0 && x < self->w && y < self->h)	902	if (cell->darkness < 0)
587	{	903	{
588	cell->darkness = 0;	904	cell->darkness = 0;
589	cell->face [0] = 0;	905	cell->face [0] = 0;
590	cell->face [1] = 0;	906	cell->face [1] = 0;
591	cell->face [2] = 0;	907	cell->face [2] = 0;
592	}	908	}
593		909
594	cell->darkness = flags & 8 ? *data++ : 255;	910	cell->darkness = flags & 8 ? *data++ : 255;
		911
		912	//TODO: don't trust server data to be in-range(!)
595		913
596	if (flags & 4)	914	if (flags & 4)
597	{	915	{
598	cell->face [0] = (data [0] << 8) + data [1]; data += 2;	916	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
599	}	917	}
600		918
601	if (flags & 2)	919	if (flags & 2)
602	{	920	{
603	cell->face [1] = (data [0] << 8) + data [1]; data += 2;	921	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;
604	}	922	}
605		923
606	if (flags & 1)	924	if (flags & 1)
607	{	925	{
608	cell->face [2] = (data [0] << 8) + data [1]; data += 2;	926	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
609	}	927	}
610	}	928	}
611	else	929	else
612	cell->darkness = -1;	930	cell->darkness = -1;
613	}	931	}
…		…
643	{	961	{
644	mapcell *cell = row->col + (x - row->c0);	962	mapcell *cell = row->col + (x - row->c0);
645		963
646	for (z = 0; z <= 0; z++)	964	for (z = 0; z <= 0; z++)
647	{	965	{
648	uint16_t face = cell->face [z];	966	mapface face = cell->face [z];
649		967
650	if (face)	968	if (face)
651	{	969	{
652	mapface tex = self->face [face];	970	maptex tex = self->tex [face];
653	int a0 = 255 - tex.a;	971	int a0 = 255 - tex.a;
654	int a1 = tex.a;	972	int a1 = tex.a;
655		973
656	r = (r * a0 + tex.r * a1) / 255;	974	r = (r * a0 + tex.r * a1) / 255;
657	g = (g * a0 + tex.g * a1) / 255;	975	g = (g * a0 + tex.g * a1) / 255;
…		…
675		993
676	void	994	void
677	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	995	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
678	PPCODE:	996	PPCODE:
679	{	997	{
		998	int vx, vy;
		999	int x, y, z;
		1000	int last_name;
		1001	mapface face;
680	int sw4 = (sw + 3) & ~3;	1002	int sw4 = (sw + 3) & ~3;
681	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1003	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
682	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);	1004	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
683		1005
		1006	memset (darkness, 255, sw4 * sh);
684	SvPOK_only (darkness_sv);	1007	SvPOK_only (darkness_sv);
685	SvCUR_set (darkness_sv, sw4 * sh);	1008	SvCUR_set (darkness_sv, sw4 * sh);
686		1009
687	int vx = self->x + (self->w - sw) / 2 - shift_x;	1010	vx = self->x + (self->w - sw) / 2 - shift_x;
688	int vy = self->y + (self->h - sh) / 2 - shift_y;	1011	vy = self->y + (self->h - sh) / 2 - shift_y;
689		1012
690	if (0)
691	{	1013	/*
692	int vx = self->vx = self->w >= sw	1014	int vx = self->vx = self->w >= sw
693	? self->x + (self->w - sw) / 2	1015	? self->x + (self->w - sw) / 2
694	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1016	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
695		1017
696	int vy = self->vy = self->h >= sh	1018	int vy = self->vy = self->h >= sh
697	? self->y + (self->h - sh) / 2	1019	? self->y + (self->h - sh) / 2
698	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1020	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
699	}	1021	*/
700		1022
701	glColor4ub (255, 255, 255, 255);	1023	glColor4ub (255, 255, 255, 255);
702		1024
703	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1025	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
704	glEnable (GL_BLEND);	1026	glEnable (GL_BLEND);
705	glEnable (GL_TEXTURE_2D);	1027	glEnable (GL_TEXTURE_2D);
706	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1028	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
707		1029
708	int x, y, z;
709
710	int last_name = 0;
711
712	glBegin (GL_QUADS);	1030	glBegin (GL_QUADS);
		1031
		1032	last_name = 0;
713		1033
714	for (z = 0; z < 3; z++)	1034	for (z = 0; z < 3; z++)
715	for (y = 0; y < sh; y++)	1035	for (y = 0; y < sh; y++)
716	if (0 <= y + vy && y + vy < self->rows)	1036	if (0 <= y + vy && y + vy < self->rows)
717	{	1037	{
…		…
724		1044
725	darkness[y * sw4 + x] = cell->darkness < 0	1045	darkness[y * sw4 + x] = cell->darkness < 0
726	? 255 - FOW_DARKNESS	1046	? 255 - FOW_DARKNESS
727	: 255 - cell->darkness;	1047	: 255 - cell->darkness;
728		1048
729	uint16_t face = cell->face [z];	1049	face = cell->face [z];
730		1050
731	if (face)	1051	if (face)
732	{	1052	{
733	mapface tex = self->face [face];	1053	maptex tex = self->tex [face];
734		1054
735	int px = (x + 1) * 32 - tex.w;	1055	int px = (x + 1) * 32 - tex.w;
736	int py = (y + 1) * 32 - tex.h;	1056	int py = (y + 1) * 32 - tex.h;
737		1057
738	if (last_name != tex.name)	1058	if (last_name != tex.name)
…		…
760	PUSHs (sv_2mortal (newSViv (sw4)));	1080	PUSHs (sv_2mortal (newSViv (sw4)));
761	PUSHs (sv_2mortal (newSViv (sh)));	1081	PUSHs (sv_2mortal (newSViv (sh)));
762	PUSHs (darkness_sv);	1082	PUSHs (darkness_sv);
763	}	1083	}
764		1084
		1085	SV *
		1086	get_rect (CFClient::Map self, int x0, int y0, int w, int h)
		1087	CODE:
		1088	{
		1089	int x, y, x1, y1;
		1090	SV data_sv = newSV (w h * 7 + 5);
		1091	uint8_t data = (uint8_t )SvPVX (data_sv);
		1092
		1093	data++ = 0; / version 0 format */
		1094	data++ = w >> 8; data++ = w;
		1095	data++ = h >> 8; data++ = h;
		1096
		1097	// we need to do this 'cause we don't keep an absolute coord system for rows
		1098	// TODO: treat rows as we treat
		1099	map_get_row (self, y0 + self->y - self->oy);//D
		1100	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
		1101
		1102	x0 += self->x - self->ox;
		1103	y0 += self->y - self->oy;
		1104
		1105	x1 = x0 + w;
		1106	y1 = y0 + h;
		1107
		1108	for (y = y0; y < y1; y++)
		1109	{
		1110	maprow *row = 0 <= y && y < self->rows
		1111	? self->row + y
		1112	: 0;
		1113
		1114	for (x = x0; x < x1; x++)
		1115	{
		1116	if (row && row->c0 <= x && x < row->c1)
		1117	{
		1118	mapcell *cell = row->col + (x - row->c0);
		1119	uint8_t flags = 0;
		1120
		1121	if (cell->face [0]) flags \|= 1;
		1122	if (cell->face [1]) flags \|= 2;
		1123	if (cell->face [2]) flags \|= 4;
		1124
		1125	*data++ = flags;
		1126
		1127	if (flags & 1)
		1128	{
		1129	*data++ = cell->face [0] >> 8;
		1130	*data++ = cell->face [0];
		1131	}
		1132
		1133	if (flags & 2)
		1134	{
		1135	*data++ = cell->face [1] >> 8;
		1136	*data++ = cell->face [1];
		1137	}
		1138
		1139	if (flags & 4)
		1140	{
		1141	*data++ = cell->face [2] >> 8;
		1142	*data++ = cell->face [2];
		1143	}
		1144	}
		1145	else
		1146	*data++ = 0;
		1147	}
		1148	}
		1149
		1150	SvPOK_only (data_sv);
		1151	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		1152	RETVAL = data_sv;
		1153	}
		1154	OUTPUT:
		1155	RETVAL
		1156
		1157	void
		1158	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)
		1159	PPCODE:
		1160	{
		1161	int x, y, z;
		1162	int w, h;
		1163	int x1, y1;
		1164
		1165	if (*data++ != 0)
		1166	return; /* version mismatch */
		1167
		1168	w = data++ << 8; w \|= data++;
		1169	h = data++ << 8; h \|= data++;
		1170
		1171	// we need to do this 'cause we don't keep an absolute coord system for rows
		1172	// TODO: treat rows as we treat
		1173	map_get_row (self, y0 + self->y - self->oy);//D
		1174	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
		1175
		1176	x0 += self->x - self->ox;
		1177	y0 += self->y - self->oy;
		1178
		1179	x1 = x0 + w;
		1180	y1 = y0 + h;
		1181
		1182	for (y = y0; y < y1; y++)
		1183	{
		1184	maprow *row = map_get_row (self, y);
		1185
		1186	for (x = x0; x < x1; x++)
		1187	{
		1188	uint8_t flags = *data++;
		1189
		1190	if (flags)
		1191	{
		1192	mapface face[3] = { 0, 0, 0 };
		1193
		1194	mapcell *cell = row_get_cell (row, x);
		1195
		1196	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
		1197	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
		1198	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
		1199
		1200	if (cell->darkness <= 0)
		1201	{
		1202	cell->darkness = -1;
		1203
		1204	for (z = 0; z <= 2; z++)
		1205	{
		1206	cell->face[z] = face[z];
		1207
		1208	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))
		1209	XPUSHs (sv_2mortal (newSViv (face[z])));
		1210	}
		1211	}
		1212	}
		1213	}
		1214	}
		1215	}
		1216
		1217	MODULE = CFClient PACKAGE = CFClient::MixChunk
		1218
		1219	CFClient::MixChunk
		1220	new_from_file (SV class, char path)
		1221	CODE:
		1222	RETVAL = Mix_LoadWAV (path);
		1223	OUTPUT:
		1224	RETVAL
		1225
		1226	void
		1227	DESTROY (CFClient::MixChunk self)
		1228	CODE:
		1229	Mix_FreeChunk (self);
		1230
		1231	int
		1232	volume (CFClient::MixChunk self, int volume = -1)
		1233	CODE:
		1234	RETVAL = Mix_VolumeChunk (self, volume);
		1235	OUTPUT:
		1236	RETVAL
		1237
		1238	int
		1239	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
		1240	CODE:
		1241	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
		1242	OUTPUT:
		1243	RETVAL
		1244
		1245	MODULE = CFClient PACKAGE = CFClient::MixMusic
		1246
		1247	int
		1248	volume (int volume = -1)
		1249	CODE:
		1250	RETVAL = Mix_VolumeMusic (volume);
		1251	OUTPUT:
		1252	RETVAL
		1253
		1254	CFClient::MixMusic
		1255	new_from_file (SV class, char path)
		1256	CODE:
		1257	RETVAL = Mix_LoadMUS (path);
		1258	OUTPUT:
		1259	RETVAL
		1260
		1261	void
		1262	DESTROY (CFClient::MixMusic self)
		1263	CODE:
		1264	Mix_FreeMusic (self);
		1265
		1266	int
		1267	play (CFClient::MixMusic self, int loops = -1)
		1268	CODE:
		1269	RETVAL = Mix_PlayMusic (self, loops);
		1270	OUTPUT:
		1271	RETVAL
		1272

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.41 by root, Sat Apr 15 01:52:53 2006 UTC vs. Revision 1.53 by root, Wed Apr 19 21:38:04 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.41 by root, Sat Apr 15 01:52:53 2006 UTC vs.
Revision 1.53 by root, Wed Apr 19 21:38:04 2006 UTC