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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.54 by root, Wed Apr 19 23:37:48 2006 UTC vs.
Revision 1.138 by root, Mon Aug 14 01:21:01 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
		3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2	# include <malloc.h>	4	# include <malloc.h>
		5	# include <windows.h>
		6	# pragma warning(disable:4244)
3	#endif	7	#endif
4		8
5	#include "EXTERN.h"	9	#include "EXTERN.h"
6	#include "perl.h"	10	#include "perl.h"
7	#include "XSUB.h"	11	#include "XSUB.h"
8		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
		17	#include <math.h>
9	#include <string.h>	18	#include <string.h>
10	#include <stdio.h>	19	#include <stdio.h>
		20	#include <stdlib.h>
11		21
12	#include <SDL.h>	22	#include <SDL.h>
		23	#include <SDL_endian.h>
13	#include <SDL_image.h>	24	#include <SDL_image.h>
14	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
15	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
16		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
17	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
18		32
19	#include <pango/pango.h>	33	#include <pango/pango.h>
20	#include <pango/pangofc-fontmap.h>
21	#include <pango/pangoft2.h>
22		34
23	#ifndef _WIN32	35	#ifndef _WIN32
24	# include <sys/types.h>	36	# include <sys/types.h>
25	# include <sys/socket.h>	37	# include <sys/socket.h>
26	# include <netinet/in.h>	38	# include <netinet/in.h>
33	typedef signed char int8_t;	45	typedef signed char int8_t;
34	typedef signed short int16_t;	46	typedef signed short int16_t;
35	typedef signed int int32_t;	47	typedef signed int int32_t;
36	#endif	48	#endif
37		49
		50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
		51
38	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
39		53
40	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
41	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
42		56
		57	#define MIN_FONT_HEIGHT 10
		58
		59	#if 0
		60	# define PARACHUTE SDL_INIT_NOPARACHUTE
		61	#else
		62	# define PARACHUTE 0
		63	#endif
		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
43	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
44	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
45		90
46	static PangoContext *context;	91	typedef PangoFontDescription *CFPlus__Font;
47	static PangoFontMap *fontmap;	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	}
48		110
49	typedef struct cf_layout {	111	typedef struct cf_layout {
50	PangoLayout *pl;	112	PangoLayout *pl;
		113	float r, g, b, a; // default color for rgba mode
51	int base_height;	114	int base_height;
		115	CFPlus__Font font;
52	} *CFClient__Layout;	116	} *CFPlus__Layout;
		117
		118	static CFPlus__Font default_font;
		119	static PangoContext *opengl_context;
		120	static PangoFontMap *opengl_fontmap;
53		121
54	static void	122	static void
55	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
56	{	124	{
57	FcPatternAddBool (pattern, FC_HINTING , 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
		126	#ifdef FC_HINT_STYLE
		127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		128	#endif
58	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
59	}	130	}
60		131
61	static void	132	static void
62	layout_update (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
63	{	134	{
64	/* 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
65	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
66	*/	137	*/
67	PangoFontDescription *font = pango_context_get_font_description (context);	138	PangoFontDescription *font = self->font ? self->font : default_font;
68		139
69	int height = self->base_height * (PANGO_SCALE * 8 / 10);
70
71	if (pango_font_description_get_size (font) != height)
72	{
73	pango_font_description_set_absolute_size (font, height);	140	pango_font_description_set_absolute_size (font,
74	pango_layout_context_changed (self->pl);	141	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
75	}	142
		143	pango_layout_set_font_description (self->pl, font);
76	}	144	}
77		145
78	static void	146	static void
79	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
80	{	148	{
81	layout_update (self);
82
83	pango_layout_get_pixel_size (self->pl, w, h);	149	pango_layout_get_pixel_size (self->pl, w, h);
84		150
85	w = (w + 3) & ~3;
86	if (!w) w = 1;	151	if (!w) w = 1;
87	if (!h) h = 1;	152	if (!h) h = 1;
		153
		154	w = (w + 3) & ~3;
88	}	155	}
89		156
90	typedef uint16_t mapface;	157	typedef uint16_t mapface;
91		158
92	typedef struct {	159	typedef struct {
…		…
115	int texs;	182	int texs;
116	maptex *tex;	183	maptex *tex;
117		184
118	int32_t rows;	185	int32_t rows;
119	maprow *row;	186	maprow *row;
120	} *CFClient__Map;	187	} *CFPlus__Map;
121		188
122	static char *	189	static char *
123	prepend (char *ptr, int sze, int inc)	190	prepend (char *ptr, int sze, int inc)
124	{	191	{
125	char *p;	192	char *p;
…		…
143		210
144	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	211	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
145	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	212	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
146		213
147	static maprow *	214	static maprow *
148	map_get_row (CFClient__Map self, int y)	215	map_get_row (CFPlus__Map self, int y)
149	{	216	{
150	if (0 > y)	217	if (0 > y)
151	{	218	{
152	int extend = - y + MAP_EXTEND_Y;	219	int extend = - y + MAP_EXTEND_Y;
153	Prepend (maprow, self->row, self->rows, extend);	220	Prepend (maprow, self->row, self->rows, extend);
…		…
191		258
192	return row->col + (x - row->c0);	259	return row->col + (x - row->c0);
193	}	260	}
194		261
195	static mapcell *	262	static mapcell *
196	map_get_cell (CFClient__Map self, int x, int y)	263	map_get_cell (CFPlus__Map self, int x, int y)
197	{	264	{
198	return row_get_cell (map_get_row (self, y), x);	265	return row_get_cell (map_get_row (self, y), x);
199	}	266	}
200		267
201	static void	268	static void
202	map_clear (CFClient__Map self)	269	map_clear (CFPlus__Map self)
203	{	270	{
204	int r;	271	int r;
205		272
206	for (r = 0; r < self->rows; r++)	273	for (r = 0; r < self->rows; r++)
207	Safefree (self->row[r].col);	274	Safefree (self->row[r].col);
…		…
215	self->row = 0;	282	self->row = 0;
216	self->rows = 0;	283	self->rows = 0;
217	}	284	}
218		285
219	static void	286	static void
220	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	287	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
221	{	288	{
222	int x, y;	289	int x, y;
223	maprow *row;	290	maprow *row;
224		291
225	for (y = y0; y < y0 + h; y++)	292	for (y = y0; y < y0 + h; y++)
…		…
239	row->col[x - row->c0].darkness = -1;	306	row->col[x - row->c0].darkness = -1;
240	}	307	}
241	}	308	}
242	}	309	}
243		310
		311	static void
		312	music_finished (void)
		313	{
		314	SDL_UserEvent ev;
		315
		316	ev.type = SDL_USEREVENT;
		317	ev.code = 0;
		318	ev.data1 = 0;
		319	ev.data2 = 0;
		320
		321	SDL_PushEvent ((SDL_Event *)&ev);
		322	}
		323
		324	static void
		325	channel_finished (int channel)
		326	{
		327	SDL_UserEvent ev;
		328
		329	ev.type = SDL_USEREVENT;
		330	ev.code = 1;
		331	ev.data1 = (void *)(long)channel;
		332	ev.data2 = 0;
		333
		334	SDL_PushEvent ((SDL_Event *)&ev);
		335	}
		336
		337	static unsigned int
		338	minpot (unsigned int n)
		339	{
		340	if (!n)
		341	return 0;
		342
		343	--n;
		344
		345	n \|= n >> 1;
		346	n \|= n >> 2;
		347	n \|= n >> 4;
		348	n \|= n >> 8;
		349	n \|= n >> 16;
		350
		351	return n + 1;
		352	}
		353
244	MODULE = CFClient PACKAGE = CFClient	354	MODULE = CFPlus PACKAGE = CFPlus
245		355
246	PROTOTYPES: ENABLE	356	PROTOTYPES: ENABLE
247		357
248	BOOT:	358	BOOT:
249	{	359	{
250	HV *stash = gv_stashpv ("CFClient", 1);	360	HV *stash = gv_stashpv ("CFPlus", 1);
251	static const struct {	361	static const struct {
252	const char *name;	362	const char *name;
253	IV iv;	363	IV iv;
254	} *civ, const_iv[] = {	364	} *civ, const_iv[] = {
255	# define const_iv(name) { # name, (IV)name }	365	# define const_iv(name) { # name, (IV)name }
…		…
354	# undef const_iv	464	# undef const_iv
355	};	465	};
356		466
357	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	467	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
358	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	468	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
359
360	fontmap = pango_ft2_font_map_new ();
361	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
362	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
363	}	469	}
364		470
365	int	471	int
		472	in_destruct ()
		473	CODE:
		474	RETVAL = PL_main_cv == Nullcv;
		475	OUTPUT:
		476	RETVAL
		477
		478	NV floor (NV x)
		479
		480	NV ceil (NV x)
		481
		482	void
		483	pango_init ()
		484	CODE:
		485	{
		486	opengl_fontmap = pango_opengl_font_map_new ();
		487	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
		488	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		489	}
		490
		491	int
366	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	492	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
367		493
368	void	494	void
369	SDL_Quit ()	495	SDL_Quit ()
370		496
371	void	497	void
…		…
377	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	503	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
378	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	504	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
379	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	505	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
380	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	506	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
381		507
		508	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		509	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		510
382	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	511	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
383	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	512	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
384	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	513	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
385	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	514	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
386		515
387	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	516	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		517	#if SDL_VERSION_ATLEAST(1,2,10)
388	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	518	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
389	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	519	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		520	#endif
390		521
391	SDL_EnableUNICODE (1);	522	SDL_EnableUNICODE (1);
392	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	523	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
393		524
394	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	525	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
403		534
404	++m;	535	++m;
405	}	536	}
406	}	537	}
407		538
		539	char *
		540	SDL_GetError ()
		541
408	int	542	int
409	SDL_SetVideoMode (int w, int h, int fullscreen)	543	SDL_SetVideoMode (int w, int h, int fullscreen)
410	CODE:	544	CODE:
411	RETVAL = !!SDL_SetVideoMode (	545	RETVAL = !!SDL_SetVideoMode (
412	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	546	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
413	);	547	);
		548	if (RETVAL)
		549	{
414	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	550	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		551	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		552	# include "glfunc.h"
		553	# undef GL_FUNC
		554	}
415	OUTPUT:	555	OUTPUT:
416	RETVAL	556	RETVAL
417		557
418	void	558	void
419	SDL_GL_SwapBuffers ()	559	SDL_GL_SwapBuffers ()
		560
		561	char *
		562	SDL_GetKeyName (int sym)
420		563
421	void	564	void
422	SDL_PollEvent ()	565	SDL_PollEvent ()
423	PPCODE:	566	PPCODE:
424	{	567	{
…		…
426		569
427	while (SDL_PollEvent (&ev))	570	while (SDL_PollEvent (&ev))
428	{	571	{
429	HV *hv = newHV ();	572	HV *hv = newHV ();
430	hv_store (hv, "type", 4, newSViv (ev.type), 0);	573	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		574
431	switch (ev.type)	575	switch (ev.type)
432	{	576	{
433	case SDL_KEYDOWN:	577	case SDL_KEYDOWN:
434	case SDL_KEYUP:	578	case SDL_KEYUP:
435	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	579	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
442	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	586	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
443	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	587	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
444	break;	588	break;
445		589
446	case SDL_MOUSEMOTION:	590	case SDL_MOUSEMOTION:
		591	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		592
447	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	593	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
448	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	594	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
449	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	595	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
450	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	596	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
451	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	597	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
452	break;	598	break;
453		599
454	case SDL_MOUSEBUTTONDOWN:	600	case SDL_MOUSEBUTTONDOWN:
455	case SDL_MOUSEBUTTONUP:	601	case SDL_MOUSEBUTTONUP:
		602	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		603
456	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	604	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
457	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	605	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
458	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	606	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
459	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	607	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		608	break;
		609
		610	case SDL_USEREVENT:
		611	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		612	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		613	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		614	break;
460	}	615	}
461		616
462	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	617	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
463	}	618	}
464	}	619	}
465		620
466	int	621	int
467	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	622	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
		623	POSTCALL:
		624	Mix_HookMusicFinished (music_finished);
		625	Mix_ChannelFinished (channel_finished);
468		626
469	void	627	void
470	Mix_CloseAudio ()	628	Mix_CloseAudio ()
471		629
472	int	630	int
…		…
477	CODE:	635	CODE:
478	#ifndef _WIN32	636	#ifndef _WIN32
479	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	637	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
480	#endif	638	#endif
481		639
482	char *
483	gl_version ()
484	CODE:
485	RETVAL = (char *)glGetString (GL_VERSION);
486	OUTPUT:
487	RETVAL
488
489	char *
490	gl_extensions ()
491	CODE:
492	RETVAL = (char *)glGetString (GL_EXTENSIONS);
493	OUTPUT:
494	RETVAL
495
496	void	640	void
497	add_font (char *file)	641	add_font (char *file)
498	CODE:	642	CODE:
499	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	643	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
500
501	void
502	set_font (char *file)
503	CODE:
504	{
505	int count;
506	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )file, 0, 0, &count);
507	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
508	FcPatternDestroy (pattern);
509	pango_context_set_font_description (context, font);
510	}
511		644
512	void	645	void
513	load_image_inline (SV *image_)	646	load_image_inline (SV *image_)
514	ALIAS:	647	ALIAS:
515	load_image_file = 1	648	load_image_file = 1
…		…
557		690
558	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	691	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
559		692
560	assert (surface2->pitch == surface2->w * 4);	693	assert (surface2->pitch == surface2->w * 4);
561		694
		695	SDL_LockSurface (surface2);
562	EXTEND (SP, 5);	696	EXTEND (SP, 6);
563	PUSHs (sv_2mortal (newSViv (surface2->w)));	697	PUSHs (sv_2mortal (newSViv (surface2->w)));
564	PUSHs (sv_2mortal (newSViv (surface2->h)));	698	PUSHs (sv_2mortal (newSViv (surface2->h)));
565	SDL_LockSurface (surface2);
566	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	699	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
567	SDL_UnlockSurface (surface2);
568	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	700	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
569	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	701	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
570	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	702	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		703	SDL_UnlockSurface (surface2);
571		704
572	SDL_FreeSurface (surface);	705	SDL_FreeSurface (surface);
573	SDL_FreeSurface (surface2);	706	SDL_FreeSurface (surface2);
574	}	707	}
575		708
…		…
597	PUSHs (sv_2mortal (newSViv (b / y)));	730	PUSHs (sv_2mortal (newSViv (b / y)));
598	PUSHs (sv_2mortal (newSViv (a / y)));	731	PUSHs (sv_2mortal (newSViv (a / y)));
599	}	732	}
600		733
601	void	734	void
		735	error (char *message)
		736	CODE:
		737	fprintf (stderr, "ERROR: %s\n", message);
		738	#ifdef _WIN32
		739	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
		740	#endif
		741
		742	void
602	fatal (char *message)	743	fatal (char *message)
603	CODE:	744	CODE:
		745	fprintf (stderr, "FATAL: %s\n", message);
604	#ifdef _WIN32	746	#ifdef _WIN32
605	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	747	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
606	#else
607	fprintf (stderr, "FATAL: %s\n", message);
608	#endif	748	#endif
609	exit (1);	749	_exit (1);
610		750
		751	void
		752	_exit (int retval)
		753	CODE:
		754	_exit (retval);
		755
		756	MODULE = CFPlus PACKAGE = CFPlus::Font
		757
		758	CFPlus::Font
		759	new_from_file (SV class, char path, int id = 0)
		760	CODE:
		761	{
		762	int count;
		763	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
		764	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
		765	FcPatternDestroy (pattern);
		766	}
		767	OUTPUT:
		768	RETVAL
		769
		770	void
		771	DESTROY (CFPlus::Font self)
		772	CODE:
		773	pango_font_description_free (self);
		774
		775	void
		776	make_default (CFPlus::Font self)
		777	CODE:
		778	default_font = self;
		779
611	MODULE = CFClient PACKAGE = CFClient::Layout	780	MODULE = CFPlus PACKAGE = CFPlus::Layout
612		781
613	CFClient::Layout	782	void
614	new (SV *class, int base_height = 10)	783	reset_glyph_cache ()
		784	CODE:
		785	tc_clear ();
		786
		787	CFPlus::Layout
		788	new (SV *class)
615	CODE:	789	CODE:
616	New (0, RETVAL, 1, struct cf_layout);	790	New (0, RETVAL, 1, struct cf_layout);
617	RETVAL->base_height = base_height;	791
618	RETVAL->pl = pango_layout_new (context);	792	RETVAL->pl = pango_layout_new (opengl_context);
		793	RETVAL->r = 1.;
		794	RETVAL->g = 1.;
		795	RETVAL->b = 1.;
		796	RETVAL->a = 1.;
		797	RETVAL->base_height = MIN_FONT_HEIGHT;
		798	RETVAL->font = 0;
		799
619	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	800	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
		801	layout_update_font (RETVAL);
620	OUTPUT:	802	OUTPUT:
621	RETVAL	803	RETVAL
622		804
623	void	805	void
624	DESTROY (CFClient::Layout self)	806	DESTROY (CFPlus::Layout self)
625	CODE:	807	CODE:
626	g_object_unref (self->pl);	808	g_object_unref (self->pl);
627	Safefree (self);	809	Safefree (self);
628		810
629	void	811	void
630	set_text (CFClient::Layout self, SV *text_)	812	set_text (CFPlus::Layout self, SV *text_)
631	CODE:	813	CODE:
632	{	814	{
633	STRLEN textlen;	815	STRLEN textlen;
634	char *text = SvPVutf8 (text_, textlen);	816	char *text = SvPVutf8 (text_, textlen);
635		817
636	pango_layout_set_text (self->pl, text, textlen);	818	pango_layout_set_text (self->pl, text, textlen);
637	}	819	}
638		820
639	void	821	void
640	set_markup (CFClient::Layout self, SV *text_)	822	set_markup (CFPlus::Layout self, SV *text_)
641	CODE:	823	CODE:
642	{	824	{
643	STRLEN textlen;	825	STRLEN textlen;
644	char *text = SvPVutf8 (text_, textlen);	826	char *text = SvPVutf8 (text_, textlen);
645		827
646	pango_layout_set_markup (self->pl, text, textlen);	828	pango_layout_set_markup (self->pl, text, textlen);
647	}	829	}
648		830
		831	void
		832	set_shapes (CFPlus::Layout self, ...)
		833	CODE:
		834	{
		835	PangoAttrList *attrs = 0;
		836	const char *text = pango_layout_get_text (self->pl);
		837	const char *pos = text;
		838	int arg = 4;
		839
		840	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		841	{
		842	PangoRectangle inkrect, rect;
		843	PangoAttribute *attr;
		844
		845	int x = SvIV (ST (arg - 3));
		846	int y = SvIV (ST (arg - 2));
		847	int w = SvIV (ST (arg - 1));
		848	int h = SvIV (ST (arg ));
		849
		850	inkrect.x = 0;
		851	inkrect.y = 0;
		852	inkrect.width = 0;
		853	inkrect.height = 0;
		854
		855	rect.x = x * PANGO_SCALE;
		856	rect.y = y * PANGO_SCALE;
		857	rect.width = w * PANGO_SCALE;
		858	rect.height = h * PANGO_SCALE;
		859
		860	if (!attrs)
		861	attrs = pango_layout_get_attributes (self->pl);
		862
		863	attr = pango_attr_shape_new (&inkrect, &rect);
		864	attr->start_index = pos - text;
		865	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		866	pango_attr_list_insert (attrs, attr);
		867
		868	arg += 4;
		869	pos += sizeof (OBJ_STR) - 1;
		870	}
		871
		872	if (attrs)
		873	pango_layout_set_attributes (self->pl, attrs);
		874	}
		875
		876	void
		877	get_shapes (CFPlus::Layout self)
		878	PPCODE:
		879	{
		880	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		881
		882	do
		883	{
		884	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		885
		886	if (run && shape_attr_p (run))
		887	{
		888	PangoRectangle extents;
		889	pango_layout_iter_get_run_extents (iter, 0, &extents);
		890
		891	EXTEND (SP, 2);
		892	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		893	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		894	}
		895	}
		896	while (pango_layout_iter_next_run (iter));
		897
		898	pango_layout_iter_free (iter);
		899	}
		900
		901	int
		902	has_wrapped (CFPlus::Layout self)
		903	CODE:
		904	{
		905	int lines = 1;
		906	const char *text = pango_layout_get_text (self->pl);
		907
		908	while (*text)
		909	lines += *text++ == '\n';
		910
		911	RETVAL = lines < pango_layout_get_line_count (self->pl);
		912	}
		913	OUTPUT:
		914	RETVAL
		915
649	SV *	916	SV *
650	get_text (CFClient::Layout self)	917	get_text (CFPlus::Layout self)
651	CODE:	918	CODE:
652	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	919	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
653	SvUTF8_on (RETVAL);	920	sv_utf8_decode (RETVAL);
654	OUTPUT:	921	OUTPUT:
655	RETVAL	922	RETVAL
656		923
657	void	924	void
		925	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
		926	CODE:
		927	self->r = r;
		928	self->g = g;
		929	self->b = b;
		930	self->a = a;
		931
		932	void
		933	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
		934	CODE:
		935	if (self->font != font)
		936	{
		937	self->font = font;
		938	layout_update_font (self);
		939	}
		940
		941	void
658	set_height (CFClient::Layout self, int base_height)	942	set_height (CFPlus::Layout self, int base_height)
659	CODE:	943	CODE:
		944	if (self->base_height != base_height)
		945	{
660	self->base_height = base_height;	946	self->base_height = base_height;
		947	layout_update_font (self);
		948	}
661		949
662	void	950	void
663	set_width (CFClient::Layout self, int max_width = -1)	951	set_width (CFPlus::Layout self, int max_width = -1)
664	CODE:	952	CODE:
665	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	953	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
666		954
667	void	955	void
		956	set_indent (CFPlus::Layout self, int indent)
		957	CODE:
		958	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		959
		960	void
		961	set_spacing (CFPlus::Layout self, int spacing)
		962	CODE:
		963	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		964
		965	void
		966	set_ellipsise (CFPlus::Layout self, int ellipsise)
		967	CODE:
		968	pango_layout_set_ellipsize (self->pl,
		969	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		970	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		971	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		972	: PANGO_ELLIPSIZE_NONE
		973	);
		974
		975	void
		976	set_single_paragraph_mode (CFPlus::Layout self, int spm)
		977	CODE:
		978	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		979
		980	void
668	size (CFClient::Layout self)	981	size (CFPlus::Layout self)
669	PPCODE:	982	PPCODE:
670	{	983	{
671	int w, h;	984	int w, h;
672		985
673	layout_update (self);
674	layout_get_pixel_size (self, &w, &h);	986	layout_get_pixel_size (self, &w, &h);
675		987
676	EXTEND (SP, 2);	988	EXTEND (SP, 2);
677	PUSHs (sv_2mortal (newSViv (w)));	989	PUSHs (sv_2mortal (newSViv (w)));
678	PUSHs (sv_2mortal (newSViv (h)));	990	PUSHs (sv_2mortal (newSViv (h)));
679	}	991	}
680		992
681	int	993	int
		994	descent (CFPlus::Layout self)
		995	CODE:
		996	{
		997	PangoRectangle rect;
		998	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		999	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1000	RETVAL = PANGO_DESCENT (rect);
		1001	}
		1002	OUTPUT:
		1003	RETVAL
		1004
		1005	int
682	xy_to_index (CFClient::Layout self, int x, int y)	1006	xy_to_index (CFPlus::Layout self, int x, int y)
683	CODE:	1007	CODE:
684	{	1008	{
685	int index, trailing;	1009	int index, trailing;
686
687	layout_update (self);
688	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1010	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
689
690	RETVAL = index;	1011	RETVAL = index;
691	}	1012	}
692	OUTPUT:	1013	OUTPUT:
693	RETVAL	1014	RETVAL
694		1015
695	void	1016	void
696	cursor_pos (CFClient::Layout self, int index)	1017	cursor_pos (CFPlus::Layout self, int index)
697	PPCODE:	1018	PPCODE:
698	{	1019	{
699	PangoRectangle strong_pos;	1020	PangoRectangle strong_pos;
700	layout_update (self);
701	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1021	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
702		1022
703	EXTEND (SP, 3);	1023	EXTEND (SP, 3);
704	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1024	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
705	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1025	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
706	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1026	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
707	}	1027	}
708		1028
709	void	1029	void
710	render (CFClient::Layout self)	1030	render (CFPlus::Layout self, float x, float y, int flags = 0)
711	PPCODE:	1031	PPCODE:
712	{	1032	pango_opengl_render_layout_subpixel (
713	SV *retval;	1033	self->pl,
714	int w, h;	1034	x * PANGO_SCALE, y * PANGO_SCALE,
715	FT_Bitmap bitmap;	1035	self->r, self->g, self->b, self->a,
		1036	flags
		1037	);
716		1038
717	layout_update (self);	1039	MODULE = CFPlus PACKAGE = CFPlus::Texture
718	layout_get_pixel_size (self, &w, &h);
719		1040
720	retval = newSV (w * h);	1041	void
721	SvPOK_only (retval);	1042	pad2pot (SV data_, SV w_, SV *h_)
722	SvCUR_set (retval, w * h);	1043	CODE:
		1044	{
		1045	int ow = SvIV (w_);
		1046	int oh = SvIV (h_);
723		1047
724	bitmap.rows = h;	1048	if (ow && oh)
725	bitmap.width = w;	1049	{
726	bitmap.pitch = w;	1050	int nw = minpot (ow);
727	bitmap.buffer = (unsigned char*)SvPVX (retval);	1051	int nh = minpot (oh);
728	bitmap.num_grays = 256;
729	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
730		1052
731	memset (bitmap.buffer, 0, w * h);	1053	if (nw != ow \|\| nh != oh)
732		1054	{
733	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	1055	if (SvOK (data_))
		1056	{
		1057	STRLEN datalen;
		1058	char *data = SvPVbyte (data_, datalen);
		1059	int bpp = datalen / (ow * oh);
		1060	SV result_ = sv_2mortal (newSV (nw nh * bpp));
734		1061
735	EXTEND (SP, 3);	1062	SvPOK_only (result_);
736	PUSHs (sv_2mortal (newSViv (w)));	1063	SvCUR_set (result_, nw * nh * bpp);
737	PUSHs (sv_2mortal (newSViv (h)));
738	PUSHs (sv_2mortal (retval));
739	}
740		1064
741	MODULE = CFClient PACKAGE = CFClient::Texture	1065	memset (SvPVX (result_), 0, nw * nh * bpp);
		1066	while (oh--)
		1067	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
742		1068
		1069	sv_setsv (data_, result_);
		1070	}
		1071
		1072	sv_setiv (w_, nw);
		1073	sv_setiv (h_, nh);
		1074	}
		1075	}
		1076	}
		1077
743	void	1078	void
744	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1079	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
745	PROTOTYPE: $$$;$$	1080	PROTOTYPE: $$$;$$
		1081	ALIAS:
		1082	draw_quad_alpha = 1
		1083	draw_quad_alpha_premultiplied = 2
746	CODE:	1084	CODE:
747	{	1085	{
748	HV hv = (HV )SvRV (self);	1086	HV hv = (HV )SvRV (self);
749	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1087	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
750	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1088	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
751	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1089	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
752	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
753		1090
754	if (items < 5)	1091	if (items < 5)
755	{	1092	{
756	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1093	w = SvNV (*hv_fetch (hv, "w", 1, 1));
757	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1094	h = SvNV (*hv_fetch (hv, "h", 1, 1));
758	}	1095	}
759		1096
		1097	if (ix)
		1098	{
		1099	glEnable (GL_BLEND);
		1100
		1101	if (ix == 2)
		1102	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1103	else
		1104	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1105	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1106
		1107	glEnable (GL_ALPHA_TEST);
		1108	glAlphaFunc (GL_GREATER, 0.01f);
		1109	}
		1110
760	glBindTexture (GL_TEXTURE_2D, name);	1111	glBindTexture (GL_TEXTURE_2D, name);
761	if (wrap_mode) {	1112
762	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
763	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
764	}
765	glBegin (GL_QUADS);	1113	glBegin (GL_QUADS);
766	glTexCoord2f (0, 0); glVertex2f (x , y );	1114	glTexCoord2f (0, 0); glVertex2f (x , y );
767	glTexCoord2f (0, t); glVertex2f (x , y + h);	1115	glTexCoord2f (0, t); glVertex2f (x , y + h);
768	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1116	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
769	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1117	glTexCoord2f (s, 0); glVertex2f (x + w, y );
770	glEnd ();	1118	glEnd ();
771	}
772		1119
		1120	if (ix)
		1121	{
		1122	glDisable (GL_ALPHA_TEST);
		1123	glDisable (GL_BLEND);
		1124	}
		1125	}
		1126
773	MODULE = CFClient PACKAGE = CFClient::Map	1127	MODULE = CFPlus PACKAGE = CFPlus::Map
774		1128
775	CFClient::Map	1129	CFPlus::Map
776	new (SV *class, int map_width, int map_height)	1130	new (SV *class, int map_width, int map_height)
777	CODE:	1131	CODE:
778	New (0, RETVAL, 1, struct map);	1132	New (0, RETVAL, 1, struct map);
779	RETVAL->x = 0;	1133	RETVAL->x = 0;
780	RETVAL->y = 0;	1134	RETVAL->y = 0;
…		…
790	RETVAL->row = 0;	1144	RETVAL->row = 0;
791	OUTPUT:	1145	OUTPUT:
792	RETVAL	1146	RETVAL
793		1147
794	void	1148	void
795	DESTROY (CFClient::Map self)	1149	DESTROY (CFPlus::Map self)
796	CODE:	1150	CODE:
797	{	1151	{
798	map_clear (self);	1152	map_clear (self);
799	Safefree (self->face);	1153	Safefree (self->face);
		1154	Safefree (self->tex);
800	Safefree (self);	1155	Safefree (self);
801	}	1156	}
802		1157
803	void	1158	void
804	clear (CFClient::Map self)	1159	clear (CFPlus::Map self)
805	CODE:	1160	CODE:
806	map_clear (self);	1161	map_clear (self);
807		1162
808	void	1163	void
809	set_face (CFClient::Map self, int face, int texid)	1164	set_face (CFPlus::Map self, int face, int texid)
810	CODE:	1165	CODE:
811	{	1166	{
812	while (self->faces <= face)	1167	while (self->faces <= face)
813	{	1168	{
814	Append (mapface, self->face, self->faces, self->faces);	1169	Append (mapface, self->face, self->faces, self->faces);
…		…
817		1172
818	self->face [face] = texid;	1173	self->face [face] = texid;
819	}	1174	}
820		1175
821	void	1176	void
822	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)	1177	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)
823	CODE:	1178	CODE:
824	{	1179	{
825	while (self->texs <= texid)	1180	while (self->texs <= texid)
826	{	1181	{
827	Append (maptex, self->tex, self->texs, self->texs);	1182	Append (maptex, self->tex, self->texs, self->texs);
…		…
839	tex->r = r;	1194	tex->r = r;
840	tex->g = g;	1195	tex->g = g;
841	tex->b = b;	1196	tex->b = b;
842	tex->a = a;	1197	tex->a = a;
843	}	1198	}
		1199
		1200	// somewhat hackish, but for textures that require it, it really
		1201	// improves the look, and most others don't suffer.
		1202	glBindTexture (GL_TEXTURE_2D, name);
		1203	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1204	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1205	// use uglier nearest interpolation because linear suffers
		1206	// from transparent color bleeding and ugly wrapping effects.
		1207	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
844	}	1208	}
845		1209
846	int	1210	int
847	ox (CFClient::Map self)	1211	ox (CFPlus::Map self)
848	ALIAS:	1212	ALIAS:
849	oy = 1	1213	oy = 1
		1214	x = 2
		1215	y = 3
		1216	w = 4
		1217	h = 5
850	CODE:	1218	CODE:
851	switch (ix)	1219	switch (ix)
852	{	1220	{
853	case 0: RETVAL = self->ox; break;	1221	case 0: RETVAL = self->ox; break;
854	case 1: RETVAL = self->oy; break;	1222	case 1: RETVAL = self->oy; break;
		1223	case 2: RETVAL = self->x; break;
		1224	case 3: RETVAL = self->y; break;
		1225	case 4: RETVAL = self->w; break;
		1226	case 5: RETVAL = self->h; break;
855	}	1227	}
856	OUTPUT:	1228	OUTPUT:
857	RETVAL	1229	RETVAL
858		1230
859	void	1231	void
860	scroll (CFClient::Map self, int dx, int dy)	1232	scroll (CFPlus::Map self, int dx, int dy)
861	CODE:	1233	CODE:
862	{	1234	{
863	if (dx > 0)	1235	if (dx > 0)
864	map_blank (self, self->x, self->y, dx - 1, self->h);	1236	map_blank (self, self->x, self->y, dx - 1, self->h);
865	else if (dx < 0)	1237	else if (dx < 0)
…		…
881	self->y += MAP_EXTEND_Y;	1253	self->y += MAP_EXTEND_Y;
882	}	1254	}
883	}	1255	}
884		1256
885	void	1257	void
886	map1a_update (CFClient::Map self, SV *data_)	1258	map1a_update (CFPlus::Map self, SV *data_)
887	CODE:	1259	CODE:
888	{	1260	{
889	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1261	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
890	uint8_t data_end = (uint8_t )SvEND (data_);	1262	uint8_t data_end = (uint8_t )SvEND (data_);
891	mapcell *cell;	1263	mapcell *cell;
…		…
893		1265
894	while (data < data_end)	1266	while (data < data_end)
895	{	1267	{
896	flags = (data [0] << 8) + data [1]; data += 2;	1268	flags = (data [0] << 8) + data [1]; data += 2;
897		1269
898	x = ((flags >> 10) & 63) + self->x;	1270	x = self->x + ((flags >> 10) & 63);
899	y = ((flags >> 4) & 63) + self->y;	1271	y = self->y + ((flags >> 4) & 63);
900		1272
901	cell = map_get_cell (self, x, y);	1273	cell = map_get_cell (self, x, y);
902		1274
903	if (flags & 15)	1275	if (flags & 15)
904	{	1276	{
…		…
933	cell->darkness = -1;	1305	cell->darkness = -1;
934	}	1306	}
935	}	1307	}
936		1308
937	SV *	1309	SV *
938	mapmap (CFClient::Map self, int w, int h)	1310	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
939	CODE:	1311	CODE:
940	{	1312	{
941	int x0, x1, x;	1313	int x1, x;
942	int y0, y1, y;	1314	int y1, y;
943	int z;	1315	int z;
944	SV map_sv = newSV (w h * sizeof (uint32_t));	1316	SV map_sv = newSV (w h * sizeof (uint32_t));
945	uint32_t map = (uint32_t )SvPVX (map_sv);	1317	uint32_t map = (uint32_t )SvPVX (map_sv);
946		1318
947	SvPOK_only (map_sv);	1319	SvPOK_only (map_sv);
948	SvCUR_set (map_sv, w * h * sizeof (uint32_t));	1320	SvCUR_set (map_sv, w * h * sizeof (uint32_t));
949		1321
950	x0 = self->x - w / 2; x1 = x0 + w;	1322	x0 += self->x; x1 = x0 + w;
951	y0 = self->y - h / 2; y1 = y0 + h;	1323	y0 += self->y; y1 = y0 + h;
952		1324
953	for (y = y0; y < y1; y++)	1325	for (y = y0; y < y1; y++)
954	{	1326	{
955	maprow *row = 0 <= y && y < self->rows	1327	maprow *row = 0 <= y && y < self->rows
956	? self->row + y	1328	? self->row + y
…		…
993	}	1365	}
994	OUTPUT:	1366	OUTPUT:
995	RETVAL	1367	RETVAL
996		1368
997	void	1369	void
998	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1370	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
999	PPCODE:	1371	CODE:
1000	{	1372	{
1001	int vx, vy;	1373	int vx, vy;
1002	int x, y, z;	1374	int x, y, z;
1003	int last_name;	1375	int last_name;
1004	mapface face;	1376	mapface face;
1005	int sw4 = (sw + 3) & ~3;
1006	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1007	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1008		1377
1009	memset (darkness, 255, sw4 * sh);
1010	SvPOK_only (darkness_sv);
1011	SvCUR_set (darkness_sv, sw4 * sh);
1012
1013	vx = self->x + (self->w - sw) / 2 - shift_x;	1378	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1014	vy = self->y + (self->h - sh) / 2 - shift_y;	1379	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1015		1380
1016	/*	1381	/*
1017	int vx = self->vx = self->w >= sw	1382	int vx = self->vx = self->w >= sw
1018	? self->x + (self->w - sw) / 2	1383	? self->x + (self->w - sw) / 2
1019	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1384	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1023	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1388	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1024	*/	1389	*/
1025		1390
1026	glColor4ub (255, 255, 255, 255);	1391	glColor4ub (255, 255, 255, 255);
1027		1392
		1393	glEnable (GL_BLEND);
1028	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1394	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1029	glEnable (GL_BLEND);
1030	glEnable (GL_TEXTURE_2D);	1395	glEnable (GL_TEXTURE_2D);
1031	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1396	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1032		1397
1033	glBegin (GL_QUADS);	1398	glBegin (GL_QUADS);
1034		1399
…		…
1042		1407
1043	for (x = 0; x < sw; x++)	1408	for (x = 0; x < sw; x++)
1044	if (row->c0 <= x + vx && x + vx < row->c1)	1409	if (row->c0 <= x + vx && x + vx < row->c1)
1045	{	1410	{
1046	mapcell *cell = row->col + (x + vx - row->c0);	1411	mapcell *cell = row->col + (x + vx - row->c0);
1047
1048	darkness[y * sw4 + x] = cell->darkness < 0
1049	? 255 - FOW_DARKNESS
1050	: 255 - cell->darkness;
1051		1412
1052	face = cell->face [z];	1413	face = cell->face [z];
1053		1414
1054	if (face)	1415	if (face)
1055	{	1416	{
…		…
1076		1437
1077	glEnd ();	1438	glEnd ();
1078		1439
1079	glDisable (GL_TEXTURE_2D);	1440	glDisable (GL_TEXTURE_2D);
1080	glDisable (GL_BLEND);	1441	glDisable (GL_BLEND);
		1442	}
		1443
		1444	void
		1445	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1446	CODE:
		1447	{
		1448	static float color[16][3] = {
		1449	{ 0.00F, 0.00F, 0.00F },
		1450	{ 1.00F, 1.00F, 1.00F },
		1451	{ 0.00F, 0.00F, 0.55F },
		1452	{ 1.00F, 0.00F, 0.00F },
		1453
		1454	{ 1.00F, 0.54F, 0.00F },
		1455	{ 0.11F, 0.56F, 1.00F },
		1456	{ 0.93F, 0.46F, 0.00F },
		1457	{ 0.18F, 0.54F, 0.34F },
		1458
		1459	{ 0.56F, 0.73F, 0.56F },
		1460	{ 0.80F, 0.80F, 0.80F },
		1461	{ 0.55F, 0.41F, 0.13F },
		1462	{ 0.99F, 0.77F, 0.26F },
		1463
		1464	{ 0.74F, 0.65F, 0.41F },
		1465
		1466	{ 0.00F, 1.00F, 1.00F },
		1467	{ 1.00F, 0.00F, 1.00F },
		1468	{ 1.00F, 1.00F, 0.00F },
		1469	};
		1470
		1471	int x, y;
		1472
		1473	glEnable (GL_TEXTURE_2D);
		1474	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1475	glEnable (GL_BLEND);
		1476	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1477	glBegin (GL_QUADS);
		1478
		1479	for (y = 0; y < h; y++)
		1480	for (x = 0; x < w; x++)
		1481	{
		1482	unsigned char m = data [x + y * w];
		1483
		1484	if (m)
		1485	{
		1486	float *c = color [m & 15];
		1487
		1488	float tx1 = m & 0x40 ? 0.5 : 0.;
		1489	float tx2 = tx1 + 0.5;
		1490
		1491	glColor4f (c[0], c[1], c[2], 0.75);
		1492	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1493	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1494	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1495	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1496	}
		1497	}
		1498
		1499	glEnd ();
		1500	glDisable (GL_BLEND);
		1501	glDisable (GL_TEXTURE_2D);
		1502	}
		1503
		1504	void
		1505	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1506	PPCODE:
		1507	{
		1508	int vx, vy;
		1509	int x, y;
		1510	int sw4 = (sw + 3) & ~3;
		1511	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1512	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1513
		1514	memset (darkness, 255, sw4 * sh);
		1515	SvPOK_only (darkness_sv);
		1516	SvCUR_set (darkness_sv, sw4 * sh);
		1517
		1518	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1519	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1520
		1521	for (y = 0; y < sh; y++)
		1522	if (0 <= y + vy && y + vy < self->rows)
		1523	{
		1524	maprow *row = self->row + (y + vy);
		1525
		1526	for (x = 0; x < sw; x++)
		1527	if (row->c0 <= x + vx && x + vx < row->c1)
		1528	{
		1529	mapcell *cell = row->col + (x + vx - row->c0);
		1530
		1531	darkness[y * sw4 + x] = cell->darkness < 0
		1532	? 255 - FOW_DARKNESS
		1533	: 255 - cell->darkness;
		1534	}
		1535	}
1081		1536
1082	EXTEND (SP, 3);	1537	EXTEND (SP, 3);
1083	PUSHs (sv_2mortal (newSViv (sw4)));	1538	PUSHs (sv_2mortal (newSViv (sw4)));
1084	PUSHs (sv_2mortal (newSViv (sh)));	1539	PUSHs (sv_2mortal (newSViv (sh)));
1085	PUSHs (darkness_sv);	1540	PUSHs (darkness_sv);
1086	}	1541	}
1087		1542
1088	SV *	1543	SV *
1089	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1544	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1090	CODE:	1545	CODE:
1091	{	1546	{
1092	int x, y, x1, y1;	1547	int x, y, x1, y1;
1093	SV data_sv = newSV (w h * 7 + 5);	1548	SV data_sv = newSV (w h * 7 + 5);
1094	uint8_t data = (uint8_t )SvPVX (data_sv);	1549	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1096	data++ = 0; / version 0 format */	1551	data++ = 0; / version 0 format */
1097	data++ = w >> 8; data++ = w;	1552	data++ = w >> 8; data++ = w;
1098	data++ = h >> 8; data++ = h;	1553	data++ = h >> 8; data++ = h;
1099		1554
1100	// we need to do this 'cause we don't keep an absolute coord system for rows	1555	// we need to do this 'cause we don't keep an absolute coord system for rows
1101	// TODO: treat rows as we treat	1556	// TODO: treat rows as we treat columns
1102	map_get_row (self, y0 + self->y - self->oy);//D	1557	map_get_row (self, y0 + self->y - self->oy);//D
1103	map_get_row (self, y0 + self->y - self->oy + h - 1);//D	1558	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1104		1559
1105	x0 += self->x - self->ox;	1560	x0 += self->x - self->ox;
1106	y0 += self->y - self->oy;	1561	y0 += self->y - self->oy;
…		…
1156	}	1611	}
1157	OUTPUT:	1612	OUTPUT:
1158	RETVAL	1613	RETVAL
1159		1614
1160	void	1615	void
1161	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1616	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1162	PPCODE:	1617	PPCODE:
1163	{	1618	{
1164	int x, y, z;	1619	int x, y, z;
1165	int w, h;	1620	int w, h;
1166	int x1, y1;	1621	int x1, y1;
…		…
1170		1625
1171	w = data++ << 8; w \|= data++;	1626	w = data++ << 8; w \|= data++;
1172	h = data++ << 8; h \|= data++;	1627	h = data++ << 8; h \|= data++;
1173		1628
1174	// we need to do this 'cause we don't keep an absolute coord system for rows	1629	// we need to do this 'cause we don't keep an absolute coord system for rows
1175	// TODO: treat rows as we treat	1630	// TODO: treat rows as we treat columns
1176	map_get_row (self, y0 + self->y - self->oy);//D	1631	map_get_row (self, y0 + self->y - self->oy);//D
1177	map_get_row (self, y0 + self->y - self->oy + h - 1);//D	1632	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1178		1633
1179	x0 += self->x - self->ox;	1634	x0 += self->x - self->ox;
1180	y0 += self->y - self->oy;	1635	y0 += self->y - self->oy;
…		…
1215	}	1670	}
1216	}	1671	}
1217	}	1672	}
1218	}	1673	}
1219		1674
1220	MODULE = CFClient PACKAGE = CFClient::MixChunk	1675	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1221		1676
1222	CFClient::MixChunk	1677	CFPlus::MixChunk
1223	new_from_file (SV class, char path)	1678	new_from_file (SV class, char path)
1224	CODE:	1679	CODE:
1225	RETVAL = Mix_LoadWAV (path);	1680	RETVAL = Mix_LoadWAV (path);
1226	OUTPUT:	1681	OUTPUT:
1227	RETVAL	1682	RETVAL
1228		1683
1229	void	1684	void
1230	DESTROY (CFClient::MixChunk self)	1685	DESTROY (CFPlus::MixChunk self)
1231	CODE:	1686	CODE:
1232	Mix_FreeChunk (self);	1687	Mix_FreeChunk (self);
1233		1688
1234	int	1689	int
1235	volume (CFClient::MixChunk self, int volume = -1)	1690	volume (CFPlus::MixChunk self, int volume = -1)
1236	CODE:	1691	CODE:
1237	RETVAL = Mix_VolumeChunk (self, volume);	1692	RETVAL = Mix_VolumeChunk (self, volume);
1238	OUTPUT:	1693	OUTPUT:
1239	RETVAL	1694	RETVAL
1240		1695
1241	int	1696	int
1242	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1697	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1243	CODE:	1698	CODE:
1244	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1699	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1245	OUTPUT:	1700	OUTPUT:
1246	RETVAL	1701	RETVAL
1247		1702
1248	MODULE = CFClient PACKAGE = CFClient::MixMusic	1703	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1249		1704
1250	int	1705	int
1251	volume (int volume = -1)	1706	volume (int volume = -1)
1252	CODE:	1707	CODE:
1253	RETVAL = Mix_VolumeMusic (volume);	1708	RETVAL = Mix_VolumeMusic (volume);
1254	OUTPUT:	1709	OUTPUT:
1255	RETVAL	1710	RETVAL
1256		1711
1257	CFClient::MixMusic	1712	CFPlus::MixMusic
1258	new_from_file (SV class, char path)	1713	new_from_file (SV class, char path)
1259	CODE:	1714	CODE:
1260	RETVAL = Mix_LoadMUS (path);	1715	RETVAL = Mix_LoadMUS (path);
1261	OUTPUT:	1716	OUTPUT:
1262	RETVAL	1717	RETVAL
1263		1718
1264	void	1719	void
1265	DESTROY (CFClient::MixMusic self)	1720	DESTROY (CFPlus::MixMusic self)
1266	CODE:	1721	CODE:
1267	Mix_FreeMusic (self);	1722	Mix_FreeMusic (self);
1268		1723
1269	int	1724	int
1270	play (CFClient::MixMusic self, int loops = -1)	1725	play (CFPlus::MixMusic self, int loops = -1)
1271	CODE:	1726	CODE:
1272	RETVAL = Mix_PlayMusic (self, loops);	1727	RETVAL = Mix_PlayMusic (self, loops);
1273	OUTPUT:	1728	OUTPUT:
1274	RETVAL	1729	RETVAL
1275		1730
1276	MODULE = CFClient PACKAGE = CFClient::OpenGL	1731	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1277		1732
1278	BOOT:	1733	BOOT:
1279	{	1734	{
1280	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1735	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1281	static const struct {	1736	static const struct {
1282	const char *name;	1737	const char *name;
1283	IV iv;	1738	IV iv;
1284	} *civ, const_iv[] = {	1739	} *civ, const_iv[] = {
1285	# define const_iv(name) { # name, (IV)name }	1740	# define const_iv(name) { # name, (IV)name }
1286	const_iv (GL_COLOR_MATERIAL),	1741	const_iv (GL_COLOR_MATERIAL),
1287	const_iv (GL_SMOOTH),	1742	const_iv (GL_SMOOTH),
1288	const_iv (GL_FLAT),	1743	const_iv (GL_FLAT),
		1744	const_iv (GL_DITHER),
1289	const_iv (GL_BLEND),	1745	const_iv (GL_BLEND),
		1746	const_iv (GL_CULL_FACE),
		1747	const_iv (GL_SCISSOR_TEST),
		1748	const_iv (GL_DEPTH_TEST),
		1749	const_iv (GL_ALPHA_TEST),
		1750	const_iv (GL_NORMALIZE),
		1751	const_iv (GL_RESCALE_NORMAL),
		1752	const_iv (GL_FRONT),
		1753	const_iv (GL_BACK),
1290	const_iv (GL_AND),	1754	const_iv (GL_AND),
		1755	const_iv (GL_ONE),
		1756	const_iv (GL_ZERO),
1291	const_iv (GL_SRC_ALPHA),	1757	const_iv (GL_SRC_ALPHA),
		1758	const_iv (GL_DST_ALPHA),
1292	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1759	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1760	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1761	const_iv (GL_SRC_ALPHA_SATURATE),
1293	const_iv (GL_RGB),	1762	const_iv (GL_RGB),
1294	const_iv (GL_RGBA),	1763	const_iv (GL_RGBA),
		1764	const_iv (GL_RGBA4),
		1765	const_iv (GL_RGBA8),
		1766	const_iv (GL_RGB5_A1),
1295	const_iv (GL_UNSIGNED_BYTE),	1767	const_iv (GL_UNSIGNED_BYTE),
1296	const_iv (GL_ALPHA4),	1768	const_iv (GL_UNSIGNED_SHORT),
		1769	const_iv (GL_UNSIGNED_INT),
1297	const_iv (GL_ALPHA),	1770	const_iv (GL_ALPHA),
		1771	const_iv (GL_INTENSITY),
		1772	const_iv (GL_LUMINANCE),
		1773	const_iv (GL_LUMINANCE_ALPHA),
1298	const_iv (GL_FLOAT),	1774	const_iv (GL_FLOAT),
1299	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1775	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1300	const_iv (GL_COMPILE),	1776	const_iv (GL_COMPILE),
1301	const_iv (GL_TEXTURE_1D),	1777	const_iv (GL_TEXTURE_1D),
1302	const_iv (GL_TEXTURE_2D),	1778	const_iv (GL_TEXTURE_2D),
…		…
1304	const_iv (GL_TEXTURE_MAG_FILTER),	1780	const_iv (GL_TEXTURE_MAG_FILTER),
1305	const_iv (GL_TEXTURE_MIN_FILTER),	1781	const_iv (GL_TEXTURE_MIN_FILTER),
1306	const_iv (GL_TEXTURE_ENV_MODE),	1782	const_iv (GL_TEXTURE_ENV_MODE),
1307	const_iv (GL_TEXTURE_WRAP_S),	1783	const_iv (GL_TEXTURE_WRAP_S),
1308	const_iv (GL_TEXTURE_WRAP_T),	1784	const_iv (GL_TEXTURE_WRAP_T),
		1785	const_iv (GL_REPEAT),
1309	const_iv (GL_CLAMP),	1786	const_iv (GL_CLAMP),
1310	const_iv (GL_REPEAT),	1787	const_iv (GL_CLAMP_TO_EDGE),
1311	const_iv (GL_NEAREST),	1788	const_iv (GL_NEAREST),
1312	const_iv (GL_LINEAR),	1789	const_iv (GL_LINEAR),
		1790	const_iv (GL_NEAREST_MIPMAP_NEAREST),
		1791	const_iv (GL_LINEAR_MIPMAP_NEAREST),
		1792	const_iv (GL_NEAREST_MIPMAP_LINEAR),
		1793	const_iv (GL_LINEAR_MIPMAP_LINEAR),
		1794	const_iv (GL_GENERATE_MIPMAP),
1313	const_iv (GL_MODULATE),	1795	const_iv (GL_MODULATE),
		1796	const_iv (GL_DECAL),
1314	const_iv (GL_REPLACE),	1797	const_iv (GL_REPLACE),
		1798	const_iv (GL_DEPTH_BUFFER_BIT),
1315	const_iv (GL_COLOR_BUFFER_BIT),	1799	const_iv (GL_COLOR_BUFFER_BIT),
1316	const_iv (GL_PROJECTION),	1800	const_iv (GL_PROJECTION),
1317	const_iv (GL_MODELVIEW),	1801	const_iv (GL_MODELVIEW),
1318	const_iv (GL_COLOR_LOGIC_OP),	1802	const_iv (GL_COLOR_LOGIC_OP),
		1803	const_iv (GL_SEPARABLE_2D),
1319	const_iv (GL_CONVOLUTION_2D),	1804	const_iv (GL_CONVOLUTION_2D),
1320	const_iv (GL_CONVOLUTION_BORDER_MODE),	1805	const_iv (GL_CONVOLUTION_BORDER_MODE),
1321	const_iv (GL_CONSTANT_BORDER),	1806	const_iv (GL_CONSTANT_BORDER),
1322	const_iv (GL_LINES),	1807	const_iv (GL_LINES),
		1808	const_iv (GL_LINE_STRIP),
		1809	const_iv (GL_LINE_LOOP),
1323	const_iv (GL_QUADS),	1810	const_iv (GL_QUADS),
		1811	const_iv (GL_QUAD_STRIP),
		1812	const_iv (GL_TRIANGLES),
		1813	const_iv (GL_TRIANGLE_STRIP),
		1814	const_iv (GL_TRIANGLE_FAN),
1324	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1815	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1325	const_iv (GL_FASTEST),	1816	const_iv (GL_FASTEST),
		1817	const_iv (GL_V2F),
		1818	const_iv (GL_V3F),
		1819	const_iv (GL_T2F_V3F),
		1820	const_iv (GL_T2F_N3F_V3F),
1326	# undef const_iv	1821	# undef const_iv
1327	};	1822	};
1328		1823
1329	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1824	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1330	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1825	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1331	}	1826	}
1332		1827
		1828	char *
		1829	gl_vendor ()
		1830	CODE:
		1831	RETVAL = (char *)glGetString (GL_VENDOR);
		1832	OUTPUT:
		1833	RETVAL
		1834
		1835	char *
		1836	gl_version ()
		1837	CODE:
		1838	RETVAL = (char *)glGetString (GL_VERSION);
		1839	OUTPUT:
		1840	RETVAL
		1841
		1842	char *
		1843	gl_extensions ()
		1844	CODE:
		1845	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1846	OUTPUT:
		1847	RETVAL
		1848
1333	int glGetError ()	1849	int glGetError ()
		1850
		1851	void glFinish ()
1334		1852
1335	void glClear (int mask)	1853	void glClear (int mask)
1336		1854
1337	void glClearColor (float r, float g, float b, float a = 1.0)	1855	void glClearColor (float r, float g, float b, float a = 1.0)
1338	PROTOTYPE: @	1856	PROTOTYPE: @
…		…
1345		1863
1346	void glHint (int target, int mode)	1864	void glHint (int target, int mode)
1347		1865
1348	void glBlendFunc (int sfactor, int dfactor)	1866	void glBlendFunc (int sfactor, int dfactor)
1349		1867
		1868	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1869	CODE:
		1870	gl_BlendFuncSeparate (sa, da, saa, daa);
		1871
		1872	void glDepthMask (int flag)
		1873
1350	void glLogicOp (int opcode)	1874	void glLogicOp (int opcode)
1351		1875
		1876	void glColorMask (int red, int green, int blue, int alpha)
		1877
1352	void glMatrixMode (int mode)	1878	void glMatrixMode (int mode)
1353		1879
1354	void glPushMatrix ()	1880	void glPushMatrix ()
1355		1881
1356	void glPopMatrix ()	1882	void glPopMatrix ()
1357		1883
1358	void glLoadIdentity ()	1884	void glLoadIdentity ()
1359		1885
		1886	void glDrawBuffer (int buffer)
		1887
		1888	void glReadBuffer (int buffer)
		1889
		1890	# near_ and far_ are due to microsofts buggy "c" compiler
		1891	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1892
		1893	# near_ and far_ are due to microsofts buggy "c" compiler
1360	void glOrtho (double left, double right, double bottom, double top, double near, double far)	1894	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1361		1895
1362	void glViewport (int x, int y, int width, int height)	1896	void glViewport (int x, int y, int width, int height)
		1897
		1898	void glScissor (int x, int y, int width, int height)
1363		1899
1364	void glTranslate (float x, float y, float z = 0.)	1900	void glTranslate (float x, float y, float z = 0.)
1365	CODE:	1901	CODE:
1366	glTranslatef (x, y, z);	1902	glTranslatef (x, y, z);
1367		1903
1368	void glScale (float x, float y, float z)	1904	void glScale (float x, float y, float z = 1.)
1369	CODE:	1905	CODE:
1370	glScalef (x, y, z);	1906	glScalef (x, y, z);
1371		1907
1372	void glRotate (float angle, float x, float y, float z)	1908	void glRotate (float angle, float x, float y, float z)
1373	CODE:	1909	CODE:
…		…
1377		1913
1378	void glEnd ()	1914	void glEnd ()
1379		1915
1380	void glColor (float r, float g, float b, float a = 1.0)	1916	void glColor (float r, float g, float b, float a = 1.0)
1381	PROTOTYPE: @	1917	PROTOTYPE: @
		1918	ALIAS:
		1919	glColor_premultiply = 1
1382	CODE:	1920	CODE:
		1921	if (ix)
		1922	{
		1923	r *= a;
		1924	g *= a;
		1925	b *= a;
		1926	}
		1927	// microsoft visual "c" rounds instead of truncating...
1383	glColor4f (r, g, b, a);	1928	glColor4f (r, g, b, a);
		1929
		1930	void glInterleavedArrays (int format, int stride, char *data)
		1931
		1932	void glDrawElements (int mode, int count, int type, char *indices)
		1933
		1934	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1935
		1936	void glRasterPos (float x, float y, float z = 0.)
		1937	CODE:
		1938	glRasterPos3f (0, 0, z);
		1939	glBitmap (0, 0, 0, 0, x, y, 0);
1384		1940
1385	void glVertex (float x, float y, float z = 0.)	1941	void glVertex (float x, float y, float z = 0.)
1386	CODE:	1942	CODE:
1387	glVertex3f (x, y, z);	1943	glVertex3f (x, y, z);
1388		1944
…		…
1400		1956
1401	void glBindTexture (int target, int name)	1957	void glBindTexture (int target, int name)
1402		1958
1403	void glConvolutionParameter (int target, int pname, float params)	1959	void glConvolutionParameter (int target, int pname, float params)
1404	CODE:	1960	CODE:
		1961	if (gl.ConvolutionParameterf)
1405	glConvolutionParameterf (target, pname, params);	1962	gl.ConvolutionParameterf (target, pname, params);
1406		1963
1407	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1964	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1965	CODE:
		1966	if (gl.ConvolutionFilter2D)
		1967	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
		1968
		1969	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		1970	CODE:
		1971	if (gl.SeparableFilter2D)
		1972	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1408		1973
1409	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1974	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1410		1975
1411	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1976	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1977
		1978	void glDrawPixels (int width, int height, int format, int type, char *pixels)
		1979
		1980	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1412		1981
1413	int glGenTexture ()	1982	int glGenTexture ()
1414	CODE:	1983	CODE:
1415	{	1984	{
1416	GLuint name;	1985	GLuint name;

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.54 by root, Wed Apr 19 23:37:48 2006 UTC vs. Revision 1.138 by root, Mon Aug 14 01:21:01 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.54 by root, Wed Apr 19 23:37:48 2006 UTC vs.
Revision 1.138 by root, Mon Aug 14 01:21:01 2006 UTC