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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.106 by root, Mon Jun 5 03:48:49 2006 UTC vs.
Revision 1.153 by root, Tue Sep 19 22:02:38 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
		58
		59	#if 0
		60	# define PARACHUTE SDL_INIT_NOPARACHUTE
		61	#else
		62	# define PARACHUTE 0
		63	#endif
52		64
53	static struct	65	static struct
54	{	66	{
55	#define GL_FUNC(ptr,name) ptr name;	67	#define GL_FUNC(ptr,name) ptr name;
56	#include "glfunc.h"	68	#include "glfunc.h"
…		…
65	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	else	78	else
67	glBlendFunc (sa, da);	79	glBlendFunc (sa, da);
68	}	80	}
69		81
		82	#include "texcache.c"
		83
		84	#include "pango-font.c"
		85	#include "pango-fontmap.c"
		86	#include "pango-render.c"
		87
70	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
71	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
72		90
73	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	}
74		110
75	typedef struct cf_layout {	111	typedef struct cf_layout {
76	PangoLayout *pl; // either derived from a cairo or ft2 context	112	PangoLayout *pl;
77	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
79	int base_height;	114	int base_height;
80	CFClient__Font font;	115	CFPlus__Font font;
81	} *CFClient__Layout;	116	} *CFPlus__Layout;
82		117
83	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
84	static PangoContext ft2_context, cairo_context;	119	static PangoContext *opengl_context;
85	static PangoFontMap ft2_fontmap, cairo_fontmap;	120	static PangoFontMap *opengl_fontmap;
86		121
87	static void	122	static void
88	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
89	{	124	{
90	FcPatternAddBool (pattern, FC_HINTING , 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
91	#ifdef _WIN32	126	#ifdef FC_HINT_STYLE
92	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
93	#else	128	#endif
94	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
95	#endif
96	}	130	}
97		131
98	static void	132	static void
99	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
100	{	134	{
101	/* 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
102	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
103	*/	137	*/
104	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
108		142
109	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
110	}	144	}
111		145
112	static void	146	static void
113	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
114	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
115	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
116		153
117	if (!w) w = 1;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
118	if (!h) h = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
119		156
120	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;
121	}	162	}
122		163
123	typedef uint16_t mapface;	164	typedef uint16_t mapface;
124		165
125	typedef struct {	166	typedef struct {
…		…
128	float s, t;	169	float s, t;
129	uint8_t r, g, b, a;	170	uint8_t r, g, b, a;
130	} maptex;	171	} maptex;
131		172
132	typedef struct {	173	typedef struct {
133	int16_t darkness;	174	uint32_t player;
134	mapface face[3];	175	mapface face[3];
		176	uint16_t darkness;
		177	uint8_t stat_width, stat_hp, flags;
135	} mapcell;	178	} mapcell;
136		179
137	typedef struct {	180	typedef struct {
138	int32_t c0, c1;	181	int32_t c0, c1;
139	mapcell *col;	182	mapcell *col;
…		…
148	int texs;	191	int texs;
149	maptex *tex;	192	maptex *tex;
150		193
151	int32_t rows;	194	int32_t rows;
152	maprow *row;	195	maprow *row;
153	} *CFClient__Map;	196	} *CFPlus__Map;
154		197
155	static char *	198	static char *
156	prepend (char *ptr, int sze, int inc)	199	prepend (char *ptr, int sze, int inc)
157	{	200	{
158	char *p;	201	char *p;
…		…
176		219
177	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	220	#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))	221	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
179		222
180	static maprow *	223	static maprow *
181	map_get_row (CFClient__Map self, int y)	224	map_get_row (CFPlus__Map self, int y)
182	{	225	{
183	if (0 > y)	226	if (0 > y)
184	{	227	{
185	int extend = - y + MAP_EXTEND_Y;	228	int extend = - y + MAP_EXTEND_Y;
186	Prepend (maprow, self->row, self->rows, extend);	229	Prepend (maprow, self->row, self->rows, extend);
…		…
224		267
225	return row->col + (x - row->c0);	268	return row->col + (x - row->c0);
226	}	269	}
227		270
228	static mapcell *	271	static mapcell *
229	map_get_cell (CFClient__Map self, int x, int y)	272	map_get_cell (CFPlus__Map self, int x, int y)
230	{	273	{
231	return row_get_cell (map_get_row (self, y), x);	274	return row_get_cell (map_get_row (self, y), x);
232	}	275	}
233		276
234	static void	277	static void
235	map_clear (CFClient__Map self)	278	map_clear (CFPlus__Map self)
236	{	279	{
237	int r;	280	int r;
238		281
239	for (r = 0; r < self->rows; r++)	282	for (r = 0; r < self->rows; r++)
240	Safefree (self->row[r].col);	283	Safefree (self->row[r].col);
…		…
248	self->row = 0;	291	self->row = 0;
249	self->rows = 0;	292	self->rows = 0;
250	}	293	}
251		294
252	static void	295	static void
253	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	296	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
254	{	297	{
255	int x, y;	298	int x, y;
256	maprow *row;	299	maprow *row;
		300	mapcell *cell;
257		301
258	for (y = y0; y < y0 + h; y++)	302	for (y = y0; y < y0 + h; y++)
259	if (y >= 0)	303	if (y >= 0)
260	{	304	{
261	if (y >= self->rows)	305	if (y >= self->rows)
…		…
267	if (x >= row->c0)	311	if (x >= row->c0)
268	{	312	{
269	if (x >= row->c1)	313	if (x >= row->c1)
270	break;	314	break;
271		315
272	row->col[x - row->c0].darkness = -1;	316	cell = row->col + x - row->c0;
		317
		318	cell->darkness = 0;
		319	cell->stat_hp = 0;
273	}	320	}
274	}	321	}
275	}	322	}
276		323
277	static void	324	static void
…		…
298	ev.data2 = 0;	345	ev.data2 = 0;
299		346
300	SDL_PushEvent ((SDL_Event *)&ev);	347	SDL_PushEvent ((SDL_Event *)&ev);
301	}	348	}
302		349
		350	static unsigned int
		351	minpot (unsigned int n)
		352	{
		353	if (!n)
		354	return 0;
		355
		356	--n;
		357
		358	n \|= n >> 1;
		359	n \|= n >> 2;
		360	n \|= n >> 4;
		361	n \|= n >> 8;
		362	n \|= n >> 16;
		363
		364	return n + 1;
		365	}
		366
303	MODULE = CFClient PACKAGE = CFClient	367	MODULE = CFPlus PACKAGE = CFPlus
304		368
305	PROTOTYPES: ENABLE	369	PROTOTYPES: ENABLE
306		370
307	BOOT:	371	BOOT:
308	{	372	{
309	HV *stash = gv_stashpv ("CFClient", 1);	373	HV *stash = gv_stashpv ("CFPlus", 1);
310	static const struct {	374	static const struct {
311	const char *name;	375	const char *name;
312	IV iv;	376	IV iv;
313	} *civ, const_iv[] = {	377	} *civ, const_iv[] = {
314	# define const_iv(name) { # name, (IV)name }	378	# define const_iv(name) { # name, (IV)name }
…		…
415		479
416	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	480	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
417	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	481	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
418	}	482	}
419		483
		484	int
		485	in_destruct ()
		486	CODE:
		487	RETVAL = PL_main_cv == Nullcv;
		488	OUTPUT:
		489	RETVAL
		490
		491	NV floor (NV x)
		492
		493	NV ceil (NV x)
		494
420	void	495	void
421	pango_init ()	496	pango_init ()
422	CODE:	497	CODE:
423	// delayed, so it can pick up new fonts added by AddFontResourceEx
424	{	498	{
425	{
426	ft2_fontmap = pango_ft2_font_map_new ();	499	opengl_fontmap = pango_opengl_font_map_new ();
427	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	500	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
428	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	501	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
429	}
430	{
431	cairo_font_options_t *fopt = cairo_font_options_create ();
432	cairo_fontmap = pango_cairo_font_map_get_default ();
433	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
434	#ifdef _WIN32
435	// cairo looks like shit eaten twice on windows
436	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
437	#else
438	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
439	#endif
440	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
441	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
442	pango_cairo_context_set_font_options (cairo_context, fopt);
443	cairo_font_options_destroy (fopt);
444	}
445	}	502	}
446		503
447	int	504	int
448	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	505	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
449		506
450	void	507	void
451	SDL_Quit ()	508	SDL_Quit ()
452		509
453	void	510	void
…		…
460	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	517	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
461	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	518	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
462	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	519	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
463		520
464	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	521	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
465	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	522	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
466		523
467	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	524	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
468	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	525	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
469	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
470	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
471		528
472	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	529	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		530	#if SDL_VERSION_ATLEAST(1,2,10)
		531	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		532	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		533	#endif
473		534
474	SDL_EnableUNICODE (1);	535	SDL_EnableUNICODE (1);
475	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	536	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
476		537
477	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	538	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
564	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	625	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
565	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	626	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
566	break;	627	break;
567	}	628	}
568		629
569	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	630	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
570	}	631	}
571	}	632	}
572		633
573	int	634	int
574	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	635	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
590	#endif	651	#endif
591		652
592	void	653	void
593	add_font (char *file)	654	add_font (char *file)
594	CODE:	655	CODE:
595	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	656	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
596	#ifdef _WIN32
597	// cairo... sigh... requires win2000
598	AddFontResourceEx (file, FR_PRIVATE, 0);
599	#endif
600		657
601	void	658	void
602	load_image_inline (SV *image_)	659	load_image_inline (SV *image_)
603	ALIAS:	660	ALIAS:
604	load_image_file = 1	661	load_image_file = 1
…		…
646		703
647	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	704	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
648		705
649	assert (surface2->pitch == surface2->w * 4);	706	assert (surface2->pitch == surface2->w * 4);
650		707
		708	SDL_LockSurface (surface2);
651	EXTEND (SP, 5);	709	EXTEND (SP, 6);
652	PUSHs (sv_2mortal (newSViv (surface2->w)));	710	PUSHs (sv_2mortal (newSViv (surface2->w)));
653	PUSHs (sv_2mortal (newSViv (surface2->h)));	711	PUSHs (sv_2mortal (newSViv (surface2->h)));
654	SDL_LockSurface (surface2);
655	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	712	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
656	SDL_UnlockSurface (surface2);
657	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	713	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
658	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	714	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
659	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	715	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		716	SDL_UnlockSurface (surface2);
660		717
661	SDL_FreeSurface (surface);	718	SDL_FreeSurface (surface);
662	SDL_FreeSurface (surface2);	719	SDL_FreeSurface (surface2);
663	}	720	}
664		721
…		…
700	CODE:	757	CODE:
701	fprintf (stderr, "FATAL: %s\n", message);	758	fprintf (stderr, "FATAL: %s\n", message);
702	#ifdef _WIN32	759	#ifdef _WIN32
703	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	760	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
704	#endif	761	#endif
705	exit (1);	762	_exit (1);
706		763
		764	void
		765	_exit (int retval)
		766	CODE:
		767	_exit (retval);
		768
707	MODULE = CFClient PACKAGE = CFClient::Font	769	MODULE = CFPlus PACKAGE = CFPlus::Font
708		770
709	CFClient::Font	771	CFPlus::Font
710	new_from_file (SV class, char path, int id = 0)	772	new_from_file (SV class, char path, int id = 0)
711	CODE:	773	CODE:
712	{	774	{
713	int count;	775	int count;
714	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	776	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
717	}	779	}
718	OUTPUT:	780	OUTPUT:
719	RETVAL	781	RETVAL
720		782
721	void	783	void
722	DESTROY (CFClient::Font self)	784	DESTROY (CFPlus::Font self)
723	CODE:	785	CODE:
724	pango_font_description_free (self);	786	pango_font_description_free (self);
725		787
726	void	788	void
727	make_default (CFClient::Font self)	789	make_default (CFPlus::Font self)
728	CODE:	790	CODE:
729	default_font = self;	791	default_font = self;
730		792
731	MODULE = CFClient PACKAGE = CFClient::Layout	793	MODULE = CFPlus PACKAGE = CFPlus::Layout
732		794
733	CFClient::Layout	795	void
734	new (SV *class, int rgba = 0)	796	reset_glyph_cache ()
		797	CODE:
		798	tc_clear ();
		799
		800	CFPlus::Layout
		801	new (SV *class)
735	CODE:	802	CODE:
736	New (0, RETVAL, 1, struct cf_layout);	803	New (0, RETVAL, 1, struct cf_layout);
737		804
738	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	805	RETVAL->pl = pango_layout_new (opengl_context);
739	RETVAL->rgba = rgba;
740	RETVAL->r = 1.;	806	RETVAL->r = 1.;
741	RETVAL->g = 1.;	807	RETVAL->g = 1.;
742	RETVAL->b = 1.;	808	RETVAL->b = 1.;
743	RETVAL->a = 1.;	809	RETVAL->a = 1.;
744	RETVAL->base_height = MIN_FONT_HEIGHT;	810	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
748	layout_update_font (RETVAL);	814	layout_update_font (RETVAL);
749	OUTPUT:	815	OUTPUT:
750	RETVAL	816	RETVAL
751		817
752	void	818	void
753	DESTROY (CFClient::Layout self)	819	DESTROY (CFPlus::Layout self)
754	CODE:	820	CODE:
755	g_object_unref (self->pl);	821	g_object_unref (self->pl);
756	Safefree (self);	822	Safefree (self);
757		823
758	int
759	is_rgba (CFClient::Layout self)
760	CODE:
761	RETVAL = self->rgba;
762	OUTPUT:
763	RETVAL
764
765	void	824	void
766	set_text (CFClient::Layout self, SV *text_)	825	set_text (CFPlus::Layout self, SV *text_)
767	CODE:	826	CODE:
768	{	827	{
769	STRLEN textlen;	828	STRLEN textlen;
770	char *text = SvPVutf8 (text_, textlen);	829	char *text = SvPVutf8 (text_, textlen);
771		830
772	pango_layout_set_text (self->pl, text, textlen);	831	pango_layout_set_text (self->pl, text, textlen);
773	}	832	}
774		833
775	void	834	void
776	set_markup (CFClient::Layout self, SV *text_)	835	set_markup (CFPlus::Layout self, SV *text_)
777	CODE:	836	CODE:
778	{	837	{
779	STRLEN textlen;	838	STRLEN textlen;
780	char *text = SvPVutf8 (text_, textlen);	839	char *text = SvPVutf8 (text_, textlen);
781		840
782	pango_layout_set_markup (self->pl, text, textlen);	841	pango_layout_set_markup (self->pl, text, textlen);
783	}	842	}
784		843
		844	void
		845	set_shapes (CFPlus::Layout self, ...)
		846	CODE:
		847	{
		848	PangoAttrList *attrs = 0;
		849	const char *text = pango_layout_get_text (self->pl);
		850	const char *pos = text;
		851	int arg = 4;
		852
		853	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		854	{
		855	PangoRectangle inkrect, rect;
		856	PangoAttribute *attr;
		857
		858	int x = SvIV (ST (arg - 3));
		859	int y = SvIV (ST (arg - 2));
		860	int w = SvIV (ST (arg - 1));
		861	int h = SvIV (ST (arg ));
		862
		863	inkrect.x = 0;
		864	inkrect.y = 0;
		865	inkrect.width = 0;
		866	inkrect.height = 0;
		867
		868	rect.x = x * PANGO_SCALE;
		869	rect.y = y * PANGO_SCALE;
		870	rect.width = w * PANGO_SCALE;
		871	rect.height = h * PANGO_SCALE;
		872
		873	if (!attrs)
		874	attrs = pango_layout_get_attributes (self->pl);
		875
		876	attr = pango_attr_shape_new (&inkrect, &rect);
		877	attr->start_index = pos - text;
		878	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		879	pango_attr_list_insert (attrs, attr);
		880
		881	arg += 4;
		882	pos += sizeof (OBJ_STR) - 1;
		883	}
		884
		885	if (attrs)
		886	pango_layout_set_attributes (self->pl, attrs);
		887	}
		888
		889	void
		890	get_shapes (CFPlus::Layout self)
		891	PPCODE:
		892	{
		893	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		894
		895	do
		896	{
		897	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		898
		899	if (run && shape_attr_p (run))
		900	{
		901	PangoRectangle extents;
		902	pango_layout_iter_get_run_extents (iter, 0, &extents);
		903
		904	EXTEND (SP, 2);
		905	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		906	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		907	}
		908	}
		909	while (pango_layout_iter_next_run (iter));
		910
		911	pango_layout_iter_free (iter);
		912	}
		913
		914	int
		915	has_wrapped (CFPlus::Layout self)
		916	CODE:
		917	{
		918	int lines = 1;
		919	const char *text = pango_layout_get_text (self->pl);
		920
		921	while (*text)
		922	lines += *text++ == '\n';
		923
		924	RETVAL = lines < pango_layout_get_line_count (self->pl);
		925	}
		926	OUTPUT:
		927	RETVAL
		928
785	SV *	929	SV *
786	get_text (CFClient::Layout self)	930	get_text (CFPlus::Layout self)
787	CODE:	931	CODE:
788	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	932	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
789	SvUTF8_on (RETVAL);	933	sv_utf8_decode (RETVAL);
790	OUTPUT:	934	OUTPUT:
791	RETVAL	935	RETVAL
792		936
793	void	937	void
794	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	938	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
795	CODE:	939	CODE:
796	self->r = r;	940	self->r = r;
797	self->g = g;	941	self->g = g;
798	self->b = b;	942	self->b = b;
799	self->a = a;	943	self->a = a;
800		944
801	void	945	void
802	set_font (CFClient::Layout self, CFClient::Font font = 0)	946	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
803	CODE:	947	CODE:
804	if (self->font != font)	948	if (self->font != font)
805	{	949	{
806	self->font = font;	950	self->font = font;
807	layout_update_font (self);	951	layout_update_font (self);
808	}	952	}
809		953
810	void	954	void
811	set_height (CFClient::Layout self, int base_height)	955	set_height (CFPlus::Layout self, int base_height)
812	CODE:	956	CODE:
813	if (self->base_height != base_height)	957	if (self->base_height != base_height)
814	{	958	{
815	self->base_height = base_height;	959	self->base_height = base_height;
816	layout_update_font (self);	960	layout_update_font (self);
817	}	961	}
818		962
819	void	963	void
820	set_width (CFClient::Layout self, int max_width = -1)	964	set_width (CFPlus::Layout self, int max_width = -1)
821	CODE:	965	CODE:
822	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	966	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
823		967
824	void	968	void
825	set_indent (CFClient::Layout self, int indent)	969	set_indent (CFPlus::Layout self, int indent)
826	CODE:	970	CODE:
827	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	971	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
828		972
829	void	973	void
830	set_spacing (CFClient::Layout self, int spacing)	974	set_spacing (CFPlus::Layout self, int spacing)
831	CODE:	975	CODE:
832	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	976	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
833		977
834	void	978	void
835	set_ellipsise (CFClient::Layout self, int ellipsise)	979	set_ellipsise (CFPlus::Layout self, int ellipsise)
836	CODE:	980	CODE:
837	pango_layout_set_ellipsize (self->pl,	981	pango_layout_set_ellipsize (self->pl,
838	ellipsise == 1 ? PANGO_ELLIPSIZE_START	982	ellipsise == 1 ? PANGO_ELLIPSIZE_START
839	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	983	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
840	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	984	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
841	: PANGO_ELLIPSIZE_NONE	985	: PANGO_ELLIPSIZE_NONE
842	);	986	);
843		987
844	void	988	void
845	set_single_paragraph_mode (CFClient::Layout self, int spm)	989	set_single_paragraph_mode (CFPlus::Layout self, int spm)
846	CODE:	990	CODE:
847	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	991	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
848		992
849	void	993	void
850	size (CFClient::Layout self)	994	size (CFPlus::Layout self)
851	PPCODE:	995	PPCODE:
852	{	996	{
853	int w, h;	997	int w, h;
854		998
855	layout_get_pixel_size (self, &w, &h);	999	layout_get_pixel_size (self, &w, &h);
…		…
858	PUSHs (sv_2mortal (newSViv (w)));	1002	PUSHs (sv_2mortal (newSViv (w)));
859	PUSHs (sv_2mortal (newSViv (h)));	1003	PUSHs (sv_2mortal (newSViv (h)));
860	}	1004	}
861		1005
862	int	1006	int
		1007	descent (CFPlus::Layout self)
		1008	CODE:
		1009	{
		1010	PangoRectangle rect;
		1011	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1012	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1013	RETVAL = PANGO_DESCENT (rect);
		1014	}
		1015	OUTPUT:
		1016	RETVAL
		1017
		1018	int
863	xy_to_index (CFClient::Layout self, int x, int y)	1019	xy_to_index (CFPlus::Layout self, int x, int y)
864	CODE:	1020	CODE:
865	{	1021	{
866	int index, trailing;	1022	int index, trailing;
867	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1023	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
868	RETVAL = index;	1024	RETVAL = index;
869	}	1025	}
870	OUTPUT:	1026	OUTPUT:
871	RETVAL	1027	RETVAL
872		1028
873	void	1029	void
874	cursor_pos (CFClient::Layout self, int index)	1030	cursor_pos (CFPlus::Layout self, int index)
875	PPCODE:	1031	PPCODE:
876	{	1032	{
877	PangoRectangle strong_pos;	1033	PangoRectangle strong_pos;
878	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1034	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
879		1035
…		…
882	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1038	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
883	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1039	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
884	}	1040	}
885		1041
886	void	1042	void
887	render (CFClient::Layout self)	1043	render (CFPlus::Layout self, float x, float y, int flags = 0)
888	PPCODE:	1044	PPCODE:
889	{	1045	pango_opengl_render_layout_subpixel (
890	SV *retval;	1046	self->pl,
891	int w, h;	1047	x * PANGO_SCALE, y * PANGO_SCALE,
		1048	self->r, self->g, self->b, self->a,
		1049	flags
		1050	);
892		1051
893	layout_get_pixel_size (self, &w, &h);	1052	MODULE = CFPlus PACKAGE = CFPlus::Texture
894		1053
895	if (self->rgba)	1054	void
		1055	pad2pot (SV data_, SV w_, SV *h_)
		1056	CODE:
		1057	{
		1058	int ow = SvIV (w_);
		1059	int oh = SvIV (h_);
		1060
		1061	if (ow && oh)
896	{	1062	{
897	cairo_surface_t *surface;	1063	int nw = minpot (ow);
898	cairo_t *cairo;	1064	int nh = minpot (oh);
899		1065
900	retval = newSV (w * h * 4);	1066	if (nw != ow \|\| nh != oh)
901	SvPOK_only (retval);
902	SvCUR_set (retval, w * h * 4);
903
904	memset (SvPVX (retval), 0, w * h * 4);
905
906	surface = cairo_image_surface_create_for_data (
907	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
908	cairo = cairo_create (surface);
909	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
910
911	pango_cairo_show_layout (cairo, self->pl);
912
913	cairo_destroy (cairo);
914	cairo_surface_destroy (surface);
915
916	// what a mess, and its premultiplied, too :(
917	{	1067	{
918	uint32_t p = (uint32_t )SvPVX (retval);	1068	if (SvOK (data_))
919	uint32_t e = p + w h;
920
921	while (p < e)
922	{	1069	{
923	uint32_t rgba = *p;	1070	STRLEN datalen;
924	rgba = (rgba >> 24) \| (rgba << 8);	1071	char *data = SvPVbyte (data_, datalen);
925	#if 0	1072	int bpp = datalen / (ow * oh);
926	#ifdef _WIN32	1073	SV result_ = sv_2mortal (newSV (nw nh * bpp));
927	{//D
928	uint8_t r = rgba >> 24;
929	uint8_t g = rgba >> 16;
930	uint8_t b = rgba >> 8;
931	uint8_t a = rgba >> 0;
932		1074
933	rgba = (rgba & 0xffffff00) \| a;	1075	SvPOK_only (result_);
		1076	SvCUR_set (result_, nw * nh * bpp);
		1077
		1078	memset (SvPVX (result_), 0, nw * nh * bpp);
		1079	while (oh--)
		1080	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1081
		1082	sv_setsv (data_, result_);
934	}	1083	}
935	#endif	1084
936	#endif	1085	sv_setiv (w_, nw);
937	rgba = SDL_SwapBE32 (rgba);	1086	sv_setiv (h_, nh);
938	*p++ = rgba;
939	}	1087	}
940	}
941
942	EXTEND (SP, 5);
943	PUSHs (sv_2mortal (newSViv (w)));
944	PUSHs (sv_2mortal (newSViv (h)));
945	PUSHs (sv_2mortal (retval));
946	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
947	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
948	}	1088	}
949	else
950	{
951	FT_Bitmap bitmap;
952
953	retval = newSV (w * h);
954	SvPOK_only (retval);
955	SvCUR_set (retval, w * h);
956
957	bitmap.rows = h;
958	bitmap.width = w;
959	bitmap.pitch = w;
960	bitmap.buffer = (unsigned char*)SvPVX (retval);
961	bitmap.num_grays = 256;
962	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
963
964	memset (bitmap.buffer, 0, w * h);
965
966	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
967
968	EXTEND (SP, 5);
969	PUSHs (sv_2mortal (newSViv (w)));
970	PUSHs (sv_2mortal (newSViv (h)));
971	PUSHs (sv_2mortal (retval));
972	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
973	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
974	}
975	}	1089	}
976		1090
977	MODULE = CFClient PACKAGE = CFClient::Texture
978
979	void	1091	void
980	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1092	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
981	PROTOTYPE: $$$;$$	1093	PROTOTYPE: $$$;$$
982	ALIAS:	1094	ALIAS:
983	draw_quad_alpha = 1	1095	draw_quad_alpha = 1
984	draw_quad_alpha_premultiplied = 2	1096	draw_quad_alpha_premultiplied = 2
985	CODE:	1097	CODE:
…		…
1023	glDisable (GL_ALPHA_TEST);	1135	glDisable (GL_ALPHA_TEST);
1024	glDisable (GL_BLEND);	1136	glDisable (GL_BLEND);
1025	}	1137	}
1026	}	1138	}
1027		1139
1028	MODULE = CFClient PACKAGE = CFClient::Map	1140	MODULE = CFPlus PACKAGE = CFPlus::Map
1029		1141
1030	CFClient::Map	1142	CFPlus::Map
1031	new (SV *class, int map_width, int map_height)	1143	new (SV *class, int map_width, int map_height)
1032	CODE:	1144	CODE:
1033	New (0, RETVAL, 1, struct map);	1145	New (0, RETVAL, 1, struct map);
1034	RETVAL->x = 0;	1146	RETVAL->x = 0;
1035	RETVAL->y = 0;	1147	RETVAL->y = 0;
…		…
1045	RETVAL->row = 0;	1157	RETVAL->row = 0;
1046	OUTPUT:	1158	OUTPUT:
1047	RETVAL	1159	RETVAL
1048		1160
1049	void	1161	void
1050	DESTROY (CFClient::Map self)	1162	DESTROY (CFPlus::Map self)
1051	CODE:	1163	CODE:
1052	{	1164	{
1053	map_clear (self);	1165	map_clear (self);
1054	Safefree (self->face);	1166	Safefree (self->face);
		1167	Safefree (self->tex);
1055	Safefree (self);	1168	Safefree (self);
1056	}	1169	}
1057		1170
1058	void	1171	void
1059	clear (CFClient::Map self)	1172	clear (CFPlus::Map self)
1060	CODE:	1173	CODE:
1061	map_clear (self);	1174	map_clear (self);
1062		1175
1063	void	1176	void
1064	set_face (CFClient::Map self, int face, int texid)	1177	set_face (CFPlus::Map self, int face, int texid)
1065	CODE:	1178	CODE:
1066	{	1179	{
1067	while (self->faces <= face)	1180	while (self->faces <= face)
1068	{	1181	{
1069	Append (mapface, self->face, self->faces, self->faces);	1182	Append (mapface, self->face, self->faces, self->faces);
…		…
1072		1185
1073	self->face [face] = texid;	1186	self->face [face] = texid;
1074	}	1187	}
1075		1188
1076	void	1189	void
1077	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)	1190	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)
1078	CODE:	1191	CODE:
1079	{	1192	{
1080	while (self->texs <= texid)	1193	while (self->texs <= texid)
1081	{	1194	{
1082	Append (maptex, self->tex, self->texs, self->texs);	1195	Append (maptex, self->tex, self->texs, self->texs);
…		…
1106	// from transparent color bleeding and ugly wrapping effects.	1219	// from transparent color bleeding and ugly wrapping effects.
1107	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1220	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1108	}	1221	}
1109		1222
1110	int	1223	int
1111	ox (CFClient::Map self)	1224	ox (CFPlus::Map self)
1112	ALIAS:	1225	ALIAS:
1113	oy = 1	1226	oy = 1
1114	x = 2	1227	x = 2
1115	y = 3	1228	y = 3
1116	w = 4	1229	w = 4
…		…
1127	}	1240	}
1128	OUTPUT:	1241	OUTPUT:
1129	RETVAL	1242	RETVAL
1130		1243
1131	void	1244	void
1132	scroll (CFClient::Map self, int dx, int dy)	1245	scroll (CFPlus::Map self, int dx, int dy)
1133	CODE:	1246	CODE:
1134	{	1247	{
1135	if (dx > 0)	1248	if (dx > 0)
1136	map_blank (self, self->x, self->y, dx - 1, self->h);	1249	map_blank (self, self->x, self->y, dx - 1, self->h);
1137	else if (dx < 0)	1250	else if (dx < 0)
…		…
1153	self->y += MAP_EXTEND_Y;	1266	self->y += MAP_EXTEND_Y;
1154	}	1267	}
1155	}	1268	}
1156		1269
1157	void	1270	void
1158	map1a_update (CFClient::Map self, SV *data_)	1271	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1159	CODE:	1272	CODE:
1160	{	1273	{
1161	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1274	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1162	uint8_t data_end = (uint8_t )SvEND (data_);	1275	uint8_t data_end = (uint8_t )SvEND (data_);
1163	mapcell *cell;	1276	mapcell *cell;
1164	int x, y, flags;	1277	int x, y, flags;
1165		1278
1166	while (data < data_end)	1279	while (data < data_end - 1)
1167	{	1280	{
1168	flags = (data [0] << 8) + data [1]; data += 2;	1281	flags = (data [0] << 8) + data [1]; data += 2;
1169		1282
1170	x = ((flags >> 10) & 63) + self->x;	1283	x = self->x + ((flags >> 10) & 63);
1171	y = ((flags >> 4) & 63) + self->y;	1284	y = self->y + ((flags >> 4) & 63);
1172		1285
1173	cell = map_get_cell (self, x, y);	1286	cell = map_get_cell (self, x, y);
1174		1287
1175	if (flags & 15)	1288	if (flags & 15)
1176	{	1289	{
1177	if (cell->darkness < 0)	1290	if (!cell->darkness)
1178	{	1291	{
1179	cell->darkness = 0;	1292	cell->darkness = 256;
1180	cell->face [0] = 0;	1293	cell->face [0] = 0;
1181	cell->face [1] = 0;	1294	cell->face [1] = 0;
1182	cell->face [2] = 0;	1295	cell->face [2] = 0;
1183	}	1296	}
1184		1297
1185	cell->darkness = flags & 8 ? *data++ : 255;
1186
1187	//TODO: don't trust server data to be in-range(!)	1298	//TODO: don't trust server data to be in-range(!)
		1299
		1300	if (flags & 8)
		1301	{
		1302	if (extmap)
		1303	{
		1304	uint8_t ext, cmd;
		1305
		1306	do
		1307	{
		1308	ext = *data++;
		1309	cmd = ext & 0x3f;
		1310
		1311	if (cmd < 4)
		1312	cell->darkness = 255 - ext * 64 + 1;
		1313	else if (cmd == 5) // health
		1314	{
		1315	cell->stat_width = 1;
		1316	cell->stat_hp = *data++;
		1317	}
		1318	else if (cmd == 6) // monster width
		1319	cell->stat_width = *data++ + 1;
		1320	else if (cmd == 0x47) // monster width
		1321	{
		1322	if (*data == 4)
		1323	; // decode player tag
		1324
		1325	data += *data + 1;
		1326	}
		1327	else if (cmd == 8) // cell flags
		1328	cell->flags = *data++;
		1329	else if (ext & 0x40) // unknown, multibyte => skip
		1330	data += *data + 1;
		1331	else
		1332	data++;
		1333	}
		1334	while (ext & 0x80);
		1335	}
		1336	else
		1337	cell->darkness = *data++ + 1;
		1338	}
1188		1339
1189	if (flags & 4)	1340	if (flags & 4)
1190	{	1341	{
1191	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1342	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1192	}	1343	}
…		…
1200	{	1351	{
1201	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1352	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1202	}	1353	}
1203	}	1354	}
1204	else	1355	else
		1356	{
1205	cell->darkness = -1;	1357	cell->darkness = 0;
		1358	cell->stat_hp = 0;
		1359	}
1206	}	1360	}
1207	}	1361	}
1208		1362
1209	SV *	1363	SV *
1210	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1364	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1211	CODE:	1365	CODE:
1212	{	1366	{
1213	int x1, x;	1367	int x1, x;
1214	int y1, y;	1368	int y1, y;
1215	int z;	1369	int z;
…		…
1265	}	1419	}
1266	OUTPUT:	1420	OUTPUT:
1267	RETVAL	1421	RETVAL
1268		1422
1269	void	1423	void
1270	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1424	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1271	PPCODE:	1425	CODE:
1272	{	1426	{
1273	int vx, vy;	1427	int vx, vy;
1274	int x, y, z;	1428	int x, y, z;
1275	int last_name;	1429	int last_name;
1276	mapface face;	1430	mapface face;
1277	int sw4 = (sw + 3) & ~3;
1278	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1279	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1280		1431
1281	memset (darkness, 255, sw4 * sh);
1282	SvPOK_only (darkness_sv);
1283	SvCUR_set (darkness_sv, sw4 * sh);
1284
1285	vx = self->x + (self->w - sw) / 2 - shift_x;	1432	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1286	vy = self->y + (self->h - sh) / 2 - shift_y;	1433	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1287		1434
1288	/*	1435	/*
1289	int vx = self->vx = self->w >= sw	1436	int vx = self->vx = self->w >= sw
1290	? self->x + (self->w - sw) / 2	1437	? self->x + (self->w - sw) / 2
1291	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1438	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1295	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1442	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1296	*/	1443	*/
1297		1444
1298	glColor4ub (255, 255, 255, 255);	1445	glColor4ub (255, 255, 255, 255);
1299		1446
		1447	glEnable (GL_BLEND);
1300	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1448	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1301	glEnable (GL_BLEND);
1302	glEnable (GL_TEXTURE_2D);	1449	glEnable (GL_TEXTURE_2D);
1303	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1450	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1304		1451
1305	glBegin (GL_QUADS);	1452	glBegin (GL_QUADS);
1306		1453
…		…
1315	for (x = 0; x < sw; x++)	1462	for (x = 0; x < sw; x++)
1316	if (row->c0 <= x + vx && x + vx < row->c1)	1463	if (row->c0 <= x + vx && x + vx < row->c1)
1317	{	1464	{
1318	mapcell *cell = row->col + (x + vx - row->c0);	1465	mapcell *cell = row->col + (x + vx - row->c0);
1319		1466
1320	darkness[y * sw4 + x] = cell->darkness < 0
1321	? 255 - FOW_DARKNESS
1322	: 255 - cell->darkness;
1323
1324	face = cell->face [z];	1467	face = cell->face [z];
1325		1468
1326	if (face)	1469	if (face && face < self->texs)
1327	{	1470	{
1328	maptex tex = self->tex [face];	1471	maptex tex = self->tex [face];
1329
1330	int px = (x + 1) * 32 - tex.w;	1472	int px = (x + 1) * 32 - tex.w;
1331	int py = (y + 1) * 32 - tex.h;	1473	int py = (y + 1) * 32 - tex.h;
1332		1474
1333	if (last_name != tex.name)	1475	if (last_name != tex.name)
1334	{	1476	{
1335	glEnd ();	1477	glEnd ();
1336	last_name = tex.name;
1337	glBindTexture (GL_TEXTURE_2D, last_name);	1478	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1338	glBegin (GL_QUADS);	1479	glBegin (GL_QUADS);
1339	}	1480	}
1340		1481
1341	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1482	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1342	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1483	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1343	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1484	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1344	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1485	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1345	}	1486	}
		1487
		1488	if (cell->flags && z == 2)
		1489	{
		1490	if (cell->flags & 1)
		1491	{
		1492	maptex tex = self->tex [1];
		1493	int px = (x + 1) * 32 - tex.w + 2;
		1494	int py = (y + 1) * 32 - tex.h - 6;
		1495
		1496	glEnd ();
		1497	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1498	glBegin (GL_QUADS);
		1499
		1500	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1501	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1502	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1503	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1504	}
		1505	}
1346	}	1506	}
1347	}	1507	}
1348		1508
1349	glEnd ();	1509	glEnd ();
1350		1510
1351	glDisable (GL_TEXTURE_2D);	1511	glDisable (GL_TEXTURE_2D);
1352	glDisable (GL_BLEND);	1512	glDisable (GL_BLEND);
		1513
		1514	// top layer: overlays such as the health bar
		1515	for (y = 0; y < sh; y++)
		1516	if (0 <= y + vy && y + vy < self->rows)
		1517	{
		1518	maprow *row = self->row + (y + vy);
		1519
		1520	for (x = 0; x < sw; x++)
		1521	if (row->c0 <= x + vx && x + vx < row->c1)
		1522	{
		1523	mapcell *cell = row->col + (x + vx - row->c0);
		1524
		1525	int px = x * 32;
		1526	int py = y * 32;
		1527
		1528	if (cell->stat_hp)
		1529	{
		1530	int width = cell->stat_width * 32;
		1531	int thick = sh / 28 + 1 + cell->stat_width;
		1532
		1533	glColor3ub (0, 0, 0);
		1534	glRectf (px + 1, py - thick - 2,
		1535	px + width - 1, py);
		1536
		1537	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1538	glRectf (px + 2,
		1539	py - thick - 1,
		1540	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1541	}
		1542	}
		1543	}
		1544	}
		1545
		1546	void
		1547	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1548	CODE:
		1549	{
		1550	static float color[16][3] = {
		1551	{ 0.00F, 0.00F, 0.00F },
		1552	{ 1.00F, 1.00F, 1.00F },
		1553	{ 0.00F, 0.00F, 0.55F },
		1554	{ 1.00F, 0.00F, 0.00F },
		1555
		1556	{ 1.00F, 0.54F, 0.00F },
		1557	{ 0.11F, 0.56F, 1.00F },
		1558	{ 0.93F, 0.46F, 0.00F },
		1559	{ 0.18F, 0.54F, 0.34F },
		1560
		1561	{ 0.56F, 0.73F, 0.56F },
		1562	{ 0.80F, 0.80F, 0.80F },
		1563	{ 0.55F, 0.41F, 0.13F },
		1564	{ 0.99F, 0.77F, 0.26F },
		1565
		1566	{ 0.74F, 0.65F, 0.41F },
		1567
		1568	{ 0.00F, 1.00F, 1.00F },
		1569	{ 1.00F, 0.00F, 1.00F },
		1570	{ 1.00F, 1.00F, 0.00F },
		1571	};
		1572
		1573	int x, y;
		1574
		1575	glEnable (GL_TEXTURE_2D);
		1576	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1577	glEnable (GL_BLEND);
		1578	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1579	glBegin (GL_QUADS);
		1580
		1581	for (y = 0; y < h; y++)
		1582	for (x = 0; x < w; x++)
		1583	{
		1584	unsigned char m = data [x + y * w];
		1585
		1586	if (m)
		1587	{
		1588	float *c = color [m & 15];
		1589
		1590	float tx1 = m & 0x40 ? 0.5 : 0.;
		1591	float tx2 = tx1 + 0.5;
		1592
		1593	glColor4f (c[0], c[1], c[2], 0.75);
		1594	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1595	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1596	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1597	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1598	}
		1599	}
		1600
		1601	glEnd ();
		1602	glDisable (GL_BLEND);
		1603	glDisable (GL_TEXTURE_2D);
		1604	}
		1605
		1606	void
		1607	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1608	PPCODE:
		1609	{
		1610	int vx, vy;
		1611	int x, y;
		1612	int sw4 = (sw + 3) & ~3;
		1613	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1614	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1615
		1616	memset (darkness, 255, sw4 * sh);
		1617	SvPOK_only (darkness_sv);
		1618	SvCUR_set (darkness_sv, sw4 * sh);
		1619
		1620	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1621	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1622
		1623	for (y = 0; y < sh; y++)
		1624	if (0 <= y + vy && y + vy < self->rows)
		1625	{
		1626	maprow *row = self->row + (y + vy);
		1627
		1628	for (x = 0; x < sw; x++)
		1629	if (row->c0 <= x + vx && x + vx < row->c1)
		1630	{
		1631	mapcell *cell = row->col + (x + vx - row->c0);
		1632
		1633	darkness[y * sw4 + x] = cell->darkness
		1634	? 255 - (cell->darkness - 1)
		1635	: 255 - FOW_DARKNESS;
		1636	}
		1637	}
1353		1638
1354	EXTEND (SP, 3);	1639	EXTEND (SP, 3);
1355	PUSHs (sv_2mortal (newSViv (sw4)));	1640	PUSHs (sv_2mortal (newSViv (sw4)));
1356	PUSHs (sv_2mortal (newSViv (sh)));	1641	PUSHs (sv_2mortal (newSViv (sh)));
1357	PUSHs (darkness_sv);	1642	PUSHs (darkness_sv);
1358	}	1643	}
1359		1644
1360	SV *	1645	SV *
1361	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1646	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1362	CODE:	1647	CODE:
1363	{	1648	{
1364	int x, y, x1, y1;	1649	int x, y, x1, y1;
1365	SV data_sv = newSV (w h * 7 + 5);	1650	SV data_sv = newSV (w h * 7 + 5);
1366	uint8_t data = (uint8_t )SvPVX (data_sv);	1651	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1428	}	1713	}
1429	OUTPUT:	1714	OUTPUT:
1430	RETVAL	1715	RETVAL
1431		1716
1432	void	1717	void
1433	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1718	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1434	PPCODE:	1719	PPCODE:
1435	{	1720	{
1436	int x, y, z;	1721	int x, y, z;
1437	int w, h;	1722	int w, h;
1438	int x1, y1;	1723	int x1, y1;
…		…
1470		1755
1471	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1756	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1472	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1757	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1473	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1758	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1474		1759
1475	if (cell->darkness <= 0)	1760	if (cell->darkness == 0)
1476	{	1761	{
1477	cell->darkness = -1;	1762	cell->darkness = 0;
1478		1763
1479	for (z = 0; z <= 2; z++)	1764	for (z = 0; z <= 2; z++)
1480	{	1765	{
1481	cell->face[z] = face[z];	1766	cell->face[z] = face[z];
1482		1767
…		…
1487	}	1772	}
1488	}	1773	}
1489	}	1774	}
1490	}	1775	}
1491		1776
1492	MODULE = CFClient PACKAGE = CFClient::MixChunk	1777	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1493		1778
1494	CFClient::MixChunk	1779	CFPlus::MixChunk
1495	new_from_file (SV class, char path)	1780	new_from_file (SV class, char path)
1496	CODE:	1781	CODE:
1497	RETVAL = Mix_LoadWAV (path);	1782	RETVAL = Mix_LoadWAV (path);
1498	OUTPUT:	1783	OUTPUT:
1499	RETVAL	1784	RETVAL
1500		1785
1501	void	1786	void
1502	DESTROY (CFClient::MixChunk self)	1787	DESTROY (CFPlus::MixChunk self)
1503	CODE:	1788	CODE:
1504	Mix_FreeChunk (self);	1789	Mix_FreeChunk (self);
1505		1790
1506	int	1791	int
1507	volume (CFClient::MixChunk self, int volume = -1)	1792	volume (CFPlus::MixChunk self, int volume = -1)
1508	CODE:	1793	CODE:
1509	RETVAL = Mix_VolumeChunk (self, volume);	1794	RETVAL = Mix_VolumeChunk (self, volume);
1510	OUTPUT:	1795	OUTPUT:
1511	RETVAL	1796	RETVAL
1512		1797
1513	int	1798	int
1514	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1799	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1515	CODE:	1800	CODE:
1516	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1801	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1517	OUTPUT:	1802	OUTPUT:
1518	RETVAL	1803	RETVAL
1519		1804
1520	MODULE = CFClient PACKAGE = CFClient::MixMusic	1805	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1521		1806
1522	int	1807	int
1523	volume (int volume = -1)	1808	volume (int volume = -1)
1524	CODE:	1809	CODE:
1525	RETVAL = Mix_VolumeMusic (volume);	1810	RETVAL = Mix_VolumeMusic (volume);
1526	OUTPUT:	1811	OUTPUT:
1527	RETVAL	1812	RETVAL
1528		1813
1529	CFClient::MixMusic	1814	CFPlus::MixMusic
1530	new_from_file (SV class, char path)	1815	new_from_file (SV class, char path)
1531	CODE:	1816	CODE:
1532	RETVAL = Mix_LoadMUS (path);	1817	RETVAL = Mix_LoadMUS (path);
1533	OUTPUT:	1818	OUTPUT:
1534	RETVAL	1819	RETVAL
1535		1820
1536	void	1821	void
1537	DESTROY (CFClient::MixMusic self)	1822	DESTROY (CFPlus::MixMusic self)
1538	CODE:	1823	CODE:
1539	Mix_FreeMusic (self);	1824	Mix_FreeMusic (self);
1540		1825
1541	int	1826	int
1542	play (CFClient::MixMusic self, int loops = -1)	1827	play (CFPlus::MixMusic self, int loops = -1)
1543	CODE:	1828	CODE:
1544	RETVAL = Mix_PlayMusic (self, loops);	1829	RETVAL = Mix_PlayMusic (self, loops);
1545	OUTPUT:	1830	OUTPUT:
1546	RETVAL	1831	RETVAL
1547		1832
1548	MODULE = CFClient PACKAGE = CFClient::OpenGL	1833	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1549		1834
1550	BOOT:	1835	BOOT:
1551	{	1836	{
1552	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1837	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1553	static const struct {	1838	static const struct {
1554	const char *name;	1839	const char *name;
1555	IV iv;	1840	IV iv;
1556	} *civ, const_iv[] = {	1841	} *civ, const_iv[] = {
1557	# define const_iv(name) { # name, (IV)name }	1842	# define const_iv(name) { # name, (IV)name }
…		…
1564	const_iv (GL_SCISSOR_TEST),	1849	const_iv (GL_SCISSOR_TEST),
1565	const_iv (GL_DEPTH_TEST),	1850	const_iv (GL_DEPTH_TEST),
1566	const_iv (GL_ALPHA_TEST),	1851	const_iv (GL_ALPHA_TEST),
1567	const_iv (GL_NORMALIZE),	1852	const_iv (GL_NORMALIZE),
1568	const_iv (GL_RESCALE_NORMAL),	1853	const_iv (GL_RESCALE_NORMAL),
		1854	const_iv (GL_FRONT),
		1855	const_iv (GL_BACK),
1569	const_iv (GL_AND),	1856	const_iv (GL_AND),
1570	const_iv (GL_ONE),	1857	const_iv (GL_ONE),
1571	const_iv (GL_ZERO),	1858	const_iv (GL_ZERO),
1572	const_iv (GL_SRC_ALPHA),	1859	const_iv (GL_SRC_ALPHA),
1573	const_iv (GL_DST_ALPHA),	1860	const_iv (GL_DST_ALPHA),
1574	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1861	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1575	const_iv (GL_ONE_MINUS_DST_ALPHA),	1862	const_iv (GL_ONE_MINUS_DST_ALPHA),
1576	const_iv (GL_SRC_ALPHA_SATURATE),	1863	const_iv (GL_SRC_ALPHA_SATURATE),
1577	const_iv (GL_RGB),	1864	const_iv (GL_RGB),
1578	const_iv (GL_RGBA),	1865	const_iv (GL_RGBA),
		1866	const_iv (GL_RGBA4),
		1867	const_iv (GL_RGBA8),
		1868	const_iv (GL_RGB5_A1),
1579	const_iv (GL_UNSIGNED_BYTE),	1869	const_iv (GL_UNSIGNED_BYTE),
1580	const_iv (GL_UNSIGNED_SHORT),	1870	const_iv (GL_UNSIGNED_SHORT),
1581	const_iv (GL_UNSIGNED_INT),	1871	const_iv (GL_UNSIGNED_INT),
1582	const_iv (GL_ALPHA),	1872	const_iv (GL_ALPHA),
1583	const_iv (GL_INTENSITY),	1873	const_iv (GL_INTENSITY),
…		…
1615	const_iv (GL_SEPARABLE_2D),	1905	const_iv (GL_SEPARABLE_2D),
1616	const_iv (GL_CONVOLUTION_2D),	1906	const_iv (GL_CONVOLUTION_2D),
1617	const_iv (GL_CONVOLUTION_BORDER_MODE),	1907	const_iv (GL_CONVOLUTION_BORDER_MODE),
1618	const_iv (GL_CONSTANT_BORDER),	1908	const_iv (GL_CONSTANT_BORDER),
1619	const_iv (GL_LINES),	1909	const_iv (GL_LINES),
		1910	const_iv (GL_LINE_STRIP),
1620	const_iv (GL_LINE_LOOP),	1911	const_iv (GL_LINE_LOOP),
1621	const_iv (GL_QUADS),	1912	const_iv (GL_QUADS),
1622	const_iv (GL_QUAD_STRIP),	1913	const_iv (GL_QUAD_STRIP),
1623	const_iv (GL_TRIANGLES),	1914	const_iv (GL_TRIANGLES),
1624	const_iv (GL_TRIANGLE_STRIP),	1915	const_iv (GL_TRIANGLE_STRIP),
…		…
1657	OUTPUT:	1948	OUTPUT:
1658	RETVAL	1949	RETVAL
1659		1950
1660	int glGetError ()	1951	int glGetError ()
1661		1952
		1953	void glFinish ()
		1954
1662	void glClear (int mask)	1955	void glClear (int mask)
1663		1956
1664	void glClearColor (float r, float g, float b, float a = 1.0)	1957	void glClearColor (float r, float g, float b, float a = 1.0)
1665	PROTOTYPE: @	1958	PROTOTYPE: @
1666		1959
…		…
1689	void glPushMatrix ()	1982	void glPushMatrix ()
1690		1983
1691	void glPopMatrix ()	1984	void glPopMatrix ()
1692		1985
1693	void glLoadIdentity ()	1986	void glLoadIdentity ()
		1987
		1988	void glDrawBuffer (int buffer)
		1989
		1990	void glReadBuffer (int buffer)
1694		1991
1695	# near_ and far_ are due to microsofts buggy "c" compiler	1992	# near_ and far_ are due to microsofts buggy "c" compiler
1696	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1993	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1697		1994
1698	# near_ and far_ are due to microsofts buggy "c" compiler	1995	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1728	r *= a;	2025	r *= a;
1729	g *= a;	2026	g *= a;
1730	b *= a;	2027	b *= a;
1731	}	2028	}
1732	// microsoft visual "c" rounds instead of truncating...	2029	// microsoft visual "c" rounds instead of truncating...
1733	glColor4ub (MIN ((int)(r * 256.f), 255),	2030	glColor4f (r, g, b, a);
1734	MIN ((int)(g * 256.f), 255),
1735	MIN ((int)(b * 256.f), 255),
1736	MIN ((int)(a * 256.f), 255));
1737		2031
1738	void glInterleavedArrays (int format, int stride, char *data)	2032	void glInterleavedArrays (int format, int stride, char *data)
1739		2033
1740	void glDrawElements (int mode, int count, int type, char *indices)	2034	void glDrawElements (int mode, int count, int type, char *indices)
1741		2035
…		…
1818		2112
1819	void glEndList ()	2113	void glEndList ()
1820		2114
1821	void glCallList (int list)	2115	void glCallList (int list)
1822		2116
1823

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.106 by root, Mon Jun 5 03:48:49 2006 UTC vs. Revision 1.153 by root, Tue Sep 19 22:02:38 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.106 by root, Mon Jun 5 03:48:49 2006 UTC vs.
Revision 1.153 by root, Tue Sep 19 22:02:38 2006 UTC