[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.165 by root, Fri Dec 8 14:59:54 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)
		8	# pragma warning(disable:4761)
6	#endif	9	#endif
7		10
8	#include "EXTERN.h"	11	#include "EXTERN.h"
9	#include "perl.h"	12	#include "perl.h"
10	#include "XSUB.h"	13	#include "XSUB.h"
11		14
		15	#ifdef _WIN32
		16	# undef pipe
		17	#endif
		18
12	#include <math.h>	19	#include <math.h>
13	#include <string.h>	20	#include <string.h>
14	#include <stdio.h>	21	#include <stdio.h>
		22	#include <stdlib.h>
15		23
16	#include <SDL.h>	24	#include <SDL.h>
17	#include <SDL_endian.h>	25	#include <SDL_endian.h>
18	#include <SDL_image.h>	26	#include <SDL_image.h>
19	#include <SDL_mixer.h>	27	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	28	#include <SDL_opengl.h>
21		29
		30	#define PANGO_ENABLE_BACKEND
		31	#define G_DISABLE_CAST_CHECKS
		32
22	#include <glib/gmacros.h>	33	#include <glib/gmacros.h>
23		34
24	#include <pango/pango.h>	35	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		36
29	#ifndef _WIN32	37	#ifndef _WIN32
30	# include <sys/types.h>	38	# include <sys/types.h>
31	# include <sys/socket.h>	39	# include <sys/socket.h>
32	# include <netinet/in.h>	40	# include <netinet/in.h>
33	# include <netinet/tcp.h>	41	# include <netinet/tcp.h>
34	# include <inttypes.h>	42	# include <inttypes.h>
35	#else
36	typedef unsigned char uint8_t;
37	typedef unsigned short uint16_t;
38	typedef unsigned int uint32_t;
39	typedef signed char int8_t;
40	typedef signed short int16_t;
41	typedef signed int int32_t;
42	#endif	43	#endif
43		44
44	#include "glext.h"	45	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
45		46
46	#define FOW_DARKNESS 32	47	#define FOW_DARKNESS 32
47		48
48	#define MAP_EXTEND_X 32	49	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	50	#define MAP_EXTEND_Y 512
50		51
51	#define MIN_FONT_HEIGHT 10	52	#define MIN_FONT_HEIGHT 10
		53
		54	#if 0
		55	# define PARACHUTE SDL_INIT_NOPARACHUTE
		56	#else
		57	# define PARACHUTE 0
		58	#endif
52		59
53	static struct	60	static struct
54	{	61	{
55	#define GL_FUNC(ptr,name) ptr name;	62	#define GL_FUNC(ptr,name) ptr name;
56	#include "glfunc.h"	63	#include "glfunc.h"
65	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	72	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	else	73	else
67	glBlendFunc (sa, da);	74	glBlendFunc (sa, da);
68	}	75	}
69		76
		77	#include "texcache.c"
		78
		79	#include "pango-font.c"
		80	#include "pango-fontmap.c"
		81	#include "pango-render.c"
		82
70	typedef Mix_Chunk *CFClient__MixChunk;	83	typedef Mix_Chunk *CFPlus__MixChunk;
71	typedef Mix_Music *CFClient__MixMusic;	84	typedef Mix_Music *CFPlus__MixMusic;
72		85
73	typedef PangoFontDescription *CFClient__Font;	86	typedef PangoFontDescription *CFPlus__Font;
		87
		88	static int
		89	shape_attr_p (PangoLayoutRun *run)
		90	{
		91	GSList *attrs = run->item->analysis.extra_attrs;
		92
		93	while (attrs)
		94	{
		95	PangoAttribute *attr = attrs->data;
		96
		97	if (attr->klass->type == PANGO_ATTR_SHAPE)
		98	return 1;
		99
		100	attrs = attrs->next;
		101	}
		102
		103	return 0;
		104	}
74		105
75	typedef struct cf_layout {	106	typedef struct cf_layout {
76	PangoLayout *pl; // either derived from a cairo or ft2 context	107	PangoLayout *pl;
77	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78	float r, g, b, a; // default color for rgba mode	108	float r, g, b, a; // default color for rgba mode
79	int base_height;	109	int base_height;
80	CFClient__Font font;	110	CFPlus__Font font;
81	} *CFClient__Layout;	111	} *CFPlus__Layout;
82		112
83	static CFClient__Font default_font;	113	static CFPlus__Font default_font;
84	static PangoContext ft2_context, cairo_context;	114	static PangoContext *opengl_context;
85	static PangoFontMap ft2_fontmap, cairo_fontmap;	115	static PangoFontMap *opengl_fontmap;
86		116
87	static void	117	static void
88	substitute_func (FcPattern *pattern, gpointer data)	118	substitute_func (FcPattern *pattern, gpointer data)
89	{	119	{
90	FcPatternAddBool (pattern, FC_HINTING , 1);	120	FcPatternAddBool (pattern, FC_HINTING, 1);
		121	#ifdef FC_HINT_STYLE
91	//FcPatternAddBool (pattern, FC_AUTOHINT, 1);	122	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		123	#endif
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	124	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	}	125	}
94		126
95	static void	127	static void
96	layout_update_font (CFClient__Layout self)	128	layout_update_font (CFPlus__Layout self)
97	{	129	{
98	/* use a random scale factor to account for unknown descenders, 0.8 works	130	/* use a random scale factor to account for unknown descenders, 0.8 works
99	* reasonably well with bitstream vera	131	* reasonably well with bitstream vera
100	*/	132	*/
101	PangoFontDescription *font = self->font ? self->font : default_font;	133	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
105		137
106	pango_layout_set_font_description (self->pl, font);	138	pango_layout_set_font_description (self->pl, font);
107	}	139	}
108		140
109	static void	141	static void
110	layout_get_pixel_size (CFClient__Layout self, int w, int h)	142	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
111	{	143	{
		144	PangoRectangle rect;
		145
		146	// get_pixel_* wrongly rounds down
112	pango_layout_get_pixel_size (self->pl, w, h);	147	pango_layout_get_extents (self->pl, 0, &rect);
113		148
114	if (!w) w = 1;	149	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
115	if (!h) h = 1;	150	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
116		151
117	w = (w + 3) & ~3;	152	if (!rect.width) rect.width = 1;
		153	if (!rect.height) rect.height = 1;
		154
		155	*w = rect.width;
		156	*h = rect.height;
118	}	157	}
119		158
120	typedef uint16_t mapface;	159	typedef uint16_t mapface;
121		160
122	typedef struct {	161	typedef struct {
…		…
125	float s, t;	164	float s, t;
126	uint8_t r, g, b, a;	165	uint8_t r, g, b, a;
127	} maptex;	166	} maptex;
128		167
129	typedef struct {	168	typedef struct {
130	int16_t darkness;	169	uint32_t player;
131	mapface face[3];	170	mapface face[3];
		171	uint16_t darkness;
		172	uint8_t stat_width, stat_hp, flags;
132	} mapcell;	173	} mapcell;
133		174
134	typedef struct {	175	typedef struct {
135	int32_t c0, c1;	176	int32_t c0, c1;
136	mapcell *col;	177	mapcell *col;
…		…
145	int texs;	186	int texs;
146	maptex *tex;	187	maptex *tex;
147		188
148	int32_t rows;	189	int32_t rows;
149	maprow *row;	190	maprow *row;
150	} *CFClient__Map;	191	} *CFPlus__Map;
151		192
152	static char *	193	static char *
153	prepend (char *ptr, int sze, int inc)	194	prepend (char *ptr, int sze, int inc)
154	{	195	{
155	char *p;	196	char *p;
…		…
173		214
174	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	215	#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))	216	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
176		217
177	static maprow *	218	static maprow *
178	map_get_row (CFClient__Map self, int y)	219	map_get_row (CFPlus__Map self, int y)
179	{	220	{
180	if (0 > y)	221	if (0 > y)
181	{	222	{
182	int extend = - y + MAP_EXTEND_Y;	223	int extend = - y + MAP_EXTEND_Y;
183	Prepend (maprow, self->row, self->rows, extend);	224	Prepend (maprow, self->row, self->rows, extend);
…		…
221		262
222	return row->col + (x - row->c0);	263	return row->col + (x - row->c0);
223	}	264	}
224		265
225	static mapcell *	266	static mapcell *
226	map_get_cell (CFClient__Map self, int x, int y)	267	map_get_cell (CFPlus__Map self, int x, int y)
227	{	268	{
228	return row_get_cell (map_get_row (self, y), x);	269	return row_get_cell (map_get_row (self, y), x);
229	}	270	}
230		271
231	static void	272	static void
232	map_clear (CFClient__Map self)	273	map_clear (CFPlus__Map self)
233	{	274	{
234	int r;	275	int r;
235		276
236	for (r = 0; r < self->rows; r++)	277	for (r = 0; r < self->rows; r++)
237	Safefree (self->row[r].col);	278	Safefree (self->row[r].col);
…		…
245	self->row = 0;	286	self->row = 0;
246	self->rows = 0;	287	self->rows = 0;
247	}	288	}
248		289
249	static void	290	static void
250	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	291	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
251	{	292	{
252	int x, y;	293	int x, y;
253	maprow *row;	294	maprow *row;
		295	mapcell *cell;
254		296
255	for (y = y0; y < y0 + h; y++)	297	for (y = y0; y < y0 + h; y++)
256	if (y >= 0)	298	if (y >= 0)
257	{	299	{
258	if (y >= self->rows)	300	if (y >= self->rows)
…		…
264	if (x >= row->c0)	306	if (x >= row->c0)
265	{	307	{
266	if (x >= row->c1)	308	if (x >= row->c1)
267	break;	309	break;
268		310
269	row->col[x - row->c0].darkness = -1;	311	cell = row->col + x - row->c0;
		312
		313	cell->darkness = 0;
		314	cell->stat_hp = 0;
		315	cell->flags = 0;
		316	cell->player = 0;
270	}	317	}
271	}	318	}
272	}	319	}
273		320
274	static void	321	static void
…		…
295	ev.data2 = 0;	342	ev.data2 = 0;
296		343
297	SDL_PushEvent ((SDL_Event *)&ev);	344	SDL_PushEvent ((SDL_Event *)&ev);
298	}	345	}
299		346
		347	static unsigned int
		348	minpot (unsigned int n)
		349	{
		350	if (!n)
		351	return 0;
		352
		353	--n;
		354
		355	n \|= n >> 1;
		356	n \|= n >> 2;
		357	n \|= n >> 4;
		358	n \|= n >> 8;
		359	n \|= n >> 16;
		360
		361	return n + 1;
		362	}
		363
300	MODULE = CFClient PACKAGE = CFClient	364	MODULE = CFPlus PACKAGE = CFPlus
301		365
302	PROTOTYPES: ENABLE	366	PROTOTYPES: ENABLE
303		367
304	BOOT:	368	BOOT:
305	{	369	{
306	HV *stash = gv_stashpv ("CFClient", 1);	370	HV *stash = gv_stashpv ("CFPlus", 1);
307	static const struct {	371	static const struct {
308	const char *name;	372	const char *name;
309	IV iv;	373	IV iv;
310	} *civ, const_iv[] = {	374	} *civ, const_iv[] = {
311	# define const_iv(name) { # name, (IV)name }	375	# define const_iv(name) { # name, (IV)name }
…		…
412		476
413	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	477	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
414	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	478	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
415	}	479	}
416		480
		481	int
		482	in_destruct ()
		483	CODE:
		484	RETVAL = PL_main_cv == Nullcv;
		485	OUTPUT:
		486	RETVAL
		487
		488	NV floor (NV x)
		489
		490	NV ceil (NV x)
		491
417	void	492	void
418	pango_init ()	493	pango_init ()
419	CODE:	494	CODE:
420	// delayed, so it can pick up new fonts added by AddFontResourceEx
421	{	495	{
422	{
423	ft2_fontmap = pango_ft2_font_map_new ();	496	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	497	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);	498	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	}	499	}
439		500
440	int	501	int
441	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	502	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
442		503
443	void	504	void
444	SDL_Quit ()	505	SDL_Quit ()
445		506
446	void	507	void
…		…
453	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	514	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
454	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	515	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
455	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	516	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
456		517
457	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	518	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
458	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	519	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
459		520
460	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
461	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	522	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
462	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	523	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
463	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	524	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
464		525
465	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	526	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		527	#if SDL_VERSION_ATLEAST(1,2,10)
		528	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		529	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		530	#endif
466		531
467	SDL_EnableUNICODE (1);	532	SDL_EnableUNICODE (1);
468	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	533	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
469		534
470	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	535	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
557	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	622	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
558	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	623	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
559	break;	624	break;
560	}	625	}
561		626
562	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	627	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
563	}	628	}
564	}	629	}
565		630
566	int	631	int
567	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	632	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
581	#ifndef _WIN32	646	#ifndef _WIN32
582	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	647	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
583	#endif	648	#endif
584		649
585	void	650	void
		651	win32_proxy_info ()
		652	PPCODE:
		653	{
		654	#ifdef _WIN32
		655	char buffer[2048];
		656	DWORD buflen;
		657
		658	EXTEND (SP, 3);
		659
		660	buflen = sizeof (buffer);
		661	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		662	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		663	{
		664	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		665
		666	buflen = sizeof (buffer);
		667	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		668	{
		669	PUSHs (newSVpv (buffer, 0));
		670
		671	buflen = sizeof (buffer);
		672	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		673	PUSHs (newSVpv (buffer, 0));
		674	}
		675	}
		676	#endif
		677	}
		678
		679	void
586	add_font (char *file)	680	add_font (char *file)
587	CODE:	681	CODE:
588	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	682	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
589	#ifdef _WIN32
590	// cairo... sigh... requires win2000
591	AddFontResourceEx (file, FR_PRIVATE, 0);
592	#endif
593		683
594	void	684	void
595	load_image_inline (SV *image_)	685	load_image_inline (SV *image_)
596	ALIAS:	686	ALIAS:
597	load_image_file = 1	687	load_image_file = 1
…		…
639		729
640	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	730	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
641		731
642	assert (surface2->pitch == surface2->w * 4);	732	assert (surface2->pitch == surface2->w * 4);
643		733
		734	SDL_LockSurface (surface2);
644	EXTEND (SP, 5);	735	EXTEND (SP, 6);
645	PUSHs (sv_2mortal (newSViv (surface2->w)));	736	PUSHs (sv_2mortal (newSViv (surface2->w)));
646	PUSHs (sv_2mortal (newSViv (surface2->h)));	737	PUSHs (sv_2mortal (newSViv (surface2->h)));
647	SDL_LockSurface (surface2);
648	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	738	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)));	739	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
651	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	740	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
652	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	741	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		742	SDL_UnlockSurface (surface2);
653		743
654	SDL_FreeSurface (surface);	744	SDL_FreeSurface (surface);
655	SDL_FreeSurface (surface2);	745	SDL_FreeSurface (surface2);
656	}	746	}
657		747
…		…
693	CODE:	783	CODE:
694	fprintf (stderr, "FATAL: %s\n", message);	784	fprintf (stderr, "FATAL: %s\n", message);
695	#ifdef _WIN32	785	#ifdef _WIN32
696	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	786	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
697	#endif	787	#endif
698	exit (1);	788	_exit (1);
699		789
		790	void
		791	_exit (int retval = 0)
		792	CODE:
		793	#ifdef WIN32
		794	ExitThread (retval); // unclean, please beam me up
		795	#else
		796	_exit (retval);
		797	#endif
		798
700	MODULE = CFClient PACKAGE = CFClient::Font	799	MODULE = CFPlus PACKAGE = CFPlus::Font
701		800
702	CFClient::Font	801	CFPlus::Font
703	new_from_file (SV class, char path, int id = 0)	802	new_from_file (SV class, char path, int id = 0)
704	CODE:	803	CODE:
705	{	804	{
706	int count;	805	int count;
707	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	806	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
710	}	809	}
711	OUTPUT:	810	OUTPUT:
712	RETVAL	811	RETVAL
713		812
714	void	813	void
715	DESTROY (CFClient::Font self)	814	DESTROY (CFPlus::Font self)
716	CODE:	815	CODE:
717	pango_font_description_free (self);	816	pango_font_description_free (self);
718		817
719	void	818	void
720	make_default (CFClient::Font self)	819	make_default (CFPlus::Font self)
721	CODE:	820	CODE:
722	default_font = self;	821	default_font = self;
723		822
724	MODULE = CFClient PACKAGE = CFClient::Layout	823	MODULE = CFPlus PACKAGE = CFPlus::Layout
725		824
726	CFClient::Layout	825	void
727	new (SV *class, int rgba = 0)	826	reset_glyph_cache ()
728	CODE:	827	CODE:
729	#if _WIN32	828	tc_clear ();
730	//rgba = 0;//D makes text nicer, breaks TextView	829
731	#endif	830	CFPlus::Layout
732	rgba=1;//D	831	new (SV *class)
		832	CODE:
733	New (0, RETVAL, 1, struct cf_layout);	833	New (0, RETVAL, 1, struct cf_layout);
734		834
735	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	835	RETVAL->pl = pango_layout_new (opengl_context);
736	RETVAL->rgba = rgba;
737	RETVAL->r = 1.;	836	RETVAL->r = 1.;
738	RETVAL->g = 1.;	837	RETVAL->g = 1.;
739	RETVAL->b = 1.;	838	RETVAL->b = 1.;
740	RETVAL->a = 1.;	839	RETVAL->a = 1.;
741	RETVAL->base_height = MIN_FONT_HEIGHT;	840	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
745	layout_update_font (RETVAL);	844	layout_update_font (RETVAL);
746	OUTPUT:	845	OUTPUT:
747	RETVAL	846	RETVAL
748		847
749	void	848	void
750	DESTROY (CFClient::Layout self)	849	DESTROY (CFPlus::Layout self)
751	CODE:	850	CODE:
752	g_object_unref (self->pl);	851	g_object_unref (self->pl);
753	Safefree (self);	852	Safefree (self);
754		853
755	int
756	is_rgba (CFClient::Layout self)
757	CODE:
758	RETVAL = self->rgba;
759	OUTPUT:
760	RETVAL
761
762	void	854	void
763	set_text (CFClient::Layout self, SV *text_)	855	set_text (CFPlus::Layout self, SV *text_)
764	CODE:	856	CODE:
765	{	857	{
766	STRLEN textlen;	858	STRLEN textlen;
767	char *text = SvPVutf8 (text_, textlen);	859	char *text = SvPVutf8 (text_, textlen);
768		860
769	pango_layout_set_text (self->pl, text, textlen);	861	pango_layout_set_text (self->pl, text, textlen);
770	}	862	}
771		863
772	void	864	void
773	set_markup (CFClient::Layout self, SV *text_)	865	set_markup (CFPlus::Layout self, SV *text_)
774	CODE:	866	CODE:
775	{	867	{
776	STRLEN textlen;	868	STRLEN textlen;
777	char *text = SvPVutf8 (text_, textlen);	869	char *text = SvPVutf8 (text_, textlen);
778		870
779	pango_layout_set_markup (self->pl, text, textlen);	871	pango_layout_set_markup (self->pl, text, textlen);
780	}	872	}
781		873
		874	void
		875	set_shapes (CFPlus::Layout self, ...)
		876	CODE:
		877	{
		878	PangoAttrList *attrs = 0;
		879	const char *text = pango_layout_get_text (self->pl);
		880	const char *pos = text;
		881	int arg = 4;
		882
		883	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		884	{
		885	PangoRectangle inkrect, rect;
		886	PangoAttribute *attr;
		887
		888	int x = SvIV (ST (arg - 3));
		889	int y = SvIV (ST (arg - 2));
		890	int w = SvIV (ST (arg - 1));
		891	int h = SvIV (ST (arg ));
		892
		893	inkrect.x = 0;
		894	inkrect.y = 0;
		895	inkrect.width = 0;
		896	inkrect.height = 0;
		897
		898	rect.x = x * PANGO_SCALE;
		899	rect.y = y * PANGO_SCALE;
		900	rect.width = w * PANGO_SCALE;
		901	rect.height = h * PANGO_SCALE;
		902
		903	if (!attrs)
		904	attrs = pango_layout_get_attributes (self->pl);
		905
		906	attr = pango_attr_shape_new (&inkrect, &rect);
		907	attr->start_index = pos - text;
		908	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		909	pango_attr_list_insert (attrs, attr);
		910
		911	arg += 4;
		912	pos += sizeof (OBJ_STR) - 1;
		913	}
		914
		915	if (attrs)
		916	pango_layout_set_attributes (self->pl, attrs);
		917	}
		918
		919	void
		920	get_shapes (CFPlus::Layout self)
		921	PPCODE:
		922	{
		923	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		924
		925	do
		926	{
		927	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		928
		929	if (run && shape_attr_p (run))
		930	{
		931	PangoRectangle extents;
		932	pango_layout_iter_get_run_extents (iter, 0, &extents);
		933
		934	EXTEND (SP, 2);
		935	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		936	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		937	}
		938	}
		939	while (pango_layout_iter_next_run (iter));
		940
		941	pango_layout_iter_free (iter);
		942	}
		943
		944	int
		945	has_wrapped (CFPlus::Layout self)
		946	CODE:
		947	{
		948	int lines = 1;
		949	const char *text = pango_layout_get_text (self->pl);
		950
		951	while (*text)
		952	lines += *text++ == '\n';
		953
		954	RETVAL = lines < pango_layout_get_line_count (self->pl);
		955	}
		956	OUTPUT:
		957	RETVAL
		958
782	SV *	959	SV *
783	get_text (CFClient::Layout self)	960	get_text (CFPlus::Layout self)
784	CODE:	961	CODE:
785	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	962	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
786	SvUTF8_on (RETVAL);	963	sv_utf8_decode (RETVAL);
787	OUTPUT:	964	OUTPUT:
788	RETVAL	965	RETVAL
789		966
790	void	967	void
791	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	968	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
792	CODE:	969	CODE:
793	self->r = r;	970	self->r = r;
794	self->g = g;	971	self->g = g;
795	self->b = b;	972	self->b = b;
796	self->a = a;	973	self->a = a;
797		974
798	void	975	void
799	set_font (CFClient::Layout self, CFClient::Font font = 0)	976	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
800	CODE:	977	CODE:
801	if (self->font != font)	978	if (self->font != font)
802	{	979	{
803	self->font = font;	980	self->font = font;
804	layout_update_font (self);	981	layout_update_font (self);
805	}	982	}
806		983
807	void	984	void
808	set_height (CFClient::Layout self, int base_height)	985	set_height (CFPlus::Layout self, int base_height)
809	CODE:	986	CODE:
810	if (self->base_height != base_height)	987	if (self->base_height != base_height)
811	{	988	{
812	self->base_height = base_height;	989	self->base_height = base_height;
813	layout_update_font (self);	990	layout_update_font (self);
814	}	991	}
815		992
816	void	993	void
817	set_width (CFClient::Layout self, int max_width = -1)	994	set_width (CFPlus::Layout self, int max_width = -1)
818	CODE:	995	CODE:
819	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	996	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
820		997
821	void	998	void
822	set_indent (CFClient::Layout self, int indent)	999	set_indent (CFPlus::Layout self, int indent)
823	CODE:	1000	CODE:
824	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1001	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
825		1002
826	void	1003	void
827	set_spacing (CFClient::Layout self, int spacing)	1004	set_spacing (CFPlus::Layout self, int spacing)
828	CODE:	1005	CODE:
829	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1006	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
830		1007
831	void	1008	void
832	set_ellipsise (CFClient::Layout self, int ellipsise)	1009	set_ellipsise (CFPlus::Layout self, int ellipsise)
833	CODE:	1010	CODE:
834	pango_layout_set_ellipsize (self->pl,	1011	pango_layout_set_ellipsize (self->pl,
835	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1012	ellipsise == 1 ? PANGO_ELLIPSIZE_START
836	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1013	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
837	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1014	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
838	: PANGO_ELLIPSIZE_NONE	1015	: PANGO_ELLIPSIZE_NONE
839	);	1016	);
840		1017
841	void	1018	void
842	set_single_paragraph_mode (CFClient::Layout self, int spm)	1019	set_single_paragraph_mode (CFPlus::Layout self, int spm)
843	CODE:	1020	CODE:
844	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1021	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
845		1022
846	void	1023	void
847	size (CFClient::Layout self)	1024	size (CFPlus::Layout self)
848	PPCODE:	1025	PPCODE:
849	{	1026	{
850	int w, h;	1027	int w, h;
851		1028
852	layout_get_pixel_size (self, &w, &h);	1029	layout_get_pixel_size (self, &w, &h);
…		…
855	PUSHs (sv_2mortal (newSViv (w)));	1032	PUSHs (sv_2mortal (newSViv (w)));
856	PUSHs (sv_2mortal (newSViv (h)));	1033	PUSHs (sv_2mortal (newSViv (h)));
857	}	1034	}
858		1035
859	int	1036	int
		1037	descent (CFPlus::Layout self)
		1038	CODE:
		1039	{
		1040	PangoRectangle rect;
		1041	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1042	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1043	RETVAL = PANGO_DESCENT (rect);
		1044	}
		1045	OUTPUT:
		1046	RETVAL
		1047
		1048	int
860	xy_to_index (CFClient::Layout self, int x, int y)	1049	xy_to_index (CFPlus::Layout self, int x, int y)
861	CODE:	1050	CODE:
862	{	1051	{
863	int index, trailing;	1052	int index, trailing;
864	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1053	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
865	RETVAL = index;	1054	RETVAL = index + trailing;
866	}	1055	}
867	OUTPUT:	1056	OUTPUT:
868	RETVAL	1057	RETVAL
869		1058
870	void	1059	void
871	cursor_pos (CFClient::Layout self, int index)	1060	cursor_pos (CFPlus::Layout self, int index)
872	PPCODE:	1061	PPCODE:
873	{	1062	{
874	PangoRectangle strong_pos;	1063	PangoRectangle strong_pos;
875	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1064	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
876		1065
…		…
879	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1068	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
880	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1069	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
881	}	1070	}
882		1071
883	void	1072	void
884	render (CFClient::Layout self)	1073	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
885	PPCODE:	1074	PPCODE:
886	{	1075	{
887	SV *retval;	1076	int line, x;
888	int w, h;
889		1077
890	layout_get_pixel_size (self, &w, &h);	1078	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1079	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
891		1080
892	if (self->rgba)
893	{
894	cairo_surface_t *surface;
895	cairo_t *cairo;
896
897	retval = newSV (w * h * 4);
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	{
915	uint32_t p = (uint32_t )SvPVX (retval);
916	uint32_t e = p + w h;
917
918	while (p < e)
919	{
920	uint32_t rgba = *p;
921	rgba = (rgba >> 24) \| (rgba << 8);
922	#if 0
923	#ifdef _WIN32
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
930	rgba = (rgba & 0xffffff00) \| a;
931	}
932	#endif
933	#endif
934	rgba = SDL_SwapBE32 (rgba);
935	*p++ = rgba;
936	}
937	}
938
939	EXTEND (SP, 5);	1081	EXTEND (SP, 2);
940	PUSHs (sv_2mortal (newSViv (w)));	1082	PUSHs (sv_2mortal (newSViv (line - 1)));
		1083	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
		1084	}
		1085
		1086	void
		1087	line_x_to_index (CFPlus::Layout self, int line, int x)
		1088	PPCODE:
		1089	{
		1090	PangoLayoutLine *lp;
		1091	int index, trailing;
		1092
		1093	if (line < 0)
		1094	XSRETURN_EMPTY;
		1095
		1096	if (!(lp = pango_layout_get_line (self->pl, line)))
		1097	XSRETURN_EMPTY; /* do better */
		1098
		1099	if (!pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing))
		1100	XSRETURN_EMPTY; /* do better */
		1101
		1102	EXTEND (SP, 2);
		1103	if (GIMME_V == G_SCALAR)
941	PUSHs (sv_2mortal (newSViv (h)));	1104	PUSHs (sv_2mortal (newSViv (index + trailing)));
942	PUSHs (sv_2mortal (retval));
943	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
944	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
945	}
946	else	1105	else
947	{	1106	{
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)));	1107	PUSHs (sv_2mortal (newSViv (index)));
967	PUSHs (sv_2mortal (newSViv (h)));	1108	PUSHs (sv_2mortal (newSViv (trailing)));
968	PUSHs (sv_2mortal (retval));
969	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
970	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
971	}	1109	}
972	}	1110	}
973		1111
		1112	void
		1113	render (CFPlus::Layout self, float x, float y, int flags = 0)
		1114	PPCODE:
		1115	pango_opengl_render_layout_subpixel (
		1116	self->pl,
		1117	x * PANGO_SCALE, y * PANGO_SCALE,
		1118	self->r, self->g, self->b, self->a,
		1119	flags
		1120	);
		1121
974	MODULE = CFClient PACKAGE = CFClient::Texture	1122	MODULE = CFPlus PACKAGE = CFPlus::Texture
975		1123
976	void	1124	void
		1125	pad2pot (SV data_, SV w_, SV *h_)
		1126	CODE:
		1127	{
		1128	int ow = SvIV (w_);
		1129	int oh = SvIV (h_);
		1130
		1131	if (ow && oh)
		1132	{
		1133	int nw = minpot (ow);
		1134	int nh = minpot (oh);
		1135
		1136	if (nw != ow \|\| nh != oh)
		1137	{
		1138	if (SvOK (data_))
		1139	{
		1140	STRLEN datalen;
		1141	char *data = SvPVbyte (data_, datalen);
		1142	int bpp = datalen / (ow * oh);
		1143	SV result_ = sv_2mortal (newSV (nw nh * bpp));
		1144
		1145	SvPOK_only (result_);
		1146	SvCUR_set (result_, nw * nh * bpp);
		1147
		1148	memset (SvPVX (result_), 0, nw * nh * bpp);
		1149	while (oh--)
		1150	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1151
		1152	sv_setsv (data_, result_);
		1153	}
		1154
		1155	sv_setiv (w_, nw);
		1156	sv_setiv (h_, nh);
		1157	}
		1158	}
		1159	}
		1160
		1161	void
977	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1162	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
978	PROTOTYPE: $$$;$$	1163	PROTOTYPE: $$$;$$
979	ALIAS:	1164	ALIAS:
980	draw_quad_alpha = 1	1165	draw_quad_alpha = 1
981	draw_quad_alpha_premultiplied = 2	1166	draw_quad_alpha_premultiplied = 2
982	CODE:	1167	CODE:
…		…
1020	glDisable (GL_ALPHA_TEST);	1205	glDisable (GL_ALPHA_TEST);
1021	glDisable (GL_BLEND);	1206	glDisable (GL_BLEND);
1022	}	1207	}
1023	}	1208	}
1024		1209
1025	MODULE = CFClient PACKAGE = CFClient::Map	1210	MODULE = CFPlus PACKAGE = CFPlus::Map
1026		1211
1027	CFClient::Map	1212	CFPlus::Map
1028	new (SV *class, int map_width, int map_height)	1213	new (SV *class)
1029	CODE:	1214	CODE:
1030	New (0, RETVAL, 1, struct map);	1215	New (0, RETVAL, 1, struct map);
1031	RETVAL->x = 0;	1216	RETVAL->x = 0;
1032	RETVAL->y = 0;	1217	RETVAL->y = 0;
1033	RETVAL->w = map_width;	1218	RETVAL->w = 0;
1034	RETVAL->h = map_height;	1219	RETVAL->h = 0;
1035	RETVAL->ox = 0;	1220	RETVAL->ox = 0;
1036	RETVAL->oy = 0;	1221	RETVAL->oy = 0;
1037	RETVAL->faces = 8192;	1222	RETVAL->faces = 8192;
1038	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1223	Newz (0, RETVAL->face, RETVAL->faces, mapface);
1039	RETVAL->texs = 8192;	1224	RETVAL->texs = 8192;
…		…
1042	RETVAL->row = 0;	1227	RETVAL->row = 0;
1043	OUTPUT:	1228	OUTPUT:
1044	RETVAL	1229	RETVAL
1045		1230
1046	void	1231	void
1047	DESTROY (CFClient::Map self)	1232	DESTROY (CFPlus::Map self)
1048	CODE:	1233	CODE:
1049	{	1234	{
1050	map_clear (self);	1235	map_clear (self);
1051	Safefree (self->face);	1236	Safefree (self->face);
		1237	Safefree (self->tex);
1052	Safefree (self);	1238	Safefree (self);
1053	}	1239	}
1054		1240
1055	void	1241	void
		1242	resize (CFPlus::Map self, int map_width, int map_height)
		1243	CODE:
		1244	self->w = map_width;
		1245	self->h = map_height;
		1246
		1247	void
1056	clear (CFClient::Map self)	1248	clear (CFPlus::Map self)
1057	CODE:	1249	CODE:
1058	map_clear (self);	1250	map_clear (self);
1059		1251
1060	void	1252	void
1061	set_face (CFClient::Map self, int face, int texid)	1253	set_face (CFPlus::Map self, int face, int texid)
1062	CODE:	1254	CODE:
1063	{	1255	{
1064	while (self->faces <= face)	1256	while (self->faces <= face)
1065	{	1257	{
1066	Append (mapface, self->face, self->faces, self->faces);	1258	Append (mapface, self->face, self->faces, self->faces);
…		…
1069		1261
1070	self->face [face] = texid;	1262	self->face [face] = texid;
1071	}	1263	}
1072		1264
1073	void	1265	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)	1266	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1075	CODE:	1267	CODE:
1076	{	1268	{
1077	while (self->texs <= texid)	1269	while (self->texs <= texid)
1078	{	1270	{
1079	Append (maptex, self->tex, self->texs, self->texs);	1271	Append (maptex, self->tex, self->texs, self->texs);
…		…
1103	// from transparent color bleeding and ugly wrapping effects.	1295	// from transparent color bleeding and ugly wrapping effects.
1104	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1296	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1105	}	1297	}
1106		1298
1107	int	1299	int
1108	ox (CFClient::Map self)	1300	ox (CFPlus::Map self)
1109	ALIAS:	1301	ALIAS:
1110	oy = 1	1302	oy = 1
1111	x = 2	1303	x = 2
1112	y = 3	1304	y = 3
1113	w = 4	1305	w = 4
…		…
1124	}	1316	}
1125	OUTPUT:	1317	OUTPUT:
1126	RETVAL	1318	RETVAL
1127		1319
1128	void	1320	void
1129	scroll (CFClient::Map self, int dx, int dy)	1321	scroll (CFPlus::Map self, int dx, int dy)
1130	CODE:	1322	CODE:
1131	{	1323	{
1132	if (dx > 0)	1324	if (dx > 0)
1133	map_blank (self, self->x, self->y, dx - 1, self->h);	1325	map_blank (self, self->x, self->y, dx, self->h);
1134	else if (dx < 0)	1326	else if (dx < 0)
1135	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1327	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1136		1328
1137	if (dy > 0)	1329	if (dy > 0)
1138	map_blank (self, self->x, self->y, self->w, dy - 1);	1330	map_blank (self, self->x, self->y, self->w, dy);
1139	else if (dy < 0)	1331	else if (dy < 0)
1140	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1332	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1141		1333
1142	self->ox += dx; self->x += dx;	1334	self->ox += dx; self->x += dx;
1143	self->oy += dy; self->y += dy;	1335	self->oy += dy; self->y += dy;
1144		1336
1145	while (self->y < 0)	1337	while (self->y < 0)
…		…
1150	self->y += MAP_EXTEND_Y;	1342	self->y += MAP_EXTEND_Y;
1151	}	1343	}
1152	}	1344	}
1153		1345
1154	void	1346	void
1155	map1a_update (CFClient::Map self, SV *data_)	1347	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1156	CODE:	1348	CODE:
1157	{	1349	{
1158	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1350	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1159	uint8_t data_end = (uint8_t )SvEND (data_);	1351	uint8_t data_end = (uint8_t )SvEND (data_);
1160	mapcell *cell;	1352	mapcell *cell;
1161	int x, y, flags;	1353	int x, y, flags;
1162		1354
1163	while (data < data_end)	1355	while (data < data_end - 1)
1164	{	1356	{
1165	flags = (data [0] << 8) + data [1]; data += 2;	1357	flags = (data [0] << 8) + data [1]; data += 2;
1166		1358
1167	x = ((flags >> 10) & 63) + self->x;	1359	x = self->x + ((flags >> 10) & 63);
1168	y = ((flags >> 4) & 63) + self->y;	1360	y = self->y + ((flags >> 4) & 63);
1169		1361
1170	cell = map_get_cell (self, x, y);	1362	cell = map_get_cell (self, x, y);
1171		1363
1172	if (flags & 15)	1364	if (flags & 15)
1173	{	1365	{
1174	if (cell->darkness < 0)	1366	if (!cell->darkness)
1175	{	1367	{
		1368	memset (cell, 0, sizeof (*cell));
1176	cell->darkness = 0;	1369	cell->darkness = 256;
1177	cell->face [0] = 0;
1178	cell->face [1] = 0;
1179	cell->face [2] = 0;
1180	}	1370	}
1181		1371
1182	cell->darkness = flags & 8 ? *data++ : 255;
1183
1184	//TODO: don't trust server data to be in-range(!)	1372	//TODO: don't trust server data to be in-range(!)
		1373
		1374	if (flags & 8)
		1375	{
		1376	if (extmap)
		1377	{
		1378	uint8_t ext, cmd;
		1379
		1380	do
		1381	{
		1382	ext = *data++;
		1383	cmd = ext & 0x3f;
		1384
		1385	if (cmd < 4)
		1386	cell->darkness = 255 - ext * 64 + 1;
		1387	else if (cmd == 5) // health
		1388	{
		1389	cell->stat_width = 1;
		1390	cell->stat_hp = *data++;
		1391	}
		1392	else if (cmd == 6) // monster width
		1393	cell->stat_width = *data++ + 1;
		1394	else if (cmd == 0x47) // monster width
		1395	{
		1396	if (*data == 4)
		1397	; // decode player tag
		1398
		1399	data += *data + 1;
		1400	}
		1401	else if (cmd == 8) // cell flags
		1402	cell->flags = *data++;
		1403	else if (ext & 0x40) // unknown, multibyte => skip
		1404	data += *data + 1;
		1405	else
		1406	data++;
		1407	}
		1408	while (ext & 0x80);
		1409	}
		1410	else
		1411	cell->darkness = *data++ + 1;
		1412	}
1185		1413
1186	if (flags & 4)	1414	if (flags & 4)
1187	{	1415	{
1188	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1416	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1189	}	1417	}
…		…
1197	{	1425	{
1198	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1426	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1199	}	1427	}
1200	}	1428	}
1201	else	1429	else
1202	cell->darkness = -1;	1430	cell->darkness = 0;
1203	}	1431	}
1204	}	1432	}
1205		1433
1206	SV *	1434	SV *
1207	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1435	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1208	CODE:	1436	CODE:
1209	{	1437	{
1210	int x1, x;	1438	int x1, x;
1211	int y1, y;	1439	int y1, y;
1212	int z;	1440	int z;
…		…
1262	}	1490	}
1263	OUTPUT:	1491	OUTPUT:
1264	RETVAL	1492	RETVAL
1265		1493
1266	void	1494	void
1267	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1495	draw (CFPlus::Map self, int mx, int my, int sw, int sh)
1268	PPCODE:	1496	CODE:
1269	{	1497	{
1270	int vx, vy;
1271	int x, y, z;	1498	int x, y, z;
1272	int last_name;	1499	int last_name;
1273	mapface face;	1500	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
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;
1283	vy = self->y + (self->h - sh) / 2 - shift_y;
1284
1285	/*
1286	int vx = self->vx = self->w >= sw
1287	? self->x + (self->w - sw) / 2
1288	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1289
1290	int vy = self->vy = self->h >= sh
1291	? self->y + (self->h - sh) / 2
1292	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1293	*/
1294		1501
1295	glColor4ub (255, 255, 255, 255);	1502	glColor4ub (255, 255, 255, 255);
1296		1503
		1504	glEnable (GL_BLEND);
1297	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1505	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1298	glEnable (GL_BLEND);
1299	glEnable (GL_TEXTURE_2D);	1506	glEnable (GL_TEXTURE_2D);
1300	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1507	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1301		1508
1302	glBegin (GL_QUADS);	1509	glBegin (GL_QUADS);
1303		1510
1304	last_name = 0;	1511	last_name = 0;
1305		1512
		1513	mx += self->x;
		1514	my += self->y;
		1515
1306	for (z = 0; z < 3; z++)	1516	for (z = 0; z < 3; z++)
1307	for (y = 0; y < sh; y++)	1517	for (y = 0; y < sh; y++)
1308	if (0 <= y + vy && y + vy < self->rows)	1518	if (0 <= y + my && y + my < self->rows)
1309	{	1519	{
1310	maprow *row = self->row + (y + vy);	1520	maprow *row = self->row + (y + my);
1311		1521
1312	for (x = 0; x < sw; x++)	1522	for (x = 0; x < sw; x++)
1313	if (row->c0 <= x + vx && x + vx < row->c1)	1523	if (row->c0 <= x + mx && x + mx < row->c1)
1314	{	1524	{
1315	mapcell *cell = row->col + (x + vx - row->c0);	1525	mapcell *cell = row->col + (x + mx - row->c0);
1316
1317	darkness[y * sw4 + x] = cell->darkness < 0
1318	? 255 - FOW_DARKNESS
1319	: 255 - cell->darkness;
1320		1526
1321	face = cell->face [z];	1527	face = cell->face [z];
1322		1528
1323	if (face)	1529	if (face && face < self->texs)
1324	{	1530	{
1325	maptex tex = self->tex [face];	1531	maptex tex = self->tex [face];
1326
1327	int px = (x + 1) * 32 - tex.w;	1532	int px = (x + 1) * 32 - tex.w;
1328	int py = (y + 1) * 32 - tex.h;	1533	int py = (y + 1) * 32 - tex.h;
1329		1534
1330	if (last_name != tex.name)	1535	if (last_name != tex.name)
1331	{	1536	{
1332	glEnd ();	1537	glEnd ();
1333	last_name = tex.name;
1334	glBindTexture (GL_TEXTURE_2D, last_name);	1538	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1335	glBegin (GL_QUADS);	1539	glBegin (GL_QUADS);
1336	}	1540	}
1337		1541
1338	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1542	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1339	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1543	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1340	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1544	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1341	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1545	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1342	}	1546	}
		1547
		1548	if (cell->flags && z == 2)
		1549	{
		1550	if (cell->flags & 1)
		1551	{
		1552	maptex tex = self->tex [1];
		1553	int px = (x + 1) * 32 - tex.w + 2;
		1554	int py = (y + 1) * 32 - tex.h - 6;
		1555
		1556	glEnd ();
		1557	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1558	glBegin (GL_QUADS);
		1559
		1560	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1561	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1562	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1563	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1564	}
		1565	}
1343	}	1566	}
1344	}	1567	}
1345		1568
1346	glEnd ();	1569	glEnd ();
1347		1570
1348	glDisable (GL_TEXTURE_2D);	1571	glDisable (GL_TEXTURE_2D);
1349	glDisable (GL_BLEND);	1572	glDisable (GL_BLEND);
		1573
		1574	// top layer: overlays such as the health bar
		1575	for (y = 0; y < sh; y++)
		1576	if (0 <= y + my && y + my < self->rows)
		1577	{
		1578	maprow *row = self->row + (y + my);
		1579
		1580	for (x = 0; x < sw; x++)
		1581	if (row->c0 <= x + mx && x + mx < row->c1)
		1582	{
		1583	mapcell *cell = row->col + (x + mx - row->c0);
		1584
		1585	int px = x * 32;
		1586	int py = y * 32;
		1587
		1588	if (cell->stat_hp)
		1589	{
		1590	int width = cell->stat_width * 32;
		1591	int thick = sh / 28 + 1 + cell->stat_width;
		1592
		1593	glColor3ub (0, 0, 0);
		1594	glRectf (px + 1, py - thick - 2,
		1595	px + width - 1, py);
		1596
		1597	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1598	glRectf (px + 2,
		1599	py - thick - 1,
		1600	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1601	}
		1602	}
		1603	}
		1604	}
		1605
		1606	void
		1607	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1608	CODE:
		1609	{
		1610	static float color[16][3] = {
		1611	{ 0.00F, 0.00F, 0.00F },
		1612	{ 1.00F, 1.00F, 1.00F },
		1613	{ 0.00F, 0.00F, 0.55F },
		1614	{ 1.00F, 0.00F, 0.00F },
		1615
		1616	{ 1.00F, 0.54F, 0.00F },
		1617	{ 0.11F, 0.56F, 1.00F },
		1618	{ 0.93F, 0.46F, 0.00F },
		1619	{ 0.18F, 0.54F, 0.34F },
		1620
		1621	{ 0.56F, 0.73F, 0.56F },
		1622	{ 0.80F, 0.80F, 0.80F },
		1623	{ 0.55F, 0.41F, 0.13F },
		1624	{ 0.99F, 0.77F, 0.26F },
		1625
		1626	{ 0.74F, 0.65F, 0.41F },
		1627
		1628	{ 0.00F, 1.00F, 1.00F },
		1629	{ 1.00F, 0.00F, 1.00F },
		1630	{ 1.00F, 1.00F, 0.00F },
		1631	};
		1632
		1633	int x, y;
		1634
		1635	glEnable (GL_TEXTURE_2D);
		1636	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1637	glEnable (GL_BLEND);
		1638	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1639	glBegin (GL_QUADS);
		1640
		1641	for (y = 0; y < h; y++)
		1642	for (x = 0; x < w; x++)
		1643	{
		1644	unsigned char m = data [x + y * w];
		1645
		1646	if (m)
		1647	{
		1648	float *c = color [m & 15];
		1649
		1650	float tx1 = m & 0x40 ? 0.5 : 0.;
		1651	float tx2 = tx1 + 0.5;
		1652
		1653	glColor4f (c[0], c[1], c[2], 0.75);
		1654	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1655	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1656	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1657	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1658	}
		1659	}
		1660
		1661	glEnd ();
		1662	glDisable (GL_BLEND);
		1663	glDisable (GL_TEXTURE_2D);
		1664	}
		1665
		1666	void
		1667	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
		1668	PPCODE:
		1669	{
		1670	int x, y;
		1671	int sw4 = (sw + 3) & ~3;
		1672	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1673	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1674
		1675	memset (darkness, 255, sw4 * sh);
		1676	SvPOK_only (darkness_sv);
		1677	SvCUR_set (darkness_sv, sw4 * sh);
		1678
		1679	mx += self->x;
		1680	my += self->y;
		1681
		1682	for (y = 0; y < sh; y++)
		1683	if (0 <= y + my && y + my < self->rows)
		1684	{
		1685	maprow *row = self->row + (y + my);
		1686
		1687	for (x = 0; x < sw; x++)
		1688	if (row->c0 <= x + mx && x + mx < row->c1)
		1689	{
		1690	mapcell *cell = row->col + (x + mx - row->c0);
		1691
		1692	darkness[y * sw4 + x] = cell->darkness
		1693	? 255 - (cell->darkness - 1)
		1694	: 255 - FOW_DARKNESS;
		1695	}
		1696	}
1350		1697
1351	EXTEND (SP, 3);	1698	EXTEND (SP, 3);
1352	PUSHs (sv_2mortal (newSViv (sw4)));	1699	PUSHs (sv_2mortal (newSViv (sw4)));
1353	PUSHs (sv_2mortal (newSViv (sh)));	1700	PUSHs (sv_2mortal (newSViv (sh)));
1354	PUSHs (darkness_sv);	1701	PUSHs (darkness_sv);
1355	}	1702	}
1356		1703
1357	SV *	1704	SV *
1358	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1705	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1359	CODE:	1706	CODE:
1360	{	1707	{
1361	int x, y, x1, y1;	1708	int x, y, x1, y1;
1362	SV data_sv = newSV (w h * 7 + 5);	1709	SV data_sv = newSV (w h * 7 + 5);
1363	uint8_t data = (uint8_t )SvPVX (data_sv);	1710	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1425	}	1772	}
1426	OUTPUT:	1773	OUTPUT:
1427	RETVAL	1774	RETVAL
1428		1775
1429	void	1776	void
1430	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1777	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1431	PPCODE:	1778	PPCODE:
1432	{	1779	{
1433	int x, y, z;	1780	int x, y, z;
1434	int w, h;	1781	int w, h;
1435	int x1, y1;	1782	int x1, y1;
…		…
1467		1814
1468	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1815	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1469	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1816	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1470	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1817	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1471		1818
1472	if (cell->darkness <= 0)	1819	if (cell->darkness == 0)
1473	{	1820	{
1474	cell->darkness = -1;	1821	cell->darkness = 0;
1475		1822
1476	for (z = 0; z <= 2; z++)	1823	for (z = 0; z <= 2; z++)
1477	{	1824	{
1478	cell->face[z] = face[z];	1825	cell->face[z] = face[z];
1479		1826
…		…
1484	}	1831	}
1485	}	1832	}
1486	}	1833	}
1487	}	1834	}
1488		1835
1489	MODULE = CFClient PACKAGE = CFClient::MixChunk	1836	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1490		1837
1491	CFClient::MixChunk	1838	CFPlus::MixChunk
1492	new_from_file (SV class, char path)	1839	new_from_file (SV class, char path)
1493	CODE:	1840	CODE:
1494	RETVAL = Mix_LoadWAV (path);	1841	RETVAL = Mix_LoadWAV (path);
1495	OUTPUT:	1842	OUTPUT:
1496	RETVAL	1843	RETVAL
1497		1844
1498	void	1845	void
1499	DESTROY (CFClient::MixChunk self)	1846	DESTROY (CFPlus::MixChunk self)
1500	CODE:	1847	CODE:
1501	Mix_FreeChunk (self);	1848	Mix_FreeChunk (self);
1502		1849
1503	int	1850	int
1504	volume (CFClient::MixChunk self, int volume = -1)	1851	volume (CFPlus::MixChunk self, int volume = -1)
1505	CODE:	1852	CODE:
1506	RETVAL = Mix_VolumeChunk (self, volume);	1853	RETVAL = Mix_VolumeChunk (self, volume);
1507	OUTPUT:	1854	OUTPUT:
1508	RETVAL	1855	RETVAL
1509		1856
1510	int	1857	int
1511	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1858	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1512	CODE:	1859	CODE:
1513	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1860	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1514	OUTPUT:	1861	OUTPUT:
1515	RETVAL	1862	RETVAL
1516		1863
1517	MODULE = CFClient PACKAGE = CFClient::MixMusic	1864	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1518		1865
1519	int	1866	int
1520	volume (int volume = -1)	1867	volume (int volume = -1)
1521	CODE:	1868	CODE:
1522	RETVAL = Mix_VolumeMusic (volume);	1869	RETVAL = Mix_VolumeMusic (volume);
1523	OUTPUT:	1870	OUTPUT:
1524	RETVAL	1871	RETVAL
1525		1872
1526	CFClient::MixMusic	1873	CFPlus::MixMusic
1527	new_from_file (SV class, char path)	1874	new_from_file (SV class, char path)
1528	CODE:	1875	CODE:
1529	RETVAL = Mix_LoadMUS (path);	1876	RETVAL = Mix_LoadMUS (path);
1530	OUTPUT:	1877	OUTPUT:
1531	RETVAL	1878	RETVAL
1532		1879
1533	void	1880	void
1534	DESTROY (CFClient::MixMusic self)	1881	DESTROY (CFPlus::MixMusic self)
1535	CODE:	1882	CODE:
1536	Mix_FreeMusic (self);	1883	Mix_FreeMusic (self);
1537		1884
1538	int	1885	int
1539	play (CFClient::MixMusic self, int loops = -1)	1886	play (CFPlus::MixMusic self, int loops = -1)
1540	CODE:	1887	CODE:
1541	RETVAL = Mix_PlayMusic (self, loops);	1888	RETVAL = Mix_PlayMusic (self, loops);
1542	OUTPUT:	1889	OUTPUT:
1543	RETVAL	1890	RETVAL
1544		1891
1545	MODULE = CFClient PACKAGE = CFClient::OpenGL	1892	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1546		1893
1547	BOOT:	1894	BOOT:
1548	{	1895	{
1549	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1896	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1550	static const struct {	1897	static const struct {
1551	const char *name;	1898	const char *name;
1552	IV iv;	1899	IV iv;
1553	} *civ, const_iv[] = {	1900	} *civ, const_iv[] = {
1554	# define const_iv(name) { # name, (IV)name }	1901	# define const_iv(name) { # name, (IV)name }
…		…
1561	const_iv (GL_SCISSOR_TEST),	1908	const_iv (GL_SCISSOR_TEST),
1562	const_iv (GL_DEPTH_TEST),	1909	const_iv (GL_DEPTH_TEST),
1563	const_iv (GL_ALPHA_TEST),	1910	const_iv (GL_ALPHA_TEST),
1564	const_iv (GL_NORMALIZE),	1911	const_iv (GL_NORMALIZE),
1565	const_iv (GL_RESCALE_NORMAL),	1912	const_iv (GL_RESCALE_NORMAL),
		1913	const_iv (GL_FRONT),
		1914	const_iv (GL_BACK),
1566	const_iv (GL_AND),	1915	const_iv (GL_AND),
1567	const_iv (GL_ONE),	1916	const_iv (GL_ONE),
1568	const_iv (GL_ZERO),	1917	const_iv (GL_ZERO),
1569	const_iv (GL_SRC_ALPHA),	1918	const_iv (GL_SRC_ALPHA),
1570	const_iv (GL_DST_ALPHA),	1919	const_iv (GL_DST_ALPHA),
1571	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1920	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1572	const_iv (GL_ONE_MINUS_DST_ALPHA),	1921	const_iv (GL_ONE_MINUS_DST_ALPHA),
1573	const_iv (GL_SRC_ALPHA_SATURATE),	1922	const_iv (GL_SRC_ALPHA_SATURATE),
1574	const_iv (GL_RGB),	1923	const_iv (GL_RGB),
1575	const_iv (GL_RGBA),	1924	const_iv (GL_RGBA),
		1925	const_iv (GL_RGBA4),
		1926	const_iv (GL_RGBA8),
		1927	const_iv (GL_RGB5_A1),
1576	const_iv (GL_UNSIGNED_BYTE),	1928	const_iv (GL_UNSIGNED_BYTE),
1577	const_iv (GL_UNSIGNED_SHORT),	1929	const_iv (GL_UNSIGNED_SHORT),
1578	const_iv (GL_UNSIGNED_INT),	1930	const_iv (GL_UNSIGNED_INT),
1579	const_iv (GL_ALPHA),	1931	const_iv (GL_ALPHA),
1580	const_iv (GL_INTENSITY),	1932	const_iv (GL_INTENSITY),
…		…
1612	const_iv (GL_SEPARABLE_2D),	1964	const_iv (GL_SEPARABLE_2D),
1613	const_iv (GL_CONVOLUTION_2D),	1965	const_iv (GL_CONVOLUTION_2D),
1614	const_iv (GL_CONVOLUTION_BORDER_MODE),	1966	const_iv (GL_CONVOLUTION_BORDER_MODE),
1615	const_iv (GL_CONSTANT_BORDER),	1967	const_iv (GL_CONSTANT_BORDER),
1616	const_iv (GL_LINES),	1968	const_iv (GL_LINES),
		1969	const_iv (GL_LINE_STRIP),
1617	const_iv (GL_LINE_LOOP),	1970	const_iv (GL_LINE_LOOP),
1618	const_iv (GL_QUADS),	1971	const_iv (GL_QUADS),
1619	const_iv (GL_QUAD_STRIP),	1972	const_iv (GL_QUAD_STRIP),
1620	const_iv (GL_TRIANGLES),	1973	const_iv (GL_TRIANGLES),
1621	const_iv (GL_TRIANGLE_STRIP),	1974	const_iv (GL_TRIANGLE_STRIP),
…		…
1654	OUTPUT:	2007	OUTPUT:
1655	RETVAL	2008	RETVAL
1656		2009
1657	int glGetError ()	2010	int glGetError ()
1658		2011
		2012	void glFinish ()
		2013
1659	void glClear (int mask)	2014	void glClear (int mask)
1660		2015
1661	void glClearColor (float r, float g, float b, float a = 1.0)	2016	void glClearColor (float r, float g, float b, float a = 1.0)
1662	PROTOTYPE: @	2017	PROTOTYPE: @
1663		2018
…		…
1686	void glPushMatrix ()	2041	void glPushMatrix ()
1687		2042
1688	void glPopMatrix ()	2043	void glPopMatrix ()
1689		2044
1690	void glLoadIdentity ()	2045	void glLoadIdentity ()
		2046
		2047	void glDrawBuffer (int buffer)
		2048
		2049	void glReadBuffer (int buffer)
1691		2050
1692	# near_ and far_ are due to microsofts buggy "c" compiler	2051	# 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_)	2052	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1694		2053
1695	# near_ and far_ are due to microsofts buggy "c" compiler	2054	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1725	r *= a;	2084	r *= a;
1726	g *= a;	2085	g *= a;
1727	b *= a;	2086	b *= a;
1728	}	2087	}
1729	// microsoft visual "c" rounds instead of truncating...	2088	// microsoft visual "c" rounds instead of truncating...
1730	glColor4ub (MIN ((int)(r * 256.f), 255),	2089	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		2090
1735	void glInterleavedArrays (int format, int stride, char *data)	2091	void glInterleavedArrays (int format, int stride, char *data)
1736		2092
1737	void glDrawElements (int mode, int count, int type, char *indices)	2093	void glDrawElements (int mode, int count, int type, char *indices)
1738		2094
…		…
1815		2171
1816	void glEndList ()	2172	void glEndList ()
1817		2173
1818	void glCallList (int list)	2174	void glCallList (int list)
1819		2175
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.165 by root, Fri Dec 8 14:59:54 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.165 by root, Fri Dec 8 14:59:54 2006 UTC