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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.26 by root, Wed Apr 12 23:15:38 2006 UTC vs.
Revision 1.43 by root, Mon Apr 17 06:50:26 2006 UTC

…		…
6	#include <stdio.h>	6	#include <stdio.h>
7		7
8	#include <SDL.h>	8	#include <SDL.h>
9	#include <SDL_image.h>	9	#include <SDL_image.h>
10	#include <SDL_opengl.h>	10	#include <SDL_opengl.h>
		11
		12	#include <glib/gmacros.h>
11		13
12	#include <pango/pango.h>	14	#include <pango/pango.h>
13	#include <pango/pangofc-fontmap.h>	15	#include <pango/pangofc-fontmap.h>
14	#include <pango/pangoft2.h>	16	#include <pango/pangoft2.h>
15		17
16	#include <sys/types.h>	18	#include <sys/types.h>
17	#include <sys/socket.h>	19	#include <sys/socket.h>
18	#include <netinet/in.h>	20	#include <netinet/in.h>
19	#include <netinet/tcp.h>	21	#include <netinet/tcp.h>
20		22
		23	#include <inttypes.h>
		24
		25	#define FOW_DARKNESS 32
		26
		27	#define MAP_EXTEND_X 32
		28	#define MAP_EXTEND_Y 512
		29
21	static PangoContext *context;	30	static PangoContext *context;
22	static PangoFontMap *fontmap;	31	static PangoFontMap *fontmap;
23		32
24	typedef struct cf_layout {	33	typedef struct cf_layout {
25	PangoLayout *pl;	34	PangoLayout *pl;
…		…
28		37
29	static void	38	static void
30	substitute_func (FcPattern *pattern, gpointer data)	39	substitute_func (FcPattern *pattern, gpointer data)
31	{	40	{
32	FcPatternAddBool (pattern, FC_HINTING , 1);	41	FcPatternAddBool (pattern, FC_HINTING , 1);
33	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	42	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
34	}	43	}
35		44
36	static void	45	static void
37	layout_update (CFClient__Layout self)	46	layout_update (CFClient__Layout self)
38	{	47	{
…		…
53	w = (w + 3) & ~3;	62	w = (w + 3) & ~3;
54	if (!w) w = 1;	63	if (!w) w = 1;
55	if (!h) h = 1;	64	if (!h) h = 1;
56	}	65	}
57		66
		67	typedef uint16_t mapface;
		68
		69	typedef struct {
		70	GLint name;
		71	int w, h;
		72	float s, t;
		73	uint8_t r, g, b, a;
		74	} maptex;
		75
		76	typedef struct {
		77	int16_t darkness;
		78	mapface face[3];
		79	} mapcell;
		80
		81	typedef struct {
		82	int32_t c0, c1;
		83	mapcell *col;
		84	} maprow;
		85
		86	typedef struct map {
		87	int x, y, w, h;
		88	int dx, dy; /* delayed map scrolling */
		89	int ox, oy; /* offset to virtual global coordinate system */
		90	int faces;
		91	mapface *face;
		92
		93	int texs;
		94	maptex *tex;
		95
		96	uint32_t rows;
		97	maprow *row;
		98	} *CFClient__Map;
		99
		100	static char *
		101	prepend (char *ptr, int sze, int inc)
		102	{
		103	char *p;
		104
		105	New (0, p, sze + inc, char);
		106	Zero (p, inc, char);
		107	Move (ptr, p + inc, sze, char);
		108	Safefree (ptr);
		109
		110	return p;
		111	}
		112
		113	static char *
		114	append (char *ptr, int sze, int inc)
		115	{
		116	Renew (ptr, sze + inc, char);
		117	Zero (ptr + sze, inc, char);
		118
		119	return ptr;
		120	}
		121
		122	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((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))
		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
		179	static void
		180	map_clear (CFClient__Map self)
		181	{
		182	int r;
		183
		184	for (r = 0; r < self->rows; r++)
		185	Safefree (self->row[r].col);
		186
		187	Safefree (self->row);
		188
		189	self->x = 0;
		190	self->y = 0;
		191	self->ox = 0;
		192	self->oy = 0;
		193	self->row = 0;
		194	self->rows = 0;
		195	}
		196
		197	static void
		198	map_blank (CFClient__Map self, int x0, int y0, int w, int h)
		199	{
		200	int x, y;
		201
		202	for (y = y0; y < y0 + h; y++)
		203	if (y >= 0)
		204	{
		205	if (y >= self->rows)
		206	break;
		207
		208	maprow *row = self->row + y;
		209
		210	for (x = x0; x < x0 + w; x++)
		211	if (x >= row->c0)
		212	{
		213	if (x >= row->c1)
		214	break;
		215
		216	row->col[x - row->c0].darkness = -1;
		217	}
		218	}
		219	}
		220
58	MODULE = CFClient PACKAGE = CFClient	221	MODULE = CFClient PACKAGE = CFClient
59		222
60	PROTOTYPES: ENABLE	223	PROTOTYPES: ENABLE
61		224
62	BOOT:	225	BOOT:
…		…
82	gl_extensions ()	245	gl_extensions ()
83	CODE:	246	CODE:
84	RETVAL = (char *)glGetString (GL_EXTENSIONS);	247	RETVAL = (char *)glGetString (GL_EXTENSIONS);
85	OUTPUT:	248	OUTPUT:
86	RETVAL	249	RETVAL
87
88	void
89	glConvolutionParameteri (U32 target, U32 name, I32 value)
90
91	void
92	glConvolutionFilter2D (U32 target, U32 internalformat, I32 width, I32 height, U32 format, U32 type, char *image)
93		250
94	void	251	void
95	add_font (char *file)	252	add_font (char *file)
96	CODE:	253	CODE:
97	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	254	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
120	SDL_RWops *rw = ix	277	SDL_RWops *rw = ix
121	? SDL_RWFromFile (image, "r")	278	? SDL_RWFromFile (image, "r")
122	: SDL_RWFromConstMem (image, image_len);	279	: SDL_RWFromConstMem (image, image_len);
123		280
124	if (!rw)	281	if (!rw)
125	croak ("load_image: unable to open file");	282	croak ("load_image: %s", SDL_GetError ());
126		283
127	surface = IMG_Load_RW (rw, 1);	284	surface = IMG_Load_RW (rw, 1);
128	if (!surface)	285	if (!surface)
129	croak ("load_image: unable to read file");	286	croak ("load_image: %s", SDL_GetError ());
130		287
131	fmt.palette = NULL;	288	fmt.palette = NULL;
132	fmt.BitsPerPixel = 32;	289	fmt.BitsPerPixel = 32;
133	fmt.BytesPerPixel = 4;	290	fmt.BytesPerPixel = 4;
134	fmt.Rmask = 0x000000ff;	291	fmt.Rmask = 0x000000ff;
…		…
146	fmt.colorkey = 0;	303	fmt.colorkey = 0;
147	fmt.alpha = 0;	304	fmt.alpha = 0;
148		305
149	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	306	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
150		307
		308	assert (surface2->pitch == surface2->w * 4);
		309
151	EXTEND (SP, 5);	310	EXTEND (SP, 5);
152	PUSHs (sv_2mortal (newSViv (surface2->w)));	311	PUSHs (sv_2mortal (newSViv (surface2->w)));
153	PUSHs (sv_2mortal (newSViv (surface2->h)));	312	PUSHs (sv_2mortal (newSViv (surface2->h)));
154	SDL_LockSurface (surface2);	313	SDL_LockSurface (surface2);
155	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	314	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
…		…
161	SDL_FreeSurface (surface);	320	SDL_FreeSurface (surface);
162	SDL_FreeSurface (surface2);	321	SDL_FreeSurface (surface2);
163	}	322	}
164		323
165	void	324	void
		325	average (int x, int y, uint32_t *data)
		326	PPCODE:
		327	{
		328	uint32_t r = 0, g = 0, b = 0, a = 0;
		329
		330	x = y = x * y;
		331
		332	while (x--)
		333	{
		334	uint32_t p = *data++;
		335
		336	r += (p ) & 255;
		337	g += (p >> 8) & 255;
		338	b += (p >> 16) & 255;
		339	a += (p >> 24) & 255;
		340	}
		341
		342	EXTEND (SP, 4);
		343	PUSHs (sv_2mortal (newSViv (r / y)));
		344	PUSHs (sv_2mortal (newSViv (g / y)));
		345	PUSHs (sv_2mortal (newSViv (b / y)));
		346	PUSHs (sv_2mortal (newSViv (a / y)));
		347	}
		348
		349	void
166	fatal (char *message)	350	fatal (char *message)
167	CODE:	351	CODE:
168	#ifdef WIN32	352	#ifdef WIN32
169	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	353	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
170	#else	354	#else
171	fprintf (stderr, "%s\n", message);	355	fprintf (stderr, "FATAL: %s\n", message);
172	#endif	356	#endif
173	exit (1);	357	exit (1);
174		358
175	MODULE = CFClient PACKAGE = CFClient::Layout	359	MODULE = CFClient PACKAGE = CFClient::Layout
176		360
…		…
189	CODE:	373	CODE:
190	g_object_unref (self->pl);	374	g_object_unref (self->pl);
191	Safefree (self);	375	Safefree (self);
192		376
193	void	377	void
		378	set_text (CFClient::Layout self, SV *text_)
		379	CODE:
		380	{
		381	STRLEN textlen;
		382	char *text = SvPVutf8 (text_, textlen);
		383
		384	pango_layout_set_text (self->pl, text, textlen);
		385	}
		386
		387	void
194	set_markup (CFClient::Layout self, SV *text_)	388	set_markup (CFClient::Layout self, SV *text_)
195	CODE:	389	CODE:
196	{	390	{
197	STRLEN textlen;	391	STRLEN textlen;
198	char *text = SvPVutf8 (text_, textlen);	392	char *text = SvPVutf8 (text_, textlen);
…		…
243	PPCODE:	437	PPCODE:
244	{	438	{
245	PangoRectangle strong_pos;	439	PangoRectangle strong_pos;
246	layout_update (self);	440	layout_update (self);
247	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	441	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
		442
248	EXTEND (SP, 3);	443	EXTEND (SP, 3);
249	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	444	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
250	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	445	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
251	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	446	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
252	}	447	}
…		…
284	}	479	}
285		480
286	MODULE = CFClient PACKAGE = CFClient::Texture	481	MODULE = CFClient PACKAGE = CFClient::Texture
287		482
288	void	483	void
289	draw_quad (SV *self, double x, double y, double w = 0, double h = 0)	484	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
290	PROTOTYPE: $$$;$$	485	PROTOTYPE: $$$;$$
291	CODE:	486	CODE:
292	{	487	{
293	HV hv = (HV )SvRV (self);	488	HV hv = (HV )SvRV (self);
294	double s = SvNV (*hv_fetch (hv, "s", 1, 1));	489	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
295	double t = SvNV (*hv_fetch (hv, "t", 1, 1));	490	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
296	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	491	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
		492	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
297		493
298	if (items < 5)	494	if (items < 5)
299	{	495	{
300	w = SvNV (*hv_fetch (hv, "w", 1, 1));	496	w = SvNV (*hv_fetch (hv, "w", 1, 1));
301	h = SvNV (*hv_fetch (hv, "h", 1, 1));	497	h = SvNV (*hv_fetch (hv, "h", 1, 1));
302	}	498	}
303		499
304	glBindTexture (GL_TEXTURE_2D, name);	500	glBindTexture (GL_TEXTURE_2D, name);
		501	if (wrap_mode) {
		502	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
		503	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
		504	}
305	glBegin (GL_QUADS);	505	glBegin (GL_QUADS);
306	glTexCoord2d (0, 0); glVertex2d (x , y );	506	glTexCoord2f (0, 0); glVertex2f (x , y );
307	glTexCoord2d (0, t); glVertex2d (x , y + h);	507	glTexCoord2f (0, t); glVertex2f (x , y + h);
308	glTexCoord2d (s, t); glVertex2d (x + w, y + h);	508	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
309	glTexCoord2d (s, 0); glVertex2d (x + w, y );	509	glTexCoord2f (s, 0); glVertex2f (x + w, y );
310	glEnd ();	510	glEnd ();
311	}	511	}
		512
		513	MODULE = CFClient PACKAGE = CFClient::Map
		514
		515	CFClient::Map
		516	new (SV *class, int map_width, int map_height)
		517	CODE:
		518	New (0, RETVAL, 1, struct map);
		519	RETVAL->x = 0;
		520	RETVAL->y = 0;
		521	RETVAL->w = map_width;
		522	RETVAL->h = map_height;
		523	RETVAL->ox = 0;
		524	RETVAL->oy = 0;
		525	RETVAL->faces = 8192;
		526	Newz (0, RETVAL->face, RETVAL->faces, mapface);
		527	RETVAL->texs = 8192;
		528	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
		529	RETVAL->rows = 0;
		530	RETVAL->row = 0;
		531	OUTPUT:
		532	RETVAL
		533
		534	void
		535	DESTROY (CFClient::Map self)
		536	CODE:
		537	{
		538	map_clear (self);
		539	Safefree (self->face);
		540	Safefree (self);
		541	}
		542
		543	void
		544	clear (CFClient::Map self)
		545	CODE:
		546	map_clear (self);
		547
		548	void
		549	set_face (CFClient::Map self, int face, int texid)
		550	CODE:
		551	{
		552	while (self->faces <= face)
		553	{
		554	Append (mapface, self->face, self->faces, self->faces);
		555	self->faces *= 2;
		556	}
		557
		558	self->face [face] = texid;
		559	}
		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
		573	tex->name = name;
		574	tex->w = w;
		575	tex->h = h;
		576	tex->s = s;
		577	tex->t = t;
		578	tex->r = r;
		579	tex->g = g;
		580	tex->b = b;
		581	tex->a = a;
		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
		596
		597	void
		598	scroll (CFClient::Map self, int dx, int dy)
		599	CODE:
		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	{
		609	if (self->dx > 0)
		610	map_blank (self, self->x, self->y, self->dx - 1, self->h);
		611	else if (self->dx < 0)
		612	map_blank (self, self->x + self->w + self->dx + 1, self->y, 1 - self->dx, self->h);
		613
		614	if (self->dy > 0)
		615	map_blank (self, self->x, self->y, self->w, self->dy - 1);
		616	else if (self->dy < 0)
		617	map_blank (self, self->x, self->y + self->h + self->dy + 1, self->w, 1 - self->dy);
		618
		619	self->x += self->dx; self->dx = 0;
		620	self->y += self->dy; self->dy = 0;
		621
		622	while (self->y < 0)
		623	{
		624	Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y);
		625
		626	self->rows += MAP_EXTEND_Y;
		627	self->y += MAP_EXTEND_Y;
		628	}
		629
		630	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
		631	uint8_t data_end = (uint8_t )SvEND (data_);
		632
		633	while (data < data_end)
		634	{
		635	int flags = (data [0] << 8) + data [1]; data += 2;
		636
		637	int x = ((flags >> 10) & 63) + self->x;
		638	int y = ((flags >> 4) & 63) + self->y;
		639
		640	mapcell *cell = map_get_cell (self, x, y);
		641
		642	if (flags & 15)
		643	{
		644	if (cell->darkness < 0) // && x < self->w && y < self->h)
		645	{
		646	cell->darkness = 0;
		647	cell->face [0] = 0;
		648	cell->face [1] = 0;
		649	cell->face [2] = 0;
		650	}
		651
		652	cell->darkness = flags & 8 ? *data++ : 255;
		653
		654	//TODO: don't trust server data to be in-range(!)
		655
		656	if (flags & 4)
		657	{
		658	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
		659	}
		660
		661	if (flags & 2)
		662	{
		663	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;
		664	}
		665
		666	if (flags & 1)
		667	{
		668	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
		669	}
		670	}
		671	else
		672	cell->darkness = -1;
		673	}
		674	}
		675
		676	SV *
		677	mapmap (CFClient::Map self, int w, int h)
		678	CODE:
		679	{
		680	int x0, x1, x;
		681	int y0, y1, y;
		682	int z;
		683	SV map_sv = newSV (w h * sizeof (uint32_t));
		684	uint32_t map = (uint32_t )SvPVX (map_sv);
		685
		686	SvPOK_only (map_sv);
		687	SvCUR_set (map_sv, w * h * sizeof (uint32_t));
		688
		689	x0 = self->x - w / 2; x1 = x0 + w;
		690	y0 = self->y - h / 2; y1 = y0 + h;
		691
		692	for (y = y0; y < y1; y++)
		693	{
		694	maprow *row = 0 <= y && y < self->rows
		695	? self->row + y
		696	: 0;
		697
		698	for (x = x0; x < x1; x++)
		699	{
		700	int r = 32, g = 32, b = 32, a = 192;
		701
		702	if (row && row->c0 <= x && x < row->c1)
		703	{
		704	mapcell *cell = row->col + (x - row->c0);
		705
		706	for (z = 0; z <= 0; z++)
		707	{
		708	mapface face = cell->face [z];
		709
		710	if (face)
		711	{
		712	maptex tex = self->tex [face];
		713	int a0 = 255 - tex.a;
		714	int a1 = tex.a;
		715
		716	r = (r * a0 + tex.r * a1) / 255;
		717	g = (g * a0 + tex.g * a1) / 255;
		718	b = (b * a0 + tex.b * a1) / 255;
		719	a = (a * a0 + tex.a * a1) / 255;
		720	}
		721	}
		722	}
		723
		724	*map++ = (r )
		725	\| (g << 8)
		726	\| (b << 16)
		727	\| (a << 24);
		728	}
		729	}
		730
		731	RETVAL = map_sv;
		732	}
		733	OUTPUT:
		734	RETVAL
		735
		736	void
		737	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		738	PPCODE:
		739	{
		740	int sw4 = (sw + 3) & ~3;
		741	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		742	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		743	memset (darkness, 255, sw4 * sh);
		744	SvPOK_only (darkness_sv);
		745	SvCUR_set (darkness_sv, sw4 * sh);
		746
		747	int vx = self->x + (self->w - sw) / 2 - shift_x;
		748	int vy = self->y + (self->h - sh) / 2 - shift_y;
		749
		750	/*
		751	int vx = self->vx = self->w >= sw
		752	? self->x + (self->w - sw) / 2
		753	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
		754
		755	int vy = self->vy = self->h >= sh
		756	? self->y + (self->h - sh) / 2
		757	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
		758	*/
		759
		760	glColor4ub (255, 255, 255, 255);
		761
		762	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		763	glEnable (GL_BLEND);
		764	glEnable (GL_TEXTURE_2D);
		765	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		766
		767	int x, y, z;
		768
		769	int last_name = 0;
		770
		771	glBegin (GL_QUADS);
		772
		773	for (z = 0; z < 3; z++)
		774	for (y = 0; y < sh; y++)
		775	if (0 <= y + vy && y + vy < self->rows)
		776	{
		777	maprow *row = self->row + (y + vy);
		778
		779	for (x = 0; x < sw; x++)
		780	if (row->c0 <= x + vx && x + vx < row->c1)
		781	{
		782	mapcell *cell = row->col + (x + vx - row->c0);
		783
		784	darkness[y * sw4 + x] = cell->darkness < 0
		785	? 255 - FOW_DARKNESS
		786	: 255 - cell->darkness;
		787
		788	mapface face = cell->face [z];
		789
		790	if (face)
		791	{
		792	maptex tex = self->tex [face];
		793
		794	int px = (x + 1) * 32 - tex.w;
		795	int py = (y + 1) * 32 - tex.h;
		796
		797	if (last_name != tex.name)
		798	{
		799	glEnd ();
		800	last_name = tex.name;
		801	glBindTexture (GL_TEXTURE_2D, last_name);
		802	glBegin (GL_QUADS);
		803	}
		804
		805	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		806	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		807	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		808	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		809	}
		810	}
		811	}
		812
		813	glEnd ();
		814
		815	glDisable (GL_TEXTURE_2D);
		816	glDisable (GL_BLEND);
		817
		818	EXTEND (SP, 3);
		819	PUSHs (sv_2mortal (newSViv (sw4)));
		820	PUSHs (sv_2mortal (newSViv (sh)));
		821	PUSHs (darkness_sv);
		822	}
		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.26 by root, Wed Apr 12 23:15:38 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.26 by root, Wed Apr 12 23:15:38 2006 UTC vs.
Revision 1.43 by root, Mon Apr 17 06:50:26 2006 UTC