[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.49 by root, Tue Apr 18 01:36:12 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>
13		17
14	#include <pango/pango.h>	18	#include <pango/pango.h>
15	#include <pango/pangofc-fontmap.h>	19	#include <pango/pangofc-fontmap.h>
16	#include <pango/pangoft2.h>	20	#include <pango/pangoft2.h>
17		21
		22	#ifndef _WIN32
18	#include <sys/types.h>	23	# include <sys/types.h>
19	#include <sys/socket.h>	24	# include <sys/socket.h>
20	#include <netinet/in.h>	25	# include <netinet/in.h>
21	#include <netinet/tcp.h>	26	# include <netinet/tcp.h>
22
23	#include <inttypes.h>	27	# include <inttypes.h>
		28	#else
		29	typedef unsigned char uint8_t;
		30	typedef unsigned short uint16_t;
		31	typedef unsigned int uint32_t;
		32	typedef signed char int8_t;
		33	typedef signed short int16_t;
		34	typedef signed int int32_t;
		35	#endif
24		36
25	#define FOW_DARKNESS 32	37	#define FOW_DARKNESS 32
26		38
27	#define MAP_EXTEND_X 32	39	#define MAP_EXTEND_X 32
28	#define MAP_EXTEND_Y 512	40	#define MAP_EXTEND_Y 512
…		…
47	{	59	{
48	/* use a random scale factor to account for unknown descenders, 0.8 works	60	/* use a random scale factor to account for unknown descenders, 0.8 works
49	* reasonably well with bitstream vera	61	* reasonably well with bitstream vera
50	*/	62	*/
51	PangoFontDescription *font = pango_context_get_font_description (context);	63	PangoFontDescription *font = pango_context_get_font_description (context);
52	pango_font_description_set_absolute_size (font, self->base_height * (PANGO_SCALE * 8 / 10));	64
		65	int height = self->base_height * (PANGO_SCALE * 8 / 10);
		66
		67	if (pango_font_description_get_size (font) != height)
		68	{
		69	pango_font_description_set_absolute_size (font, height);
		70	pango_layout_context_changed (self->pl);
		71	}
53	}	72	}
54		73
55	static void	74	static void
56	layout_get_pixel_size (CFClient__Layout self, int w, int h)	75	layout_get_pixel_size (CFClient__Layout self, int w, int h)
57	{	76	{
…		…
61		80
62	w = (w + 3) & ~3;	81	w = (w + 3) & ~3;
63	if (!w) w = 1;	82	if (!w) w = 1;
64	if (!h) h = 1;	83	if (!h) h = 1;
65	}	84	}
		85
		86	typedef uint16_t mapface;
66		87
67	typedef struct {	88	typedef struct {
68	GLint name;	89	GLint name;
69	int w, h;	90	int w, h;
70	float s, t;	91	float s, t;
71	uint8_t r, g, b, a;	92	uint8_t r, g, b, a;
72	} mapface;	93	} maptex;
73		94
74	typedef struct {	95	typedef struct {
75	int16_t darkness;	96	int16_t darkness;
76	uint16_t face[3];	97	mapface face[3];
77	} mapcell;	98	} mapcell;
78		99
79	typedef struct {	100	typedef struct {
80	int32_t c0, c1;	101	int32_t c0, c1;
81	mapcell *col;	102	mapcell *col;
82	} maprow;	103	} maprow;
83		104
84	typedef struct map {	105	typedef struct map {
85	int x, y, w, h;	106	int x, y, w, h;
86	int vx, vy;	107	int ox, oy; /* offset to virtual global coordinate system */
87	int faces;	108	int faces;
88	mapface *face;	109	mapface *face;
89		110
		111	int texs;
		112	maptex *tex;
		113
90	uint32_t rows;	114	int32_t rows;
91	maprow *row;	115	maprow *row;
92	} *CFClient__Map;	116	} *CFClient__Map;
93		117
94	static char *	118	static char *
95	prepend (char *ptr, int sze, int inc)	119	prepend (char *ptr, int sze, int inc)
…		…
114	}	138	}
115		139
116	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	140	#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))	141	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
118		142
		143	static maprow *
		144	map_get_row (CFClient__Map self, int y)
		145	{
		146	if (0 > y)
		147	{
		148	int extend = - y + MAP_EXTEND_Y;
		149	Prepend (maprow, self->row, self->rows, extend);
		150
		151	self->rows += extend;
		152	self->y += extend;
		153	y += extend;
		154	}
		155	else if (y >= self->rows)
		156	{
		157	int extend = y - self->rows + MAP_EXTEND_Y;
		158	Append (maprow, self->row, self->rows, extend);
		159	self->rows += extend;
		160	}
		161
		162	return self->row + y;
		163	}
		164
		165	static mapcell *
		166	row_get_cell (maprow *row, int x)
		167	{
		168	if (!row->col)
		169	{
		170	Newz (0, row->col, MAP_EXTEND_X, mapcell);
		171	row->c0 = x - MAP_EXTEND_X / 4;
		172	row->c1 = row->c0 + MAP_EXTEND_X;
		173	}
		174
		175	if (row->c0 > x)
		176	{
		177	int extend = row->c0 - x + MAP_EXTEND_X;
		178	Prepend (mapcell, row->col, row->c1 - row->c0, extend);
		179	row->c0 -= extend;
		180	}
		181	else if (x >= row->c1)
		182	{
		183	int extend = x - row->c1 + MAP_EXTEND_X;
		184	Append (mapcell, row->col, row->c1 - row->c0, extend);
		185	row->c1 += extend;
		186	}
		187
		188	return row->col + (x - row->c0);
		189	}
		190
		191	static mapcell *
		192	map_get_cell (CFClient__Map self, int x, int y)
		193	{
		194	return row_get_cell (map_get_row (self, y), x);
		195	}
		196
119	static void	197	static void
120	map_clear (CFClient__Map self)	198	map_clear (CFClient__Map self)
121	{	199	{
122	int r;	200	int r;
123		201
…		…
126		204
127	Safefree (self->row);	205	Safefree (self->row);
128		206
129	self->x = 0;	207	self->x = 0;
130	self->y = 0;	208	self->y = 0;
131	self->vx = 0;	209	self->ox = 0;
132	self->vy = 0;	210	self->oy = 0;
133	self->row = 0;	211	self->row = 0;
134	self->rows = 0;	212	self->rows = 0;
135	}	213	}
136		214
137	static void	215	static void
138	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	216	map_blank (CFClient__Map self, int x0, int y0, int w, int h)
139	{	217	{
140	int x, y;	218	int x, y;
		219	maprow *row;
141		220
142	for (y = y0; y < y0 + h; y++)	221	for (y = y0; y < y0 + h; y++)
143	if (y >= 0)	222	if (y >= 0)
144	{	223	{
145	if (y >= self->rows)	224	if (y >= self->rows)
146	break;	225	break;
147		226
148	maprow *row = self->row + y;	227	row = self->row + y;
149		228
150	for (x = x0; x < x0 + w; x++)	229	for (x = x0; x < x0 + w; x++)
151	if (x >= row->c0)	230	if (x >= row->c0)
152	{	231	{
153	if (x >= row->c1)	232	if (x >= row->c1)
…		…
170	}	249	}
171		250
172	void	251	void
173	lowdelay (int fd, int val = 1)	252	lowdelay (int fd, int val = 1)
174	CODE:	253	CODE:
		254	#ifndef _WIN32
175	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	255	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
		256	#endif
176		257
177	char *	258	char *
178	gl_version ()	259	gl_version ()
179	CODE:	260	CODE:
180	RETVAL = (char *)glGetString (GL_VERSION);	261	RETVAL = (char *)glGetString (GL_VERSION);
…		…
226	croak ("load_image: %s", SDL_GetError ());	307	croak ("load_image: %s", SDL_GetError ());
227		308
228	fmt.palette = NULL;	309	fmt.palette = NULL;
229	fmt.BitsPerPixel = 32;	310	fmt.BitsPerPixel = 32;
230	fmt.BytesPerPixel = 4;	311	fmt.BytesPerPixel = 4;
		312	#if SDL_BYTEORDER == SDL_LIL_ENDIAN
231	fmt.Rmask = 0x000000ff;	313	fmt.Rmask = 0x000000ff;
232	fmt.Gmask = 0x0000ff00;	314	fmt.Gmask = 0x0000ff00;
233	fmt.Bmask = 0x00ff0000;	315	fmt.Bmask = 0x00ff0000;
234	fmt.Amask = 0xff000000;	316	fmt.Amask = 0xff000000;
		317	#else
		318	fmt.Rmask = 0xff000000;
		319	fmt.Gmask = 0x00ff0000;
		320	fmt.Bmask = 0x0000ff00;
		321	fmt.Amask = 0x000000ff;
		322	#endif
235	fmt.Rloss = 0;	323	fmt.Rloss = 0;
236	fmt.Gloss = 0;	324	fmt.Gloss = 0;
237	fmt.Bloss = 0;	325	fmt.Bloss = 0;
238	fmt.Aloss = 0;	326	fmt.Aloss = 0;
239	fmt.Rshift = 0;	327	fmt.Rshift = 0;
…		…
253	SDL_LockSurface (surface2);	341	SDL_LockSurface (surface2);
254	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	342	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
255	SDL_UnlockSurface (surface2);	343	SDL_UnlockSurface (surface2);
256	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	344	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
257	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	345	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
258	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_INT_8_8_8_8_REV)));	346	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
259		347
260	SDL_FreeSurface (surface);	348	SDL_FreeSurface (surface);
261	SDL_FreeSurface (surface2);	349	SDL_FreeSurface (surface2);
262	}	350	}
263		351
…		…
331	STRLEN textlen;	419	STRLEN textlen;
332	char *text = SvPVutf8 (text_, textlen);	420	char *text = SvPVutf8 (text_, textlen);
333		421
334	pango_layout_set_markup (self->pl, text, textlen);	422	pango_layout_set_markup (self->pl, text, textlen);
335	}	423	}
		424
		425	SV *
		426	get_text (CFClient::Layout self)
		427	CODE:
		428	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
		429	SvUTF8_on (RETVAL);
		430	OUTPUT:
		431	RETVAL
336		432
337	void	433	void
338	set_height (CFClient::Layout self, int base_height)	434	set_height (CFClient::Layout self, int base_height)
339	CODE:	435	CODE:
340	self->base_height = base_height;	436	self->base_height = base_height;
…		…
454		550
455	CFClient::Map	551	CFClient::Map
456	new (SV *class, int map_width, int map_height)	552	new (SV *class, int map_width, int map_height)
457	CODE:	553	CODE:
458	New (0, RETVAL, 1, struct map);	554	New (0, RETVAL, 1, struct map);
459	RETVAL->x = 0;	555	RETVAL->x = 0;
460	RETVAL->y = 0;	556	RETVAL->y = 0;
461	RETVAL->w = map_width;	557	RETVAL->w = map_width;
462	RETVAL->h = map_height;	558	RETVAL->h = map_height;
463	RETVAL->vx = 0;	559	RETVAL->ox = 0;
464	RETVAL->vy = 0;	560	RETVAL->oy = 0;
465	RETVAL->faces = 8192;	561	RETVAL->faces = 8192;
466	Newz (0, RETVAL->face, RETVAL->faces, mapface);	562	Newz (0, RETVAL->face, RETVAL->faces, mapface);
		563	RETVAL->texs = 8192;
		564	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
467	RETVAL->rows = 0;	565	RETVAL->rows = 0;
468	RETVAL->row = 0;	566	RETVAL->row = 0;
469	OUTPUT:	567	OUTPUT:
470	RETVAL	568	RETVAL
471		569
…		…
482	clear (CFClient::Map self)	580	clear (CFClient::Map self)
483	CODE:	581	CODE:
484	map_clear (self);	582	map_clear (self);
485		583
486	void	584	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)	585	set_face (CFClient::Map self, int face, int texid)
488	CODE:	586	CODE:
489	{	587	{
490	while (self->faces < face)	588	while (self->faces <= face)
491	{	589	{
492	Append (mapface, self->face, self->faces, self->faces);	590	Append (mapface, self->face, self->faces, self->faces);
493	self->faces *= 2;	591	self->faces *= 2;
494	}	592	}
495		593
496	mapface *f = self->face + face;	594	self->face [face] = texid;
		595	}
497		596
		597	void
		598	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)
		599	CODE:
		600	{
		601	while (self->texs <= texid)
		602	{
		603	Append (maptex, self->tex, self->texs, self->texs);
		604	self->texs *= 2;
		605	}
		606
		607	{
		608	maptex *tex = self->tex + texid;
		609
498	f->name = name;	610	tex->name = name;
499	f->w = w;	611	tex->w = w;
500	f->h = h;	612	tex->h = h;
501	f->s = s;	613	tex->s = s;
502	f->t = t;	614	tex->t = t;
503	f->r = r;	615	tex->r = r;
504	f->g = g;	616	tex->g = g;
505	f->b = b;	617	tex->b = b;
506	f->a = a;	618	tex->a = a;
		619	}
507	}	620	}
		621
		622	int
		623	ox (CFClient::Map self)
		624	ALIAS:
		625	oy = 1
		626	CODE:
		627	switch (ix)
		628	{
		629	case 0: RETVAL = self->ox; break;
		630	case 1: RETVAL = self->oy; break;
		631	}
		632	OUTPUT:
		633	RETVAL
508		634
509	void	635	void
510	scroll (CFClient::Map self, int dx, int dy)	636	scroll (CFClient::Map self, int dx, int dy)
511	CODE:	637	CODE:
512	{	638	{
…		…
518	if (dy > 0)	644	if (dy > 0)
519	map_blank (self, self->x, self->y, self->w, dy - 1);	645	map_blank (self, self->x, self->y, self->w, dy - 1);
520	else if (dy < 0)	646	else if (dy < 0)
521	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	647	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);
522		648
523	self->x += dx;	649	self->ox += dx; self->x += dx;
524	self->y += dy;	650	self->oy += dy; self->y += dy;
525		651
526	while (self->y < 0)	652	while (self->y < 0)
527	{	653	{
528	Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y);	654	Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y);
529		655
…		…
536	map1a_update (CFClient::Map self, SV *data_)	662	map1a_update (CFClient::Map self, SV *data_)
537	CODE:	663	CODE:
538	{	664	{
539	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	665	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
540	uint8_t data_end = (uint8_t )SvEND (data_);	666	uint8_t data_end = (uint8_t )SvEND (data_);
541		667	mapcell *cell;
		668	int x, y, flags;
		669
542	while (data < data_end)	670	while (data < data_end)
543	{	671	{
544	int flags = (data [0] << 8) + data [1]; data += 2;	672	flags = (data [0] << 8) + data [1]; data += 2;
545		673
546	int x = ((flags >> 10) & 63) + self->x;	674	x = ((flags >> 10) & 63) + self->x;
547	int y = ((flags >> 4) & 63) + self->y;	675	y = ((flags >> 4) & 63) + self->y;
548		676
549	while (y >= self->rows)	677	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		678
584	if (flags & 15)	679	if (flags & 15)
585	{	680	{
586	if (cell->darkness < 0 && x < self->w && y < self->h)	681	if (cell->darkness < 0)
587	{	682	{
588	cell->darkness = 0;	683	cell->darkness = 0;
589	cell->face [0] = 0;	684	cell->face [0] = 0;
590	cell->face [1] = 0;	685	cell->face [1] = 0;
591	cell->face [2] = 0;	686	cell->face [2] = 0;
592	}	687	}
593		688
594	cell->darkness = flags & 8 ? *data++ : 255;	689	cell->darkness = flags & 8 ? *data++ : 255;
		690
		691	//TODO: don't trust server data to be in-range(!)
595		692
596	if (flags & 4)	693	if (flags & 4)
597	{	694	{
598	cell->face [0] = (data [0] << 8) + data [1]; data += 2;	695	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
599	}	696	}
600		697
601	if (flags & 2)	698	if (flags & 2)
602	{	699	{
603	cell->face [1] = (data [0] << 8) + data [1]; data += 2;	700	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;
604	}	701	}
605		702
606	if (flags & 1)	703	if (flags & 1)
607	{	704	{
608	cell->face [2] = (data [0] << 8) + data [1]; data += 2;	705	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
609	}	706	}
610	}	707	}
611	else	708	else
612	cell->darkness = -1;	709	cell->darkness = -1;
613	}	710	}
…		…
643	{	740	{
644	mapcell *cell = row->col + (x - row->c0);	741	mapcell *cell = row->col + (x - row->c0);
645		742
646	for (z = 0; z <= 0; z++)	743	for (z = 0; z <= 0; z++)
647	{	744	{
648	uint16_t face = cell->face [z];	745	mapface face = cell->face [z];
649		746
650	if (face)	747	if (face)
651	{	748	{
652	mapface tex = self->face [face];	749	maptex tex = self->tex [face];
653	int a0 = 255 - tex.a;	750	int a0 = 255 - tex.a;
654	int a1 = tex.a;	751	int a1 = tex.a;
655		752
656	r = (r * a0 + tex.r * a1) / 255;	753	r = (r * a0 + tex.r * a1) / 255;
657	g = (g * a0 + tex.g * a1) / 255;	754	g = (g * a0 + tex.g * a1) / 255;
…		…
675		772
676	void	773	void
677	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	774	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
678	PPCODE:	775	PPCODE:
679	{	776	{
		777	int vx, vy;
		778	int x, y, z;
		779	int last_name;
		780	mapface face;
680	int sw4 = (sw + 3) & ~3;	781	int sw4 = (sw + 3) & ~3;
681	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	782	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
682	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);	783	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
683		784
		785	memset (darkness, 255, sw4 * sh);
684	SvPOK_only (darkness_sv);	786	SvPOK_only (darkness_sv);
685	SvCUR_set (darkness_sv, sw4 * sh);	787	SvCUR_set (darkness_sv, sw4 * sh);
686		788
687	int vx = self->x + (self->w - sw) / 2 - shift_x;	789	vx = self->x + (self->w - sw) / 2 - shift_x;
688	int vy = self->y + (self->h - sh) / 2 - shift_y;	790	vy = self->y + (self->h - sh) / 2 - shift_y;
689		791
690	if (0)
691	{	792	/*
692	int vx = self->vx = self->w >= sw	793	int vx = self->vx = self->w >= sw
693	? self->x + (self->w - sw) / 2	794	? self->x + (self->w - sw) / 2
694	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	795	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
695		796
696	int vy = self->vy = self->h >= sh	797	int vy = self->vy = self->h >= sh
697	? self->y + (self->h - sh) / 2	798	? self->y + (self->h - sh) / 2
698	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	799	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
699	}	800	*/
700		801
701	glColor4ub (255, 255, 255, 255);	802	glColor4ub (255, 255, 255, 255);
702		803
703	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	804	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
704	glEnable (GL_BLEND);	805	glEnable (GL_BLEND);
705	glEnable (GL_TEXTURE_2D);	806	glEnable (GL_TEXTURE_2D);
706	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	807	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
707		808
708	int x, y, z;
709
710	int last_name = 0;
711
712	glBegin (GL_QUADS);	809	glBegin (GL_QUADS);
		810
		811	last_name = 0;
713		812
714	for (z = 0; z < 3; z++)	813	for (z = 0; z < 3; z++)
715	for (y = 0; y < sh; y++)	814	for (y = 0; y < sh; y++)
716	if (0 <= y + vy && y + vy < self->rows)	815	if (0 <= y + vy && y + vy < self->rows)
717	{	816	{
…		…
724		823
725	darkness[y * sw4 + x] = cell->darkness < 0	824	darkness[y * sw4 + x] = cell->darkness < 0
726	? 255 - FOW_DARKNESS	825	? 255 - FOW_DARKNESS
727	: 255 - cell->darkness;	826	: 255 - cell->darkness;
728		827
729	uint16_t face = cell->face [z];	828	face = cell->face [z];
730		829
731	if (face)	830	if (face)
732	{	831	{
733	mapface tex = self->face [face];	832	maptex tex = self->tex [face];
734		833
735	int px = (x + 1) * 32 - tex.w;	834	int px = (x + 1) * 32 - tex.w;
736	int py = (y + 1) * 32 - tex.h;	835	int py = (y + 1) * 32 - tex.h;
737		836
738	if (last_name != tex.name)	837	if (last_name != tex.name)
…		…
760	PUSHs (sv_2mortal (newSViv (sw4)));	859	PUSHs (sv_2mortal (newSViv (sw4)));
761	PUSHs (sv_2mortal (newSViv (sh)));	860	PUSHs (sv_2mortal (newSViv (sh)));
762	PUSHs (darkness_sv);	861	PUSHs (darkness_sv);
763	}	862	}
764		863
		864	SV *
		865	get_rect (CFClient::Map self, int x0, int y0, int w, int h)
		866	CODE:
		867	{
		868	int x, y, x1, y1;
		869	SV data_sv = newSV (w h * 7 + 5);
		870	uint8_t data = (uint8_t )SvPVX (data_sv);
		871
		872	data++ = 0; / version 0 format */
		873	data++ = w >> 8; data++ = w;
		874	data++ = h >> 8; data++ = h;
		875
		876	// we need to do this 'cause we don't keep an absolute coord system for rows
		877	// TODO: treat rows as we treat
		878	map_get_row (self, y0 + self->y - self->oy);//D
		879	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
		880
		881	x0 += self->x - self->ox;
		882	y0 += self->y - self->oy;
		883
		884	x1 = x0 + w;
		885	y1 = y0 + h;
		886
		887	for (y = y0; y < y1; y++)
		888	{
		889	maprow *row = 0 <= y && y < self->rows
		890	? self->row + y
		891	: 0;
		892
		893	for (x = x0; x < x1; x++)
		894	{
		895	if (row && row->c0 <= x && x < row->c1)
		896	{
		897	mapcell *cell = row->col + (x - row->c0);
		898	uint8_t flags = 0;
		899
		900	if (cell->face [0]) flags \|= 1;
		901	if (cell->face [1]) flags \|= 2;
		902	if (cell->face [2]) flags \|= 4;
		903
		904	*data++ = flags;
		905
		906	if (flags & 1)
		907	{
		908	*data++ = cell->face [0] >> 8;
		909	*data++ = cell->face [0];
		910	}
		911
		912	if (flags & 2)
		913	{
		914	*data++ = cell->face [1] >> 8;
		915	*data++ = cell->face [1];
		916	}
		917
		918	if (flags & 4)
		919	{
		920	*data++ = cell->face [2] >> 8;
		921	*data++ = cell->face [2];
		922	}
		923	}
		924	else
		925	*data++ = 0;
		926	}
		927	}
		928
		929	SvPOK_only (data_sv);
		930	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		931	RETVAL = data_sv;
		932	}
		933	OUTPUT:
		934	RETVAL
		935
		936	void
		937	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)
		938	PPCODE:
		939	{
		940	int x, y, z;
		941	int w, h;
		942	int x1, y1;
		943
		944	if (*data++ != 0)
		945	return; /* version mismatch */
		946
		947	w = data++ << 8; w \|= data++;
		948	h = data++ << 8; h \|= data++;
		949
		950	// we need to do this 'cause we don't keep an absolute coord system for rows
		951	// TODO: treat rows as we treat
		952	map_get_row (self, y0 + self->y - self->oy);//D
		953	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
		954
		955	x0 += self->x - self->ox;
		956	y0 += self->y - self->oy;
		957
		958	x1 = x0 + w;
		959	y1 = y0 + h;
		960
		961	for (y = y0; y < y1; y++)
		962	{
		963	maprow *row = map_get_row (self, y);
		964
		965	for (x = x0; x < x1; x++)
		966	{
		967	uint8_t flags = *data++;
		968
		969	if (flags)
		970	{
		971	mapface face[3] = { 0, 0, 0 };
		972
		973	mapcell *cell = row_get_cell (row, x);
		974
		975	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
		976	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
		977	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
		978
		979	if (cell->darkness <= 0)
		980	{
		981	cell->darkness = -1;
		982
		983	for (z = 0; z <= 2; z++)
		984	{
		985	cell->face[z] = face[z];
		986
		987	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))
		988	XPUSHs (sv_2mortal (newSViv (face[z])));
		989	}
		990	}
		991	}
		992	}
		993	}
		994	}
		995

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.49 by root, Tue Apr 18 01:36:12 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.49 by root, Tue Apr 18 01:36:12 2006 UTC