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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.105 by root, Mon Jun 5 03:33:09 2006 UTC vs.
Revision 1.157 by root, Sun Oct 1 14:48:50 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);
		127	#ifdef FC_HINT_STYLE
91	//FcPatternAddBool (pattern, FC_AUTOHINT, 1);	128	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		129	#endif
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	130	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	}	131	}
94		132
95	static void	133	static void
96	layout_update_font (CFClient__Layout self)	134	layout_update_font (CFPlus__Layout self)
97	{	135	{
98	/* 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
99	* reasonably well with bitstream vera	137	* reasonably well with bitstream vera
100	*/	138	*/
101	PangoFontDescription *font = self->font ? self->font : default_font;	139	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
105		143
106	pango_layout_set_font_description (self->pl, font);	144	pango_layout_set_font_description (self->pl, font);
107	}	145	}
108		146
109	static void	147	static void
110	layout_get_pixel_size (CFClient__Layout self, int w, int h)	148	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
111	{	149	{
		150	PangoRectangle rect;
		151
		152	// get_pixel_* wrongly rounds down
112	pango_layout_get_pixel_size (self->pl, w, h);	153	pango_layout_get_extents (self->pl, 0, &rect);
113		154
114	if (!w) w = 1;	155	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
115	if (!h) h = 1;	156	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
116		157
117	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;
118	}	163	}
119		164
120	typedef uint16_t mapface;	165	typedef uint16_t mapface;
121		166
122	typedef struct {	167	typedef struct {
…		…
125	float s, t;	170	float s, t;
126	uint8_t r, g, b, a;	171	uint8_t r, g, b, a;
127	} maptex;	172	} maptex;
128		173
129	typedef struct {	174	typedef struct {
130	int16_t darkness;	175	uint32_t player;
131	mapface face[3];	176	mapface face[3];
		177	uint16_t darkness;
		178	uint8_t stat_width, stat_hp, flags;
132	} mapcell;	179	} mapcell;
133		180
134	typedef struct {	181	typedef struct {
135	int32_t c0, c1;	182	int32_t c0, c1;
136	mapcell *col;	183	mapcell *col;
…		…
145	int texs;	192	int texs;
146	maptex *tex;	193	maptex *tex;
147		194
148	int32_t rows;	195	int32_t rows;
149	maprow *row;	196	maprow *row;
150	} *CFClient__Map;	197	} *CFPlus__Map;
151		198
152	static char *	199	static char *
153	prepend (char *ptr, int sze, int inc)	200	prepend (char *ptr, int sze, int inc)
154	{	201	{
155	char *p;	202	char *p;
…		…
173		220
174	#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))
175	#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))
176		223
177	static maprow *	224	static maprow *
178	map_get_row (CFClient__Map self, int y)	225	map_get_row (CFPlus__Map self, int y)
179	{	226	{
180	if (0 > y)	227	if (0 > y)
181	{	228	{
182	int extend = - y + MAP_EXTEND_Y;	229	int extend = - y + MAP_EXTEND_Y;
183	Prepend (maprow, self->row, self->rows, extend);	230	Prepend (maprow, self->row, self->rows, extend);
…		…
221		268
222	return row->col + (x - row->c0);	269	return row->col + (x - row->c0);
223	}	270	}
224		271
225	static mapcell *	272	static mapcell *
226	map_get_cell (CFClient__Map self, int x, int y)	273	map_get_cell (CFPlus__Map self, int x, int y)
227	{	274	{
228	return row_get_cell (map_get_row (self, y), x);	275	return row_get_cell (map_get_row (self, y), x);
229	}	276	}
230		277
231	static void	278	static void
232	map_clear (CFClient__Map self)	279	map_clear (CFPlus__Map self)
233	{	280	{
234	int r;	281	int r;
235		282
236	for (r = 0; r < self->rows; r++)	283	for (r = 0; r < self->rows; r++)
237	Safefree (self->row[r].col);	284	Safefree (self->row[r].col);
…		…
245	self->row = 0;	292	self->row = 0;
246	self->rows = 0;	293	self->rows = 0;
247	}	294	}
248		295
249	static void	296	static void
250	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)
251	{	298	{
252	int x, y;	299	int x, y;
253	maprow *row;	300	maprow *row;
		301	mapcell *cell;
254		302
255	for (y = y0; y < y0 + h; y++)	303	for (y = y0; y < y0 + h; y++)
256	if (y >= 0)	304	if (y >= 0)
257	{	305	{
258	if (y >= self->rows)	306	if (y >= self->rows)
…		…
264	if (x >= row->c0)	312	if (x >= row->c0)
265	{	313	{
266	if (x >= row->c1)	314	if (x >= row->c1)
267	break;	315	break;
268		316
269	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;
270	}	323	}
271	}	324	}
272	}	325	}
273		326
274	static void	327	static void
…		…
295	ev.data2 = 0;	348	ev.data2 = 0;
296		349
297	SDL_PushEvent ((SDL_Event *)&ev);	350	SDL_PushEvent ((SDL_Event *)&ev);
298	}	351	}
299		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
300	MODULE = CFClient PACKAGE = CFClient	370	MODULE = CFPlus PACKAGE = CFPlus
301		371
302	PROTOTYPES: ENABLE	372	PROTOTYPES: ENABLE
303		373
304	BOOT:	374	BOOT:
305	{	375	{
306	HV *stash = gv_stashpv ("CFClient", 1);	376	HV *stash = gv_stashpv ("CFPlus", 1);
307	static const struct {	377	static const struct {
308	const char *name;	378	const char *name;
309	IV iv;	379	IV iv;
310	} *civ, const_iv[] = {	380	} *civ, const_iv[] = {
311	# define const_iv(name) { # name, (IV)name }	381	# define const_iv(name) { # name, (IV)name }
…		…
412		482
413	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; )
414	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	484	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
415	}	485	}
416		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
417	void	498	void
418	pango_init ()	499	pango_init ()
419	CODE:	500	CODE:
420	// delayed, so it can pick up new fonts added by AddFontResourceEx
421	{	501	{
422	{
423	ft2_fontmap = pango_ft2_font_map_new ();	502	opengl_fontmap = pango_opengl_font_map_new ();
424	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);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	504	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426	}
427
428	{
429	cairo_font_options_t *fopt = cairo_font_options_create ();
430	cairo_fontmap = pango_cairo_font_map_get_default ();
431	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
432	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
433	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
434	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
435	pango_cairo_context_set_font_options (cairo_context, fopt);
436	cairo_font_options_destroy (fopt);
437	}
438	}	505	}
439		506
440	int	507	int
441	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	508	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
442		509
443	void	510	void
444	SDL_Quit ()	511	SDL_Quit ()
445		512
446	void	513	void
…		…
453	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	520	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
454	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	521	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
455	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	522	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
456		523
457	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	524	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
458	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	525	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
459		526
460	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
461	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	528	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
462	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	529	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
463	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	530	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
464		531
465	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
466		537
467	SDL_EnableUNICODE (1);	538	SDL_EnableUNICODE (1);
468	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	539	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
469		540
470	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	541	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
557	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	628	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
558	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	629	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
559	break;	630	break;
560	}	631	}
561		632
562	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	633	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
563	}	634	}
564	}	635	}
565		636
566	int	637	int
567	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)
…		…
581	#ifndef _WIN32	652	#ifndef _WIN32
582	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	653	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
583	#endif	654	#endif
584		655
585	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
586	add_font (char *file)	687	add_font (char *file)
587	CODE:	688	CODE:
588	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	689	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
589	#ifdef _WIN32
590	// cairo... sigh... requires win2000
591	AddFontResourceEx (file, FR_PRIVATE, 0);
592	#endif
593		690
594	void	691	void
595	load_image_inline (SV *image_)	692	load_image_inline (SV *image_)
596	ALIAS:	693	ALIAS:
597	load_image_file = 1	694	load_image_file = 1
…		…
639		736
640	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	737	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
641		738
642	assert (surface2->pitch == surface2->w * 4);	739	assert (surface2->pitch == surface2->w * 4);
643		740
		741	SDL_LockSurface (surface2);
644	EXTEND (SP, 5);	742	EXTEND (SP, 6);
645	PUSHs (sv_2mortal (newSViv (surface2->w)));	743	PUSHs (sv_2mortal (newSViv (surface2->w)));
646	PUSHs (sv_2mortal (newSViv (surface2->h)));	744	PUSHs (sv_2mortal (newSViv (surface2->h)));
647	SDL_LockSurface (surface2);
648	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	745	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
649	SDL_UnlockSurface (surface2);
650	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)));
651	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	747	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
652	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	748	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		749	SDL_UnlockSurface (surface2);
653		750
654	SDL_FreeSurface (surface);	751	SDL_FreeSurface (surface);
655	SDL_FreeSurface (surface2);	752	SDL_FreeSurface (surface2);
656	}	753	}
657		754
…		…
693	CODE:	790	CODE:
694	fprintf (stderr, "FATAL: %s\n", message);	791	fprintf (stderr, "FATAL: %s\n", message);
695	#ifdef _WIN32	792	#ifdef _WIN32
696	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	793	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
697	#endif	794	#endif
698	exit (1);	795	_exit (1);
699		796
		797	void
		798	_exit (int retval)
		799	CODE:
		800	_exit (retval);
		801
700	MODULE = CFClient PACKAGE = CFClient::Font	802	MODULE = CFPlus PACKAGE = CFPlus::Font
701		803
702	CFClient::Font	804	CFPlus::Font
703	new_from_file (SV class, char path, int id = 0)	805	new_from_file (SV class, char path, int id = 0)
704	CODE:	806	CODE:
705	{	807	{
706	int count;	808	int count;
707	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	809	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
710	}	812	}
711	OUTPUT:	813	OUTPUT:
712	RETVAL	814	RETVAL
713		815
714	void	816	void
715	DESTROY (CFClient::Font self)	817	DESTROY (CFPlus::Font self)
716	CODE:	818	CODE:
717	pango_font_description_free (self);	819	pango_font_description_free (self);
718		820
719	void	821	void
720	make_default (CFClient::Font self)	822	make_default (CFPlus::Font self)
721	CODE:	823	CODE:
722	default_font = self;	824	default_font = self;
723		825
724	MODULE = CFClient PACKAGE = CFClient::Layout	826	MODULE = CFPlus PACKAGE = CFPlus::Layout
725		827
726	CFClient::Layout	828	void
727	new (SV *class, int rgba = 0)	829	reset_glyph_cache ()
728	CODE:	830	CODE:
729	#if _WIN32	831	tc_clear ();
730	//rgba = 0;//D makes text nicer, breaks TextView	832
731	#endif	833	CFPlus::Layout
732	rgba=1;//D	834	new (SV *class)
		835	CODE:
733	New (0, RETVAL, 1, struct cf_layout);	836	New (0, RETVAL, 1, struct cf_layout);
734		837
735	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	838	RETVAL->pl = pango_layout_new (opengl_context);
736	RETVAL->rgba = rgba;
737	RETVAL->r = 1.;	839	RETVAL->r = 1.;
738	RETVAL->g = 1.;	840	RETVAL->g = 1.;
739	RETVAL->b = 1.;	841	RETVAL->b = 1.;
740	RETVAL->a = 1.;	842	RETVAL->a = 1.;
741	RETVAL->base_height = MIN_FONT_HEIGHT;	843	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
745	layout_update_font (RETVAL);	847	layout_update_font (RETVAL);
746	OUTPUT:	848	OUTPUT:
747	RETVAL	849	RETVAL
748		850
749	void	851	void
750	DESTROY (CFClient::Layout self)	852	DESTROY (CFPlus::Layout self)
751	CODE:	853	CODE:
752	g_object_unref (self->pl);	854	g_object_unref (self->pl);
753	Safefree (self);	855	Safefree (self);
754		856
755	int
756	is_rgba (CFClient::Layout self)
757	CODE:
758	RETVAL = self->rgba;
759	OUTPUT:
760	RETVAL
761
762	void	857	void
763	set_text (CFClient::Layout self, SV *text_)	858	set_text (CFPlus::Layout self, SV *text_)
764	CODE:	859	CODE:
765	{	860	{
766	STRLEN textlen;	861	STRLEN textlen;
767	char *text = SvPVutf8 (text_, textlen);	862	char *text = SvPVutf8 (text_, textlen);
768		863
769	pango_layout_set_text (self->pl, text, textlen);	864	pango_layout_set_text (self->pl, text, textlen);
770	}	865	}
771		866
772	void	867	void
773	set_markup (CFClient::Layout self, SV *text_)	868	set_markup (CFPlus::Layout self, SV *text_)
774	CODE:	869	CODE:
775	{	870	{
776	STRLEN textlen;	871	STRLEN textlen;
777	char *text = SvPVutf8 (text_, textlen);	872	char *text = SvPVutf8 (text_, textlen);
778		873
779	pango_layout_set_markup (self->pl, text, textlen);	874	pango_layout_set_markup (self->pl, text, textlen);
780	}	875	}
781		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
782	SV *	962	SV *
783	get_text (CFClient::Layout self)	963	get_text (CFPlus::Layout self)
784	CODE:	964	CODE:
785	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	965	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
786	SvUTF8_on (RETVAL);	966	sv_utf8_decode (RETVAL);
787	OUTPUT:	967	OUTPUT:
788	RETVAL	968	RETVAL
789		969
790	void	970	void
791	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.)
792	CODE:	972	CODE:
793	self->r = r;	973	self->r = r;
794	self->g = g;	974	self->g = g;
795	self->b = b;	975	self->b = b;
796	self->a = a;	976	self->a = a;
797		977
798	void	978	void
799	set_font (CFClient::Layout self, CFClient::Font font = 0)	979	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
800	CODE:	980	CODE:
801	if (self->font != font)	981	if (self->font != font)
802	{	982	{
803	self->font = font;	983	self->font = font;
804	layout_update_font (self);	984	layout_update_font (self);
805	}	985	}
806		986
807	void	987	void
808	set_height (CFClient::Layout self, int base_height)	988	set_height (CFPlus::Layout self, int base_height)
809	CODE:	989	CODE:
810	if (self->base_height != base_height)	990	if (self->base_height != base_height)
811	{	991	{
812	self->base_height = base_height;	992	self->base_height = base_height;
813	layout_update_font (self);	993	layout_update_font (self);
814	}	994	}
815		995
816	void	996	void
817	set_width (CFClient::Layout self, int max_width = -1)	997	set_width (CFPlus::Layout self, int max_width = -1)
818	CODE:	998	CODE:
819	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);
820		1000
821	void	1001	void
822	set_indent (CFClient::Layout self, int indent)	1002	set_indent (CFPlus::Layout self, int indent)
823	CODE:	1003	CODE:
824	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1004	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
825		1005
826	void	1006	void
827	set_spacing (CFClient::Layout self, int spacing)	1007	set_spacing (CFPlus::Layout self, int spacing)
828	CODE:	1008	CODE:
829	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1009	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
830		1010
831	void	1011	void
832	set_ellipsise (CFClient::Layout self, int ellipsise)	1012	set_ellipsise (CFPlus::Layout self, int ellipsise)
833	CODE:	1013	CODE:
834	pango_layout_set_ellipsize (self->pl,	1014	pango_layout_set_ellipsize (self->pl,
835	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1015	ellipsise == 1 ? PANGO_ELLIPSIZE_START
836	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1016	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
837	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1017	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
838	: PANGO_ELLIPSIZE_NONE	1018	: PANGO_ELLIPSIZE_NONE
839	);	1019	);
840		1020
841	void	1021	void
842	set_single_paragraph_mode (CFClient::Layout self, int spm)	1022	set_single_paragraph_mode (CFPlus::Layout self, int spm)
843	CODE:	1023	CODE:
844	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1024	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
845		1025
846	void	1026	void
847	size (CFClient::Layout self)	1027	size (CFPlus::Layout self)
848	PPCODE:	1028	PPCODE:
849	{	1029	{
850	int w, h;	1030	int w, h;
851		1031
852	layout_get_pixel_size (self, &w, &h);	1032	layout_get_pixel_size (self, &w, &h);
…		…
855	PUSHs (sv_2mortal (newSViv (w)));	1035	PUSHs (sv_2mortal (newSViv (w)));
856	PUSHs (sv_2mortal (newSViv (h)));	1036	PUSHs (sv_2mortal (newSViv (h)));
857	}	1037	}
858		1038
859	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
860	xy_to_index (CFClient::Layout self, int x, int y)	1052	xy_to_index (CFPlus::Layout self, int x, int y)
861	CODE:	1053	CODE:
862	{	1054	{
863	int index, trailing;	1055	int index, trailing;
864	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);
865	RETVAL = index;	1057	RETVAL = index;
866	}	1058	}
867	OUTPUT:	1059	OUTPUT:
868	RETVAL	1060	RETVAL
869		1061
870	void	1062	void
871	cursor_pos (CFClient::Layout self, int index)	1063	cursor_pos (CFPlus::Layout self, int index)
872	PPCODE:	1064	PPCODE:
873	{	1065	{
874	PangoRectangle strong_pos;	1066	PangoRectangle strong_pos;
875	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1067	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
876		1068
…		…
879	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1071	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
880	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1072	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
881	}	1073	}
882		1074
883	void	1075	void
884	render (CFClient::Layout self)	1076	render (CFPlus::Layout self, float x, float y, int flags = 0)
885	PPCODE:	1077	PPCODE:
886	{	1078	pango_opengl_render_layout_subpixel (
887	SV *retval;	1079	self->pl,
888	int w, h;	1080	x * PANGO_SCALE, y * PANGO_SCALE,
		1081	self->r, self->g, self->b, self->a,
		1082	flags
		1083	);
889		1084
890	layout_get_pixel_size (self, &w, &h);	1085	MODULE = CFPlus PACKAGE = CFPlus::Texture
891		1086
892	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)
893	{	1095	{
894	cairo_surface_t *surface;	1096	int nw = minpot (ow);
895	cairo_t *cairo;	1097	int nh = minpot (oh);
896		1098
897	retval = newSV (w * h * 4);	1099	if (nw != ow \|\| nh != oh)
898	SvPOK_only (retval);
899	SvCUR_set (retval, w * h * 4);
900
901	memset (SvPVX (retval), 0, w * h * 4);
902
903	surface = cairo_image_surface_create_for_data (
904	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
905	cairo = cairo_create (surface);
906	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
907
908	pango_cairo_show_layout (cairo, self->pl);
909
910	cairo_destroy (cairo);
911	cairo_surface_destroy (surface);
912
913	// what a mess, and its premultiplied, too :(
914	{	1100	{
915	uint32_t p = (uint32_t )SvPVX (retval);	1101	if (SvOK (data_))
916	uint32_t e = p + w h;
917
918	while (p < e)
919	{	1102	{
920	uint32_t rgba = *p;	1103	STRLEN datalen;
921	rgba = (rgba >> 24) \| (rgba << 8);	1104	char *data = SvPVbyte (data_, datalen);
922	#if 0	1105	int bpp = datalen / (ow * oh);
923	#ifdef _WIN32	1106	SV result_ = sv_2mortal (newSV (nw nh * bpp));
924	{//D
925	uint8_t r = rgba >> 24;
926	uint8_t g = rgba >> 16;
927	uint8_t b = rgba >> 8;
928	uint8_t a = rgba >> 0;
929		1107
930	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_);
931	}	1116	}
932	#endif	1117
933	#endif	1118	sv_setiv (w_, nw);
934	rgba = SDL_SwapBE32 (rgba);	1119	sv_setiv (h_, nh);
935	*p++ = rgba;
936	}	1120	}
937	}
938
939	EXTEND (SP, 5);
940	PUSHs (sv_2mortal (newSViv (w)));
941	PUSHs (sv_2mortal (newSViv (h)));
942	PUSHs (sv_2mortal (retval));
943	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
944	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
945	}	1121	}
946	else
947	{
948	FT_Bitmap bitmap;
949
950	retval = newSV (w * h);
951	SvPOK_only (retval);
952	SvCUR_set (retval, w * h);
953
954	bitmap.rows = h;
955	bitmap.width = w;
956	bitmap.pitch = w;
957	bitmap.buffer = (unsigned char*)SvPVX (retval);
958	bitmap.num_grays = 256;
959	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
960
961	memset (bitmap.buffer, 0, w * h);
962
963	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
964
965	EXTEND (SP, 5);
966	PUSHs (sv_2mortal (newSViv (w)));
967	PUSHs (sv_2mortal (newSViv (h)));
968	PUSHs (sv_2mortal (retval));
969	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
970	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
971	}
972	}	1122	}
973		1123
974	MODULE = CFClient PACKAGE = CFClient::Texture
975
976	void	1124	void
977	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.)
978	PROTOTYPE: $$$;$$	1126	PROTOTYPE: $$$;$$
979	ALIAS:	1127	ALIAS:
980	draw_quad_alpha = 1	1128	draw_quad_alpha = 1
981	draw_quad_alpha_premultiplied = 2	1129	draw_quad_alpha_premultiplied = 2
982	CODE:	1130	CODE:
…		…
1020	glDisable (GL_ALPHA_TEST);	1168	glDisable (GL_ALPHA_TEST);
1021	glDisable (GL_BLEND);	1169	glDisable (GL_BLEND);
1022	}	1170	}
1023	}	1171	}
1024		1172
1025	MODULE = CFClient PACKAGE = CFClient::Map	1173	MODULE = CFPlus PACKAGE = CFPlus::Map
1026		1174
1027	CFClient::Map	1175	CFPlus::Map
1028	new (SV *class, int map_width, int map_height)	1176	new (SV *class, int map_width, int map_height)
1029	CODE:	1177	CODE:
1030	New (0, RETVAL, 1, struct map);	1178	New (0, RETVAL, 1, struct map);
1031	RETVAL->x = 0;	1179	RETVAL->x = 0;
1032	RETVAL->y = 0;	1180	RETVAL->y = 0;
…		…
1042	RETVAL->row = 0;	1190	RETVAL->row = 0;
1043	OUTPUT:	1191	OUTPUT:
1044	RETVAL	1192	RETVAL
1045		1193
1046	void	1194	void
1047	DESTROY (CFClient::Map self)	1195	DESTROY (CFPlus::Map self)
1048	CODE:	1196	CODE:
1049	{	1197	{
1050	map_clear (self);	1198	map_clear (self);
1051	Safefree (self->face);	1199	Safefree (self->face);
		1200	Safefree (self->tex);
1052	Safefree (self);	1201	Safefree (self);
1053	}	1202	}
1054		1203
1055	void	1204	void
1056	clear (CFClient::Map self)	1205	clear (CFPlus::Map self)
1057	CODE:	1206	CODE:
1058	map_clear (self);	1207	map_clear (self);
1059		1208
1060	void	1209	void
1061	set_face (CFClient::Map self, int face, int texid)	1210	set_face (CFPlus::Map self, int face, int texid)
1062	CODE:	1211	CODE:
1063	{	1212	{
1064	while (self->faces <= face)	1213	while (self->faces <= face)
1065	{	1214	{
1066	Append (mapface, self->face, self->faces, self->faces);	1215	Append (mapface, self->face, self->faces, self->faces);
…		…
1069		1218
1070	self->face [face] = texid;	1219	self->face [face] = texid;
1071	}	1220	}
1072		1221
1073	void	1222	void
1074	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)
1075	CODE:	1224	CODE:
1076	{	1225	{
1077	while (self->texs <= texid)	1226	while (self->texs <= texid)
1078	{	1227	{
1079	Append (maptex, self->tex, self->texs, self->texs);	1228	Append (maptex, self->tex, self->texs, self->texs);
…		…
1103	// from transparent color bleeding and ugly wrapping effects.	1252	// from transparent color bleeding and ugly wrapping effects.
1104	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1253	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1105	}	1254	}
1106		1255
1107	int	1256	int
1108	ox (CFClient::Map self)	1257	ox (CFPlus::Map self)
1109	ALIAS:	1258	ALIAS:
1110	oy = 1	1259	oy = 1
1111	x = 2	1260	x = 2
1112	y = 3	1261	y = 3
1113	w = 4	1262	w = 4
…		…
1124	}	1273	}
1125	OUTPUT:	1274	OUTPUT:
1126	RETVAL	1275	RETVAL
1127		1276
1128	void	1277	void
1129	scroll (CFClient::Map self, int dx, int dy)	1278	scroll (CFPlus::Map self, int dx, int dy)
1130	CODE:	1279	CODE:
1131	{	1280	{
1132	if (dx > 0)	1281	if (dx > 0)
1133	map_blank (self, self->x, self->y, dx - 1, self->h);	1282	map_blank (self, self->x, self->y, dx, self->h);
1134	else if (dx < 0)	1283	else if (dx < 0)
1135	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);
1136		1285
1137	if (dy > 0)	1286	if (dy > 0)
1138	map_blank (self, self->x, self->y, self->w, dy - 1);	1287	map_blank (self, self->x, self->y, self->w, dy);
1139	else if (dy < 0)	1288	else if (dy < 0)
1140	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);
1141		1290
1142	self->ox += dx; self->x += dx;	1291	self->ox += dx; self->x += dx;
1143	self->oy += dy; self->y += dy;	1292	self->oy += dy; self->y += dy;
1144		1293
1145	while (self->y < 0)	1294	while (self->y < 0)
…		…
1150	self->y += MAP_EXTEND_Y;	1299	self->y += MAP_EXTEND_Y;
1151	}	1300	}
1152	}	1301	}
1153		1302
1154	void	1303	void
1155	map1a_update (CFClient::Map self, SV *data_)	1304	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1156	CODE:	1305	CODE:
1157	{	1306	{
1158	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1307	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1159	uint8_t data_end = (uint8_t )SvEND (data_);	1308	uint8_t data_end = (uint8_t )SvEND (data_);
1160	mapcell *cell;	1309	mapcell *cell;
1161	int x, y, flags;	1310	int x, y, flags;
1162		1311
1163	while (data < data_end)	1312	while (data < data_end - 1)
1164	{	1313	{
1165	flags = (data [0] << 8) + data [1]; data += 2;	1314	flags = (data [0] << 8) + data [1]; data += 2;
1166		1315
1167	x = ((flags >> 10) & 63) + self->x;	1316	x = self->x + ((flags >> 10) & 63);
1168	y = ((flags >> 4) & 63) + self->y;	1317	y = self->y + ((flags >> 4) & 63);
1169		1318
1170	cell = map_get_cell (self, x, y);	1319	cell = map_get_cell (self, x, y);
1171		1320
1172	if (flags & 15)	1321	if (flags & 15)
1173	{	1322	{
1174	if (cell->darkness < 0)	1323	if (!cell->darkness)
1175	{	1324	{
		1325	memset (cell, 0, sizeof (*cell));
1176	cell->darkness = 0;	1326	cell->darkness = 256;
1177	cell->face [0] = 0;
1178	cell->face [1] = 0;
1179	cell->face [2] = 0;
1180	}	1327	}
1181		1328
1182	cell->darkness = flags & 8 ? *data++ : 255;
1183
1184	//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	}
1185		1370
1186	if (flags & 4)	1371	if (flags & 4)
1187	{	1372	{
1188	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;
1189	}	1374	}
…		…
1197	{	1382	{
1198	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;
1199	}	1384	}
1200	}	1385	}
1201	else	1386	else
1202	cell->darkness = -1;	1387	cell->darkness = 0;
1203	}	1388	}
1204	}	1389	}
1205		1390
1206	SV *	1391	SV *
1207	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)
1208	CODE:	1393	CODE:
1209	{	1394	{
1210	int x1, x;	1395	int x1, x;
1211	int y1, y;	1396	int y1, y;
1212	int z;	1397	int z;
…		…
1262	}	1447	}
1263	OUTPUT:	1448	OUTPUT:
1264	RETVAL	1449	RETVAL
1265		1450
1266	void	1451	void
1267	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)
1268	PPCODE:	1453	CODE:
1269	{	1454	{
1270	int vx, vy;	1455	int vx, vy;
1271	int x, y, z;	1456	int x, y, z;
1272	int last_name;	1457	int last_name;
1273	mapface face;	1458	mapface face;
1274	int sw4 = (sw + 3) & ~3;
1275	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1276	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1277		1459
1278	memset (darkness, 255, sw4 * sh);
1279	SvPOK_only (darkness_sv);
1280	SvCUR_set (darkness_sv, sw4 * sh);
1281
1282	vx = self->x + (self->w - sw) / 2 - shift_x;	1460	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1283	vy = self->y + (self->h - sh) / 2 - shift_y;	1461	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1284		1462
1285	/*	1463	/*
1286	int vx = self->vx = self->w >= sw	1464	int vx = self->vx = self->w >= sw
1287	? self->x + (self->w - sw) / 2	1465	? self->x + (self->w - sw) / 2
1288	: 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));
…		…
1292	: 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));
1293	*/	1471	*/
1294		1472
1295	glColor4ub (255, 255, 255, 255);	1473	glColor4ub (255, 255, 255, 255);
1296		1474
		1475	glEnable (GL_BLEND);
1297	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1476	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1298	glEnable (GL_BLEND);
1299	glEnable (GL_TEXTURE_2D);	1477	glEnable (GL_TEXTURE_2D);
1300	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1478	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1301		1479
1302	glBegin (GL_QUADS);	1480	glBegin (GL_QUADS);
1303		1481
…		…
1312	for (x = 0; x < sw; x++)	1490	for (x = 0; x < sw; x++)
1313	if (row->c0 <= x + vx && x + vx < row->c1)	1491	if (row->c0 <= x + vx && x + vx < row->c1)
1314	{	1492	{
1315	mapcell *cell = row->col + (x + vx - row->c0);	1493	mapcell *cell = row->col + (x + vx - row->c0);
1316		1494
1317	darkness[y * sw4 + x] = cell->darkness < 0
1318	? 255 - FOW_DARKNESS
1319	: 255 - cell->darkness;
1320
1321	face = cell->face [z];	1495	face = cell->face [z];
1322		1496
1323	if (face)	1497	if (face && face < self->texs)
1324	{	1498	{
1325	maptex tex = self->tex [face];	1499	maptex tex = self->tex [face];
1326
1327	int px = (x + 1) * 32 - tex.w;	1500	int px = (x + 1) * 32 - tex.w;
1328	int py = (y + 1) * 32 - tex.h;	1501	int py = (y + 1) * 32 - tex.h;
1329		1502
1330	if (last_name != tex.name)	1503	if (last_name != tex.name)
1331	{	1504	{
1332	glEnd ();	1505	glEnd ();
1333	last_name = tex.name;
1334	glBindTexture (GL_TEXTURE_2D, last_name);	1506	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1335	glBegin (GL_QUADS);	1507	glBegin (GL_QUADS);
1336	}	1508	}
1337		1509
1338	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1510	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1339	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1511	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1340	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);
1341	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1513	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1342	}	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	}
1343	}	1534	}
1344	}	1535	}
1345		1536
1346	glEnd ();	1537	glEnd ();
1347		1538
1348	glDisable (GL_TEXTURE_2D);	1539	glDisable (GL_TEXTURE_2D);
1349	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	}
1350		1666
1351	EXTEND (SP, 3);	1667	EXTEND (SP, 3);
1352	PUSHs (sv_2mortal (newSViv (sw4)));	1668	PUSHs (sv_2mortal (newSViv (sw4)));
1353	PUSHs (sv_2mortal (newSViv (sh)));	1669	PUSHs (sv_2mortal (newSViv (sh)));
1354	PUSHs (darkness_sv);	1670	PUSHs (darkness_sv);
1355	}	1671	}
1356		1672
1357	SV *	1673	SV *
1358	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)
1359	CODE:	1675	CODE:
1360	{	1676	{
1361	int x, y, x1, y1;	1677	int x, y, x1, y1;
1362	SV data_sv = newSV (w h * 7 + 5);	1678	SV data_sv = newSV (w h * 7 + 5);
1363	uint8_t data = (uint8_t )SvPVX (data_sv);	1679	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1425	}	1741	}
1426	OUTPUT:	1742	OUTPUT:
1427	RETVAL	1743	RETVAL
1428		1744
1429	void	1745	void
1430	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)
1431	PPCODE:	1747	PPCODE:
1432	{	1748	{
1433	int x, y, z;	1749	int x, y, z;
1434	int w, h;	1750	int w, h;
1435	int x1, y1;	1751	int x1, y1;
…		…
1467		1783
1468	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1784	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1469	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1785	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1470	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1786	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1471		1787
1472	if (cell->darkness <= 0)	1788	if (cell->darkness == 0)
1473	{	1789	{
1474	cell->darkness = -1;	1790	cell->darkness = 0;
1475		1791
1476	for (z = 0; z <= 2; z++)	1792	for (z = 0; z <= 2; z++)
1477	{	1793	{
1478	cell->face[z] = face[z];	1794	cell->face[z] = face[z];
1479		1795
…		…
1484	}	1800	}
1485	}	1801	}
1486	}	1802	}
1487	}	1803	}
1488		1804
1489	MODULE = CFClient PACKAGE = CFClient::MixChunk	1805	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1490		1806
1491	CFClient::MixChunk	1807	CFPlus::MixChunk
1492	new_from_file (SV class, char path)	1808	new_from_file (SV class, char path)
1493	CODE:	1809	CODE:
1494	RETVAL = Mix_LoadWAV (path);	1810	RETVAL = Mix_LoadWAV (path);
1495	OUTPUT:	1811	OUTPUT:
1496	RETVAL	1812	RETVAL
1497		1813
1498	void	1814	void
1499	DESTROY (CFClient::MixChunk self)	1815	DESTROY (CFPlus::MixChunk self)
1500	CODE:	1816	CODE:
1501	Mix_FreeChunk (self);	1817	Mix_FreeChunk (self);
1502		1818
1503	int	1819	int
1504	volume (CFClient::MixChunk self, int volume = -1)	1820	volume (CFPlus::MixChunk self, int volume = -1)
1505	CODE:	1821	CODE:
1506	RETVAL = Mix_VolumeChunk (self, volume);	1822	RETVAL = Mix_VolumeChunk (self, volume);
1507	OUTPUT:	1823	OUTPUT:
1508	RETVAL	1824	RETVAL
1509		1825
1510	int	1826	int
1511	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)
1512	CODE:	1828	CODE:
1513	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1829	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1514	OUTPUT:	1830	OUTPUT:
1515	RETVAL	1831	RETVAL
1516		1832
1517	MODULE = CFClient PACKAGE = CFClient::MixMusic	1833	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1518		1834
1519	int	1835	int
1520	volume (int volume = -1)	1836	volume (int volume = -1)
1521	CODE:	1837	CODE:
1522	RETVAL = Mix_VolumeMusic (volume);	1838	RETVAL = Mix_VolumeMusic (volume);
1523	OUTPUT:	1839	OUTPUT:
1524	RETVAL	1840	RETVAL
1525		1841
1526	CFClient::MixMusic	1842	CFPlus::MixMusic
1527	new_from_file (SV class, char path)	1843	new_from_file (SV class, char path)
1528	CODE:	1844	CODE:
1529	RETVAL = Mix_LoadMUS (path);	1845	RETVAL = Mix_LoadMUS (path);
1530	OUTPUT:	1846	OUTPUT:
1531	RETVAL	1847	RETVAL
1532		1848
1533	void	1849	void
1534	DESTROY (CFClient::MixMusic self)	1850	DESTROY (CFPlus::MixMusic self)
1535	CODE:	1851	CODE:
1536	Mix_FreeMusic (self);	1852	Mix_FreeMusic (self);
1537		1853
1538	int	1854	int
1539	play (CFClient::MixMusic self, int loops = -1)	1855	play (CFPlus::MixMusic self, int loops = -1)
1540	CODE:	1856	CODE:
1541	RETVAL = Mix_PlayMusic (self, loops);	1857	RETVAL = Mix_PlayMusic (self, loops);
1542	OUTPUT:	1858	OUTPUT:
1543	RETVAL	1859	RETVAL
1544		1860
1545	MODULE = CFClient PACKAGE = CFClient::OpenGL	1861	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1546		1862
1547	BOOT:	1863	BOOT:
1548	{	1864	{
1549	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1865	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1550	static const struct {	1866	static const struct {
1551	const char *name;	1867	const char *name;
1552	IV iv;	1868	IV iv;
1553	} *civ, const_iv[] = {	1869	} *civ, const_iv[] = {
1554	# define const_iv(name) { # name, (IV)name }	1870	# define const_iv(name) { # name, (IV)name }
…		…
1561	const_iv (GL_SCISSOR_TEST),	1877	const_iv (GL_SCISSOR_TEST),
1562	const_iv (GL_DEPTH_TEST),	1878	const_iv (GL_DEPTH_TEST),
1563	const_iv (GL_ALPHA_TEST),	1879	const_iv (GL_ALPHA_TEST),
1564	const_iv (GL_NORMALIZE),	1880	const_iv (GL_NORMALIZE),
1565	const_iv (GL_RESCALE_NORMAL),	1881	const_iv (GL_RESCALE_NORMAL),
		1882	const_iv (GL_FRONT),
		1883	const_iv (GL_BACK),
1566	const_iv (GL_AND),	1884	const_iv (GL_AND),
1567	const_iv (GL_ONE),	1885	const_iv (GL_ONE),
1568	const_iv (GL_ZERO),	1886	const_iv (GL_ZERO),
1569	const_iv (GL_SRC_ALPHA),	1887	const_iv (GL_SRC_ALPHA),
1570	const_iv (GL_DST_ALPHA),	1888	const_iv (GL_DST_ALPHA),
1571	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1889	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1572	const_iv (GL_ONE_MINUS_DST_ALPHA),	1890	const_iv (GL_ONE_MINUS_DST_ALPHA),
1573	const_iv (GL_SRC_ALPHA_SATURATE),	1891	const_iv (GL_SRC_ALPHA_SATURATE),
1574	const_iv (GL_RGB),	1892	const_iv (GL_RGB),
1575	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),
1576	const_iv (GL_UNSIGNED_BYTE),	1897	const_iv (GL_UNSIGNED_BYTE),
1577	const_iv (GL_UNSIGNED_SHORT),	1898	const_iv (GL_UNSIGNED_SHORT),
1578	const_iv (GL_UNSIGNED_INT),	1899	const_iv (GL_UNSIGNED_INT),
1579	const_iv (GL_ALPHA),	1900	const_iv (GL_ALPHA),
1580	const_iv (GL_INTENSITY),	1901	const_iv (GL_INTENSITY),
…		…
1612	const_iv (GL_SEPARABLE_2D),	1933	const_iv (GL_SEPARABLE_2D),
1613	const_iv (GL_CONVOLUTION_2D),	1934	const_iv (GL_CONVOLUTION_2D),
1614	const_iv (GL_CONVOLUTION_BORDER_MODE),	1935	const_iv (GL_CONVOLUTION_BORDER_MODE),
1615	const_iv (GL_CONSTANT_BORDER),	1936	const_iv (GL_CONSTANT_BORDER),
1616	const_iv (GL_LINES),	1937	const_iv (GL_LINES),
		1938	const_iv (GL_LINE_STRIP),
1617	const_iv (GL_LINE_LOOP),	1939	const_iv (GL_LINE_LOOP),
1618	const_iv (GL_QUADS),	1940	const_iv (GL_QUADS),
1619	const_iv (GL_QUAD_STRIP),	1941	const_iv (GL_QUAD_STRIP),
1620	const_iv (GL_TRIANGLES),	1942	const_iv (GL_TRIANGLES),
1621	const_iv (GL_TRIANGLE_STRIP),	1943	const_iv (GL_TRIANGLE_STRIP),
…		…
1654	OUTPUT:	1976	OUTPUT:
1655	RETVAL	1977	RETVAL
1656		1978
1657	int glGetError ()	1979	int glGetError ()
1658		1980
		1981	void glFinish ()
		1982
1659	void glClear (int mask)	1983	void glClear (int mask)
1660		1984
1661	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)
1662	PROTOTYPE: @	1986	PROTOTYPE: @
1663		1987
…		…
1686	void glPushMatrix ()	2010	void glPushMatrix ()
1687		2011
1688	void glPopMatrix ()	2012	void glPopMatrix ()
1689		2013
1690	void glLoadIdentity ()	2014	void glLoadIdentity ()
		2015
		2016	void glDrawBuffer (int buffer)
		2017
		2018	void glReadBuffer (int buffer)
1691		2019
1692	# near_ and far_ are due to microsofts buggy "c" compiler	2020	# near_ and far_ are due to microsofts buggy "c" compiler
1693	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_)
1694		2022
1695	# near_ and far_ are due to microsofts buggy "c" compiler	2023	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1725	r *= a;	2053	r *= a;
1726	g *= a;	2054	g *= a;
1727	b *= a;	2055	b *= a;
1728	}	2056	}
1729	// microsoft visual "c" rounds instead of truncating...	2057	// microsoft visual "c" rounds instead of truncating...
1730	glColor4ub (MIN ((int)(r * 256.f), 255),	2058	glColor4f (r, g, b, a);
1731	MIN ((int)(g * 256.f), 255),
1732	MIN ((int)(b * 256.f), 255),
1733	MIN ((int)(a * 256.f), 255));
1734		2059
1735	void glInterleavedArrays (int format, int stride, char *data)	2060	void glInterleavedArrays (int format, int stride, char *data)
1736		2061
1737	void glDrawElements (int mode, int count, int type, char *indices)	2062	void glDrawElements (int mode, int count, int type, char *indices)
1738		2063
…		…
1815		2140
1816	void glEndList ()	2141	void glEndList ()
1817		2142
1818	void glCallList (int list)	2143	void glCallList (int list)
1819		2144
1820

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.105 by root, Mon Jun 5 03:33:09 2006 UTC vs. Revision 1.157 by root, Sun Oct 1 14:48:50 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.105 by root, Mon Jun 5 03:33:09 2006 UTC vs.
Revision 1.157 by root, Sun Oct 1 14:48:50 2006 UTC