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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.175 by root, Fri Apr 6 08:09:42 2007 UTC vs.
Revision 1.206 by root, Thu Jul 19 23:29:16 2007 UTC

…		…
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
…		…
21	#include <string.h>	26	#include <string.h>
22	#include <stdio.h>	27	#include <stdio.h>
23	#include <stdlib.h>	28	#include <stdlib.h>
24		29
25	#include <SDL.h>	30	#include <SDL.h>
		31	#include <SDL_thread.h>
26	#include <SDL_endian.h>	32	#include <SDL_endian.h>
27	#include <SDL_image.h>	33	#include <SDL_image.h>
28	#include <SDL_mixer.h>	34	#include <SDL_mixer.h>
29	#include <SDL_opengl.h>	35	#include <SDL_opengl.h>
30		36
…		…
56	# define PARACHUTE SDL_INIT_NOPARACHUTE	62	# define PARACHUTE SDL_INIT_NOPARACHUTE
57	#else	63	#else
58	# define PARACHUTE 0	64	# define PARACHUTE 0
59	#endif	65	#endif
60		66
		67	static AV *texture_av;
		68
61	static struct	69	static struct
62	{	70	{
63	#define GL_FUNC(ptr,name) ptr name;	71	#define GL_FUNC(ptr,name) ptr name;
64	#include "glfunc.h"	72	#include "glfunc.h"
65	#undef GL_FUNC	73	#undef GL_FUNC
66	} gl;	74	} gl;
67		75
		76	static void
68	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	77	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69	{	78	{
70	if (gl.BlendFuncSeparate)	79	if (gl.BlendFuncSeparate)
71	gl.BlendFuncSeparate (sa, da, saa, daa);	80	gl.BlendFuncSeparate (sa, da, saa, daa);
72	else if (gl.BlendFuncSeparateEXT)	81	else if (gl.BlendFuncSeparateEXT)
73	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	82	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74	else	83	else
75	glBlendFunc (sa, da);	84	glBlendFunc (sa, da);
76	}	85	}
77		86
		87	static GLuint
		88	gen_texture ()
		89	{
		90	GLuint name;
		91
		92	if (AvFILL (texture_av) >= 0)
		93	name = (GLuint)(size_t)av_pop (texture_av);
		94	else
		95	glGenTextures (1, &name);
		96
		97	return name;
		98	}
		99
		100	static void
		101	del_texture (GLuint name)
		102	{
		103	/* make a half-assed attempt at returning the memory used by the texture */
		104	/* textures are frequently being reused by cfplus anyway */
		105	/glBindTexture (GL_TEXTURE_2D, name);/
		106	/glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);/
		107	av_push (texture_av, (SV *)(size_t)name);
		108	glDeleteTextures (1, &name);
		109	}
		110
78	#include "texcache.c"	111	#include "texcache.c"
79		112
80	#include "pango-font.c"	113	#include "pango-font.c"
81	#include "pango-fontmap.c"	114	#include "pango-fontmap.c"
82	#include "pango-render.c"	115	#include "pango-render.c"
…		…
163	typedef struct {	196	typedef struct {
164	int name;	197	int name;
165	int w, h;	198	int w, h;
166	float s, t;	199	float s, t;
167	uint8_t r, g, b, a;	200	uint8_t r, g, b, a;
		201	tileid smoothtile;
		202	uint8_t smoothlevel;
168	} maptex;	203	} maptex;
169		204
170	typedef struct {	205	typedef struct {
171	uint32_t player;	206	uint32_t player;
172	tileid tile[3];	207	tileid tile[3];
173	uint16_t darkness;	208	uint16_t darkness;
174	uint8_t stat_width, stat_hp, flags;	209	uint8_t stat_width, stat_hp, flags, smoothmax;
175	} mapcell;	210	} mapcell;
176		211
177	typedef struct {	212	typedef struct {
178	int32_t c0, c1;	213	int32_t c0, c1;
179	mapcell *col;	214	mapcell *col;
…		…
333	cell->stat_hp = 0;	368	cell->stat_hp = 0;
334	cell->flags = 0;	369	cell->flags = 0;
335	cell->player = 0;	370	cell->player = 0;
336	}	371	}
337	}	372	}
		373	}
		374
		375	typedef struct {
		376	tileid tile;
		377	uint8_t x, y, level;
		378	} smooth_key;
		379
		380	static void
		381	smooth_or_bits (HV hv, smooth_key key, IV bits)
		382	{
		383	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);
		384
		385	if (SvIOK (*sv))
		386	SvIV_set (sv, SvIVX (sv) \| bits);
		387	else
		388	sv_setiv (*sv, bits);
338	}	389	}
339		390
340	static void	391	static void
341	music_finished (void)	392	music_finished (void)
342	{	393	{
…		…
537	opengl_fontmap = pango_opengl_font_map_new ();	588	opengl_fontmap = pango_opengl_font_map_new ();
538	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	589	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
539	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	590	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
540	}	591	}
541		592
		593	char *
		594	SDL_GetError ()
		595
542	int	596	int
543	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)	597	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
544		598
545	void	599	void
546	SDL_Quit ()	600	SDL_Quit ()
547		601
548	void	602	void
549	SDL_ListModes ()	603	SDL_ListModes (int rgb, int alpha)
550	PPCODE:	604	PPCODE:
551	{	605	{
552	SDL_Rect **m;	606	SDL_Rect **m;
553		607
554	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	608	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
555	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	609	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
556	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	610	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
557	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	611	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
558		612
559	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	613	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
560	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	614	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
561		615
562	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	616	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
563	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	617	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
564	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	618	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
565	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	619	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
566		620
567	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	621	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
568	#if SDL_VERSION_ATLEAST(1,2,10)	622	#if SDL_VERSION_ATLEAST(1,2,10)
569	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);	623	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
570	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	624	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
571	#endif	625	#endif
572		626
573	SDL_EnableUNICODE (1);
574	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
575
576	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	627	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
577		628
578	if (m && m != (SDL_Rect **)-1)	629	if (m && m != (SDL_Rect **)-1)
579	while (*m)	630	while (*m)
580	{	631	{
		632	if ((m)->w >= 640 && (m)->h >= 480)
		633	{
581	AV *av = newAV ();	634	AV *av = newAV ();
582	av_push (av, newSViv ((*m)->w));	635	av_push (av, newSViv ((*m)->w));
583	av_push (av, newSViv ((*m)->h));	636	av_push (av, newSViv ((*m)->h));
		637	av_push (av, newSViv (rgb));
		638	av_push (av, newSViv (alpha));
584	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	639	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
		640	}
585		641
586	++m;	642	++m;
587	}	643	}
588	}	644	}
589		645
590	char *
591	SDL_GetError ()
592
593	int	646	int
594	SDL_SetVideoMode (int w, int h, int fullscreen)	647	SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
595	CODE:	648	CODE:
		649	{
		650	SDL_EnableUNICODE (1);
		651	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
		652
		653	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
		654	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
		655	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
		656	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
		657
596	RETVAL = !!SDL_SetVideoMode (	658	RETVAL = !!SDL_SetVideoMode (
597	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	659	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
598	);	660	);
		661
599	if (RETVAL)	662	if (RETVAL)
600	{	663	{
		664	av_clear (texture_av);
		665
601	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	666	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
602	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	667	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
603	# include "glfunc.h"	668	#include "glfunc.h"
604	# undef GL_FUNC	669	#undef GL_FUNC
605	}	670	}
		671	}
606	OUTPUT:	672	OUTPUT:
607	RETVAL	673	RETVAL
608		674
609	void	675	void
610	SDL_GL_SwapBuffers ()	676	SDL_GL_SwapBuffers ()
611		677
612	char *	678	char *
613	SDL_GetKeyName (int sym)	679	SDL_GetKeyName (int sym)
614		680
		681	int
		682	SDL_GetAppState ()
		683
615	void	684	void
616	SDL_PollEvent ()	685	poll_events ()
617	PPCODE:	686	PPCODE:
618	{	687	{
619	SDL_Event ev;	688	SDL_Event ev;
620		689
621	while (SDL_PollEvent (&ev))	690	SDL_PumpEvents ();
		691	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
622	{	692	{
623	HV *hv = newHV ();	693	HV *hv = newHV ();
624	hv_store (hv, "type", 4, newSViv (ev.type), 0);	694	hv_store (hv, "type", 4, newSViv (ev.type), 0);
625		695
626	switch (ev.type)	696	switch (ev.type)
…		…
638	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	708	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
639	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	709	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
640	break;	710	break;
641		711
642	case SDL_MOUSEMOTION:	712	case SDL_MOUSEMOTION:
		713	{
		714	int state = ev.motion.state;
		715	int x = ev.motion.x;
		716	int y = ev.motion.y;
		717	int xrel = ev.motion.xrel;
		718	int yrel = ev.motion.yrel;
		719
		720	/* do simplistic event compression */
		721	while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
		722	&& state == ev.motion.state)
		723	{
		724	xrel += ev.motion.xrel;
		725	yrel += ev.motion.yrel;
		726	x = ev.motion.x;
		727	y = ev.motion.y;
		728	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
		729	}
		730
643	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	731	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
644
645	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	732	hv_store (hv, "state", 5, newSViv (state), 0);
646	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	733	hv_store (hv, "x", 1, newSViv (x), 0);
647	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	734	hv_store (hv, "y", 1, newSViv (y), 0);
648	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	735	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
649	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	736	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		737	}
650	break;	738	break;
651		739
652	case SDL_MOUSEBUTTONDOWN:	740	case SDL_MOUSEBUTTONDOWN:
653	case SDL_MOUSEBUTTONUP:	741	case SDL_MOUSEBUTTONUP:
654	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	742	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
683	Mix_AllocateChannels (int numchans = -1)	771	Mix_AllocateChannels (int numchans = -1)
684		772
685	void	773	void
686	lowdelay (int fd, int val = 1)	774	lowdelay (int fd, int val = 1)
687	CODE:	775	CODE:
688	#ifndef _WIN32
689	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	776	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
690	#endif
691		777
692	void	778	void
693	win32_proxy_info ()	779	win32_proxy_info ()
694	PPCODE:	780	PPCODE:
695	{	781	{
…		…
836	ExitThread (retval); // unclean, please beam me up	922	ExitThread (retval); // unclean, please beam me up
837	#else	923	#else
838	_exit (retval);	924	_exit (retval);
839	#endif	925	#endif
840		926
		927	void
		928	debug ()
		929	CODE:
		930	{
		931	#if DEBUG
		932	VALGRIND_DO_LEAK_CHECK;
		933	#endif
		934	}
		935
841	MODULE = CFPlus PACKAGE = CFPlus::Font	936	MODULE = CFPlus PACKAGE = CFPlus::Font
		937
		938	PROTOTYPES: DISABLE
842		939
843	CFPlus::Font	940	CFPlus::Font
844	new_from_file (SV class, char path, int id = 0)	941	new_from_file (SV class, char path, int id = 0)
845	CODE:	942	CODE:
846	{	943	{
…		…
857	CODE:	954	CODE:
858	pango_font_description_free (self);	955	pango_font_description_free (self);
859		956
860	void	957	void
861	make_default (CFPlus::Font self)	958	make_default (CFPlus::Font self)
		959	PROTOTYPE: $
862	CODE:	960	CODE:
863	default_font = self;	961	default_font = self;
864		962
865	MODULE = CFPlus PACKAGE = CFPlus::Layout	963	MODULE = CFPlus PACKAGE = CFPlus::Layout
866		964
		965	PROTOTYPES: DISABLE
		966
867	void	967	void
868	reset_glyph_cache ()	968	reset_glyph_cache ()
		969	PROTOTYPE:
869	CODE:	970	CODE:
870	tc_clear ();	971	tc_clear ();
871		972
872	CFPlus::Layout	973	CFPlus::Layout
873	new (SV *class)	974	new (SV *class)
…		…
1160	flags	1261	flags
1161	);	1262	);
1162		1263
1163	MODULE = CFPlus PACKAGE = CFPlus::Texture	1264	MODULE = CFPlus PACKAGE = CFPlus::Texture
1164		1265
1165	void	1266	PROTOTYPES: ENABLE
1166	pad2pot (SV data_, SV w_, SV *h_)
1167	CODE:
1168	{
1169	int ow = SvIV (w_);
1170	int oh = SvIV (h_);
1171		1267
1172	if (ow && oh)	1268	int minpot (int n)
		1269
		1270	void
		1271	pad (SV *data_, int ow, int oh, int nw, int nh)
		1272	CODE:
		1273	{
		1274	if ((nw != ow \|\| nh != oh) && SvOK (data_))
1173	{	1275	{
1174	int nw = minpot (ow);
1175	int nh = minpot (oh);
1176
1177	if (nw != ow \|\| nh != oh)
1178	{
1179	if (SvOK (data_))
1180	{
1181	STRLEN datalen;	1276	STRLEN datalen;
1182	char *data = SvPVbyte (data_, datalen);	1277	char *data = SvPVbyte (data_, datalen);
1183	int bpp = datalen / (ow * oh);	1278	int bpp = datalen / (ow * oh);
1184	SV result_ = sv_2mortal (newSV (nw nh * bpp));	1279	SV result_ = sv_2mortal (newSV (nw nh * bpp));
1185		1280
1186	SvPOK_only (result_);	1281	SvPOK_only (result_);
1187	SvCUR_set (result_, nw * nh * bpp);	1282	SvCUR_set (result_, nw * nh * bpp);
1188		1283
1189	memset (SvPVX (result_), 0, nw * nh * bpp);	1284	memset (SvPVX (result_), 0, nw * nh * bpp);
1190	while (oh--)	1285	while (oh--)
1191	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);	1286	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1192		1287
1193	sv_setsv (data_, result_);	1288	sv_setsv (data_, result_);
1194	}
1195
1196	sv_setiv (w_, nw);
1197	sv_setiv (h_, nh);
1198	}
1199	}	1289	}
1200	}	1290	}
1201		1291
1202	void	1292	void
1203	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)	1293	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
…		…
1246	glDisable (GL_ALPHA_TEST);	1336	glDisable (GL_ALPHA_TEST);
1247	glDisable (GL_BLEND);	1337	glDisable (GL_BLEND);
1248	}	1338	}
1249	}	1339	}
1250		1340
		1341	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
		1342	CODE:
		1343	{
		1344	GLint width;
		1345	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
		1346	glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
		1347	RETVAL = width > 0;
		1348	}
		1349	OUTPUT:
		1350	RETVAL
		1351
1251	MODULE = CFPlus PACKAGE = CFPlus::Map	1352	MODULE = CFPlus PACKAGE = CFPlus::Map
		1353
		1354	PROTOTYPES: DISABLE
1252		1355
1253	CFPlus::Map	1356	CFPlus::Map
1254	new (SV *class)	1357	new (SV *class)
1255	CODE:	1358	CODE:
1256	New (0, RETVAL, 1, struct map);	1359	New (0, RETVAL, 1, struct map);
…		…
1292	set_tileid (CFPlus::Map self, int face, int tile)	1395	set_tileid (CFPlus::Map self, int face, int tile)
1293	CODE:	1396	CODE:
1294	{	1397	{
1295	need_facenum (self, face); self->face2tile [face] = tile;	1398	need_facenum (self, face); self->face2tile [face] = tile;
1296	need_texid (self, tile);	1399	need_texid (self, tile);
		1400	}
		1401
		1402	void
		1403	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1404	CODE:
		1405	{
		1406	tileid texid;
		1407	maptex *tex;
		1408
		1409	if (face < 0 \|\| face >= self->faces)
		1410	return;
		1411
		1412	if (smooth < 0 \|\| smooth >= self->faces)
		1413	return;
		1414
		1415	texid = self->face2tile [face];
		1416
		1417	if (!texid)
		1418	return;
		1419
		1420	tex = self->tex + texid;
		1421	tex->smoothtile = self->face2tile [smooth];
		1422	tex->smoothlevel = level;
1297	}	1423	}
1298		1424
1299	void	1425	void
1300	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)	1426	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)
1301	CODE:	1427	CODE:
…		…
1352	CODE:	1478	CODE:
1353	{	1479	{
1354	if (dx > 0)	1480	if (dx > 0)
1355	map_blank (self, self->x, self->y, dx, self->h);	1481	map_blank (self, self->x, self->y, dx, self->h);
1356	else if (dx < 0)	1482	else if (dx < 0)
1357	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1483	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1358		1484
1359	if (dy > 0)	1485	if (dy > 0)
1360	map_blank (self, self->x, self->y, self->w, dy);	1486	map_blank (self, self->x, self->y, self->w, dy);
1361	else if (dy < 0)	1487	else if (dy < 0)
1362	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1488	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1363		1489
1364	self->ox += dx; self->x += dx;	1490	self->ox += dx; self->x += dx;
1365	self->oy += dy; self->y += dy;	1491	self->oy += dy; self->y += dy;
1366		1492
1367	while (self->y < 0)	1493	while (self->y < 0)
…		…
1421	}	1547	}
1422	else if (cmd == 6) // monster width	1548	else if (cmd == 6) // monster width
1423	cell->stat_width = *data++ + 1;	1549	cell->stat_width = *data++ + 1;
1424	else if (cmd == 0x47)	1550	else if (cmd == 0x47)
1425	{	1551	{
1426	if (*data == 8)	1552	if (*data == 4)
1427	; // decode player uuid	1553	; // decode player count
1428		1554
1429	data += *data + 1;	1555	data += *data + 1;
1430	}	1556	}
1431	else if (cmd == 8) // cell flags	1557	else if (cmd == 8) // cell flags
1432	cell->flags = *data++;	1558	cell->flags = *data++;
…		…
1524		1650
1525	void	1651	void
1526	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1652	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1527	CODE:	1653	CODE:
1528	{	1654	{
		1655	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
		1656	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1657	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1658	smooth_key skey;
1529	int x, y, z;	1659	int x, y, z;
1530	int last_name;	1660	int last_name;
		1661
		1662	// thats current max. sorry.
		1663	if (sw > 255) sw = 255;
		1664	if (sh > 255) sh = 255;
		1665
		1666	// clear key, in case of extra padding
		1667	memset (&skey, 0, sizeof (skey));
1531		1668
1532	glColor4ub (255, 255, 255, 255);	1669	glColor4ub (255, 255, 255, 255);
1533		1670
1534	glEnable (GL_BLEND);	1671	glEnable (GL_BLEND);
1535	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1672	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1541	last_name = 0;	1678	last_name = 0;
1542		1679
1543	mx += self->x;	1680	mx += self->x;
1544	my += self->y;	1681	my += self->y;
1545		1682
		1683	// first pass: determine smooth_max
		1684	// rather ugly, if you ask me
		1685	// could also be stored inside mapcell and updated on change
		1686	memset (smooth_max, 0, sizeof (smooth_max));
		1687
		1688	for (y = 0; y < sh; y++)
		1689	if (0 <= y + my && y + my < self->rows)
		1690	{
		1691	maprow *row = self->row + (y + my);
		1692
		1693	for (x = 0; x < sw; x++)
		1694	if (row->c0 <= x + mx && x + mx < row->c1)
		1695	{
		1696	mapcell *cell = row->col + (x + mx - row->c0);
		1697
		1698	smooth_max[x + 1][y + 1] =
		1699	MAX (self->tex [cell->tile [0]].smoothlevel,
		1700	MAX (self->tex [cell->tile [1]].smoothlevel,
		1701	self->tex [cell->tile [2]].smoothlevel));
		1702	}
		1703	}
		1704
1546	for (z = 0; z < 3; z++)	1705	for (z = 0; z <= 2; z++)
		1706	{
		1707	memset (smooth_level, 0, sizeof (smooth_level));
		1708
1547	for (y = 0; y < sh; y++)	1709	for (y = 0; y < sh; y++)
1548	if (0 <= y + my && y + my < self->rows)	1710	if (0 <= y + my && y + my < self->rows)
1549	{	1711	{
1550	maprow *row = self->row + (y + my);	1712	maprow *row = self->row + (y + my);
1551		1713
1552	for (x = 0; x < sw; x++)	1714	for (x = 0; x < sw; x++)
1553	if (row->c0 <= x + mx && x + mx < row->c1)	1715	if (row->c0 <= x + mx && x + mx < row->c1)
1554	{	1716	{
1555	mapcell *cell = row->col + (x + mx - row->c0);	1717	mapcell *cell = row->col + (x + mx - row->c0);
1556	tileid tile = cell->tile [z];	1718	tileid tile = cell->tile [z];
		1719
		1720	if (tile)
		1721	{
		1722	maptex tex = self->tex [tile];
		1723	int px = (x + 1) * T - tex.w;
		1724	int py = (y + 1) * T - tex.h;
		1725
		1726	// suppressing texture state switches here
		1727	// is only moderately effective, but worth the extra effort
		1728	if (last_name != tex.name)
		1729	{
		1730	if (!tex.name)
		1731	tex = self->tex [2]; /* missing, replace by noface */
		1732
		1733	glEnd ();
		1734	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1735	glBegin (GL_QUADS);
		1736	}
		1737
		1738	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1739	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1740	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1741	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1742
		1743	if (cell->flags && z == 2)
		1744	{
		1745	if (cell->flags & 1)
		1746	{
		1747	maptex tex = self->tex [1];
		1748	int px = x * T + T * 2 / 32;
		1749	int py = y * T - T * 6 / 32;
		1750
		1751	glEnd ();
		1752	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1753	glBegin (GL_QUADS);
		1754
		1755	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1756	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1757	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1758	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1759	}
		1760	}
		1761
		1762	// update smooth hash
		1763	if (tex.smoothtile)
		1764	{
		1765	skey.tile = tex.smoothtile;
		1766	skey.level = tex.smoothlevel;
		1767
		1768	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1769
		1770	// add bits to current tile and all neighbours. skey.x\|y is
		1771	// shifted +1\|+1 so we always stay positive.
		1772
		1773	// bits is ___n cccc CCCC bbbb
		1774	// n do not draw borders&corners
		1775	// c draw these corners, but...
		1776	// C ... not these
		1777	// b draw these borders
		1778
		1779	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1780	// ┃· ·· ·┃ ━━
		1781
		1782	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1783	// ·· ·· ·┏ ┓·
		1784
		1785	// full tile
		1786	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1787
		1788	// borders
		1789	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1790	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1791	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1792	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1793
		1794	// corners
		1795	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1796	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1797	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1798	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1799	}
		1800	}
1557		1801	}
		1802	}
		1803
		1804	// go through all smoothlevels, lowest to highest, then draw.
		1805	// this is basically counting sort
		1806	{
		1807	int w, b;
		1808
		1809	for (w = 0; w < 256 / 32; ++w)
		1810	{
		1811	uint32_t smask = smooth_level [w];
1558	if (tile)	1812	if (smask)
		1813	for (b = 0; b < 32; ++b)
		1814	if (smask & (((uint32_t)1) << b))
1559	{	1815	{
1560	maptex tex = self->tex [tile];	1816	int level = (w << 5) \| b;
1561	int px = (x + 1) * T - tex.w;	1817	HE *he;
1562	int py = (y + 1) * T - tex.h;
1563		1818
1564	if (last_name != tex.name)	1819	hv_iterinit (smooth);
		1820	while ((he = hv_iternext (smooth)))
1565	{	1821	{
		1822	smooth_key skey = (smooth_key )HeKEY (he);
		1823	IV bits = SvIVX (HeVAL (he));
		1824
1566	if (!tex.name)	1825	if (!(bits & 0x1000)
1567	tex = self->tex [2]; /* missing, replace by noface */	1826	&& skey->level == level
1568		1827	&& level > smooth_max [skey->x][skey->y])
1569	glEnd ();
1570	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1571	glBegin (GL_QUADS);
1572	}
1573
1574	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1575	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1576	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1577	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1578
1579	if (cell->flags && z == 2)
1580	{
1581	if (cell->flags & 1)
1582	{	1828	{
1583	maptex tex = self->tex [1];	1829	maptex tex = self->tex [skey->tile];
1584	int px = x * T + T * 2 / 32;	1830	int px = (((int)skey->x) - 1) * T;
1585	int py = y * T - T * 6 / 32;	1831	int py = (((int)skey->y) - 1) * T;
		1832	int border = bits & 15;
		1833	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1834	float dx = tex.s * .0625f; // 16 images/row
		1835	float dy = tex.t * .5f ; // 2 images/column
1586		1836
		1837	// this time naively avoiding texture state changes
		1838	// save gobs of state changes.
		1839	if (last_name != tex.name)
		1840	{
		1841	if (!tex.name)
		1842	continue; // smoothing not yet available
		1843
1587	glEnd ();	1844	glEnd ();
1588	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1845	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1589	glBegin (GL_QUADS);	1846	glBegin (GL_QUADS);
		1847	}
1590		1848
		1849	if (border)
		1850	{
		1851	float ox = border * dx;
		1852
		1853	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1854	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1855	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1856	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1857	}
		1858
		1859	if (corner)
		1860	{
		1861	float ox = corner * dx;
		1862
1591	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1863	glTexCoord2f (ox , dy ); glVertex2f (px , py );
1592	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);	1864	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1593	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);	1865	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1594	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );	1866	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1867	}
1595	}	1868	}
1596	}	1869	}
1597	}	1870	}
1598	}
1599	}	1871	}
		1872	}
		1873
		1874	hv_clear (smooth);
		1875	}
1600		1876
1601	glEnd ();	1877	glEnd ();
1602		1878
1603	glDisable (GL_TEXTURE_2D);	1879	glDisable (GL_TEXTURE_2D);
1604	glDisable (GL_BLEND);	1880	glDisable (GL_BLEND);
…		…
1698	void	1974	void
1699	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	1975	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1700	PPCODE:	1976	PPCODE:
1701	{	1977	{
1702	int x, y;	1978	int x, y;
		1979	int sw1 = sw + 2;
		1980	int sh1 = sh + 2;
		1981	int sh3 = sh * 3;
1703	int sw4 = (sw + 3) & ~3;	1982	int sw34 = (sw * 3 + 3) & ~3;
		1983	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
1704	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1984	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));
1705	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);	1985	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
1706		1986
1707	memset (darkness, 255, sw4 * sh);
1708	SvPOK_only (darkness_sv);	1987	SvPOK_only (darkness3_sv);
1709	SvCUR_set (darkness_sv, sw4 * sh);	1988	SvCUR_set (darkness3_sv, sw34 * sh3);
1710		1989
1711	mx += self->x;	1990	mx += self->x - 1;
1712	my += self->y;	1991	my += self->y - 1;
1713		1992
		1993	memset (darkness1, 255, sw1 * sh1);
		1994
1714	for (y = 0; y < sh; y++)	1995	for (y = 0; y < sh1; y++)
1715	if (0 <= y + my && y + my < self->rows)	1996	if (0 <= y + my && y + my < self->rows)
1716	{	1997	{
1717	maprow *row = self->row + (y + my);	1998	maprow *row = self->row + (y + my);
1718		1999
1719	for (x = 0; x < sw; x++)	2000	for (x = 0; x < sw1; x++)
1720	if (row->c0 <= x + mx && x + mx < row->c1)	2001	if (row->c0 <= x + mx && x + mx < row->c1)
1721	{	2002	{
1722	mapcell *cell = row->col + (x + mx - row->c0);	2003	mapcell *cell = row->col + (x + mx - row->c0);
1723		2004
1724	darkness[y * sw4 + x] = cell->darkness	2005	darkness1 [y * sw1 + x] = cell->darkness
1725	? 255 - (cell->darkness - 1)	2006	? 255 - (cell->darkness - 1)
1726	: 255 - FOW_DARKNESS;	2007	: 255 - FOW_DARKNESS;
1727	}	2008	}
1728	}	2009	}
1729		2010
		2011	for (y = 0; y < sh; ++y)
		2012	for (x = 0; x < sw; ++x)
		2013	{
		2014	uint8_t d11 = darkness1 [(y ) * sw1 + x ];
		2015	uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
		2016	uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
		2017	uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
		2018	uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
		2019	uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
		2020	uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
		2021	uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
		2022	uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
		2023
		2024	uint8_t r11 = (d11 + d21 + d12) / 3;
		2025	uint8_t r21 = d21;
		2026	uint8_t r31 = (d21 + d31 + d32) / 3;
		2027
		2028	uint8_t r12 = d12;
		2029	uint8_t r22 = d22;
		2030	uint8_t r32 = d32;
		2031
		2032	uint8_t r13 = (d13 + d23 + d12) / 3;
		2033	uint8_t r23 = d23;
		2034	uint8_t r33 = (d23 + d33 + d32) / 3;
		2035
		2036	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
		2037	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
		2038	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
		2039	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
		2040	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
		2041	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
		2042	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
		2043	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
		2044	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
		2045	}
		2046
		2047	free (darkness1);
		2048
1730	EXTEND (SP, 3);	2049	EXTEND (SP, 3);
1731	PUSHs (sv_2mortal (newSViv (sw4)));	2050	PUSHs (sv_2mortal (newSViv (sw34)));
1732	PUSHs (sv_2mortal (newSViv (sh)));	2051	PUSHs (sv_2mortal (newSViv (sh3)));
1733	PUSHs (darkness_sv);	2052	PUSHs (darkness3_sv);
1734	}	2053	}
1735		2054
1736	SV *	2055	SV *
1737	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2056	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1738	CODE:	2057	CODE:
…		…
1872	}	2191	}
1873	}	2192	}
1874		2193
1875	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2194	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1876		2195
		2196	PROTOTYPES: DISABLE
		2197
1877	CFPlus::MixChunk	2198	CFPlus::MixChunk
1878	new_from_file (SV class, char path)	2199	new_from_file (SV class, char path)
1879	CODE:	2200	CODE:
1880	RETVAL = Mix_LoadWAV (path);	2201	RETVAL = Mix_LoadWAV (path);
1881	OUTPUT:	2202	OUTPUT:
…		…
1902		2223
1903	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2224	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1904		2225
1905	int	2226	int
1906	volume (int volume = -1)	2227	volume (int volume = -1)
		2228	PROTOTYPE: ;$
1907	CODE:	2229	CODE:
1908	RETVAL = Mix_VolumeMusic (volume);	2230	RETVAL = Mix_VolumeMusic (volume);
		2231	OUTPUT:
		2232	RETVAL
		2233
		2234	int
		2235	fade_out (int ms)
		2236	CODE:
		2237	RETVAL = Mix_FadeOutMusic (ms);
1909	OUTPUT:	2238	OUTPUT:
1910	RETVAL	2239	RETVAL
1911		2240
1912	CFPlus::MixMusic	2241	CFPlus::MixMusic
1913	new_from_file (SV class, char path)	2242	new_from_file (SV class, char path)
…		…
1926	CODE:	2255	CODE:
1927	RETVAL = Mix_PlayMusic (self, loops);	2256	RETVAL = Mix_PlayMusic (self, loops);
1928	OUTPUT:	2257	OUTPUT:
1929	RETVAL	2258	RETVAL
1930		2259
		2260	int
		2261	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2262	CODE:
		2263	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
		2264	OUTPUT:
		2265	RETVAL
		2266
1931	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2267	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
		2268
		2269	PROTOTYPES: ENABLE
1932		2270
1933	BOOT:	2271	BOOT:
1934	{	2272	{
1935	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2273	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1936	static const struct {	2274	static const struct {
1937	const char *name;	2275	const char *name;
1938	IV iv;	2276	IV iv;
1939	} *civ, const_iv[] = {	2277	} *civ, const_iv[] = {
1940	# define const_iv(name) { # name, (IV)name }	2278	# define const_iv(name) { # name, (IV)name }
		2279	const_iv (GL_VENDOR),
		2280	const_iv (GL_VERSION),
		2281	const_iv (GL_EXTENSIONS),
1941	const_iv (GL_COLOR_MATERIAL),	2282	const_iv (GL_COLOR_MATERIAL),
1942	const_iv (GL_SMOOTH),	2283	const_iv (GL_SMOOTH),
1943	const_iv (GL_FLAT),	2284	const_iv (GL_FLAT),
1944	const_iv (GL_DITHER),	2285	const_iv (GL_DITHER),
1945	const_iv (GL_BLEND),	2286	const_iv (GL_BLEND),
…		…
1949	const_iv (GL_ALPHA_TEST),	2290	const_iv (GL_ALPHA_TEST),
1950	const_iv (GL_NORMALIZE),	2291	const_iv (GL_NORMALIZE),
1951	const_iv (GL_RESCALE_NORMAL),	2292	const_iv (GL_RESCALE_NORMAL),
1952	const_iv (GL_FRONT),	2293	const_iv (GL_FRONT),
1953	const_iv (GL_BACK),	2294	const_iv (GL_BACK),
		2295	const_iv (GL_AUX0),
1954	const_iv (GL_AND),	2296	const_iv (GL_AND),
1955	const_iv (GL_ONE),	2297	const_iv (GL_ONE),
1956	const_iv (GL_ZERO),	2298	const_iv (GL_ZERO),
1957	const_iv (GL_SRC_ALPHA),	2299	const_iv (GL_SRC_ALPHA),
1958	const_iv (GL_DST_ALPHA),	2300	const_iv (GL_DST_ALPHA),
…		…
1972	const_iv (GL_LUMINANCE),	2314	const_iv (GL_LUMINANCE),
1973	const_iv (GL_LUMINANCE_ALPHA),	2315	const_iv (GL_LUMINANCE_ALPHA),
1974	const_iv (GL_FLOAT),	2316	const_iv (GL_FLOAT),
1975	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2317	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1976	const_iv (GL_COMPILE),	2318	const_iv (GL_COMPILE),
		2319	const_iv (GL_PROXY_TEXTURE_1D),
		2320	const_iv (GL_PROXY_TEXTURE_2D),
1977	const_iv (GL_TEXTURE_1D),	2321	const_iv (GL_TEXTURE_1D),
1978	const_iv (GL_TEXTURE_2D),	2322	const_iv (GL_TEXTURE_2D),
1979	const_iv (GL_TEXTURE_ENV),	2323	const_iv (GL_TEXTURE_ENV),
1980	const_iv (GL_TEXTURE_MAG_FILTER),	2324	const_iv (GL_TEXTURE_MAG_FILTER),
1981	const_iv (GL_TEXTURE_MIN_FILTER),	2325	const_iv (GL_TEXTURE_MIN_FILTER),
…		…
2011	const_iv (GL_QUAD_STRIP),	2355	const_iv (GL_QUAD_STRIP),
2012	const_iv (GL_TRIANGLES),	2356	const_iv (GL_TRIANGLES),
2013	const_iv (GL_TRIANGLE_STRIP),	2357	const_iv (GL_TRIANGLE_STRIP),
2014	const_iv (GL_TRIANGLE_FAN),	2358	const_iv (GL_TRIANGLE_FAN),
2015	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2359	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
		2360	const_iv (GL_POINT_SMOOTH_HINT),
		2361	const_iv (GL_LINE_SMOOTH_HINT),
		2362	const_iv (GL_POLYGON_SMOOTH_HINT),
		2363	const_iv (GL_GENERATE_MIPMAP_HINT),
2016	const_iv (GL_FASTEST),	2364	const_iv (GL_FASTEST),
		2365	const_iv (GL_DONT_CARE),
		2366	const_iv (GL_NICEST),
2017	const_iv (GL_V2F),	2367	const_iv (GL_V2F),
2018	const_iv (GL_V3F),	2368	const_iv (GL_V3F),
2019	const_iv (GL_T2F_V3F),	2369	const_iv (GL_T2F_V3F),
2020	const_iv (GL_T2F_N3F_V3F),	2370	const_iv (GL_T2F_N3F_V3F),
2021	# undef const_iv	2371	# undef const_iv
2022	};	2372	};
2023		2373
2024	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2374	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2025	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2375	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2376
		2377	texture_av = newAV ();
		2378	AvREAL_off (texture_av);
2026	}	2379	}
2027		2380
2028	char *	2381	char *
2029	gl_vendor ()	2382	gl_vendor ()
2030	CODE:	2383	CODE:
…		…
2041		2394
2042	char *	2395	char *
2043	gl_extensions ()	2396	gl_extensions ()
2044	CODE:	2397	CODE:
2045	RETVAL = (char *)glGetString (GL_EXTENSIONS);	2398	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		2399	OUTPUT:
		2400	RETVAL
		2401
		2402	const char *glGetString (GLenum pname)
		2403
		2404	GLint glGetInteger (GLenum pname)
		2405	CODE:
		2406	glGetIntegerv (pname, &RETVAL);
		2407	OUTPUT:
		2408	RETVAL
		2409
		2410	GLdouble glGetDouble (GLenum pname)
		2411	CODE:
		2412	glGetDoublev (pname, &RETVAL);
2046	OUTPUT:	2413	OUTPUT:
2047	RETVAL	2414	RETVAL
2048		2415
2049	int glGetError ()	2416	int glGetError ()
2050		2417
…		…
2175		2542
2176	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2543	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2177		2544
2178	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2545	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2179		2546
		2547	void glPixelZoom (float x, float y)
		2548
2180	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2549	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2181		2550
2182	int glGenTexture ()	2551	int glGenTexture ()
2183	CODE:	2552	CODE:
2184	{	2553	RETVAL = gen_texture ();
2185	GLuint name;
2186	glGenTextures (1, &name);
2187	RETVAL = name;
2188	}
2189	OUTPUT:	2554	OUTPUT:
2190	RETVAL	2555	RETVAL
2191		2556
2192	void glDeleteTexture (int name)	2557	void glDeleteTexture (int name)
2193	CODE:	2558	CODE:
2194	{
2195	GLuint name_ = name;
2196	glDeleteTextures (1, &name_);	2559	del_texture (name);
2197	}	2560
2198
2199	int glGenList ()	2561	int glGenList ()
2200	CODE:	2562	CODE:
2201	RETVAL = glGenLists (1);	2563	RETVAL = glGenLists (1);
2202	OUTPUT:	2564	OUTPUT:
2203	RETVAL	2565	RETVAL

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.175 by root, Fri Apr 6 08:09:42 2007 UTC vs. Revision 1.206 by root, Thu Jul 19 23:29:16 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.175 by root, Fri Apr 6 08:09:42 2007 UTC vs.
Revision 1.206 by root, Thu Jul 19 23:29:16 2007 UTC