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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.108 by root, Wed Jun 7 23:28:12 2006 UTC vs. Revision 1.154 by root, Tue Sep 19 22:23:30 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.108 by root, Wed Jun 7 23:28:12 2006 UTC vs.
Revision 1.154 by root, Tue Sep 19 22:23:30 2006 UTC