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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.112 by root, Mon Jun 12 14:55:41 2006 UTC vs. Revision 1.156 by root, Thu Sep 21 14:47:51 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.112 by root, Mon Jun 12 14:55:41 2006 UTC vs.
Revision 1.156 by root, Thu Sep 21 14:47:51 2006 UTC