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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.28 by root, Thu Apr 13 00:25:28 2006 UTC vs.
Revision 1.36 by elmex, Fri Apr 14 11:32:21 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
…		…
18	#include <netinet/in.h>	20	#include <netinet/in.h>
19	#include <netinet/tcp.h>	21	#include <netinet/tcp.h>
20		22
21	#include <inttypes.h>	23	#include <inttypes.h>
22		24
		25	#define FOW_DARKNESS 32
		26
		27	#define MAP_EXTEND_X 32
		28	#define MAP_EXTEND_Y 512
		29
23	static PangoContext *context;	30	static PangoContext *context;
24	static PangoFontMap *fontmap;	31	static PangoFontMap *fontmap;
25		32
26	typedef struct cf_layout {	33	typedef struct cf_layout {
27	PangoLayout *pl;	34	PangoLayout *pl;
…		…
30		37
31	static void	38	static void
32	substitute_func (FcPattern *pattern, gpointer data)	39	substitute_func (FcPattern *pattern, gpointer data)
33	{	40	{
34	FcPatternAddBool (pattern, FC_HINTING , 1);	41	FcPatternAddBool (pattern, FC_HINTING , 1);
35	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	42	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
36	}	43	}
37		44
38	static void	45	static void
39	layout_update (CFClient__Layout self)	46	layout_update (CFClient__Layout self)
40	{	47	{
…		…
56	if (!w) w = 1;	63	if (!w) w = 1;
57	if (!h) h = 1;	64	if (!h) h = 1;
58	}	65	}
59		66
60	typedef struct {	67	typedef struct {
		68	GLint name;
		69	int w, h;
		70	float s, t;
		71	} mapface;
		72
		73	typedef struct {
		74	int16_t darkness;
61	uint16_t face[3];	75	uint16_t face[3];
62	uint8_t darkness;
63	uint8_t padding;
64	} mapcell;	76	} mapcell;
65		77
66	typedef struct {	78	typedef struct {
67	uint32_t cols;	79	int32_t c0, c1;
68	mapcell *col;	80	mapcell *col;
69	} maprow;	81	} maprow;
70		82
71	typedef struct map {	83	typedef struct map {
72	int x, y, w, h;	84	int x, y, w, h;
		85	int vx, vy;
73	int faces;	86	int faces;
74	GLint *face;	87	mapface *face;
75		88
76	uint32_t rows;	89	uint32_t rows;
77	maprow *row;	90	maprow *row;
78	} *CFClient__Map;	91	} *CFClient__Map;
		92
		93	static char *
		94	prepend (char *ptr, int sze, int inc)
		95	{
		96	char *p;
		97
		98	New (0, p, sze + inc, char);
		99	Zero (p, inc, char);
		100	Move (ptr, p + inc, sze, char);
		101	Safefree (ptr);
		102
		103	return p;
		104	}
		105
		106	static char *
		107	append (char *ptr, int sze, int inc)
		108	{
		109	Renew (ptr, sze + inc, char);
		110	Zero (ptr + sze, inc, char);
		111
		112	return ptr;
		113	}
		114
		115	#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))
		117
		118	static void
		119	map_clear (CFClient__Map self)
		120	{
		121	int r;
		122
		123	for (r = 0; r < self->rows; r++)
		124	Safefree (self->row[r].col);
		125
		126	Safefree (self->row);
		127
		128	self->x = 0;
		129	self->y = 0;
		130	self->vx = 0;
		131	self->vy = 0;
		132	self->row = 0;
		133	self->rows = 0;
		134	}
		135
		136	static void
		137	map_blank (CFClient__Map self, int x0, int y0, int w, int h)
		138	{
		139	int x, y;
		140
		141	for (y = y0; y < y0 + h; y++)
		142	if (y >= 0)
		143	{
		144	if (y >= self->rows)
		145	break;
		146
		147	maprow *row = self->row + y;
		148
		149	for (x = x0; x < x0 + w; x++)
		150	if (x >= row->c0)
		151	{
		152	if (x >= row->c1)
		153	break;
		154
		155	row->col[x - row->c0].darkness = -1;
		156	}
		157	}
		158	}
79		159
80	MODULE = CFClient PACKAGE = CFClient	160	MODULE = CFClient PACKAGE = CFClient
81		161
82	PROTOTYPES: ENABLE	162	PROTOTYPES: ENABLE
83		163
…		…
205	CODE:	285	CODE:
206	g_object_unref (self->pl);	286	g_object_unref (self->pl);
207	Safefree (self);	287	Safefree (self);
208		288
209	void	289	void
		290	set_text (CFClient::Layout self, SV *text_)
		291	CODE:
		292	{
		293	STRLEN textlen;
		294	char *text = SvPVutf8 (text_, textlen);
		295
		296	pango_layout_set_text (self->pl, text, textlen);
		297	}
		298
		299	void
210	set_markup (CFClient::Layout self, SV *text_)	300	set_markup (CFClient::Layout self, SV *text_)
211	CODE:	301	CODE:
212	{	302	{
213	STRLEN textlen;	303	STRLEN textlen;
214	char *text = SvPVutf8 (text_, textlen);	304	char *text = SvPVutf8 (text_, textlen);
…		…
259	PPCODE:	349	PPCODE:
260	{	350	{
261	PangoRectangle strong_pos;	351	PangoRectangle strong_pos;
262	layout_update (self);	352	layout_update (self);
263	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	353	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
		354
264	EXTEND (SP, 3);	355	EXTEND (SP, 3);
265	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	356	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
266	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	357	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
267	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	358	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
268	}	359	}
…		…
308	{	399	{
309	HV hv = (HV )SvRV (self);	400	HV hv = (HV )SvRV (self);
310	double s = SvNV (*hv_fetch (hv, "s", 1, 1));	401	double s = SvNV (*hv_fetch (hv, "s", 1, 1));
311	double t = SvNV (*hv_fetch (hv, "t", 1, 1));	402	double t = SvNV (*hv_fetch (hv, "t", 1, 1));
312	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	403	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
		404	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
313		405
314	if (items < 5)	406	if (items < 5)
315	{	407	{
316	w = SvNV (*hv_fetch (hv, "w", 1, 1));	408	w = SvNV (*hv_fetch (hv, "w", 1, 1));
317	h = SvNV (*hv_fetch (hv, "h", 1, 1));	409	h = SvNV (*hv_fetch (hv, "h", 1, 1));
318	}	410	}
319		411
320	glBindTexture (GL_TEXTURE_2D, name);	412	glBindTexture (GL_TEXTURE_2D, name);
		413	if (wrap_mode) {
		414	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
		415	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
		416	}
321	glBegin (GL_QUADS);	417	glBegin (GL_QUADS);
322	glTexCoord2d (0, 0); glVertex2d (x , y );	418	glTexCoord2d (0, 0); glVertex2d (x , y );
323	glTexCoord2d (0, t); glVertex2d (x , y + h);	419	glTexCoord2d (0, t); glVertex2d (x , y + h);
324	glTexCoord2d (s, t); glVertex2d (x + w, y + h);	420	glTexCoord2d (s, t); glVertex2d (x + w, y + h);
325	glTexCoord2d (s, 0); glVertex2d (x + w, y );	421	glTexCoord2d (s, 0); glVertex2d (x + w, y );
…		…
334	New (0, RETVAL, 1, struct map);	430	New (0, RETVAL, 1, struct map);
335	RETVAL->x = 0;	431	RETVAL->x = 0;
336	RETVAL->y = 0;	432	RETVAL->y = 0;
337	RETVAL->w = map_width;	433	RETVAL->w = map_width;
338	RETVAL->h = map_height;	434	RETVAL->h = map_height;
		435	RETVAL->vx = 0;
		436	RETVAL->vy = 0;
339	RETVAL->faces = 0;	437	RETVAL->faces = 8192;
340	RETVAL->face = 0;	438	Newz (0, RETVAL->face, RETVAL->faces, mapface);
341
342	RETVAL->rows = 0;	439	RETVAL->rows = 0;
343	RETVAL->row = 0;	440	RETVAL->row = 0;
344	OUTPUT:	441	OUTPUT:
345	RETVAL	442	RETVAL
346		443
347	void	444	void
348	DESTROY (CFClient::Map self)	445	DESTROY (CFClient::Map self)
349	CODE:	446	CODE:
350	{	447	{
351	int r, c;	448	map_clear (self);
352
353	Safefree (self->face);	449	Safefree (self->face);
354	for (r = 0; r < self->rows; r++)	450	Safefree (self);
		451	}
		452
		453	void
		454	clear (CFClient::Map self)
		455	CODE:
		456	map_clear (self);
		457
		458	void
		459	set_texture (CFClient::Map self, int face, int name, int w, int h, float s, float t)
		460	CODE:
		461	{
		462	while (self->faces < face)
355	{	463	{
356	maprow *row = self->row + r;	464	Append (mapface, self->face, self->faces, self->faces);
357	if (!row)	465	self->faces *= 2;
358	continue;
359
360	Safefree (row->col);
361	}	466	}
362		467
363	Safefree (self->row);	468	self->face [face].name = name;
364	Safefree (self);	469	self->face [face].w = w;
		470	self->face [face].h = h;
		471	self->face [face].s = s;
		472	self->face [face].t = t;
365	}	473	}
366		474
		475	void
		476	scroll (CFClient::Map self, int dx, int dy)
		477	CODE:
		478	{
		479	if (dx > 0)
		480	map_blank (self, self->x, self->y, dx - 1, self->h);
		481	else if (dx < 0)
		482	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);
		483
		484	if (dy > 0)
		485	map_blank (self, self->x, self->y, self->w, dy - 1);
		486	else if (dy < 0)
		487	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);
		488
		489	self->x += dx;
		490	self->y += dy;
		491
		492	while (self->y < 0)
		493	{
		494	Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y);
		495
		496	self->rows += MAP_EXTEND_Y;
		497	self->y += MAP_EXTEND_Y;
		498	}
		499	}
		500
		501	void
		502	map1a_update (CFClient::Map self, SV *data_)
		503	CODE:
		504	{
		505	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
		506	uint8_t data_end = (uint8_t )SvEND (data_);
		507
		508	while (data < data_end)
		509	{
		510	int flags = (data [0] << 8) + data [1]; data += 2;
		511
		512	int x = ((flags >> 10) & 63) + self->x;
		513	int y = ((flags >> 4) & 63) + self->y;
		514
		515	while (y >= self->rows)
		516	{
		517	Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y);
		518
		519	self->rows += MAP_EXTEND_Y;
		520	}
		521
		522	maprow *row = self->row + y;
		523
		524	if (!row->col)
		525	{
		526	Newz (0, row->col, MAP_EXTEND_X, mapcell);
		527	row->c0 = self->x - MAP_EXTEND_X / 4;
		528	row->c1 = row->c0 + MAP_EXTEND_X;
		529	}
		530
		531	if (row->c0 > x)
		532	{
		533	int extend = row->c0 - x + MAP_EXTEND_X;
		534	Prepend (mapcell, row->col, row->c1 - row->c0, extend);
		535	row->c0 -= extend;
		536	}
		537	else if (x >= row->c1)
		538	{
		539	int extend = x - row->c1 + MAP_EXTEND_X;
		540	Append (mapcell, row->col, row->c1 - row->c0, extend);
		541	row->c1 += extend;
		542	}
		543
		544	assert (y >= 0);
		545	assert (y < self->rows);
		546	assert (x >= row->c0);
		547	assert (x < row->c1);
		548	mapcell *cell = row->col + (x - row->c0);
		549
		550	if (flags & 15)
		551	{
		552	if (cell->darkness < 0 && x < self->w && y < self->h)
		553	{
		554	cell->darkness = 0;
		555	cell->face [0] = 0;
		556	cell->face [1] = 0;
		557	cell->face [2] = 0;
		558	}
		559
		560	cell->darkness = flags & 8 ? *data++ : 255;
		561
		562	if (flags & 4)
		563	{
		564	cell->face [0] = (data [0] << 8) + data [1]; data += 2;
		565	}
		566
		567	if (flags & 2)
		568	{
		569	cell->face [1] = (data [0] << 8) + data [1]; data += 2;
		570	}
		571
		572	if (flags & 1)
		573	{
		574	cell->face [2] = (data [0] << 8) + data [1]; data += 2;
		575	}
		576	}
		577	else
		578	cell->darkness = -1;
		579	}
		580	}
		581
		582	void
		583	draw (CFClient::Map self, int x0, int y0, int sw, int sh)
		584	PPCODE:
		585	{
		586	int sw4 = (sw + 3) & ~3;
		587	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		588	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		589
		590	SvPOK_only (darkness_sv);
		591	SvCUR_set (darkness_sv, sw4 * sh);
		592
		593	int vx = self->vx = self->w >= sw
		594	? self->x + (self->w - sw) / 2
		595	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
		596
		597	int vy = self->vy = self->h >= sh
		598	? self->y + (self->h - sh) / 2
		599	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
		600
		601	glColor4ub (255, 255, 255, 255);
		602
		603	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		604	glEnable (GL_BLEND);
		605	glEnable (GL_TEXTURE_2D);
		606	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		607
		608	int x, y, z;
		609
		610	int last_name = 0;
		611
		612	glBegin (GL_QUADS);
		613
		614	for (z = 0; z < 3; z++)
		615	for (y = 0; y < sh; y++)
		616	if (0 <= y + vy && y + vy < self->rows)
		617	{
		618	maprow *row = self->row + (y + vy);
		619
		620	for (x = 0; x < sw; x++)
		621	if (row->c0 <= x + vx && x + vx < row->c1)
		622	{
		623	mapcell *cell = row->col + (x + vx - row->c0);
		624
		625	darkness[y * sw4 + x] = cell->darkness < 0
		626	? 255 - FOW_DARKNESS
		627	: 255 - cell->darkness;
		628
		629	uint16_t face = cell->face [z];
		630
		631	if (face)
		632	{
		633	mapface tex = self->face [face];
		634
		635	int px = (x + 1) * 32 - tex.w;
		636	int py = (y + 1) * 32 - tex.h;
		637
		638	if (last_name != tex.name)
		639	{
		640	glEnd ();
		641	last_name = tex.name;
		642	glBindTexture (GL_TEXTURE_2D, last_name);
		643	glBegin (GL_QUADS);
		644	}
		645
		646	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		647	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		648	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		649	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		650	}
		651	}
		652	}
		653
		654	glEnd ();
		655
		656	glDisable (GL_TEXTURE_2D);
		657	glDisable (GL_BLEND);
		658
		659	EXTEND (SP, 3);
		660	PUSHs (sv_2mortal (newSViv (sw4)));
		661	PUSHs (sv_2mortal (newSViv (sh)));
		662	PUSHs (darkness_sv);
		663	}
		664

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.28 by root, Thu Apr 13 00:25:28 2006 UTC vs. Revision 1.36 by elmex, Fri Apr 14 11:32:21 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.28 by root, Thu Apr 13 00:25:28 2006 UTC vs.
Revision 1.36 by elmex, Fri Apr 14 11:32:21 2006 UTC