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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.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>
		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;
		320	cell->flags = 0;
		321	cell->player = 0;
273	}	322	}
274	}	323	}
275	}	324	}
276		325
277	static void	326	static void
…		…
298	ev.data2 = 0;	347	ev.data2 = 0;
299		348
300	SDL_PushEvent ((SDL_Event *)&ev);	349	SDL_PushEvent ((SDL_Event *)&ev);
301	}	350	}
302		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
303	MODULE = CFClient PACKAGE = CFClient	369	MODULE = CFPlus PACKAGE = CFPlus
304		370
305	PROTOTYPES: ENABLE	371	PROTOTYPES: ENABLE
306		372
307	BOOT:	373	BOOT:
308	{	374	{
309	HV *stash = gv_stashpv ("CFClient", 1);	375	HV *stash = gv_stashpv ("CFPlus", 1);
310	static const struct {	376	static const struct {
311	const char *name;	377	const char *name;
312	IV iv;	378	IV iv;
313	} *civ, const_iv[] = {	379	} *civ, const_iv[] = {
314	# define const_iv(name) { # name, (IV)name }	380	# define const_iv(name) { # name, (IV)name }
…		…
415		481
416	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; )
417	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	483	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
418	}	484	}
419		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
420	void	497	void
421	pango_init ()	498	pango_init ()
422	CODE:	499	CODE:
423	{	500	{
424	// delayed, so it can pick up new fonts added by AddFontResourceEx
425	ft2_fontmap = pango_ft2_font_map_new ();	501	opengl_fontmap = pango_opengl_font_map_new ();
426	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);
427	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	503	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
428
429	cairo_fontmap = pango_cairo_font_map_get_default ();
430	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
431	}	504	}
432		505
433	int	506	int
434	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	507	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
435		508
436	void	509	void
437	SDL_Quit ()	510	SDL_Quit ()
438		511
439	void	512	void
…		…
446	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	519	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
447	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	520	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
448	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	521	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
449		522
450	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	523	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	524	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
452		525
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
455	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	528	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
456	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	529	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
457		530
458	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
459		536
460	SDL_EnableUNICODE (1);	537	SDL_EnableUNICODE (1);
461	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	538	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
462		539
463	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	540	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
550	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	627	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
551	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	628	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
552	break;	629	break;
553	}	630	}
554		631
555	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	632	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
556	}	633	}
557	}	634	}
558		635
559	int	636	int
560	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)
…		…
576	#endif	653	#endif
577		654
578	void	655	void
579	add_font (char *file)	656	add_font (char *file)
580	CODE:	657	CODE:
581	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	658	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
582	#ifdef _WIN32
583	// cairo... sigh... requires win2000
584	AddFontResourceEx (file, FR_PRIVATE, 0);
585	#endif
586		659
587	void	660	void
588	load_image_inline (SV *image_)	661	load_image_inline (SV *image_)
589	ALIAS:	662	ALIAS:
590	load_image_file = 1	663	load_image_file = 1
…		…
632		705
633	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	706	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
634		707
635	assert (surface2->pitch == surface2->w * 4);	708	assert (surface2->pitch == surface2->w * 4);
636		709
		710	SDL_LockSurface (surface2);
637	EXTEND (SP, 5);	711	EXTEND (SP, 6);
638	PUSHs (sv_2mortal (newSViv (surface2->w)));	712	PUSHs (sv_2mortal (newSViv (surface2->w)));
639	PUSHs (sv_2mortal (newSViv (surface2->h)));	713	PUSHs (sv_2mortal (newSViv (surface2->h)));
640	SDL_LockSurface (surface2);
641	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	714	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
642	SDL_UnlockSurface (surface2);
643	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	715	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
644	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	716	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
645	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	717	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		718	SDL_UnlockSurface (surface2);
646		719
647	SDL_FreeSurface (surface);	720	SDL_FreeSurface (surface);
648	SDL_FreeSurface (surface2);	721	SDL_FreeSurface (surface2);
649	}	722	}
650		723
…		…
686	CODE:	759	CODE:
687	fprintf (stderr, "FATAL: %s\n", message);	760	fprintf (stderr, "FATAL: %s\n", message);
688	#ifdef _WIN32	761	#ifdef _WIN32
689	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	762	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
690	#endif	763	#endif
691	exit (1);	764	_exit (1);
692		765
		766	void
		767	_exit (int retval)
		768	CODE:
		769	_exit (retval);
		770
693	MODULE = CFClient PACKAGE = CFClient::Font	771	MODULE = CFPlus PACKAGE = CFPlus::Font
694		772
695	CFClient::Font	773	CFPlus::Font
696	new_from_file (SV class, char path, int id = 0)	774	new_from_file (SV class, char path, int id = 0)
697	CODE:	775	CODE:
698	{	776	{
699	int count;	777	int count;
700	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	778	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
703	}	781	}
704	OUTPUT:	782	OUTPUT:
705	RETVAL	783	RETVAL
706		784
707	void	785	void
708	DESTROY (CFClient::Font self)	786	DESTROY (CFPlus::Font self)
709	CODE:	787	CODE:
710	pango_font_description_free (self);	788	pango_font_description_free (self);
711		789
712	void	790	void
713	make_default (CFClient::Font self)	791	make_default (CFPlus::Font self)
714	CODE:	792	CODE:
715	default_font = self;	793	default_font = self;
716		794
717	MODULE = CFClient PACKAGE = CFClient::Layout	795	MODULE = CFPlus PACKAGE = CFPlus::Layout
718		796
719	CFClient::Layout	797	void
720	new (SV *class, int rgba = 0)	798	reset_glyph_cache ()
721	CODE:	799	CODE:
722	#if _WIN32	800	tc_clear ();
723	//rgba = 0;//D makes text nicer, breaks TextView	801
724	#endif	802	CFPlus::Layout
725	rgba=1;//D	803	new (SV *class)
		804	CODE:
726	New (0, RETVAL, 1, struct cf_layout);	805	New (0, RETVAL, 1, struct cf_layout);
727		806
728	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	807	RETVAL->pl = pango_layout_new (opengl_context);
729	RETVAL->rgba = rgba;
730	RETVAL->r = 1.;	808	RETVAL->r = 1.;
731	RETVAL->g = 1.;	809	RETVAL->g = 1.;
732	RETVAL->b = 1.;	810	RETVAL->b = 1.;
733	RETVAL->a = 1.;	811	RETVAL->a = 1.;
734	RETVAL->base_height = MIN_FONT_HEIGHT;	812	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
738	layout_update_font (RETVAL);	816	layout_update_font (RETVAL);
739	OUTPUT:	817	OUTPUT:
740	RETVAL	818	RETVAL
741		819
742	void	820	void
743	DESTROY (CFClient::Layout self)	821	DESTROY (CFPlus::Layout self)
744	CODE:	822	CODE:
745	g_object_unref (self->pl);	823	g_object_unref (self->pl);
746	Safefree (self);	824	Safefree (self);
747		825
748	int
749	is_rgba (CFClient::Layout self)
750	CODE:
751	RETVAL = self->rgba;
752	OUTPUT:
753	RETVAL
754
755	void	826	void
756	set_text (CFClient::Layout self, SV *text_)	827	set_text (CFPlus::Layout self, SV *text_)
757	CODE:	828	CODE:
758	{	829	{
759	STRLEN textlen;	830	STRLEN textlen;
760	char *text = SvPVutf8 (text_, textlen);	831	char *text = SvPVutf8 (text_, textlen);
761		832
762	pango_layout_set_text (self->pl, text, textlen);	833	pango_layout_set_text (self->pl, text, textlen);
763	}	834	}
764		835
765	void	836	void
766	set_markup (CFClient::Layout self, SV *text_)	837	set_markup (CFPlus::Layout self, SV *text_)
767	CODE:	838	CODE:
768	{	839	{
769	STRLEN textlen;	840	STRLEN textlen;
770	char *text = SvPVutf8 (text_, textlen);	841	char *text = SvPVutf8 (text_, textlen);
771		842
772	pango_layout_set_markup (self->pl, text, textlen);	843	pango_layout_set_markup (self->pl, text, textlen);
773	}	844	}
774		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
775	SV *	931	SV *
776	get_text (CFClient::Layout self)	932	get_text (CFPlus::Layout self)
777	CODE:	933	CODE:
778	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	934	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
779	SvUTF8_on (RETVAL);	935	sv_utf8_decode (RETVAL);
780	OUTPUT:	936	OUTPUT:
781	RETVAL	937	RETVAL
782		938
783	void	939	void
784	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.)
785	CODE:	941	CODE:
786	self->r = r;	942	self->r = r;
787	self->g = g;	943	self->g = g;
788	self->b = b;	944	self->b = b;
789	self->a = a;	945	self->a = a;
790		946
791	void	947	void
792	set_font (CFClient::Layout self, CFClient::Font font = 0)	948	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
793	CODE:	949	CODE:
794	if (self->font != font)	950	if (self->font != font)
795	{	951	{
796	self->font = font;	952	self->font = font;
797	layout_update_font (self);	953	layout_update_font (self);
798	}	954	}
799		955
800	void	956	void
801	set_height (CFClient::Layout self, int base_height)	957	set_height (CFPlus::Layout self, int base_height)
802	CODE:	958	CODE:
803	if (self->base_height != base_height)	959	if (self->base_height != base_height)
804	{	960	{
805	self->base_height = base_height;	961	self->base_height = base_height;
806	layout_update_font (self);	962	layout_update_font (self);
807	}	963	}
808		964
809	void	965	void
810	set_width (CFClient::Layout self, int max_width = -1)	966	set_width (CFPlus::Layout self, int max_width = -1)
811	CODE:	967	CODE:
812	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);
813		969
814	void	970	void
815	set_indent (CFClient::Layout self, int indent)	971	set_indent (CFPlus::Layout self, int indent)
816	CODE:	972	CODE:
817	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	973	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
818		974
819	void	975	void
820	set_spacing (CFClient::Layout self, int spacing)	976	set_spacing (CFPlus::Layout self, int spacing)
821	CODE:	977	CODE:
822	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	978	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
823		979
824	void	980	void
825	set_ellipsise (CFClient::Layout self, int ellipsise)	981	set_ellipsise (CFPlus::Layout self, int ellipsise)
826	CODE:	982	CODE:
827	pango_layout_set_ellipsize (self->pl,	983	pango_layout_set_ellipsize (self->pl,
828	ellipsise == 1 ? PANGO_ELLIPSIZE_START	984	ellipsise == 1 ? PANGO_ELLIPSIZE_START
829	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	985	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
830	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	986	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
831	: PANGO_ELLIPSIZE_NONE	987	: PANGO_ELLIPSIZE_NONE
832	);	988	);
833		989
834	void	990	void
835	set_single_paragraph_mode (CFClient::Layout self, int spm)	991	set_single_paragraph_mode (CFPlus::Layout self, int spm)
836	CODE:	992	CODE:
837	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	993	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
838		994
839	void	995	void
840	size (CFClient::Layout self)	996	size (CFPlus::Layout self)
841	PPCODE:	997	PPCODE:
842	{	998	{
843	int w, h;	999	int w, h;
844		1000
845	layout_get_pixel_size (self, &w, &h);	1001	layout_get_pixel_size (self, &w, &h);
…		…
848	PUSHs (sv_2mortal (newSViv (w)));	1004	PUSHs (sv_2mortal (newSViv (w)));
849	PUSHs (sv_2mortal (newSViv (h)));	1005	PUSHs (sv_2mortal (newSViv (h)));
850	}	1006	}
851		1007
852	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
853	xy_to_index (CFClient::Layout self, int x, int y)	1021	xy_to_index (CFPlus::Layout self, int x, int y)
854	CODE:	1022	CODE:
855	{	1023	{
856	int index, trailing;	1024	int index, trailing;
857	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);
858	RETVAL = index;	1026	RETVAL = index;
859	}	1027	}
860	OUTPUT:	1028	OUTPUT:
861	RETVAL	1029	RETVAL
862		1030
863	void	1031	void
864	cursor_pos (CFClient::Layout self, int index)	1032	cursor_pos (CFPlus::Layout self, int index)
865	PPCODE:	1033	PPCODE:
866	{	1034	{
867	PangoRectangle strong_pos;	1035	PangoRectangle strong_pos;
868	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1036	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
869		1037
…		…
872	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1040	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
873	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1041	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
874	}	1042	}
875		1043
876	void	1044	void
877	render (CFClient::Layout self)	1045	render (CFPlus::Layout self, float x, float y, int flags = 0)
878	PPCODE:	1046	PPCODE:
879	{	1047	pango_opengl_render_layout_subpixel (
880	SV *retval;	1048	self->pl,
881	int w, h;	1049	x * PANGO_SCALE, y * PANGO_SCALE,
		1050	self->r, self->g, self->b, self->a,
		1051	flags
		1052	);
882		1053
883	layout_get_pixel_size (self, &w, &h);	1054	MODULE = CFPlus PACKAGE = CFPlus::Texture
884		1055
885	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)
886	{	1064	{
887	cairo_surface_t *surface;	1065	int nw = minpot (ow);
888	cairo_t *cairo;	1066	int nh = minpot (oh);
889		1067
890	retval = newSV (w * h * 4);	1068	if (nw != ow \|\| nh != oh)
891	SvPOK_only (retval);
892	SvCUR_set (retval, w * h * 4);
893
894	memset (SvPVX (retval), 0, w * h * 4);
895
896	surface = cairo_image_surface_create_for_data (
897	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
898	cairo = cairo_create (surface);
899	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
900
901	pango_cairo_show_layout (cairo, self->pl);
902
903	cairo_destroy (cairo);
904	cairo_surface_destroy (surface);
905
906	// what a mess, and its premultiplied, too :(
907	{	1069	{
908	uint32_t p = (uint32_t )SvPVX (retval);	1070	if (SvOK (data_))
909	uint32_t e = p + w h;
910
911	while (p < e)
912	{	1071	{
913	uint32_t rgba = *p;	1072	STRLEN datalen;
914	rgba = (rgba >> 24) \| (rgba << 8);	1073	char *data = SvPVbyte (data_, datalen);
915	#if 0	1074	int bpp = datalen / (ow * oh);
916	#ifdef _WIN32	1075	SV result_ = sv_2mortal (newSV (nw nh * bpp));
917	{//D
918	uint8_t r = rgba >> 24;
919	uint8_t g = rgba >> 16;
920	uint8_t b = rgba >> 8;
921	uint8_t a = rgba >> 0;
922		1076
923	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_);
924	}	1085	}
925	#endif	1086
926	#endif	1087	sv_setiv (w_, nw);
927	rgba = SDL_SwapBE32 (rgba);	1088	sv_setiv (h_, nh);
928	*p++ = rgba;
929	}	1089	}
930	}
931
932	EXTEND (SP, 5);
933	PUSHs (sv_2mortal (newSViv (w)));
934	PUSHs (sv_2mortal (newSViv (h)));
935	PUSHs (sv_2mortal (retval));
936	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
937	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
938	}	1090	}
939	else
940	{
941	FT_Bitmap bitmap;
942
943	retval = newSV (w * h);
944	SvPOK_only (retval);
945	SvCUR_set (retval, w * h);
946
947	bitmap.rows = h;
948	bitmap.width = w;
949	bitmap.pitch = w;
950	bitmap.buffer = (unsigned char*)SvPVX (retval);
951	bitmap.num_grays = 256;
952	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
953
954	memset (bitmap.buffer, 0, w * h);
955
956	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
957
958	EXTEND (SP, 5);
959	PUSHs (sv_2mortal (newSViv (w)));
960	PUSHs (sv_2mortal (newSViv (h)));
961	PUSHs (sv_2mortal (retval));
962	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
963	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
964	}
965	}	1091	}
966		1092
967	MODULE = CFClient PACKAGE = CFClient::Texture
968
969	void	1093	void
970	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.)
971	PROTOTYPE: $$$;$$	1095	PROTOTYPE: $$$;$$
972	ALIAS:	1096	ALIAS:
973	draw_quad_alpha = 1	1097	draw_quad_alpha = 1
974	draw_quad_alpha_premultiplied = 2	1098	draw_quad_alpha_premultiplied = 2
975	CODE:	1099	CODE:
…		…
1013	glDisable (GL_ALPHA_TEST);	1137	glDisable (GL_ALPHA_TEST);
1014	glDisable (GL_BLEND);	1138	glDisable (GL_BLEND);
1015	}	1139	}
1016	}	1140	}
1017		1141
1018	MODULE = CFClient PACKAGE = CFClient::Map	1142	MODULE = CFPlus PACKAGE = CFPlus::Map
1019		1143
1020	CFClient::Map	1144	CFPlus::Map
1021	new (SV *class, int map_width, int map_height)	1145	new (SV *class, int map_width, int map_height)
1022	CODE:	1146	CODE:
1023	New (0, RETVAL, 1, struct map);	1147	New (0, RETVAL, 1, struct map);
1024	RETVAL->x = 0;	1148	RETVAL->x = 0;
1025	RETVAL->y = 0;	1149	RETVAL->y = 0;
…		…
1035	RETVAL->row = 0;	1159	RETVAL->row = 0;
1036	OUTPUT:	1160	OUTPUT:
1037	RETVAL	1161	RETVAL
1038		1162
1039	void	1163	void
1040	DESTROY (CFClient::Map self)	1164	DESTROY (CFPlus::Map self)
1041	CODE:	1165	CODE:
1042	{	1166	{
1043	map_clear (self);	1167	map_clear (self);
1044	Safefree (self->face);	1168	Safefree (self->face);
		1169	Safefree (self->tex);
1045	Safefree (self);	1170	Safefree (self);
1046	}	1171	}
1047		1172
1048	void	1173	void
1049	clear (CFClient::Map self)	1174	clear (CFPlus::Map self)
1050	CODE:	1175	CODE:
1051	map_clear (self);	1176	map_clear (self);
1052		1177
1053	void	1178	void
1054	set_face (CFClient::Map self, int face, int texid)	1179	set_face (CFPlus::Map self, int face, int texid)
1055	CODE:	1180	CODE:
1056	{	1181	{
1057	while (self->faces <= face)	1182	while (self->faces <= face)
1058	{	1183	{
1059	Append (mapface, self->face, self->faces, self->faces);	1184	Append (mapface, self->face, self->faces, self->faces);
…		…
1062		1187
1063	self->face [face] = texid;	1188	self->face [face] = texid;
1064	}	1189	}
1065		1190
1066	void	1191	void
1067	set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	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)
1068	CODE:	1193	CODE:
1069	{	1194	{
1070	while (self->texs <= texid)	1195	while (self->texs <= texid)
1071	{	1196	{
1072	Append (maptex, self->tex, self->texs, self->texs);	1197	Append (maptex, self->tex, self->texs, self->texs);
…		…
1096	// from transparent color bleeding and ugly wrapping effects.	1221	// from transparent color bleeding and ugly wrapping effects.
1097	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1222	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1098	}	1223	}
1099		1224
1100	int	1225	int
1101	ox (CFClient::Map self)	1226	ox (CFPlus::Map self)
1102	ALIAS:	1227	ALIAS:
1103	oy = 1	1228	oy = 1
1104	x = 2	1229	x = 2
1105	y = 3	1230	y = 3
1106	w = 4	1231	w = 4
…		…
1117	}	1242	}
1118	OUTPUT:	1243	OUTPUT:
1119	RETVAL	1244	RETVAL
1120		1245
1121	void	1246	void
1122	scroll (CFClient::Map self, int dx, int dy)	1247	scroll (CFPlus::Map self, int dx, int dy)
1123	CODE:	1248	CODE:
1124	{	1249	{
1125	if (dx > 0)	1250	if (dx > 0)
1126	map_blank (self, self->x, self->y, dx - 1, self->h);	1251	map_blank (self, self->x, self->y, dx, self->h);
1127	else if (dx < 0)	1252	else if (dx < 0)
1128	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);
1129		1254
1130	if (dy > 0)	1255	if (dy > 0)
1131	map_blank (self, self->x, self->y, self->w, dy - 1);	1256	map_blank (self, self->x, self->y, self->w, dy);
1132	else if (dy < 0)	1257	else if (dy < 0)
1133	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);
1134		1259
1135	self->ox += dx; self->x += dx;	1260	self->ox += dx; self->x += dx;
1136	self->oy += dy; self->y += dy;	1261	self->oy += dy; self->y += dy;
1137		1262
1138	while (self->y < 0)	1263	while (self->y < 0)
…		…
1143	self->y += MAP_EXTEND_Y;	1268	self->y += MAP_EXTEND_Y;
1144	}	1269	}
1145	}	1270	}
1146		1271
1147	void	1272	void
1148	map1a_update (CFClient::Map self, SV *data_)	1273	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1149	CODE:	1274	CODE:
1150	{	1275	{
1151	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1276	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1152	uint8_t data_end = (uint8_t )SvEND (data_);	1277	uint8_t data_end = (uint8_t )SvEND (data_);
1153	mapcell *cell;	1278	mapcell *cell;
1154	int x, y, flags;	1279	int x, y, flags;
1155		1280
1156	while (data < data_end)	1281	while (data < data_end - 1)
1157	{	1282	{
1158	flags = (data [0] << 8) + data [1]; data += 2;	1283	flags = (data [0] << 8) + data [1]; data += 2;
1159		1284
1160	x = ((flags >> 10) & 63) + self->x;	1285	x = self->x + ((flags >> 10) & 63);
1161	y = ((flags >> 4) & 63) + self->y;	1286	y = self->y + ((flags >> 4) & 63);
1162		1287
1163	cell = map_get_cell (self, x, y);	1288	cell = map_get_cell (self, x, y);
1164		1289
1165	if (flags & 15)	1290	if (flags & 15)
1166	{	1291	{
1167	if (cell->darkness < 0)	1292	if (!cell->darkness)
1168	{	1293	{
		1294	memset (cell, 0, sizeof (*cell));
1169	cell->darkness = 0;	1295	cell->darkness = 256;
1170	cell->face [0] = 0;
1171	cell->face [1] = 0;
1172	cell->face [2] = 0;
1173	}	1296	}
1174		1297
1175	cell->darkness = flags & 8 ? *data++ : 255;
1176
1177	//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	}
1178		1339
1179	if (flags & 4)	1340	if (flags & 4)
1180	{	1341	{
1181	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;
1182	}	1343	}
…		…
1190	{	1351	{
1191	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;
1192	}	1353	}
1193	}	1354	}
1194	else	1355	else
1195	cell->darkness = -1;	1356	cell->darkness = 0;
1196	}	1357	}
1197	}	1358	}
1198		1359
1199	SV *	1360	SV *
1200	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)
1201	CODE:	1362	CODE:
1202	{	1363	{
1203	int x1, x;	1364	int x1, x;
1204	int y1, y;	1365	int y1, y;
1205	int z;	1366	int z;
…		…
1255	}	1416	}
1256	OUTPUT:	1417	OUTPUT:
1257	RETVAL	1418	RETVAL
1258		1419
1259	void	1420	void
1260	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)
1261	PPCODE:	1422	CODE:
1262	{	1423	{
1263	int vx, vy;	1424	int vx, vy;
1264	int x, y, z;	1425	int x, y, z;
1265	int last_name;	1426	int last_name;
1266	mapface face;	1427	mapface face;
1267	int sw4 = (sw + 3) & ~3;
1268	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1269	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1270		1428
1271	memset (darkness, 255, sw4 * sh);
1272	SvPOK_only (darkness_sv);
1273	SvCUR_set (darkness_sv, sw4 * sh);
1274
1275	vx = self->x + (self->w - sw) / 2 - shift_x;	1429	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1276	vy = self->y + (self->h - sh) / 2 - shift_y;	1430	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1277		1431
1278	/*	1432	/*
1279	int vx = self->vx = self->w >= sw	1433	int vx = self->vx = self->w >= sw
1280	? self->x + (self->w - sw) / 2	1434	? self->x + (self->w - sw) / 2
1281	: 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));
…		…
1285	: 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));
1286	*/	1440	*/
1287		1441
1288	glColor4ub (255, 255, 255, 255);	1442	glColor4ub (255, 255, 255, 255);
1289		1443
		1444	glEnable (GL_BLEND);
1290	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1445	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1291	glEnable (GL_BLEND);
1292	glEnable (GL_TEXTURE_2D);	1446	glEnable (GL_TEXTURE_2D);
1293	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1447	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1294		1448
1295	glBegin (GL_QUADS);	1449	glBegin (GL_QUADS);
1296		1450
…		…
1305	for (x = 0; x < sw; x++)	1459	for (x = 0; x < sw; x++)
1306	if (row->c0 <= x + vx && x + vx < row->c1)	1460	if (row->c0 <= x + vx && x + vx < row->c1)
1307	{	1461	{
1308	mapcell *cell = row->col + (x + vx - row->c0);	1462	mapcell *cell = row->col + (x + vx - row->c0);
1309		1463
1310	darkness[y * sw4 + x] = cell->darkness < 0
1311	? 255 - FOW_DARKNESS
1312	: 255 - cell->darkness;
1313
1314	face = cell->face [z];	1464	face = cell->face [z];
1315		1465
1316	if (face)	1466	if (face && face < self->texs)
1317	{	1467	{
1318	maptex tex = self->tex [face];	1468	maptex tex = self->tex [face];
1319
1320	int px = (x + 1) * 32 - tex.w;	1469	int px = (x + 1) * 32 - tex.w;
1321	int py = (y + 1) * 32 - tex.h;	1470	int py = (y + 1) * 32 - tex.h;
1322		1471
1323	if (last_name != tex.name)	1472	if (last_name != tex.name)
1324	{	1473	{
1325	glEnd ();	1474	glEnd ();
1326	last_name = tex.name;
1327	glBindTexture (GL_TEXTURE_2D, last_name);	1475	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1328	glBegin (GL_QUADS);	1476	glBegin (GL_QUADS);
1329	}	1477	}
1330		1478
1331	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1479	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1332	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1480	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1333	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);
1334	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1482	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1335	}	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	}
1336	}	1503	}
1337	}	1504	}
1338		1505
1339	glEnd ();	1506	glEnd ();
1340		1507
1341	glDisable (GL_TEXTURE_2D);	1508	glDisable (GL_TEXTURE_2D);
1342	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	}
1343		1635
1344	EXTEND (SP, 3);	1636	EXTEND (SP, 3);
1345	PUSHs (sv_2mortal (newSViv (sw4)));	1637	PUSHs (sv_2mortal (newSViv (sw4)));
1346	PUSHs (sv_2mortal (newSViv (sh)));	1638	PUSHs (sv_2mortal (newSViv (sh)));
1347	PUSHs (darkness_sv);	1639	PUSHs (darkness_sv);
1348	}	1640	}
1349		1641
1350	SV *	1642	SV *
1351	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)
1352	CODE:	1644	CODE:
1353	{	1645	{
1354	int x, y, x1, y1;	1646	int x, y, x1, y1;
1355	SV data_sv = newSV (w h * 7 + 5);	1647	SV data_sv = newSV (w h * 7 + 5);
1356	uint8_t data = (uint8_t )SvPVX (data_sv);	1648	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1418	}	1710	}
1419	OUTPUT:	1711	OUTPUT:
1420	RETVAL	1712	RETVAL
1421		1713
1422	void	1714	void
1423	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)
1424	PPCODE:	1716	PPCODE:
1425	{	1717	{
1426	int x, y, z;	1718	int x, y, z;
1427	int w, h;	1719	int w, h;
1428	int x1, y1;	1720	int x1, y1;
…		…
1460		1752
1461	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1753	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1462	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1754	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1463	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1755	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1464		1756
1465	if (cell->darkness <= 0)	1757	if (cell->darkness == 0)
1466	{	1758	{
1467	cell->darkness = -1;	1759	cell->darkness = 0;
1468		1760
1469	for (z = 0; z <= 2; z++)	1761	for (z = 0; z <= 2; z++)
1470	{	1762	{
1471	cell->face[z] = face[z];	1763	cell->face[z] = face[z];
1472		1764
…		…
1477	}	1769	}
1478	}	1770	}
1479	}	1771	}
1480	}	1772	}
1481		1773
1482	MODULE = CFClient PACKAGE = CFClient::MixChunk	1774	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1483		1775
1484	CFClient::MixChunk	1776	CFPlus::MixChunk
1485	new_from_file (SV class, char path)	1777	new_from_file (SV class, char path)
1486	CODE:	1778	CODE:
1487	RETVAL = Mix_LoadWAV (path);	1779	RETVAL = Mix_LoadWAV (path);
1488	OUTPUT:	1780	OUTPUT:
1489	RETVAL	1781	RETVAL
1490		1782
1491	void	1783	void
1492	DESTROY (CFClient::MixChunk self)	1784	DESTROY (CFPlus::MixChunk self)
1493	CODE:	1785	CODE:
1494	Mix_FreeChunk (self);	1786	Mix_FreeChunk (self);
1495		1787
1496	int	1788	int
1497	volume (CFClient::MixChunk self, int volume = -1)	1789	volume (CFPlus::MixChunk self, int volume = -1)
1498	CODE:	1790	CODE:
1499	RETVAL = Mix_VolumeChunk (self, volume);	1791	RETVAL = Mix_VolumeChunk (self, volume);
1500	OUTPUT:	1792	OUTPUT:
1501	RETVAL	1793	RETVAL
1502		1794
1503	int	1795	int
1504	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)
1505	CODE:	1797	CODE:
1506	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1798	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1507	OUTPUT:	1799	OUTPUT:
1508	RETVAL	1800	RETVAL
1509		1801
1510	MODULE = CFClient PACKAGE = CFClient::MixMusic	1802	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1511		1803
1512	int	1804	int
1513	volume (int volume = -1)	1805	volume (int volume = -1)
1514	CODE:	1806	CODE:
1515	RETVAL = Mix_VolumeMusic (volume);	1807	RETVAL = Mix_VolumeMusic (volume);
1516	OUTPUT:	1808	OUTPUT:
1517	RETVAL	1809	RETVAL
1518		1810
1519	CFClient::MixMusic	1811	CFPlus::MixMusic
1520	new_from_file (SV class, char path)	1812	new_from_file (SV class, char path)
1521	CODE:	1813	CODE:
1522	RETVAL = Mix_LoadMUS (path);	1814	RETVAL = Mix_LoadMUS (path);
1523	OUTPUT:	1815	OUTPUT:
1524	RETVAL	1816	RETVAL
1525		1817
1526	void	1818	void
1527	DESTROY (CFClient::MixMusic self)	1819	DESTROY (CFPlus::MixMusic self)
1528	CODE:	1820	CODE:
1529	Mix_FreeMusic (self);	1821	Mix_FreeMusic (self);
1530		1822
1531	int	1823	int
1532	play (CFClient::MixMusic self, int loops = -1)	1824	play (CFPlus::MixMusic self, int loops = -1)
1533	CODE:	1825	CODE:
1534	RETVAL = Mix_PlayMusic (self, loops);	1826	RETVAL = Mix_PlayMusic (self, loops);
1535	OUTPUT:	1827	OUTPUT:
1536	RETVAL	1828	RETVAL
1537		1829
1538	MODULE = CFClient PACKAGE = CFClient::OpenGL	1830	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1539		1831
1540	BOOT:	1832	BOOT:
1541	{	1833	{
1542	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1834	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1543	static const struct {	1835	static const struct {
1544	const char *name;	1836	const char *name;
1545	IV iv;	1837	IV iv;
1546	} *civ, const_iv[] = {	1838	} *civ, const_iv[] = {
1547	# define const_iv(name) { # name, (IV)name }	1839	# define const_iv(name) { # name, (IV)name }
…		…
1554	const_iv (GL_SCISSOR_TEST),	1846	const_iv (GL_SCISSOR_TEST),
1555	const_iv (GL_DEPTH_TEST),	1847	const_iv (GL_DEPTH_TEST),
1556	const_iv (GL_ALPHA_TEST),	1848	const_iv (GL_ALPHA_TEST),
1557	const_iv (GL_NORMALIZE),	1849	const_iv (GL_NORMALIZE),
1558	const_iv (GL_RESCALE_NORMAL),	1850	const_iv (GL_RESCALE_NORMAL),
		1851	const_iv (GL_FRONT),
		1852	const_iv (GL_BACK),
1559	const_iv (GL_AND),	1853	const_iv (GL_AND),
1560	const_iv (GL_ONE),	1854	const_iv (GL_ONE),
1561	const_iv (GL_ZERO),	1855	const_iv (GL_ZERO),
1562	const_iv (GL_SRC_ALPHA),	1856	const_iv (GL_SRC_ALPHA),
1563	const_iv (GL_DST_ALPHA),	1857	const_iv (GL_DST_ALPHA),
1564	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1858	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1565	const_iv (GL_ONE_MINUS_DST_ALPHA),	1859	const_iv (GL_ONE_MINUS_DST_ALPHA),
1566	const_iv (GL_SRC_ALPHA_SATURATE),	1860	const_iv (GL_SRC_ALPHA_SATURATE),
1567	const_iv (GL_RGB),	1861	const_iv (GL_RGB),
1568	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),
1569	const_iv (GL_UNSIGNED_BYTE),	1866	const_iv (GL_UNSIGNED_BYTE),
1570	const_iv (GL_UNSIGNED_SHORT),	1867	const_iv (GL_UNSIGNED_SHORT),
1571	const_iv (GL_UNSIGNED_INT),	1868	const_iv (GL_UNSIGNED_INT),
1572	const_iv (GL_ALPHA),	1869	const_iv (GL_ALPHA),
1573	const_iv (GL_INTENSITY),	1870	const_iv (GL_INTENSITY),
…		…
1605	const_iv (GL_SEPARABLE_2D),	1902	const_iv (GL_SEPARABLE_2D),
1606	const_iv (GL_CONVOLUTION_2D),	1903	const_iv (GL_CONVOLUTION_2D),
1607	const_iv (GL_CONVOLUTION_BORDER_MODE),	1904	const_iv (GL_CONVOLUTION_BORDER_MODE),
1608	const_iv (GL_CONSTANT_BORDER),	1905	const_iv (GL_CONSTANT_BORDER),
1609	const_iv (GL_LINES),	1906	const_iv (GL_LINES),
		1907	const_iv (GL_LINE_STRIP),
1610	const_iv (GL_LINE_LOOP),	1908	const_iv (GL_LINE_LOOP),
1611	const_iv (GL_QUADS),	1909	const_iv (GL_QUADS),
1612	const_iv (GL_QUAD_STRIP),	1910	const_iv (GL_QUAD_STRIP),
1613	const_iv (GL_TRIANGLES),	1911	const_iv (GL_TRIANGLES),
1614	const_iv (GL_TRIANGLE_STRIP),	1912	const_iv (GL_TRIANGLE_STRIP),
…		…
1647	OUTPUT:	1945	OUTPUT:
1648	RETVAL	1946	RETVAL
1649		1947
1650	int glGetError ()	1948	int glGetError ()
1651		1949
		1950	void glFinish ()
		1951
1652	void glClear (int mask)	1952	void glClear (int mask)
1653		1953
1654	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)
1655	PROTOTYPE: @	1955	PROTOTYPE: @
1656		1956
…		…
1679	void glPushMatrix ()	1979	void glPushMatrix ()
1680		1980
1681	void glPopMatrix ()	1981	void glPopMatrix ()
1682		1982
1683	void glLoadIdentity ()	1983	void glLoadIdentity ()
		1984
		1985	void glDrawBuffer (int buffer)
		1986
		1987	void glReadBuffer (int buffer)
1684		1988
1685	# near_ and far_ are due to microsofts buggy "c" compiler	1989	# near_ and far_ are due to microsofts buggy "c" compiler
1686	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1990	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1687		1991
1688	# near_ and far_ are due to microsofts buggy "c" compiler	1992	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1718	r *= a;	2022	r *= a;
1719	g *= a;	2023	g *= a;
1720	b *= a;	2024	b *= a;
1721	}	2025	}
1722	// microsoft visual "c" rounds instead of truncating...	2026	// microsoft visual "c" rounds instead of truncating...
1723	glColor4ub (MIN ((int)(r * 256.f), 255),	2027	glColor4f (r, g, b, a);
1724	MIN ((int)(g * 256.f), 255),
1725	MIN ((int)(b * 256.f), 255),
1726	MIN ((int)(a * 256.f), 255));
1727		2028
1728	void glInterleavedArrays (int format, int stride, char *data)	2029	void glInterleavedArrays (int format, int stride, char *data)
1729		2030
1730	void glDrawElements (int mode, int count, int type, char *indices)	2031	void glDrawElements (int mode, int count, int type, char *indices)
1731		2032
…		…
1808		2109
1809	void glEndList ()	2110	void glEndList ()
1810		2111
1811	void glCallList (int list)	2112	void glCallList (int list)
1812		2113
1813

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC vs. Revision 1.156 by root, Thu Sep 21 14:47:51 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.156 by root, Thu Sep 21 14:47:51 2006 UTC