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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.30 by root, Thu Apr 13 23:07:56 2006 UTC vs.
Revision 1.47 by root, Mon Apr 17 21:52:42 2006 UTC

…		…
37		37
38	static void	38	static void
39	substitute_func (FcPattern *pattern, gpointer data)	39	substitute_func (FcPattern *pattern, gpointer data)
40	{	40	{
41	FcPatternAddBool (pattern, FC_HINTING , 1);	41	FcPatternAddBool (pattern, FC_HINTING , 1);
42	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	42	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
43	}	43	}
44		44
45	static void	45	static void
46	layout_update (CFClient__Layout self)	46	layout_update (CFClient__Layout self)
47	{	47	{
48	/* use a random scale factor to account for unknown descenders, 0.8 works	48	/* use a random scale factor to account for unknown descenders, 0.8 works
49	* reasonably well with bitstream vera	49	* reasonably well with bitstream vera
50	*/	50	*/
51	PangoFontDescription *font = pango_context_get_font_description (context);	51	PangoFontDescription *font = pango_context_get_font_description (context);
52	pango_font_description_set_absolute_size (font, self->base_height * (PANGO_SCALE * 8 / 10));	52
		53	int height = self->base_height * (PANGO_SCALE * 8 / 10);
		54
		55	if (pango_font_description_get_size (font) != height)
		56	{
		57	pango_font_description_set_absolute_size (font, height);
		58	pango_layout_context_changed (self->pl);
		59	}
53	}	60	}
54		61
55	static void	62	static void
56	layout_get_pixel_size (CFClient__Layout self, int w, int h)	63	layout_get_pixel_size (CFClient__Layout self, int w, int h)
57	{	64	{
…		…
61		68
62	w = (w + 3) & ~3;	69	w = (w + 3) & ~3;
63	if (!w) w = 1;	70	if (!w) w = 1;
64	if (!h) h = 1;	71	if (!h) h = 1;
65	}	72	}
		73
		74	typedef uint16_t mapface;
66		75
67	typedef struct {	76	typedef struct {
68	GLint name;	77	GLint name;
69	int w, h;	78	int w, h;
70	float s, t;	79	float s, t;
71	} mapface;	80	uint8_t r, g, b, a;
		81	} maptex;
72		82
73	typedef struct {	83	typedef struct {
74	int16_t darkness;	84	int16_t darkness;
75	uint16_t face[3];	85	mapface face[3];
76	} mapcell;	86	} mapcell;
77		87
78	typedef struct {	88	typedef struct {
79	int32_t c0, c1;	89	int32_t c0, c1;
80	mapcell *col;	90	mapcell *col;
81	} maprow;	91	} maprow;
82		92
83	typedef struct map {	93	typedef struct map {
84	int x, y, w, h;	94	int x, y, w, h;
85	int vx, vy;	95	int ox, oy; /* offset to virtual global coordinate system */
86	int faces;	96	int faces;
87	mapface *face;	97	mapface *face;
		98
		99	int texs;
		100	maptex *tex;
88		101
89	uint32_t rows;	102	uint32_t rows;
90	maprow *row;	103	maprow *row;
91	} *CFClient__Map;	104	} *CFClient__Map;
92		105
…		…
113	}	126	}
114		127
115	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	128	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
116	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	129	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
117		130
		131	static maprow *
		132	map_get_row (CFClient__Map self, int y)
		133	{
		134	if (0 > y)
		135	{
		136	int extend = - y + MAP_EXTEND_Y;
		137	Prepend (maprow, self->row, self->rows, extend);
		138
		139	self->rows += extend;
		140	self->y += extend;
		141	y += extend;
		142	}
		143	else if (y >= self->rows)
		144	{
		145	int extend = y - self->rows + MAP_EXTEND_Y;
		146	Append (maprow, self->row, self->rows, extend);
		147	self->rows += extend;
		148	}
		149
		150	return self->row + y;
		151	}
		152
		153	static mapcell *
		154	row_get_cell (maprow *row, int x)
		155	{
		156	if (!row->col)
		157	{
		158	Newz (0, row->col, MAP_EXTEND_X, mapcell);
		159	row->c0 = x - MAP_EXTEND_X / 4;
		160	row->c1 = row->c0 + MAP_EXTEND_X;
		161	}
		162
		163	if (row->c0 > x)
		164	{
		165	int extend = row->c0 - x + MAP_EXTEND_X;
		166	Prepend (mapcell, row->col, row->c1 - row->c0, extend);
		167	row->c0 -= extend;
		168	}
		169	else if (x >= row->c1)
		170	{
		171	int extend = x - row->c1 + MAP_EXTEND_X;
		172	Append (mapcell, row->col, row->c1 - row->c0, extend);
		173	row->c1 += extend;
		174	}
		175
		176	return row->col + (x - row->c0);
		177	}
		178
		179	static mapcell *
		180	map_get_cell (CFClient__Map self, int x, int y)
		181	{
		182	return row_get_cell (map_get_row (self, y), x);
		183	}
		184
118	static void	185	static void
119	map_clear (CFClient__Map self)	186	map_clear (CFClient__Map self)
120	{	187	{
121	int r;	188	int r;
122		189
…		…
125		192
126	Safefree (self->row);	193	Safefree (self->row);
127		194
128	self->x = 0;	195	self->x = 0;
129	self->y = 0;	196	self->y = 0;
130	self->vx = 0;	197	self->ox = 0;
131	self->vy = 0;	198	self->oy = 0;
132	self->row = 0;	199	self->row = 0;
133	self->rows = 0;	200	self->rows = 0;
134	}	201	}
135		202
136	static void	203	static void
…		…
150	if (x >= row->c0)	217	if (x >= row->c0)
151	{	218	{
152	if (x >= row->c1)	219	if (x >= row->c1)
153	break;	220	break;
154		221
155	mapcell *cell = row->col + (x - row->c0);	222	row->col[x - row->c0].darkness = -1;
156	cell->darkness = -1;
157	cell->face [2] = 0;
158	}	223	}
159	}	224	}
160	}	225	}
161		226
162	MODULE = CFClient PACKAGE = CFClient	227	MODULE = CFClient PACKAGE = CFClient
…		…
218	SDL_RWops *rw = ix	283	SDL_RWops *rw = ix
219	? SDL_RWFromFile (image, "r")	284	? SDL_RWFromFile (image, "r")
220	: SDL_RWFromConstMem (image, image_len);	285	: SDL_RWFromConstMem (image, image_len);
221		286
222	if (!rw)	287	if (!rw)
223	croak ("load_image: unable to open file");	288	croak ("load_image: %s", SDL_GetError ());
224		289
225	surface = IMG_Load_RW (rw, 1);	290	surface = IMG_Load_RW (rw, 1);
226	if (!surface)	291	if (!surface)
227	croak ("load_image: unable to read file");	292	croak ("load_image: %s", SDL_GetError ());
228		293
229	fmt.palette = NULL;	294	fmt.palette = NULL;
230	fmt.BitsPerPixel = 32;	295	fmt.BitsPerPixel = 32;
231	fmt.BytesPerPixel = 4;	296	fmt.BytesPerPixel = 4;
232	fmt.Rmask = 0x000000ff;	297	fmt.Rmask = 0x000000ff;
…		…
244	fmt.colorkey = 0;	309	fmt.colorkey = 0;
245	fmt.alpha = 0;	310	fmt.alpha = 0;
246		311
247	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	312	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
248		313
		314	assert (surface2->pitch == surface2->w * 4);
		315
249	EXTEND (SP, 5);	316	EXTEND (SP, 5);
250	PUSHs (sv_2mortal (newSViv (surface2->w)));	317	PUSHs (sv_2mortal (newSViv (surface2->w)));
251	PUSHs (sv_2mortal (newSViv (surface2->h)));	318	PUSHs (sv_2mortal (newSViv (surface2->h)));
252	SDL_LockSurface (surface2);	319	SDL_LockSurface (surface2);
253	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	320	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
…		…
259	SDL_FreeSurface (surface);	326	SDL_FreeSurface (surface);
260	SDL_FreeSurface (surface2);	327	SDL_FreeSurface (surface2);
261	}	328	}
262		329
263	void	330	void
		331	average (int x, int y, uint32_t *data)
		332	PPCODE:
		333	{
		334	uint32_t r = 0, g = 0, b = 0, a = 0;
		335
		336	x = y = x * y;
		337
		338	while (x--)
		339	{
		340	uint32_t p = *data++;
		341
		342	r += (p ) & 255;
		343	g += (p >> 8) & 255;
		344	b += (p >> 16) & 255;
		345	a += (p >> 24) & 255;
		346	}
		347
		348	EXTEND (SP, 4);
		349	PUSHs (sv_2mortal (newSViv (r / y)));
		350	PUSHs (sv_2mortal (newSViv (g / y)));
		351	PUSHs (sv_2mortal (newSViv (b / y)));
		352	PUSHs (sv_2mortal (newSViv (a / y)));
		353	}
		354
		355	void
264	fatal (char *message)	356	fatal (char *message)
265	CODE:	357	CODE:
266	#ifdef WIN32	358	#ifdef WIN32
267	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	359	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
268	#else	360	#else
269	fprintf (stderr, "%s\n", message);	361	fprintf (stderr, "FATAL: %s\n", message);
270	#endif	362	#endif
271	exit (1);	363	exit (1);
272		364
273	MODULE = CFClient PACKAGE = CFClient::Layout	365	MODULE = CFClient PACKAGE = CFClient::Layout
274		366
…		…
287	CODE:	379	CODE:
288	g_object_unref (self->pl);	380	g_object_unref (self->pl);
289	Safefree (self);	381	Safefree (self);
290		382
291	void	383	void
292	set_markup (CFClient::Layout self, SV *text_)	384	set_text (CFClient::Layout self, SV *text_)
293	CODE:	385	CODE:
294	{	386	{
295	STRLEN textlen;	387	STRLEN textlen;
296	char *text = SvPVutf8 (text_, textlen);	388	char *text = SvPVutf8 (text_, textlen);
297		389
		390	pango_layout_set_text (self->pl, text, textlen);
		391	}
		392
		393	void
		394	set_markup (CFClient::Layout self, SV *text_)
		395	CODE:
		396	{
		397	STRLEN textlen;
		398	char *text = SvPVutf8 (text_, textlen);
		399
298	pango_layout_set_markup (self->pl, text, textlen);	400	pango_layout_set_markup (self->pl, text, textlen);
299	}	401	}
		402
		403	SV *
		404	get_text (CFClient::Layout self)
		405	CODE:
		406	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
		407	SvUTF8_on (RETVAL);
		408	OUTPUT:
		409	RETVAL
300		410
301	void	411	void
302	set_height (CFClient::Layout self, int base_height)	412	set_height (CFClient::Layout self, int base_height)
303	CODE:	413	CODE:
304	self->base_height = base_height;	414	self->base_height = base_height;
…		…
383	}	493	}
384		494
385	MODULE = CFClient PACKAGE = CFClient::Texture	495	MODULE = CFClient PACKAGE = CFClient::Texture
386		496
387	void	497	void
388	draw_quad (SV *self, double x, double y, double w = 0, double h = 0)	498	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
389	PROTOTYPE: $$$;$$	499	PROTOTYPE: $$$;$$
390	CODE:	500	CODE:
391	{	501	{
392	HV hv = (HV )SvRV (self);	502	HV hv = (HV )SvRV (self);
393	double s = SvNV (*hv_fetch (hv, "s", 1, 1));	503	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
394	double t = SvNV (*hv_fetch (hv, "t", 1, 1));	504	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
395	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	505	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
		506	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
396		507
397	if (items < 5)	508	if (items < 5)
398	{	509	{
399	w = SvNV (*hv_fetch (hv, "w", 1, 1));	510	w = SvNV (*hv_fetch (hv, "w", 1, 1));
400	h = SvNV (*hv_fetch (hv, "h", 1, 1));	511	h = SvNV (*hv_fetch (hv, "h", 1, 1));
401	}	512	}
402		513
403	glBindTexture (GL_TEXTURE_2D, name);	514	glBindTexture (GL_TEXTURE_2D, name);
		515	if (wrap_mode) {
		516	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
		517	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
		518	}
404	glBegin (GL_QUADS);	519	glBegin (GL_QUADS);
405	glTexCoord2d (0, 0); glVertex2d (x , y );	520	glTexCoord2f (0, 0); glVertex2f (x , y );
406	glTexCoord2d (0, t); glVertex2d (x , y + h);	521	glTexCoord2f (0, t); glVertex2f (x , y + h);
407	glTexCoord2d (s, t); glVertex2d (x + w, y + h);	522	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
408	glTexCoord2d (s, 0); glVertex2d (x + w, y );	523	glTexCoord2f (s, 0); glVertex2f (x + w, y );
409	glEnd ();	524	glEnd ();
410	}	525	}
411		526
412	MODULE = CFClient PACKAGE = CFClient::Map	527	MODULE = CFClient PACKAGE = CFClient::Map
413		528
414	CFClient::Map	529	CFClient::Map
415	new (SV *class, int map_width, int map_height)	530	new (SV *class, int map_width, int map_height)
416	CODE:	531	CODE:
417	New (0, RETVAL, 1, struct map);	532	New (0, RETVAL, 1, struct map);
418	RETVAL->x = 0;	533	RETVAL->x = 0;
419	RETVAL->y = 0;	534	RETVAL->y = 0;
420	RETVAL->w = map_width;	535	RETVAL->w = map_width;
421	RETVAL->h = map_height;	536	RETVAL->h = map_height;
422	RETVAL->vx = 0;	537	RETVAL->ox = 0;
423	RETVAL->vy = 0;	538	RETVAL->oy = 0;
424	RETVAL->faces = 8192;	539	RETVAL->faces = 8192;
425	Newz (0, RETVAL->face, RETVAL->faces, mapface);	540	Newz (0, RETVAL->face, RETVAL->faces, mapface);
		541	RETVAL->texs = 8192;
		542	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
426	RETVAL->rows = 0;	543	RETVAL->rows = 0;
427	RETVAL->row = 0;	544	RETVAL->row = 0;
428	OUTPUT:	545	OUTPUT:
429	RETVAL	546	RETVAL
430		547
…		…
441	clear (CFClient::Map self)	558	clear (CFClient::Map self)
442	CODE:	559	CODE:
443	map_clear (self);	560	map_clear (self);
444		561
445	void	562	void
446	set_texture (CFClient::Map self, int face, int name, int w, int h, float s, float t)	563	set_face (CFClient::Map self, int face, int texid)
447	CODE:	564	CODE:
448	{	565	{
449	while (self->faces < face)	566	while (self->faces <= face)
450	{	567	{
451	Append (mapface, self->face, self->faces, self->faces);	568	Append (mapface, self->face, self->faces, self->faces);
452	self->faces *= 2;	569	self->faces *= 2;
453	}	570	}
454		571
455	self->face [face].name = name;
456	self->face [face].w = w;	572	self->face [face] = texid;
457	self->face [face].h = h;
458	self->face [face].s = s;
459	self->face [face].t = t;
460	}	573	}
		574
		575	void
		576	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)
		577	CODE:
		578	{
		579	while (self->texs <= texid)
		580	{
		581	Append (maptex, self->tex, self->texs, self->texs);
		582	self->texs *= 2;
		583	}
		584
		585	maptex *tex = self->tex + texid;
		586
		587	tex->name = name;
		588	tex->w = w;
		589	tex->h = h;
		590	tex->s = s;
		591	tex->t = t;
		592	tex->r = r;
		593	tex->g = g;
		594	tex->b = b;
		595	tex->a = a;
		596	}
		597
		598	int
		599	ox (CFClient::Map self)
		600	ALIAS:
		601	oy = 1
		602	CODE:
		603	switch (ix)
		604	{
		605	case 0: RETVAL = self->ox; break;
		606	case 1: RETVAL = self->oy; break;
		607	}
		608	OUTPUT:
		609	RETVAL
461		610
462	void	611	void
463	scroll (CFClient::Map self, int dx, int dy)	612	scroll (CFClient::Map self, int dx, int dy)
464	CODE:	613	CODE:
465	{	614	{
…		…
471	if (dy > 0)	620	if (dy > 0)
472	map_blank (self, self->x, self->y, self->w, dy - 1);	621	map_blank (self, self->x, self->y, self->w, dy - 1);
473	else if (dy < 0)	622	else if (dy < 0)
474	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	623	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);
475		624
476	self->x += dx;	625	self->ox += dx; self->x += dx;
477	self->y += dy;	626	self->oy += dy; self->y += dy;
478		627
479	while (self->y < 0)	628	while (self->y < 0)
480	{	629	{
481	Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y);	630	Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y);
482		631
…		…
489	map1a_update (CFClient::Map self, SV *data_)	638	map1a_update (CFClient::Map self, SV *data_)
490	CODE:	639	CODE:
491	{	640	{
492	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	641	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
493	uint8_t data_end = (uint8_t )SvEND (data_);	642	uint8_t data_end = (uint8_t )SvEND (data_);
494		643
495	while (data < data_end)	644	while (data < data_end)
496	{	645	{
497	int flags = (data [0] << 8) + data [1]; data += 2;	646	int flags = (data [0] << 8) + data [1]; data += 2;
498		647
499	int x = ((flags >> 10) & 63) + self->x;	648	int x = ((flags >> 10) & 63) + self->x;
500	int y = ((flags >> 4) & 63) + self->y;	649	int y = ((flags >> 4) & 63) + self->y;
501		650
502	while (y >= self->rows)	651	mapcell *cell = map_get_cell (self, x, y);
503	{
504	Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y);
505
506	self->rows += MAP_EXTEND_Y;
507	}
508
509	maprow *row = self->row + y;
510
511	if (!row->col)
512	{
513	Newz (0, row->col, MAP_EXTEND_X, mapcell);
514	row->c0 = self->x - MAP_EXTEND_X / 4;
515	row->c1 = row->c0 + MAP_EXTEND_X;
516	}
517
518	if (row->c0 > x)
519	{
520	int extend = row->c0 - x + MAP_EXTEND_X;
521	Prepend (mapcell, row->col, row->c1 - row->c0, extend);
522	row->c0 -= extend;
523	}
524	else if (x >= row->c1)
525	{
526	int extend = x - row->c1 + MAP_EXTEND_X;
527	Append (mapcell, row->col, row->c1 - row->c0, extend);
528	row->c1 += extend;
529	}
530
531	assert (y >= 0);
532	assert (y < self->rows);
533	assert (x >= row->c0);
534	assert (x < row->c1);
535	mapcell *cell = row->col + (x - row->c0);
536		652
537	if (flags & 15)	653	if (flags & 15)
538	{	654	{
539	if (cell->darkness < 0 && x < self->w && y < self->h)	655	if (cell->darkness < 0)
540	{	656	{
541	cell->darkness = 0;	657	cell->darkness = 0;
542	cell->face [0] = 0;	658	cell->face [0] = 0;
543	cell->face [1] = 0;	659	cell->face [1] = 0;
544	cell->face [2] = 0;	660	cell->face [2] = 0;
545	}	661	}
546		662
547	cell->darkness = flags & 8 ? *data++ : 255;	663	cell->darkness = flags & 8 ? *data++ : 255;
		664
		665	//TODO: don't trust server data to be in-range(!)
548		666
549	if (flags & 4)	667	if (flags & 4)
550	{	668	{
551	cell->face [0] = (data [0] << 8) + data [1]; data += 2;	669	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
552	}	670	}
553		671
554	if (flags & 2)	672	if (flags & 2)
555	{	673	{
556	cell->face [1] = (data [0] << 8) + data [1]; data += 2;	674	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;
557	}	675	}
558		676
559	if (flags & 1)	677	if (flags & 1)
560	{	678	{
561	cell->face [2] = (data [0] << 8) + data [1]; data += 2;	679	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
562	}	680	}
563	}	681	}
564	else	682	else
		683	cell->darkness = -1;
		684	}
		685	}
		686
		687	SV *
		688	mapmap (CFClient::Map self, int w, int h)
		689	CODE:
		690	{
		691	int x0, x1, x;
		692	int y0, y1, y;
		693	int z;
		694	SV map_sv = newSV (w h * sizeof (uint32_t));
		695	uint32_t map = (uint32_t )SvPVX (map_sv);
		696
		697	SvPOK_only (map_sv);
		698	SvCUR_set (map_sv, w * h * sizeof (uint32_t));
		699
		700	x0 = self->x - w / 2; x1 = x0 + w;
		701	y0 = self->y - h / 2; y1 = y0 + h;
		702
		703	for (y = y0; y < y1; y++)
		704	{
		705	maprow *row = 0 <= y && y < self->rows
		706	? self->row + y
		707	: 0;
		708
		709	for (x = x0; x < x1; x++)
565	{	710	{
566	cell->darkness = -1;	711	int r = 32, g = 32, b = 32, a = 192;
567	cell->face [2] = 0;	712
		713	if (row && row->c0 <= x && x < row->c1)
		714	{
		715	mapcell *cell = row->col + (x - row->c0);
		716
		717	for (z = 0; z <= 0; z++)
		718	{
		719	mapface face = cell->face [z];
		720
		721	if (face)
		722	{
		723	maptex tex = self->tex [face];
		724	int a0 = 255 - tex.a;
		725	int a1 = tex.a;
		726
		727	r = (r * a0 + tex.r * a1) / 255;
		728	g = (g * a0 + tex.g * a1) / 255;
		729	b = (b * a0 + tex.b * a1) / 255;
		730	a = (a * a0 + tex.a * a1) / 255;
		731	}
		732	}
		733	}
		734
		735	*map++ = (r )
		736	\| (g << 8)
		737	\| (b << 16)
		738	\| (a << 24);
568	}	739	}
569	}	740	}
570	}
571		741
		742	RETVAL = map_sv;
		743	}
		744	OUTPUT:
		745	RETVAL
		746
572	void	747	void
573	draw (CFClient::Map self, int x0, int y0, int sw, int sh)	748	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
574	CODE:	749	PPCODE:
575	{	750	{
		751	int sw4 = (sw + 3) & ~3;
		752	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		753	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		754	memset (darkness, 255, sw4 * sh);
		755	SvPOK_only (darkness_sv);
		756	SvCUR_set (darkness_sv, sw4 * sh);
		757
		758	int vx = self->x + (self->w - sw) / 2 - shift_x;
		759	int vy = self->y + (self->h - sh) / 2 - shift_y;
		760
		761	/*
576	int vx = self->vx = self->w >= sw	762	int vx = self->vx = self->w >= sw
577	? self->x + (self->w - sw) / 2	763	? self->x + (self->w - sw) / 2
578	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	764	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
579		765
580	int vy = self->vy = self->h >= sh	766	int vy = self->vy = self->h >= sh
581	? self->y + (self->h - sh) / 2	767	? self->y + (self->h - sh) / 2
582	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	768	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
		769	*/
583		770
584	glColor4ub (255, 255, 255, 255);	771	glColor4ub (255, 255, 255, 255);
585		772
586	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	773	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
587	glEnable (GL_BLEND);	774	glEnable (GL_BLEND);
…		…
602		789
603	for (x = 0; x < sw; x++)	790	for (x = 0; x < sw; x++)
604	if (row->c0 <= x + vx && x + vx < row->c1)	791	if (row->c0 <= x + vx && x + vx < row->c1)
605	{	792	{
606	mapcell *cell = row->col + (x + vx - row->c0);	793	mapcell *cell = row->col + (x + vx - row->c0);
		794
		795	darkness[y * sw4 + x] = cell->darkness < 0
		796	? 255 - FOW_DARKNESS
		797	: 255 - cell->darkness;
		798
607	uint16_t face = cell->face [z];	799	mapface face = cell->face [z];
608		800
609	if (face)	801	if (face)
610	{	802	{
611	mapface tex = self->face [face];	803	maptex tex = self->tex [face];
612		804
613	int px = (x + 1) * 32 - tex.w;	805	int px = (x + 1) * 32 - tex.w;
614	int py = (y + 1) * 32 - tex.h;	806	int py = (y + 1) * 32 - tex.h;
615		807
616	if (last_name != tex.name)	808	if (last_name != tex.name)
…		…
628	}	820	}
629	}	821	}
630	}	822	}
631		823
632	glEnd ();	824	glEnd ();
633	}
634		825
		826	glDisable (GL_TEXTURE_2D);
		827	glDisable (GL_BLEND);
		828
		829	EXTEND (SP, 3);
		830	PUSHs (sv_2mortal (newSViv (sw4)));
		831	PUSHs (sv_2mortal (newSViv (sh)));
		832	PUSHs (darkness_sv);
		833	}
		834
		835	SV *
		836	get_rect (CFClient::Map self, int x0, int y0, int w, int h)
		837	CODE:
		838	{
		839	int x, y, x1, y1;
		840	SV data_sv = newSV (w h * 7 + 5);
		841	uint8_t data = (uint8_t )SvPVX (data_sv);
		842
		843	data++ = 0; / version 0 format */
		844	data++ = w >> 8; data++ = w;
		845	data++ = h >> 8; data++ = h;
		846
		847	// we need to do this 'cause we don't keep an absolute coord system for rows
		848	// TODO: treat rows as we treat
		849	map_get_row (self, y0 + self->y - self->oy);//D
		850	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
		851
		852	x0 += self->x - self->ox;
		853	y0 += self->y - self->oy;
		854
		855	x1 = x0 + w;
		856	y1 = y0 + h;
		857
		858	for (y = y0; y < y1; y++)
		859	{
		860	maprow *row = 0 <= y && y < self->rows
		861	? self->row + y
		862	: 0;
		863
		864	for (x = x0; x < x1; x++)
		865	{
		866	if (row && row->c0 <= x && x < row->c1)
		867	{
		868	mapcell *cell = row->col + (x - row->c0);
		869
		870	uint8_t flags = 0;
		871
		872	if (cell->face [0]) flags \|= 1;
		873	if (cell->face [1]) flags \|= 2;
		874	if (cell->face [2]) flags \|= 4;
		875
		876	*data++ = flags;
		877
		878	if (flags & 1)
		879	{
		880	*data++ = cell->face [0] >> 8;
		881	*data++ = cell->face [0];
		882	}
		883
		884	if (flags & 2)
		885	{
		886	*data++ = cell->face [1] >> 8;
		887	*data++ = cell->face [1];
		888	}
		889
		890	if (flags & 4)
		891	{
		892	*data++ = cell->face [2] >> 8;
		893	*data++ = cell->face [2];
		894	}
		895	}
		896	else
		897	*data++ = 0;
		898	}
		899	}
		900
		901	SvPOK_only (data_sv);
		902	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		903	RETVAL = data_sv;
		904	}
		905	OUTPUT:
		906	RETVAL
		907
		908	void
		909	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)
		910	PPCODE:
		911	{
		912	int x, y, z;
		913	int x1, y1;
		914
		915	if (*data++ != 0)
		916	return; /* version mismatch */
		917
		918	int w = data++ << 8; w \|= data++;
		919	int h = data++ << 8; h \|= data++;
		920
		921	// we need to do this 'cause we don't keep an absolute coord system for rows
		922	// TODO: treat rows as we treat
		923	map_get_row (self, y0 + self->y - self->oy);//D
		924	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
		925
		926	x0 += self->x - self->ox;
		927	y0 += self->y - self->oy;
		928
		929	x1 = x0 + w;
		930	y1 = y0 + h;
		931
		932	for (y = y0; y < y1; y++)
		933	{
		934	maprow *row = map_get_row (self, y);
		935
		936	for (x = x0; x < x1; x++)
		937	{
		938	uint8_t flags = *data++;
		939
		940	if (flags)
		941	{
		942	mapface face[3] = { 0, 0, 0 };
		943
		944	mapcell *cell = row_get_cell (row, x);
		945
		946	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
		947	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
		948	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
		949
		950	if (cell->darkness <= 0)
		951	{
		952	cell->darkness = -1;
		953
		954	for (z = 0; z <= 2; z++)
		955	{
		956	cell->face[z] = face[z];
		957
		958	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))
		959	XPUSHs (sv_2mortal (newSViv (face[z])));
		960	}
		961	}
		962	}
		963	}
		964	}
		965	}
		966

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.30 by root, Thu Apr 13 23:07:56 2006 UTC vs. Revision 1.47 by root, Mon Apr 17 21:52:42 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.30 by root, Thu Apr 13 23:07:56 2006 UTC vs.
Revision 1.47 by root, Mon Apr 17 21:52:42 2006 UTC