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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.102 by root, Sat Jun 3 23:47:46 2006 UTC vs.
Revision 1.146 by root, Sat Aug 19 02:49:53 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>
5	# pragma warning(disable:4244)	6	# pragma warning(disable:4244)
6	#endif	7	#endif
7		8
8	#include "EXTERN.h"	9	#include "EXTERN.h"
9	#include "perl.h"	10	#include "perl.h"
10	#include "XSUB.h"	11	#include "XSUB.h"
11		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
12	#include <math.h>	17	#include <math.h>
13	#include <string.h>	18	#include <string.h>
14	#include <stdio.h>	19	#include <stdio.h>
		20	#include <stdlib.h>
15		21
16	#include <SDL.h>	22	#include <SDL.h>
17	#include <SDL_endian.h>	23	#include <SDL_endian.h>
18	#include <SDL_image.h>	24	#include <SDL_image.h>
19	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
21		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
22	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
23		32
24	#include <pango/pango.h>	33	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		34
29	#ifndef _WIN32	35	#ifndef _WIN32
30	# include <sys/types.h>	36	# include <sys/types.h>
31	# include <sys/socket.h>	37	# include <sys/socket.h>
32	# include <netinet/in.h>	38	# include <netinet/in.h>
39	typedef signed char int8_t;	45	typedef signed char int8_t;
40	typedef signed short int16_t;	46	typedef signed short int16_t;
41	typedef signed int int32_t;	47	typedef signed int int32_t;
42	#endif	48	#endif
43		49
44	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45		51
46	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
47		53
48	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
50		56
51	#define MIN_FONT_HEIGHT 10	57	#define MIN_FONT_HEIGHT 10
52		58
53	#define GL_CALL(type,func,args) \	59	#if 0
54	{ \	60	# define PARACHUTE SDL_INIT_NOPARACHUTE
55	static int init_; \	61	#else
56	static type fptr_; \	62	# define PARACHUTE 0
57	\	63	#endif
58	if (!init_) \
59	{ \
60	init_ = 1; \
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62	} \
63	\
64	if (fptr_) \
65	fptr_ args; \
66	}
67		64
		65	static struct
		66	{
		67	#define GL_FUNC(ptr,name) ptr name;
		68	#include "glfunc.h"
		69	#undef GL_FUNC
		70	} gl;
		71
		72	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
		73	{
		74	if (gl.BlendFuncSeparate)
		75	gl.BlendFuncSeparate (sa, da, saa, daa);
		76	else if (gl.BlendFuncSeparateEXT)
		77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
		78	else
		79	glBlendFunc (sa, da);
		80	}
		81
		82	#include "texcache.c"
		83
		84	#include "pango-font.c"
		85	#include "pango-fontmap.c"
		86	#include "pango-render.c"
		87
68	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
70		90
71	typedef PangoFontDescription *CFClient__Font;	91	typedef PangoFontDescription *CFPlus__Font;
		92
		93	static int
		94	shape_attr_p (PangoLayoutRun *run)
		95	{
		96	GSList *attrs = run->item->analysis.extra_attrs;
		97
		98	while (attrs)
		99	{
		100	PangoAttribute *attr = attrs->data;
		101
		102	if (attr->klass->type == PANGO_ATTR_SHAPE)
		103	return 1;
		104
		105	attrs = attrs->next;
		106	}
		107
		108	return 0;
		109	}
72		110
73	typedef struct cf_layout {	111	typedef struct cf_layout {
74	PangoLayout *pl; // either derived from a cairo or ft2 context	112	PangoLayout *pl;
75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
77	int base_height;	114	int base_height;
78	CFClient__Font font;	115	CFPlus__Font font;
79	} *CFClient__Layout;	116	} *CFPlus__Layout;
80		117
81	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
82	static PangoContext ft2_context, cairo_context;	119	static PangoContext *opengl_context;
83	static PangoFontMap ft2_fontmap, cairo_fontmap;	120	static PangoFontMap *opengl_fontmap;
84		121
85	static void	122	static void
86	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
87	{	124	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
89	#ifdef _WIN32	126	#ifdef FC_HINT_STYLE
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91	#else	128	#endif
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif
94	}	130	}
95		131
96	static void	132	static void
97	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
98	{	134	{
99	/* use a random scale factor to account for unknown descenders, 0.8 works	135	/* use a random scale factor to account for unknown descenders, 0.8 works
100	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
101	*/	137	*/
102	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
106		142
107	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
108	}	144	}
109		145
110	static void	146	static void
111	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
112	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
113	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
114		153
115	if (!w) w = 1;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
116	if (!h) h = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
117		156
118	w = (w + 3) & ~3;	157	if (!rect.width) rect.width = 1;
		158	if (!rect.height) rect.height = 1;
		159
		160	*w = rect.width;
		161	*h = rect.height;
119	}	162	}
120		163
121	typedef uint16_t mapface;	164	typedef uint16_t mapface;
122		165
123	typedef struct {	166	typedef struct {
…		…
126	float s, t;	169	float s, t;
127	uint8_t r, g, b, a;	170	uint8_t r, g, b, a;
128	} maptex;	171	} maptex;
129		172
130	typedef struct {	173	typedef struct {
131	int16_t darkness;	174	uint16_t darkness;
132	mapface face[3];	175	mapface face[3];
		176	uint8_t stat_hp;
133	} mapcell;	177	} mapcell;
134		178
135	typedef struct {	179	typedef struct {
136	int32_t c0, c1;	180	int32_t c0, c1;
137	mapcell *col;	181	mapcell *col;
…		…
146	int texs;	190	int texs;
147	maptex *tex;	191	maptex *tex;
148		192
149	int32_t rows;	193	int32_t rows;
150	maprow *row;	194	maprow *row;
151	} *CFClient__Map;	195	} *CFPlus__Map;
152		196
153	static char *	197	static char *
154	prepend (char *ptr, int sze, int inc)	198	prepend (char *ptr, int sze, int inc)
155	{	199	{
156	char *p;	200	char *p;
…		…
174		218
175	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	219	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
176	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	220	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
177		221
178	static maprow *	222	static maprow *
179	map_get_row (CFClient__Map self, int y)	223	map_get_row (CFPlus__Map self, int y)
180	{	224	{
181	if (0 > y)	225	if (0 > y)
182	{	226	{
183	int extend = - y + MAP_EXTEND_Y;	227	int extend = - y + MAP_EXTEND_Y;
184	Prepend (maprow, self->row, self->rows, extend);	228	Prepend (maprow, self->row, self->rows, extend);
…		…
222		266
223	return row->col + (x - row->c0);	267	return row->col + (x - row->c0);
224	}	268	}
225		269
226	static mapcell *	270	static mapcell *
227	map_get_cell (CFClient__Map self, int x, int y)	271	map_get_cell (CFPlus__Map self, int x, int y)
228	{	272	{
229	return row_get_cell (map_get_row (self, y), x);	273	return row_get_cell (map_get_row (self, y), x);
230	}	274	}
231		275
232	static void	276	static void
233	map_clear (CFClient__Map self)	277	map_clear (CFPlus__Map self)
234	{	278	{
235	int r;	279	int r;
236		280
237	for (r = 0; r < self->rows; r++)	281	for (r = 0; r < self->rows; r++)
238	Safefree (self->row[r].col);	282	Safefree (self->row[r].col);
…		…
246	self->row = 0;	290	self->row = 0;
247	self->rows = 0;	291	self->rows = 0;
248	}	292	}
249		293
250	static void	294	static void
251	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	295	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
252	{	296	{
253	int x, y;	297	int x, y;
254	maprow *row;	298	maprow *row;
		299	mapcell *cell;
255		300
256	for (y = y0; y < y0 + h; y++)	301	for (y = y0; y < y0 + h; y++)
257	if (y >= 0)	302	if (y >= 0)
258	{	303	{
259	if (y >= self->rows)	304	if (y >= self->rows)
…		…
265	if (x >= row->c0)	310	if (x >= row->c0)
266	{	311	{
267	if (x >= row->c1)	312	if (x >= row->c1)
268	break;	313	break;
269		314
270	row->col[x - row->c0].darkness = -1;	315	cell = row->col + x - row->c0;
		316
		317	cell->darkness = 0;
		318	cell->stat_hp = 0;
271	}	319	}
272	}	320	}
273	}	321	}
274		322
275	static void	323	static void
…		…
296	ev.data2 = 0;	344	ev.data2 = 0;
297		345
298	SDL_PushEvent ((SDL_Event *)&ev);	346	SDL_PushEvent ((SDL_Event *)&ev);
299	}	347	}
300		348
		349	static unsigned int
		350	minpot (unsigned int n)
		351	{
		352	if (!n)
		353	return 0;
		354
		355	--n;
		356
		357	n \|= n >> 1;
		358	n \|= n >> 2;
		359	n \|= n >> 4;
		360	n \|= n >> 8;
		361	n \|= n >> 16;
		362
		363	return n + 1;
		364	}
		365
301	MODULE = CFClient PACKAGE = CFClient	366	MODULE = CFPlus PACKAGE = CFPlus
302		367
303	PROTOTYPES: ENABLE	368	PROTOTYPES: ENABLE
304		369
305	BOOT:	370	BOOT:
306	{	371	{
307	HV *stash = gv_stashpv ("CFClient", 1);	372	HV *stash = gv_stashpv ("CFPlus", 1);
308	static const struct {	373	static const struct {
309	const char *name;	374	const char *name;
310	IV iv;	375	IV iv;
311	} *civ, const_iv[] = {	376	} *civ, const_iv[] = {
312	# define const_iv(name) { # name, (IV)name }	377	# define const_iv(name) { # name, (IV)name }
…		…
413		478
414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	479	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	480	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416	}	481	}
417		482
		483	int
		484	in_destruct ()
		485	CODE:
		486	RETVAL = PL_main_cv == Nullcv;
		487	OUTPUT:
		488	RETVAL
		489
		490	NV floor (NV x)
		491
		492	NV ceil (NV x)
		493
418	void	494	void
419	pango_init ()	495	pango_init ()
420	CODE:	496	CODE:
421	{	497	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx
423	ft2_fontmap = pango_ft2_font_map_new ();	498	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	499	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	500	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426
427	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
429	}	501	}
430		502
431	int	503	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	504	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
433		505
434	void	506	void
435	SDL_Quit ()	507	SDL_Quit ()
436		508
437	void	509	void
…		…
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	516	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	517	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	518	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		519
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	520	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	521	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450		522
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	523	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	524	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	525	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455		527
456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	528	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		529	#if SDL_VERSION_ATLEAST(1,2,10)
		530	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		531	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		532	#endif
457		533
458	SDL_EnableUNICODE (1);	534	SDL_EnableUNICODE (1);
459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	535	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460		536
461	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	537	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	555	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	556	CODE:
481	RETVAL = !!SDL_SetVideoMode (	557	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	558	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	559	);
		560	if (RETVAL)
		561	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	562	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		563	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		564	# include "glfunc.h"
		565	# undef GL_FUNC
		566	}
485	OUTPUT:	567	OUTPUT:
486	RETVAL	568	RETVAL
487		569
488	void	570	void
489	SDL_GL_SwapBuffers ()	571	SDL_GL_SwapBuffers ()
…		…
542	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	624	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
543	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	625	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
544	break;	626	break;
545	}	627	}
546		628
547	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	629	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
548	}	630	}
549	}	631	}
550		632
551	int	633	int
552	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	634	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
568	#endif	650	#endif
569		651
570	void	652	void
571	add_font (char *file)	653	add_font (char *file)
572	CODE:	654	CODE:
573	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	655	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
574	#ifdef _WIN32
575	// cairo... sigh... requires win2000
576	AddFontResourceEx (file, FR_PRIVATE, 0);
577	#endif
578		656
579	void	657	void
580	load_image_inline (SV *image_)	658	load_image_inline (SV *image_)
581	ALIAS:	659	ALIAS:
582	load_image_file = 1	660	load_image_file = 1
…		…
624		702
625	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	703	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
626		704
627	assert (surface2->pitch == surface2->w * 4);	705	assert (surface2->pitch == surface2->w * 4);
628		706
		707	SDL_LockSurface (surface2);
629	EXTEND (SP, 5);	708	EXTEND (SP, 6);
630	PUSHs (sv_2mortal (newSViv (surface2->w)));	709	PUSHs (sv_2mortal (newSViv (surface2->w)));
631	PUSHs (sv_2mortal (newSViv (surface2->h)));	710	PUSHs (sv_2mortal (newSViv (surface2->h)));
632	SDL_LockSurface (surface2);
633	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	711	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
634	SDL_UnlockSurface (surface2);
635	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	712	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
636	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	713	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
637	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	714	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		715	SDL_UnlockSurface (surface2);
638		716
639	SDL_FreeSurface (surface);	717	SDL_FreeSurface (surface);
640	SDL_FreeSurface (surface2);	718	SDL_FreeSurface (surface2);
641	}	719	}
642		720
…		…
678	CODE:	756	CODE:
679	fprintf (stderr, "FATAL: %s\n", message);	757	fprintf (stderr, "FATAL: %s\n", message);
680	#ifdef _WIN32	758	#ifdef _WIN32
681	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	759	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
682	#endif	760	#endif
683	exit (1);	761	_exit (1);
684		762
		763	void
		764	_exit (int retval)
		765	CODE:
		766	_exit (retval);
		767
685	MODULE = CFClient PACKAGE = CFClient::Font	768	MODULE = CFPlus PACKAGE = CFPlus::Font
686		769
687	CFClient::Font	770	CFPlus::Font
688	new_from_file (SV class, char path, int id = 0)	771	new_from_file (SV class, char path, int id = 0)
689	CODE:	772	CODE:
690	{	773	{
691	int count;	774	int count;
692	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	775	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
695	}	778	}
696	OUTPUT:	779	OUTPUT:
697	RETVAL	780	RETVAL
698		781
699	void	782	void
700	DESTROY (CFClient::Font self)	783	DESTROY (CFPlus::Font self)
701	CODE:	784	CODE:
702	pango_font_description_free (self);	785	pango_font_description_free (self);
703		786
704	void	787	void
705	make_default (CFClient::Font self)	788	make_default (CFPlus::Font self)
706	CODE:	789	CODE:
707	default_font = self;	790	default_font = self;
708		791
709	MODULE = CFClient PACKAGE = CFClient::Layout	792	MODULE = CFPlus PACKAGE = CFPlus::Layout
710		793
711	CFClient::Layout	794	void
712	new (SV *class, int rgba = 0)	795	reset_glyph_cache ()
713	CODE:	796	CODE:
714	#if _WIN32	797	tc_clear ();
715	//rgba = 0;//D make stext nicer, breaks TextView	798
716	#endif	799	CFPlus::Layout
		800	new (SV *class)
		801	CODE:
717	New (0, RETVAL, 1, struct cf_layout);	802	New (0, RETVAL, 1, struct cf_layout);
718		803
719	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	804	RETVAL->pl = pango_layout_new (opengl_context);
720	RETVAL->rgba = rgba;
721	RETVAL->r = 1.;	805	RETVAL->r = 1.;
722	RETVAL->g = 1.;	806	RETVAL->g = 1.;
723	RETVAL->b = 1.;	807	RETVAL->b = 1.;
724	RETVAL->a = 1.;	808	RETVAL->a = 1.;
725	RETVAL->base_height = MIN_FONT_HEIGHT;	809	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
729	layout_update_font (RETVAL);	813	layout_update_font (RETVAL);
730	OUTPUT:	814	OUTPUT:
731	RETVAL	815	RETVAL
732		816
733	void	817	void
734	DESTROY (CFClient::Layout self)	818	DESTROY (CFPlus::Layout self)
735	CODE:	819	CODE:
736	g_object_unref (self->pl);	820	g_object_unref (self->pl);
737	Safefree (self);	821	Safefree (self);
738		822
739	int
740	is_rgba (CFClient::Layout self)
741	CODE:
742	RETVAL = self->rgba;
743	OUTPUT:
744	RETVAL
745
746	void	823	void
747	set_text (CFClient::Layout self, SV *text_)	824	set_text (CFPlus::Layout self, SV *text_)
748	CODE:	825	CODE:
749	{	826	{
750	STRLEN textlen;	827	STRLEN textlen;
751	char *text = SvPVutf8 (text_, textlen);	828	char *text = SvPVutf8 (text_, textlen);
752		829
753	pango_layout_set_text (self->pl, text, textlen);	830	pango_layout_set_text (self->pl, text, textlen);
754	}	831	}
755		832
756	void	833	void
757	set_markup (CFClient::Layout self, SV *text_)	834	set_markup (CFPlus::Layout self, SV *text_)
758	CODE:	835	CODE:
759	{	836	{
760	STRLEN textlen;	837	STRLEN textlen;
761	char *text = SvPVutf8 (text_, textlen);	838	char *text = SvPVutf8 (text_, textlen);
762		839
763	pango_layout_set_markup (self->pl, text, textlen);	840	pango_layout_set_markup (self->pl, text, textlen);
764	}	841	}
765		842
		843	void
		844	set_shapes (CFPlus::Layout self, ...)
		845	CODE:
		846	{
		847	PangoAttrList *attrs = 0;
		848	const char *text = pango_layout_get_text (self->pl);
		849	const char *pos = text;
		850	int arg = 4;
		851
		852	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		853	{
		854	PangoRectangle inkrect, rect;
		855	PangoAttribute *attr;
		856
		857	int x = SvIV (ST (arg - 3));
		858	int y = SvIV (ST (arg - 2));
		859	int w = SvIV (ST (arg - 1));
		860	int h = SvIV (ST (arg ));
		861
		862	inkrect.x = 0;
		863	inkrect.y = 0;
		864	inkrect.width = 0;
		865	inkrect.height = 0;
		866
		867	rect.x = x * PANGO_SCALE;
		868	rect.y = y * PANGO_SCALE;
		869	rect.width = w * PANGO_SCALE;
		870	rect.height = h * PANGO_SCALE;
		871
		872	if (!attrs)
		873	attrs = pango_layout_get_attributes (self->pl);
		874
		875	attr = pango_attr_shape_new (&inkrect, &rect);
		876	attr->start_index = pos - text;
		877	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		878	pango_attr_list_insert (attrs, attr);
		879
		880	arg += 4;
		881	pos += sizeof (OBJ_STR) - 1;
		882	}
		883
		884	if (attrs)
		885	pango_layout_set_attributes (self->pl, attrs);
		886	}
		887
		888	void
		889	get_shapes (CFPlus::Layout self)
		890	PPCODE:
		891	{
		892	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		893
		894	do
		895	{
		896	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		897
		898	if (run && shape_attr_p (run))
		899	{
		900	PangoRectangle extents;
		901	pango_layout_iter_get_run_extents (iter, 0, &extents);
		902
		903	EXTEND (SP, 2);
		904	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		905	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		906	}
		907	}
		908	while (pango_layout_iter_next_run (iter));
		909
		910	pango_layout_iter_free (iter);
		911	}
		912
		913	int
		914	has_wrapped (CFPlus::Layout self)
		915	CODE:
		916	{
		917	int lines = 1;
		918	const char *text = pango_layout_get_text (self->pl);
		919
		920	while (*text)
		921	lines += *text++ == '\n';
		922
		923	RETVAL = lines < pango_layout_get_line_count (self->pl);
		924	}
		925	OUTPUT:
		926	RETVAL
		927
766	SV *	928	SV *
767	get_text (CFClient::Layout self)	929	get_text (CFPlus::Layout self)
768	CODE:	930	CODE:
769	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	931	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
770	SvUTF8_on (RETVAL);	932	sv_utf8_decode (RETVAL);
771	OUTPUT:	933	OUTPUT:
772	RETVAL	934	RETVAL
773		935
774	void	936	void
775	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	937	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
776	CODE:	938	CODE:
777	self->r = r;	939	self->r = r;
778	self->g = g;	940	self->g = g;
779	self->b = b;	941	self->b = b;
780	self->a = a;	942	self->a = a;
781		943
782	void	944	void
783	set_font (CFClient::Layout self, CFClient::Font font = 0)	945	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
784	CODE:	946	CODE:
785	if (self->font != font)	947	if (self->font != font)
786	{	948	{
787	self->font = font;	949	self->font = font;
788	layout_update_font (self);	950	layout_update_font (self);
789	}	951	}
790		952
791	void	953	void
792	set_height (CFClient::Layout self, int base_height)	954	set_height (CFPlus::Layout self, int base_height)
793	CODE:	955	CODE:
794	if (self->base_height != base_height)	956	if (self->base_height != base_height)
795	{	957	{
796	self->base_height = base_height;	958	self->base_height = base_height;
797	layout_update_font (self);	959	layout_update_font (self);
798	}	960	}
799		961
800	void	962	void
801	set_width (CFClient::Layout self, int max_width = -1)	963	set_width (CFPlus::Layout self, int max_width = -1)
802	CODE:	964	CODE:
803	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	965	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
804		966
805	void	967	void
806	set_indent (CFClient::Layout self, int indent)	968	set_indent (CFPlus::Layout self, int indent)
807	CODE:	969	CODE:
808	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	970	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
809		971
810	void	972	void
811	set_spacing (CFClient::Layout self, int spacing)	973	set_spacing (CFPlus::Layout self, int spacing)
812	CODE:	974	CODE:
813	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	975	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
814		976
815	void	977	void
816	set_ellipsise (CFClient::Layout self, int ellipsise)	978	set_ellipsise (CFPlus::Layout self, int ellipsise)
817	CODE:	979	CODE:
818	pango_layout_set_ellipsize (self->pl,	980	pango_layout_set_ellipsize (self->pl,
819	ellipsise == 1 ? PANGO_ELLIPSIZE_START	981	ellipsise == 1 ? PANGO_ELLIPSIZE_START
820	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	982	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
821	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	983	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
822	: PANGO_ELLIPSIZE_NONE	984	: PANGO_ELLIPSIZE_NONE
823	);	985	);
824		986
825	void	987	void
826	set_single_paragraph_mode (CFClient::Layout self, int spm)	988	set_single_paragraph_mode (CFPlus::Layout self, int spm)
827	CODE:	989	CODE:
828	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	990	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
829		991
830	void	992	void
831	size (CFClient::Layout self)	993	size (CFPlus::Layout self)
832	PPCODE:	994	PPCODE:
833	{	995	{
834	int w, h;	996	int w, h;
835		997
836	layout_get_pixel_size (self, &w, &h);	998	layout_get_pixel_size (self, &w, &h);
…		…
839	PUSHs (sv_2mortal (newSViv (w)));	1001	PUSHs (sv_2mortal (newSViv (w)));
840	PUSHs (sv_2mortal (newSViv (h)));	1002	PUSHs (sv_2mortal (newSViv (h)));
841	}	1003	}
842		1004
843	int	1005	int
		1006	descent (CFPlus::Layout self)
		1007	CODE:
		1008	{
		1009	PangoRectangle rect;
		1010	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1011	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1012	RETVAL = PANGO_DESCENT (rect);
		1013	}
		1014	OUTPUT:
		1015	RETVAL
		1016
		1017	int
844	xy_to_index (CFClient::Layout self, int x, int y)	1018	xy_to_index (CFPlus::Layout self, int x, int y)
845	CODE:	1019	CODE:
846	{	1020	{
847	int index, trailing;	1021	int index, trailing;
848	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1022	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
849	RETVAL = index;	1023	RETVAL = index;
850	}	1024	}
851	OUTPUT:	1025	OUTPUT:
852	RETVAL	1026	RETVAL
853		1027
854	void	1028	void
855	cursor_pos (CFClient::Layout self, int index)	1029	cursor_pos (CFPlus::Layout self, int index)
856	PPCODE:	1030	PPCODE:
857	{	1031	{
858	PangoRectangle strong_pos;	1032	PangoRectangle strong_pos;
859	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1033	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
860		1034
…		…
863	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1037	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
864	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1038	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
865	}	1039	}
866		1040
867	void	1041	void
868	render (CFClient::Layout self)	1042	render (CFPlus::Layout self, float x, float y, int flags = 0)
869	PPCODE:	1043	PPCODE:
870	{	1044	pango_opengl_render_layout_subpixel (
871	SV *retval;	1045	self->pl,
872	int w, h;	1046	x * PANGO_SCALE, y * PANGO_SCALE,
		1047	self->r, self->g, self->b, self->a,
		1048	flags
		1049	);
873		1050
874	layout_get_pixel_size (self, &w, &h);	1051	MODULE = CFPlus PACKAGE = CFPlus::Texture
875		1052
876	if (self->rgba)	1053	void
		1054	pad2pot (SV data_, SV w_, SV *h_)
		1055	CODE:
		1056	{
		1057	int ow = SvIV (w_);
		1058	int oh = SvIV (h_);
		1059
		1060	if (ow && oh)
877	{	1061	{
878	cairo_surface_t *surface;	1062	int nw = minpot (ow);
879	cairo_t *cairo;	1063	int nh = minpot (oh);
880		1064
881	retval = newSV (w * h * 4);	1065	if (nw != ow \|\| nh != oh)
882	SvPOK_only (retval);
883	SvCUR_set (retval, w * h * 4);
884
885	memset (SvPVX (retval), 0, w * h * 4);
886
887	surface = cairo_image_surface_create_for_data (
888	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
889	cairo = cairo_create (surface);
890	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
891
892	pango_cairo_show_layout (cairo, self->pl);
893
894	cairo_destroy (cairo);
895	cairo_surface_destroy (surface);
896
897	// what a mess, and its premultiplied, too :(
898	{	1066	{
899	uint32_t p = (uint32_t )SvPVX (retval);	1067	if (SvOK (data_))
900	uint32_t e = p + w h;
901
902	while (p < e)
903	{	1068	{
904	uint32_t rgba = *p;	1069	STRLEN datalen;
905	rgba = (rgba >> 24) \| (rgba << 8);	1070	char *data = SvPVbyte (data_, datalen);
906	#if 0	1071	int bpp = datalen / (ow * oh);
907	#ifdef _WIN32	1072	SV result_ = sv_2mortal (newSV (nw nh * bpp));
908	{//D
909	uint8_t r = rgba >> 24;
910	uint8_t g = rgba >> 16;
911	uint8_t b = rgba >> 8;
912	uint8_t a = rgba >> 0;
913		1073
914	rgba = (rgba & 0xffffff00) \| a;	1074	SvPOK_only (result_);
		1075	SvCUR_set (result_, nw * nh * bpp);
		1076
		1077	memset (SvPVX (result_), 0, nw * nh * bpp);
		1078	while (oh--)
		1079	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1080
		1081	sv_setsv (data_, result_);
915	}	1082	}
916	#endif	1083
917	#endif	1084	sv_setiv (w_, nw);
918	rgba = SDL_SwapBE32 (rgba);	1085	sv_setiv (h_, nh);
919	*p++ = rgba;
920	}	1086	}
921	}
922
923	EXTEND (SP, 5);
924	PUSHs (sv_2mortal (newSViv (w)));
925	PUSHs (sv_2mortal (newSViv (h)));
926	PUSHs (sv_2mortal (retval));
927	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
928	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
929	}	1087	}
930	else
931	{
932	FT_Bitmap bitmap;
933
934	retval = newSV (w * h);
935	SvPOK_only (retval);
936	SvCUR_set (retval, w * h);
937
938	bitmap.rows = h;
939	bitmap.width = w;
940	bitmap.pitch = w;
941	bitmap.buffer = (unsigned char*)SvPVX (retval);
942	bitmap.num_grays = 256;
943	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
944
945	memset (bitmap.buffer, 0, w * h);
946
947	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
948
949	EXTEND (SP, 5);
950	PUSHs (sv_2mortal (newSViv (w)));
951	PUSHs (sv_2mortal (newSViv (h)));
952	PUSHs (sv_2mortal (retval));
953	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
954	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
955	}
956	}	1088	}
957		1089
958	MODULE = CFClient PACKAGE = CFClient::Texture
959
960	void	1090	void
961	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1091	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
962	PROTOTYPE: $$$;$$	1092	PROTOTYPE: $$$;$$
963	ALIAS:	1093	ALIAS:
964	draw_quad_alpha = 1	1094	draw_quad_alpha = 1
965	draw_quad_alpha_premultiplied = 2	1095	draw_quad_alpha_premultiplied = 2
966	CODE:	1096	CODE:
…		…
977	}	1107	}
978		1108
979	if (ix)	1109	if (ix)
980	{	1110	{
981	glEnable (GL_BLEND);	1111	glEnable (GL_BLEND);
		1112
		1113	if (ix == 2)
982	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1114	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1115	else
		1116	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1117	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1118
983	glEnable (GL_ALPHA_TEST);	1119	glEnable (GL_ALPHA_TEST);
984	glAlphaFunc (GL_GREATER, 0.01f);	1120	glAlphaFunc (GL_GREATER, 0.01f);
985	}	1121	}
986		1122
987	glBindTexture (GL_TEXTURE_2D, name);	1123	glBindTexture (GL_TEXTURE_2D, name);
…		…
998	glDisable (GL_ALPHA_TEST);	1134	glDisable (GL_ALPHA_TEST);
999	glDisable (GL_BLEND);	1135	glDisable (GL_BLEND);
1000	}	1136	}
1001	}	1137	}
1002		1138
1003	MODULE = CFClient PACKAGE = CFClient::Map	1139	MODULE = CFPlus PACKAGE = CFPlus::Map
1004		1140
1005	CFClient::Map	1141	CFPlus::Map
1006	new (SV *class, int map_width, int map_height)	1142	new (SV *class, int map_width, int map_height)
1007	CODE:	1143	CODE:
1008	New (0, RETVAL, 1, struct map);	1144	New (0, RETVAL, 1, struct map);
1009	RETVAL->x = 0;	1145	RETVAL->x = 0;
1010	RETVAL->y = 0;	1146	RETVAL->y = 0;
…		…
1020	RETVAL->row = 0;	1156	RETVAL->row = 0;
1021	OUTPUT:	1157	OUTPUT:
1022	RETVAL	1158	RETVAL
1023		1159
1024	void	1160	void
1025	DESTROY (CFClient::Map self)	1161	DESTROY (CFPlus::Map self)
1026	CODE:	1162	CODE:
1027	{	1163	{
1028	map_clear (self);	1164	map_clear (self);
1029	Safefree (self->face);	1165	Safefree (self->face);
		1166	Safefree (self->tex);
1030	Safefree (self);	1167	Safefree (self);
1031	}	1168	}
1032		1169
1033	void	1170	void
1034	clear (CFClient::Map self)	1171	clear (CFPlus::Map self)
1035	CODE:	1172	CODE:
1036	map_clear (self);	1173	map_clear (self);
1037		1174
1038	void	1175	void
1039	set_face (CFClient::Map self, int face, int texid)	1176	set_face (CFPlus::Map self, int face, int texid)
1040	CODE:	1177	CODE:
1041	{	1178	{
1042	while (self->faces <= face)	1179	while (self->faces <= face)
1043	{	1180	{
1044	Append (mapface, self->face, self->faces, self->faces);	1181	Append (mapface, self->face, self->faces, self->faces);
…		…
1047		1184
1048	self->face [face] = texid;	1185	self->face [face] = texid;
1049	}	1186	}
1050		1187
1051	void	1188	void
1052	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)	1189	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)
1053	CODE:	1190	CODE:
1054	{	1191	{
1055	while (self->texs <= texid)	1192	while (self->texs <= texid)
1056	{	1193	{
1057	Append (maptex, self->tex, self->texs, self->texs);	1194	Append (maptex, self->tex, self->texs, self->texs);
…		…
1081	// from transparent color bleeding and ugly wrapping effects.	1218	// from transparent color bleeding and ugly wrapping effects.
1082	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1219	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1083	}	1220	}
1084		1221
1085	int	1222	int
1086	ox (CFClient::Map self)	1223	ox (CFPlus::Map self)
1087	ALIAS:	1224	ALIAS:
1088	oy = 1	1225	oy = 1
1089	x = 2	1226	x = 2
1090	y = 3	1227	y = 3
1091	w = 4	1228	w = 4
…		…
1102	}	1239	}
1103	OUTPUT:	1240	OUTPUT:
1104	RETVAL	1241	RETVAL
1105		1242
1106	void	1243	void
1107	scroll (CFClient::Map self, int dx, int dy)	1244	scroll (CFPlus::Map self, int dx, int dy)
1108	CODE:	1245	CODE:
1109	{	1246	{
1110	if (dx > 0)	1247	if (dx > 0)
1111	map_blank (self, self->x, self->y, dx - 1, self->h);	1248	map_blank (self, self->x, self->y, dx - 1, self->h);
1112	else if (dx < 0)	1249	else if (dx < 0)
…		…
1128	self->y += MAP_EXTEND_Y;	1265	self->y += MAP_EXTEND_Y;
1129	}	1266	}
1130	}	1267	}
1131		1268
1132	void	1269	void
1133	map1a_update (CFClient::Map self, SV *data_)	1270	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1134	CODE:	1271	CODE:
1135	{	1272	{
1136	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1273	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1137	uint8_t data_end = (uint8_t )SvEND (data_);	1274	uint8_t data_end = (uint8_t )SvEND (data_);
1138	mapcell *cell;	1275	mapcell *cell;
…		…
1140		1277
1141	while (data < data_end)	1278	while (data < data_end)
1142	{	1279	{
1143	flags = (data [0] << 8) + data [1]; data += 2;	1280	flags = (data [0] << 8) + data [1]; data += 2;
1144		1281
1145	x = ((flags >> 10) & 63) + self->x;	1282	x = self->x + ((flags >> 10) & 63);
1146	y = ((flags >> 4) & 63) + self->y;	1283	y = self->y + ((flags >> 4) & 63);
1147		1284
1148	cell = map_get_cell (self, x, y);	1285	cell = map_get_cell (self, x, y);
1149		1286
1150	if (flags & 15)	1287	if (flags & 15)
1151	{	1288	{
1152	if (cell->darkness < 0)	1289	if (!cell->darkness)
1153	{	1290	{
1154	cell->darkness = 0;	1291	cell->darkness = 256;
1155	cell->face [0] = 0;	1292	cell->face [0] = 0;
1156	cell->face [1] = 0;	1293	cell->face [1] = 0;
1157	cell->face [2] = 0;	1294	cell->face [2] = 0;
1158	}	1295	}
1159		1296
1160	cell->darkness = flags & 8 ? *data++ : 255;
1161
1162	//TODO: don't trust server data to be in-range(!)	1297	//TODO: don't trust server data to be in-range(!)
		1298
		1299	if (flags & 8)
		1300	{
		1301	if (extmap)
		1302	{
		1303	uint8_t ext, cmd;
		1304
		1305	do
		1306	{
		1307	ext = *data++;
		1308	cmd = ext & 0x3f;
		1309
		1310	if (ext < 4)
		1311	cell->darkness = 255 - ext * 64 + 1;
		1312	else if (ext == 5) // health
		1313	cell->stat_hp = *data++;
		1314	else if (ext & 0x40) // unknown, multibyte => skip
		1315	data += *data + 1;
		1316	}
		1317	while (cmd & 0x80);
		1318	}
		1319	else
		1320	cell->darkness = *data++ + 1;
		1321	}
1163		1322
1164	if (flags & 4)	1323	if (flags & 4)
1165	{	1324	{
1166	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1325	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1167	}	1326	}
…		…
1175	{	1334	{
1176	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1335	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1177	}	1336	}
1178	}	1337	}
1179	else	1338	else
		1339	{
1180	cell->darkness = -1;	1340	cell->darkness = 0;
		1341	cell->stat_hp = 0;
		1342	}
1181	}	1343	}
1182	}	1344	}
1183		1345
1184	SV *	1346	SV *
1185	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1347	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1186	CODE:	1348	CODE:
1187	{	1349	{
1188	int x1, x;	1350	int x1, x;
1189	int y1, y;	1351	int y1, y;
1190	int z;	1352	int z;
…		…
1240	}	1402	}
1241	OUTPUT:	1403	OUTPUT:
1242	RETVAL	1404	RETVAL
1243		1405
1244	void	1406	void
1245	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1407	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1246	PPCODE:	1408	CODE:
1247	{	1409	{
1248	int vx, vy;	1410	int vx, vy;
1249	int x, y, z;	1411	int x, y, z;
1250	int last_name;	1412	int last_name;
1251	mapface face;	1413	mapface face;
1252	int sw4 = (sw + 3) & ~3;
1253	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1254	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1255		1414
1256	memset (darkness, 255, sw4 * sh);
1257	SvPOK_only (darkness_sv);
1258	SvCUR_set (darkness_sv, sw4 * sh);
1259
1260	vx = self->x + (self->w - sw) / 2 - shift_x;	1415	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1261	vy = self->y + (self->h - sh) / 2 - shift_y;	1416	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1262		1417
1263	/*	1418	/*
1264	int vx = self->vx = self->w >= sw	1419	int vx = self->vx = self->w >= sw
1265	? self->x + (self->w - sw) / 2	1420	? self->x + (self->w - sw) / 2
1266	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1421	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1270	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1425	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1271	*/	1426	*/
1272		1427
1273	glColor4ub (255, 255, 255, 255);	1428	glColor4ub (255, 255, 255, 255);
1274		1429
		1430	glEnable (GL_BLEND);
1275	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1431	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1276	glEnable (GL_BLEND);
1277	glEnable (GL_TEXTURE_2D);	1432	glEnable (GL_TEXTURE_2D);
1278	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1433	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1279		1434
1280	glBegin (GL_QUADS);	1435	glBegin (GL_QUADS);
1281		1436
…		…
1290	for (x = 0; x < sw; x++)	1445	for (x = 0; x < sw; x++)
1291	if (row->c0 <= x + vx && x + vx < row->c1)	1446	if (row->c0 <= x + vx && x + vx < row->c1)
1292	{	1447	{
1293	mapcell *cell = row->col + (x + vx - row->c0);	1448	mapcell *cell = row->col + (x + vx - row->c0);
1294		1449
1295	darkness[y * sw4 + x] = cell->darkness < 0
1296	? 255 - FOW_DARKNESS
1297	: 255 - cell->darkness;
1298
1299	face = cell->face [z];	1450	face = cell->face [z];
1300		1451
1301	if (face)	1452	if (face && face < self->texs)
1302	{	1453	{
1303	maptex tex = self->tex [face];	1454	maptex tex = self->tex [face];
1304		1455
1305	int px = (x + 1) * 32 - tex.w;	1456	int px = (x + 1) * 32 - tex.w;
1306	int py = (y + 1) * 32 - tex.h;	1457	int py = (y + 1) * 32 - tex.h;
…		…
1324	glEnd ();	1475	glEnd ();
1325		1476
1326	glDisable (GL_TEXTURE_2D);	1477	glDisable (GL_TEXTURE_2D);
1327	glDisable (GL_BLEND);	1478	glDisable (GL_BLEND);
1328		1479
		1480	// top layer: overlays such as the health bar
		1481	for (y = 0; y < sh; y++)
		1482	if (0 <= y + vy && y + vy < self->rows)
		1483	{
		1484	maprow *row = self->row + (y + vy);
		1485
		1486	for (x = 0; x < sw; x++)
		1487	if (row->c0 <= x + vx && x + vx < row->c1)
		1488	{
		1489	mapcell *cell = row->col + (x + vx - row->c0);
		1490
		1491	int px = x * 32;
		1492	int py = y * 32;
		1493
		1494	if (cell->stat_hp)
		1495	{
		1496	int width = sh / 28 + 1;
		1497
		1498	glColor3ub (0, 0, 0);
		1499	glRectf (px + 1, py, px + 31, py + width + 2);
		1500
		1501	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1502	glRectf (px + 2, py + 1, px + 30 - cell->stat_hp * 28 / 255, py + width + 1);
		1503	}
		1504	}
		1505	}
		1506	}
		1507
		1508	void
		1509	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1510	CODE:
		1511	{
		1512	static float color[16][3] = {
		1513	{ 0.00F, 0.00F, 0.00F },
		1514	{ 1.00F, 1.00F, 1.00F },
		1515	{ 0.00F, 0.00F, 0.55F },
		1516	{ 1.00F, 0.00F, 0.00F },
		1517
		1518	{ 1.00F, 0.54F, 0.00F },
		1519	{ 0.11F, 0.56F, 1.00F },
		1520	{ 0.93F, 0.46F, 0.00F },
		1521	{ 0.18F, 0.54F, 0.34F },
		1522
		1523	{ 0.56F, 0.73F, 0.56F },
		1524	{ 0.80F, 0.80F, 0.80F },
		1525	{ 0.55F, 0.41F, 0.13F },
		1526	{ 0.99F, 0.77F, 0.26F },
		1527
		1528	{ 0.74F, 0.65F, 0.41F },
		1529
		1530	{ 0.00F, 1.00F, 1.00F },
		1531	{ 1.00F, 0.00F, 1.00F },
		1532	{ 1.00F, 1.00F, 0.00F },
		1533	};
		1534
		1535	int x, y;
		1536
		1537	glEnable (GL_TEXTURE_2D);
		1538	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1539	glEnable (GL_BLEND);
		1540	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1541	glBegin (GL_QUADS);
		1542
		1543	for (y = 0; y < h; y++)
		1544	for (x = 0; x < w; x++)
		1545	{
		1546	unsigned char m = data [x + y * w];
		1547
		1548	if (m)
		1549	{
		1550	float *c = color [m & 15];
		1551
		1552	float tx1 = m & 0x40 ? 0.5 : 0.;
		1553	float tx2 = tx1 + 0.5;
		1554
		1555	glColor4f (c[0], c[1], c[2], 0.75);
		1556	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1557	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1558	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1559	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1560	}
		1561	}
		1562
		1563	glEnd ();
		1564	glDisable (GL_BLEND);
		1565	glDisable (GL_TEXTURE_2D);
		1566	}
		1567
		1568	void
		1569	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1570	PPCODE:
		1571	{
		1572	int vx, vy;
		1573	int x, y;
		1574	int sw4 = (sw + 3) & ~3;
		1575	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1576	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1577
		1578	memset (darkness, 255, sw4 * sh);
		1579	SvPOK_only (darkness_sv);
		1580	SvCUR_set (darkness_sv, sw4 * sh);
		1581
		1582	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1583	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1584
		1585	for (y = 0; y < sh; y++)
		1586	if (0 <= y + vy && y + vy < self->rows)
		1587	{
		1588	maprow *row = self->row + (y + vy);
		1589
		1590	for (x = 0; x < sw; x++)
		1591	if (row->c0 <= x + vx && x + vx < row->c1)
		1592	{
		1593	mapcell *cell = row->col + (x + vx - row->c0);
		1594
		1595	darkness[y * sw4 + x] = cell->darkness
		1596	? 255 - (cell->darkness - 1)
		1597	: 255 - FOW_DARKNESS;
		1598	}
		1599	}
		1600
1329	EXTEND (SP, 3);	1601	EXTEND (SP, 3);
1330	PUSHs (sv_2mortal (newSViv (sw4)));	1602	PUSHs (sv_2mortal (newSViv (sw4)));
1331	PUSHs (sv_2mortal (newSViv (sh)));	1603	PUSHs (sv_2mortal (newSViv (sh)));
1332	PUSHs (darkness_sv);	1604	PUSHs (darkness_sv);
1333	}	1605	}
1334		1606
1335	SV *	1607	SV *
1336	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1608	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1337	CODE:	1609	CODE:
1338	{	1610	{
1339	int x, y, x1, y1;	1611	int x, y, x1, y1;
1340	SV data_sv = newSV (w h * 7 + 5);	1612	SV data_sv = newSV (w h * 7 + 5);
1341	uint8_t data = (uint8_t )SvPVX (data_sv);	1613	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1403	}	1675	}
1404	OUTPUT:	1676	OUTPUT:
1405	RETVAL	1677	RETVAL
1406		1678
1407	void	1679	void
1408	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1680	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1409	PPCODE:	1681	PPCODE:
1410	{	1682	{
1411	int x, y, z;	1683	int x, y, z;
1412	int w, h;	1684	int w, h;
1413	int x1, y1;	1685	int x1, y1;
…		…
1445		1717
1446	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1718	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1447	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1719	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1448	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1720	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1449		1721
1450	if (cell->darkness <= 0)	1722	if (cell->darkness == 0)
1451	{	1723	{
1452	cell->darkness = -1;	1724	cell->darkness = 0;
1453		1725
1454	for (z = 0; z <= 2; z++)	1726	for (z = 0; z <= 2; z++)
1455	{	1727	{
1456	cell->face[z] = face[z];	1728	cell->face[z] = face[z];
1457		1729
…		…
1462	}	1734	}
1463	}	1735	}
1464	}	1736	}
1465	}	1737	}
1466		1738
1467	MODULE = CFClient PACKAGE = CFClient::MixChunk	1739	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1468		1740
1469	CFClient::MixChunk	1741	CFPlus::MixChunk
1470	new_from_file (SV class, char path)	1742	new_from_file (SV class, char path)
1471	CODE:	1743	CODE:
1472	RETVAL = Mix_LoadWAV (path);	1744	RETVAL = Mix_LoadWAV (path);
1473	OUTPUT:	1745	OUTPUT:
1474	RETVAL	1746	RETVAL
1475		1747
1476	void	1748	void
1477	DESTROY (CFClient::MixChunk self)	1749	DESTROY (CFPlus::MixChunk self)
1478	CODE:	1750	CODE:
1479	Mix_FreeChunk (self);	1751	Mix_FreeChunk (self);
1480		1752
1481	int	1753	int
1482	volume (CFClient::MixChunk self, int volume = -1)	1754	volume (CFPlus::MixChunk self, int volume = -1)
1483	CODE:	1755	CODE:
1484	RETVAL = Mix_VolumeChunk (self, volume);	1756	RETVAL = Mix_VolumeChunk (self, volume);
1485	OUTPUT:	1757	OUTPUT:
1486	RETVAL	1758	RETVAL
1487		1759
1488	int	1760	int
1489	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1761	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1490	CODE:	1762	CODE:
1491	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1763	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1492	OUTPUT:	1764	OUTPUT:
1493	RETVAL	1765	RETVAL
1494		1766
1495	MODULE = CFClient PACKAGE = CFClient::MixMusic	1767	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1496		1768
1497	int	1769	int
1498	volume (int volume = -1)	1770	volume (int volume = -1)
1499	CODE:	1771	CODE:
1500	RETVAL = Mix_VolumeMusic (volume);	1772	RETVAL = Mix_VolumeMusic (volume);
1501	OUTPUT:	1773	OUTPUT:
1502	RETVAL	1774	RETVAL
1503		1775
1504	CFClient::MixMusic	1776	CFPlus::MixMusic
1505	new_from_file (SV class, char path)	1777	new_from_file (SV class, char path)
1506	CODE:	1778	CODE:
1507	RETVAL = Mix_LoadMUS (path);	1779	RETVAL = Mix_LoadMUS (path);
1508	OUTPUT:	1780	OUTPUT:
1509	RETVAL	1781	RETVAL
1510		1782
1511	void	1783	void
1512	DESTROY (CFClient::MixMusic self)	1784	DESTROY (CFPlus::MixMusic self)
1513	CODE:	1785	CODE:
1514	Mix_FreeMusic (self);	1786	Mix_FreeMusic (self);
1515		1787
1516	int	1788	int
1517	play (CFClient::MixMusic self, int loops = -1)	1789	play (CFPlus::MixMusic self, int loops = -1)
1518	CODE:	1790	CODE:
1519	RETVAL = Mix_PlayMusic (self, loops);	1791	RETVAL = Mix_PlayMusic (self, loops);
1520	OUTPUT:	1792	OUTPUT:
1521	RETVAL	1793	RETVAL
1522		1794
1523	MODULE = CFClient PACKAGE = CFClient::OpenGL	1795	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1524		1796
1525	BOOT:	1797	BOOT:
1526	{	1798	{
1527	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1799	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1528	static const struct {	1800	static const struct {
1529	const char *name;	1801	const char *name;
1530	IV iv;	1802	IV iv;
1531	} *civ, const_iv[] = {	1803	} *civ, const_iv[] = {
1532	# define const_iv(name) { # name, (IV)name }	1804	# define const_iv(name) { # name, (IV)name }
…		…
1539	const_iv (GL_SCISSOR_TEST),	1811	const_iv (GL_SCISSOR_TEST),
1540	const_iv (GL_DEPTH_TEST),	1812	const_iv (GL_DEPTH_TEST),
1541	const_iv (GL_ALPHA_TEST),	1813	const_iv (GL_ALPHA_TEST),
1542	const_iv (GL_NORMALIZE),	1814	const_iv (GL_NORMALIZE),
1543	const_iv (GL_RESCALE_NORMAL),	1815	const_iv (GL_RESCALE_NORMAL),
		1816	const_iv (GL_FRONT),
		1817	const_iv (GL_BACK),
1544	const_iv (GL_AND),	1818	const_iv (GL_AND),
1545	const_iv (GL_ONE),	1819	const_iv (GL_ONE),
1546	const_iv (GL_ZERO),	1820	const_iv (GL_ZERO),
1547	const_iv (GL_SRC_ALPHA),	1821	const_iv (GL_SRC_ALPHA),
1548	const_iv (GL_SRC_ALPHA_SATURATE),	1822	const_iv (GL_DST_ALPHA),
1549	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1823	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1550	const_iv (GL_ONE_MINUS_DST_ALPHA),	1824	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1825	const_iv (GL_SRC_ALPHA_SATURATE),
1551	const_iv (GL_RGB),	1826	const_iv (GL_RGB),
1552	const_iv (GL_RGBA),	1827	const_iv (GL_RGBA),
		1828	const_iv (GL_RGBA4),
		1829	const_iv (GL_RGBA8),
		1830	const_iv (GL_RGB5_A1),
1553	const_iv (GL_UNSIGNED_BYTE),	1831	const_iv (GL_UNSIGNED_BYTE),
1554	const_iv (GL_UNSIGNED_SHORT),	1832	const_iv (GL_UNSIGNED_SHORT),
1555	const_iv (GL_UNSIGNED_INT),	1833	const_iv (GL_UNSIGNED_INT),
1556	const_iv (GL_ALPHA),	1834	const_iv (GL_ALPHA),
1557	const_iv (GL_INTENSITY),	1835	const_iv (GL_INTENSITY),
…		…
1589	const_iv (GL_SEPARABLE_2D),	1867	const_iv (GL_SEPARABLE_2D),
1590	const_iv (GL_CONVOLUTION_2D),	1868	const_iv (GL_CONVOLUTION_2D),
1591	const_iv (GL_CONVOLUTION_BORDER_MODE),	1869	const_iv (GL_CONVOLUTION_BORDER_MODE),
1592	const_iv (GL_CONSTANT_BORDER),	1870	const_iv (GL_CONSTANT_BORDER),
1593	const_iv (GL_LINES),	1871	const_iv (GL_LINES),
		1872	const_iv (GL_LINE_STRIP),
1594	const_iv (GL_LINE_LOOP),	1873	const_iv (GL_LINE_LOOP),
1595	const_iv (GL_QUADS),	1874	const_iv (GL_QUADS),
1596	const_iv (GL_QUAD_STRIP),	1875	const_iv (GL_QUAD_STRIP),
1597	const_iv (GL_TRIANGLES),	1876	const_iv (GL_TRIANGLES),
1598	const_iv (GL_TRIANGLE_STRIP),	1877	const_iv (GL_TRIANGLE_STRIP),
…		…
1631	OUTPUT:	1910	OUTPUT:
1632	RETVAL	1911	RETVAL
1633		1912
1634	int glGetError ()	1913	int glGetError ()
1635		1914
		1915	void glFinish ()
		1916
1636	void glClear (int mask)	1917	void glClear (int mask)
1637		1918
1638	void glClearColor (float r, float g, float b, float a = 1.0)	1919	void glClearColor (float r, float g, float b, float a = 1.0)
1639	PROTOTYPE: @	1920	PROTOTYPE: @
1640		1921
…		…
1646		1927
1647	void glHint (int target, int mode)	1928	void glHint (int target, int mode)
1648		1929
1649	void glBlendFunc (int sfactor, int dfactor)	1930	void glBlendFunc (int sfactor, int dfactor)
1650		1931
		1932	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1933	CODE:
		1934	gl_BlendFuncSeparate (sa, da, saa, daa);
		1935
1651	void glDepthMask (int flag)	1936	void glDepthMask (int flag)
1652		1937
1653	void glLogicOp (int opcode)	1938	void glLogicOp (int opcode)
1654		1939
1655	void glColorMask (int red, int green, int blue, int alpha)	1940	void glColorMask (int red, int green, int blue, int alpha)
…		…
1659	void glPushMatrix ()	1944	void glPushMatrix ()
1660		1945
1661	void glPopMatrix ()	1946	void glPopMatrix ()
1662		1947
1663	void glLoadIdentity ()	1948	void glLoadIdentity ()
		1949
		1950	void glDrawBuffer (int buffer)
		1951
		1952	void glReadBuffer (int buffer)
1664		1953
1665	# near_ and far_ are due to microsofts buggy "c" compiler	1954	# near_ and far_ are due to microsofts buggy "c" compiler
1666	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1955	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1667		1956
1668	# near_ and far_ are due to microsofts buggy "c" compiler	1957	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1688		1977
1689	void glEnd ()	1978	void glEnd ()
1690		1979
1691	void glColor (float r, float g, float b, float a = 1.0)	1980	void glColor (float r, float g, float b, float a = 1.0)
1692	PROTOTYPE: @	1981	PROTOTYPE: @
		1982	ALIAS:
		1983	glColor_premultiply = 1
1693	CODE:	1984	CODE:
		1985	if (ix)
		1986	{
		1987	r *= a;
		1988	g *= a;
		1989	b *= a;
		1990	}
1694	// microsoft visual "c" rounds instead of truncating...	1991	// microsoft visual "c" rounds instead of truncating...
1695	glColor4ub (MIN ((int)(r * 256.f), 255),	1992	glColor4f (r, g, b, a);
1696	MIN ((int)(g * 256.f), 255),
1697	MIN ((int)(b * 256.f), 255),
1698	MIN ((int)(a * 256.f), 255));
1699		1993
1700	void glInterleavedArrays (int format, int stride, char *data)	1994	void glInterleavedArrays (int format, int stride, char *data)
1701		1995
1702	void glDrawElements (int mode, int count, int type, char *indices)	1996	void glDrawElements (int mode, int count, int type, char *indices)
1703		1997
…		…
1726		2020
1727	void glBindTexture (int target, int name)	2021	void glBindTexture (int target, int name)
1728		2022
1729	void glConvolutionParameter (int target, int pname, float params)	2023	void glConvolutionParameter (int target, int pname, float params)
1730	CODE:	2024	CODE:
1731	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2025	if (gl.ConvolutionParameterf)
		2026	gl.ConvolutionParameterf (target, pname, params);
1732		2027
1733	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2028	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1734	CODE:	2029	CODE:
1735	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2030	if (gl.ConvolutionFilter2D)
1736	(target, internalformat, width, height, format, type, data));	2031	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1737		2032
1738	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2033	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1739	CODE:	2034	CODE:
1740	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2035	if (gl.SeparableFilter2D)
1741	(target, internalformat, width, height, format, type, row, column));	2036	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1742		2037
1743	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2038	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1744		2039
1745	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2040	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1746		2041
…		…
1779		2074
1780	void glEndList ()	2075	void glEndList ()
1781		2076
1782	void glCallList (int list)	2077	void glCallList (int list)
1783		2078
1784

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.102 by root, Sat Jun 3 23:47:46 2006 UTC vs. Revision 1.146 by root, Sat Aug 19 02:49:53 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.102 by root, Sat Jun 3 23:47:46 2006 UTC vs.
Revision 1.146 by root, Sat Aug 19 02:49:53 2006 UTC