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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.29 by root, Thu Apr 13 01:55:38 2006 UTC vs. Revision 1.49 by root, Tue Apr 18 01:36:12 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.29 by root, Thu Apr 13 01:55:38 2006 UTC vs.
Revision 1.49 by root, Tue Apr 18 01:36:12 2006 UTC