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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.164 by root, Tue Nov 7 22:41:27 2006 UTC vs.
Revision 1.191 by root, Thu Apr 26 23:51:02 2007 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
2	# define WIN32_LEAN_AND_MEAN	2	# define WIN32_LEAN_AND_MEAN
3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4	# include <malloc.h>	4	# include <malloc.h>
5	# include <windows.h>	5	# include <windows.h>
6	# include <wininet.h>	6	# include <wininet.h>
7	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
8	# pragma warning(disable:4761)	8	# pragma warning(disable:4761)
14		14
15	#ifdef _WIN32	15	#ifdef _WIN32
16	# undef pipe	16	# undef pipe
17	#endif	17	#endif
18		18
		19	#include <assert.h>
19	#include <math.h>	20	#include <math.h>
20	#include <string.h>	21	#include <string.h>
21	#include <stdio.h>	22	#include <stdio.h>
22	#include <stdlib.h>	23	#include <stdlib.h>
23		24
…		…
55	# define PARACHUTE SDL_INIT_NOPARACHUTE	56	# define PARACHUTE SDL_INIT_NOPARACHUTE
56	#else	57	#else
57	# define PARACHUTE 0	58	# define PARACHUTE 0
58	#endif	59	#endif
59		60
		61	static AV *texture_av;
		62
60	static struct	63	static struct
61	{	64	{
62	#define GL_FUNC(ptr,name) ptr name;	65	#define GL_FUNC(ptr,name) ptr name;
63	#include "glfunc.h"	66	#include "glfunc.h"
64	#undef GL_FUNC	67	#undef GL_FUNC
…		…
154		157
155	*w = rect.width;	158	*w = rect.width;
156	*h = rect.height;	159	*h = rect.height;
157	}	160	}
158		161
		162	typedef uint16_t tileid;
159	typedef uint16_t mapface;	163	typedef uint16_t faceid;
160		164
161	typedef struct {	165	typedef struct {
162	GLint name;	166	int name;
163	int w, h;	167	int w, h;
164	float s, t;	168	float s, t;
165	uint8_t r, g, b, a;	169	uint8_t r, g, b, a;
		170	tileid smoothtile;
		171	uint8_t smoothlevel;
166	} maptex;	172	} maptex;
167		173
168	typedef struct {	174	typedef struct {
169	uint32_t player;	175	uint32_t player;
170	mapface face[3];	176	tileid tile[3];
171	uint16_t darkness;	177	uint16_t darkness;
172	uint8_t stat_width, stat_hp, flags;	178	uint8_t stat_width, stat_hp, flags, smoothmax;
173	} mapcell;	179	} mapcell;
174		180
175	typedef struct {	181	typedef struct {
176	int32_t c0, c1;	182	int32_t c0, c1;
177	mapcell *col;	183	mapcell *col;
178	} maprow;	184	} maprow;
179		185
180	typedef struct map {	186	typedef struct map {
181	int x, y, w, h;	187	int x, y, w, h;
182	int ox, oy; /* offset to virtual global coordinate system */	188	int ox, oy; /* offset to virtual global coordinate system */
183	int faces;	189	int faces; tileid *face2tile; // [faceid]
184	mapface *face;	190	int texs; maptex *tex; // [tileid]
185
186	int texs;
187	maptex *tex;
188		191
189	int32_t rows;	192	int32_t rows;
190	maprow *row;	193	maprow *row;
191	} *CFPlus__Map;	194	} *CFPlus__Map;
192		195
…		…
212	return ptr;	215	return ptr;
213	}	216	}
214		217
215	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	218	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
216	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	219	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
		220
		221	static void
		222	need_facenum (struct map *self, faceid face)
		223	{
		224	while (self->faces <= face)
		225	{
		226	Append (tileid, self->face2tile, self->faces, self->faces);
		227	self->faces *= 2;
		228	}
		229	}
		230
		231	static void
		232	need_texid (struct map *self, int texid)
		233	{
		234	while (self->texs <= texid)
		235	{
		236	Append (maptex, self->tex, self->texs, self->texs);
		237	self->texs *= 2;
		238	}
		239	}
217		240
218	static maprow *	241	static maprow *
219	map_get_row (CFPlus__Map self, int y)	242	map_get_row (CFPlus__Map self, int y)
220	{	243	{
221	if (0 > y)	244	if (0 > y)
…		…
316	cell->player = 0;	339	cell->player = 0;
317	}	340	}
318	}	341	}
319	}	342	}
320		343
		344	typedef struct {
		345	tileid tile;
		346	uint8_t x, y, level;
		347	} smooth_key;
		348
		349	static void
		350	smooth_or_bits (HV hv, smooth_key key, IV bits)
		351	{
		352	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);
		353
		354	if (SvIOK (*sv))
		355	SvIV_set (sv, SvIVX (sv) \| bits);
		356	else
		357	sv_setiv (*sv, bits);
		358	}
		359
321	static void	360	static void
322	music_finished (void)	361	music_finished (void)
323	{	362	{
324	SDL_UserEvent ev;	363	SDL_UserEvent ev;
325		364
…		…
358	n \|= n >> 8;	397	n \|= n >> 8;
359	n \|= n >> 16;	398	n \|= n >> 16;
360		399
361	return n + 1;	400	return n + 1;
362	}	401	}
		402
		403	/* SDL should provide this, really. */
		404	#define SDLK_MODIFIER_MIN 300
		405	#define SDLK_MODIFIER_MAX 314
363		406
364	MODULE = CFPlus PACKAGE = CFPlus	407	MODULE = CFPlus PACKAGE = CFPlus
365		408
366	PROTOTYPES: ENABLE	409	PROTOTYPES: ENABLE
367		410
…		…
371	static const struct {	414	static const struct {
372	const char *name;	415	const char *name;
373	IV iv;	416	IV iv;
374	} *civ, const_iv[] = {	417	} *civ, const_iv[] = {
375	# define const_iv(name) { # name, (IV)name }	418	# define const_iv(name) { # name, (IV)name }
		419	const_iv (SDLK_MODIFIER_MIN),
		420	const_iv (SDLK_MODIFIER_MAX),
		421
376	const_iv (SDL_ACTIVEEVENT),	422	const_iv (SDL_ACTIVEEVENT),
377	const_iv (SDL_KEYDOWN),	423	const_iv (SDL_KEYDOWN),
378	const_iv (SDL_KEYUP),	424	const_iv (SDL_KEYUP),
379	const_iv (SDL_MOUSEMOTION),	425	const_iv (SDL_MOUSEMOTION),
380	const_iv (SDL_MOUSEBUTTONDOWN),	426	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
389	const_iv (SDL_EVENT_RESERVEDA),	435	const_iv (SDL_EVENT_RESERVEDA),
390	const_iv (SDL_EVENT_RESERVEDB),	436	const_iv (SDL_EVENT_RESERVEDB),
391	const_iv (SDL_VIDEORESIZE),	437	const_iv (SDL_VIDEORESIZE),
392	const_iv (SDL_VIDEOEXPOSE),	438	const_iv (SDL_VIDEOEXPOSE),
393	const_iv (SDL_USEREVENT),	439	const_iv (SDL_USEREVENT),
		440
		441	const_iv (SDL_APPINPUTFOCUS),
		442	const_iv (SDL_APPMOUSEFOCUS),
		443	const_iv (SDL_APPACTIVE),
		444
394	const_iv (SDLK_KP0),	445	const_iv (SDLK_KP0),
395	const_iv (SDLK_KP1),	446	const_iv (SDLK_KP1),
396	const_iv (SDLK_KP2),	447	const_iv (SDLK_KP2),
397	const_iv (SDLK_KP3),	448	const_iv (SDLK_KP3),
398	const_iv (SDLK_KP4),	449	const_iv (SDLK_KP4),
…		…
453	const_iv (SDLK_BREAK),	504	const_iv (SDLK_BREAK),
454	const_iv (SDLK_MENU),	505	const_iv (SDLK_MENU),
455	const_iv (SDLK_POWER),	506	const_iv (SDLK_POWER),
456	const_iv (SDLK_EURO),	507	const_iv (SDLK_EURO),
457	const_iv (SDLK_UNDO),	508	const_iv (SDLK_UNDO),
		509
458	const_iv (KMOD_NONE),	510	const_iv (KMOD_NONE),
		511	const_iv (KMOD_SHIFT),
459	const_iv (KMOD_LSHIFT),	512	const_iv (KMOD_LSHIFT),
460	const_iv (KMOD_RSHIFT),	513	const_iv (KMOD_RSHIFT),
		514	const_iv (KMOD_CTRL),
461	const_iv (KMOD_LCTRL),	515	const_iv (KMOD_LCTRL),
462	const_iv (KMOD_RCTRL),	516	const_iv (KMOD_RCTRL),
		517	const_iv (KMOD_ALT),
463	const_iv (KMOD_LALT),	518	const_iv (KMOD_LALT),
464	const_iv (KMOD_RALT),	519	const_iv (KMOD_RALT),
		520	const_iv (KMOD_META),
465	const_iv (KMOD_LMETA),	521	const_iv (KMOD_LMETA),
466	const_iv (KMOD_RMETA),	522	const_iv (KMOD_RMETA),
467	const_iv (KMOD_NUM),	523	const_iv (KMOD_NUM),
468	const_iv (KMOD_CAPS),	524	const_iv (KMOD_CAPS),
469	const_iv (KMOD_MODE),	525	const_iv (KMOD_MODE),
470	const_iv (KMOD_CTRL),
471	const_iv (KMOD_SHIFT),
472	const_iv (KMOD_ALT),
473	const_iv (KMOD_META)
474	# undef const_iv	526	# undef const_iv
475	};	527	};
476		528
477	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	529	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
478	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	530	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		531
		532	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
		533	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
479	}	534	}
		535
		536	void
		537	weaken (SV *rv)
		538	PROTOTYPE: $
		539	CODE:
		540	sv_rvweaken (rv);
480		541
481	int	542	int
482	in_destruct ()	543	in_destruct ()
483	CODE:	544	CODE:
484	RETVAL = PL_main_cv == Nullcv;	545	RETVAL = PL_main_cv == Nullcv;
…		…
555	RETVAL = !!SDL_SetVideoMode (	616	RETVAL = !!SDL_SetVideoMode (
556	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	617	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
557	);	618	);
558	if (RETVAL)	619	if (RETVAL)
559	{	620	{
		621	av_clear (texture_av);
		622
560	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	623	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
561	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	624	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
562	# include "glfunc.h"	625	# include "glfunc.h"
563	# undef GL_FUNC	626	# undef GL_FUNC
		627
564	}	628	}
565	OUTPUT:	629	OUTPUT:
566	RETVAL	630	RETVAL
567		631
568	void	632	void
…		…
587	case SDL_KEYDOWN:	651	case SDL_KEYDOWN:
588	case SDL_KEYUP:	652	case SDL_KEYUP:
589	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	653	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
590	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	654	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
591	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	655	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		656	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
592	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	657	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
593	break;	658	break;
594		659
595	case SDL_ACTIVEEVENT:	660	case SDL_ACTIVEEVENT:
596	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	661	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
641	Mix_AllocateChannels (int numchans = -1)	706	Mix_AllocateChannels (int numchans = -1)
642		707
643	void	708	void
644	lowdelay (int fd, int val = 1)	709	lowdelay (int fd, int val = 1)
645	CODE:	710	CODE:
646	#ifndef _WIN32
647	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	711	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
648	#endif
649		712
650	void	713	void
651	win32_proxy_info ()	714	win32_proxy_info ()
652	PPCODE:	715	PPCODE:
653	{	716	{
…		…
1049	xy_to_index (CFPlus::Layout self, int x, int y)	1112	xy_to_index (CFPlus::Layout self, int x, int y)
1050	CODE:	1113	CODE:
1051	{	1114	{
1052	int index, trailing;	1115	int index, trailing;
1053	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1116	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1054	RETVAL = index;	1117	RETVAL = index + trailing;
1055	}	1118	}
1056	OUTPUT:	1119	OUTPUT:
1057	RETVAL	1120	RETVAL
1058		1121
1059	void	1122	void
…		…
1065		1128
1066	EXTEND (SP, 3);	1129	EXTEND (SP, 3);
1067	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1130	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1068	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1131	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1069	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1132	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
		1133	}
		1134
		1135	void
		1136	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
		1137	PPCODE:
		1138	{
		1139	int line, x;
		1140
		1141	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1142	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
		1143
		1144	EXTEND (SP, 2);
		1145	PUSHs (sv_2mortal (newSViv (line - 1)));
		1146	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
		1147	}
		1148
		1149	void
		1150	line_x_to_index (CFPlus::Layout self, int line, int x)
		1151	PPCODE:
		1152	{
		1153	PangoLayoutLine *lp;
		1154	int index, trailing;
		1155
		1156	if (line < 0)
		1157	XSRETURN_EMPTY;
		1158
		1159	if (!(lp = pango_layout_get_line (self->pl, line)))
		1160	XSRETURN_EMPTY; /* do better */
		1161
		1162	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
		1163
		1164	EXTEND (SP, 2);
		1165	if (GIMME_V == G_SCALAR)
		1166	PUSHs (sv_2mortal (newSViv (index + trailing)));
		1167	else
		1168	{
		1169	PUSHs (sv_2mortal (newSViv (index)));
		1170	PUSHs (sv_2mortal (newSViv (trailing)));
		1171	}
1070	}	1172	}
1071		1173
1072	void	1174	void
1073	render (CFPlus::Layout self, float x, float y, int flags = 0)	1175	render (CFPlus::Layout self, float x, float y, int flags = 0)
1074	PPCODE:	1176	PPCODE:
…		…
1177	RETVAL->y = 0;	1279	RETVAL->y = 0;
1178	RETVAL->w = 0;	1280	RETVAL->w = 0;
1179	RETVAL->h = 0;	1281	RETVAL->h = 0;
1180	RETVAL->ox = 0;	1282	RETVAL->ox = 0;
1181	RETVAL->oy = 0;	1283	RETVAL->oy = 0;
1182	RETVAL->faces = 8192;	1284	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1183	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1285	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1184	RETVAL->texs = 8192;
1185	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1186	RETVAL->rows = 0;	1286	RETVAL->rows = 0;
1187	RETVAL->row = 0;	1287	RETVAL->row = 0;
1188	OUTPUT:	1288	OUTPUT:
1189	RETVAL	1289	RETVAL
1190		1290
1191	void	1291	void
1192	DESTROY (CFPlus::Map self)	1292	DESTROY (CFPlus::Map self)
1193	CODE:	1293	CODE:
1194	{	1294	{
1195	map_clear (self);	1295	map_clear (self);
1196	Safefree (self->face);	1296	Safefree (self->face2tile);
1197	Safefree (self->tex);	1297	Safefree (self->tex);
1198	Safefree (self);	1298	Safefree (self);
1199	}	1299	}
1200		1300
1201	void	1301	void
…		…
1208	clear (CFPlus::Map self)	1308	clear (CFPlus::Map self)
1209	CODE:	1309	CODE:
1210	map_clear (self);	1310	map_clear (self);
1211		1311
1212	void	1312	void
1213	set_face (CFPlus::Map self, int face, int texid)	1313	set_tileid (CFPlus::Map self, int face, int tile)
1214	CODE:	1314	CODE:
1215	{	1315	{
1216	while (self->faces <= face)	1316	need_facenum (self, face); self->face2tile [face] = tile;
1217	{	1317	need_texid (self, tile);
1218	Append (mapface, self->face, self->faces, self->faces);	1318	}
1219	self->faces *= 2;
1220	}
1221		1319
1222	self->face [face] = texid;	1320	void
		1321	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1322	CODE:
		1323	{
		1324	tileid texid;
		1325	maptex *tex;
		1326
		1327	if (face < 0 \|\| face >= self->faces)
		1328	return;
		1329
		1330	if (smooth < 0 \|\| smooth >= self->faces)
		1331	return;
		1332
		1333	texid = self->face2tile [face];
		1334
		1335	if (!texid)
		1336	return;
		1337
		1338	tex = self->tex + texid;
		1339	tex->smoothtile = self->face2tile [smooth];
		1340	tex->smoothlevel = level;
1223	}	1341	}
1224		1342
1225	void	1343	void
1226	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1344	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1227	CODE:	1345	CODE:
1228	{	1346	{
1229	while (self->texs <= texid)	1347	need_texid (self, texid);
1230	{
1231	Append (maptex, self->tex, self->texs, self->texs);
1232	self->texs *= 2;
1233	}
1234		1348
1235	{	1349	{
1236	maptex *tex = self->tex + texid;	1350	maptex *tex = self->tex + texid;
1237		1351
1238	tex->name = name;	1352	tex->name = name;
…		…
1282	CODE:	1396	CODE:
1283	{	1397	{
1284	if (dx > 0)	1398	if (dx > 0)
1285	map_blank (self, self->x, self->y, dx, self->h);	1399	map_blank (self, self->x, self->y, dx, self->h);
1286	else if (dx < 0)	1400	else if (dx < 0)
1287	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1401	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1288		1402
1289	if (dy > 0)	1403	if (dy > 0)
1290	map_blank (self, self->x, self->y, self->w, dy);	1404	map_blank (self, self->x, self->y, self->w, dy);
1291	else if (dy < 0)	1405	else if (dy < 0)
1292	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1406	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1293		1407
1294	self->ox += dx; self->x += dx;	1408	self->ox += dx; self->x += dx;
1295	self->oy += dy; self->y += dy;	1409	self->oy += dy; self->y += dy;
1296		1410
1297	while (self->y < 0)	1411	while (self->y < 0)
…		…
1349	cell->stat_width = 1;	1463	cell->stat_width = 1;
1350	cell->stat_hp = *data++;	1464	cell->stat_hp = *data++;
1351	}	1465	}
1352	else if (cmd == 6) // monster width	1466	else if (cmd == 6) // monster width
1353	cell->stat_width = *data++ + 1;	1467	cell->stat_width = *data++ + 1;
1354	else if (cmd == 0x47) // monster width	1468	else if (cmd == 0x47)
1355	{	1469	{
1356	if (*data == 4)	1470	if (*data == 4)
1357	; // decode player tag	1471	; // decode player count
1358		1472
1359	data += *data + 1;	1473	data += *data + 1;
1360	}	1474	}
1361	else if (cmd == 8) // cell flags	1475	else if (cmd == 8) // cell flags
1362	cell->flags = *data++;	1476	cell->flags = *data++;
…		…
1371	cell->darkness = *data++ + 1;	1485	cell->darkness = *data++ + 1;
1372	}	1486	}
1373		1487
1374	if (flags & 4)	1488	if (flags & 4)
1375	{	1489	{
1376	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1490	faceid face = (data [0] << 8) + data [1]; data += 2;
		1491	need_facenum (self, face);
		1492	cell->tile [0] = self->face2tile [face];
1377	}	1493	}
1378		1494
1379	if (flags & 2)	1495	if (flags & 2)
1380	{	1496	{
1381	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1497	faceid face = (data [0] << 8) + data [1]; data += 2;
		1498	need_facenum (self, face);
		1499	cell->tile [1] = self->face2tile [face];
1382	}	1500	}
1383		1501
1384	if (flags & 1)	1502	if (flags & 1)
1385	{	1503	{
1386	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1504	faceid face = (data [0] << 8) + data [1]; data += 2;
		1505	need_facenum (self, face);
		1506	cell->tile [2] = self->face2tile [face];
1387	}	1507	}
1388	}	1508	}
1389	else	1509	else
1390	cell->darkness = 0;	1510	cell->darkness = 0;
1391	}	1511	}
…		…
1421	{	1541	{
1422	mapcell *cell = row->col + (x - row->c0);	1542	mapcell *cell = row->col + (x - row->c0);
1423		1543
1424	for (z = 0; z <= 0; z++)	1544	for (z = 0; z <= 0; z++)
1425	{	1545	{
1426	mapface face = cell->face [z];
1427
1428	if (face)
1429	{
1430	maptex tex = self->tex [face];	1546	maptex tex = self->tex [cell->tile [z]];
1431	int a0 = 255 - tex.a;	1547	int a0 = 255 - tex.a;
1432	int a1 = tex.a;	1548	int a1 = tex.a;
1433		1549
1434	r = (r * a0 + tex.r * a1) / 255;	1550	r = (r * a0 + tex.r * a1) / 255;
1435	g = (g * a0 + tex.g * a1) / 255;	1551	g = (g * a0 + tex.g * a1) / 255;
1436	b = (b * a0 + tex.b * a1) / 255;	1552	b = (b * a0 + tex.b * a1) / 255;
1437	a = (a * a0 + tex.a * a1) / 255;	1553	a = (a * a0 + tex.a * a1) / 255;
1438	}
1439	}	1554	}
1440	}	1555	}
1441		1556
1442	*map++ = (r )	1557	*map++ = (r )
1443	\| (g << 8)	1558	\| (g << 8)
…		…
1450	}	1565	}
1451	OUTPUT:	1566	OUTPUT:
1452	RETVAL	1567	RETVAL
1453		1568
1454	void	1569	void
1455	draw (CFPlus::Map self, int mx, int my, int sw, int sh)	1570	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1456	CODE:	1571	CODE:
1457	{	1572	{
		1573	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
		1574	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1575	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1576	smooth_key skey;
1458	int x, y, z;	1577	int x, y, z;
1459	int last_name;	1578	int last_name;
1460	mapface face;	1579
		1580	// thats current max. sorry.
		1581	if (sw > 255) sw = 255;
		1582	if (sh > 255) sh = 255;
		1583
		1584	// clear key, in case of extra padding
		1585	memset (&skey, 0, sizeof (skey));
1461		1586
1462	glColor4ub (255, 255, 255, 255);	1587	glColor4ub (255, 255, 255, 255);
1463		1588
1464	glEnable (GL_BLEND);	1589	glEnable (GL_BLEND);
1465	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1590	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1471	last_name = 0;	1596	last_name = 0;
1472		1597
1473	mx += self->x;	1598	mx += self->x;
1474	my += self->y;	1599	my += self->y;
1475		1600
		1601	// first pass: determine smooth_max
		1602	// rather ugly, if you ask me
		1603	// could also be stored inside mapcell and updated on change
		1604	memset (smooth_max, 0, sizeof (smooth_max));
		1605
		1606	for (y = 0; y < sh; y++)
		1607	if (0 <= y + my && y + my < self->rows)
		1608	{
		1609	maprow *row = self->row + (y + my);
		1610
		1611	for (x = 0; x < sw; x++)
		1612	if (row->c0 <= x + mx && x + mx < row->c1)
		1613	{
		1614	mapcell *cell = row->col + (x + mx - row->c0);
		1615
		1616	smooth_max[x + 1][y + 1] =
		1617	MAX (self->tex [cell->tile [0]].smoothlevel,
		1618	MAX (self->tex [cell->tile [1]].smoothlevel,
		1619	self->tex [cell->tile [2]].smoothlevel));
		1620	}
		1621	}
		1622
1476	for (z = 0; z < 3; z++)	1623	for (z = 0; z <= 2; z++)
		1624	{
		1625	memset (smooth_level, 0, sizeof (smooth_level));
		1626
1477	for (y = 0; y < sh; y++)	1627	for (y = 0; y < sh; y++)
1478	if (0 <= y + my && y + my < self->rows)	1628	if (0 <= y + my && y + my < self->rows)
1479	{	1629	{
1480	maprow *row = self->row + (y + my);	1630	maprow *row = self->row + (y + my);
1481		1631
1482	for (x = 0; x < sw; x++)	1632	for (x = 0; x < sw; x++)
1483	if (row->c0 <= x + mx && x + mx < row->c1)	1633	if (row->c0 <= x + mx && x + mx < row->c1)
1484	{	1634	{
1485	mapcell *cell = row->col + (x + mx - row->c0);	1635	mapcell *cell = row->col + (x + mx - row->c0);
1486
1487	face = cell->face [z];	1636	tileid tile = cell->tile [z];
		1637
		1638	if (tile)
		1639	{
		1640	maptex tex = self->tex [tile];
		1641	int px = (x + 1) * T - tex.w;
		1642	int py = (y + 1) * T - tex.h;
1488		1643
1489	if (face && face < self->texs)	1644	// suppressing texture state switches here
		1645	// is only moderately effective, but worth the extra effort
		1646	if (last_name != tex.name)
		1647	{
		1648	if (!tex.name)
		1649	tex = self->tex [2]; /* missing, replace by noface */
		1650
		1651	glEnd ();
		1652	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1653	glBegin (GL_QUADS);
		1654	}
		1655
		1656	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1657	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1658	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1659	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1660
		1661	if (cell->flags && z == 2)
		1662	{
		1663	if (cell->flags & 1)
		1664	{
		1665	maptex tex = self->tex [1];
		1666	int px = x * T + T * 2 / 32;
		1667	int py = y * T - T * 6 / 32;
		1668
		1669	glEnd ();
		1670	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1671	glBegin (GL_QUADS);
		1672
		1673	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1674	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1675	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1676	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1677	}
		1678	}
		1679
		1680	// update smooth hash
		1681	if (tex.smoothtile)
		1682	{
		1683	skey.tile = tex.smoothtile;
		1684	skey.level = tex.smoothlevel;
		1685
		1686	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1687
		1688	// add bits to current tile and all neighbours. skey.x\|y is
		1689	// shifted +1\|+1 so we always stay positive.
		1690
		1691	// bits is ___n cccc CCCC bbbb
		1692	// n do not draw borders&corners
		1693	// c draw these corners, but...
		1694	// C ... not these
		1695	// b draw these borders
		1696
		1697	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1698	// ┃· ·· ·┃ ━━
		1699
		1700	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1701	// ·· ·· ·┏ ┓·
		1702
		1703	// full tile
		1704	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1705
		1706	// borders
		1707	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1708	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1709	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1710	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1711
		1712	// corners
		1713	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1714	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1715	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1716	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1717	}
		1718	}
		1719	}
		1720	}
		1721
		1722	// go through all smoothlevels, lowest to highest, then draw.
		1723	// this is basically counting sort
		1724	{
		1725	int w, b;
		1726
		1727	for (w = 0; w < 256 / 32; ++w)
		1728	{
		1729	uint32_t smask = smooth_level [w];
		1730	if (smask)
		1731	for (b = 0; b < 32; ++b)
		1732	if (smask & (((uint32_t)1) << b))
1490	{	1733	{
1491	maptex tex = self->tex [face];	1734	int level = (w << 5) \| b;
1492	int px = (x + 1) * 32 - tex.w;	1735	HE *he;
1493	int py = (y + 1) * 32 - tex.h;
1494		1736
1495	if (last_name != tex.name)	1737	hv_iterinit (smooth);
		1738	while ((he = hv_iternext (smooth)))
1496	{	1739	{
		1740	smooth_key skey = (smooth_key )HeKEY (he);
		1741	IV bits = SvIVX (HeVAL (he));
		1742
		1743	if (!(bits & 0x1000)
		1744	&& skey->level == level
		1745	&& level > smooth_max [skey->x][skey->y])
		1746	{
		1747	maptex tex = self->tex [skey->tile];
		1748	int px = (((int)skey->x) - 1) * T;
		1749	int py = (((int)skey->y) - 1) * T;
		1750	int border = bits & 15;
		1751	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1752	float dx = tex.s * .0625f; // 16 images/row
		1753	float dy = tex.t * .5f ; // 2 images/column
		1754
		1755	// this time naively avoiding texture state changes
		1756	// save gobs of state changes.
		1757	if (last_name != tex.name)
		1758	{
		1759	if (!tex.name)
		1760	continue; // smoothing not yet available
		1761
1497	glEnd ();	1762	glEnd ();
1498	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1763	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1499	glBegin (GL_QUADS);	1764	glBegin (GL_QUADS);
		1765	}
		1766
		1767	if (border)
		1768	{
		1769	float ox = border * dx;
		1770
		1771	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1772	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1773	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1774	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1775	}
		1776
		1777	if (corner)
		1778	{
		1779	float ox = corner * dx;
		1780
		1781	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1782	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1783	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1784	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1785	}
1500	}	1786	}
1501
1502	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1503	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1504	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1505	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1506	}
1507
1508	if (cell->flags && z == 2)
1509	{
1510	if (cell->flags & 1)
1511	{
1512	maptex tex = self->tex [1];
1513	int px = (x + 1) * 32 - tex.w + 2;
1514	int py = (y + 1) * 32 - tex.h - 6;
1515
1516	glEnd ();
1517	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1518	glBegin (GL_QUADS);
1519
1520	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1521	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1522	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1523	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1524	}	1787	}
1525	}	1788	}
1526	}
1527	}	1789	}
		1790	}
		1791
		1792	hv_clear (smooth);
		1793	}
1528		1794
1529	glEnd ();	1795	glEnd ();
1530		1796
1531	glDisable (GL_TEXTURE_2D);	1797	glDisable (GL_TEXTURE_2D);
1532	glDisable (GL_BLEND);	1798	glDisable (GL_BLEND);
…		…
1540	for (x = 0; x < sw; x++)	1806	for (x = 0; x < sw; x++)
1541	if (row->c0 <= x + mx && x + mx < row->c1)	1807	if (row->c0 <= x + mx && x + mx < row->c1)
1542	{	1808	{
1543	mapcell *cell = row->col + (x + mx - row->c0);	1809	mapcell *cell = row->col + (x + mx - row->c0);
1544		1810
1545	int px = x * 32;	1811	int px = x * T;
1546	int py = y * 32;	1812	int py = y * T;
1547		1813
1548	if (cell->stat_hp)	1814	if (cell->stat_hp)
1549	{	1815	{
1550	int width = cell->stat_width * 32;	1816	int width = cell->stat_width * T;
1551	int thick = sh / 28 + 1 + cell->stat_width;	1817	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1552		1818
1553	glColor3ub (0, 0, 0);	1819	glColor3ub (0, 0, 0);
1554	glRectf (px + 1, py - thick - 2,	1820	glRectf (px + 1, py - thick - 2,
1555	px + width - 1, py);	1821	px + width - 1, py);
1556		1822
…		…
1695	if (row && row->c0 <= x && x < row->c1)	1961	if (row && row->c0 <= x && x < row->c1)
1696	{	1962	{
1697	mapcell *cell = row->col + (x - row->c0);	1963	mapcell *cell = row->col + (x - row->c0);
1698	uint8_t flags = 0;	1964	uint8_t flags = 0;
1699		1965
1700	if (cell->face [0]) flags \|= 1;	1966	if (cell->tile [0]) flags \|= 1;
1701	if (cell->face [1]) flags \|= 2;	1967	if (cell->tile [1]) flags \|= 2;
1702	if (cell->face [2]) flags \|= 4;	1968	if (cell->tile [2]) flags \|= 4;
1703		1969
1704	*data++ = flags;	1970	*data++ = flags;
1705		1971
1706	if (flags & 1)	1972	if (flags & 1)
1707	{	1973	{
		1974	tileid tile = cell->tile [0];
1708	*data++ = cell->face [0] >> 8;	1975	*data++ = tile >> 8;
1709	*data++ = cell->face [0];	1976	*data++ = tile;
1710	}	1977	}
1711		1978
1712	if (flags & 2)	1979	if (flags & 2)
1713	{	1980	{
		1981	tileid tile = cell->tile [1];
1714	*data++ = cell->face [1] >> 8;	1982	*data++ = tile >> 8;
1715	*data++ = cell->face [1];	1983	*data++ = tile;
1716	}	1984	}
1717		1985
1718	if (flags & 4)	1986	if (flags & 4)
1719	{	1987	{
		1988	tileid tile = cell->tile [2];
1720	*data++ = cell->face [2] >> 8;	1989	*data++ = tile >> 8;
1721	*data++ = cell->face [2];	1990	*data++ = tile;
1722	}	1991	}
1723	}	1992	}
1724	else	1993	else
1725	*data++ = 0;	1994	*data++ = 0;
1726	}	1995	}
…		…
1766	{	2035	{
1767	uint8_t flags = *data++;	2036	uint8_t flags = *data++;
1768		2037
1769	if (flags)	2038	if (flags)
1770	{	2039	{
1771	mapface face[3] = { 0, 0, 0 };
1772
1773	mapcell *cell = row_get_cell (row, x);	2040	mapcell *cell = row_get_cell (row, x);
		2041	tileid tile[3] = { 0, 0, 0 };
1774		2042
1775	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2043	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1776	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2044	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1777	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2045	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1778		2046
1779	if (cell->darkness == 0)	2047	if (cell->darkness == 0)
1780	{	2048	{
1781	cell->darkness = 0;	2049	cell->darkness = 0;
1782		2050
1783	for (z = 0; z <= 2; z++)	2051	for (z = 0; z <= 2; z++)
1784	{	2052	{
1785	cell->face[z] = face[z];	2053	tileid t = tile [z];
1786		2054
1787	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2055	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2056	{
1788	XPUSHs (sv_2mortal (newSViv (face[z])));	2057	XPUSHs (sv_2mortal (newSViv (t)));
		2058	need_texid (self, t);
		2059	}
		2060
		2061	cell->tile [z] = t;
1789	}	2062	}
1790	}	2063	}
1791	}	2064	}
1792	}	2065	}
1793	}	2066	}
…		…
1942	# undef const_iv	2215	# undef const_iv
1943	};	2216	};
1944		2217
1945	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2218	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1946	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2219	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2220
		2221	texture_av = newAV ();
		2222	AvREAL_off (texture_av);
1947	}	2223	}
1948		2224
1949	char *	2225	char *
1950	gl_vendor ()	2226	gl_vendor ()
1951	CODE:	2227	CODE:
…		…
2102		2378
2103	int glGenTexture ()	2379	int glGenTexture ()
2104	CODE:	2380	CODE:
2105	{	2381	{
2106	GLuint name;	2382	GLuint name;
		2383	if (AvFILL (texture_av) >= 0)
		2384	name = (GLuint)(size_t)av_pop (texture_av);
		2385	else
2107	glGenTextures (1, &name);	2386	glGenTextures (1, &name);
2108	RETVAL = name;	2387	RETVAL = name;
2109	}	2388	}
2110	OUTPUT:	2389	OUTPUT:
2111	RETVAL	2390	RETVAL
2112		2391
2113	void glDeleteTexture (int name)	2392	void glDeleteTexture (int name)
2114	CODE:	2393	CODE:
2115	{	2394	{
2116	GLuint name_ = name;	2395	/* make a half-assed attempt at returning the memory used by the texture */
2117	glDeleteTextures (1, &name_);	2396	/* textures are frequently being reused by cfplus anyway */
		2397	/glBindTexture (GL_TEXTURE_2D, name);/
		2398	/glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);/
		2399	av_push (texture_av, (SV *)(size_t)name);
		2400	{ GLuint name_ = name; glDeleteTextures (1, &name_); }
2118	}	2401	}
2119		2402
2120	int glGenList ()	2403	int glGenList ()
2121	CODE:	2404	CODE:
2122	RETVAL = glGenLists (1);	2405	RETVAL = glGenLists (1);

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.164 by root, Tue Nov 7 22:41:27 2006 UTC vs. Revision 1.191 by root, Thu Apr 26 23:51:02 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.164 by root, Tue Nov 7 22:41:27 2006 UTC vs.
Revision 1.191 by root, Thu Apr 26 23:51:02 2007 UTC