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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.165 by root, Fri Dec 8 14:59:54 2006 UTC vs.
Revision 1.200 by root, Tue Jul 17 16:02:13 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;
…		…
496	opengl_fontmap = pango_opengl_font_map_new ();	587	opengl_fontmap = pango_opengl_font_map_new ();
497	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	588	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
498	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	589	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
499	}	590	}
500		591
		592	char *
		593	SDL_GetError ()
		594
501	int	595	int
502	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)	596	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
503		597
504	void	598	void
505	SDL_Quit ()	599	SDL_Quit ()
506		600
507	void	601	void
508	SDL_ListModes ()	602	SDL_ListModes (int rgb, int alpha)
509	PPCODE:	603	PPCODE:
510	{	604	{
511	SDL_Rect **m;	605	SDL_Rect **m;
512		606
513	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	607	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
514	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	608	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
515	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	609	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
516	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	610	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
517		611
518	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	612	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
519	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	613	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
520		614
521	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	615	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
522	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	616	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
523	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	617	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
524	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	618	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
525		619
526	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	620	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
527	#if SDL_VERSION_ATLEAST(1,2,10)	621	#if SDL_VERSION_ATLEAST(1,2,10)
528	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);	622	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
529	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	623	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
530	#endif	624	#endif
531		625
532	SDL_EnableUNICODE (1);
533	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
534
535	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	626	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
536		627
537	if (m && m != (SDL_Rect **)-1)	628	if (m && m != (SDL_Rect **)-1)
538	while (*m)	629	while (*m)
539	{	630	{
		631	if ((m)->w >= 640 && (m)->h >= 480)
		632	{
540	AV *av = newAV ();	633	AV *av = newAV ();
541	av_push (av, newSViv ((*m)->w));	634	av_push (av, newSViv ((*m)->w));
542	av_push (av, newSViv ((*m)->h));	635	av_push (av, newSViv ((*m)->h));
		636	av_push (av, newSViv (rgb));
		637	av_push (av, newSViv (alpha));
543	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	638	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
		639	}
544		640
545	++m;	641	++m;
546	}	642	}
547	}	643	}
548		644
549	char *
550	SDL_GetError ()
551
552	int	645	int
553	SDL_SetVideoMode (int w, int h, int fullscreen)	646	SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
554	CODE:	647	CODE:
		648	{
		649	SDL_EnableUNICODE (1);
		650	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
		651
		652	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
		653	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
		654	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
		655	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
		656
555	RETVAL = !!SDL_SetVideoMode (	657	RETVAL = !!SDL_SetVideoMode (
556	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	658	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
557	);	659	);
		660
558	if (RETVAL)	661	if (RETVAL)
559	{	662	{
		663	av_clear (texture_av);
		664
560	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	665	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
561	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	666	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
562	# include "glfunc.h"	667	#include "glfunc.h"
563	# undef GL_FUNC	668	#undef GL_FUNC
564	}	669	}
		670	}
565	OUTPUT:	671	OUTPUT:
566	RETVAL	672	RETVAL
567		673
568	void	674	void
569	SDL_GL_SwapBuffers ()	675	SDL_GL_SwapBuffers ()
570		676
571	char *	677	char *
572	SDL_GetKeyName (int sym)	678	SDL_GetKeyName (int sym)
573		679
		680	int
		681	SDL_GetAppState ()
		682
574	void	683	void
575	SDL_PollEvent ()	684	poll_events ()
576	PPCODE:	685	PPCODE:
577	{	686	{
578	SDL_Event ev;	687	SDL_Event ev;
579		688
580	while (SDL_PollEvent (&ev))	689	SDL_PumpEvents ();
		690	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
581	{	691	{
582	HV *hv = newHV ();	692	HV *hv = newHV ();
583	hv_store (hv, "type", 4, newSViv (ev.type), 0);	693	hv_store (hv, "type", 4, newSViv (ev.type), 0);
584		694
585	switch (ev.type)	695	switch (ev.type)
…		…
587	case SDL_KEYDOWN:	697	case SDL_KEYDOWN:
588	case SDL_KEYUP:	698	case SDL_KEYUP:
589	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	699	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
590	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	700	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
591	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	701	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		702	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
592	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	703	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
593	break;	704	break;
594		705
595	case SDL_ACTIVEEVENT:	706	case SDL_ACTIVEEVENT:
596	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	707	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
597	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	708	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
598	break;	709	break;
599		710
600	case SDL_MOUSEMOTION:	711	case SDL_MOUSEMOTION:
		712	{
		713	int state = ev.motion.state;
		714	int x = ev.motion.x;
		715	int y = ev.motion.y;
		716	int xrel = ev.motion.xrel;
		717	int yrel = ev.motion.yrel;
		718
		719	/* do simplistic event compression */
		720	while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
		721	&& state == ev.motion.state)
		722	{
		723	xrel += ev.motion.xrel;
		724	yrel += ev.motion.yrel;
		725	x = ev.motion.x;
		726	y = ev.motion.y;
		727	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
		728	}
		729
601	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	730	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
602
603	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	731	hv_store (hv, "state", 5, newSViv (state), 0);
604	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	732	hv_store (hv, "x", 1, newSViv (x), 0);
605	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	733	hv_store (hv, "y", 1, newSViv (y), 0);
606	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	734	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
607	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	735	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		736	}
608	break;	737	break;
609		738
610	case SDL_MOUSEBUTTONDOWN:	739	case SDL_MOUSEBUTTONDOWN:
611	case SDL_MOUSEBUTTONUP:	740	case SDL_MOUSEBUTTONUP:
612	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	741	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
641	Mix_AllocateChannels (int numchans = -1)	770	Mix_AllocateChannels (int numchans = -1)
642		771
643	void	772	void
644	lowdelay (int fd, int val = 1)	773	lowdelay (int fd, int val = 1)
645	CODE:	774	CODE:
646	#ifndef _WIN32
647	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	775	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
648	#endif
649		776
650	void	777	void
651	win32_proxy_info ()	778	win32_proxy_info ()
652	PPCODE:	779	PPCODE:
653	{	780	{
…		…
794	ExitThread (retval); // unclean, please beam me up	921	ExitThread (retval); // unclean, please beam me up
795	#else	922	#else
796	_exit (retval);	923	_exit (retval);
797	#endif	924	#endif
798		925
		926	void
		927	debug ()
		928	CODE:
		929	{
		930	#if DEBUG
		931	VALGRIND_DO_LEAK_CHECK;
		932	#endif
		933	}
		934
799	MODULE = CFPlus PACKAGE = CFPlus::Font	935	MODULE = CFPlus PACKAGE = CFPlus::Font
800		936
801	CFPlus::Font	937	CFPlus::Font
802	new_from_file (SV class, char path, int id = 0)	938	new_from_file (SV class, char path, int id = 0)
803	CODE:	939	CODE:
…		…
1094	XSRETURN_EMPTY;	1230	XSRETURN_EMPTY;
1095		1231
1096	if (!(lp = pango_layout_get_line (self->pl, line)))	1232	if (!(lp = pango_layout_get_line (self->pl, line)))
1097	XSRETURN_EMPTY; /* do better */	1233	XSRETURN_EMPTY; /* do better */
1098		1234
1099	if (!pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing))	1235	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1100	XSRETURN_EMPTY; /* do better */
1101		1236
1102	EXTEND (SP, 2);	1237	EXTEND (SP, 2);
1103	if (GIMME_V == G_SCALAR)	1238	if (GIMME_V == G_SCALAR)
1104	PUSHs (sv_2mortal (newSViv (index + trailing)));	1239	PUSHs (sv_2mortal (newSViv (index + trailing)));
1105	else	1240	else
…		…
1119	flags	1254	flags
1120	);	1255	);
1121		1256
1122	MODULE = CFPlus PACKAGE = CFPlus::Texture	1257	MODULE = CFPlus PACKAGE = CFPlus::Texture
1123		1258
		1259	int minpot (int n)
		1260
1124	void	1261	void
1125	pad2pot (SV data_, SV w_, SV *h_)	1262	pad2pot (SV data_, SV w_, SV *h_)
1126	CODE:	1263	CODE:
1127	{	1264	{
1128	int ow = SvIV (w_);	1265	int ow = SvIV (w_);
…		…
1205	glDisable (GL_ALPHA_TEST);	1342	glDisable (GL_ALPHA_TEST);
1206	glDisable (GL_BLEND);	1343	glDisable (GL_BLEND);
1207	}	1344	}
1208	}	1345	}
1209		1346
		1347	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
		1348	CODE:
		1349	{
		1350	GLint width;
		1351	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
		1352	glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
		1353	RETVAL = width > 0;
		1354	}
		1355	OUTPUT:
		1356	RETVAL
		1357
1210	MODULE = CFPlus PACKAGE = CFPlus::Map	1358	MODULE = CFPlus PACKAGE = CFPlus::Map
1211		1359
1212	CFPlus::Map	1360	CFPlus::Map
1213	new (SV *class)	1361	new (SV *class)
1214	CODE:	1362	CODE:
…		…
1217	RETVAL->y = 0;	1365	RETVAL->y = 0;
1218	RETVAL->w = 0;	1366	RETVAL->w = 0;
1219	RETVAL->h = 0;	1367	RETVAL->h = 0;
1220	RETVAL->ox = 0;	1368	RETVAL->ox = 0;
1221	RETVAL->oy = 0;	1369	RETVAL->oy = 0;
1222	RETVAL->faces = 8192;	1370	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1223	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1371	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1224	RETVAL->texs = 8192;
1225	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1226	RETVAL->rows = 0;	1372	RETVAL->rows = 0;
1227	RETVAL->row = 0;	1373	RETVAL->row = 0;
1228	OUTPUT:	1374	OUTPUT:
1229	RETVAL	1375	RETVAL
1230		1376
1231	void	1377	void
1232	DESTROY (CFPlus::Map self)	1378	DESTROY (CFPlus::Map self)
1233	CODE:	1379	CODE:
1234	{	1380	{
1235	map_clear (self);	1381	map_clear (self);
1236	Safefree (self->face);	1382	Safefree (self->face2tile);
1237	Safefree (self->tex);	1383	Safefree (self->tex);
1238	Safefree (self);	1384	Safefree (self);
1239	}	1385	}
1240		1386
1241	void	1387	void
…		…
1248	clear (CFPlus::Map self)	1394	clear (CFPlus::Map self)
1249	CODE:	1395	CODE:
1250	map_clear (self);	1396	map_clear (self);
1251		1397
1252	void	1398	void
1253	set_face (CFPlus::Map self, int face, int texid)	1399	set_tileid (CFPlus::Map self, int face, int tile)
1254	CODE:	1400	CODE:
1255	{	1401	{
1256	while (self->faces <= face)	1402	need_facenum (self, face); self->face2tile [face] = tile;
1257	{	1403	need_texid (self, tile);
1258	Append (mapface, self->face, self->faces, self->faces);	1404	}
1259	self->faces *= 2;
1260	}
1261		1405
1262	self->face [face] = texid;	1406	void
		1407	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1408	CODE:
		1409	{
		1410	tileid texid;
		1411	maptex *tex;
		1412
		1413	if (face < 0 \|\| face >= self->faces)
		1414	return;
		1415
		1416	if (smooth < 0 \|\| smooth >= self->faces)
		1417	return;
		1418
		1419	texid = self->face2tile [face];
		1420
		1421	if (!texid)
		1422	return;
		1423
		1424	tex = self->tex + texid;
		1425	tex->smoothtile = self->face2tile [smooth];
		1426	tex->smoothlevel = level;
1263	}	1427	}
1264		1428
1265	void	1429	void
1266	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)	1430	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)
1267	CODE:	1431	CODE:
1268	{	1432	{
1269	while (self->texs <= texid)	1433	need_texid (self, texid);
1270	{
1271	Append (maptex, self->tex, self->texs, self->texs);
1272	self->texs *= 2;
1273	}
1274		1434
1275	{	1435	{
1276	maptex *tex = self->tex + texid;	1436	maptex *tex = self->tex + texid;
1277		1437
1278	tex->name = name;	1438	tex->name = name;
…		…
1322	CODE:	1482	CODE:
1323	{	1483	{
1324	if (dx > 0)	1484	if (dx > 0)
1325	map_blank (self, self->x, self->y, dx, self->h);	1485	map_blank (self, self->x, self->y, dx, self->h);
1326	else if (dx < 0)	1486	else if (dx < 0)
1327	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1487	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1328		1488
1329	if (dy > 0)	1489	if (dy > 0)
1330	map_blank (self, self->x, self->y, self->w, dy);	1490	map_blank (self, self->x, self->y, self->w, dy);
1331	else if (dy < 0)	1491	else if (dy < 0)
1332	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1492	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1333		1493
1334	self->ox += dx; self->x += dx;	1494	self->ox += dx; self->x += dx;
1335	self->oy += dy; self->y += dy;	1495	self->oy += dy; self->y += dy;
1336		1496
1337	while (self->y < 0)	1497	while (self->y < 0)
…		…
1389	cell->stat_width = 1;	1549	cell->stat_width = 1;
1390	cell->stat_hp = *data++;	1550	cell->stat_hp = *data++;
1391	}	1551	}
1392	else if (cmd == 6) // monster width	1552	else if (cmd == 6) // monster width
1393	cell->stat_width = *data++ + 1;	1553	cell->stat_width = *data++ + 1;
1394	else if (cmd == 0x47) // monster width	1554	else if (cmd == 0x47)
1395	{	1555	{
1396	if (*data == 4)	1556	if (*data == 4)
1397	; // decode player tag	1557	; // decode player count
1398		1558
1399	data += *data + 1;	1559	data += *data + 1;
1400	}	1560	}
1401	else if (cmd == 8) // cell flags	1561	else if (cmd == 8) // cell flags
1402	cell->flags = *data++;	1562	cell->flags = *data++;
…		…
1411	cell->darkness = *data++ + 1;	1571	cell->darkness = *data++ + 1;
1412	}	1572	}
1413		1573
1414	if (flags & 4)	1574	if (flags & 4)
1415	{	1575	{
1416	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1576	faceid face = (data [0] << 8) + data [1]; data += 2;
		1577	need_facenum (self, face);
		1578	cell->tile [0] = self->face2tile [face];
1417	}	1579	}
1418		1580
1419	if (flags & 2)	1581	if (flags & 2)
1420	{	1582	{
1421	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1583	faceid face = (data [0] << 8) + data [1]; data += 2;
		1584	need_facenum (self, face);
		1585	cell->tile [1] = self->face2tile [face];
1422	}	1586	}
1423		1587
1424	if (flags & 1)	1588	if (flags & 1)
1425	{	1589	{
1426	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1590	faceid face = (data [0] << 8) + data [1]; data += 2;
		1591	need_facenum (self, face);
		1592	cell->tile [2] = self->face2tile [face];
1427	}	1593	}
1428	}	1594	}
1429	else	1595	else
1430	cell->darkness = 0;	1596	cell->darkness = 0;
1431	}	1597	}
…		…
1461	{	1627	{
1462	mapcell *cell = row->col + (x - row->c0);	1628	mapcell *cell = row->col + (x - row->c0);
1463		1629
1464	for (z = 0; z <= 0; z++)	1630	for (z = 0; z <= 0; z++)
1465	{	1631	{
1466	mapface face = cell->face [z];
1467
1468	if (face)
1469	{
1470	maptex tex = self->tex [face];	1632	maptex tex = self->tex [cell->tile [z]];
1471	int a0 = 255 - tex.a;	1633	int a0 = 255 - tex.a;
1472	int a1 = tex.a;	1634	int a1 = tex.a;
1473		1635
1474	r = (r * a0 + tex.r * a1) / 255;	1636	r = (r * a0 + tex.r * a1) / 255;
1475	g = (g * a0 + tex.g * a1) / 255;	1637	g = (g * a0 + tex.g * a1) / 255;
1476	b = (b * a0 + tex.b * a1) / 255;	1638	b = (b * a0 + tex.b * a1) / 255;
1477	a = (a * a0 + tex.a * a1) / 255;	1639	a = (a * a0 + tex.a * a1) / 255;
1478	}
1479	}	1640	}
1480	}	1641	}
1481		1642
1482	*map++ = (r )	1643	*map++ = (r )
1483	\| (g << 8)	1644	\| (g << 8)
…		…
1490	}	1651	}
1491	OUTPUT:	1652	OUTPUT:
1492	RETVAL	1653	RETVAL
1493		1654
1494	void	1655	void
1495	draw (CFPlus::Map self, int mx, int my, int sw, int sh)	1656	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1496	CODE:	1657	CODE:
1497	{	1658	{
		1659	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
		1660	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1661	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1662	smooth_key skey;
1498	int x, y, z;	1663	int x, y, z;
1499	int last_name;	1664	int last_name;
1500	mapface face;	1665
		1666	// thats current max. sorry.
		1667	if (sw > 255) sw = 255;
		1668	if (sh > 255) sh = 255;
		1669
		1670	// clear key, in case of extra padding
		1671	memset (&skey, 0, sizeof (skey));
1501		1672
1502	glColor4ub (255, 255, 255, 255);	1673	glColor4ub (255, 255, 255, 255);
1503		1674
1504	glEnable (GL_BLEND);	1675	glEnable (GL_BLEND);
1505	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1676	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1511	last_name = 0;	1682	last_name = 0;
1512		1683
1513	mx += self->x;	1684	mx += self->x;
1514	my += self->y;	1685	my += self->y;
1515		1686
		1687	// first pass: determine smooth_max
		1688	// rather ugly, if you ask me
		1689	// could also be stored inside mapcell and updated on change
		1690	memset (smooth_max, 0, sizeof (smooth_max));
		1691
		1692	for (y = 0; y < sh; y++)
		1693	if (0 <= y + my && y + my < self->rows)
		1694	{
		1695	maprow *row = self->row + (y + my);
		1696
		1697	for (x = 0; x < sw; x++)
		1698	if (row->c0 <= x + mx && x + mx < row->c1)
		1699	{
		1700	mapcell *cell = row->col + (x + mx - row->c0);
		1701
		1702	smooth_max[x + 1][y + 1] =
		1703	MAX (self->tex [cell->tile [0]].smoothlevel,
		1704	MAX (self->tex [cell->tile [1]].smoothlevel,
		1705	self->tex [cell->tile [2]].smoothlevel));
		1706	}
		1707	}
		1708
1516	for (z = 0; z < 3; z++)	1709	for (z = 0; z <= 2; z++)
		1710	{
		1711	memset (smooth_level, 0, sizeof (smooth_level));
		1712
1517	for (y = 0; y < sh; y++)	1713	for (y = 0; y < sh; y++)
1518	if (0 <= y + my && y + my < self->rows)	1714	if (0 <= y + my && y + my < self->rows)
1519	{	1715	{
1520	maprow *row = self->row + (y + my);	1716	maprow *row = self->row + (y + my);
1521		1717
1522	for (x = 0; x < sw; x++)	1718	for (x = 0; x < sw; x++)
1523	if (row->c0 <= x + mx && x + mx < row->c1)	1719	if (row->c0 <= x + mx && x + mx < row->c1)
1524	{	1720	{
1525	mapcell *cell = row->col + (x + mx - row->c0);	1721	mapcell *cell = row->col + (x + mx - row->c0);
1526
1527	face = cell->face [z];	1722	tileid tile = cell->tile [z];
		1723
		1724	if (tile)
		1725	{
		1726	maptex tex = self->tex [tile];
		1727	int px = (x + 1) * T - tex.w;
		1728	int py = (y + 1) * T - tex.h;
1528		1729
1529	if (face && face < self->texs)	1730	// suppressing texture state switches here
		1731	// is only moderately effective, but worth the extra effort
		1732	if (last_name != tex.name)
		1733	{
		1734	if (!tex.name)
		1735	tex = self->tex [2]; /* missing, replace by noface */
		1736
		1737	glEnd ();
		1738	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1739	glBegin (GL_QUADS);
		1740	}
		1741
		1742	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1743	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1744	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1745	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1746
		1747	if (cell->flags && z == 2)
		1748	{
		1749	if (cell->flags & 1)
		1750	{
		1751	maptex tex = self->tex [1];
		1752	int px = x * T + T * 2 / 32;
		1753	int py = y * T - T * 6 / 32;
		1754
		1755	glEnd ();
		1756	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1757	glBegin (GL_QUADS);
		1758
		1759	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1760	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1761	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1762	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1763	}
		1764	}
		1765
		1766	// update smooth hash
		1767	if (tex.smoothtile)
		1768	{
		1769	skey.tile = tex.smoothtile;
		1770	skey.level = tex.smoothlevel;
		1771
		1772	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1773
		1774	// add bits to current tile and all neighbours. skey.x\|y is
		1775	// shifted +1\|+1 so we always stay positive.
		1776
		1777	// bits is ___n cccc CCCC bbbb
		1778	// n do not draw borders&corners
		1779	// c draw these corners, but...
		1780	// C ... not these
		1781	// b draw these borders
		1782
		1783	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1784	// ┃· ·· ·┃ ━━
		1785
		1786	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1787	// ·· ·· ·┏ ┓·
		1788
		1789	// full tile
		1790	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1791
		1792	// borders
		1793	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1794	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1795	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1796	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1797
		1798	// corners
		1799	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1800	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1801	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1802	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1803	}
		1804	}
		1805	}
		1806	}
		1807
		1808	// go through all smoothlevels, lowest to highest, then draw.
		1809	// this is basically counting sort
		1810	{
		1811	int w, b;
		1812
		1813	for (w = 0; w < 256 / 32; ++w)
		1814	{
		1815	uint32_t smask = smooth_level [w];
		1816	if (smask)
		1817	for (b = 0; b < 32; ++b)
		1818	if (smask & (((uint32_t)1) << b))
1530	{	1819	{
1531	maptex tex = self->tex [face];	1820	int level = (w << 5) \| b;
1532	int px = (x + 1) * 32 - tex.w;	1821	HE *he;
1533	int py = (y + 1) * 32 - tex.h;
1534		1822
1535	if (last_name != tex.name)	1823	hv_iterinit (smooth);
		1824	while ((he = hv_iternext (smooth)))
1536	{	1825	{
		1826	smooth_key skey = (smooth_key )HeKEY (he);
		1827	IV bits = SvIVX (HeVAL (he));
		1828
		1829	if (!(bits & 0x1000)
		1830	&& skey->level == level
		1831	&& level > smooth_max [skey->x][skey->y])
		1832	{
		1833	maptex tex = self->tex [skey->tile];
		1834	int px = (((int)skey->x) - 1) * T;
		1835	int py = (((int)skey->y) - 1) * T;
		1836	int border = bits & 15;
		1837	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1838	float dx = tex.s * .0625f; // 16 images/row
		1839	float dy = tex.t * .5f ; // 2 images/column
		1840
		1841	// this time naively avoiding texture state changes
		1842	// save gobs of state changes.
		1843	if (last_name != tex.name)
		1844	{
		1845	if (!tex.name)
		1846	continue; // smoothing not yet available
		1847
1537	glEnd ();	1848	glEnd ();
1538	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1849	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1539	glBegin (GL_QUADS);	1850	glBegin (GL_QUADS);
		1851	}
		1852
		1853	if (border)
		1854	{
		1855	float ox = border * dx;
		1856
		1857	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1858	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1859	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1860	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1861	}
		1862
		1863	if (corner)
		1864	{
		1865	float ox = corner * dx;
		1866
		1867	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1868	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1869	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1870	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1871	}
1540	}	1872	}
1541
1542	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1543	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1544	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1545	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1546	}
1547
1548	if (cell->flags && z == 2)
1549	{
1550	if (cell->flags & 1)
1551	{
1552	maptex tex = self->tex [1];
1553	int px = (x + 1) * 32 - tex.w + 2;
1554	int py = (y + 1) * 32 - tex.h - 6;
1555
1556	glEnd ();
1557	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1558	glBegin (GL_QUADS);
1559
1560	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1561	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1562	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1563	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1564	}	1873	}
1565	}	1874	}
1566	}
1567	}	1875	}
		1876	}
		1877
		1878	hv_clear (smooth);
		1879	}
1568		1880
1569	glEnd ();	1881	glEnd ();
1570		1882
1571	glDisable (GL_TEXTURE_2D);	1883	glDisable (GL_TEXTURE_2D);
1572	glDisable (GL_BLEND);	1884	glDisable (GL_BLEND);
…		…
1580	for (x = 0; x < sw; x++)	1892	for (x = 0; x < sw; x++)
1581	if (row->c0 <= x + mx && x + mx < row->c1)	1893	if (row->c0 <= x + mx && x + mx < row->c1)
1582	{	1894	{
1583	mapcell *cell = row->col + (x + mx - row->c0);	1895	mapcell *cell = row->col + (x + mx - row->c0);
1584		1896
1585	int px = x * 32;	1897	int px = x * T;
1586	int py = y * 32;	1898	int py = y * T;
1587		1899
1588	if (cell->stat_hp)	1900	if (cell->stat_hp)
1589	{	1901	{
1590	int width = cell->stat_width * 32;	1902	int width = cell->stat_width * T;
1591	int thick = sh / 28 + 1 + cell->stat_width;	1903	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1592		1904
1593	glColor3ub (0, 0, 0);	1905	glColor3ub (0, 0, 0);
1594	glRectf (px + 1, py - thick - 2,	1906	glRectf (px + 1, py - thick - 2,
1595	px + width - 1, py);	1907	px + width - 1, py);
1596		1908
…		…
1735	if (row && row->c0 <= x && x < row->c1)	2047	if (row && row->c0 <= x && x < row->c1)
1736	{	2048	{
1737	mapcell *cell = row->col + (x - row->c0);	2049	mapcell *cell = row->col + (x - row->c0);
1738	uint8_t flags = 0;	2050	uint8_t flags = 0;
1739		2051
1740	if (cell->face [0]) flags \|= 1;	2052	if (cell->tile [0]) flags \|= 1;
1741	if (cell->face [1]) flags \|= 2;	2053	if (cell->tile [1]) flags \|= 2;
1742	if (cell->face [2]) flags \|= 4;	2054	if (cell->tile [2]) flags \|= 4;
1743		2055
1744	*data++ = flags;	2056	*data++ = flags;
1745		2057
1746	if (flags & 1)	2058	if (flags & 1)
1747	{	2059	{
		2060	tileid tile = cell->tile [0];
1748	*data++ = cell->face [0] >> 8;	2061	*data++ = tile >> 8;
1749	*data++ = cell->face [0];	2062	*data++ = tile;
1750	}	2063	}
1751		2064
1752	if (flags & 2)	2065	if (flags & 2)
1753	{	2066	{
		2067	tileid tile = cell->tile [1];
1754	*data++ = cell->face [1] >> 8;	2068	*data++ = tile >> 8;
1755	*data++ = cell->face [1];	2069	*data++ = tile;
1756	}	2070	}
1757		2071
1758	if (flags & 4)	2072	if (flags & 4)
1759	{	2073	{
		2074	tileid tile = cell->tile [2];
1760	*data++ = cell->face [2] >> 8;	2075	*data++ = tile >> 8;
1761	*data++ = cell->face [2];	2076	*data++ = tile;
1762	}	2077	}
1763	}	2078	}
1764	else	2079	else
1765	*data++ = 0;	2080	*data++ = 0;
1766	}	2081	}
…		…
1806	{	2121	{
1807	uint8_t flags = *data++;	2122	uint8_t flags = *data++;
1808		2123
1809	if (flags)	2124	if (flags)
1810	{	2125	{
1811	mapface face[3] = { 0, 0, 0 };
1812
1813	mapcell *cell = row_get_cell (row, x);	2126	mapcell *cell = row_get_cell (row, x);
		2127	tileid tile[3] = { 0, 0, 0 };
1814		2128
1815	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2129	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1816	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2130	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1817	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2131	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1818		2132
1819	if (cell->darkness == 0)	2133	if (cell->darkness == 0)
1820	{	2134	{
1821	cell->darkness = 0;	2135	cell->darkness = 0;
1822		2136
1823	for (z = 0; z <= 2; z++)	2137	for (z = 0; z <= 2; z++)
1824	{	2138	{
1825	cell->face[z] = face[z];	2139	tileid t = tile [z];
1826		2140
1827	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2141	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2142	{
1828	XPUSHs (sv_2mortal (newSViv (face[z])));	2143	XPUSHs (sv_2mortal (newSViv (t)));
		2144	need_texid (self, t);
		2145	}
		2146
		2147	cell->tile [z] = t;
1829	}	2148	}
1830	}	2149	}
1831	}	2150	}
1832	}	2151	}
1833	}	2152	}
…		…
1868	CODE:	2187	CODE:
1869	RETVAL = Mix_VolumeMusic (volume);	2188	RETVAL = Mix_VolumeMusic (volume);
1870	OUTPUT:	2189	OUTPUT:
1871	RETVAL	2190	RETVAL
1872		2191
		2192	int
		2193	fade_out (int ms)
		2194	CODE:
		2195	RETVAL = Mix_FadeOutMusic (ms);
		2196	OUTPUT:
		2197	RETVAL
		2198
1873	CFPlus::MixMusic	2199	CFPlus::MixMusic
1874	new_from_file (SV class, char path)	2200	new_from_file (SV class, char path)
1875	CODE:	2201	CODE:
1876	RETVAL = Mix_LoadMUS (path);	2202	RETVAL = Mix_LoadMUS (path);
1877	OUTPUT:	2203	OUTPUT:
…		…
1884		2210
1885	int	2211	int
1886	play (CFPlus::MixMusic self, int loops = -1)	2212	play (CFPlus::MixMusic self, int loops = -1)
1887	CODE:	2213	CODE:
1888	RETVAL = Mix_PlayMusic (self, loops);	2214	RETVAL = Mix_PlayMusic (self, loops);
		2215	OUTPUT:
		2216	RETVAL
		2217
		2218	int
		2219	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2220	CODE:
		2221	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1889	OUTPUT:	2222	OUTPUT:
1890	RETVAL	2223	RETVAL
1891		2224
1892	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2225	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1893		2226
…		…
1897	static const struct {	2230	static const struct {
1898	const char *name;	2231	const char *name;
1899	IV iv;	2232	IV iv;
1900	} *civ, const_iv[] = {	2233	} *civ, const_iv[] = {
1901	# define const_iv(name) { # name, (IV)name }	2234	# define const_iv(name) { # name, (IV)name }
		2235	const_iv (GL_VENDOR),
		2236	const_iv (GL_VERSION),
		2237	const_iv (GL_EXTENSIONS),
1902	const_iv (GL_COLOR_MATERIAL),	2238	const_iv (GL_COLOR_MATERIAL),
1903	const_iv (GL_SMOOTH),	2239	const_iv (GL_SMOOTH),
1904	const_iv (GL_FLAT),	2240	const_iv (GL_FLAT),
1905	const_iv (GL_DITHER),	2241	const_iv (GL_DITHER),
1906	const_iv (GL_BLEND),	2242	const_iv (GL_BLEND),
…		…
1933	const_iv (GL_LUMINANCE),	2269	const_iv (GL_LUMINANCE),
1934	const_iv (GL_LUMINANCE_ALPHA),	2270	const_iv (GL_LUMINANCE_ALPHA),
1935	const_iv (GL_FLOAT),	2271	const_iv (GL_FLOAT),
1936	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2272	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1937	const_iv (GL_COMPILE),	2273	const_iv (GL_COMPILE),
		2274	const_iv (GL_PROXY_TEXTURE_1D),
		2275	const_iv (GL_PROXY_TEXTURE_2D),
1938	const_iv (GL_TEXTURE_1D),	2276	const_iv (GL_TEXTURE_1D),
1939	const_iv (GL_TEXTURE_2D),	2277	const_iv (GL_TEXTURE_2D),
1940	const_iv (GL_TEXTURE_ENV),	2278	const_iv (GL_TEXTURE_ENV),
1941	const_iv (GL_TEXTURE_MAG_FILTER),	2279	const_iv (GL_TEXTURE_MAG_FILTER),
1942	const_iv (GL_TEXTURE_MIN_FILTER),	2280	const_iv (GL_TEXTURE_MIN_FILTER),
…		…
1982	# undef const_iv	2320	# undef const_iv
1983	};	2321	};
1984		2322
1985	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2323	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1986	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2324	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2325
		2326	texture_av = newAV ();
		2327	AvREAL_off (texture_av);
1987	}	2328	}
1988		2329
1989	char *	2330	char *
1990	gl_vendor ()	2331	gl_vendor ()
1991	CODE:	2332	CODE:
…		…
2002		2343
2003	char *	2344	char *
2004	gl_extensions ()	2345	gl_extensions ()
2005	CODE:	2346	CODE:
2006	RETVAL = (char *)glGetString (GL_EXTENSIONS);	2347	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		2348	OUTPUT:
		2349	RETVAL
		2350
		2351	char *glGetString (GLenum pname)
		2352
		2353	GLint glGetInteger (GLenum pname)
		2354	CODE:
		2355	glGetIntegerv (pname, &RETVAL);
		2356	OUTPUT:
		2357	RETVAL
		2358
		2359	GLdouble glGetDouble (GLenum pname)
		2360	CODE:
		2361	glGetDoublev (pname, &RETVAL);
2007	OUTPUT:	2362	OUTPUT:
2008	RETVAL	2363	RETVAL
2009		2364
2010	int glGetError ()	2365	int glGetError ()
2011		2366
…		…
2136		2491
2137	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2492	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2138		2493
2139	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2494	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2140		2495
		2496	void glPixelZoom (float x, float y)
		2497
2141	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2498	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2142		2499
2143	int glGenTexture ()	2500	int glGenTexture ()
2144	CODE:	2501	CODE:
2145	{	2502	RETVAL = gen_texture ();
2146	GLuint name;
2147	glGenTextures (1, &name);
2148	RETVAL = name;
2149	}
2150	OUTPUT:	2503	OUTPUT:
2151	RETVAL	2504	RETVAL
2152		2505
2153	void glDeleteTexture (int name)	2506	void glDeleteTexture (int name)
2154	CODE:	2507	CODE:
2155	{
2156	GLuint name_ = name;
2157	glDeleteTextures (1, &name_);	2508	del_texture (name);
2158	}	2509
2159
2160	int glGenList ()	2510	int glGenList ()
2161	CODE:	2511	CODE:
2162	RETVAL = glGenLists (1);	2512	RETVAL = glGenLists (1);
2163	OUTPUT:	2513	OUTPUT:
2164	RETVAL	2514	RETVAL

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.165 by root, Fri Dec 8 14:59:54 2006 UTC vs. Revision 1.200 by root, Tue Jul 17 16:02:13 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.165 by root, Fri Dec 8 14:59:54 2006 UTC vs.
Revision 1.200 by root, Tue Jul 17 16:02:13 2007 UTC