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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.29 by root, Thu Apr 13 01:55:38 2006 UTC vs. Revision 1.45 by root, Mon Apr 17 09:33:11 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.29 by root, Thu Apr 13 01:55:38 2006 UTC vs.
Revision 1.45 by root, Mon Apr 17 09:33:11 2006 UTC