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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.103 by root, Sun Jun 4 23:05:05 2006 UTC vs. Revision 1.163 by root, Wed Oct 18 12:53:45 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.103 by root, Sun Jun 4 23:05:05 2006 UTC vs.
Revision 1.163 by root, Wed Oct 18 12:53:45 2006 UTC