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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.26 by root, Wed Apr 12 23:15:38 2006 UTC vs.
Revision 1.38 by root, Fri Apr 14 23:32:28 2006 UTC

…		…
6	#include <stdio.h>	6	#include <stdio.h>
7		7
8	#include <SDL.h>	8	#include <SDL.h>
9	#include <SDL_image.h>	9	#include <SDL_image.h>
10	#include <SDL_opengl.h>	10	#include <SDL_opengl.h>
		11
		12	#include <glib/gmacros.h>
11		13
12	#include <pango/pango.h>	14	#include <pango/pango.h>
13	#include <pango/pangofc-fontmap.h>	15	#include <pango/pangofc-fontmap.h>
14	#include <pango/pangoft2.h>	16	#include <pango/pangoft2.h>
15		17
16	#include <sys/types.h>	18	#include <sys/types.h>
17	#include <sys/socket.h>	19	#include <sys/socket.h>
18	#include <netinet/in.h>	20	#include <netinet/in.h>
19	#include <netinet/tcp.h>	21	#include <netinet/tcp.h>
20		22
		23	#include <inttypes.h>
		24
		25	#define FOW_DARKNESS 32
		26
		27	#define MAP_EXTEND_X 32
		28	#define MAP_EXTEND_Y 512
		29
21	static PangoContext *context;	30	static PangoContext *context;
22	static PangoFontMap *fontmap;	31	static PangoFontMap *fontmap;
23		32
24	typedef struct cf_layout {	33	typedef struct cf_layout {
25	PangoLayout *pl;	34	PangoLayout *pl;
…		…
28		37
29	static void	38	static void
30	substitute_func (FcPattern *pattern, gpointer data)	39	substitute_func (FcPattern *pattern, gpointer data)
31	{	40	{
32	FcPatternAddBool (pattern, FC_HINTING , 1);	41	FcPatternAddBool (pattern, FC_HINTING , 1);
33	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	42	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
34	}	43	}
35		44
36	static void	45	static void
37	layout_update (CFClient__Layout self)	46	layout_update (CFClient__Layout self)
38	{	47	{
…		…
53	w = (w + 3) & ~3;	62	w = (w + 3) & ~3;
54	if (!w) w = 1;	63	if (!w) w = 1;
55	if (!h) h = 1;	64	if (!h) h = 1;
56	}	65	}
57		66
		67	typedef struct {
		68	GLint name;
		69	int w, h;
		70	float s, t;
		71	} mapface;
		72
		73	typedef struct {
		74	int16_t darkness;
		75	uint16_t face[3];
		76	} mapcell;
		77
		78	typedef struct {
		79	int32_t c0, c1;
		80	mapcell *col;
		81	} maprow;
		82
		83	typedef struct map {
		84	int x, y, w, h;
		85	int vx, vy;
		86	int faces;
		87	mapface *face;
		88
		89	uint32_t rows;
		90	maprow *row;
		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	}
		159
58	MODULE = CFClient PACKAGE = CFClient	160	MODULE = CFClient PACKAGE = CFClient
59		161
60	PROTOTYPES: ENABLE	162	PROTOTYPES: ENABLE
61		163
62	BOOT:	164	BOOT:
…		…
82	gl_extensions ()	184	gl_extensions ()
83	CODE:	185	CODE:
84	RETVAL = (char *)glGetString (GL_EXTENSIONS);	186	RETVAL = (char *)glGetString (GL_EXTENSIONS);
85	OUTPUT:	187	OUTPUT:
86	RETVAL	188	RETVAL
87
88	void
89	glConvolutionParameteri (U32 target, U32 name, I32 value)
90
91	void
92	glConvolutionFilter2D (U32 target, U32 internalformat, I32 width, I32 height, U32 format, U32 type, char *image)
93		189
94	void	190	void
95	add_font (char *file)	191	add_font (char *file)
96	CODE:	192	CODE:
97	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	193	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
189	CODE:	285	CODE:
190	g_object_unref (self->pl);	286	g_object_unref (self->pl);
191	Safefree (self);	287	Safefree (self);
192		288
193	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
194	set_markup (CFClient::Layout self, SV *text_)	300	set_markup (CFClient::Layout self, SV *text_)
195	CODE:	301	CODE:
196	{	302	{
197	STRLEN textlen;	303	STRLEN textlen;
198	char *text = SvPVutf8 (text_, textlen);	304	char *text = SvPVutf8 (text_, textlen);
…		…
243	PPCODE:	349	PPCODE:
244	{	350	{
245	PangoRectangle strong_pos;	351	PangoRectangle strong_pos;
246	layout_update (self);	352	layout_update (self);
247	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	353	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
		354
248	EXTEND (SP, 3);	355	EXTEND (SP, 3);
249	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	356	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
250	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	357	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
251	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	358	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
252	}	359	}
…		…
284	}	391	}
285		392
286	MODULE = CFClient PACKAGE = CFClient::Texture	393	MODULE = CFClient PACKAGE = CFClient::Texture
287		394
288	void	395	void
289	draw_quad (SV *self, double x, double y, double w = 0, double h = 0)	396	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
290	PROTOTYPE: $$$;$$	397	PROTOTYPE: $$$;$$
291	CODE:	398	CODE:
292	{	399	{
293	HV hv = (HV )SvRV (self);	400	HV hv = (HV )SvRV (self);
294	double s = SvNV (*hv_fetch (hv, "s", 1, 1));	401	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
295	double t = SvNV (*hv_fetch (hv, "t", 1, 1));	402	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
296	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));
297		405
298	if (items < 5)	406	if (items < 5)
299	{	407	{
300	w = SvNV (*hv_fetch (hv, "w", 1, 1));	408	w = SvNV (*hv_fetch (hv, "w", 1, 1));
301	h = SvNV (*hv_fetch (hv, "h", 1, 1));	409	h = SvNV (*hv_fetch (hv, "h", 1, 1));
302	}	410	}
303		411
304	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	}
305	glBegin (GL_QUADS);	417	glBegin (GL_QUADS);
306	glTexCoord2d (0, 0); glVertex2d (x , y );	418	glTexCoord2f (0, 0); glVertex2f (x , y );
307	glTexCoord2d (0, t); glVertex2d (x , y + h);	419	glTexCoord2f (0, t); glVertex2f (x , y + h);
308	glTexCoord2d (s, t); glVertex2d (x + w, y + h);	420	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
309	glTexCoord2d (s, 0); glVertex2d (x + w, y );	421	glTexCoord2f (s, 0); glVertex2f (x + w, y );
310	glEnd ();	422	glEnd ();
311	}	423	}
		424
		425	MODULE = CFClient PACKAGE = CFClient::Map
		426
		427	CFClient::Map
		428	new (SV *class, int map_width, int map_height)
		429	CODE:
		430	New (0, RETVAL, 1, struct map);
		431	RETVAL->x = 0;
		432	RETVAL->y = 0;
		433	RETVAL->w = map_width;
		434	RETVAL->h = map_height;
		435	RETVAL->vx = 0;
		436	RETVAL->vy = 0;
		437	RETVAL->faces = 8192;
		438	Newz (0, RETVAL->face, RETVAL->faces, mapface);
		439	RETVAL->rows = 0;
		440	RETVAL->row = 0;
		441	OUTPUT:
		442	RETVAL
		443
		444	void
		445	DESTROY (CFClient::Map self)
		446	CODE:
		447	{
		448	map_clear (self);
		449	Safefree (self->face);
		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)
		463	{
		464	Append (mapface, self->face, self->faces, self->faces);
		465	self->faces *= 2;
		466	}
		467
		468	self->face [face].name = name;
		469	self->face [face].w = w;
		470	self->face [face].h = h;
		471	self->face [face].s = s;
		472	self->face [face].t = t;
		473	}
		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 shift_x, int shift_y, 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->x + (self->w - sw) / 2 - shift_x;
		594	int vy = self->y + (self->h - sh) / 2 - shift_y;
		595
		596	if (0)
		597	{
		598	int vx = self->vx = self->w >= sw
		599	? self->x + (self->w - sw) / 2
		600	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
		601
		602	int vy = self->vy = self->h >= sh
		603	? self->y + (self->h - sh) / 2
		604	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
		605	}
		606
		607	glColor4ub (255, 255, 255, 255);
		608
		609	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		610	glEnable (GL_BLEND);
		611	glEnable (GL_TEXTURE_2D);
		612	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		613
		614	int x, y, z;
		615
		616	int last_name = 0;
		617
		618	glBegin (GL_QUADS);
		619
		620	for (z = 0; z < 3; z++)
		621	for (y = 0; y < sh; y++)
		622	if (0 <= y + vy && y + vy < self->rows)
		623	{
		624	maprow *row = self->row + (y + vy);
		625
		626	for (x = 0; x < sw; x++)
		627	if (row->c0 <= x + vx && x + vx < row->c1)
		628	{
		629	mapcell *cell = row->col + (x + vx - row->c0);
		630
		631	darkness[y * sw4 + x] = cell->darkness < 0
		632	? 255 - FOW_DARKNESS
		633	: 255 - cell->darkness;
		634
		635	uint16_t face = cell->face [z];
		636
		637	if (face)
		638	{
		639	mapface tex = self->face [face];
		640
		641	int px = (x + 1) * 32 - tex.w;
		642	int py = (y + 1) * 32 - tex.h;
		643
		644	if (last_name != tex.name)
		645	{
		646	glEnd ();
		647	last_name = tex.name;
		648	glBindTexture (GL_TEXTURE_2D, last_name);
		649	glBegin (GL_QUADS);
		650	}
		651
		652	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		653	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		654	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		655	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		656	}
		657	}
		658	}
		659
		660	glEnd ();
		661
		662	glDisable (GL_TEXTURE_2D);
		663	glDisable (GL_BLEND);
		664
		665	EXTEND (SP, 3);
		666	PUSHs (sv_2mortal (newSViv (sw4)));
		667	PUSHs (sv_2mortal (newSViv (sh)));
		668	PUSHs (darkness_sv);
		669	}
		670

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.26 by root, Wed Apr 12 23:15:38 2006 UTC vs. Revision 1.38 by root, Fri Apr 14 23:32:28 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.26 by root, Wed Apr 12 23:15:38 2006 UTC vs.
Revision 1.38 by root, Fri Apr 14 23:32:28 2006 UTC