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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.103 by root, Sun Jun 4 23:05:05 2006 UTC vs.
Revision 1.158 by root, Sun Oct 1 18:17:37 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3	# include <malloc.h>	4	# include <malloc.h>
4	# include <windows.h>	5	# include <windows.h>
		6	# include <wininet.h>
5	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
6	#endif	8	#endif
7		9
8	#include "EXTERN.h"	10	#include "EXTERN.h"
9	#include "perl.h"	11	#include "perl.h"
10	#include "XSUB.h"	12	#include "XSUB.h"
11		13
		14	#ifdef _WIN32
		15	# undef pipe
		16	#endif
		17
12	#include <math.h>	18	#include <math.h>
13	#include <string.h>	19	#include <string.h>
14	#include <stdio.h>	20	#include <stdio.h>
		21	#include <stdlib.h>
15		22
16	#include <SDL.h>	23	#include <SDL.h>
17	#include <SDL_endian.h>	24	#include <SDL_endian.h>
18	#include <SDL_image.h>	25	#include <SDL_image.h>
19	#include <SDL_mixer.h>	26	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	27	#include <SDL_opengl.h>
21		28
		29	#define PANGO_ENABLE_BACKEND
		30	#define G_DISABLE_CAST_CHECKS
		31
22	#include <glib/gmacros.h>	32	#include <glib/gmacros.h>
23		33
24	#include <pango/pango.h>	34	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		35
29	#ifndef _WIN32	36	#ifndef _WIN32
30	# include <sys/types.h>	37	# include <sys/types.h>
31	# include <sys/socket.h>	38	# include <sys/socket.h>
32	# include <netinet/in.h>	39	# include <netinet/in.h>
39	typedef signed char int8_t;	46	typedef signed char int8_t;
40	typedef signed short int16_t;	47	typedef signed short int16_t;
41	typedef signed int int32_t;	48	typedef signed int int32_t;
42	#endif	49	#endif
43		50
44	#include "glext.h"	51	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45		52
46	#define FOW_DARKNESS 32	53	#define FOW_DARKNESS 32
47		54
48	#define MAP_EXTEND_X 32	55	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	56	#define MAP_EXTEND_Y 512
50		57
51	#define MIN_FONT_HEIGHT 10	58	#define MIN_FONT_HEIGHT 10
		59
		60	#if 0
		61	# define PARACHUTE SDL_INIT_NOPARACHUTE
		62	#else
		63	# define PARACHUTE 0
		64	#endif
52		65
53	static struct	66	static struct
54	{	67	{
55	#define GL_FUNC(ptr,name) ptr name;	68	#define GL_FUNC(ptr,name) ptr name;
56	#include "glfunc.h"	69	#include "glfunc.h"
…		…
65	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	78	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	else	79	else
67	glBlendFunc (sa, da);	80	glBlendFunc (sa, da);
68	}	81	}
69		82
		83	#include "texcache.c"
		84
		85	#include "pango-font.c"
		86	#include "pango-fontmap.c"
		87	#include "pango-render.c"
		88
70	typedef Mix_Chunk *CFClient__MixChunk;	89	typedef Mix_Chunk *CFPlus__MixChunk;
71	typedef Mix_Music *CFClient__MixMusic;	90	typedef Mix_Music *CFPlus__MixMusic;
72		91
73	typedef PangoFontDescription *CFClient__Font;	92	typedef PangoFontDescription *CFPlus__Font;
		93
		94	static int
		95	shape_attr_p (PangoLayoutRun *run)
		96	{
		97	GSList *attrs = run->item->analysis.extra_attrs;
		98
		99	while (attrs)
		100	{
		101	PangoAttribute *attr = attrs->data;
		102
		103	if (attr->klass->type == PANGO_ATTR_SHAPE)
		104	return 1;
		105
		106	attrs = attrs->next;
		107	}
		108
		109	return 0;
		110	}
74		111
75	typedef struct cf_layout {	112	typedef struct cf_layout {
76	PangoLayout *pl; // either derived from a cairo or ft2 context	113	PangoLayout *pl;
77	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78	float r, g, b, a; // default color for rgba mode	114	float r, g, b, a; // default color for rgba mode
79	int base_height;	115	int base_height;
80	CFClient__Font font;	116	CFPlus__Font font;
81	} *CFClient__Layout;	117	} *CFPlus__Layout;
82		118
83	static CFClient__Font default_font;	119	static CFPlus__Font default_font;
84	static PangoContext ft2_context, cairo_context;	120	static PangoContext *opengl_context;
85	static PangoFontMap ft2_fontmap, cairo_fontmap;	121	static PangoFontMap *opengl_fontmap;
86		122
87	static void	123	static void
88	substitute_func (FcPattern *pattern, gpointer data)	124	substitute_func (FcPattern *pattern, gpointer data)
89	{	125	{
90	FcPatternAddBool (pattern, FC_HINTING , 1);	126	FcPatternAddBool (pattern, FC_HINTING, 1);
91	#ifdef _WIN32	127	#ifdef FC_HINT_STYLE
92	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	128	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
93	#else	129	#endif
94	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	130	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
95	#endif
96	}	131	}
97		132
98	static void	133	static void
99	layout_update_font (CFClient__Layout self)	134	layout_update_font (CFPlus__Layout self)
100	{	135	{
101	/* use a random scale factor to account for unknown descenders, 0.8 works	136	/* use a random scale factor to account for unknown descenders, 0.8 works
102	* reasonably well with bitstream vera	137	* reasonably well with bitstream vera
103	*/	138	*/
104	PangoFontDescription *font = self->font ? self->font : default_font;	139	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
108		143
109	pango_layout_set_font_description (self->pl, font);	144	pango_layout_set_font_description (self->pl, font);
110	}	145	}
111		146
112	static void	147	static void
113	layout_get_pixel_size (CFClient__Layout self, int w, int h)	148	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
114	{	149	{
		150	PangoRectangle rect;
		151
		152	// get_pixel_* wrongly rounds down
115	pango_layout_get_pixel_size (self->pl, w, h);	153	pango_layout_get_extents (self->pl, 0, &rect);
116		154
117	if (!w) w = 1;	155	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
118	if (!h) h = 1;	156	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
119		157
120	w = (w + 3) & ~3;	158	if (!rect.width) rect.width = 1;
		159	if (!rect.height) rect.height = 1;
		160
		161	*w = rect.width;
		162	*h = rect.height;
121	}	163	}
122		164
123	typedef uint16_t mapface;	165	typedef uint16_t mapface;
124		166
125	typedef struct {	167	typedef struct {
…		…
128	float s, t;	170	float s, t;
129	uint8_t r, g, b, a;	171	uint8_t r, g, b, a;
130	} maptex;	172	} maptex;
131		173
132	typedef struct {	174	typedef struct {
133	int16_t darkness;	175	uint32_t player;
134	mapface face[3];	176	mapface face[3];
		177	uint16_t darkness;
		178	uint8_t stat_width, stat_hp, flags;
135	} mapcell;	179	} mapcell;
136		180
137	typedef struct {	181	typedef struct {
138	int32_t c0, c1;	182	int32_t c0, c1;
139	mapcell *col;	183	mapcell *col;
…		…
148	int texs;	192	int texs;
149	maptex *tex;	193	maptex *tex;
150		194
151	int32_t rows;	195	int32_t rows;
152	maprow *row;	196	maprow *row;
153	} *CFClient__Map;	197	} *CFPlus__Map;
154		198
155	static char *	199	static char *
156	prepend (char *ptr, int sze, int inc)	200	prepend (char *ptr, int sze, int inc)
157	{	201	{
158	char *p;	202	char *p;
…		…
176		220
177	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	221	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
178	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	222	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
179		223
180	static maprow *	224	static maprow *
181	map_get_row (CFClient__Map self, int y)	225	map_get_row (CFPlus__Map self, int y)
182	{	226	{
183	if (0 > y)	227	if (0 > y)
184	{	228	{
185	int extend = - y + MAP_EXTEND_Y;	229	int extend = - y + MAP_EXTEND_Y;
186	Prepend (maprow, self->row, self->rows, extend);	230	Prepend (maprow, self->row, self->rows, extend);
…		…
224		268
225	return row->col + (x - row->c0);	269	return row->col + (x - row->c0);
226	}	270	}
227		271
228	static mapcell *	272	static mapcell *
229	map_get_cell (CFClient__Map self, int x, int y)	273	map_get_cell (CFPlus__Map self, int x, int y)
230	{	274	{
231	return row_get_cell (map_get_row (self, y), x);	275	return row_get_cell (map_get_row (self, y), x);
232	}	276	}
233		277
234	static void	278	static void
235	map_clear (CFClient__Map self)	279	map_clear (CFPlus__Map self)
236	{	280	{
237	int r;	281	int r;
238		282
239	for (r = 0; r < self->rows; r++)	283	for (r = 0; r < self->rows; r++)
240	Safefree (self->row[r].col);	284	Safefree (self->row[r].col);
…		…
248	self->row = 0;	292	self->row = 0;
249	self->rows = 0;	293	self->rows = 0;
250	}	294	}
251		295
252	static void	296	static void
253	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	297	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
254	{	298	{
255	int x, y;	299	int x, y;
256	maprow *row;	300	maprow *row;
		301	mapcell *cell;
257		302
258	for (y = y0; y < y0 + h; y++)	303	for (y = y0; y < y0 + h; y++)
259	if (y >= 0)	304	if (y >= 0)
260	{	305	{
261	if (y >= self->rows)	306	if (y >= self->rows)
…		…
267	if (x >= row->c0)	312	if (x >= row->c0)
268	{	313	{
269	if (x >= row->c1)	314	if (x >= row->c1)
270	break;	315	break;
271		316
272	row->col[x - row->c0].darkness = -1;	317	cell = row->col + x - row->c0;
		318
		319	cell->darkness = 0;
		320	cell->stat_hp = 0;
		321	cell->flags = 0;
		322	cell->player = 0;
273	}	323	}
274	}	324	}
275	}	325	}
276		326
277	static void	327	static void
…		…
298	ev.data2 = 0;	348	ev.data2 = 0;
299		349
300	SDL_PushEvent ((SDL_Event *)&ev);	350	SDL_PushEvent ((SDL_Event *)&ev);
301	}	351	}
302		352
		353	static unsigned int
		354	minpot (unsigned int n)
		355	{
		356	if (!n)
		357	return 0;
		358
		359	--n;
		360
		361	n \|= n >> 1;
		362	n \|= n >> 2;
		363	n \|= n >> 4;
		364	n \|= n >> 8;
		365	n \|= n >> 16;
		366
		367	return n + 1;
		368	}
		369
303	MODULE = CFClient PACKAGE = CFClient	370	MODULE = CFPlus PACKAGE = CFPlus
304		371
305	PROTOTYPES: ENABLE	372	PROTOTYPES: ENABLE
306		373
307	BOOT:	374	BOOT:
308	{	375	{
309	HV *stash = gv_stashpv ("CFClient", 1);	376	HV *stash = gv_stashpv ("CFPlus", 1);
310	static const struct {	377	static const struct {
311	const char *name;	378	const char *name;
312	IV iv;	379	IV iv;
313	} *civ, const_iv[] = {	380	} *civ, const_iv[] = {
314	# define const_iv(name) { # name, (IV)name }	381	# define const_iv(name) { # name, (IV)name }
…		…
415		482
416	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	483	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
417	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	484	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
418	}	485	}
419		486
		487	int
		488	in_destruct ()
		489	CODE:
		490	RETVAL = PL_main_cv == Nullcv;
		491	OUTPUT:
		492	RETVAL
		493
		494	NV floor (NV x)
		495
		496	NV ceil (NV x)
		497
420	void	498	void
421	pango_init ()	499	pango_init ()
422	CODE:	500	CODE:
423	{	501	{
424	// delayed, so it can pick up new fonts added by AddFontResourceEx
425	ft2_fontmap = pango_ft2_font_map_new ();	502	opengl_fontmap = pango_opengl_font_map_new ();
426	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	503	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
427	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	504	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
428
429	cairo_fontmap = pango_cairo_font_map_get_default ();
430	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
431	}	505	}
432		506
433	int	507	int
434	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	508	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
435		509
436	void	510	void
437	SDL_Quit ()	511	SDL_Quit ()
438		512
439	void	513	void
…		…
446	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	520	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
447	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	521	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
448	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	522	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
449		523
450	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	524	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	525	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
452		526
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	528	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
455	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	529	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
456	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	530	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
457		531
458	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	532	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		533	#if SDL_VERSION_ATLEAST(1,2,10)
		534	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		535	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		536	#endif
459		537
460	SDL_EnableUNICODE (1);	538	SDL_EnableUNICODE (1);
461	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	539	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
462		540
463	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	541	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
550	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	628	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
551	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	629	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
552	break;	630	break;
553	}	631	}
554		632
555	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	633	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
556	}	634	}
557	}	635	}
558		636
559	int	637	int
560	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	638	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
574	#ifndef _WIN32	652	#ifndef _WIN32
575	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	653	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
576	#endif	654	#endif
577		655
578	void	656	void
		657	win32_proxy_info ()
		658	PPCODE:
		659	{
		660	#ifdef _WIN32
		661	INTERNET_PROXY_INFO proxyinfo;
		662	char buffer[2048];
		663	DWORD buflen;
		664
		665	EXTEND (SP, 3);
		666
		667	buflen = sizeof (buffer);
		668	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		669	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		670	{
		671	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		672
		673	buflen = sizeof (buffer);
		674	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		675	{
		676	PUSHs (newSVpv (buffer, 0));
		677
		678	buflen = sizeof (buffer);
		679	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		680	PUSHs (newSVpv (buffer, 0));
		681	}
		682	}
		683	#endif
		684	}
		685
		686	void
579	add_font (char *file)	687	add_font (char *file)
580	CODE:	688	CODE:
581	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	689	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
582	#ifdef _WIN32
583	// cairo... sigh... requires win2000
584	AddFontResourceEx (file, FR_PRIVATE, 0);
585	#endif
586		690
587	void	691	void
588	load_image_inline (SV *image_)	692	load_image_inline (SV *image_)
589	ALIAS:	693	ALIAS:
590	load_image_file = 1	694	load_image_file = 1
…		…
632		736
633	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	737	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
634		738
635	assert (surface2->pitch == surface2->w * 4);	739	assert (surface2->pitch == surface2->w * 4);
636		740
		741	SDL_LockSurface (surface2);
637	EXTEND (SP, 5);	742	EXTEND (SP, 6);
638	PUSHs (sv_2mortal (newSViv (surface2->w)));	743	PUSHs (sv_2mortal (newSViv (surface2->w)));
639	PUSHs (sv_2mortal (newSViv (surface2->h)));	744	PUSHs (sv_2mortal (newSViv (surface2->h)));
640	SDL_LockSurface (surface2);
641	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	745	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
642	SDL_UnlockSurface (surface2);
643	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	746	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
644	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	747	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
645	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	748	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		749	SDL_UnlockSurface (surface2);
646		750
647	SDL_FreeSurface (surface);	751	SDL_FreeSurface (surface);
648	SDL_FreeSurface (surface2);	752	SDL_FreeSurface (surface2);
649	}	753	}
650		754
…		…
686	CODE:	790	CODE:
687	fprintf (stderr, "FATAL: %s\n", message);	791	fprintf (stderr, "FATAL: %s\n", message);
688	#ifdef _WIN32	792	#ifdef _WIN32
689	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	793	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
690	#endif	794	#endif
691	exit (1);	795	_exit (1);
692		796
		797	void
		798	_exit (int retval = 0)
		799	CODE:
		800	_exit (retval);
		801
693	MODULE = CFClient PACKAGE = CFClient::Font	802	MODULE = CFPlus PACKAGE = CFPlus::Font
694		803
695	CFClient::Font	804	CFPlus::Font
696	new_from_file (SV class, char path, int id = 0)	805	new_from_file (SV class, char path, int id = 0)
697	CODE:	806	CODE:
698	{	807	{
699	int count;	808	int count;
700	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	809	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
703	}	812	}
704	OUTPUT:	813	OUTPUT:
705	RETVAL	814	RETVAL
706		815
707	void	816	void
708	DESTROY (CFClient::Font self)	817	DESTROY (CFPlus::Font self)
709	CODE:	818	CODE:
710	pango_font_description_free (self);	819	pango_font_description_free (self);
711		820
712	void	821	void
713	make_default (CFClient::Font self)	822	make_default (CFPlus::Font self)
714	CODE:	823	CODE:
715	default_font = self;	824	default_font = self;
716		825
717	MODULE = CFClient PACKAGE = CFClient::Layout	826	MODULE = CFPlus PACKAGE = CFPlus::Layout
718		827
719	CFClient::Layout	828	void
720	new (SV *class, int rgba = 0)	829	reset_glyph_cache ()
721	CODE:	830	CODE:
722	#if _WIN32	831	tc_clear ();
723	//rgba = 0;//D makes text nicer, breaks TextView	832
724	#endif	833	CFPlus::Layout
		834	new (SV *class)
		835	CODE:
725	New (0, RETVAL, 1, struct cf_layout);	836	New (0, RETVAL, 1, struct cf_layout);
726		837
727	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	838	RETVAL->pl = pango_layout_new (opengl_context);
728	RETVAL->rgba = rgba;
729	RETVAL->r = 1.;	839	RETVAL->r = 1.;
730	RETVAL->g = 1.;	840	RETVAL->g = 1.;
731	RETVAL->b = 1.;	841	RETVAL->b = 1.;
732	RETVAL->a = 1.;	842	RETVAL->a = 1.;
733	RETVAL->base_height = MIN_FONT_HEIGHT;	843	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
737	layout_update_font (RETVAL);	847	layout_update_font (RETVAL);
738	OUTPUT:	848	OUTPUT:
739	RETVAL	849	RETVAL
740		850
741	void	851	void
742	DESTROY (CFClient::Layout self)	852	DESTROY (CFPlus::Layout self)
743	CODE:	853	CODE:
744	g_object_unref (self->pl);	854	g_object_unref (self->pl);
745	Safefree (self);	855	Safefree (self);
746		856
747	int
748	is_rgba (CFClient::Layout self)
749	CODE:
750	RETVAL = self->rgba;
751	OUTPUT:
752	RETVAL
753
754	void	857	void
755	set_text (CFClient::Layout self, SV *text_)	858	set_text (CFPlus::Layout self, SV *text_)
756	CODE:	859	CODE:
757	{	860	{
758	STRLEN textlen;	861	STRLEN textlen;
759	char *text = SvPVutf8 (text_, textlen);	862	char *text = SvPVutf8 (text_, textlen);
760		863
761	pango_layout_set_text (self->pl, text, textlen);	864	pango_layout_set_text (self->pl, text, textlen);
762	}	865	}
763		866
764	void	867	void
765	set_markup (CFClient::Layout self, SV *text_)	868	set_markup (CFPlus::Layout self, SV *text_)
766	CODE:	869	CODE:
767	{	870	{
768	STRLEN textlen;	871	STRLEN textlen;
769	char *text = SvPVutf8 (text_, textlen);	872	char *text = SvPVutf8 (text_, textlen);
770		873
771	pango_layout_set_markup (self->pl, text, textlen);	874	pango_layout_set_markup (self->pl, text, textlen);
772	}	875	}
773		876
		877	void
		878	set_shapes (CFPlus::Layout self, ...)
		879	CODE:
		880	{
		881	PangoAttrList *attrs = 0;
		882	const char *text = pango_layout_get_text (self->pl);
		883	const char *pos = text;
		884	int arg = 4;
		885
		886	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		887	{
		888	PangoRectangle inkrect, rect;
		889	PangoAttribute *attr;
		890
		891	int x = SvIV (ST (arg - 3));
		892	int y = SvIV (ST (arg - 2));
		893	int w = SvIV (ST (arg - 1));
		894	int h = SvIV (ST (arg ));
		895
		896	inkrect.x = 0;
		897	inkrect.y = 0;
		898	inkrect.width = 0;
		899	inkrect.height = 0;
		900
		901	rect.x = x * PANGO_SCALE;
		902	rect.y = y * PANGO_SCALE;
		903	rect.width = w * PANGO_SCALE;
		904	rect.height = h * PANGO_SCALE;
		905
		906	if (!attrs)
		907	attrs = pango_layout_get_attributes (self->pl);
		908
		909	attr = pango_attr_shape_new (&inkrect, &rect);
		910	attr->start_index = pos - text;
		911	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		912	pango_attr_list_insert (attrs, attr);
		913
		914	arg += 4;
		915	pos += sizeof (OBJ_STR) - 1;
		916	}
		917
		918	if (attrs)
		919	pango_layout_set_attributes (self->pl, attrs);
		920	}
		921
		922	void
		923	get_shapes (CFPlus::Layout self)
		924	PPCODE:
		925	{
		926	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		927
		928	do
		929	{
		930	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		931
		932	if (run && shape_attr_p (run))
		933	{
		934	PangoRectangle extents;
		935	pango_layout_iter_get_run_extents (iter, 0, &extents);
		936
		937	EXTEND (SP, 2);
		938	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		939	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		940	}
		941	}
		942	while (pango_layout_iter_next_run (iter));
		943
		944	pango_layout_iter_free (iter);
		945	}
		946
		947	int
		948	has_wrapped (CFPlus::Layout self)
		949	CODE:
		950	{
		951	int lines = 1;
		952	const char *text = pango_layout_get_text (self->pl);
		953
		954	while (*text)
		955	lines += *text++ == '\n';
		956
		957	RETVAL = lines < pango_layout_get_line_count (self->pl);
		958	}
		959	OUTPUT:
		960	RETVAL
		961
774	SV *	962	SV *
775	get_text (CFClient::Layout self)	963	get_text (CFPlus::Layout self)
776	CODE:	964	CODE:
777	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	965	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
778	SvUTF8_on (RETVAL);	966	sv_utf8_decode (RETVAL);
779	OUTPUT:	967	OUTPUT:
780	RETVAL	968	RETVAL
781		969
782	void	970	void
783	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	971	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
784	CODE:	972	CODE:
785	self->r = r;	973	self->r = r;
786	self->g = g;	974	self->g = g;
787	self->b = b;	975	self->b = b;
788	self->a = a;	976	self->a = a;
789		977
790	void	978	void
791	set_font (CFClient::Layout self, CFClient::Font font = 0)	979	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
792	CODE:	980	CODE:
793	if (self->font != font)	981	if (self->font != font)
794	{	982	{
795	self->font = font;	983	self->font = font;
796	layout_update_font (self);	984	layout_update_font (self);
797	}	985	}
798		986
799	void	987	void
800	set_height (CFClient::Layout self, int base_height)	988	set_height (CFPlus::Layout self, int base_height)
801	CODE:	989	CODE:
802	if (self->base_height != base_height)	990	if (self->base_height != base_height)
803	{	991	{
804	self->base_height = base_height;	992	self->base_height = base_height;
805	layout_update_font (self);	993	layout_update_font (self);
806	}	994	}
807		995
808	void	996	void
809	set_width (CFClient::Layout self, int max_width = -1)	997	set_width (CFPlus::Layout self, int max_width = -1)
810	CODE:	998	CODE:
811	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	999	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
812		1000
813	void	1001	void
814	set_indent (CFClient::Layout self, int indent)	1002	set_indent (CFPlus::Layout self, int indent)
815	CODE:	1003	CODE:
816	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1004	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
817		1005
818	void	1006	void
819	set_spacing (CFClient::Layout self, int spacing)	1007	set_spacing (CFPlus::Layout self, int spacing)
820	CODE:	1008	CODE:
821	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1009	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
822		1010
823	void	1011	void
824	set_ellipsise (CFClient::Layout self, int ellipsise)	1012	set_ellipsise (CFPlus::Layout self, int ellipsise)
825	CODE:	1013	CODE:
826	pango_layout_set_ellipsize (self->pl,	1014	pango_layout_set_ellipsize (self->pl,
827	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1015	ellipsise == 1 ? PANGO_ELLIPSIZE_START
828	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1016	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
829	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1017	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
830	: PANGO_ELLIPSIZE_NONE	1018	: PANGO_ELLIPSIZE_NONE
831	);	1019	);
832		1020
833	void	1021	void
834	set_single_paragraph_mode (CFClient::Layout self, int spm)	1022	set_single_paragraph_mode (CFPlus::Layout self, int spm)
835	CODE:	1023	CODE:
836	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1024	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
837		1025
838	void	1026	void
839	size (CFClient::Layout self)	1027	size (CFPlus::Layout self)
840	PPCODE:	1028	PPCODE:
841	{	1029	{
842	int w, h;	1030	int w, h;
843		1031
844	layout_get_pixel_size (self, &w, &h);	1032	layout_get_pixel_size (self, &w, &h);
…		…
847	PUSHs (sv_2mortal (newSViv (w)));	1035	PUSHs (sv_2mortal (newSViv (w)));
848	PUSHs (sv_2mortal (newSViv (h)));	1036	PUSHs (sv_2mortal (newSViv (h)));
849	}	1037	}
850		1038
851	int	1039	int
		1040	descent (CFPlus::Layout self)
		1041	CODE:
		1042	{
		1043	PangoRectangle rect;
		1044	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1045	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1046	RETVAL = PANGO_DESCENT (rect);
		1047	}
		1048	OUTPUT:
		1049	RETVAL
		1050
		1051	int
852	xy_to_index (CFClient::Layout self, int x, int y)	1052	xy_to_index (CFPlus::Layout self, int x, int y)
853	CODE:	1053	CODE:
854	{	1054	{
855	int index, trailing;	1055	int index, trailing;
856	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1056	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
857	RETVAL = index;	1057	RETVAL = index;
858	}	1058	}
859	OUTPUT:	1059	OUTPUT:
860	RETVAL	1060	RETVAL
861		1061
862	void	1062	void
863	cursor_pos (CFClient::Layout self, int index)	1063	cursor_pos (CFPlus::Layout self, int index)
864	PPCODE:	1064	PPCODE:
865	{	1065	{
866	PangoRectangle strong_pos;	1066	PangoRectangle strong_pos;
867	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1067	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
868		1068
…		…
871	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1071	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
872	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1072	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
873	}	1073	}
874		1074
875	void	1075	void
876	render (CFClient::Layout self)	1076	render (CFPlus::Layout self, float x, float y, int flags = 0)
877	PPCODE:	1077	PPCODE:
878	{	1078	pango_opengl_render_layout_subpixel (
879	SV *retval;	1079	self->pl,
880	int w, h;	1080	x * PANGO_SCALE, y * PANGO_SCALE,
		1081	self->r, self->g, self->b, self->a,
		1082	flags
		1083	);
881		1084
882	layout_get_pixel_size (self, &w, &h);	1085	MODULE = CFPlus PACKAGE = CFPlus::Texture
883		1086
884	if (self->rgba)	1087	void
		1088	pad2pot (SV data_, SV w_, SV *h_)
		1089	CODE:
		1090	{
		1091	int ow = SvIV (w_);
		1092	int oh = SvIV (h_);
		1093
		1094	if (ow && oh)
885	{	1095	{
886	cairo_surface_t *surface;	1096	int nw = minpot (ow);
887	cairo_t *cairo;	1097	int nh = minpot (oh);
888		1098
889	retval = newSV (w * h * 4);	1099	if (nw != ow \|\| nh != oh)
890	SvPOK_only (retval);
891	SvCUR_set (retval, w * h * 4);
892
893	memset (SvPVX (retval), 0, w * h * 4);
894
895	surface = cairo_image_surface_create_for_data (
896	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
897	cairo = cairo_create (surface);
898	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
899
900	pango_cairo_show_layout (cairo, self->pl);
901
902	cairo_destroy (cairo);
903	cairo_surface_destroy (surface);
904
905	// what a mess, and its premultiplied, too :(
906	{	1100	{
907	uint32_t p = (uint32_t )SvPVX (retval);	1101	if (SvOK (data_))
908	uint32_t e = p + w h;
909
910	while (p < e)
911	{	1102	{
912	uint32_t rgba = *p;	1103	STRLEN datalen;
913	rgba = (rgba >> 24) \| (rgba << 8);	1104	char *data = SvPVbyte (data_, datalen);
914	#if 0	1105	int bpp = datalen / (ow * oh);
915	#ifdef _WIN32	1106	SV result_ = sv_2mortal (newSV (nw nh * bpp));
916	{//D
917	uint8_t r = rgba >> 24;
918	uint8_t g = rgba >> 16;
919	uint8_t b = rgba >> 8;
920	uint8_t a = rgba >> 0;
921		1107
922	rgba = (rgba & 0xffffff00) \| a;	1108	SvPOK_only (result_);
		1109	SvCUR_set (result_, nw * nh * bpp);
		1110
		1111	memset (SvPVX (result_), 0, nw * nh * bpp);
		1112	while (oh--)
		1113	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1114
		1115	sv_setsv (data_, result_);
923	}	1116	}
924	#endif	1117
925	#endif	1118	sv_setiv (w_, nw);
926	rgba = SDL_SwapBE32 (rgba);	1119	sv_setiv (h_, nh);
927	*p++ = rgba;
928	}	1120	}
929	}
930
931	EXTEND (SP, 5);
932	PUSHs (sv_2mortal (newSViv (w)));
933	PUSHs (sv_2mortal (newSViv (h)));
934	PUSHs (sv_2mortal (retval));
935	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
936	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
937	}	1121	}
938	else
939	{
940	FT_Bitmap bitmap;
941
942	retval = newSV (w * h);
943	SvPOK_only (retval);
944	SvCUR_set (retval, w * h);
945
946	bitmap.rows = h;
947	bitmap.width = w;
948	bitmap.pitch = w;
949	bitmap.buffer = (unsigned char*)SvPVX (retval);
950	bitmap.num_grays = 256;
951	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
952
953	memset (bitmap.buffer, 0, w * h);
954
955	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
956
957	EXTEND (SP, 5);
958	PUSHs (sv_2mortal (newSViv (w)));
959	PUSHs (sv_2mortal (newSViv (h)));
960	PUSHs (sv_2mortal (retval));
961	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
962	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
963	}
964	}	1122	}
965		1123
966	MODULE = CFClient PACKAGE = CFClient::Texture
967
968	void	1124	void
969	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1125	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
970	PROTOTYPE: $$$;$$	1126	PROTOTYPE: $$$;$$
971	ALIAS:	1127	ALIAS:
972	draw_quad_alpha = 1	1128	draw_quad_alpha = 1
973	draw_quad_alpha_premultiplied = 2	1129	draw_quad_alpha_premultiplied = 2
974	CODE:	1130	CODE:
…		…
990		1146
991	if (ix == 2)	1147	if (ix == 2)
992	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1148	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
993	else	1149	else
994	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	1150	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
995	GL_ONE_MINUS_DST_ALPHA, GL_ONE);	1151	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
996		1152
997	glEnable (GL_ALPHA_TEST);	1153	glEnable (GL_ALPHA_TEST);
998	glAlphaFunc (GL_GREATER, 0.01f);	1154	glAlphaFunc (GL_GREATER, 0.01f);
999	}	1155	}
1000		1156
…		…
1012	glDisable (GL_ALPHA_TEST);	1168	glDisable (GL_ALPHA_TEST);
1013	glDisable (GL_BLEND);	1169	glDisable (GL_BLEND);
1014	}	1170	}
1015	}	1171	}
1016		1172
1017	MODULE = CFClient PACKAGE = CFClient::Map	1173	MODULE = CFPlus PACKAGE = CFPlus::Map
1018		1174
1019	CFClient::Map	1175	CFPlus::Map
1020	new (SV *class, int map_width, int map_height)	1176	new (SV *class, int map_width, int map_height)
1021	CODE:	1177	CODE:
1022	New (0, RETVAL, 1, struct map);	1178	New (0, RETVAL, 1, struct map);
1023	RETVAL->x = 0;	1179	RETVAL->x = 0;
1024	RETVAL->y = 0;	1180	RETVAL->y = 0;
…		…
1034	RETVAL->row = 0;	1190	RETVAL->row = 0;
1035	OUTPUT:	1191	OUTPUT:
1036	RETVAL	1192	RETVAL
1037		1193
1038	void	1194	void
1039	DESTROY (CFClient::Map self)	1195	DESTROY (CFPlus::Map self)
1040	CODE:	1196	CODE:
1041	{	1197	{
1042	map_clear (self);	1198	map_clear (self);
1043	Safefree (self->face);	1199	Safefree (self->face);
		1200	Safefree (self->tex);
1044	Safefree (self);	1201	Safefree (self);
1045	}	1202	}
1046		1203
1047	void	1204	void
1048	clear (CFClient::Map self)	1205	clear (CFPlus::Map self)
1049	CODE:	1206	CODE:
1050	map_clear (self);	1207	map_clear (self);
1051		1208
1052	void	1209	void
1053	set_face (CFClient::Map self, int face, int texid)	1210	set_face (CFPlus::Map self, int face, int texid)
1054	CODE:	1211	CODE:
1055	{	1212	{
1056	while (self->faces <= face)	1213	while (self->faces <= face)
1057	{	1214	{
1058	Append (mapface, self->face, self->faces, self->faces);	1215	Append (mapface, self->face, self->faces, self->faces);
…		…
1061		1218
1062	self->face [face] = texid;	1219	self->face [face] = texid;
1063	}	1220	}
1064		1221
1065	void	1222	void
1066	set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1223	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)
1067	CODE:	1224	CODE:
1068	{	1225	{
1069	while (self->texs <= texid)	1226	while (self->texs <= texid)
1070	{	1227	{
1071	Append (maptex, self->tex, self->texs, self->texs);	1228	Append (maptex, self->tex, self->texs, self->texs);
…		…
1095	// from transparent color bleeding and ugly wrapping effects.	1252	// from transparent color bleeding and ugly wrapping effects.
1096	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1253	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1097	}	1254	}
1098		1255
1099	int	1256	int
1100	ox (CFClient::Map self)	1257	ox (CFPlus::Map self)
1101	ALIAS:	1258	ALIAS:
1102	oy = 1	1259	oy = 1
1103	x = 2	1260	x = 2
1104	y = 3	1261	y = 3
1105	w = 4	1262	w = 4
…		…
1116	}	1273	}
1117	OUTPUT:	1274	OUTPUT:
1118	RETVAL	1275	RETVAL
1119		1276
1120	void	1277	void
1121	scroll (CFClient::Map self, int dx, int dy)	1278	scroll (CFPlus::Map self, int dx, int dy)
1122	CODE:	1279	CODE:
1123	{	1280	{
1124	if (dx > 0)	1281	if (dx > 0)
1125	map_blank (self, self->x, self->y, dx - 1, self->h);	1282	map_blank (self, self->x, self->y, dx, self->h);
1126	else if (dx < 0)	1283	else if (dx < 0)
1127	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1284	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1128		1285
1129	if (dy > 0)	1286	if (dy > 0)
1130	map_blank (self, self->x, self->y, self->w, dy - 1);	1287	map_blank (self, self->x, self->y, self->w, dy);
1131	else if (dy < 0)	1288	else if (dy < 0)
1132	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1289	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1133		1290
1134	self->ox += dx; self->x += dx;	1291	self->ox += dx; self->x += dx;
1135	self->oy += dy; self->y += dy;	1292	self->oy += dy; self->y += dy;
1136		1293
1137	while (self->y < 0)	1294	while (self->y < 0)
…		…
1142	self->y += MAP_EXTEND_Y;	1299	self->y += MAP_EXTEND_Y;
1143	}	1300	}
1144	}	1301	}
1145		1302
1146	void	1303	void
1147	map1a_update (CFClient::Map self, SV *data_)	1304	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1148	CODE:	1305	CODE:
1149	{	1306	{
1150	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1307	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1151	uint8_t data_end = (uint8_t )SvEND (data_);	1308	uint8_t data_end = (uint8_t )SvEND (data_);
1152	mapcell *cell;	1309	mapcell *cell;
1153	int x, y, flags;	1310	int x, y, flags;
1154		1311
1155	while (data < data_end)	1312	while (data < data_end - 1)
1156	{	1313	{
1157	flags = (data [0] << 8) + data [1]; data += 2;	1314	flags = (data [0] << 8) + data [1]; data += 2;
1158		1315
1159	x = ((flags >> 10) & 63) + self->x;	1316	x = self->x + ((flags >> 10) & 63);
1160	y = ((flags >> 4) & 63) + self->y;	1317	y = self->y + ((flags >> 4) & 63);
1161		1318
1162	cell = map_get_cell (self, x, y);	1319	cell = map_get_cell (self, x, y);
1163		1320
1164	if (flags & 15)	1321	if (flags & 15)
1165	{	1322	{
1166	if (cell->darkness < 0)	1323	if (!cell->darkness)
1167	{	1324	{
		1325	memset (cell, 0, sizeof (*cell));
1168	cell->darkness = 0;	1326	cell->darkness = 256;
1169	cell->face [0] = 0;
1170	cell->face [1] = 0;
1171	cell->face [2] = 0;
1172	}	1327	}
1173		1328
1174	cell->darkness = flags & 8 ? *data++ : 255;
1175
1176	//TODO: don't trust server data to be in-range(!)	1329	//TODO: don't trust server data to be in-range(!)
		1330
		1331	if (flags & 8)
		1332	{
		1333	if (extmap)
		1334	{
		1335	uint8_t ext, cmd;
		1336
		1337	do
		1338	{
		1339	ext = *data++;
		1340	cmd = ext & 0x3f;
		1341
		1342	if (cmd < 4)
		1343	cell->darkness = 255 - ext * 64 + 1;
		1344	else if (cmd == 5) // health
		1345	{
		1346	cell->stat_width = 1;
		1347	cell->stat_hp = *data++;
		1348	}
		1349	else if (cmd == 6) // monster width
		1350	cell->stat_width = *data++ + 1;
		1351	else if (cmd == 0x47) // monster width
		1352	{
		1353	if (*data == 4)
		1354	; // decode player tag
		1355
		1356	data += *data + 1;
		1357	}
		1358	else if (cmd == 8) // cell flags
		1359	cell->flags = *data++;
		1360	else if (ext & 0x40) // unknown, multibyte => skip
		1361	data += *data + 1;
		1362	else
		1363	data++;
		1364	}
		1365	while (ext & 0x80);
		1366	}
		1367	else
		1368	cell->darkness = *data++ + 1;
		1369	}
1177		1370
1178	if (flags & 4)	1371	if (flags & 4)
1179	{	1372	{
1180	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1373	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1181	}	1374	}
…		…
1189	{	1382	{
1190	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1383	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1191	}	1384	}
1192	}	1385	}
1193	else	1386	else
1194	cell->darkness = -1;	1387	cell->darkness = 0;
1195	}	1388	}
1196	}	1389	}
1197		1390
1198	SV *	1391	SV *
1199	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1392	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1200	CODE:	1393	CODE:
1201	{	1394	{
1202	int x1, x;	1395	int x1, x;
1203	int y1, y;	1396	int y1, y;
1204	int z;	1397	int z;
…		…
1254	}	1447	}
1255	OUTPUT:	1448	OUTPUT:
1256	RETVAL	1449	RETVAL
1257		1450
1258	void	1451	void
1259	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1452	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1260	PPCODE:	1453	CODE:
1261	{	1454	{
1262	int vx, vy;	1455	int vx, vy;
1263	int x, y, z;	1456	int x, y, z;
1264	int last_name;	1457	int last_name;
1265	mapface face;	1458	mapface face;
1266	int sw4 = (sw + 3) & ~3;
1267	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1268	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1269		1459
1270	memset (darkness, 255, sw4 * sh);
1271	SvPOK_only (darkness_sv);
1272	SvCUR_set (darkness_sv, sw4 * sh);
1273
1274	vx = self->x + (self->w - sw) / 2 - shift_x;	1460	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1275	vy = self->y + (self->h - sh) / 2 - shift_y;	1461	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1276		1462
1277	/*	1463	/*
1278	int vx = self->vx = self->w >= sw	1464	int vx = self->vx = self->w >= sw
1279	? self->x + (self->w - sw) / 2	1465	? self->x + (self->w - sw) / 2
1280	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1466	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1284	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1470	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1285	*/	1471	*/
1286		1472
1287	glColor4ub (255, 255, 255, 255);	1473	glColor4ub (255, 255, 255, 255);
1288		1474
		1475	glEnable (GL_BLEND);
1289	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1476	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1290	glEnable (GL_BLEND);
1291	glEnable (GL_TEXTURE_2D);	1477	glEnable (GL_TEXTURE_2D);
1292	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1478	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1293		1479
1294	glBegin (GL_QUADS);	1480	glBegin (GL_QUADS);
1295		1481
…		…
1304	for (x = 0; x < sw; x++)	1490	for (x = 0; x < sw; x++)
1305	if (row->c0 <= x + vx && x + vx < row->c1)	1491	if (row->c0 <= x + vx && x + vx < row->c1)
1306	{	1492	{
1307	mapcell *cell = row->col + (x + vx - row->c0);	1493	mapcell *cell = row->col + (x + vx - row->c0);
1308		1494
1309	darkness[y * sw4 + x] = cell->darkness < 0
1310	? 255 - FOW_DARKNESS
1311	: 255 - cell->darkness;
1312
1313	face = cell->face [z];	1495	face = cell->face [z];
1314		1496
1315	if (face)	1497	if (face && face < self->texs)
1316	{	1498	{
1317	maptex tex = self->tex [face];	1499	maptex tex = self->tex [face];
1318
1319	int px = (x + 1) * 32 - tex.w;	1500	int px = (x + 1) * 32 - tex.w;
1320	int py = (y + 1) * 32 - tex.h;	1501	int py = (y + 1) * 32 - tex.h;
1321		1502
1322	if (last_name != tex.name)	1503	if (last_name != tex.name)
1323	{	1504	{
1324	glEnd ();	1505	glEnd ();
1325	last_name = tex.name;
1326	glBindTexture (GL_TEXTURE_2D, last_name);	1506	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1327	glBegin (GL_QUADS);	1507	glBegin (GL_QUADS);
1328	}	1508	}
1329		1509
1330	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1510	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1331	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1511	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1332	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1512	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1333	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1513	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1334	}	1514	}
		1515
		1516	if (cell->flags && z == 2)
		1517	{
		1518	if (cell->flags & 1)
		1519	{
		1520	maptex tex = self->tex [1];
		1521	int px = (x + 1) * 32 - tex.w + 2;
		1522	int py = (y + 1) * 32 - tex.h - 6;
		1523
		1524	glEnd ();
		1525	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1526	glBegin (GL_QUADS);
		1527
		1528	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1529	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1530	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1531	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1532	}
		1533	}
1335	}	1534	}
1336	}	1535	}
1337		1536
1338	glEnd ();	1537	glEnd ();
1339		1538
1340	glDisable (GL_TEXTURE_2D);	1539	glDisable (GL_TEXTURE_2D);
1341	glDisable (GL_BLEND);	1540	glDisable (GL_BLEND);
		1541
		1542	// top layer: overlays such as the health bar
		1543	for (y = 0; y < sh; y++)
		1544	if (0 <= y + vy && y + vy < self->rows)
		1545	{
		1546	maprow *row = self->row + (y + vy);
		1547
		1548	for (x = 0; x < sw; x++)
		1549	if (row->c0 <= x + vx && x + vx < row->c1)
		1550	{
		1551	mapcell *cell = row->col + (x + vx - row->c0);
		1552
		1553	int px = x * 32;
		1554	int py = y * 32;
		1555
		1556	if (cell->stat_hp)
		1557	{
		1558	int width = cell->stat_width * 32;
		1559	int thick = sh / 28 + 1 + cell->stat_width;
		1560
		1561	glColor3ub (0, 0, 0);
		1562	glRectf (px + 1, py - thick - 2,
		1563	px + width - 1, py);
		1564
		1565	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1566	glRectf (px + 2,
		1567	py - thick - 1,
		1568	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1569	}
		1570	}
		1571	}
		1572	}
		1573
		1574	void
		1575	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1576	CODE:
		1577	{
		1578	static float color[16][3] = {
		1579	{ 0.00F, 0.00F, 0.00F },
		1580	{ 1.00F, 1.00F, 1.00F },
		1581	{ 0.00F, 0.00F, 0.55F },
		1582	{ 1.00F, 0.00F, 0.00F },
		1583
		1584	{ 1.00F, 0.54F, 0.00F },
		1585	{ 0.11F, 0.56F, 1.00F },
		1586	{ 0.93F, 0.46F, 0.00F },
		1587	{ 0.18F, 0.54F, 0.34F },
		1588
		1589	{ 0.56F, 0.73F, 0.56F },
		1590	{ 0.80F, 0.80F, 0.80F },
		1591	{ 0.55F, 0.41F, 0.13F },
		1592	{ 0.99F, 0.77F, 0.26F },
		1593
		1594	{ 0.74F, 0.65F, 0.41F },
		1595
		1596	{ 0.00F, 1.00F, 1.00F },
		1597	{ 1.00F, 0.00F, 1.00F },
		1598	{ 1.00F, 1.00F, 0.00F },
		1599	};
		1600
		1601	int x, y;
		1602
		1603	glEnable (GL_TEXTURE_2D);
		1604	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1605	glEnable (GL_BLEND);
		1606	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1607	glBegin (GL_QUADS);
		1608
		1609	for (y = 0; y < h; y++)
		1610	for (x = 0; x < w; x++)
		1611	{
		1612	unsigned char m = data [x + y * w];
		1613
		1614	if (m)
		1615	{
		1616	float *c = color [m & 15];
		1617
		1618	float tx1 = m & 0x40 ? 0.5 : 0.;
		1619	float tx2 = tx1 + 0.5;
		1620
		1621	glColor4f (c[0], c[1], c[2], 0.75);
		1622	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1623	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1624	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1625	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1626	}
		1627	}
		1628
		1629	glEnd ();
		1630	glDisable (GL_BLEND);
		1631	glDisable (GL_TEXTURE_2D);
		1632	}
		1633
		1634	void
		1635	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1636	PPCODE:
		1637	{
		1638	int vx, vy;
		1639	int x, y;
		1640	int sw4 = (sw + 3) & ~3;
		1641	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1642	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1643
		1644	memset (darkness, 255, sw4 * sh);
		1645	SvPOK_only (darkness_sv);
		1646	SvCUR_set (darkness_sv, sw4 * sh);
		1647
		1648	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1649	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1650
		1651	for (y = 0; y < sh; y++)
		1652	if (0 <= y + vy && y + vy < self->rows)
		1653	{
		1654	maprow *row = self->row + (y + vy);
		1655
		1656	for (x = 0; x < sw; x++)
		1657	if (row->c0 <= x + vx && x + vx < row->c1)
		1658	{
		1659	mapcell *cell = row->col + (x + vx - row->c0);
		1660
		1661	darkness[y * sw4 + x] = cell->darkness
		1662	? 255 - (cell->darkness - 1)
		1663	: 255 - FOW_DARKNESS;
		1664	}
		1665	}
1342		1666
1343	EXTEND (SP, 3);	1667	EXTEND (SP, 3);
1344	PUSHs (sv_2mortal (newSViv (sw4)));	1668	PUSHs (sv_2mortal (newSViv (sw4)));
1345	PUSHs (sv_2mortal (newSViv (sh)));	1669	PUSHs (sv_2mortal (newSViv (sh)));
1346	PUSHs (darkness_sv);	1670	PUSHs (darkness_sv);
1347	}	1671	}
1348		1672
1349	SV *	1673	SV *
1350	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1674	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1351	CODE:	1675	CODE:
1352	{	1676	{
1353	int x, y, x1, y1;	1677	int x, y, x1, y1;
1354	SV data_sv = newSV (w h * 7 + 5);	1678	SV data_sv = newSV (w h * 7 + 5);
1355	uint8_t data = (uint8_t )SvPVX (data_sv);	1679	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1417	}	1741	}
1418	OUTPUT:	1742	OUTPUT:
1419	RETVAL	1743	RETVAL
1420		1744
1421	void	1745	void
1422	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1746	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1423	PPCODE:	1747	PPCODE:
1424	{	1748	{
1425	int x, y, z;	1749	int x, y, z;
1426	int w, h;	1750	int w, h;
1427	int x1, y1;	1751	int x1, y1;
…		…
1459		1783
1460	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1784	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1461	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1785	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1462	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1786	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1463		1787
1464	if (cell->darkness <= 0)	1788	if (cell->darkness == 0)
1465	{	1789	{
1466	cell->darkness = -1;	1790	cell->darkness = 0;
1467		1791
1468	for (z = 0; z <= 2; z++)	1792	for (z = 0; z <= 2; z++)
1469	{	1793	{
1470	cell->face[z] = face[z];	1794	cell->face[z] = face[z];
1471		1795
…		…
1476	}	1800	}
1477	}	1801	}
1478	}	1802	}
1479	}	1803	}
1480		1804
1481	MODULE = CFClient PACKAGE = CFClient::MixChunk	1805	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1482		1806
1483	CFClient::MixChunk	1807	CFPlus::MixChunk
1484	new_from_file (SV class, char path)	1808	new_from_file (SV class, char path)
1485	CODE:	1809	CODE:
1486	RETVAL = Mix_LoadWAV (path);	1810	RETVAL = Mix_LoadWAV (path);
1487	OUTPUT:	1811	OUTPUT:
1488	RETVAL	1812	RETVAL
1489		1813
1490	void	1814	void
1491	DESTROY (CFClient::MixChunk self)	1815	DESTROY (CFPlus::MixChunk self)
1492	CODE:	1816	CODE:
1493	Mix_FreeChunk (self);	1817	Mix_FreeChunk (self);
1494		1818
1495	int	1819	int
1496	volume (CFClient::MixChunk self, int volume = -1)	1820	volume (CFPlus::MixChunk self, int volume = -1)
1497	CODE:	1821	CODE:
1498	RETVAL = Mix_VolumeChunk (self, volume);	1822	RETVAL = Mix_VolumeChunk (self, volume);
1499	OUTPUT:	1823	OUTPUT:
1500	RETVAL	1824	RETVAL
1501		1825
1502	int	1826	int
1503	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1827	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1504	CODE:	1828	CODE:
1505	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1829	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1506	OUTPUT:	1830	OUTPUT:
1507	RETVAL	1831	RETVAL
1508		1832
1509	MODULE = CFClient PACKAGE = CFClient::MixMusic	1833	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1510		1834
1511	int	1835	int
1512	volume (int volume = -1)	1836	volume (int volume = -1)
1513	CODE:	1837	CODE:
1514	RETVAL = Mix_VolumeMusic (volume);	1838	RETVAL = Mix_VolumeMusic (volume);
1515	OUTPUT:	1839	OUTPUT:
1516	RETVAL	1840	RETVAL
1517		1841
1518	CFClient::MixMusic	1842	CFPlus::MixMusic
1519	new_from_file (SV class, char path)	1843	new_from_file (SV class, char path)
1520	CODE:	1844	CODE:
1521	RETVAL = Mix_LoadMUS (path);	1845	RETVAL = Mix_LoadMUS (path);
1522	OUTPUT:	1846	OUTPUT:
1523	RETVAL	1847	RETVAL
1524		1848
1525	void	1849	void
1526	DESTROY (CFClient::MixMusic self)	1850	DESTROY (CFPlus::MixMusic self)
1527	CODE:	1851	CODE:
1528	Mix_FreeMusic (self);	1852	Mix_FreeMusic (self);
1529		1853
1530	int	1854	int
1531	play (CFClient::MixMusic self, int loops = -1)	1855	play (CFPlus::MixMusic self, int loops = -1)
1532	CODE:	1856	CODE:
1533	RETVAL = Mix_PlayMusic (self, loops);	1857	RETVAL = Mix_PlayMusic (self, loops);
1534	OUTPUT:	1858	OUTPUT:
1535	RETVAL	1859	RETVAL
1536		1860
1537	MODULE = CFClient PACKAGE = CFClient::OpenGL	1861	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1538		1862
1539	BOOT:	1863	BOOT:
1540	{	1864	{
1541	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1865	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1542	static const struct {	1866	static const struct {
1543	const char *name;	1867	const char *name;
1544	IV iv;	1868	IV iv;
1545	} *civ, const_iv[] = {	1869	} *civ, const_iv[] = {
1546	# define const_iv(name) { # name, (IV)name }	1870	# define const_iv(name) { # name, (IV)name }
…		…
1553	const_iv (GL_SCISSOR_TEST),	1877	const_iv (GL_SCISSOR_TEST),
1554	const_iv (GL_DEPTH_TEST),	1878	const_iv (GL_DEPTH_TEST),
1555	const_iv (GL_ALPHA_TEST),	1879	const_iv (GL_ALPHA_TEST),
1556	const_iv (GL_NORMALIZE),	1880	const_iv (GL_NORMALIZE),
1557	const_iv (GL_RESCALE_NORMAL),	1881	const_iv (GL_RESCALE_NORMAL),
		1882	const_iv (GL_FRONT),
		1883	const_iv (GL_BACK),
1558	const_iv (GL_AND),	1884	const_iv (GL_AND),
1559	const_iv (GL_ONE),	1885	const_iv (GL_ONE),
1560	const_iv (GL_ZERO),	1886	const_iv (GL_ZERO),
1561	const_iv (GL_SRC_ALPHA),	1887	const_iv (GL_SRC_ALPHA),
1562	const_iv (GL_SRC_ALPHA_SATURATE),	1888	const_iv (GL_DST_ALPHA),
1563	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1889	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1564	const_iv (GL_ONE_MINUS_DST_ALPHA),	1890	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1891	const_iv (GL_SRC_ALPHA_SATURATE),
1565	const_iv (GL_RGB),	1892	const_iv (GL_RGB),
1566	const_iv (GL_RGBA),	1893	const_iv (GL_RGBA),
		1894	const_iv (GL_RGBA4),
		1895	const_iv (GL_RGBA8),
		1896	const_iv (GL_RGB5_A1),
1567	const_iv (GL_UNSIGNED_BYTE),	1897	const_iv (GL_UNSIGNED_BYTE),
1568	const_iv (GL_UNSIGNED_SHORT),	1898	const_iv (GL_UNSIGNED_SHORT),
1569	const_iv (GL_UNSIGNED_INT),	1899	const_iv (GL_UNSIGNED_INT),
1570	const_iv (GL_ALPHA),	1900	const_iv (GL_ALPHA),
1571	const_iv (GL_INTENSITY),	1901	const_iv (GL_INTENSITY),
…		…
1603	const_iv (GL_SEPARABLE_2D),	1933	const_iv (GL_SEPARABLE_2D),
1604	const_iv (GL_CONVOLUTION_2D),	1934	const_iv (GL_CONVOLUTION_2D),
1605	const_iv (GL_CONVOLUTION_BORDER_MODE),	1935	const_iv (GL_CONVOLUTION_BORDER_MODE),
1606	const_iv (GL_CONSTANT_BORDER),	1936	const_iv (GL_CONSTANT_BORDER),
1607	const_iv (GL_LINES),	1937	const_iv (GL_LINES),
		1938	const_iv (GL_LINE_STRIP),
1608	const_iv (GL_LINE_LOOP),	1939	const_iv (GL_LINE_LOOP),
1609	const_iv (GL_QUADS),	1940	const_iv (GL_QUADS),
1610	const_iv (GL_QUAD_STRIP),	1941	const_iv (GL_QUAD_STRIP),
1611	const_iv (GL_TRIANGLES),	1942	const_iv (GL_TRIANGLES),
1612	const_iv (GL_TRIANGLE_STRIP),	1943	const_iv (GL_TRIANGLE_STRIP),
…		…
1645	OUTPUT:	1976	OUTPUT:
1646	RETVAL	1977	RETVAL
1647		1978
1648	int glGetError ()	1979	int glGetError ()
1649		1980
		1981	void glFinish ()
		1982
1650	void glClear (int mask)	1983	void glClear (int mask)
1651		1984
1652	void glClearColor (float r, float g, float b, float a = 1.0)	1985	void glClearColor (float r, float g, float b, float a = 1.0)
1653	PROTOTYPE: @	1986	PROTOTYPE: @
1654		1987
…		…
1677	void glPushMatrix ()	2010	void glPushMatrix ()
1678		2011
1679	void glPopMatrix ()	2012	void glPopMatrix ()
1680		2013
1681	void glLoadIdentity ()	2014	void glLoadIdentity ()
		2015
		2016	void glDrawBuffer (int buffer)
		2017
		2018	void glReadBuffer (int buffer)
1682		2019
1683	# near_ and far_ are due to microsofts buggy "c" compiler	2020	# near_ and far_ are due to microsofts buggy "c" compiler
1684	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2021	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1685		2022
1686	# near_ and far_ are due to microsofts buggy "c" compiler	2023	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1716	r *= a;	2053	r *= a;
1717	g *= a;	2054	g *= a;
1718	b *= a;	2055	b *= a;
1719	}	2056	}
1720	// microsoft visual "c" rounds instead of truncating...	2057	// microsoft visual "c" rounds instead of truncating...
1721	glColor4ub (MIN ((int)(r * 256.f), 255),	2058	glColor4f (r, g, b, a);
1722	MIN ((int)(g * 256.f), 255),
1723	MIN ((int)(b * 256.f), 255),
1724	MIN ((int)(a * 256.f), 255));
1725		2059
1726	void glInterleavedArrays (int format, int stride, char *data)	2060	void glInterleavedArrays (int format, int stride, char *data)
1727		2061
1728	void glDrawElements (int mode, int count, int type, char *indices)	2062	void glDrawElements (int mode, int count, int type, char *indices)
1729		2063
…		…
1806		2140
1807	void glEndList ()	2141	void glEndList ()
1808		2142
1809	void glCallList (int list)	2143	void glCallList (int list)
1810		2144
1811

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.103 by root, Sun Jun 4 23:05:05 2006 UTC vs. Revision 1.158 by root, Sun Oct 1 18:17:37 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.103 by root, Sun Jun 4 23:05:05 2006 UTC vs.
Revision 1.158 by root, Sun Oct 1 18:17:37 2006 UTC