[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.199 by root, Tue Jul 17 13:53: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)
9	#endif	9	#endif
10		10
		11	//#define DEBUG 1
		12	#if DEBUG
		13	# include <valgrind/memcheck.h>
		14	#endif
		15
11	#include "EXTERN.h"	16	#include "EXTERN.h"
12	#include "perl.h"	17	#include "perl.h"
13	#include "XSUB.h"	18	#include "XSUB.h"
14		19
15	#ifdef _WIN32	20	#ifdef _WIN32
16	# undef pipe	21	# undef pipe
17	#endif	22	#endif
18		23
		24	#include <assert.h>
19	#include <math.h>	25	#include <math.h>
20	#include <string.h>	26	#include <string.h>
21	#include <stdio.h>	27	#include <stdio.h>
22	#include <stdlib.h>	28	#include <stdlib.h>
23		29
55	# define PARACHUTE SDL_INIT_NOPARACHUTE	61	# define PARACHUTE SDL_INIT_NOPARACHUTE
56	#else	62	#else
57	# define PARACHUTE 0	63	# define PARACHUTE 0
58	#endif	64	#endif
59		65
		66	static AV *texture_av;
		67
60	static struct	68	static struct
61	{	69	{
62	#define GL_FUNC(ptr,name) ptr name;	70	#define GL_FUNC(ptr,name) ptr name;
63	#include "glfunc.h"	71	#include "glfunc.h"
64	#undef GL_FUNC	72	#undef GL_FUNC
65	} gl;	73	} gl;
66		74
		75	static void
67	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	76	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
68	{	77	{
69	if (gl.BlendFuncSeparate)	78	if (gl.BlendFuncSeparate)
70	gl.BlendFuncSeparate (sa, da, saa, daa);	79	gl.BlendFuncSeparate (sa, da, saa, daa);
71	else if (gl.BlendFuncSeparateEXT)	80	else if (gl.BlendFuncSeparateEXT)
72	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	81	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
73	else	82	else
74	glBlendFunc (sa, da);	83	glBlendFunc (sa, da);
75	}	84	}
76		85
		86	static GLuint
		87	gen_texture ()
		88	{
		89	GLuint name;
		90
		91	if (AvFILL (texture_av) >= 0)
		92	name = (GLuint)(size_t)av_pop (texture_av);
		93	else
		94	glGenTextures (1, &name);
		95
		96	return name;
		97	}
		98
		99	static void
		100	del_texture (GLuint name)
		101	{
		102	/* make a half-assed attempt at returning the memory used by the texture */
		103	/* textures are frequently being reused by cfplus anyway */
		104	/glBindTexture (GL_TEXTURE_2D, name);/
		105	/glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);/
		106	av_push (texture_av, (SV *)(size_t)name);
		107	glDeleteTextures (1, &name);
		108	}
		109
77	#include "texcache.c"	110	#include "texcache.c"
78		111
79	#include "pango-font.c"	112	#include "pango-font.c"
80	#include "pango-fontmap.c"	113	#include "pango-fontmap.c"
81	#include "pango-render.c"	114	#include "pango-render.c"
…		…
154		187
155	*w = rect.width;	188	*w = rect.width;
156	*h = rect.height;	189	*h = rect.height;
157	}	190	}
158		191
		192	typedef uint16_t tileid;
159	typedef uint16_t mapface;	193	typedef uint16_t faceid;
160		194
161	typedef struct {	195	typedef struct {
162	GLint name;	196	int name;
163	int w, h;	197	int w, h;
164	float s, t;	198	float s, t;
165	uint8_t r, g, b, a;	199	uint8_t r, g, b, a;
		200	tileid smoothtile;
		201	uint8_t smoothlevel;
166	} maptex;	202	} maptex;
167		203
168	typedef struct {	204	typedef struct {
169	uint32_t player;	205	uint32_t player;
170	mapface face[3];	206	tileid tile[3];
171	uint16_t darkness;	207	uint16_t darkness;
172	uint8_t stat_width, stat_hp, flags;	208	uint8_t stat_width, stat_hp, flags, smoothmax;
173	} mapcell;	209	} mapcell;
174		210
175	typedef struct {	211	typedef struct {
176	int32_t c0, c1;	212	int32_t c0, c1;
177	mapcell *col;	213	mapcell *col;
178	} maprow;	214	} maprow;
179		215
180	typedef struct map {	216	typedef struct map {
181	int x, y, w, h;	217	int x, y, w, h;
182	int ox, oy; /* offset to virtual global coordinate system */	218	int ox, oy; /* offset to virtual global coordinate system */
183	int faces;	219	int faces; tileid *face2tile; // [faceid]
184	mapface *face;	220	int texs; maptex *tex; // [tileid]
185
186	int texs;
187	maptex *tex;
188		221
189	int32_t rows;	222	int32_t rows;
190	maprow *row;	223	maprow *row;
191	} *CFPlus__Map;	224	} *CFPlus__Map;
192		225
…		…
212	return ptr;	245	return ptr;
213	}	246	}
214		247
215	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	248	#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))	249	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
		250
		251	static void
		252	need_facenum (struct map *self, faceid face)
		253	{
		254	while (self->faces <= face)
		255	{
		256	Append (tileid, self->face2tile, self->faces, self->faces);
		257	self->faces *= 2;
		258	}
		259	}
		260
		261	static void
		262	need_texid (struct map *self, int texid)
		263	{
		264	while (self->texs <= texid)
		265	{
		266	Append (maptex, self->tex, self->texs, self->texs);
		267	self->texs *= 2;
		268	}
		269	}
217		270
218	static maprow *	271	static maprow *
219	map_get_row (CFPlus__Map self, int y)	272	map_get_row (CFPlus__Map self, int y)
220	{	273	{
221	if (0 > y)	274	if (0 > y)
…		…
316	cell->player = 0;	369	cell->player = 0;
317	}	370	}
318	}	371	}
319	}	372	}
320		373
		374	typedef struct {
		375	tileid tile;
		376	uint8_t x, y, level;
		377	} smooth_key;
		378
		379	static void
		380	smooth_or_bits (HV hv, smooth_key key, IV bits)
		381	{
		382	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);
		383
		384	if (SvIOK (*sv))
		385	SvIV_set (sv, SvIVX (sv) \| bits);
		386	else
		387	sv_setiv (*sv, bits);
		388	}
		389
321	static void	390	static void
322	music_finished (void)	391	music_finished (void)
323	{	392	{
324	SDL_UserEvent ev;	393	SDL_UserEvent ev;
325		394
…		…
358	n \|= n >> 8;	427	n \|= n >> 8;
359	n \|= n >> 16;	428	n \|= n >> 16;
360		429
361	return n + 1;	430	return n + 1;
362	}	431	}
		432
		433	/* SDL should provide this, really. */
		434	#define SDLK_MODIFIER_MIN 300
		435	#define SDLK_MODIFIER_MAX 314
363		436
364	MODULE = CFPlus PACKAGE = CFPlus	437	MODULE = CFPlus PACKAGE = CFPlus
365		438
366	PROTOTYPES: ENABLE	439	PROTOTYPES: ENABLE
367		440
…		…
371	static const struct {	444	static const struct {
372	const char *name;	445	const char *name;
373	IV iv;	446	IV iv;
374	} *civ, const_iv[] = {	447	} *civ, const_iv[] = {
375	# define const_iv(name) { # name, (IV)name }	448	# define const_iv(name) { # name, (IV)name }
		449	const_iv (SDLK_MODIFIER_MIN),
		450	const_iv (SDLK_MODIFIER_MAX),
		451
376	const_iv (SDL_ACTIVEEVENT),	452	const_iv (SDL_ACTIVEEVENT),
377	const_iv (SDL_KEYDOWN),	453	const_iv (SDL_KEYDOWN),
378	const_iv (SDL_KEYUP),	454	const_iv (SDL_KEYUP),
379	const_iv (SDL_MOUSEMOTION),	455	const_iv (SDL_MOUSEMOTION),
380	const_iv (SDL_MOUSEBUTTONDOWN),	456	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
389	const_iv (SDL_EVENT_RESERVEDA),	465	const_iv (SDL_EVENT_RESERVEDA),
390	const_iv (SDL_EVENT_RESERVEDB),	466	const_iv (SDL_EVENT_RESERVEDB),
391	const_iv (SDL_VIDEORESIZE),	467	const_iv (SDL_VIDEORESIZE),
392	const_iv (SDL_VIDEOEXPOSE),	468	const_iv (SDL_VIDEOEXPOSE),
393	const_iv (SDL_USEREVENT),	469	const_iv (SDL_USEREVENT),
		470
		471	const_iv (SDL_APPINPUTFOCUS),
		472	const_iv (SDL_APPMOUSEFOCUS),
		473	const_iv (SDL_APPACTIVE),
		474
394	const_iv (SDLK_KP0),	475	const_iv (SDLK_KP0),
395	const_iv (SDLK_KP1),	476	const_iv (SDLK_KP1),
396	const_iv (SDLK_KP2),	477	const_iv (SDLK_KP2),
397	const_iv (SDLK_KP3),	478	const_iv (SDLK_KP3),
398	const_iv (SDLK_KP4),	479	const_iv (SDLK_KP4),
…		…
453	const_iv (SDLK_BREAK),	534	const_iv (SDLK_BREAK),
454	const_iv (SDLK_MENU),	535	const_iv (SDLK_MENU),
455	const_iv (SDLK_POWER),	536	const_iv (SDLK_POWER),
456	const_iv (SDLK_EURO),	537	const_iv (SDLK_EURO),
457	const_iv (SDLK_UNDO),	538	const_iv (SDLK_UNDO),
		539
458	const_iv (KMOD_NONE),	540	const_iv (KMOD_NONE),
		541	const_iv (KMOD_SHIFT),
459	const_iv (KMOD_LSHIFT),	542	const_iv (KMOD_LSHIFT),
460	const_iv (KMOD_RSHIFT),	543	const_iv (KMOD_RSHIFT),
		544	const_iv (KMOD_CTRL),
461	const_iv (KMOD_LCTRL),	545	const_iv (KMOD_LCTRL),
462	const_iv (KMOD_RCTRL),	546	const_iv (KMOD_RCTRL),
		547	const_iv (KMOD_ALT),
463	const_iv (KMOD_LALT),	548	const_iv (KMOD_LALT),
464	const_iv (KMOD_RALT),	549	const_iv (KMOD_RALT),
		550	const_iv (KMOD_META),
465	const_iv (KMOD_LMETA),	551	const_iv (KMOD_LMETA),
466	const_iv (KMOD_RMETA),	552	const_iv (KMOD_RMETA),
467	const_iv (KMOD_NUM),	553	const_iv (KMOD_NUM),
468	const_iv (KMOD_CAPS),	554	const_iv (KMOD_CAPS),
469	const_iv (KMOD_MODE),	555	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	556	# undef const_iv
475	};	557	};
476		558
477	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	559	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
478	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	560	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		561
		562	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
		563	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
479	}	564	}
		565
		566	void
		567	weaken (SV *rv)
		568	PROTOTYPE: $
		569	CODE:
		570	sv_rvweaken (rv);
480		571
481	int	572	int
482	in_destruct ()	573	in_destruct ()
483	CODE:	574	CODE:
484	RETVAL = PL_main_cv == Nullcv;	575	RETVAL = PL_main_cv == Nullcv;
…		…
555	RETVAL = !!SDL_SetVideoMode (	646	RETVAL = !!SDL_SetVideoMode (
556	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	647	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
557	);	648	);
558	if (RETVAL)	649	if (RETVAL)
559	{	650	{
		651	av_clear (texture_av);
		652
560	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	653	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
561	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	654	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
562	# include "glfunc.h"	655	# include "glfunc.h"
563	# undef GL_FUNC	656	# undef GL_FUNC
		657
564	}	658	}
565	OUTPUT:	659	OUTPUT:
566	RETVAL	660	RETVAL
567		661
568	void	662	void
569	SDL_GL_SwapBuffers ()	663	SDL_GL_SwapBuffers ()
570		664
571	char *	665	char *
572	SDL_GetKeyName (int sym)	666	SDL_GetKeyName (int sym)
573		667
		668	int
		669	SDL_GetAppState ()
		670
574	void	671	void
575	SDL_PollEvent ()	672	poll_events ()
576	PPCODE:	673	PPCODE:
577	{	674	{
578	SDL_Event ev;	675	SDL_Event ev;
579		676
580	while (SDL_PollEvent (&ev))	677	SDL_PumpEvents ();
		678	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
581	{	679	{
582	HV *hv = newHV ();	680	HV *hv = newHV ();
583	hv_store (hv, "type", 4, newSViv (ev.type), 0);	681	hv_store (hv, "type", 4, newSViv (ev.type), 0);
584		682
585	switch (ev.type)	683	switch (ev.type)
…		…
587	case SDL_KEYDOWN:	685	case SDL_KEYDOWN:
588	case SDL_KEYUP:	686	case SDL_KEYUP:
589	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	687	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
590	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	688	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
591	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	689	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		690	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
592	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	691	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
593	break;	692	break;
594		693
595	case SDL_ACTIVEEVENT:	694	case SDL_ACTIVEEVENT:
596	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	695	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
597	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	696	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
598	break;	697	break;
599		698
600	case SDL_MOUSEMOTION:	699	case SDL_MOUSEMOTION:
		700	{
		701	int state = ev.motion.state;
		702	int x = ev.motion.x;
		703	int y = ev.motion.y;
		704	int xrel = ev.motion.xrel;
		705	int yrel = ev.motion.yrel;
		706
		707	/* do simplistic event compression */
		708	while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
		709	&& state == ev.motion.state)
		710	{
		711	xrel += ev.motion.xrel;
		712	yrel += ev.motion.yrel;
		713	x = ev.motion.x;
		714	y = ev.motion.y;
		715	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
		716	}
		717
601	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	718	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
602
603	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	719	hv_store (hv, "state", 5, newSViv (state), 0);
604	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	720	hv_store (hv, "x", 1, newSViv (x), 0);
605	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	721	hv_store (hv, "y", 1, newSViv (y), 0);
606	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	722	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
607	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	723	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		724	}
608	break;	725	break;
609		726
610	case SDL_MOUSEBUTTONDOWN:	727	case SDL_MOUSEBUTTONDOWN:
611	case SDL_MOUSEBUTTONUP:	728	case SDL_MOUSEBUTTONUP:
612	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	729	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
641	Mix_AllocateChannels (int numchans = -1)	758	Mix_AllocateChannels (int numchans = -1)
642		759
643	void	760	void
644	lowdelay (int fd, int val = 1)	761	lowdelay (int fd, int val = 1)
645	CODE:	762	CODE:
646	#ifndef _WIN32
647	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	763	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
648	#endif
649		764
650	void	765	void
651	win32_proxy_info ()	766	win32_proxy_info ()
652	PPCODE:	767	PPCODE:
653	{	768	{
…		…
794	ExitThread (retval); // unclean, please beam me up	909	ExitThread (retval); // unclean, please beam me up
795	#else	910	#else
796	_exit (retval);	911	_exit (retval);
797	#endif	912	#endif
798		913
		914	void
		915	debug ()
		916	CODE:
		917	{
		918	#if DEBUG
		919	VALGRIND_DO_LEAK_CHECK;
		920	#endif
		921	}
		922
799	MODULE = CFPlus PACKAGE = CFPlus::Font	923	MODULE = CFPlus PACKAGE = CFPlus::Font
800		924
801	CFPlus::Font	925	CFPlus::Font
802	new_from_file (SV class, char path, int id = 0)	926	new_from_file (SV class, char path, int id = 0)
803	CODE:	927	CODE:
…		…
1049	xy_to_index (CFPlus::Layout self, int x, int y)	1173	xy_to_index (CFPlus::Layout self, int x, int y)
1050	CODE:	1174	CODE:
1051	{	1175	{
1052	int index, trailing;	1176	int index, trailing;
1053	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1177	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1054	RETVAL = index;	1178	RETVAL = index + trailing;
1055	}	1179	}
1056	OUTPUT:	1180	OUTPUT:
1057	RETVAL	1181	RETVAL
1058		1182
1059	void	1183	void
…		…
1065		1189
1066	EXTEND (SP, 3);	1190	EXTEND (SP, 3);
1067	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1191	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1068	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1192	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1069	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1193	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
		1194	}
		1195
		1196	void
		1197	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
		1198	PPCODE:
		1199	{
		1200	int line, x;
		1201
		1202	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1203	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
		1204
		1205	EXTEND (SP, 2);
		1206	PUSHs (sv_2mortal (newSViv (line - 1)));
		1207	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
		1208	}
		1209
		1210	void
		1211	line_x_to_index (CFPlus::Layout self, int line, int x)
		1212	PPCODE:
		1213	{
		1214	PangoLayoutLine *lp;
		1215	int index, trailing;
		1216
		1217	if (line < 0)
		1218	XSRETURN_EMPTY;
		1219
		1220	if (!(lp = pango_layout_get_line (self->pl, line)))
		1221	XSRETURN_EMPTY; /* do better */
		1222
		1223	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
		1224
		1225	EXTEND (SP, 2);
		1226	if (GIMME_V == G_SCALAR)
		1227	PUSHs (sv_2mortal (newSViv (index + trailing)));
		1228	else
		1229	{
		1230	PUSHs (sv_2mortal (newSViv (index)));
		1231	PUSHs (sv_2mortal (newSViv (trailing)));
		1232	}
1070	}	1233	}
1071		1234
1072	void	1235	void
1073	render (CFPlus::Layout self, float x, float y, int flags = 0)	1236	render (CFPlus::Layout self, float x, float y, int flags = 0)
1074	PPCODE:	1237	PPCODE:
…		…
1079	flags	1242	flags
1080	);	1243	);
1081		1244
1082	MODULE = CFPlus PACKAGE = CFPlus::Texture	1245	MODULE = CFPlus PACKAGE = CFPlus::Texture
1083		1246
		1247	int minpot (int n)
		1248
1084	void	1249	void
1085	pad2pot (SV data_, SV w_, SV *h_)	1250	pad2pot (SV data_, SV w_, SV *h_)
1086	CODE:	1251	CODE:
1087	{	1252	{
1088	int ow = SvIV (w_);	1253	int ow = SvIV (w_);
…		…
1165	glDisable (GL_ALPHA_TEST);	1330	glDisable (GL_ALPHA_TEST);
1166	glDisable (GL_BLEND);	1331	glDisable (GL_BLEND);
1167	}	1332	}
1168	}	1333	}
1169		1334
		1335	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
		1336	CODE:
		1337	{
		1338	GLint width;
		1339	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
		1340	glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
		1341	RETVAL = width > 0;
		1342	}
		1343	OUTPUT:
		1344	RETVAL
		1345
1170	MODULE = CFPlus PACKAGE = CFPlus::Map	1346	MODULE = CFPlus PACKAGE = CFPlus::Map
1171		1347
1172	CFPlus::Map	1348	CFPlus::Map
1173	new (SV *class)	1349	new (SV *class)
1174	CODE:	1350	CODE:
…		…
1177	RETVAL->y = 0;	1353	RETVAL->y = 0;
1178	RETVAL->w = 0;	1354	RETVAL->w = 0;
1179	RETVAL->h = 0;	1355	RETVAL->h = 0;
1180	RETVAL->ox = 0;	1356	RETVAL->ox = 0;
1181	RETVAL->oy = 0;	1357	RETVAL->oy = 0;
1182	RETVAL->faces = 8192;	1358	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1183	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1359	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;	1360	RETVAL->rows = 0;
1187	RETVAL->row = 0;	1361	RETVAL->row = 0;
1188	OUTPUT:	1362	OUTPUT:
1189	RETVAL	1363	RETVAL
1190		1364
1191	void	1365	void
1192	DESTROY (CFPlus::Map self)	1366	DESTROY (CFPlus::Map self)
1193	CODE:	1367	CODE:
1194	{	1368	{
1195	map_clear (self);	1369	map_clear (self);
1196	Safefree (self->face);	1370	Safefree (self->face2tile);
1197	Safefree (self->tex);	1371	Safefree (self->tex);
1198	Safefree (self);	1372	Safefree (self);
1199	}	1373	}
1200		1374
1201	void	1375	void
…		…
1208	clear (CFPlus::Map self)	1382	clear (CFPlus::Map self)
1209	CODE:	1383	CODE:
1210	map_clear (self);	1384	map_clear (self);
1211		1385
1212	void	1386	void
1213	set_face (CFPlus::Map self, int face, int texid)	1387	set_tileid (CFPlus::Map self, int face, int tile)
1214	CODE:	1388	CODE:
1215	{	1389	{
1216	while (self->faces <= face)	1390	need_facenum (self, face); self->face2tile [face] = tile;
1217	{	1391	need_texid (self, tile);
1218	Append (mapface, self->face, self->faces, self->faces);	1392	}
1219	self->faces *= 2;
1220	}
1221		1393
1222	self->face [face] = texid;	1394	void
		1395	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1396	CODE:
		1397	{
		1398	tileid texid;
		1399	maptex *tex;
		1400
		1401	if (face < 0 \|\| face >= self->faces)
		1402	return;
		1403
		1404	if (smooth < 0 \|\| smooth >= self->faces)
		1405	return;
		1406
		1407	texid = self->face2tile [face];
		1408
		1409	if (!texid)
		1410	return;
		1411
		1412	tex = self->tex + texid;
		1413	tex->smoothtile = self->face2tile [smooth];
		1414	tex->smoothlevel = level;
1223	}	1415	}
1224		1416
1225	void	1417	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)	1418	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:	1419	CODE:
1228	{	1420	{
1229	while (self->texs <= texid)	1421	need_texid (self, texid);
1230	{
1231	Append (maptex, self->tex, self->texs, self->texs);
1232	self->texs *= 2;
1233	}
1234		1422
1235	{	1423	{
1236	maptex *tex = self->tex + texid;	1424	maptex *tex = self->tex + texid;
1237		1425
1238	tex->name = name;	1426	tex->name = name;
…		…
1282	CODE:	1470	CODE:
1283	{	1471	{
1284	if (dx > 0)	1472	if (dx > 0)
1285	map_blank (self, self->x, self->y, dx, self->h);	1473	map_blank (self, self->x, self->y, dx, self->h);
1286	else if (dx < 0)	1474	else if (dx < 0)
1287	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1475	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1288		1476
1289	if (dy > 0)	1477	if (dy > 0)
1290	map_blank (self, self->x, self->y, self->w, dy);	1478	map_blank (self, self->x, self->y, self->w, dy);
1291	else if (dy < 0)	1479	else if (dy < 0)
1292	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1480	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1293		1481
1294	self->ox += dx; self->x += dx;	1482	self->ox += dx; self->x += dx;
1295	self->oy += dy; self->y += dy;	1483	self->oy += dy; self->y += dy;
1296		1484
1297	while (self->y < 0)	1485	while (self->y < 0)
…		…
1349	cell->stat_width = 1;	1537	cell->stat_width = 1;
1350	cell->stat_hp = *data++;	1538	cell->stat_hp = *data++;
1351	}	1539	}
1352	else if (cmd == 6) // monster width	1540	else if (cmd == 6) // monster width
1353	cell->stat_width = *data++ + 1;	1541	cell->stat_width = *data++ + 1;
1354	else if (cmd == 0x47) // monster width	1542	else if (cmd == 0x47)
1355	{	1543	{
1356	if (*data == 4)	1544	if (*data == 4)
1357	; // decode player tag	1545	; // decode player count
1358		1546
1359	data += *data + 1;	1547	data += *data + 1;
1360	}	1548	}
1361	else if (cmd == 8) // cell flags	1549	else if (cmd == 8) // cell flags
1362	cell->flags = *data++;	1550	cell->flags = *data++;
…		…
1371	cell->darkness = *data++ + 1;	1559	cell->darkness = *data++ + 1;
1372	}	1560	}
1373		1561
1374	if (flags & 4)	1562	if (flags & 4)
1375	{	1563	{
1376	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1564	faceid face = (data [0] << 8) + data [1]; data += 2;
		1565	need_facenum (self, face);
		1566	cell->tile [0] = self->face2tile [face];
1377	}	1567	}
1378		1568
1379	if (flags & 2)	1569	if (flags & 2)
1380	{	1570	{
1381	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1571	faceid face = (data [0] << 8) + data [1]; data += 2;
		1572	need_facenum (self, face);
		1573	cell->tile [1] = self->face2tile [face];
1382	}	1574	}
1383		1575
1384	if (flags & 1)	1576	if (flags & 1)
1385	{	1577	{
1386	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1578	faceid face = (data [0] << 8) + data [1]; data += 2;
		1579	need_facenum (self, face);
		1580	cell->tile [2] = self->face2tile [face];
1387	}	1581	}
1388	}	1582	}
1389	else	1583	else
1390	cell->darkness = 0;	1584	cell->darkness = 0;
1391	}	1585	}
…		…
1421	{	1615	{
1422	mapcell *cell = row->col + (x - row->c0);	1616	mapcell *cell = row->col + (x - row->c0);
1423		1617
1424	for (z = 0; z <= 0; z++)	1618	for (z = 0; z <= 0; z++)
1425	{	1619	{
1426	mapface face = cell->face [z];
1427
1428	if (face)
1429	{
1430	maptex tex = self->tex [face];	1620	maptex tex = self->tex [cell->tile [z]];
1431	int a0 = 255 - tex.a;	1621	int a0 = 255 - tex.a;
1432	int a1 = tex.a;	1622	int a1 = tex.a;
1433		1623
1434	r = (r * a0 + tex.r * a1) / 255;	1624	r = (r * a0 + tex.r * a1) / 255;
1435	g = (g * a0 + tex.g * a1) / 255;	1625	g = (g * a0 + tex.g * a1) / 255;
1436	b = (b * a0 + tex.b * a1) / 255;	1626	b = (b * a0 + tex.b * a1) / 255;
1437	a = (a * a0 + tex.a * a1) / 255;	1627	a = (a * a0 + tex.a * a1) / 255;
1438	}
1439	}	1628	}
1440	}	1629	}
1441		1630
1442	*map++ = (r )	1631	*map++ = (r )
1443	\| (g << 8)	1632	\| (g << 8)
…		…
1450	}	1639	}
1451	OUTPUT:	1640	OUTPUT:
1452	RETVAL	1641	RETVAL
1453		1642
1454	void	1643	void
1455	draw (CFPlus::Map self, int mx, int my, int sw, int sh)	1644	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1456	CODE:	1645	CODE:
1457	{	1646	{
		1647	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
		1648	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1649	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1650	smooth_key skey;
1458	int x, y, z;	1651	int x, y, z;
1459	int last_name;	1652	int last_name;
1460	mapface face;	1653
		1654	// thats current max. sorry.
		1655	if (sw > 255) sw = 255;
		1656	if (sh > 255) sh = 255;
		1657
		1658	// clear key, in case of extra padding
		1659	memset (&skey, 0, sizeof (skey));
1461		1660
1462	glColor4ub (255, 255, 255, 255);	1661	glColor4ub (255, 255, 255, 255);
1463		1662
1464	glEnable (GL_BLEND);	1663	glEnable (GL_BLEND);
1465	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1664	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1471	last_name = 0;	1670	last_name = 0;
1472		1671
1473	mx += self->x;	1672	mx += self->x;
1474	my += self->y;	1673	my += self->y;
1475		1674
		1675	// first pass: determine smooth_max
		1676	// rather ugly, if you ask me
		1677	// could also be stored inside mapcell and updated on change
		1678	memset (smooth_max, 0, sizeof (smooth_max));
		1679
		1680	for (y = 0; y < sh; y++)
		1681	if (0 <= y + my && y + my < self->rows)
		1682	{
		1683	maprow *row = self->row + (y + my);
		1684
		1685	for (x = 0; x < sw; x++)
		1686	if (row->c0 <= x + mx && x + mx < row->c1)
		1687	{
		1688	mapcell *cell = row->col + (x + mx - row->c0);
		1689
		1690	smooth_max[x + 1][y + 1] =
		1691	MAX (self->tex [cell->tile [0]].smoothlevel,
		1692	MAX (self->tex [cell->tile [1]].smoothlevel,
		1693	self->tex [cell->tile [2]].smoothlevel));
		1694	}
		1695	}
		1696
1476	for (z = 0; z < 3; z++)	1697	for (z = 0; z <= 2; z++)
		1698	{
		1699	memset (smooth_level, 0, sizeof (smooth_level));
		1700
1477	for (y = 0; y < sh; y++)	1701	for (y = 0; y < sh; y++)
1478	if (0 <= y + my && y + my < self->rows)	1702	if (0 <= y + my && y + my < self->rows)
1479	{	1703	{
1480	maprow *row = self->row + (y + my);	1704	maprow *row = self->row + (y + my);
1481		1705
1482	for (x = 0; x < sw; x++)	1706	for (x = 0; x < sw; x++)
1483	if (row->c0 <= x + mx && x + mx < row->c1)	1707	if (row->c0 <= x + mx && x + mx < row->c1)
1484	{	1708	{
1485	mapcell *cell = row->col + (x + mx - row->c0);	1709	mapcell *cell = row->col + (x + mx - row->c0);
1486
1487	face = cell->face [z];	1710	tileid tile = cell->tile [z];
		1711
		1712	if (tile)
		1713	{
		1714	maptex tex = self->tex [tile];
		1715	int px = (x + 1) * T - tex.w;
		1716	int py = (y + 1) * T - tex.h;
1488		1717
1489	if (face && face < self->texs)	1718	// suppressing texture state switches here
		1719	// is only moderately effective, but worth the extra effort
		1720	if (last_name != tex.name)
		1721	{
		1722	if (!tex.name)
		1723	tex = self->tex [2]; /* missing, replace by noface */
		1724
		1725	glEnd ();
		1726	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1727	glBegin (GL_QUADS);
		1728	}
		1729
		1730	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1731	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1732	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1733	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1734
		1735	if (cell->flags && z == 2)
		1736	{
		1737	if (cell->flags & 1)
		1738	{
		1739	maptex tex = self->tex [1];
		1740	int px = x * T + T * 2 / 32;
		1741	int py = y * T - T * 6 / 32;
		1742
		1743	glEnd ();
		1744	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1745	glBegin (GL_QUADS);
		1746
		1747	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1748	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1749	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1750	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1751	}
		1752	}
		1753
		1754	// update smooth hash
		1755	if (tex.smoothtile)
		1756	{
		1757	skey.tile = tex.smoothtile;
		1758	skey.level = tex.smoothlevel;
		1759
		1760	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1761
		1762	// add bits to current tile and all neighbours. skey.x\|y is
		1763	// shifted +1\|+1 so we always stay positive.
		1764
		1765	// bits is ___n cccc CCCC bbbb
		1766	// n do not draw borders&corners
		1767	// c draw these corners, but...
		1768	// C ... not these
		1769	// b draw these borders
		1770
		1771	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1772	// ┃· ·· ·┃ ━━
		1773
		1774	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1775	// ·· ·· ·┏ ┓·
		1776
		1777	// full tile
		1778	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1779
		1780	// borders
		1781	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1782	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1783	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1784	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1785
		1786	// corners
		1787	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1788	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1789	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1790	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1791	}
		1792	}
		1793	}
		1794	}
		1795
		1796	// go through all smoothlevels, lowest to highest, then draw.
		1797	// this is basically counting sort
		1798	{
		1799	int w, b;
		1800
		1801	for (w = 0; w < 256 / 32; ++w)
		1802	{
		1803	uint32_t smask = smooth_level [w];
		1804	if (smask)
		1805	for (b = 0; b < 32; ++b)
		1806	if (smask & (((uint32_t)1) << b))
1490	{	1807	{
1491	maptex tex = self->tex [face];	1808	int level = (w << 5) \| b;
1492	int px = (x + 1) * 32 - tex.w;	1809	HE *he;
1493	int py = (y + 1) * 32 - tex.h;
1494		1810
1495	if (last_name != tex.name)	1811	hv_iterinit (smooth);
		1812	while ((he = hv_iternext (smooth)))
1496	{	1813	{
		1814	smooth_key skey = (smooth_key )HeKEY (he);
		1815	IV bits = SvIVX (HeVAL (he));
		1816
		1817	if (!(bits & 0x1000)
		1818	&& skey->level == level
		1819	&& level > smooth_max [skey->x][skey->y])
		1820	{
		1821	maptex tex = self->tex [skey->tile];
		1822	int px = (((int)skey->x) - 1) * T;
		1823	int py = (((int)skey->y) - 1) * T;
		1824	int border = bits & 15;
		1825	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1826	float dx = tex.s * .0625f; // 16 images/row
		1827	float dy = tex.t * .5f ; // 2 images/column
		1828
		1829	// this time naively avoiding texture state changes
		1830	// save gobs of state changes.
		1831	if (last_name != tex.name)
		1832	{
		1833	if (!tex.name)
		1834	continue; // smoothing not yet available
		1835
1497	glEnd ();	1836	glEnd ();
1498	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1837	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1499	glBegin (GL_QUADS);	1838	glBegin (GL_QUADS);
		1839	}
		1840
		1841	if (border)
		1842	{
		1843	float ox = border * dx;
		1844
		1845	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1846	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1847	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1848	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1849	}
		1850
		1851	if (corner)
		1852	{
		1853	float ox = corner * dx;
		1854
		1855	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1856	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1857	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1858	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1859	}
1500	}	1860	}
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	}	1861	}
1525	}	1862	}
1526	}
1527	}	1863	}
		1864	}
		1865
		1866	hv_clear (smooth);
		1867	}
1528		1868
1529	glEnd ();	1869	glEnd ();
1530		1870
1531	glDisable (GL_TEXTURE_2D);	1871	glDisable (GL_TEXTURE_2D);
1532	glDisable (GL_BLEND);	1872	glDisable (GL_BLEND);
…		…
1540	for (x = 0; x < sw; x++)	1880	for (x = 0; x < sw; x++)
1541	if (row->c0 <= x + mx && x + mx < row->c1)	1881	if (row->c0 <= x + mx && x + mx < row->c1)
1542	{	1882	{
1543	mapcell *cell = row->col + (x + mx - row->c0);	1883	mapcell *cell = row->col + (x + mx - row->c0);
1544		1884
1545	int px = x * 32;	1885	int px = x * T;
1546	int py = y * 32;	1886	int py = y * T;
1547		1887
1548	if (cell->stat_hp)	1888	if (cell->stat_hp)
1549	{	1889	{
1550	int width = cell->stat_width * 32;	1890	int width = cell->stat_width * T;
1551	int thick = sh / 28 + 1 + cell->stat_width;	1891	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1552		1892
1553	glColor3ub (0, 0, 0);	1893	glColor3ub (0, 0, 0);
1554	glRectf (px + 1, py - thick - 2,	1894	glRectf (px + 1, py - thick - 2,
1555	px + width - 1, py);	1895	px + width - 1, py);
1556		1896
…		…
1695	if (row && row->c0 <= x && x < row->c1)	2035	if (row && row->c0 <= x && x < row->c1)
1696	{	2036	{
1697	mapcell *cell = row->col + (x - row->c0);	2037	mapcell *cell = row->col + (x - row->c0);
1698	uint8_t flags = 0;	2038	uint8_t flags = 0;
1699		2039
1700	if (cell->face [0]) flags \|= 1;	2040	if (cell->tile [0]) flags \|= 1;
1701	if (cell->face [1]) flags \|= 2;	2041	if (cell->tile [1]) flags \|= 2;
1702	if (cell->face [2]) flags \|= 4;	2042	if (cell->tile [2]) flags \|= 4;
1703		2043
1704	*data++ = flags;	2044	*data++ = flags;
1705		2045
1706	if (flags & 1)	2046	if (flags & 1)
1707	{	2047	{
		2048	tileid tile = cell->tile [0];
1708	*data++ = cell->face [0] >> 8;	2049	*data++ = tile >> 8;
1709	*data++ = cell->face [0];	2050	*data++ = tile;
1710	}	2051	}
1711		2052
1712	if (flags & 2)	2053	if (flags & 2)
1713	{	2054	{
		2055	tileid tile = cell->tile [1];
1714	*data++ = cell->face [1] >> 8;	2056	*data++ = tile >> 8;
1715	*data++ = cell->face [1];	2057	*data++ = tile;
1716	}	2058	}
1717		2059
1718	if (flags & 4)	2060	if (flags & 4)
1719	{	2061	{
		2062	tileid tile = cell->tile [2];
1720	*data++ = cell->face [2] >> 8;	2063	*data++ = tile >> 8;
1721	*data++ = cell->face [2];	2064	*data++ = tile;
1722	}	2065	}
1723	}	2066	}
1724	else	2067	else
1725	*data++ = 0;	2068	*data++ = 0;
1726	}	2069	}
…		…
1766	{	2109	{
1767	uint8_t flags = *data++;	2110	uint8_t flags = *data++;
1768		2111
1769	if (flags)	2112	if (flags)
1770	{	2113	{
1771	mapface face[3] = { 0, 0, 0 };
1772
1773	mapcell *cell = row_get_cell (row, x);	2114	mapcell *cell = row_get_cell (row, x);
		2115	tileid tile[3] = { 0, 0, 0 };
1774		2116
1775	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2117	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1776	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2118	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1777	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2119	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1778		2120
1779	if (cell->darkness == 0)	2121	if (cell->darkness == 0)
1780	{	2122	{
1781	cell->darkness = 0;	2123	cell->darkness = 0;
1782		2124
1783	for (z = 0; z <= 2; z++)	2125	for (z = 0; z <= 2; z++)
1784	{	2126	{
1785	cell->face[z] = face[z];	2127	tileid t = tile [z];
1786		2128
1787	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2129	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2130	{
1788	XPUSHs (sv_2mortal (newSViv (face[z])));	2131	XPUSHs (sv_2mortal (newSViv (t)));
		2132	need_texid (self, t);
		2133	}
		2134
		2135	cell->tile [z] = t;
1789	}	2136	}
1790	}	2137	}
1791	}	2138	}
1792	}	2139	}
1793	}	2140	}
…		…
1828	CODE:	2175	CODE:
1829	RETVAL = Mix_VolumeMusic (volume);	2176	RETVAL = Mix_VolumeMusic (volume);
1830	OUTPUT:	2177	OUTPUT:
1831	RETVAL	2178	RETVAL
1832		2179
		2180	int
		2181	fade_out (int ms)
		2182	CODE:
		2183	RETVAL = Mix_FadeOutMusic (ms);
		2184	OUTPUT:
		2185	RETVAL
		2186
1833	CFPlus::MixMusic	2187	CFPlus::MixMusic
1834	new_from_file (SV class, char path)	2188	new_from_file (SV class, char path)
1835	CODE:	2189	CODE:
1836	RETVAL = Mix_LoadMUS (path);	2190	RETVAL = Mix_LoadMUS (path);
1837	OUTPUT:	2191	OUTPUT:
…		…
1844		2198
1845	int	2199	int
1846	play (CFPlus::MixMusic self, int loops = -1)	2200	play (CFPlus::MixMusic self, int loops = -1)
1847	CODE:	2201	CODE:
1848	RETVAL = Mix_PlayMusic (self, loops);	2202	RETVAL = Mix_PlayMusic (self, loops);
		2203	OUTPUT:
		2204	RETVAL
		2205
		2206	int
		2207	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2208	CODE:
		2209	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1849	OUTPUT:	2210	OUTPUT:
1850	RETVAL	2211	RETVAL
1851		2212
1852	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2213	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1853		2214
…		…
1857	static const struct {	2218	static const struct {
1858	const char *name;	2219	const char *name;
1859	IV iv;	2220	IV iv;
1860	} *civ, const_iv[] = {	2221	} *civ, const_iv[] = {
1861	# define const_iv(name) { # name, (IV)name }	2222	# define const_iv(name) { # name, (IV)name }
		2223	const_iv (GL_VENDOR),
		2224	const_iv (GL_VERSION),
		2225	const_iv (GL_EXTENSIONS),
1862	const_iv (GL_COLOR_MATERIAL),	2226	const_iv (GL_COLOR_MATERIAL),
1863	const_iv (GL_SMOOTH),	2227	const_iv (GL_SMOOTH),
1864	const_iv (GL_FLAT),	2228	const_iv (GL_FLAT),
1865	const_iv (GL_DITHER),	2229	const_iv (GL_DITHER),
1866	const_iv (GL_BLEND),	2230	const_iv (GL_BLEND),
…		…
1893	const_iv (GL_LUMINANCE),	2257	const_iv (GL_LUMINANCE),
1894	const_iv (GL_LUMINANCE_ALPHA),	2258	const_iv (GL_LUMINANCE_ALPHA),
1895	const_iv (GL_FLOAT),	2259	const_iv (GL_FLOAT),
1896	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2260	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1897	const_iv (GL_COMPILE),	2261	const_iv (GL_COMPILE),
		2262	const_iv (GL_PROXY_TEXTURE_1D),
		2263	const_iv (GL_PROXY_TEXTURE_2D),
1898	const_iv (GL_TEXTURE_1D),	2264	const_iv (GL_TEXTURE_1D),
1899	const_iv (GL_TEXTURE_2D),	2265	const_iv (GL_TEXTURE_2D),
1900	const_iv (GL_TEXTURE_ENV),	2266	const_iv (GL_TEXTURE_ENV),
1901	const_iv (GL_TEXTURE_MAG_FILTER),	2267	const_iv (GL_TEXTURE_MAG_FILTER),
1902	const_iv (GL_TEXTURE_MIN_FILTER),	2268	const_iv (GL_TEXTURE_MIN_FILTER),
…		…
1942	# undef const_iv	2308	# undef const_iv
1943	};	2309	};
1944		2310
1945	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2311	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1946	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2312	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2313
		2314	texture_av = newAV ();
		2315	AvREAL_off (texture_av);
1947	}	2316	}
1948		2317
1949	char *	2318	char *
1950	gl_vendor ()	2319	gl_vendor ()
1951	CODE:	2320	CODE:
…		…
1962		2331
1963	char *	2332	char *
1964	gl_extensions ()	2333	gl_extensions ()
1965	CODE:	2334	CODE:
1966	RETVAL = (char *)glGetString (GL_EXTENSIONS);	2335	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		2336	OUTPUT:
		2337	RETVAL
		2338
		2339	char *glGetString (GLenum pname)
		2340
		2341	GLint glGetInteger (GLenum pname)
		2342	CODE:
		2343	glGetIntegerv (pname, &RETVAL);
		2344	OUTPUT:
		2345	RETVAL
		2346
		2347	GLdouble glGetDouble (GLenum pname)
		2348	CODE:
		2349	glGetDoublev (pname, &RETVAL);
1967	OUTPUT:	2350	OUTPUT:
1968	RETVAL	2351	RETVAL
1969		2352
1970	int glGetError ()	2353	int glGetError ()
1971		2354
…		…
2096		2479
2097	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2480	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2098		2481
2099	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2482	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2100		2483
		2484	void glPixelZoom (float x, float y)
		2485
2101	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2486	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2102		2487
2103	int glGenTexture ()	2488	int glGenTexture ()
2104	CODE:	2489	CODE:
2105	{	2490	RETVAL = gen_texture ();
2106	GLuint name;
2107	glGenTextures (1, &name);
2108	RETVAL = name;
2109	}
2110	OUTPUT:	2491	OUTPUT:
2111	RETVAL	2492	RETVAL
2112		2493
2113	void glDeleteTexture (int name)	2494	void glDeleteTexture (int name)
2114	CODE:	2495	CODE:
2115	{
2116	GLuint name_ = name;
2117	glDeleteTextures (1, &name_);	2496	del_texture (name);
2118	}	2497
2119
2120	int glGenList ()	2498	int glGenList ()
2121	CODE:	2499	CODE:
2122	RETVAL = glGenLists (1);	2500	RETVAL = glGenLists (1);
2123	OUTPUT:	2501	OUTPUT:
2124	RETVAL	2502	RETVAL

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.199 by root, Tue Jul 17 13:53: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.199 by root, Tue Jul 17 13:53:02 2007 UTC