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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.103 by root, Sun Jun 4 23:05:05 2006 UTC vs.
Revision 1.155 by root, Thu Sep 21 00:16:42 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
		803	new (SV *class)
		804	CODE:
725	New (0, RETVAL, 1, struct cf_layout);	805	New (0, RETVAL, 1, struct cf_layout);
726		806
727	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	807	RETVAL->pl = pango_layout_new (opengl_context);
728	RETVAL->rgba = rgba;
729	RETVAL->r = 1.;	808	RETVAL->r = 1.;
730	RETVAL->g = 1.;	809	RETVAL->g = 1.;
731	RETVAL->b = 1.;	810	RETVAL->b = 1.;
732	RETVAL->a = 1.;	811	RETVAL->a = 1.;
733	RETVAL->base_height = MIN_FONT_HEIGHT;	812	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
737	layout_update_font (RETVAL);	816	layout_update_font (RETVAL);
738	OUTPUT:	817	OUTPUT:
739	RETVAL	818	RETVAL
740		819
741	void	820	void
742	DESTROY (CFClient::Layout self)	821	DESTROY (CFPlus::Layout self)
743	CODE:	822	CODE:
744	g_object_unref (self->pl);	823	g_object_unref (self->pl);
745	Safefree (self);	824	Safefree (self);
746		825
747	int
748	is_rgba (CFClient::Layout self)
749	CODE:
750	RETVAL = self->rgba;
751	OUTPUT:
752	RETVAL
753
754	void	826	void
755	set_text (CFClient::Layout self, SV *text_)	827	set_text (CFPlus::Layout self, SV *text_)
756	CODE:	828	CODE:
757	{	829	{
758	STRLEN textlen;	830	STRLEN textlen;
759	char *text = SvPVutf8 (text_, textlen);	831	char *text = SvPVutf8 (text_, textlen);
760		832
761	pango_layout_set_text (self->pl, text, textlen);	833	pango_layout_set_text (self->pl, text, textlen);
762	}	834	}
763		835
764	void	836	void
765	set_markup (CFClient::Layout self, SV *text_)	837	set_markup (CFPlus::Layout self, SV *text_)
766	CODE:	838	CODE:
767	{	839	{
768	STRLEN textlen;	840	STRLEN textlen;
769	char *text = SvPVutf8 (text_, textlen);	841	char *text = SvPVutf8 (text_, textlen);
770		842
771	pango_layout_set_markup (self->pl, text, textlen);	843	pango_layout_set_markup (self->pl, text, textlen);
772	}	844	}
773		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
774	SV *	931	SV *
775	get_text (CFClient::Layout self)	932	get_text (CFPlus::Layout self)
776	CODE:	933	CODE:
777	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	934	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
778	SvUTF8_on (RETVAL);	935	sv_utf8_decode (RETVAL);
779	OUTPUT:	936	OUTPUT:
780	RETVAL	937	RETVAL
781		938
782	void	939	void
783	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.)
784	CODE:	941	CODE:
785	self->r = r;	942	self->r = r;
786	self->g = g;	943	self->g = g;
787	self->b = b;	944	self->b = b;
788	self->a = a;	945	self->a = a;
789		946
790	void	947	void
791	set_font (CFClient::Layout self, CFClient::Font font = 0)	948	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
792	CODE:	949	CODE:
793	if (self->font != font)	950	if (self->font != font)
794	{	951	{
795	self->font = font;	952	self->font = font;
796	layout_update_font (self);	953	layout_update_font (self);
797	}	954	}
798		955
799	void	956	void
800	set_height (CFClient::Layout self, int base_height)	957	set_height (CFPlus::Layout self, int base_height)
801	CODE:	958	CODE:
802	if (self->base_height != base_height)	959	if (self->base_height != base_height)
803	{	960	{
804	self->base_height = base_height;	961	self->base_height = base_height;
805	layout_update_font (self);	962	layout_update_font (self);
806	}	963	}
807		964
808	void	965	void
809	set_width (CFClient::Layout self, int max_width = -1)	966	set_width (CFPlus::Layout self, int max_width = -1)
810	CODE:	967	CODE:
811	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);
812		969
813	void	970	void
814	set_indent (CFClient::Layout self, int indent)	971	set_indent (CFPlus::Layout self, int indent)
815	CODE:	972	CODE:
816	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	973	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
817		974
818	void	975	void
819	set_spacing (CFClient::Layout self, int spacing)	976	set_spacing (CFPlus::Layout self, int spacing)
820	CODE:	977	CODE:
821	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	978	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
822		979
823	void	980	void
824	set_ellipsise (CFClient::Layout self, int ellipsise)	981	set_ellipsise (CFPlus::Layout self, int ellipsise)
825	CODE:	982	CODE:
826	pango_layout_set_ellipsize (self->pl,	983	pango_layout_set_ellipsize (self->pl,
827	ellipsise == 1 ? PANGO_ELLIPSIZE_START	984	ellipsise == 1 ? PANGO_ELLIPSIZE_START
828	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	985	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
829	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	986	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
830	: PANGO_ELLIPSIZE_NONE	987	: PANGO_ELLIPSIZE_NONE
831	);	988	);
832		989
833	void	990	void
834	set_single_paragraph_mode (CFClient::Layout self, int spm)	991	set_single_paragraph_mode (CFPlus::Layout self, int spm)
835	CODE:	992	CODE:
836	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	993	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
837		994
838	void	995	void
839	size (CFClient::Layout self)	996	size (CFPlus::Layout self)
840	PPCODE:	997	PPCODE:
841	{	998	{
842	int w, h;	999	int w, h;
843		1000
844	layout_get_pixel_size (self, &w, &h);	1001	layout_get_pixel_size (self, &w, &h);
…		…
847	PUSHs (sv_2mortal (newSViv (w)));	1004	PUSHs (sv_2mortal (newSViv (w)));
848	PUSHs (sv_2mortal (newSViv (h)));	1005	PUSHs (sv_2mortal (newSViv (h)));
849	}	1006	}
850		1007
851	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
852	xy_to_index (CFClient::Layout self, int x, int y)	1021	xy_to_index (CFPlus::Layout self, int x, int y)
853	CODE:	1022	CODE:
854	{	1023	{
855	int index, trailing;	1024	int index, trailing;
856	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);
857	RETVAL = index;	1026	RETVAL = index;
858	}	1027	}
859	OUTPUT:	1028	OUTPUT:
860	RETVAL	1029	RETVAL
861		1030
862	void	1031	void
863	cursor_pos (CFClient::Layout self, int index)	1032	cursor_pos (CFPlus::Layout self, int index)
864	PPCODE:	1033	PPCODE:
865	{	1034	{
866	PangoRectangle strong_pos;	1035	PangoRectangle strong_pos;
867	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1036	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
868		1037
…		…
871	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1040	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
872	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1041	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
873	}	1042	}
874		1043
875	void	1044	void
876	render (CFClient::Layout self)	1045	render (CFPlus::Layout self, float x, float y, int flags = 0)
877	PPCODE:	1046	PPCODE:
878	{	1047	pango_opengl_render_layout_subpixel (
879	SV *retval;	1048	self->pl,
880	int w, h;	1049	x * PANGO_SCALE, y * PANGO_SCALE,
		1050	self->r, self->g, self->b, self->a,
		1051	flags
		1052	);
881		1053
882	layout_get_pixel_size (self, &w, &h);	1054	MODULE = CFPlus PACKAGE = CFPlus::Texture
883		1055
884	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)
885	{	1064	{
886	cairo_surface_t *surface;	1065	int nw = minpot (ow);
887	cairo_t *cairo;	1066	int nh = minpot (oh);
888		1067
889	retval = newSV (w * h * 4);	1068	if (nw != ow \|\| nh != oh)
890	SvPOK_only (retval);
891	SvCUR_set (retval, w * h * 4);
892
893	memset (SvPVX (retval), 0, w * h * 4);
894
895	surface = cairo_image_surface_create_for_data (
896	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
897	cairo = cairo_create (surface);
898	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
899
900	pango_cairo_show_layout (cairo, self->pl);
901
902	cairo_destroy (cairo);
903	cairo_surface_destroy (surface);
904
905	// what a mess, and its premultiplied, too :(
906	{	1069	{
907	uint32_t p = (uint32_t )SvPVX (retval);	1070	if (SvOK (data_))
908	uint32_t e = p + w h;
909
910	while (p < e)
911	{	1071	{
912	uint32_t rgba = *p;	1072	STRLEN datalen;
913	rgba = (rgba >> 24) \| (rgba << 8);	1073	char *data = SvPVbyte (data_, datalen);
914	#if 0	1074	int bpp = datalen / (ow * oh);
915	#ifdef _WIN32	1075	SV result_ = sv_2mortal (newSV (nw nh * bpp));
916	{//D
917	uint8_t r = rgba >> 24;
918	uint8_t g = rgba >> 16;
919	uint8_t b = rgba >> 8;
920	uint8_t a = rgba >> 0;
921		1076
922	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_);
923	}	1085	}
924	#endif	1086
925	#endif	1087	sv_setiv (w_, nw);
926	rgba = SDL_SwapBE32 (rgba);	1088	sv_setiv (h_, nh);
927	*p++ = rgba;
928	}	1089	}
929	}
930
931	EXTEND (SP, 5);
932	PUSHs (sv_2mortal (newSViv (w)));
933	PUSHs (sv_2mortal (newSViv (h)));
934	PUSHs (sv_2mortal (retval));
935	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
936	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
937	}	1090	}
938	else
939	{
940	FT_Bitmap bitmap;
941
942	retval = newSV (w * h);
943	SvPOK_only (retval);
944	SvCUR_set (retval, w * h);
945
946	bitmap.rows = h;
947	bitmap.width = w;
948	bitmap.pitch = w;
949	bitmap.buffer = (unsigned char*)SvPVX (retval);
950	bitmap.num_grays = 256;
951	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
952
953	memset (bitmap.buffer, 0, w * h);
954
955	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
956
957	EXTEND (SP, 5);
958	PUSHs (sv_2mortal (newSViv (w)));
959	PUSHs (sv_2mortal (newSViv (h)));
960	PUSHs (sv_2mortal (retval));
961	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
962	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
963	}
964	}	1091	}
965		1092
966	MODULE = CFClient PACKAGE = CFClient::Texture
967
968	void	1093	void
969	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.)
970	PROTOTYPE: $$$;$$	1095	PROTOTYPE: $$$;$$
971	ALIAS:	1096	ALIAS:
972	draw_quad_alpha = 1	1097	draw_quad_alpha = 1
973	draw_quad_alpha_premultiplied = 2	1098	draw_quad_alpha_premultiplied = 2
974	CODE:	1099	CODE:
…		…
990		1115
991	if (ix == 2)	1116	if (ix == 2)
992	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1117	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
993	else	1118	else
994	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	1119	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
995	GL_ONE_MINUS_DST_ALPHA, GL_ONE);	1120	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
996		1121
997	glEnable (GL_ALPHA_TEST);	1122	glEnable (GL_ALPHA_TEST);
998	glAlphaFunc (GL_GREATER, 0.01f);	1123	glAlphaFunc (GL_GREATER, 0.01f);
999	}	1124	}
1000		1125
…		…
1012	glDisable (GL_ALPHA_TEST);	1137	glDisable (GL_ALPHA_TEST);
1013	glDisable (GL_BLEND);	1138	glDisable (GL_BLEND);
1014	}	1139	}
1015	}	1140	}
1016		1141
1017	MODULE = CFClient PACKAGE = CFClient::Map	1142	MODULE = CFPlus PACKAGE = CFPlus::Map
1018		1143
1019	CFClient::Map	1144	CFPlus::Map
1020	new (SV *class, int map_width, int map_height)	1145	new (SV *class, int map_width, int map_height)
1021	CODE:	1146	CODE:
1022	New (0, RETVAL, 1, struct map);	1147	New (0, RETVAL, 1, struct map);
1023	RETVAL->x = 0;	1148	RETVAL->x = 0;
1024	RETVAL->y = 0;	1149	RETVAL->y = 0;
…		…
1034	RETVAL->row = 0;	1159	RETVAL->row = 0;
1035	OUTPUT:	1160	OUTPUT:
1036	RETVAL	1161	RETVAL
1037		1162
1038	void	1163	void
1039	DESTROY (CFClient::Map self)	1164	DESTROY (CFPlus::Map self)
1040	CODE:	1165	CODE:
1041	{	1166	{
1042	map_clear (self);	1167	map_clear (self);
1043	Safefree (self->face);	1168	Safefree (self->face);
		1169	Safefree (self->tex);
1044	Safefree (self);	1170	Safefree (self);
1045	}	1171	}
1046		1172
1047	void	1173	void
1048	clear (CFClient::Map self)	1174	clear (CFPlus::Map self)
1049	CODE:	1175	CODE:
1050	map_clear (self);	1176	map_clear (self);
1051		1177
1052	void	1178	void
1053	set_face (CFClient::Map self, int face, int texid)	1179	set_face (CFPlus::Map self, int face, int texid)
1054	CODE:	1180	CODE:
1055	{	1181	{
1056	while (self->faces <= face)	1182	while (self->faces <= face)
1057	{	1183	{
1058	Append (mapface, self->face, self->faces, self->faces);	1184	Append (mapface, self->face, self->faces, self->faces);
…		…
1061		1187
1062	self->face [face] = texid;	1188	self->face [face] = texid;
1063	}	1189	}
1064		1190
1065	void	1191	void
1066	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)
1067	CODE:	1193	CODE:
1068	{	1194	{
1069	while (self->texs <= texid)	1195	while (self->texs <= texid)
1070	{	1196	{
1071	Append (maptex, self->tex, self->texs, self->texs);	1197	Append (maptex, self->tex, self->texs, self->texs);
…		…
1095	// from transparent color bleeding and ugly wrapping effects.	1221	// from transparent color bleeding and ugly wrapping effects.
1096	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1222	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1097	}	1223	}
1098		1224
1099	int	1225	int
1100	ox (CFClient::Map self)	1226	ox (CFPlus::Map self)
1101	ALIAS:	1227	ALIAS:
1102	oy = 1	1228	oy = 1
1103	x = 2	1229	x = 2
1104	y = 3	1230	y = 3
1105	w = 4	1231	w = 4
…		…
1116	}	1242	}
1117	OUTPUT:	1243	OUTPUT:
1118	RETVAL	1244	RETVAL
1119		1245
1120	void	1246	void
1121	scroll (CFClient::Map self, int dx, int dy)	1247	scroll (CFPlus::Map self, int dx, int dy)
1122	CODE:	1248	CODE:
1123	{	1249	{
1124	if (dx > 0)	1250	if (dx > 0)
1125	map_blank (self, self->x, self->y, dx - 1, self->h);	1251	map_blank (self, self->x, self->y, dx, self->h);
1126	else if (dx < 0)	1252	else if (dx < 0)
1127	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);
1128		1254
1129	if (dy > 0)	1255	if (dy > 0)
1130	map_blank (self, self->x, self->y, self->w, dy - 1);	1256	map_blank (self, self->x, self->y, self->w, dy);
1131	else if (dy < 0)	1257	else if (dy < 0)
1132	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);
1133		1259
1134	self->ox += dx; self->x += dx;	1260	self->ox += dx; self->x += dx;
1135	self->oy += dy; self->y += dy;	1261	self->oy += dy; self->y += dy;
1136		1262
1137	while (self->y < 0)	1263	while (self->y < 0)
…		…
1142	self->y += MAP_EXTEND_Y;	1268	self->y += MAP_EXTEND_Y;
1143	}	1269	}
1144	}	1270	}
1145		1271
1146	void	1272	void
1147	map1a_update (CFClient::Map self, SV *data_)	1273	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1148	CODE:	1274	CODE:
1149	{	1275	{
1150	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1276	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1151	uint8_t data_end = (uint8_t )SvEND (data_);	1277	uint8_t data_end = (uint8_t )SvEND (data_);
1152	mapcell *cell;	1278	mapcell *cell;
1153	int x, y, flags;	1279	int x, y, flags;
1154		1280
1155	while (data < data_end)	1281	while (data < data_end - 1)
1156	{	1282	{
1157	flags = (data [0] << 8) + data [1]; data += 2;	1283	flags = (data [0] << 8) + data [1]; data += 2;
1158		1284
1159	x = ((flags >> 10) & 63) + self->x;	1285	x = self->x + ((flags >> 10) & 63);
1160	y = ((flags >> 4) & 63) + self->y;	1286	y = self->y + ((flags >> 4) & 63);
1161		1287
1162	cell = map_get_cell (self, x, y);	1288	cell = map_get_cell (self, x, y);
1163		1289
1164	if (flags & 15)	1290	if (flags & 15)
1165	{	1291	{
1166	if (cell->darkness < 0)	1292	if (!cell->darkness)
1167	{	1293	{
		1294	memset (cell, 0, sizeof (*cell));
1168	cell->darkness = 0;	1295	cell->darkness = 256;
1169	cell->face [0] = 0;
1170	cell->face [1] = 0;
1171	cell->face [2] = 0;
1172	}	1296	}
1173		1297
1174	cell->darkness = flags & 8 ? *data++ : 255;
1175
1176	//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	}
1177		1340
1178	if (flags & 4)	1341	if (flags & 4)
1179	{	1342	{
1180	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;
1181	}	1344	}
…		…
1189	{	1352	{
1190	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;
1191	}	1354	}
1192	}	1355	}
1193	else	1356	else
1194	cell->darkness = -1;	1357	cell->darkness = 0;
1195	}	1358	}
1196	}	1359	}
1197		1360
1198	SV *	1361	SV *
1199	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1362	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1200	CODE:	1363	CODE:
1201	{	1364	{
1202	int x1, x;	1365	int x1, x;
1203	int y1, y;	1366	int y1, y;
1204	int z;	1367	int z;
…		…
1254	}	1417	}
1255	OUTPUT:	1418	OUTPUT:
1256	RETVAL	1419	RETVAL
1257		1420
1258	void	1421	void
1259	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1422	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1260	PPCODE:	1423	CODE:
1261	{	1424	{
1262	int vx, vy;	1425	int vx, vy;
1263	int x, y, z;	1426	int x, y, z;
1264	int last_name;	1427	int last_name;
1265	mapface face;	1428	mapface face;
1266	int sw4 = (sw + 3) & ~3;
1267	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1268	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1269		1429
1270	memset (darkness, 255, sw4 * sh);
1271	SvPOK_only (darkness_sv);
1272	SvCUR_set (darkness_sv, sw4 * sh);
1273
1274	vx = self->x + (self->w - sw) / 2 - shift_x;	1430	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1275	vy = self->y + (self->h - sh) / 2 - shift_y;	1431	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1276		1432
1277	/*	1433	/*
1278	int vx = self->vx = self->w >= sw	1434	int vx = self->vx = self->w >= sw
1279	? self->x + (self->w - sw) / 2	1435	? self->x + (self->w - sw) / 2
1280	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1436	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1284	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1440	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1285	*/	1441	*/
1286		1442
1287	glColor4ub (255, 255, 255, 255);	1443	glColor4ub (255, 255, 255, 255);
1288		1444
		1445	glEnable (GL_BLEND);
1289	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1446	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1290	glEnable (GL_BLEND);
1291	glEnable (GL_TEXTURE_2D);	1447	glEnable (GL_TEXTURE_2D);
1292	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1448	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1293		1449
1294	glBegin (GL_QUADS);	1450	glBegin (GL_QUADS);
1295		1451
…		…
1304	for (x = 0; x < sw; x++)	1460	for (x = 0; x < sw; x++)
1305	if (row->c0 <= x + vx && x + vx < row->c1)	1461	if (row->c0 <= x + vx && x + vx < row->c1)
1306	{	1462	{
1307	mapcell *cell = row->col + (x + vx - row->c0);	1463	mapcell *cell = row->col + (x + vx - row->c0);
1308		1464
1309	darkness[y * sw4 + x] = cell->darkness < 0
1310	? 255 - FOW_DARKNESS
1311	: 255 - cell->darkness;
1312
1313	face = cell->face [z];	1465	face = cell->face [z];
1314		1466
1315	if (face)	1467	if (face && face < self->texs)
1316	{	1468	{
1317	maptex tex = self->tex [face];	1469	maptex tex = self->tex [face];
1318
1319	int px = (x + 1) * 32 - tex.w;	1470	int px = (x + 1) * 32 - tex.w;
1320	int py = (y + 1) * 32 - tex.h;	1471	int py = (y + 1) * 32 - tex.h;
1321		1472
1322	if (last_name != tex.name)	1473	if (last_name != tex.name)
1323	{	1474	{
1324	glEnd ();	1475	glEnd ();
1325	last_name = tex.name;
1326	glBindTexture (GL_TEXTURE_2D, last_name);	1476	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1327	glBegin (GL_QUADS);	1477	glBegin (GL_QUADS);
1328	}	1478	}
1329		1479
1330	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1480	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1331	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1481	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1332	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1482	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1333	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1483	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1334	}	1484	}
		1485
		1486	if (cell->flags && z == 2)
		1487	{
		1488	if (cell->flags & 1)
		1489	{
		1490	maptex tex = self->tex [1];
		1491	int px = (x + 1) * 32 - tex.w + 2;
		1492	int py = (y + 1) * 32 - tex.h - 6;
		1493
		1494	glEnd ();
		1495	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1496	glBegin (GL_QUADS);
		1497
		1498	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1499	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1500	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1501	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1502	}
		1503	}
1335	}	1504	}
1336	}	1505	}
1337		1506
1338	glEnd ();	1507	glEnd ();
1339		1508
1340	glDisable (GL_TEXTURE_2D);	1509	glDisable (GL_TEXTURE_2D);
1341	glDisable (GL_BLEND);	1510	glDisable (GL_BLEND);
		1511
		1512	// top layer: overlays such as the health bar
		1513	for (y = 0; y < sh; y++)
		1514	if (0 <= y + vy && y + vy < self->rows)
		1515	{
		1516	maprow *row = self->row + (y + vy);
		1517
		1518	for (x = 0; x < sw; x++)
		1519	if (row->c0 <= x + vx && x + vx < row->c1)
		1520	{
		1521	mapcell *cell = row->col + (x + vx - row->c0);
		1522
		1523	int px = x * 32;
		1524	int py = y * 32;
		1525
		1526	if (cell->stat_hp)
		1527	{
		1528	int width = cell->stat_width * 32;
		1529	int thick = sh / 28 + 1 + cell->stat_width;
		1530
		1531	glColor3ub (0, 0, 0);
		1532	glRectf (px + 1, py - thick - 2,
		1533	px + width - 1, py);
		1534
		1535	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1536	glRectf (px + 2,
		1537	py - thick - 1,
		1538	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1539	}
		1540	}
		1541	}
		1542	}
		1543
		1544	void
		1545	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1546	CODE:
		1547	{
		1548	static float color[16][3] = {
		1549	{ 0.00F, 0.00F, 0.00F },
		1550	{ 1.00F, 1.00F, 1.00F },
		1551	{ 0.00F, 0.00F, 0.55F },
		1552	{ 1.00F, 0.00F, 0.00F },
		1553
		1554	{ 1.00F, 0.54F, 0.00F },
		1555	{ 0.11F, 0.56F, 1.00F },
		1556	{ 0.93F, 0.46F, 0.00F },
		1557	{ 0.18F, 0.54F, 0.34F },
		1558
		1559	{ 0.56F, 0.73F, 0.56F },
		1560	{ 0.80F, 0.80F, 0.80F },
		1561	{ 0.55F, 0.41F, 0.13F },
		1562	{ 0.99F, 0.77F, 0.26F },
		1563
		1564	{ 0.74F, 0.65F, 0.41F },
		1565
		1566	{ 0.00F, 1.00F, 1.00F },
		1567	{ 1.00F, 0.00F, 1.00F },
		1568	{ 1.00F, 1.00F, 0.00F },
		1569	};
		1570
		1571	int x, y;
		1572
		1573	glEnable (GL_TEXTURE_2D);
		1574	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1575	glEnable (GL_BLEND);
		1576	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1577	glBegin (GL_QUADS);
		1578
		1579	for (y = 0; y < h; y++)
		1580	for (x = 0; x < w; x++)
		1581	{
		1582	unsigned char m = data [x + y * w];
		1583
		1584	if (m)
		1585	{
		1586	float *c = color [m & 15];
		1587
		1588	float tx1 = m & 0x40 ? 0.5 : 0.;
		1589	float tx2 = tx1 + 0.5;
		1590
		1591	glColor4f (c[0], c[1], c[2], 0.75);
		1592	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1593	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1594	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1595	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1596	}
		1597	}
		1598
		1599	glEnd ();
		1600	glDisable (GL_BLEND);
		1601	glDisable (GL_TEXTURE_2D);
		1602	}
		1603
		1604	void
		1605	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1606	PPCODE:
		1607	{
		1608	int vx, vy;
		1609	int x, y;
		1610	int sw4 = (sw + 3) & ~3;
		1611	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1612	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1613
		1614	memset (darkness, 255, sw4 * sh);
		1615	SvPOK_only (darkness_sv);
		1616	SvCUR_set (darkness_sv, sw4 * sh);
		1617
		1618	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1619	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1620
		1621	for (y = 0; y < sh; y++)
		1622	if (0 <= y + vy && y + vy < self->rows)
		1623	{
		1624	maprow *row = self->row + (y + vy);
		1625
		1626	for (x = 0; x < sw; x++)
		1627	if (row->c0 <= x + vx && x + vx < row->c1)
		1628	{
		1629	mapcell *cell = row->col + (x + vx - row->c0);
		1630
		1631	darkness[y * sw4 + x] = cell->darkness
		1632	? 255 - (cell->darkness - 1)
		1633	: 255 - FOW_DARKNESS;
		1634	}
		1635	}
1342		1636
1343	EXTEND (SP, 3);	1637	EXTEND (SP, 3);
1344	PUSHs (sv_2mortal (newSViv (sw4)));	1638	PUSHs (sv_2mortal (newSViv (sw4)));
1345	PUSHs (sv_2mortal (newSViv (sh)));	1639	PUSHs (sv_2mortal (newSViv (sh)));
1346	PUSHs (darkness_sv);	1640	PUSHs (darkness_sv);
1347	}	1641	}
1348		1642
1349	SV *	1643	SV *
1350	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1644	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1351	CODE:	1645	CODE:
1352	{	1646	{
1353	int x, y, x1, y1;	1647	int x, y, x1, y1;
1354	SV data_sv = newSV (w h * 7 + 5);	1648	SV data_sv = newSV (w h * 7 + 5);
1355	uint8_t data = (uint8_t )SvPVX (data_sv);	1649	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1417	}	1711	}
1418	OUTPUT:	1712	OUTPUT:
1419	RETVAL	1713	RETVAL
1420		1714
1421	void	1715	void
1422	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1716	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1423	PPCODE:	1717	PPCODE:
1424	{	1718	{
1425	int x, y, z;	1719	int x, y, z;
1426	int w, h;	1720	int w, h;
1427	int x1, y1;	1721	int x1, y1;
…		…
1459		1753
1460	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1754	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1461	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1755	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1462	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1756	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1463		1757
1464	if (cell->darkness <= 0)	1758	if (cell->darkness == 0)
1465	{	1759	{
1466	cell->darkness = -1;	1760	cell->darkness = 0;
1467		1761
1468	for (z = 0; z <= 2; z++)	1762	for (z = 0; z <= 2; z++)
1469	{	1763	{
1470	cell->face[z] = face[z];	1764	cell->face[z] = face[z];
1471		1765
…		…
1476	}	1770	}
1477	}	1771	}
1478	}	1772	}
1479	}	1773	}
1480		1774
1481	MODULE = CFClient PACKAGE = CFClient::MixChunk	1775	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1482		1776
1483	CFClient::MixChunk	1777	CFPlus::MixChunk
1484	new_from_file (SV class, char path)	1778	new_from_file (SV class, char path)
1485	CODE:	1779	CODE:
1486	RETVAL = Mix_LoadWAV (path);	1780	RETVAL = Mix_LoadWAV (path);
1487	OUTPUT:	1781	OUTPUT:
1488	RETVAL	1782	RETVAL
1489		1783
1490	void	1784	void
1491	DESTROY (CFClient::MixChunk self)	1785	DESTROY (CFPlus::MixChunk self)
1492	CODE:	1786	CODE:
1493	Mix_FreeChunk (self);	1787	Mix_FreeChunk (self);
1494		1788
1495	int	1789	int
1496	volume (CFClient::MixChunk self, int volume = -1)	1790	volume (CFPlus::MixChunk self, int volume = -1)
1497	CODE:	1791	CODE:
1498	RETVAL = Mix_VolumeChunk (self, volume);	1792	RETVAL = Mix_VolumeChunk (self, volume);
1499	OUTPUT:	1793	OUTPUT:
1500	RETVAL	1794	RETVAL
1501		1795
1502	int	1796	int
1503	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1797	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1504	CODE:	1798	CODE:
1505	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1799	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1506	OUTPUT:	1800	OUTPUT:
1507	RETVAL	1801	RETVAL
1508		1802
1509	MODULE = CFClient PACKAGE = CFClient::MixMusic	1803	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1510		1804
1511	int	1805	int
1512	volume (int volume = -1)	1806	volume (int volume = -1)
1513	CODE:	1807	CODE:
1514	RETVAL = Mix_VolumeMusic (volume);	1808	RETVAL = Mix_VolumeMusic (volume);
1515	OUTPUT:	1809	OUTPUT:
1516	RETVAL	1810	RETVAL
1517		1811
1518	CFClient::MixMusic	1812	CFPlus::MixMusic
1519	new_from_file (SV class, char path)	1813	new_from_file (SV class, char path)
1520	CODE:	1814	CODE:
1521	RETVAL = Mix_LoadMUS (path);	1815	RETVAL = Mix_LoadMUS (path);
1522	OUTPUT:	1816	OUTPUT:
1523	RETVAL	1817	RETVAL
1524		1818
1525	void	1819	void
1526	DESTROY (CFClient::MixMusic self)	1820	DESTROY (CFPlus::MixMusic self)
1527	CODE:	1821	CODE:
1528	Mix_FreeMusic (self);	1822	Mix_FreeMusic (self);
1529		1823
1530	int	1824	int
1531	play (CFClient::MixMusic self, int loops = -1)	1825	play (CFPlus::MixMusic self, int loops = -1)
1532	CODE:	1826	CODE:
1533	RETVAL = Mix_PlayMusic (self, loops);	1827	RETVAL = Mix_PlayMusic (self, loops);
1534	OUTPUT:	1828	OUTPUT:
1535	RETVAL	1829	RETVAL
1536		1830
1537	MODULE = CFClient PACKAGE = CFClient::OpenGL	1831	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1538		1832
1539	BOOT:	1833	BOOT:
1540	{	1834	{
1541	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1835	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1542	static const struct {	1836	static const struct {
1543	const char *name;	1837	const char *name;
1544	IV iv;	1838	IV iv;
1545	} *civ, const_iv[] = {	1839	} *civ, const_iv[] = {
1546	# define const_iv(name) { # name, (IV)name }	1840	# define const_iv(name) { # name, (IV)name }
…		…
1553	const_iv (GL_SCISSOR_TEST),	1847	const_iv (GL_SCISSOR_TEST),
1554	const_iv (GL_DEPTH_TEST),	1848	const_iv (GL_DEPTH_TEST),
1555	const_iv (GL_ALPHA_TEST),	1849	const_iv (GL_ALPHA_TEST),
1556	const_iv (GL_NORMALIZE),	1850	const_iv (GL_NORMALIZE),
1557	const_iv (GL_RESCALE_NORMAL),	1851	const_iv (GL_RESCALE_NORMAL),
		1852	const_iv (GL_FRONT),
		1853	const_iv (GL_BACK),
1558	const_iv (GL_AND),	1854	const_iv (GL_AND),
1559	const_iv (GL_ONE),	1855	const_iv (GL_ONE),
1560	const_iv (GL_ZERO),	1856	const_iv (GL_ZERO),
1561	const_iv (GL_SRC_ALPHA),	1857	const_iv (GL_SRC_ALPHA),
1562	const_iv (GL_SRC_ALPHA_SATURATE),	1858	const_iv (GL_DST_ALPHA),
1563	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1859	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1564	const_iv (GL_ONE_MINUS_DST_ALPHA),	1860	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1861	const_iv (GL_SRC_ALPHA_SATURATE),
1565	const_iv (GL_RGB),	1862	const_iv (GL_RGB),
1566	const_iv (GL_RGBA),	1863	const_iv (GL_RGBA),
		1864	const_iv (GL_RGBA4),
		1865	const_iv (GL_RGBA8),
		1866	const_iv (GL_RGB5_A1),
1567	const_iv (GL_UNSIGNED_BYTE),	1867	const_iv (GL_UNSIGNED_BYTE),
1568	const_iv (GL_UNSIGNED_SHORT),	1868	const_iv (GL_UNSIGNED_SHORT),
1569	const_iv (GL_UNSIGNED_INT),	1869	const_iv (GL_UNSIGNED_INT),
1570	const_iv (GL_ALPHA),	1870	const_iv (GL_ALPHA),
1571	const_iv (GL_INTENSITY),	1871	const_iv (GL_INTENSITY),
…		…
1603	const_iv (GL_SEPARABLE_2D),	1903	const_iv (GL_SEPARABLE_2D),
1604	const_iv (GL_CONVOLUTION_2D),	1904	const_iv (GL_CONVOLUTION_2D),
1605	const_iv (GL_CONVOLUTION_BORDER_MODE),	1905	const_iv (GL_CONVOLUTION_BORDER_MODE),
1606	const_iv (GL_CONSTANT_BORDER),	1906	const_iv (GL_CONSTANT_BORDER),
1607	const_iv (GL_LINES),	1907	const_iv (GL_LINES),
		1908	const_iv (GL_LINE_STRIP),
1608	const_iv (GL_LINE_LOOP),	1909	const_iv (GL_LINE_LOOP),
1609	const_iv (GL_QUADS),	1910	const_iv (GL_QUADS),
1610	const_iv (GL_QUAD_STRIP),	1911	const_iv (GL_QUAD_STRIP),
1611	const_iv (GL_TRIANGLES),	1912	const_iv (GL_TRIANGLES),
1612	const_iv (GL_TRIANGLE_STRIP),	1913	const_iv (GL_TRIANGLE_STRIP),
…		…
1645	OUTPUT:	1946	OUTPUT:
1646	RETVAL	1947	RETVAL
1647		1948
1648	int glGetError ()	1949	int glGetError ()
1649		1950
		1951	void glFinish ()
		1952
1650	void glClear (int mask)	1953	void glClear (int mask)
1651		1954
1652	void glClearColor (float r, float g, float b, float a = 1.0)	1955	void glClearColor (float r, float g, float b, float a = 1.0)
1653	PROTOTYPE: @	1956	PROTOTYPE: @
1654		1957
…		…
1677	void glPushMatrix ()	1980	void glPushMatrix ()
1678		1981
1679	void glPopMatrix ()	1982	void glPopMatrix ()
1680		1983
1681	void glLoadIdentity ()	1984	void glLoadIdentity ()
		1985
		1986	void glDrawBuffer (int buffer)
		1987
		1988	void glReadBuffer (int buffer)
1682		1989
1683	# near_ and far_ are due to microsofts buggy "c" compiler	1990	# near_ and far_ are due to microsofts buggy "c" compiler
1684	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1991	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1685		1992
1686	# near_ and far_ are due to microsofts buggy "c" compiler	1993	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1716	r *= a;	2023	r *= a;
1717	g *= a;	2024	g *= a;
1718	b *= a;	2025	b *= a;
1719	}	2026	}
1720	// microsoft visual "c" rounds instead of truncating...	2027	// microsoft visual "c" rounds instead of truncating...
1721	glColor4ub (MIN ((int)(r * 256.f), 255),	2028	glColor4f (r, g, b, a);
1722	MIN ((int)(g * 256.f), 255),
1723	MIN ((int)(b * 256.f), 255),
1724	MIN ((int)(a * 256.f), 255));
1725		2029
1726	void glInterleavedArrays (int format, int stride, char *data)	2030	void glInterleavedArrays (int format, int stride, char *data)
1727		2031
1728	void glDrawElements (int mode, int count, int type, char *indices)	2032	void glDrawElements (int mode, int count, int type, char *indices)
1729		2033
…		…
1806		2110
1807	void glEndList ()	2111	void glEndList ()
1808		2112
1809	void glCallList (int list)	2113	void glCallList (int list)
1810		2114
1811

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.103 by root, Sun Jun 4 23:05:05 2006 UTC vs. Revision 1.155 by root, Thu Sep 21 00:16:42 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.103 by root, Sun Jun 4 23:05:05 2006 UTC vs.
Revision 1.155 by root, Thu Sep 21 00:16:42 2006 UTC