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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.40 by root, Sat Apr 15 01:13:46 2006 UTC vs.
Revision 1.43 by root, Mon Apr 17 06:50:26 2006 UTC

…		…
62	w = (w + 3) & ~3;	62	w = (w + 3) & ~3;
63	if (!w) w = 1;	63	if (!w) w = 1;
64	if (!h) h = 1;	64	if (!h) h = 1;
65	}	65	}
66		66
		67	typedef uint16_t mapface;
		68
67	typedef struct {	69	typedef struct {
68	GLint name;	70	GLint name;
69	int w, h;	71	int w, h;
70	float s, t;	72	float s, t;
71	uint8_t r, g, b, a;	73	uint8_t r, g, b, a;
72	} mapface;	74	} maptex;
73		75
74	typedef struct {	76	typedef struct {
75	int16_t darkness;	77	int16_t darkness;
76	uint16_t face[3];	78	mapface face[3];
77	} mapcell;	79	} mapcell;
78		80
79	typedef struct {	81	typedef struct {
80	int32_t c0, c1;	82	int32_t c0, c1;
81	mapcell *col;	83	mapcell *col;
82	} maprow;	84	} maprow;
83		85
84	typedef struct map {	86	typedef struct map {
85	int x, y, w, h;	87	int x, y, w, h;
86	int vx, vy;	88	int dx, dy; /* delayed map scrolling */
		89	int ox, oy; /* offset to virtual global coordinate system */
87	int faces;	90	int faces;
88	mapface *face;	91	mapface *face;
		92
		93	int texs;
		94	maptex *tex;
89		95
90	uint32_t rows;	96	uint32_t rows;
91	maprow *row;	97	maprow *row;
92	} *CFClient__Map;	98	} *CFClient__Map;
93		99
…		…
114	}	120	}
115		121
116	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	122	#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))	123	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
118		124
		125	static maprow *
		126	map_get_row (CFClient__Map self, int y)
		127	{
		128	if (0 > y)
		129	{
		130	int extend = - y + MAP_EXTEND_Y;
		131	Prepend (maprow, self->row, self->rows, extend);
		132
		133	self->rows += extend;
		134	self->y += extend;
		135	y += extend;
		136	}
		137	else if (y >= self->rows)
		138	{
		139	int extend = y - self->rows + MAP_EXTEND_Y;
		140	Append (maprow, self->row, self->rows, extend);
		141	self->rows += extend;
		142	}
		143
		144	return self->row + y;
		145	}
		146
		147	static mapcell *
		148	row_get_cell (maprow *row, int x)
		149	{
		150	if (!row->col)
		151	{
		152	Newz (0, row->col, MAP_EXTEND_X, mapcell);
		153	row->c0 = x - MAP_EXTEND_X / 4;
		154	row->c1 = row->c0 + MAP_EXTEND_X;
		155	}
		156
		157	if (row->c0 > x)
		158	{
		159	int extend = row->c0 - x + MAP_EXTEND_X;
		160	Prepend (mapcell, row->col, row->c1 - row->c0, extend);
		161	row->c0 -= extend;
		162	}
		163	else if (x >= row->c1)
		164	{
		165	int extend = x - row->c1 + MAP_EXTEND_X;
		166	Append (mapcell, row->col, row->c1 - row->c0, extend);
		167	row->c1 += extend;
		168	}
		169
		170	return row->col + (x - row->c0);
		171	}
		172
		173	static mapcell *
		174	map_get_cell (CFClient__Map self, int x, int y)
		175	{
		176	return row_get_cell (map_get_row (self, y), x);
		177	}
		178
119	static void	179	static void
120	map_clear (CFClient__Map self)	180	map_clear (CFClient__Map self)
121	{	181	{
122	int r;	182	int r;
123		183
…		…
126		186
127	Safefree (self->row);	187	Safefree (self->row);
128		188
129	self->x = 0;	189	self->x = 0;
130	self->y = 0;	190	self->y = 0;
131	self->vx = 0;	191	self->ox = 0;
132	self->vy = 0;	192	self->oy = 0;
133	self->row = 0;	193	self->row = 0;
134	self->rows = 0;	194	self->rows = 0;
135	}	195	}
136		196
137	static void	197	static void
…		…
217	SDL_RWops *rw = ix	277	SDL_RWops *rw = ix
218	? SDL_RWFromFile (image, "r")	278	? SDL_RWFromFile (image, "r")
219	: SDL_RWFromConstMem (image, image_len);	279	: SDL_RWFromConstMem (image, image_len);
220		280
221	if (!rw)	281	if (!rw)
222	croak ("load_image: unable to open file");	282	croak ("load_image: %s", SDL_GetError ());
223		283
224	surface = IMG_Load_RW (rw, 1);	284	surface = IMG_Load_RW (rw, 1);
225	if (!surface)	285	if (!surface)
226	croak ("load_image: unable to read file");	286	croak ("load_image: %s", SDL_GetError ());
227		287
228	fmt.palette = NULL;	288	fmt.palette = NULL;
229	fmt.BitsPerPixel = 32;	289	fmt.BitsPerPixel = 32;
230	fmt.BytesPerPixel = 4;	290	fmt.BytesPerPixel = 4;
231	fmt.Rmask = 0x000000ff;	291	fmt.Rmask = 0x000000ff;
…		…
454		514
455	CFClient::Map	515	CFClient::Map
456	new (SV *class, int map_width, int map_height)	516	new (SV *class, int map_width, int map_height)
457	CODE:	517	CODE:
458	New (0, RETVAL, 1, struct map);	518	New (0, RETVAL, 1, struct map);
459	RETVAL->x = 0;	519	RETVAL->x = 0;
460	RETVAL->y = 0;	520	RETVAL->y = 0;
461	RETVAL->w = map_width;	521	RETVAL->w = map_width;
462	RETVAL->h = map_height;	522	RETVAL->h = map_height;
463	RETVAL->vx = 0;	523	RETVAL->ox = 0;
464	RETVAL->vy = 0;	524	RETVAL->oy = 0;
465	RETVAL->faces = 8192;	525	RETVAL->faces = 8192;
466	Newz (0, RETVAL->face, RETVAL->faces, mapface);	526	Newz (0, RETVAL->face, RETVAL->faces, mapface);
		527	RETVAL->texs = 8192;
		528	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
467	RETVAL->rows = 0;	529	RETVAL->rows = 0;
468	RETVAL->row = 0;	530	RETVAL->row = 0;
469	OUTPUT:	531	OUTPUT:
470	RETVAL	532	RETVAL
471		533
…		…
482	clear (CFClient::Map self)	544	clear (CFClient::Map self)
483	CODE:	545	CODE:
484	map_clear (self);	546	map_clear (self);
485		547
486	void	548	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)	549	set_face (CFClient::Map self, int face, int texid)
488	CODE:	550	CODE:
489	{	551	{
490	while (self->faces < face)	552	while (self->faces <= face)
491	{	553	{
492	Append (mapface, self->face, self->faces, self->faces);	554	Append (mapface, self->face, self->faces, self->faces);
493	self->faces *= 2;	555	self->faces *= 2;
494	}	556	}
495		557
496	mapface *f = self->face + face;	558	self->face [face] = texid;
		559	}
497		560
		561	void
		562	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)
		563	CODE:
		564	{
		565	while (self->texs <= texid)
		566	{
		567	Append (maptex, self->tex, self->texs, self->texs);
		568	self->texs *= 2;
		569	}
		570
		571	maptex *tex = self->tex + texid;
		572
498	f->name = name;	573	tex->name = name;
499	f->w = w;	574	tex->w = w;
500	f->h = h;	575	tex->h = h;
501	f->s = s;	576	tex->s = s;
502	f->t = t;	577	tex->t = t;
503	f->r = r;	578	tex->r = r;
504	f->g = g;	579	tex->g = g;
505	f->b = b;	580	tex->b = b;
506	f->a = a;	581	tex->a = a;
507	}	582	}
		583
		584	int
		585	ox (CFClient::Map self)
		586	ALIAS:
		587	oy = 1
		588	CODE:
		589	switch (ix)
		590	{
		591	case 0: RETVAL = self->ox; break;
		592	case 1: RETVAL = self->oy; break;
		593	}
		594	OUTPUT:
		595	RETVAL
508		596
509	void	597	void
510	scroll (CFClient::Map self, int dx, int dy)	598	scroll (CFClient::Map self, int dx, int dy)
511	CODE:	599	CODE:
512	{	600	{
		601	self->dx += dx; self->ox += dx;
		602	self->dy += dy; self->oy += dy;
		603	}
		604
		605	void
		606	map1a_update (CFClient::Map self, SV *data_)
		607	CODE:
		608	{
513	if (dx > 0)	609	if (self->dx > 0)
514	map_blank (self, self->x, self->y, dx - 1, self->h);	610	map_blank (self, self->x, self->y, self->dx - 1, self->h);
515	else if (dx < 0)	611	else if (self->dx < 0)
516	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	612	map_blank (self, self->x + self->w + self->dx + 1, self->y, 1 - self->dx, self->h);
517		613
518	if (dy > 0)	614	if (self->dy > 0)
519	map_blank (self, self->x, self->y, self->w, dy - 1);	615	map_blank (self, self->x, self->y, self->w, self->dy - 1);
520	else if (dy < 0)	616	else if (self->dy < 0)
521	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	617	map_blank (self, self->x, self->y + self->h + self->dy + 1, self->w, 1 - self->dy);
522		618
523	self->x += dx;	619	self->x += self->dx; self->dx = 0;
524	self->y += dy;	620	self->y += self->dy; self->dy = 0;
525		621
526	while (self->y < 0)	622	while (self->y < 0)
527	{	623	{
528	Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y);	624	Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y);
529		625
530	self->rows += MAP_EXTEND_Y;	626	self->rows += MAP_EXTEND_Y;
531	self->y += MAP_EXTEND_Y;	627	self->y += MAP_EXTEND_Y;
532	}	628	}
533	}
534		629
535	void
536	map1a_update (CFClient::Map self, SV *data_)
537	CODE:
538	{
539	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	630	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
540	uint8_t data_end = (uint8_t )SvEND (data_);	631	uint8_t data_end = (uint8_t )SvEND (data_);
541		632
542	while (data < data_end)	633	while (data < data_end)
543	{	634	{
544	int flags = (data [0] << 8) + data [1]; data += 2;	635	int flags = (data [0] << 8) + data [1]; data += 2;
545		636
546	int x = ((flags >> 10) & 63) + self->x;	637	int x = ((flags >> 10) & 63) + self->x;
547	int y = ((flags >> 4) & 63) + self->y;	638	int y = ((flags >> 4) & 63) + self->y;
548		639
549	while (y >= self->rows)	640	mapcell *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		641
584	if (flags & 15)	642	if (flags & 15)
585	{	643	{
586	if (cell->darkness < 0 && x < self->w && y < self->h)	644	if (cell->darkness < 0) // && x < self->w && y < self->h)
587	{	645	{
588	cell->darkness = 0;	646	cell->darkness = 0;
589	cell->face [0] = 0;	647	cell->face [0] = 0;
590	cell->face [1] = 0;	648	cell->face [1] = 0;
591	cell->face [2] = 0;	649	cell->face [2] = 0;
592	}	650	}
593		651
594	cell->darkness = flags & 8 ? *data++ : 255;	652	cell->darkness = flags & 8 ? *data++ : 255;
595		653
		654	//TODO: don't trust server data to be in-range(!)
		655
596	if (flags & 4)	656	if (flags & 4)
597	{	657	{
598	cell->face [0] = (data [0] << 8) + data [1]; data += 2;	658	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
599	}	659	}
600		660
601	if (flags & 2)	661	if (flags & 2)
602	{	662	{
603	cell->face [1] = (data [0] << 8) + data [1]; data += 2;	663	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;
604	}	664	}
605		665
606	if (flags & 1)	666	if (flags & 1)
607	{	667	{
608	cell->face [2] = (data [0] << 8) + data [1]; data += 2;	668	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
609	}	669	}
610	}	670	}
611	else	671	else
612	cell->darkness = -1;	672	cell->darkness = -1;
613	}	673	}
…		…
643	{	703	{
644	mapcell *cell = row->col + (x - row->c0);	704	mapcell *cell = row->col + (x - row->c0);
645		705
646	for (z = 0; z <= 0; z++)	706	for (z = 0; z <= 0; z++)
647	{	707	{
648	uint16_t face = cell->face [z];	708	mapface face = cell->face [z];
649		709
650	if (face)	710	if (face)
651	{	711	{
652	mapface tex = self->face [face];	712	maptex tex = self->tex [face];
653	int a0 = 255 - tex.a;	713	int a0 = 255 - tex.a;
654	int a1 = tex.a;	714	int a1 = tex.a;
655		715
656	r = (r * a0 + tex.r * a1) / 255;	716	r = (r * a0 + tex.r * a1) / 255;
657	g = (g * a0 + tex.g * a1) / 255;	717	g = (g * a0 + tex.g * a1) / 255;
…		…
678	PPCODE:	738	PPCODE:
679	{	739	{
680	int sw4 = (sw + 3) & ~3;	740	int sw4 = (sw + 3) & ~3;
681	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	741	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
682	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);	742	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
683		743	memset (darkness, 255, sw4 * sh);
684	SvPOK_only (darkness_sv);	744	SvPOK_only (darkness_sv);
685	SvCUR_set (darkness_sv, sw4 * sh);	745	SvCUR_set (darkness_sv, sw4 * sh);
686		746
687	int vx = self->x + (self->w - sw) / 2 - shift_x;	747	int vx = self->x + (self->w - sw) / 2 - shift_x;
688	int vy = self->y + (self->h - sh) / 2 - shift_y;	748	int vy = self->y + (self->h - sh) / 2 - shift_y;
689		749
690	if (0)
691	{	750	/*
692	int vx = self->vx = self->w >= sw	751	int vx = self->vx = self->w >= sw
693	? self->x + (self->w - sw) / 2	752	? self->x + (self->w - sw) / 2
694	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	753	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
695		754
696	int vy = self->vy = self->h >= sh	755	int vy = self->vy = self->h >= sh
697	? self->y + (self->h - sh) / 2	756	? self->y + (self->h - sh) / 2
698	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	757	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
699	}	758	*/
700		759
701	glColor4ub (255, 255, 255, 255);	760	glColor4ub (255, 255, 255, 255);
702		761
703	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	762	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
704	glEnable (GL_BLEND);	763	glEnable (GL_BLEND);
…		…
724		783
725	darkness[y * sw4 + x] = cell->darkness < 0	784	darkness[y * sw4 + x] = cell->darkness < 0
726	? 255 - FOW_DARKNESS	785	? 255 - FOW_DARKNESS
727	: 255 - cell->darkness;	786	: 255 - cell->darkness;
728		787
729	uint16_t face = cell->face [z];	788	mapface face = cell->face [z];
730		789
731	if (face)	790	if (face)
732	{	791	{
733	mapface tex = self->face [face];	792	maptex tex = self->tex [face];
734		793
735	int px = (x + 1) * 32 - tex.w;	794	int px = (x + 1) * 32 - tex.w;
736	int py = (y + 1) * 32 - tex.h;	795	int py = (y + 1) * 32 - tex.h;
737		796
738	if (last_name != tex.name)	797	if (last_name != tex.name)
…		…
760	PUSHs (sv_2mortal (newSViv (sw4)));	819	PUSHs (sv_2mortal (newSViv (sw4)));
761	PUSHs (sv_2mortal (newSViv (sh)));	820	PUSHs (sv_2mortal (newSViv (sh)));
762	PUSHs (darkness_sv);	821	PUSHs (darkness_sv);
763	}	822	}
764		823
		824	SV *
		825	get_rect (CFClient::Map self, int x0, int y0, int w, int h)
		826	CODE:
		827	{
		828	int x, y, x1, y1;
		829	SV data_sv = newSV (w h * 7 + 5);
		830	uint8_t data = (uint8_t )SvPVX (data_sv);
		831
		832	data++ = 0; / version 0 format */
		833	data++ = w >> 8; data++ = w;
		834	data++ = h >> 8; data++ = h;
		835
		836	// we need to do this 'cause we don't keep an absolute coord system for rows
		837	// TODO: treat rows as we treat
		838	map_get_row (self, y0 + self->y - self->oy);//D
		839	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
		840
		841	x0 += self->x - self->ox;
		842	y0 += self->y - self->oy;
		843
		844	x1 = x0 + w;
		845	y1 = y0 + h;
		846
		847	for (y = y0; y < y1; y++)
		848	{
		849	maprow *row = 0 <= y && y < self->rows
		850	? self->row + y
		851	: 0;
		852
		853	for (x = x0; x < x1; x++)
		854	{
		855	if (row && row->c0 <= x && x < row->c1)
		856	{
		857	mapcell *cell = row->col + (x - row->c0);
		858
		859	uint8_t flags = 0;
		860
		861	if (cell->face [0]) flags \|= 1;
		862	if (cell->face [1]) flags \|= 2;
		863	if (cell->face [2]) flags \|= 4;
		864
		865	*data++ = flags;
		866
		867	if (flags & 1)
		868	{
		869	*data++ = cell->face [0] >> 8;
		870	*data++ = cell->face [0];
		871	}
		872
		873	if (flags & 2)
		874	{
		875	*data++ = cell->face [1] >> 8;
		876	*data++ = cell->face [1];
		877	}
		878
		879	if (flags & 4)
		880	{
		881	*data++ = cell->face [2] >> 8;
		882	*data++ = cell->face [2];
		883	}
		884	}
		885	else
		886	*data++ = 0;
		887	}
		888	}
		889
		890	SvPOK_only (data_sv);
		891	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		892	RETVAL = data_sv;
		893	}
		894	OUTPUT:
		895	RETVAL
		896
		897	void
		898	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)
		899	PPCODE:
		900	{
		901	int x, y, z;
		902	int x1, y1;
		903
		904	if (*data++ != 0)
		905	return; /* version mismatch */
		906
		907	int w = data++ << 8; w \|= data++;
		908	int h = data++ << 8; h \|= data++;
		909
		910	// we need to do this 'cause we don't keep an absolute coord system for rows
		911	// TODO: treat rows as we treat
		912	map_get_row (self, y0 + self->y - self->oy);//D
		913	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
		914
		915	x0 += self->x - self->ox;
		916	y0 += self->y - self->oy;
		917
		918	x1 = x0 + w;
		919	y1 = y0 + h;
		920
		921	for (y = y0; y < y1; y++)
		922	{
		923	maprow *row = map_get_row (self, y);
		924
		925	for (x = x0; x < x1; x++)
		926	{
		927	uint8_t flags = *data++;
		928
		929	if (flags)
		930	{
		931	mapface face[3] = { 0, 0, 0 };
		932
		933	mapcell *cell = row_get_cell (row, x);
		934
		935	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
		936	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
		937	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
		938
		939	if (cell->darkness <= 0)
		940	{
		941	cell->darkness = -1;
		942
		943	for (z = 0; z <= 2; z++)
		944	{
		945	cell->face[z] = face[z];
		946
		947	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))
		948	XPUSHs (sv_2mortal (newSViv (face[z])));
		949	}
		950	}
		951	}
		952	}
		953	}
		954	}
		955

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.40 by root, Sat Apr 15 01:13:46 2006 UTC vs. Revision 1.43 by root, Mon Apr 17 06:50:26 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.40 by root, Sat Apr 15 01:13:46 2006 UTC vs.
Revision 1.43 by root, Mon Apr 17 06:50:26 2006 UTC