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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.90 by root, Sun May 21 00:34:58 2006 UTC vs.
Revision 1.142 by root, Fri Aug 18 01:27:15 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
52		58
53	#define GL_CALL(type,func,args) \	59	#if 0
54	{ \	60	# define PARACHUTE SDL_INIT_NOPARACHUTE
55	static int init_; \	61	#else
56	static type fptr_; \	62	# define PARACHUTE 0
57	\	63	#endif
58	if (!init_) \
59	{ \
60	init_ = 1; \
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62	} \
63	\
64	if (fptr_) \
65	fptr_ args; \
66	}
67		64
		65	static struct
		66	{
		67	#define GL_FUNC(ptr,name) ptr name;
		68	#include "glfunc.h"
		69	#undef GL_FUNC
		70	} gl;
		71
		72	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
		73	{
		74	if (gl.BlendFuncSeparate)
		75	gl.BlendFuncSeparate (sa, da, saa, daa);
		76	else if (gl.BlendFuncSeparateEXT)
		77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
		78	else
		79	glBlendFunc (sa, da);
		80	}
		81
		82	#include "texcache.c"
		83
		84	#include "pango-font.c"
		85	#include "pango-fontmap.c"
		86	#include "pango-render.c"
		87
68	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
70		90
71	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	}
72		110
73	typedef struct cf_layout {	111	typedef struct cf_layout {
74	PangoLayout *pl; // either derived from a cairo or ft2 context	112	PangoLayout *pl;
75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
77	int base_height;	114	int base_height;
78	CFClient__Font font;	115	CFPlus__Font font;
79	} *CFClient__Layout;	116	} *CFPlus__Layout;
80		117
81	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
82	static PangoContext ft2_context, cairo_context;	119	static PangoContext *opengl_context;
83	static PangoFontMap ft2_fontmap, cairo_fontmap;	120	static PangoFontMap *opengl_fontmap;
84		121
85	static void	122	static void
86	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
87	{	124	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
89	#ifdef _WIN32	126	#ifdef FC_HINT_STYLE
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91	#else	128	#endif
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif
94	}	130	}
95		131
96	static void	132	static void
97	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
98	{	134	{
99	/* 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
100	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
101	*/	137	*/
102	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
106		142
107	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
108	}	144	}
109		145
110	static void	146	static void
111	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
112	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
113	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
114		153
115	if (!w) w = 1;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
116	if (!h) h = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
117		156
118	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;
119	}	162	}
120		163
121	typedef uint16_t mapface;	164	typedef uint16_t mapface;
122		165
123	typedef struct {	166	typedef struct {
…		…
126	float s, t;	169	float s, t;
127	uint8_t r, g, b, a;	170	uint8_t r, g, b, a;
128	} maptex;	171	} maptex;
129		172
130	typedef struct {	173	typedef struct {
131	int16_t darkness;	174	uint16_t darkness;
132	mapface face[3];	175	mapface face[3];
		176	uint8_t stat_hp;
133	} mapcell;	177	} mapcell;
134		178
135	typedef struct {	179	typedef struct {
136	int32_t c0, c1;	180	int32_t c0, c1;
137	mapcell *col;	181	mapcell *col;
…		…
146	int texs;	190	int texs;
147	maptex *tex;	191	maptex *tex;
148		192
149	int32_t rows;	193	int32_t rows;
150	maprow *row;	194	maprow *row;
151	} *CFClient__Map;	195	} *CFPlus__Map;
152		196
153	static char *	197	static char *
154	prepend (char *ptr, int sze, int inc)	198	prepend (char *ptr, int sze, int inc)
155	{	199	{
156	char *p;	200	char *p;
…		…
174		218
175	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	219	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
176	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	220	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
177		221
178	static maprow *	222	static maprow *
179	map_get_row (CFClient__Map self, int y)	223	map_get_row (CFPlus__Map self, int y)
180	{	224	{
181	if (0 > y)	225	if (0 > y)
182	{	226	{
183	int extend = - y + MAP_EXTEND_Y;	227	int extend = - y + MAP_EXTEND_Y;
184	Prepend (maprow, self->row, self->rows, extend);	228	Prepend (maprow, self->row, self->rows, extend);
…		…
222		266
223	return row->col + (x - row->c0);	267	return row->col + (x - row->c0);
224	}	268	}
225		269
226	static mapcell *	270	static mapcell *
227	map_get_cell (CFClient__Map self, int x, int y)	271	map_get_cell (CFPlus__Map self, int x, int y)
228	{	272	{
229	return row_get_cell (map_get_row (self, y), x);	273	return row_get_cell (map_get_row (self, y), x);
230	}	274	}
231		275
232	static void	276	static void
233	map_clear (CFClient__Map self)	277	map_clear (CFPlus__Map self)
234	{	278	{
235	int r;	279	int r;
236		280
237	for (r = 0; r < self->rows; r++)	281	for (r = 0; r < self->rows; r++)
238	Safefree (self->row[r].col);	282	Safefree (self->row[r].col);
…		…
246	self->row = 0;	290	self->row = 0;
247	self->rows = 0;	291	self->rows = 0;
248	}	292	}
249		293
250	static void	294	static void
251	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	295	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
252	{	296	{
253	int x, y;	297	int x, y;
254	maprow *row;	298	maprow *row;
255		299
256	for (y = y0; y < y0 + h; y++)	300	for (y = y0; y < y0 + h; y++)
…		…
265	if (x >= row->c0)	309	if (x >= row->c0)
266	{	310	{
267	if (x >= row->c1)	311	if (x >= row->c1)
268	break;	312	break;
269		313
270	row->col[x - row->c0].darkness = -1;	314	row->col[x - row->c0].darkness = 0;
271	}	315	}
272	}	316	}
273	}	317	}
274		318
275	static void	319	static void
…		…
296	ev.data2 = 0;	340	ev.data2 = 0;
297		341
298	SDL_PushEvent ((SDL_Event *)&ev);	342	SDL_PushEvent ((SDL_Event *)&ev);
299	}	343	}
300		344
		345	static unsigned int
		346	minpot (unsigned int n)
		347	{
		348	if (!n)
		349	return 0;
		350
		351	--n;
		352
		353	n \|= n >> 1;
		354	n \|= n >> 2;
		355	n \|= n >> 4;
		356	n \|= n >> 8;
		357	n \|= n >> 16;
		358
		359	return n + 1;
		360	}
		361
301	MODULE = CFClient PACKAGE = CFClient	362	MODULE = CFPlus PACKAGE = CFPlus
302		363
303	PROTOTYPES: ENABLE	364	PROTOTYPES: ENABLE
304		365
305	BOOT:	366	BOOT:
306	{	367	{
307	HV *stash = gv_stashpv ("CFClient", 1);	368	HV *stash = gv_stashpv ("CFPlus", 1);
308	static const struct {	369	static const struct {
309	const char *name;	370	const char *name;
310	IV iv;	371	IV iv;
311	} *civ, const_iv[] = {	372	} *civ, const_iv[] = {
312	# define const_iv(name) { # name, (IV)name }	373	# define const_iv(name) { # name, (IV)name }
…		…
413		474
414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	475	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	476	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416	}	477	}
417		478
		479	int
		480	in_destruct ()
		481	CODE:
		482	RETVAL = PL_main_cv == Nullcv;
		483	OUTPUT:
		484	RETVAL
		485
		486	NV floor (NV x)
		487
		488	NV ceil (NV x)
		489
418	void	490	void
419	pango_init ()	491	pango_init ()
420	CODE:	492	CODE:
421	{	493	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx
423	ft2_fontmap = pango_ft2_font_map_new ();	494	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	495	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	496	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426
427	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
429	}	497	}
430		498
431	int	499	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	500	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
433		501
434	void	502	void
435	SDL_Quit ()	503	SDL_Quit ()
436		504
437	void	505	void
…		…
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	512	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	513	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	514	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		515
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	516	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	517	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450		518
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	519	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	520	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	522	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455		523
456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	524	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		525	#if SDL_VERSION_ATLEAST(1,2,10)
		526	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		527	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		528	#endif
457		529
458	SDL_EnableUNICODE (1);	530	SDL_EnableUNICODE (1);
459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	531	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460		532
461	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	533	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	551	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	552	CODE:
481	RETVAL = !!SDL_SetVideoMode (	553	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	554	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	555	);
		556	if (RETVAL)
		557	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	558	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		559	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		560	# include "glfunc.h"
		561	# undef GL_FUNC
		562	}
485	OUTPUT:	563	OUTPUT:
486	RETVAL	564	RETVAL
487		565
488	void	566	void
489	SDL_GL_SwapBuffers ()	567	SDL_GL_SwapBuffers ()
		568
		569	char *
		570	SDL_GetKeyName (int sym)
490		571
491	void	572	void
492	SDL_PollEvent ()	573	SDL_PollEvent ()
493	PPCODE:	574	PPCODE:
494	{	575	{
…		…
513	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	594	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
514	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	595	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
515	break;	596	break;
516		597
517	case SDL_MOUSEMOTION:	598	case SDL_MOUSEMOTION:
		599	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		600
518	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	601	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
519	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	602	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
520	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	603	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
521	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	604	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
522	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	605	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
523	break;	606	break;
524		607
525	case SDL_MOUSEBUTTONDOWN:	608	case SDL_MOUSEBUTTONDOWN:
526	case SDL_MOUSEBUTTONUP:	609	case SDL_MOUSEBUTTONUP:
		610	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		611
527	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	612	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
528	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	613	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
529	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	614	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
530	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	615	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531	break;	616	break;
…		…
535	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	620	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
536	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	621	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
537	break;	622	break;
538	}	623	}
539		624
540	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	625	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
541	}	626	}
542	}	627	}
543		628
544	int	629	int
545	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	630	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
558	CODE:	643	CODE:
559	#ifndef _WIN32	644	#ifndef _WIN32
560	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	645	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
561	#endif	646	#endif
562		647
563	char *
564	gl_version ()
565	CODE:
566	RETVAL = (char *)glGetString (GL_VERSION);
567	OUTPUT:
568	RETVAL
569
570	char *
571	gl_extensions ()
572	CODE:
573	RETVAL = (char *)glGetString (GL_EXTENSIONS);
574	OUTPUT:
575	RETVAL
576
577	void	648	void
578	add_font (char *file)	649	add_font (char *file)
579	CODE:	650	CODE:
580	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	651	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
581	#ifdef _WIN32
582	// cairo... sigh... requires win2000
583	AddFontResourceEx (file, FR_PRIVATE, 0);
584	#endif
585		652
586	void	653	void
587	load_image_inline (SV *image_)	654	load_image_inline (SV *image_)
588	ALIAS:	655	ALIAS:
589	load_image_file = 1	656	load_image_file = 1
…		…
631		698
632	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	699	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
633		700
634	assert (surface2->pitch == surface2->w * 4);	701	assert (surface2->pitch == surface2->w * 4);
635		702
		703	SDL_LockSurface (surface2);
636	EXTEND (SP, 5);	704	EXTEND (SP, 6);
637	PUSHs (sv_2mortal (newSViv (surface2->w)));	705	PUSHs (sv_2mortal (newSViv (surface2->w)));
638	PUSHs (sv_2mortal (newSViv (surface2->h)));	706	PUSHs (sv_2mortal (newSViv (surface2->h)));
639	SDL_LockSurface (surface2);
640	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	707	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
641	SDL_UnlockSurface (surface2);
642	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	708	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
643	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	709	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
644	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	710	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		711	SDL_UnlockSurface (surface2);
645		712
646	SDL_FreeSurface (surface);	713	SDL_FreeSurface (surface);
647	SDL_FreeSurface (surface2);	714	SDL_FreeSurface (surface2);
648	}	715	}
649		716
…		…
685	CODE:	752	CODE:
686	fprintf (stderr, "FATAL: %s\n", message);	753	fprintf (stderr, "FATAL: %s\n", message);
687	#ifdef _WIN32	754	#ifdef _WIN32
688	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	755	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
689	#endif	756	#endif
690	exit (1);	757	_exit (1);
691		758
		759	void
		760	_exit (int retval)
		761	CODE:
		762	_exit (retval);
		763
692	MODULE = CFClient PACKAGE = CFClient::Font	764	MODULE = CFPlus PACKAGE = CFPlus::Font
693		765
694	CFClient::Font	766	CFPlus::Font
695	new_from_file (SV class, char path, int id = 0)	767	new_from_file (SV class, char path, int id = 0)
696	CODE:	768	CODE:
697	{	769	{
698	int count;	770	int count;
699	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	771	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
702	}	774	}
703	OUTPUT:	775	OUTPUT:
704	RETVAL	776	RETVAL
705		777
706	void	778	void
707	DESTROY (CFClient::Font self)	779	DESTROY (CFPlus::Font self)
708	CODE:	780	CODE:
709	pango_font_description_free (self);	781	pango_font_description_free (self);
710		782
711	void	783	void
712	make_default (CFClient::Font self)	784	make_default (CFPlus::Font self)
713	CODE:	785	CODE:
714	default_font = self;	786	default_font = self;
715		787
716	MODULE = CFClient PACKAGE = CFClient::Layout	788	MODULE = CFPlus PACKAGE = CFPlus::Layout
717		789
718	CFClient::Layout	790	void
719	new (SV *class, int rgba = 0)	791	reset_glyph_cache ()
720	CODE:	792	CODE:
721	#if _WIN32	793	tc_clear ();
722	rgba = 0;//D	794
723	#endif	795	CFPlus::Layout
		796	new (SV *class)
		797	CODE:
724	New (0, RETVAL, 1, struct cf_layout);	798	New (0, RETVAL, 1, struct cf_layout);
725		799
726	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	800	RETVAL->pl = pango_layout_new (opengl_context);
727	RETVAL->rgba = rgba;
728	RETVAL->r = 1.;	801	RETVAL->r = 1.;
729	RETVAL->g = 1.;	802	RETVAL->g = 1.;
730	RETVAL->b = 1.;	803	RETVAL->b = 1.;
731	RETVAL->a = 1.;	804	RETVAL->a = 1.;
732	RETVAL->base_height = MIN_FONT_HEIGHT;	805	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
736	layout_update_font (RETVAL);	809	layout_update_font (RETVAL);
737	OUTPUT:	810	OUTPUT:
738	RETVAL	811	RETVAL
739		812
740	void	813	void
741	DESTROY (CFClient::Layout self)	814	DESTROY (CFPlus::Layout self)
742	CODE:	815	CODE:
743	g_object_unref (self->pl);	816	g_object_unref (self->pl);
744	Safefree (self);	817	Safefree (self);
745		818
746	int
747	is_rgba (CFClient::Layout self)
748	CODE:
749	RETVAL = self->rgba;
750	OUTPUT:
751	RETVAL
752
753	void	819	void
754	set_text (CFClient::Layout self, SV *text_)	820	set_text (CFPlus::Layout self, SV *text_)
755	CODE:	821	CODE:
756	{	822	{
757	STRLEN textlen;	823	STRLEN textlen;
758	char *text = SvPVutf8 (text_, textlen);	824	char *text = SvPVutf8 (text_, textlen);
759		825
760	pango_layout_set_text (self->pl, text, textlen);	826	pango_layout_set_text (self->pl, text, textlen);
761	}	827	}
762		828
763	void	829	void
764	set_markup (CFClient::Layout self, SV *text_)	830	set_markup (CFPlus::Layout self, SV *text_)
765	CODE:	831	CODE:
766	{	832	{
767	STRLEN textlen;	833	STRLEN textlen;
768	char *text = SvPVutf8 (text_, textlen);	834	char *text = SvPVutf8 (text_, textlen);
769		835
770	pango_layout_set_markup (self->pl, text, textlen);	836	pango_layout_set_markup (self->pl, text, textlen);
771	}	837	}
772		838
		839	void
		840	set_shapes (CFPlus::Layout self, ...)
		841	CODE:
		842	{
		843	PangoAttrList *attrs = 0;
		844	const char *text = pango_layout_get_text (self->pl);
		845	const char *pos = text;
		846	int arg = 4;
		847
		848	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		849	{
		850	PangoRectangle inkrect, rect;
		851	PangoAttribute *attr;
		852
		853	int x = SvIV (ST (arg - 3));
		854	int y = SvIV (ST (arg - 2));
		855	int w = SvIV (ST (arg - 1));
		856	int h = SvIV (ST (arg ));
		857
		858	inkrect.x = 0;
		859	inkrect.y = 0;
		860	inkrect.width = 0;
		861	inkrect.height = 0;
		862
		863	rect.x = x * PANGO_SCALE;
		864	rect.y = y * PANGO_SCALE;
		865	rect.width = w * PANGO_SCALE;
		866	rect.height = h * PANGO_SCALE;
		867
		868	if (!attrs)
		869	attrs = pango_layout_get_attributes (self->pl);
		870
		871	attr = pango_attr_shape_new (&inkrect, &rect);
		872	attr->start_index = pos - text;
		873	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		874	pango_attr_list_insert (attrs, attr);
		875
		876	arg += 4;
		877	pos += sizeof (OBJ_STR) - 1;
		878	}
		879
		880	if (attrs)
		881	pango_layout_set_attributes (self->pl, attrs);
		882	}
		883
		884	void
		885	get_shapes (CFPlus::Layout self)
		886	PPCODE:
		887	{
		888	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		889
		890	do
		891	{
		892	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		893
		894	if (run && shape_attr_p (run))
		895	{
		896	PangoRectangle extents;
		897	pango_layout_iter_get_run_extents (iter, 0, &extents);
		898
		899	EXTEND (SP, 2);
		900	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		901	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		902	}
		903	}
		904	while (pango_layout_iter_next_run (iter));
		905
		906	pango_layout_iter_free (iter);
		907	}
		908
		909	int
		910	has_wrapped (CFPlus::Layout self)
		911	CODE:
		912	{
		913	int lines = 1;
		914	const char *text = pango_layout_get_text (self->pl);
		915
		916	while (*text)
		917	lines += *text++ == '\n';
		918
		919	RETVAL = lines < pango_layout_get_line_count (self->pl);
		920	}
		921	OUTPUT:
		922	RETVAL
		923
773	SV *	924	SV *
774	get_text (CFClient::Layout self)	925	get_text (CFPlus::Layout self)
775	CODE:	926	CODE:
776	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	927	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
777	SvUTF8_on (RETVAL);	928	sv_utf8_decode (RETVAL);
778	OUTPUT:	929	OUTPUT:
779	RETVAL	930	RETVAL
780		931
781	void	932	void
782	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	933	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
783	CODE:	934	CODE:
784	self->r = r;	935	self->r = r;
785	self->g = g;	936	self->g = g;
786	self->b = b;	937	self->b = b;
787	self->a = a;	938	self->a = a;
788		939
789	void	940	void
790	set_font (CFClient::Layout self, CFClient::Font font = 0)	941	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
791	CODE:	942	CODE:
792	if (self->font != font)	943	if (self->font != font)
793	{	944	{
794	self->font = font;	945	self->font = font;
795	layout_update_font (self);	946	layout_update_font (self);
796	}	947	}
797		948
798	void	949	void
799	set_height (CFClient::Layout self, int base_height)	950	set_height (CFPlus::Layout self, int base_height)
800	CODE:	951	CODE:
801	if (self->base_height != base_height)	952	if (self->base_height != base_height)
802	{	953	{
803	self->base_height = base_height;	954	self->base_height = base_height;
804	layout_update_font (self);	955	layout_update_font (self);
805	}	956	}
806		957
807	void	958	void
808	set_width (CFClient::Layout self, int max_width = -1)	959	set_width (CFPlus::Layout self, int max_width = -1)
809	CODE:	960	CODE:
810	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	961	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
811		962
812	void	963	void
813	set_indent (CFClient::Layout self, int indent)	964	set_indent (CFPlus::Layout self, int indent)
814	CODE:	965	CODE:
815	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	966	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
816		967
817	void	968	void
818	set_spacing (CFClient::Layout self, int spacing)	969	set_spacing (CFPlus::Layout self, int spacing)
819	CODE:	970	CODE:
820	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	971	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
821		972
822	void	973	void
823	set_ellipsise (CFClient::Layout self, int ellipsise)	974	set_ellipsise (CFPlus::Layout self, int ellipsise)
824	CODE:	975	CODE:
825	pango_layout_set_ellipsize (self->pl,	976	pango_layout_set_ellipsize (self->pl,
826	ellipsise == 1 ? PANGO_ELLIPSIZE_START	977	ellipsise == 1 ? PANGO_ELLIPSIZE_START
827	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	978	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
828	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	979	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
829	: PANGO_ELLIPSIZE_NONE	980	: PANGO_ELLIPSIZE_NONE
830	);	981	);
831		982
832	void	983	void
833	set_single_paragraph_mode (CFClient::Layout self, int spm)	984	set_single_paragraph_mode (CFPlus::Layout self, int spm)
834	CODE:	985	CODE:
835	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	986	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
836		987
837	void	988	void
838	size (CFClient::Layout self)	989	size (CFPlus::Layout self)
839	PPCODE:	990	PPCODE:
840	{	991	{
841	int w, h;	992	int w, h;
842		993
843	layout_get_pixel_size (self, &w, &h);	994	layout_get_pixel_size (self, &w, &h);
…		…
846	PUSHs (sv_2mortal (newSViv (w)));	997	PUSHs (sv_2mortal (newSViv (w)));
847	PUSHs (sv_2mortal (newSViv (h)));	998	PUSHs (sv_2mortal (newSViv (h)));
848	}	999	}
849		1000
850	int	1001	int
		1002	descent (CFPlus::Layout self)
		1003	CODE:
		1004	{
		1005	PangoRectangle rect;
		1006	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1007	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1008	RETVAL = PANGO_DESCENT (rect);
		1009	}
		1010	OUTPUT:
		1011	RETVAL
		1012
		1013	int
851	xy_to_index (CFClient::Layout self, int x, int y)	1014	xy_to_index (CFPlus::Layout self, int x, int y)
852	CODE:	1015	CODE:
853	{	1016	{
854	int index, trailing;	1017	int index, trailing;
855	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1018	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
856	RETVAL = index;	1019	RETVAL = index;
857	}	1020	}
858	OUTPUT:	1021	OUTPUT:
859	RETVAL	1022	RETVAL
860		1023
861	void	1024	void
862	cursor_pos (CFClient::Layout self, int index)	1025	cursor_pos (CFPlus::Layout self, int index)
863	PPCODE:	1026	PPCODE:
864	{	1027	{
865	PangoRectangle strong_pos;	1028	PangoRectangle strong_pos;
866	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1029	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
867		1030
…		…
870	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1033	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
871	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1034	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
872	}	1035	}
873		1036
874	void	1037	void
875	render (CFClient::Layout self)	1038	render (CFPlus::Layout self, float x, float y, int flags = 0)
876	PPCODE:	1039	PPCODE:
877	{	1040	pango_opengl_render_layout_subpixel (
878	SV *retval;	1041	self->pl,
879	int w, h;	1042	x * PANGO_SCALE, y * PANGO_SCALE,
		1043	self->r, self->g, self->b, self->a,
		1044	flags
		1045	);
880		1046
881	layout_get_pixel_size (self, &w, &h);	1047	MODULE = CFPlus PACKAGE = CFPlus::Texture
882		1048
883	if (self->rgba)	1049	void
		1050	pad2pot (SV data_, SV w_, SV *h_)
		1051	CODE:
		1052	{
		1053	int ow = SvIV (w_);
		1054	int oh = SvIV (h_);
		1055
		1056	if (ow && oh)
884	{	1057	{
885	cairo_surface_t *surface;	1058	int nw = minpot (ow);
886	cairo_t *cairo;	1059	int nh = minpot (oh);
887		1060
888	retval = newSV (w * h * 4);	1061	if (nw != ow \|\| nh != oh)
889	SvPOK_only (retval);
890	SvCUR_set (retval, w * h * 4);
891
892	memset (SvPVX (retval), 0, w * h * 4);
893
894	surface = cairo_image_surface_create_for_data (
895	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
896	cairo = cairo_create (surface);
897	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
898
899	pango_cairo_show_layout (cairo, self->pl);
900
901	cairo_destroy (cairo);
902	cairo_surface_destroy (surface);
903
904	// what a mess, and its premultiplied, too :(
905	{	1062	{
906	uint32_t p = (uint32_t )SvPVX (retval);	1063	if (SvOK (data_))
907	uint32_t e = p + w h;
908
909	while (p < e)
910	{	1064	{
911	uint32_t rgba = *p;	1065	STRLEN datalen;
912	rgba = (rgba >> 24) \| (rgba << 8);	1066	char *data = SvPVbyte (data_, datalen);
913	#if 0	1067	int bpp = datalen / (ow * oh);
914	#ifdef _WIN32	1068	SV result_ = sv_2mortal (newSV (nw nh * bpp));
915	{//D
916	uint8_t r = rgba >> 24;
917	uint8_t g = rgba >> 16;
918	uint8_t b = rgba >> 8;
919	uint8_t a = rgba >> 0;
920		1069
921	rgba = (rgba & 0xffffff00) \| a;	1070	SvPOK_only (result_);
		1071	SvCUR_set (result_, nw * nh * bpp);
		1072
		1073	memset (SvPVX (result_), 0, nw * nh * bpp);
		1074	while (oh--)
		1075	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1076
		1077	sv_setsv (data_, result_);
922	}	1078	}
923	#endif	1079
924	#endif	1080	sv_setiv (w_, nw);
925	rgba = SDL_SwapBE32 (rgba);	1081	sv_setiv (h_, nh);
926	*p++ = rgba;
927	}	1082	}
928	}
929
930	EXTEND (SP, 5);
931	PUSHs (sv_2mortal (newSViv (w)));
932	PUSHs (sv_2mortal (newSViv (h)));
933	PUSHs (sv_2mortal (retval));
934	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
935	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
936	}	1083	}
937	else
938	{
939	FT_Bitmap bitmap;
940
941	retval = newSV (w * h);
942	SvPOK_only (retval);
943	SvCUR_set (retval, w * h);
944
945	bitmap.rows = h;
946	bitmap.width = w;
947	bitmap.pitch = w;
948	bitmap.buffer = (unsigned char*)SvPVX (retval);
949	bitmap.num_grays = 256;
950	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
951
952	memset (bitmap.buffer, 0, w * h);
953
954	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
955
956	EXTEND (SP, 5);
957	PUSHs (sv_2mortal (newSViv (w)));
958	PUSHs (sv_2mortal (newSViv (h)));
959	PUSHs (sv_2mortal (retval));
960	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
961	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
962	}
963	}	1084	}
964		1085
965	MODULE = CFClient PACKAGE = CFClient::Texture
966
967	void	1086	void
968	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1087	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
969	PROTOTYPE: $$$;$$	1088	PROTOTYPE: $$$;$$
970	ALIAS:	1089	ALIAS:
971	draw_quad_alpha = 1	1090	draw_quad_alpha = 1
972	draw_quad_alpha_premultiplied = 2	1091	draw_quad_alpha_premultiplied = 2
973	CODE:	1092	CODE:
974	{	1093	{
975	HV hv = (HV )SvRV (self);	1094	HV hv = (HV )SvRV (self);
976	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1095	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
977	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1096	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
978	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1097	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
979	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
980		1098
981	if (items < 5)	1099	if (items < 5)
982	{	1100	{
983	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1101	w = SvNV (*hv_fetch (hv, "w", 1, 1));
984	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1102	h = SvNV (*hv_fetch (hv, "h", 1, 1));
985	}	1103	}
986		1104
987	if (ix)	1105	if (ix)
988	{	1106	{
989	glEnable (GL_BLEND);	1107	glEnable (GL_BLEND);
		1108
		1109	if (ix == 2)
990	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1110	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1111	else
		1112	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1113	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1114
991	glEnable (GL_ALPHA_TEST);	1115	glEnable (GL_ALPHA_TEST);
992	glAlphaFunc (GL_GREATER, 0.01f);	1116	glAlphaFunc (GL_GREATER, 0.01f);
993	}	1117	}
994		1118
995	glBindTexture (GL_TEXTURE_2D, name);	1119	glBindTexture (GL_TEXTURE_2D, name);
996
997	if (wrap_mode)
998	{
999	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1000	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1001	}
1002		1120
1003	glBegin (GL_QUADS);	1121	glBegin (GL_QUADS);
1004	glTexCoord2f (0, 0); glVertex2f (x , y );	1122	glTexCoord2f (0, 0); glVertex2f (x , y );
1005	glTexCoord2f (0, t); glVertex2f (x , y + h);	1123	glTexCoord2f (0, t); glVertex2f (x , y + h);
1006	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1124	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1012	glDisable (GL_ALPHA_TEST);	1130	glDisable (GL_ALPHA_TEST);
1013	glDisable (GL_BLEND);	1131	glDisable (GL_BLEND);
1014	}	1132	}
1015	}	1133	}
1016		1134
1017	MODULE = CFClient PACKAGE = CFClient::Map	1135	MODULE = CFPlus PACKAGE = CFPlus::Map
1018		1136
1019	CFClient::Map	1137	CFPlus::Map
1020	new (SV *class, int map_width, int map_height)	1138	new (SV *class, int map_width, int map_height)
1021	CODE:	1139	CODE:
1022	New (0, RETVAL, 1, struct map);	1140	New (0, RETVAL, 1, struct map);
1023	RETVAL->x = 0;	1141	RETVAL->x = 0;
1024	RETVAL->y = 0;	1142	RETVAL->y = 0;
…		…
1034	RETVAL->row = 0;	1152	RETVAL->row = 0;
1035	OUTPUT:	1153	OUTPUT:
1036	RETVAL	1154	RETVAL
1037		1155
1038	void	1156	void
1039	DESTROY (CFClient::Map self)	1157	DESTROY (CFPlus::Map self)
1040	CODE:	1158	CODE:
1041	{	1159	{
1042	map_clear (self);	1160	map_clear (self);
1043	Safefree (self->face);	1161	Safefree (self->face);
		1162	Safefree (self->tex);
1044	Safefree (self);	1163	Safefree (self);
1045	}	1164	}
1046		1165
1047	void	1166	void
1048	clear (CFClient::Map self)	1167	clear (CFPlus::Map self)
1049	CODE:	1168	CODE:
1050	map_clear (self);	1169	map_clear (self);
1051		1170
1052	void	1171	void
1053	set_face (CFClient::Map self, int face, int texid)	1172	set_face (CFPlus::Map self, int face, int texid)
1054	CODE:	1173	CODE:
1055	{	1174	{
1056	while (self->faces <= face)	1175	while (self->faces <= face)
1057	{	1176	{
1058	Append (mapface, self->face, self->faces, self->faces);	1177	Append (mapface, self->face, self->faces, self->faces);
…		…
1061		1180
1062	self->face [face] = texid;	1181	self->face [face] = texid;
1063	}	1182	}
1064		1183
1065	void	1184	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)	1185	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:	1186	CODE:
1068	{	1187	{
1069	while (self->texs <= texid)	1188	while (self->texs <= texid)
1070	{	1189	{
1071	Append (maptex, self->tex, self->texs, self->texs);	1190	Append (maptex, self->tex, self->texs, self->texs);
…		…
1083	tex->r = r;	1202	tex->r = r;
1084	tex->g = g;	1203	tex->g = g;
1085	tex->b = b;	1204	tex->b = b;
1086	tex->a = a;	1205	tex->a = a;
1087	}	1206	}
		1207
		1208	// somewhat hackish, but for textures that require it, it really
		1209	// improves the look, and most others don't suffer.
		1210	glBindTexture (GL_TEXTURE_2D, name);
		1211	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1212	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1213	// use uglier nearest interpolation because linear suffers
		1214	// from transparent color bleeding and ugly wrapping effects.
		1215	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1088	}	1216	}
1089		1217
1090	int	1218	int
1091	ox (CFClient::Map self)	1219	ox (CFPlus::Map self)
1092	ALIAS:	1220	ALIAS:
1093	oy = 1	1221	oy = 1
		1222	x = 2
		1223	y = 3
		1224	w = 4
		1225	h = 5
1094	CODE:	1226	CODE:
1095	switch (ix)	1227	switch (ix)
1096	{	1228	{
1097	case 0: RETVAL = self->ox; break;	1229	case 0: RETVAL = self->ox; break;
1098	case 1: RETVAL = self->oy; break;	1230	case 1: RETVAL = self->oy; break;
		1231	case 2: RETVAL = self->x; break;
		1232	case 3: RETVAL = self->y; break;
		1233	case 4: RETVAL = self->w; break;
		1234	case 5: RETVAL = self->h; break;
1099	}	1235	}
1100	OUTPUT:	1236	OUTPUT:
1101	RETVAL	1237	RETVAL
1102		1238
1103	void	1239	void
1104	scroll (CFClient::Map self, int dx, int dy)	1240	scroll (CFPlus::Map self, int dx, int dy)
1105	CODE:	1241	CODE:
1106	{	1242	{
1107	if (dx > 0)	1243	if (dx > 0)
1108	map_blank (self, self->x, self->y, dx - 1, self->h);	1244	map_blank (self, self->x, self->y, dx - 1, self->h);
1109	else if (dx < 0)	1245	else if (dx < 0)
…		…
1125	self->y += MAP_EXTEND_Y;	1261	self->y += MAP_EXTEND_Y;
1126	}	1262	}
1127	}	1263	}
1128		1264
1129	void	1265	void
1130	map1a_update (CFClient::Map self, SV *data_)	1266	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1131	CODE:	1267	CODE:
1132	{	1268	{
1133	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1269	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1134	uint8_t data_end = (uint8_t )SvEND (data_);	1270	uint8_t data_end = (uint8_t )SvEND (data_);
1135	mapcell *cell;	1271	mapcell *cell;
…		…
1137		1273
1138	while (data < data_end)	1274	while (data < data_end)
1139	{	1275	{
1140	flags = (data [0] << 8) + data [1]; data += 2;	1276	flags = (data [0] << 8) + data [1]; data += 2;
1141		1277
1142	x = ((flags >> 10) & 63) + self->x;	1278	x = self->x + ((flags >> 10) & 63);
1143	y = ((flags >> 4) & 63) + self->y;	1279	y = self->y + ((flags >> 4) & 63);
1144		1280
1145	cell = map_get_cell (self, x, y);	1281	cell = map_get_cell (self, x, y);
1146		1282
1147	if (flags & 15)	1283	if (flags & 15)
1148	{	1284	{
1149	if (cell->darkness < 0)	1285	if (!cell->darkness)
1150	{	1286	{
1151	cell->darkness = 0;	1287	cell->darkness = 256;
1152	cell->face [0] = 0;	1288	cell->face [0] = 0;
1153	cell->face [1] = 0;	1289	cell->face [1] = 0;
1154	cell->face [2] = 0;	1290	cell->face [2] = 0;
1155	}	1291	}
1156		1292
1157	cell->darkness = flags & 8 ? *data++ : 255;
1158
1159	//TODO: don't trust server data to be in-range(!)	1293	//TODO: don't trust server data to be in-range(!)
		1294
		1295	if (flags & 8)
		1296	{
		1297	if (extmap)
		1298	{
		1299	uint8_t ext, cmd;
		1300
		1301	do
		1302	{
		1303	ext = *data++;
		1304	cmd = ext & 0x7f;
		1305
		1306	if (ext < 4)
		1307	cell->darkness = 255 - ext * 64 + 1;
		1308	else if (ext == 5) // health
		1309	cell->stat_hp = *data++;
		1310	}
		1311	while (cmd & 0x80);
		1312	}
		1313	else
		1314	cell->darkness = *data++ + 1;
		1315	}
1160		1316
1161	if (flags & 4)	1317	if (flags & 4)
1162	{	1318	{
1163	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1319	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1164	}	1320	}
…		…
1172	{	1328	{
1173	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1329	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1174	}	1330	}
1175	}	1331	}
1176	else	1332	else
1177	cell->darkness = -1;	1333	cell->darkness = 0;
1178	}	1334	}
1179	}	1335	}
1180		1336
1181	SV *	1337	SV *
1182	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1338	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1183	CODE:	1339	CODE:
1184	{	1340	{
1185	int x1, x;	1341	int x1, x;
1186	int y1, y;	1342	int y1, y;
1187	int z;	1343	int z;
…		…
1237	}	1393	}
1238	OUTPUT:	1394	OUTPUT:
1239	RETVAL	1395	RETVAL
1240		1396
1241	void	1397	void
1242	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1398	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1243	PPCODE:	1399	CODE:
1244	{	1400	{
1245	int vx, vy;	1401	int vx, vy;
1246	int x, y, z;	1402	int x, y, z;
1247	int last_name;	1403	int last_name;
1248	mapface face;	1404	mapface face;
1249	int sw4 = (sw + 3) & ~3;
1250	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1251	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1252		1405
1253	memset (darkness, 255, sw4 * sh);
1254	SvPOK_only (darkness_sv);
1255	SvCUR_set (darkness_sv, sw4 * sh);
1256
1257	vx = self->x + (self->w - sw) / 2 - shift_x;	1406	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1258	vy = self->y + (self->h - sh) / 2 - shift_y;	1407	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1259		1408
1260	/*	1409	/*
1261	int vx = self->vx = self->w >= sw	1410	int vx = self->vx = self->w >= sw
1262	? self->x + (self->w - sw) / 2	1411	? self->x + (self->w - sw) / 2
1263	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1412	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1267	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1416	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1268	*/	1417	*/
1269		1418
1270	glColor4ub (255, 255, 255, 255);	1419	glColor4ub (255, 255, 255, 255);
1271		1420
		1421	glEnable (GL_BLEND);
1272	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1422	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1273	glEnable (GL_BLEND);
1274	glEnable (GL_TEXTURE_2D);	1423	glEnable (GL_TEXTURE_2D);
1275	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1424	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1276		1425
1277	glBegin (GL_QUADS);	1426	glBegin (GL_QUADS);
1278		1427
…		…
1286		1435
1287	for (x = 0; x < sw; x++)	1436	for (x = 0; x < sw; x++)
1288	if (row->c0 <= x + vx && x + vx < row->c1)	1437	if (row->c0 <= x + vx && x + vx < row->c1)
1289	{	1438	{
1290	mapcell *cell = row->col + (x + vx - row->c0);	1439	mapcell *cell = row->col + (x + vx - row->c0);
1291
1292	darkness[y * sw4 + x] = cell->darkness < 0
1293	? 255 - FOW_DARKNESS
1294	: 255 - cell->darkness;
1295		1440
1296	face = cell->face [z];	1441	face = cell->face [z];
1297		1442
1298	if (face)	1443	if (face)
1299	{	1444	{
…		…
1320		1465
1321	glEnd ();	1466	glEnd ();
1322		1467
1323	glDisable (GL_TEXTURE_2D);	1468	glDisable (GL_TEXTURE_2D);
1324	glDisable (GL_BLEND);	1469	glDisable (GL_BLEND);
		1470	}
		1471
		1472	void
		1473	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1474	CODE:
		1475	{
		1476	static float color[16][3] = {
		1477	{ 0.00F, 0.00F, 0.00F },
		1478	{ 1.00F, 1.00F, 1.00F },
		1479	{ 0.00F, 0.00F, 0.55F },
		1480	{ 1.00F, 0.00F, 0.00F },
		1481
		1482	{ 1.00F, 0.54F, 0.00F },
		1483	{ 0.11F, 0.56F, 1.00F },
		1484	{ 0.93F, 0.46F, 0.00F },
		1485	{ 0.18F, 0.54F, 0.34F },
		1486
		1487	{ 0.56F, 0.73F, 0.56F },
		1488	{ 0.80F, 0.80F, 0.80F },
		1489	{ 0.55F, 0.41F, 0.13F },
		1490	{ 0.99F, 0.77F, 0.26F },
		1491
		1492	{ 0.74F, 0.65F, 0.41F },
		1493
		1494	{ 0.00F, 1.00F, 1.00F },
		1495	{ 1.00F, 0.00F, 1.00F },
		1496	{ 1.00F, 1.00F, 0.00F },
		1497	};
		1498
		1499	int x, y;
		1500
		1501	glEnable (GL_TEXTURE_2D);
		1502	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1503	glEnable (GL_BLEND);
		1504	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1505	glBegin (GL_QUADS);
		1506
		1507	for (y = 0; y < h; y++)
		1508	for (x = 0; x < w; x++)
		1509	{
		1510	unsigned char m = data [x + y * w];
		1511
		1512	if (m)
		1513	{
		1514	float *c = color [m & 15];
		1515
		1516	float tx1 = m & 0x40 ? 0.5 : 0.;
		1517	float tx2 = tx1 + 0.5;
		1518
		1519	glColor4f (c[0], c[1], c[2], 0.75);
		1520	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1521	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1522	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1523	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1524	}
		1525	}
		1526
		1527	glEnd ();
		1528	glDisable (GL_BLEND);
		1529	glDisable (GL_TEXTURE_2D);
		1530	}
		1531
		1532	void
		1533	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1534	PPCODE:
		1535	{
		1536	int vx, vy;
		1537	int x, y;
		1538	int sw4 = (sw + 3) & ~3;
		1539	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1540	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1541
		1542	memset (darkness, 255, sw4 * sh);
		1543	SvPOK_only (darkness_sv);
		1544	SvCUR_set (darkness_sv, sw4 * sh);
		1545
		1546	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1547	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1548
		1549	for (y = 0; y < sh; y++)
		1550	if (0 <= y + vy && y + vy < self->rows)
		1551	{
		1552	maprow *row = self->row + (y + vy);
		1553
		1554	for (x = 0; x < sw; x++)
		1555	if (row->c0 <= x + vx && x + vx < row->c1)
		1556	{
		1557	mapcell *cell = row->col + (x + vx - row->c0);
		1558
		1559	darkness[y * sw4 + x] = cell->darkness
		1560	? 255 - cell->darkness + 1
		1561	: 255 - FOW_DARKNESS;
		1562	}
		1563	}
1325		1564
1326	EXTEND (SP, 3);	1565	EXTEND (SP, 3);
1327	PUSHs (sv_2mortal (newSViv (sw4)));	1566	PUSHs (sv_2mortal (newSViv (sw4)));
1328	PUSHs (sv_2mortal (newSViv (sh)));	1567	PUSHs (sv_2mortal (newSViv (sh)));
1329	PUSHs (darkness_sv);	1568	PUSHs (darkness_sv);
1330	}	1569	}
1331		1570
1332	SV *	1571	SV *
1333	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1572	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1334	CODE:	1573	CODE:
1335	{	1574	{
1336	int x, y, x1, y1;	1575	int x, y, x1, y1;
1337	SV data_sv = newSV (w h * 7 + 5);	1576	SV data_sv = newSV (w h * 7 + 5);
1338	uint8_t data = (uint8_t )SvPVX (data_sv);	1577	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1400	}	1639	}
1401	OUTPUT:	1640	OUTPUT:
1402	RETVAL	1641	RETVAL
1403		1642
1404	void	1643	void
1405	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1644	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1406	PPCODE:	1645	PPCODE:
1407	{	1646	{
1408	int x, y, z;	1647	int x, y, z;
1409	int w, h;	1648	int w, h;
1410	int x1, y1;	1649	int x1, y1;
…		…
1442		1681
1443	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1682	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1444	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1683	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1445	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1684	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1446		1685
1447	if (cell->darkness <= 0)	1686	if (cell->darkness <= 1)
1448	{	1687	{
1449	cell->darkness = -1;	1688	cell->darkness = 0;
1450		1689
1451	for (z = 0; z <= 2; z++)	1690	for (z = 0; z <= 2; z++)
1452	{	1691	{
1453	cell->face[z] = face[z];	1692	cell->face[z] = face[z];
1454		1693
…		…
1459	}	1698	}
1460	}	1699	}
1461	}	1700	}
1462	}	1701	}
1463		1702
1464	MODULE = CFClient PACKAGE = CFClient::MixChunk	1703	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1465		1704
1466	CFClient::MixChunk	1705	CFPlus::MixChunk
1467	new_from_file (SV class, char path)	1706	new_from_file (SV class, char path)
1468	CODE:	1707	CODE:
1469	RETVAL = Mix_LoadWAV (path);	1708	RETVAL = Mix_LoadWAV (path);
1470	OUTPUT:	1709	OUTPUT:
1471	RETVAL	1710	RETVAL
1472		1711
1473	void	1712	void
1474	DESTROY (CFClient::MixChunk self)	1713	DESTROY (CFPlus::MixChunk self)
1475	CODE:	1714	CODE:
1476	Mix_FreeChunk (self);	1715	Mix_FreeChunk (self);
1477		1716
1478	int	1717	int
1479	volume (CFClient::MixChunk self, int volume = -1)	1718	volume (CFPlus::MixChunk self, int volume = -1)
1480	CODE:	1719	CODE:
1481	RETVAL = Mix_VolumeChunk (self, volume);	1720	RETVAL = Mix_VolumeChunk (self, volume);
1482	OUTPUT:	1721	OUTPUT:
1483	RETVAL	1722	RETVAL
1484		1723
1485	int	1724	int
1486	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1725	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1487	CODE:	1726	CODE:
1488	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1727	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1489	OUTPUT:	1728	OUTPUT:
1490	RETVAL	1729	RETVAL
1491		1730
1492	MODULE = CFClient PACKAGE = CFClient::MixMusic	1731	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1493		1732
1494	int	1733	int
1495	volume (int volume = -1)	1734	volume (int volume = -1)
1496	CODE:	1735	CODE:
1497	RETVAL = Mix_VolumeMusic (volume);	1736	RETVAL = Mix_VolumeMusic (volume);
1498	OUTPUT:	1737	OUTPUT:
1499	RETVAL	1738	RETVAL
1500		1739
1501	CFClient::MixMusic	1740	CFPlus::MixMusic
1502	new_from_file (SV class, char path)	1741	new_from_file (SV class, char path)
1503	CODE:	1742	CODE:
1504	RETVAL = Mix_LoadMUS (path);	1743	RETVAL = Mix_LoadMUS (path);
1505	OUTPUT:	1744	OUTPUT:
1506	RETVAL	1745	RETVAL
1507		1746
1508	void	1747	void
1509	DESTROY (CFClient::MixMusic self)	1748	DESTROY (CFPlus::MixMusic self)
1510	CODE:	1749	CODE:
1511	Mix_FreeMusic (self);	1750	Mix_FreeMusic (self);
1512		1751
1513	int	1752	int
1514	play (CFClient::MixMusic self, int loops = -1)	1753	play (CFPlus::MixMusic self, int loops = -1)
1515	CODE:	1754	CODE:
1516	RETVAL = Mix_PlayMusic (self, loops);	1755	RETVAL = Mix_PlayMusic (self, loops);
1517	OUTPUT:	1756	OUTPUT:
1518	RETVAL	1757	RETVAL
1519		1758
1520	MODULE = CFClient PACKAGE = CFClient::OpenGL	1759	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1521		1760
1522	BOOT:	1761	BOOT:
1523	{	1762	{
1524	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1763	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1525	static const struct {	1764	static const struct {
1526	const char *name;	1765	const char *name;
1527	IV iv;	1766	IV iv;
1528	} *civ, const_iv[] = {	1767	} *civ, const_iv[] = {
1529	# define const_iv(name) { # name, (IV)name }	1768	# define const_iv(name) { # name, (IV)name }
…		…
1536	const_iv (GL_SCISSOR_TEST),	1775	const_iv (GL_SCISSOR_TEST),
1537	const_iv (GL_DEPTH_TEST),	1776	const_iv (GL_DEPTH_TEST),
1538	const_iv (GL_ALPHA_TEST),	1777	const_iv (GL_ALPHA_TEST),
1539	const_iv (GL_NORMALIZE),	1778	const_iv (GL_NORMALIZE),
1540	const_iv (GL_RESCALE_NORMAL),	1779	const_iv (GL_RESCALE_NORMAL),
		1780	const_iv (GL_FRONT),
		1781	const_iv (GL_BACK),
1541	const_iv (GL_AND),	1782	const_iv (GL_AND),
1542	const_iv (GL_ONE),	1783	const_iv (GL_ONE),
1543	const_iv (GL_ZERO),	1784	const_iv (GL_ZERO),
1544	const_iv (GL_SRC_ALPHA),	1785	const_iv (GL_SRC_ALPHA),
1545	const_iv (GL_SRC_ALPHA_SATURATE),	1786	const_iv (GL_DST_ALPHA),
1546	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1787	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1547	const_iv (GL_ONE_MINUS_DST_ALPHA),	1788	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1789	const_iv (GL_SRC_ALPHA_SATURATE),
1548	const_iv (GL_RGB),	1790	const_iv (GL_RGB),
1549	const_iv (GL_RGBA),	1791	const_iv (GL_RGBA),
		1792	const_iv (GL_RGBA4),
		1793	const_iv (GL_RGBA8),
		1794	const_iv (GL_RGB5_A1),
1550	const_iv (GL_UNSIGNED_BYTE),	1795	const_iv (GL_UNSIGNED_BYTE),
1551	const_iv (GL_UNSIGNED_SHORT),	1796	const_iv (GL_UNSIGNED_SHORT),
1552	const_iv (GL_UNSIGNED_INT),	1797	const_iv (GL_UNSIGNED_INT),
1553	const_iv (GL_ALPHA),	1798	const_iv (GL_ALPHA),
1554	const_iv (GL_INTENSITY),	1799	const_iv (GL_INTENSITY),
…		…
1563	const_iv (GL_TEXTURE_MAG_FILTER),	1808	const_iv (GL_TEXTURE_MAG_FILTER),
1564	const_iv (GL_TEXTURE_MIN_FILTER),	1809	const_iv (GL_TEXTURE_MIN_FILTER),
1565	const_iv (GL_TEXTURE_ENV_MODE),	1810	const_iv (GL_TEXTURE_ENV_MODE),
1566	const_iv (GL_TEXTURE_WRAP_S),	1811	const_iv (GL_TEXTURE_WRAP_S),
1567	const_iv (GL_TEXTURE_WRAP_T),	1812	const_iv (GL_TEXTURE_WRAP_T),
		1813	const_iv (GL_REPEAT),
1568	const_iv (GL_CLAMP),	1814	const_iv (GL_CLAMP),
1569	const_iv (GL_REPEAT),	1815	const_iv (GL_CLAMP_TO_EDGE),
1570	const_iv (GL_NEAREST),	1816	const_iv (GL_NEAREST),
1571	const_iv (GL_LINEAR),	1817	const_iv (GL_LINEAR),
1572	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1818	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1573	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1819	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1574	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1820	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1585	const_iv (GL_SEPARABLE_2D),	1831	const_iv (GL_SEPARABLE_2D),
1586	const_iv (GL_CONVOLUTION_2D),	1832	const_iv (GL_CONVOLUTION_2D),
1587	const_iv (GL_CONVOLUTION_BORDER_MODE),	1833	const_iv (GL_CONVOLUTION_BORDER_MODE),
1588	const_iv (GL_CONSTANT_BORDER),	1834	const_iv (GL_CONSTANT_BORDER),
1589	const_iv (GL_LINES),	1835	const_iv (GL_LINES),
		1836	const_iv (GL_LINE_STRIP),
1590	const_iv (GL_LINE_LOOP),	1837	const_iv (GL_LINE_LOOP),
1591	const_iv (GL_QUADS),	1838	const_iv (GL_QUADS),
1592	const_iv (GL_QUAD_STRIP),	1839	const_iv (GL_QUAD_STRIP),
1593	const_iv (GL_TRIANGLES),	1840	const_iv (GL_TRIANGLES),
1594	const_iv (GL_TRIANGLE_STRIP),	1841	const_iv (GL_TRIANGLE_STRIP),
…		…
1604		1851
1605	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1852	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1606	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1853	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1607	}	1854	}
1608		1855
		1856	char *
		1857	gl_vendor ()
		1858	CODE:
		1859	RETVAL = (char *)glGetString (GL_VENDOR);
		1860	OUTPUT:
		1861	RETVAL
		1862
		1863	char *
		1864	gl_version ()
		1865	CODE:
		1866	RETVAL = (char *)glGetString (GL_VERSION);
		1867	OUTPUT:
		1868	RETVAL
		1869
		1870	char *
		1871	gl_extensions ()
		1872	CODE:
		1873	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1874	OUTPUT:
		1875	RETVAL
		1876
1609	int glGetError ()	1877	int glGetError ()
		1878
		1879	void glFinish ()
1610		1880
1611	void glClear (int mask)	1881	void glClear (int mask)
1612		1882
1613	void glClearColor (float r, float g, float b, float a = 1.0)	1883	void glClearColor (float r, float g, float b, float a = 1.0)
1614	PROTOTYPE: @	1884	PROTOTYPE: @
…		…
1621		1891
1622	void glHint (int target, int mode)	1892	void glHint (int target, int mode)
1623		1893
1624	void glBlendFunc (int sfactor, int dfactor)	1894	void glBlendFunc (int sfactor, int dfactor)
1625		1895
		1896	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1897	CODE:
		1898	gl_BlendFuncSeparate (sa, da, saa, daa);
		1899
1626	void glDepthMask (int flag)	1900	void glDepthMask (int flag)
1627		1901
1628	void glLogicOp (int opcode)	1902	void glLogicOp (int opcode)
1629		1903
1630	void glColorMask (int red, int green, int blue, int alpha)	1904	void glColorMask (int red, int green, int blue, int alpha)
…		…
1634	void glPushMatrix ()	1908	void glPushMatrix ()
1635		1909
1636	void glPopMatrix ()	1910	void glPopMatrix ()
1637		1911
1638	void glLoadIdentity ()	1912	void glLoadIdentity ()
		1913
		1914	void glDrawBuffer (int buffer)
		1915
		1916	void glReadBuffer (int buffer)
1639		1917
1640	# near_ and far_ are due to microsofts buggy "c" compiler	1918	# near_ and far_ are due to microsofts buggy "c" compiler
1641	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1919	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1642		1920
1643	# near_ and far_ are due to microsofts buggy "c" compiler	1921	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1663		1941
1664	void glEnd ()	1942	void glEnd ()
1665		1943
1666	void glColor (float r, float g, float b, float a = 1.0)	1944	void glColor (float r, float g, float b, float a = 1.0)
1667	PROTOTYPE: @	1945	PROTOTYPE: @
		1946	ALIAS:
		1947	glColor_premultiply = 1
1668	CODE:	1948	CODE:
		1949	if (ix)
		1950	{
		1951	r *= a;
		1952	g *= a;
		1953	b *= a;
		1954	}
1669	// microsoft visual "c" rounds instead of truncating...	1955	// microsoft visual "c" rounds instead of truncating...
1670	glColor4ub (MIN ((int)(r * 255.f), 255),	1956	glColor4f (r, g, b, a);
1671	MIN ((int)(g * 255.f), 255),
1672	MIN ((int)(b * 255.f), 255),
1673	MIN ((int)(a * 255.f), 255));
1674		1957
1675	void glInterleavedArrays (int format, int stride, char *data)	1958	void glInterleavedArrays (int format, int stride, char *data)
1676		1959
1677	void glDrawElements (int mode, int count, int type, char *indices)	1960	void glDrawElements (int mode, int count, int type, char *indices)
1678		1961
1679	# 1.2 void glDrawRangeElements (int mode, int start, int end	1962	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1963
		1964	void glRasterPos (float x, float y, float z = 0.)
		1965	CODE:
		1966	glRasterPos3f (0, 0, z);
		1967	glBitmap (0, 0, 0, 0, x, y, 0);
1680		1968
1681	void glVertex (float x, float y, float z = 0.)	1969	void glVertex (float x, float y, float z = 0.)
1682	CODE:	1970	CODE:
1683	glVertex3f (x, y, z);	1971	glVertex3f (x, y, z);
1684		1972
…		…
1696		1984
1697	void glBindTexture (int target, int name)	1985	void glBindTexture (int target, int name)
1698		1986
1699	void glConvolutionParameter (int target, int pname, float params)	1987	void glConvolutionParameter (int target, int pname, float params)
1700	CODE:	1988	CODE:
1701	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1989	if (gl.ConvolutionParameterf)
		1990	gl.ConvolutionParameterf (target, pname, params);
1702		1991
1703	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1992	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1704	CODE:	1993	CODE:
1705	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1994	if (gl.ConvolutionFilter2D)
1706	(target, internalformat, width, height, format, type, data));	1995	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1707		1996
1708	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1997	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1709	CODE:	1998	CODE:
1710	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1999	if (gl.SeparableFilter2D)
1711	(target, internalformat, width, height, format, type, row, column));	2000	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1712		2001
1713	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2002	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1714		2003
1715	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2004	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1716		2005
1717	void glRasterPos (int x, int y)	2006	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1718	CODE:
1719	glRasterPos2i (x, y);
1720		2007
1721	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2008	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1722		2009
1723	int glGenTexture ()	2010	int glGenTexture ()
1724	CODE:	2011	CODE:
…		…
1751		2038
1752	void glEndList ()	2039	void glEndList ()
1753		2040
1754	void glCallList (int list)	2041	void glCallList (int list)
1755		2042
1756

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.90 by root, Sun May 21 00:34:58 2006 UTC vs. Revision 1.142 by root, Fri Aug 18 01:27:15 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.90 by root, Sun May 21 00:34:58 2006 UTC vs.
Revision 1.142 by root, Fri Aug 18 01:27:15 2006 UTC