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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.166 by root, Fri Dec 8 15:07:08 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
725	rgba=1;//D	831	new (SV *class)
		832	CODE:
726	New (0, RETVAL, 1, struct cf_layout);	833	New (0, RETVAL, 1, struct cf_layout);
727		834
728	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	835	RETVAL->pl = pango_layout_new (opengl_context);
729	RETVAL->rgba = rgba;
730	RETVAL->r = 1.;	836	RETVAL->r = 1.;
731	RETVAL->g = 1.;	837	RETVAL->g = 1.;
732	RETVAL->b = 1.;	838	RETVAL->b = 1.;
733	RETVAL->a = 1.;	839	RETVAL->a = 1.;
734	RETVAL->base_height = MIN_FONT_HEIGHT;	840	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
738	layout_update_font (RETVAL);	844	layout_update_font (RETVAL);
739	OUTPUT:	845	OUTPUT:
740	RETVAL	846	RETVAL
741		847
742	void	848	void
743	DESTROY (CFClient::Layout self)	849	DESTROY (CFPlus::Layout self)
744	CODE:	850	CODE:
745	g_object_unref (self->pl);	851	g_object_unref (self->pl);
746	Safefree (self);	852	Safefree (self);
747		853
748	int
749	is_rgba (CFClient::Layout self)
750	CODE:
751	RETVAL = self->rgba;
752	OUTPUT:
753	RETVAL
754
755	void	854	void
756	set_text (CFClient::Layout self, SV *text_)	855	set_text (CFPlus::Layout self, SV *text_)
757	CODE:	856	CODE:
758	{	857	{
759	STRLEN textlen;	858	STRLEN textlen;
760	char *text = SvPVutf8 (text_, textlen);	859	char *text = SvPVutf8 (text_, textlen);
761		860
762	pango_layout_set_text (self->pl, text, textlen);	861	pango_layout_set_text (self->pl, text, textlen);
763	}	862	}
764		863
765	void	864	void
766	set_markup (CFClient::Layout self, SV *text_)	865	set_markup (CFPlus::Layout self, SV *text_)
767	CODE:	866	CODE:
768	{	867	{
769	STRLEN textlen;	868	STRLEN textlen;
770	char *text = SvPVutf8 (text_, textlen);	869	char *text = SvPVutf8 (text_, textlen);
771		870
772	pango_layout_set_markup (self->pl, text, textlen);	871	pango_layout_set_markup (self->pl, text, textlen);
773	}	872	}
774		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
775	SV *	959	SV *
776	get_text (CFClient::Layout self)	960	get_text (CFPlus::Layout self)
777	CODE:	961	CODE:
778	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	962	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
779	SvUTF8_on (RETVAL);	963	sv_utf8_decode (RETVAL);
780	OUTPUT:	964	OUTPUT:
781	RETVAL	965	RETVAL
782		966
783	void	967	void
784	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.)
785	CODE:	969	CODE:
786	self->r = r;	970	self->r = r;
787	self->g = g;	971	self->g = g;
788	self->b = b;	972	self->b = b;
789	self->a = a;	973	self->a = a;
790		974
791	void	975	void
792	set_font (CFClient::Layout self, CFClient::Font font = 0)	976	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
793	CODE:	977	CODE:
794	if (self->font != font)	978	if (self->font != font)
795	{	979	{
796	self->font = font;	980	self->font = font;
797	layout_update_font (self);	981	layout_update_font (self);
798	}	982	}
799		983
800	void	984	void
801	set_height (CFClient::Layout self, int base_height)	985	set_height (CFPlus::Layout self, int base_height)
802	CODE:	986	CODE:
803	if (self->base_height != base_height)	987	if (self->base_height != base_height)
804	{	988	{
805	self->base_height = base_height;	989	self->base_height = base_height;
806	layout_update_font (self);	990	layout_update_font (self);
807	}	991	}
808		992
809	void	993	void
810	set_width (CFClient::Layout self, int max_width = -1)	994	set_width (CFPlus::Layout self, int max_width = -1)
811	CODE:	995	CODE:
812	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);
813		997
814	void	998	void
815	set_indent (CFClient::Layout self, int indent)	999	set_indent (CFPlus::Layout self, int indent)
816	CODE:	1000	CODE:
817	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1001	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
818		1002
819	void	1003	void
820	set_spacing (CFClient::Layout self, int spacing)	1004	set_spacing (CFPlus::Layout self, int spacing)
821	CODE:	1005	CODE:
822	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1006	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
823		1007
824	void	1008	void
825	set_ellipsise (CFClient::Layout self, int ellipsise)	1009	set_ellipsise (CFPlus::Layout self, int ellipsise)
826	CODE:	1010	CODE:
827	pango_layout_set_ellipsize (self->pl,	1011	pango_layout_set_ellipsize (self->pl,
828	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1012	ellipsise == 1 ? PANGO_ELLIPSIZE_START
829	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1013	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
830	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1014	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
831	: PANGO_ELLIPSIZE_NONE	1015	: PANGO_ELLIPSIZE_NONE
832	);	1016	);
833		1017
834	void	1018	void
835	set_single_paragraph_mode (CFClient::Layout self, int spm)	1019	set_single_paragraph_mode (CFPlus::Layout self, int spm)
836	CODE:	1020	CODE:
837	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1021	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
838		1022
839	void	1023	void
840	size (CFClient::Layout self)	1024	size (CFPlus::Layout self)
841	PPCODE:	1025	PPCODE:
842	{	1026	{
843	int w, h;	1027	int w, h;
844		1028
845	layout_get_pixel_size (self, &w, &h);	1029	layout_get_pixel_size (self, &w, &h);
…		…
848	PUSHs (sv_2mortal (newSViv (w)));	1032	PUSHs (sv_2mortal (newSViv (w)));
849	PUSHs (sv_2mortal (newSViv (h)));	1033	PUSHs (sv_2mortal (newSViv (h)));
850	}	1034	}
851		1035
852	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
853	xy_to_index (CFClient::Layout self, int x, int y)	1049	xy_to_index (CFPlus::Layout self, int x, int y)
854	CODE:	1050	CODE:
855	{	1051	{
856	int index, trailing;	1052	int index, trailing;
857	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);
858	RETVAL = index;	1054	RETVAL = index + trailing;
859	}	1055	}
860	OUTPUT:	1056	OUTPUT:
861	RETVAL	1057	RETVAL
862		1058
863	void	1059	void
864	cursor_pos (CFClient::Layout self, int index)	1060	cursor_pos (CFPlus::Layout self, int index)
865	PPCODE:	1061	PPCODE:
866	{	1062	{
867	PangoRectangle strong_pos;	1063	PangoRectangle strong_pos;
868	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1064	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
869		1065
…		…
872	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1068	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
873	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1069	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
874	}	1070	}
875		1071
876	void	1072	void
877	render (CFClient::Layout self)	1073	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
878	PPCODE:	1074	PPCODE:
879	{	1075	{
880	SV *retval;	1076	int line, x;
881	int w, h;
882		1077
883	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 */
884		1080
885	if (self->rgba)
886	{
887	cairo_surface_t *surface;
888	cairo_t *cairo;
889
890	retval = newSV (w * h * 4);
891	SvPOK_only (retval);
892	SvCUR_set (retval, w * h * 4);
893
894	memset (SvPVX (retval), 0, w * h * 4);
895
896	surface = cairo_image_surface_create_for_data (
897	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
898	cairo = cairo_create (surface);
899	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
900
901	pango_cairo_show_layout (cairo, self->pl);
902
903	cairo_destroy (cairo);
904	cairo_surface_destroy (surface);
905
906	// what a mess, and its premultiplied, too :(
907	{
908	uint32_t p = (uint32_t )SvPVX (retval);
909	uint32_t e = p + w h;
910
911	while (p < e)
912	{
913	uint32_t rgba = *p;
914	rgba = (rgba >> 24) \| (rgba << 8);
915	#if 0
916	#ifdef _WIN32
917	{//D
918	uint8_t r = rgba >> 24;
919	uint8_t g = rgba >> 16;
920	uint8_t b = rgba >> 8;
921	uint8_t a = rgba >> 0;
922
923	rgba = (rgba & 0xffffff00) \| a;
924	}
925	#endif
926	#endif
927	rgba = SDL_SwapBE32 (rgba);
928	*p++ = rgba;
929	}
930	}
931
932	EXTEND (SP, 5);	1081	EXTEND (SP, 2);
933	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	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
		1100
		1101	EXTEND (SP, 2);
		1102	if (GIMME_V == G_SCALAR)
934	PUSHs (sv_2mortal (newSViv (h)));	1103	PUSHs (sv_2mortal (newSViv (index + trailing)));
935	PUSHs (sv_2mortal (retval));
936	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
937	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
938	}
939	else	1104	else
940	{	1105	{
941	FT_Bitmap bitmap;
942
943	retval = newSV (w * h);
944	SvPOK_only (retval);
945	SvCUR_set (retval, w * h);
946
947	bitmap.rows = h;
948	bitmap.width = w;
949	bitmap.pitch = w;
950	bitmap.buffer = (unsigned char*)SvPVX (retval);
951	bitmap.num_grays = 256;
952	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
953
954	memset (bitmap.buffer, 0, w * h);
955
956	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
957
958	EXTEND (SP, 5);
959	PUSHs (sv_2mortal (newSViv (w)));	1106	PUSHs (sv_2mortal (newSViv (index)));
960	PUSHs (sv_2mortal (newSViv (h)));	1107	PUSHs (sv_2mortal (newSViv (trailing)));
961	PUSHs (sv_2mortal (retval));
962	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
963	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
964	}	1108	}
965	}	1109	}
966		1110
		1111	void
		1112	render (CFPlus::Layout self, float x, float y, int flags = 0)
		1113	PPCODE:
		1114	pango_opengl_render_layout_subpixel (
		1115	self->pl,
		1116	x * PANGO_SCALE, y * PANGO_SCALE,
		1117	self->r, self->g, self->b, self->a,
		1118	flags
		1119	);
		1120
967	MODULE = CFClient PACKAGE = CFClient::Texture	1121	MODULE = CFPlus PACKAGE = CFPlus::Texture
968		1122
969	void	1123	void
		1124	pad2pot (SV data_, SV w_, SV *h_)
		1125	CODE:
		1126	{
		1127	int ow = SvIV (w_);
		1128	int oh = SvIV (h_);
		1129
		1130	if (ow && oh)
		1131	{
		1132	int nw = minpot (ow);
		1133	int nh = minpot (oh);
		1134
		1135	if (nw != ow \|\| nh != oh)
		1136	{
		1137	if (SvOK (data_))
		1138	{
		1139	STRLEN datalen;
		1140	char *data = SvPVbyte (data_, datalen);
		1141	int bpp = datalen / (ow * oh);
		1142	SV result_ = sv_2mortal (newSV (nw nh * bpp));
		1143
		1144	SvPOK_only (result_);
		1145	SvCUR_set (result_, nw * nh * bpp);
		1146
		1147	memset (SvPVX (result_), 0, nw * nh * bpp);
		1148	while (oh--)
		1149	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1150
		1151	sv_setsv (data_, result_);
		1152	}
		1153
		1154	sv_setiv (w_, nw);
		1155	sv_setiv (h_, nh);
		1156	}
		1157	}
		1158	}
		1159
		1160	void
970	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1161	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
971	PROTOTYPE: $$$;$$	1162	PROTOTYPE: $$$;$$
972	ALIAS:	1163	ALIAS:
973	draw_quad_alpha = 1	1164	draw_quad_alpha = 1
974	draw_quad_alpha_premultiplied = 2	1165	draw_quad_alpha_premultiplied = 2
975	CODE:	1166	CODE:
…		…
1013	glDisable (GL_ALPHA_TEST);	1204	glDisable (GL_ALPHA_TEST);
1014	glDisable (GL_BLEND);	1205	glDisable (GL_BLEND);
1015	}	1206	}
1016	}	1207	}
1017		1208
1018	MODULE = CFClient PACKAGE = CFClient::Map	1209	MODULE = CFPlus PACKAGE = CFPlus::Map
1019		1210
1020	CFClient::Map	1211	CFPlus::Map
1021	new (SV *class, int map_width, int map_height)	1212	new (SV *class)
1022	CODE:	1213	CODE:
1023	New (0, RETVAL, 1, struct map);	1214	New (0, RETVAL, 1, struct map);
1024	RETVAL->x = 0;	1215	RETVAL->x = 0;
1025	RETVAL->y = 0;	1216	RETVAL->y = 0;
1026	RETVAL->w = map_width;	1217	RETVAL->w = 0;
1027	RETVAL->h = map_height;	1218	RETVAL->h = 0;
1028	RETVAL->ox = 0;	1219	RETVAL->ox = 0;
1029	RETVAL->oy = 0;	1220	RETVAL->oy = 0;
1030	RETVAL->faces = 8192;	1221	RETVAL->faces = 8192;
1031	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1222	Newz (0, RETVAL->face, RETVAL->faces, mapface);
1032	RETVAL->texs = 8192;	1223	RETVAL->texs = 8192;
…		…
1035	RETVAL->row = 0;	1226	RETVAL->row = 0;
1036	OUTPUT:	1227	OUTPUT:
1037	RETVAL	1228	RETVAL
1038		1229
1039	void	1230	void
1040	DESTROY (CFClient::Map self)	1231	DESTROY (CFPlus::Map self)
1041	CODE:	1232	CODE:
1042	{	1233	{
1043	map_clear (self);	1234	map_clear (self);
1044	Safefree (self->face);	1235	Safefree (self->face);
		1236	Safefree (self->tex);
1045	Safefree (self);	1237	Safefree (self);
1046	}	1238	}
1047		1239
1048	void	1240	void
		1241	resize (CFPlus::Map self, int map_width, int map_height)
		1242	CODE:
		1243	self->w = map_width;
		1244	self->h = map_height;
		1245
		1246	void
1049	clear (CFClient::Map self)	1247	clear (CFPlus::Map self)
1050	CODE:	1248	CODE:
1051	map_clear (self);	1249	map_clear (self);
1052		1250
1053	void	1251	void
1054	set_face (CFClient::Map self, int face, int texid)	1252	set_face (CFPlus::Map self, int face, int texid)
1055	CODE:	1253	CODE:
1056	{	1254	{
1057	while (self->faces <= face)	1255	while (self->faces <= face)
1058	{	1256	{
1059	Append (mapface, self->face, self->faces, self->faces);	1257	Append (mapface, self->face, self->faces, self->faces);
…		…
1062		1260
1063	self->face [face] = texid;	1261	self->face [face] = texid;
1064	}	1262	}
1065		1263
1066	void	1264	void
1067	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)	1265	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)
1068	CODE:	1266	CODE:
1069	{	1267	{
1070	while (self->texs <= texid)	1268	while (self->texs <= texid)
1071	{	1269	{
1072	Append (maptex, self->tex, self->texs, self->texs);	1270	Append (maptex, self->tex, self->texs, self->texs);
…		…
1096	// from transparent color bleeding and ugly wrapping effects.	1294	// from transparent color bleeding and ugly wrapping effects.
1097	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1295	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1098	}	1296	}
1099		1297
1100	int	1298	int
1101	ox (CFClient::Map self)	1299	ox (CFPlus::Map self)
1102	ALIAS:	1300	ALIAS:
1103	oy = 1	1301	oy = 1
1104	x = 2	1302	x = 2
1105	y = 3	1303	y = 3
1106	w = 4	1304	w = 4
…		…
1117	}	1315	}
1118	OUTPUT:	1316	OUTPUT:
1119	RETVAL	1317	RETVAL
1120		1318
1121	void	1319	void
1122	scroll (CFClient::Map self, int dx, int dy)	1320	scroll (CFPlus::Map self, int dx, int dy)
1123	CODE:	1321	CODE:
1124	{	1322	{
1125	if (dx > 0)	1323	if (dx > 0)
1126	map_blank (self, self->x, self->y, dx - 1, self->h);	1324	map_blank (self, self->x, self->y, dx, self->h);
1127	else if (dx < 0)	1325	else if (dx < 0)
1128	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1326	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1129		1327
1130	if (dy > 0)	1328	if (dy > 0)
1131	map_blank (self, self->x, self->y, self->w, dy - 1);	1329	map_blank (self, self->x, self->y, self->w, dy);
1132	else if (dy < 0)	1330	else if (dy < 0)
1133	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1331	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1134		1332
1135	self->ox += dx; self->x += dx;	1333	self->ox += dx; self->x += dx;
1136	self->oy += dy; self->y += dy;	1334	self->oy += dy; self->y += dy;
1137		1335
1138	while (self->y < 0)	1336	while (self->y < 0)
…		…
1143	self->y += MAP_EXTEND_Y;	1341	self->y += MAP_EXTEND_Y;
1144	}	1342	}
1145	}	1343	}
1146		1344
1147	void	1345	void
1148	map1a_update (CFClient::Map self, SV *data_)	1346	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1149	CODE:	1347	CODE:
1150	{	1348	{
1151	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1349	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1152	uint8_t data_end = (uint8_t )SvEND (data_);	1350	uint8_t data_end = (uint8_t )SvEND (data_);
1153	mapcell *cell;	1351	mapcell *cell;
1154	int x, y, flags;	1352	int x, y, flags;
1155		1353
1156	while (data < data_end)	1354	while (data < data_end - 1)
1157	{	1355	{
1158	flags = (data [0] << 8) + data [1]; data += 2;	1356	flags = (data [0] << 8) + data [1]; data += 2;
1159		1357
1160	x = ((flags >> 10) & 63) + self->x;	1358	x = self->x + ((flags >> 10) & 63);
1161	y = ((flags >> 4) & 63) + self->y;	1359	y = self->y + ((flags >> 4) & 63);
1162		1360
1163	cell = map_get_cell (self, x, y);	1361	cell = map_get_cell (self, x, y);
1164		1362
1165	if (flags & 15)	1363	if (flags & 15)
1166	{	1364	{
1167	if (cell->darkness < 0)	1365	if (!cell->darkness)
1168	{	1366	{
		1367	memset (cell, 0, sizeof (*cell));
1169	cell->darkness = 0;	1368	cell->darkness = 256;
1170	cell->face [0] = 0;
1171	cell->face [1] = 0;
1172	cell->face [2] = 0;
1173	}	1369	}
1174		1370
1175	cell->darkness = flags & 8 ? *data++ : 255;
1176
1177	//TODO: don't trust server data to be in-range(!)	1371	//TODO: don't trust server data to be in-range(!)
		1372
		1373	if (flags & 8)
		1374	{
		1375	if (extmap)
		1376	{
		1377	uint8_t ext, cmd;
		1378
		1379	do
		1380	{
		1381	ext = *data++;
		1382	cmd = ext & 0x3f;
		1383
		1384	if (cmd < 4)
		1385	cell->darkness = 255 - ext * 64 + 1;
		1386	else if (cmd == 5) // health
		1387	{
		1388	cell->stat_width = 1;
		1389	cell->stat_hp = *data++;
		1390	}
		1391	else if (cmd == 6) // monster width
		1392	cell->stat_width = *data++ + 1;
		1393	else if (cmd == 0x47) // monster width
		1394	{
		1395	if (*data == 4)
		1396	; // decode player tag
		1397
		1398	data += *data + 1;
		1399	}
		1400	else if (cmd == 8) // cell flags
		1401	cell->flags = *data++;
		1402	else if (ext & 0x40) // unknown, multibyte => skip
		1403	data += *data + 1;
		1404	else
		1405	data++;
		1406	}
		1407	while (ext & 0x80);
		1408	}
		1409	else
		1410	cell->darkness = *data++ + 1;
		1411	}
1178		1412
1179	if (flags & 4)	1413	if (flags & 4)
1180	{	1414	{
1181	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1415	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1182	}	1416	}
…		…
1190	{	1424	{
1191	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1425	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1192	}	1426	}
1193	}	1427	}
1194	else	1428	else
1195	cell->darkness = -1;	1429	cell->darkness = 0;
1196	}	1430	}
1197	}	1431	}
1198		1432
1199	SV *	1433	SV *
1200	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1434	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1201	CODE:	1435	CODE:
1202	{	1436	{
1203	int x1, x;	1437	int x1, x;
1204	int y1, y;	1438	int y1, y;
1205	int z;	1439	int z;
…		…
1255	}	1489	}
1256	OUTPUT:	1490	OUTPUT:
1257	RETVAL	1491	RETVAL
1258		1492
1259	void	1493	void
1260	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1494	draw (CFPlus::Map self, int mx, int my, int sw, int sh)
1261	PPCODE:	1495	CODE:
1262	{	1496	{
1263	int vx, vy;
1264	int x, y, z;	1497	int x, y, z;
1265	int last_name;	1498	int last_name;
1266	mapface face;	1499	mapface face;
1267	int sw4 = (sw + 3) & ~3;
1268	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1269	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1270
1271	memset (darkness, 255, sw4 * sh);
1272	SvPOK_only (darkness_sv);
1273	SvCUR_set (darkness_sv, sw4 * sh);
1274
1275	vx = self->x + (self->w - sw) / 2 - shift_x;
1276	vy = self->y + (self->h - sh) / 2 - shift_y;
1277
1278	/*
1279	int vx = self->vx = self->w >= sw
1280	? self->x + (self->w - sw) / 2
1281	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1282
1283	int vy = self->vy = self->h >= sh
1284	? self->y + (self->h - sh) / 2
1285	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1286	*/
1287		1500
1288	glColor4ub (255, 255, 255, 255);	1501	glColor4ub (255, 255, 255, 255);
1289		1502
		1503	glEnable (GL_BLEND);
1290	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1504	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1291	glEnable (GL_BLEND);
1292	glEnable (GL_TEXTURE_2D);	1505	glEnable (GL_TEXTURE_2D);
1293	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1506	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1294		1507
1295	glBegin (GL_QUADS);	1508	glBegin (GL_QUADS);
1296		1509
1297	last_name = 0;	1510	last_name = 0;
1298		1511
		1512	mx += self->x;
		1513	my += self->y;
		1514
1299	for (z = 0; z < 3; z++)	1515	for (z = 0; z < 3; z++)
1300	for (y = 0; y < sh; y++)	1516	for (y = 0; y < sh; y++)
1301	if (0 <= y + vy && y + vy < self->rows)	1517	if (0 <= y + my && y + my < self->rows)
1302	{	1518	{
1303	maprow *row = self->row + (y + vy);	1519	maprow *row = self->row + (y + my);
1304		1520
1305	for (x = 0; x < sw; x++)	1521	for (x = 0; x < sw; x++)
1306	if (row->c0 <= x + vx && x + vx < row->c1)	1522	if (row->c0 <= x + mx && x + mx < row->c1)
1307	{	1523	{
1308	mapcell *cell = row->col + (x + vx - row->c0);	1524	mapcell *cell = row->col + (x + mx - row->c0);
1309
1310	darkness[y * sw4 + x] = cell->darkness < 0
1311	? 255 - FOW_DARKNESS
1312	: 255 - cell->darkness;
1313		1525
1314	face = cell->face [z];	1526	face = cell->face [z];
1315		1527
1316	if (face)	1528	if (face && face < self->texs)
1317	{	1529	{
1318	maptex tex = self->tex [face];	1530	maptex tex = self->tex [face];
1319
1320	int px = (x + 1) * 32 - tex.w;	1531	int px = (x + 1) * 32 - tex.w;
1321	int py = (y + 1) * 32 - tex.h;	1532	int py = (y + 1) * 32 - tex.h;
1322		1533
1323	if (last_name != tex.name)	1534	if (last_name != tex.name)
1324	{	1535	{
1325	glEnd ();	1536	glEnd ();
1326	last_name = tex.name;
1327	glBindTexture (GL_TEXTURE_2D, last_name);	1537	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1328	glBegin (GL_QUADS);	1538	glBegin (GL_QUADS);
1329	}	1539	}
1330		1540
1331	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1541	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1332	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1542	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1333	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1543	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1334	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1544	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1335	}	1545	}
		1546
		1547	if (cell->flags && z == 2)
		1548	{
		1549	if (cell->flags & 1)
		1550	{
		1551	maptex tex = self->tex [1];
		1552	int px = (x + 1) * 32 - tex.w + 2;
		1553	int py = (y + 1) * 32 - tex.h - 6;
		1554
		1555	glEnd ();
		1556	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1557	glBegin (GL_QUADS);
		1558
		1559	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1560	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1561	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1562	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1563	}
		1564	}
1336	}	1565	}
1337	}	1566	}
1338		1567
1339	glEnd ();	1568	glEnd ();
1340		1569
1341	glDisable (GL_TEXTURE_2D);	1570	glDisable (GL_TEXTURE_2D);
1342	glDisable (GL_BLEND);	1571	glDisable (GL_BLEND);
		1572
		1573	// top layer: overlays such as the health bar
		1574	for (y = 0; y < sh; y++)
		1575	if (0 <= y + my && y + my < self->rows)
		1576	{
		1577	maprow *row = self->row + (y + my);
		1578
		1579	for (x = 0; x < sw; x++)
		1580	if (row->c0 <= x + mx && x + mx < row->c1)
		1581	{
		1582	mapcell *cell = row->col + (x + mx - row->c0);
		1583
		1584	int px = x * 32;
		1585	int py = y * 32;
		1586
		1587	if (cell->stat_hp)
		1588	{
		1589	int width = cell->stat_width * 32;
		1590	int thick = sh / 28 + 1 + cell->stat_width;
		1591
		1592	glColor3ub (0, 0, 0);
		1593	glRectf (px + 1, py - thick - 2,
		1594	px + width - 1, py);
		1595
		1596	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1597	glRectf (px + 2,
		1598	py - thick - 1,
		1599	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1600	}
		1601	}
		1602	}
		1603	}
		1604
		1605	void
		1606	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1607	CODE:
		1608	{
		1609	static float color[16][3] = {
		1610	{ 0.00F, 0.00F, 0.00F },
		1611	{ 1.00F, 1.00F, 1.00F },
		1612	{ 0.00F, 0.00F, 0.55F },
		1613	{ 1.00F, 0.00F, 0.00F },
		1614
		1615	{ 1.00F, 0.54F, 0.00F },
		1616	{ 0.11F, 0.56F, 1.00F },
		1617	{ 0.93F, 0.46F, 0.00F },
		1618	{ 0.18F, 0.54F, 0.34F },
		1619
		1620	{ 0.56F, 0.73F, 0.56F },
		1621	{ 0.80F, 0.80F, 0.80F },
		1622	{ 0.55F, 0.41F, 0.13F },
		1623	{ 0.99F, 0.77F, 0.26F },
		1624
		1625	{ 0.74F, 0.65F, 0.41F },
		1626
		1627	{ 0.00F, 1.00F, 1.00F },
		1628	{ 1.00F, 0.00F, 1.00F },
		1629	{ 1.00F, 1.00F, 0.00F },
		1630	};
		1631
		1632	int x, y;
		1633
		1634	glEnable (GL_TEXTURE_2D);
		1635	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1636	glEnable (GL_BLEND);
		1637	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1638	glBegin (GL_QUADS);
		1639
		1640	for (y = 0; y < h; y++)
		1641	for (x = 0; x < w; x++)
		1642	{
		1643	unsigned char m = data [x + y * w];
		1644
		1645	if (m)
		1646	{
		1647	float *c = color [m & 15];
		1648
		1649	float tx1 = m & 0x40 ? 0.5 : 0.;
		1650	float tx2 = tx1 + 0.5;
		1651
		1652	glColor4f (c[0], c[1], c[2], 0.75);
		1653	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1654	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1655	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1656	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1657	}
		1658	}
		1659
		1660	glEnd ();
		1661	glDisable (GL_BLEND);
		1662	glDisable (GL_TEXTURE_2D);
		1663	}
		1664
		1665	void
		1666	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
		1667	PPCODE:
		1668	{
		1669	int x, y;
		1670	int sw4 = (sw + 3) & ~3;
		1671	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1672	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1673
		1674	memset (darkness, 255, sw4 * sh);
		1675	SvPOK_only (darkness_sv);
		1676	SvCUR_set (darkness_sv, sw4 * sh);
		1677
		1678	mx += self->x;
		1679	my += self->y;
		1680
		1681	for (y = 0; y < sh; y++)
		1682	if (0 <= y + my && y + my < self->rows)
		1683	{
		1684	maprow *row = self->row + (y + my);
		1685
		1686	for (x = 0; x < sw; x++)
		1687	if (row->c0 <= x + mx && x + mx < row->c1)
		1688	{
		1689	mapcell *cell = row->col + (x + mx - row->c0);
		1690
		1691	darkness[y * sw4 + x] = cell->darkness
		1692	? 255 - (cell->darkness - 1)
		1693	: 255 - FOW_DARKNESS;
		1694	}
		1695	}
1343		1696
1344	EXTEND (SP, 3);	1697	EXTEND (SP, 3);
1345	PUSHs (sv_2mortal (newSViv (sw4)));	1698	PUSHs (sv_2mortal (newSViv (sw4)));
1346	PUSHs (sv_2mortal (newSViv (sh)));	1699	PUSHs (sv_2mortal (newSViv (sh)));
1347	PUSHs (darkness_sv);	1700	PUSHs (darkness_sv);
1348	}	1701	}
1349		1702
1350	SV *	1703	SV *
1351	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1704	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1352	CODE:	1705	CODE:
1353	{	1706	{
1354	int x, y, x1, y1;	1707	int x, y, x1, y1;
1355	SV data_sv = newSV (w h * 7 + 5);	1708	SV data_sv = newSV (w h * 7 + 5);
1356	uint8_t data = (uint8_t )SvPVX (data_sv);	1709	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1418	}	1771	}
1419	OUTPUT:	1772	OUTPUT:
1420	RETVAL	1773	RETVAL
1421		1774
1422	void	1775	void
1423	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1776	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1424	PPCODE:	1777	PPCODE:
1425	{	1778	{
1426	int x, y, z;	1779	int x, y, z;
1427	int w, h;	1780	int w, h;
1428	int x1, y1;	1781	int x1, y1;
…		…
1460		1813
1461	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1814	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1462	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1815	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1463	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1816	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1464		1817
1465	if (cell->darkness <= 0)	1818	if (cell->darkness == 0)
1466	{	1819	{
1467	cell->darkness = -1;	1820	cell->darkness = 0;
1468		1821
1469	for (z = 0; z <= 2; z++)	1822	for (z = 0; z <= 2; z++)
1470	{	1823	{
1471	cell->face[z] = face[z];	1824	cell->face[z] = face[z];
1472		1825
…		…
1477	}	1830	}
1478	}	1831	}
1479	}	1832	}
1480	}	1833	}
1481		1834
1482	MODULE = CFClient PACKAGE = CFClient::MixChunk	1835	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1483		1836
1484	CFClient::MixChunk	1837	CFPlus::MixChunk
1485	new_from_file (SV class, char path)	1838	new_from_file (SV class, char path)
1486	CODE:	1839	CODE:
1487	RETVAL = Mix_LoadWAV (path);	1840	RETVAL = Mix_LoadWAV (path);
1488	OUTPUT:	1841	OUTPUT:
1489	RETVAL	1842	RETVAL
1490		1843
1491	void	1844	void
1492	DESTROY (CFClient::MixChunk self)	1845	DESTROY (CFPlus::MixChunk self)
1493	CODE:	1846	CODE:
1494	Mix_FreeChunk (self);	1847	Mix_FreeChunk (self);
1495		1848
1496	int	1849	int
1497	volume (CFClient::MixChunk self, int volume = -1)	1850	volume (CFPlus::MixChunk self, int volume = -1)
1498	CODE:	1851	CODE:
1499	RETVAL = Mix_VolumeChunk (self, volume);	1852	RETVAL = Mix_VolumeChunk (self, volume);
1500	OUTPUT:	1853	OUTPUT:
1501	RETVAL	1854	RETVAL
1502		1855
1503	int	1856	int
1504	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1857	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1505	CODE:	1858	CODE:
1506	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1859	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1507	OUTPUT:	1860	OUTPUT:
1508	RETVAL	1861	RETVAL
1509		1862
1510	MODULE = CFClient PACKAGE = CFClient::MixMusic	1863	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1511		1864
1512	int	1865	int
1513	volume (int volume = -1)	1866	volume (int volume = -1)
1514	CODE:	1867	CODE:
1515	RETVAL = Mix_VolumeMusic (volume);	1868	RETVAL = Mix_VolumeMusic (volume);
1516	OUTPUT:	1869	OUTPUT:
1517	RETVAL	1870	RETVAL
1518		1871
1519	CFClient::MixMusic	1872	CFPlus::MixMusic
1520	new_from_file (SV class, char path)	1873	new_from_file (SV class, char path)
1521	CODE:	1874	CODE:
1522	RETVAL = Mix_LoadMUS (path);	1875	RETVAL = Mix_LoadMUS (path);
1523	OUTPUT:	1876	OUTPUT:
1524	RETVAL	1877	RETVAL
1525		1878
1526	void	1879	void
1527	DESTROY (CFClient::MixMusic self)	1880	DESTROY (CFPlus::MixMusic self)
1528	CODE:	1881	CODE:
1529	Mix_FreeMusic (self);	1882	Mix_FreeMusic (self);
1530		1883
1531	int	1884	int
1532	play (CFClient::MixMusic self, int loops = -1)	1885	play (CFPlus::MixMusic self, int loops = -1)
1533	CODE:	1886	CODE:
1534	RETVAL = Mix_PlayMusic (self, loops);	1887	RETVAL = Mix_PlayMusic (self, loops);
1535	OUTPUT:	1888	OUTPUT:
1536	RETVAL	1889	RETVAL
1537		1890
1538	MODULE = CFClient PACKAGE = CFClient::OpenGL	1891	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1539		1892
1540	BOOT:	1893	BOOT:
1541	{	1894	{
1542	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1895	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1543	static const struct {	1896	static const struct {
1544	const char *name;	1897	const char *name;
1545	IV iv;	1898	IV iv;
1546	} *civ, const_iv[] = {	1899	} *civ, const_iv[] = {
1547	# define const_iv(name) { # name, (IV)name }	1900	# define const_iv(name) { # name, (IV)name }
…		…
1554	const_iv (GL_SCISSOR_TEST),	1907	const_iv (GL_SCISSOR_TEST),
1555	const_iv (GL_DEPTH_TEST),	1908	const_iv (GL_DEPTH_TEST),
1556	const_iv (GL_ALPHA_TEST),	1909	const_iv (GL_ALPHA_TEST),
1557	const_iv (GL_NORMALIZE),	1910	const_iv (GL_NORMALIZE),
1558	const_iv (GL_RESCALE_NORMAL),	1911	const_iv (GL_RESCALE_NORMAL),
		1912	const_iv (GL_FRONT),
		1913	const_iv (GL_BACK),
1559	const_iv (GL_AND),	1914	const_iv (GL_AND),
1560	const_iv (GL_ONE),	1915	const_iv (GL_ONE),
1561	const_iv (GL_ZERO),	1916	const_iv (GL_ZERO),
1562	const_iv (GL_SRC_ALPHA),	1917	const_iv (GL_SRC_ALPHA),
1563	const_iv (GL_DST_ALPHA),	1918	const_iv (GL_DST_ALPHA),
1564	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1919	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1565	const_iv (GL_ONE_MINUS_DST_ALPHA),	1920	const_iv (GL_ONE_MINUS_DST_ALPHA),
1566	const_iv (GL_SRC_ALPHA_SATURATE),	1921	const_iv (GL_SRC_ALPHA_SATURATE),
1567	const_iv (GL_RGB),	1922	const_iv (GL_RGB),
1568	const_iv (GL_RGBA),	1923	const_iv (GL_RGBA),
		1924	const_iv (GL_RGBA4),
		1925	const_iv (GL_RGBA8),
		1926	const_iv (GL_RGB5_A1),
1569	const_iv (GL_UNSIGNED_BYTE),	1927	const_iv (GL_UNSIGNED_BYTE),
1570	const_iv (GL_UNSIGNED_SHORT),	1928	const_iv (GL_UNSIGNED_SHORT),
1571	const_iv (GL_UNSIGNED_INT),	1929	const_iv (GL_UNSIGNED_INT),
1572	const_iv (GL_ALPHA),	1930	const_iv (GL_ALPHA),
1573	const_iv (GL_INTENSITY),	1931	const_iv (GL_INTENSITY),
…		…
1605	const_iv (GL_SEPARABLE_2D),	1963	const_iv (GL_SEPARABLE_2D),
1606	const_iv (GL_CONVOLUTION_2D),	1964	const_iv (GL_CONVOLUTION_2D),
1607	const_iv (GL_CONVOLUTION_BORDER_MODE),	1965	const_iv (GL_CONVOLUTION_BORDER_MODE),
1608	const_iv (GL_CONSTANT_BORDER),	1966	const_iv (GL_CONSTANT_BORDER),
1609	const_iv (GL_LINES),	1967	const_iv (GL_LINES),
		1968	const_iv (GL_LINE_STRIP),
1610	const_iv (GL_LINE_LOOP),	1969	const_iv (GL_LINE_LOOP),
1611	const_iv (GL_QUADS),	1970	const_iv (GL_QUADS),
1612	const_iv (GL_QUAD_STRIP),	1971	const_iv (GL_QUAD_STRIP),
1613	const_iv (GL_TRIANGLES),	1972	const_iv (GL_TRIANGLES),
1614	const_iv (GL_TRIANGLE_STRIP),	1973	const_iv (GL_TRIANGLE_STRIP),
…		…
1647	OUTPUT:	2006	OUTPUT:
1648	RETVAL	2007	RETVAL
1649		2008
1650	int glGetError ()	2009	int glGetError ()
1651		2010
		2011	void glFinish ()
		2012
1652	void glClear (int mask)	2013	void glClear (int mask)
1653		2014
1654	void glClearColor (float r, float g, float b, float a = 1.0)	2015	void glClearColor (float r, float g, float b, float a = 1.0)
1655	PROTOTYPE: @	2016	PROTOTYPE: @
1656		2017
…		…
1679	void glPushMatrix ()	2040	void glPushMatrix ()
1680		2041
1681	void glPopMatrix ()	2042	void glPopMatrix ()
1682		2043
1683	void glLoadIdentity ()	2044	void glLoadIdentity ()
		2045
		2046	void glDrawBuffer (int buffer)
		2047
		2048	void glReadBuffer (int buffer)
1684		2049
1685	# near_ and far_ are due to microsofts buggy "c" compiler	2050	# near_ and far_ are due to microsofts buggy "c" compiler
1686	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2051	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1687		2052
1688	# near_ and far_ are due to microsofts buggy "c" compiler	2053	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1718	r *= a;	2083	r *= a;
1719	g *= a;	2084	g *= a;
1720	b *= a;	2085	b *= a;
1721	}	2086	}
1722	// microsoft visual "c" rounds instead of truncating...	2087	// microsoft visual "c" rounds instead of truncating...
1723	glColor4ub (MIN ((int)(r * 256.f), 255),	2088	glColor4f (r, g, b, a);
1724	MIN ((int)(g * 256.f), 255),
1725	MIN ((int)(b * 256.f), 255),
1726	MIN ((int)(a * 256.f), 255));
1727		2089
1728	void glInterleavedArrays (int format, int stride, char *data)	2090	void glInterleavedArrays (int format, int stride, char *data)
1729		2091
1730	void glDrawElements (int mode, int count, int type, char *indices)	2092	void glDrawElements (int mode, int count, int type, char *indices)
1731		2093
…		…
1808		2170
1809	void glEndList ()	2171	void glEndList ()
1810		2172
1811	void glCallList (int list)	2173	void glCallList (int list)
1812		2174
1813

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC vs. Revision 1.166 by root, Fri Dec 8 15:07:08 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.166 by root, Fri Dec 8 15:07:08 2006 UTC