[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.133 by root, Sun Jul 30 13:16:44 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);
388	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	517	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
389	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	518	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
390		519
391	SDL_EnableUNICODE (1);	520	SDL_EnableUNICODE (1);
392	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	521	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
393		522
394	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	523	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
403		532
404	++m;	533	++m;
405	}	534	}
406	}	535	}
407		536
		537	char *
		538	SDL_GetError ()
		539
408	int	540	int
409	SDL_SetVideoMode (int w, int h, int fullscreen)	541	SDL_SetVideoMode (int w, int h, int fullscreen)
410	CODE:	542	CODE:
411	RETVAL = !!SDL_SetVideoMode (	543	RETVAL = !!SDL_SetVideoMode (
412	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	544	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
413	);	545	);
		546	if (RETVAL)
		547	{
414	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	548	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		549	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		550	# include "glfunc.h"
		551	# undef GL_FUNC
		552	}
415	OUTPUT:	553	OUTPUT:
416	RETVAL	554	RETVAL
417		555
418	void	556	void
419	SDL_GL_SwapBuffers ()	557	SDL_GL_SwapBuffers ()
		558
		559	char *
		560	SDL_GetKeyName (int sym)
420		561
421	void	562	void
422	SDL_PollEvent ()	563	SDL_PollEvent ()
423	PPCODE:	564	PPCODE:
424	{	565	{
…		…
426		567
427	while (SDL_PollEvent (&ev))	568	while (SDL_PollEvent (&ev))
428	{	569	{
429	HV *hv = newHV ();	570	HV *hv = newHV ();
430	hv_store (hv, "type", 4, newSViv (ev.type), 0);	571	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		572
431	switch (ev.type)	573	switch (ev.type)
432	{	574	{
433	case SDL_KEYDOWN:	575	case SDL_KEYDOWN:
434	case SDL_KEYUP:	576	case SDL_KEYUP:
435	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	577	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
442	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	584	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
443	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	585	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
444	break;	586	break;
445		587
446	case SDL_MOUSEMOTION:	588	case SDL_MOUSEMOTION:
		589	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		590
447	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	591	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
448	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	592	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
449	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	593	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
450	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	594	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
451	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	595	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
452	break;	596	break;
453		597
454	case SDL_MOUSEBUTTONDOWN:	598	case SDL_MOUSEBUTTONDOWN:
455	case SDL_MOUSEBUTTONUP:	599	case SDL_MOUSEBUTTONUP:
		600	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		601
456	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	602	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
457	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	603	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
458	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	604	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
459	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	605	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		606	break;
		607
		608	case SDL_USEREVENT:
		609	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		610	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		611	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		612	break;
460	}	613	}
461		614
462	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	615	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
463	}	616	}
464	}	617	}
465		618
466	int	619	int
467	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	620	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
		621	POSTCALL:
		622	Mix_HookMusicFinished (music_finished);
		623	Mix_ChannelFinished (channel_finished);
468		624
469	void	625	void
470	Mix_CloseAudio ()	626	Mix_CloseAudio ()
471		627
472	int	628	int
…		…
477	CODE:	633	CODE:
478	#ifndef _WIN32	634	#ifndef _WIN32
479	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	635	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
480	#endif	636	#endif
481		637
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	638	void
497	add_font (char *file)	639	add_font (char *file)
498	CODE:	640	CODE:
499	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	641	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		642
512	void	643	void
513	load_image_inline (SV *image_)	644	load_image_inline (SV *image_)
514	ALIAS:	645	ALIAS:
515	load_image_file = 1	646	load_image_file = 1
…		…
557		688
558	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	689	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
559		690
560	assert (surface2->pitch == surface2->w * 4);	691	assert (surface2->pitch == surface2->w * 4);
561		692
		693	SDL_LockSurface (surface2);
562	EXTEND (SP, 5);	694	EXTEND (SP, 6);
563	PUSHs (sv_2mortal (newSViv (surface2->w)));	695	PUSHs (sv_2mortal (newSViv (surface2->w)));
564	PUSHs (sv_2mortal (newSViv (surface2->h)));	696	PUSHs (sv_2mortal (newSViv (surface2->h)));
565	SDL_LockSurface (surface2);
566	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	697	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)));	698	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
569	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	699	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
570	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	700	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		701	SDL_UnlockSurface (surface2);
571		702
572	SDL_FreeSurface (surface);	703	SDL_FreeSurface (surface);
573	SDL_FreeSurface (surface2);	704	SDL_FreeSurface (surface2);
574	}	705	}
575		706
…		…
597	PUSHs (sv_2mortal (newSViv (b / y)));	728	PUSHs (sv_2mortal (newSViv (b / y)));
598	PUSHs (sv_2mortal (newSViv (a / y)));	729	PUSHs (sv_2mortal (newSViv (a / y)));
599	}	730	}
600		731
601	void	732	void
		733	error (char *message)
		734	CODE:
		735	fprintf (stderr, "ERROR: %s\n", message);
		736	#ifdef _WIN32
		737	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
		738	#endif
		739
		740	void
602	fatal (char *message)	741	fatal (char *message)
603	CODE:	742	CODE:
		743	fprintf (stderr, "FATAL: %s\n", message);
604	#ifdef _WIN32	744	#ifdef _WIN32
605	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	745	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
606	#else
607	fprintf (stderr, "FATAL: %s\n", message);
608	#endif	746	#endif
609	exit (1);	747	_exit (1);
610		748
		749	void
		750	_exit (int retval)
		751	CODE:
		752	_exit (retval);
		753
		754	MODULE = CFPlus PACKAGE = CFPlus::Font
		755
		756	CFPlus::Font
		757	new_from_file (SV class, char path, int id = 0)
		758	CODE:
		759	{
		760	int count;
		761	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
		762	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
		763	FcPatternDestroy (pattern);
		764	}
		765	OUTPUT:
		766	RETVAL
		767
		768	void
		769	DESTROY (CFPlus::Font self)
		770	CODE:
		771	pango_font_description_free (self);
		772
		773	void
		774	make_default (CFPlus::Font self)
		775	CODE:
		776	default_font = self;
		777
611	MODULE = CFClient PACKAGE = CFClient::Layout	778	MODULE = CFPlus PACKAGE = CFPlus::Layout
612		779
613	CFClient::Layout	780	void
614	new (SV *class, int base_height = 10)	781	reset_glyph_cache ()
		782	CODE:
		783	tc_clear ();
		784
		785	CFPlus::Layout
		786	new (SV *class)
615	CODE:	787	CODE:
616	New (0, RETVAL, 1, struct cf_layout);	788	New (0, RETVAL, 1, struct cf_layout);
617	RETVAL->base_height = base_height;	789
618	RETVAL->pl = pango_layout_new (context);	790	RETVAL->pl = pango_layout_new (opengl_context);
		791	RETVAL->r = 1.;
		792	RETVAL->g = 1.;
		793	RETVAL->b = 1.;
		794	RETVAL->a = 1.;
		795	RETVAL->base_height = MIN_FONT_HEIGHT;
		796	RETVAL->font = 0;
		797
619	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	798	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
		799	layout_update_font (RETVAL);
620	OUTPUT:	800	OUTPUT:
621	RETVAL	801	RETVAL
622		802
623	void	803	void
624	DESTROY (CFClient::Layout self)	804	DESTROY (CFPlus::Layout self)
625	CODE:	805	CODE:
626	g_object_unref (self->pl);	806	g_object_unref (self->pl);
627	Safefree (self);	807	Safefree (self);
628		808
629	void	809	void
630	set_text (CFClient::Layout self, SV *text_)	810	set_text (CFPlus::Layout self, SV *text_)
631	CODE:	811	CODE:
632	{	812	{
633	STRLEN textlen;	813	STRLEN textlen;
634	char *text = SvPVutf8 (text_, textlen);	814	char *text = SvPVutf8 (text_, textlen);
635		815
636	pango_layout_set_text (self->pl, text, textlen);	816	pango_layout_set_text (self->pl, text, textlen);
637	}	817	}
638		818
639	void	819	void
640	set_markup (CFClient::Layout self, SV *text_)	820	set_markup (CFPlus::Layout self, SV *text_)
641	CODE:	821	CODE:
642	{	822	{
643	STRLEN textlen;	823	STRLEN textlen;
644	char *text = SvPVutf8 (text_, textlen);	824	char *text = SvPVutf8 (text_, textlen);
645		825
646	pango_layout_set_markup (self->pl, text, textlen);	826	pango_layout_set_markup (self->pl, text, textlen);
647	}	827	}
648		828
		829	void
		830	set_shapes (CFPlus::Layout self, ...)
		831	CODE:
		832	{
		833	PangoAttrList *attrs = 0;
		834	const char *text = pango_layout_get_text (self->pl);
		835	const char *pos = text;
		836	int arg = 4;
		837
		838	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		839	{
		840	PangoRectangle inkrect, rect;
		841	PangoAttribute *attr;
		842
		843	int x = SvIV (ST (arg - 3));
		844	int y = SvIV (ST (arg - 2));
		845	int w = SvIV (ST (arg - 1));
		846	int h = SvIV (ST (arg ));
		847
		848	inkrect.x = 0;
		849	inkrect.y = 0;
		850	inkrect.width = 0;
		851	inkrect.height = 0;
		852
		853	rect.x = x * PANGO_SCALE;
		854	rect.y = y * PANGO_SCALE;
		855	rect.width = w * PANGO_SCALE;
		856	rect.height = h * PANGO_SCALE;
		857
		858	if (!attrs)
		859	attrs = pango_layout_get_attributes (self->pl);
		860
		861	attr = pango_attr_shape_new (&inkrect, &rect);
		862	attr->start_index = pos - text;
		863	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		864	pango_attr_list_insert (attrs, attr);
		865
		866	arg += 4;
		867	pos += sizeof (OBJ_STR) - 1;
		868	}
		869
		870	if (attrs)
		871	pango_layout_set_attributes (self->pl, attrs);
		872	}
		873
		874	void
		875	get_shapes (CFPlus::Layout self)
		876	PPCODE:
		877	{
		878	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		879
		880	do
		881	{
		882	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		883
		884	if (run && shape_attr_p (run))
		885	{
		886	PangoRectangle extents;
		887	pango_layout_iter_get_run_extents (iter, 0, &extents);
		888
		889	EXTEND (SP, 2);
		890	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		891	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		892	}
		893	}
		894	while (pango_layout_iter_next_run (iter));
		895
		896	pango_layout_iter_free (iter);
		897	}
		898
		899	int
		900	has_wrapped (CFPlus::Layout self)
		901	CODE:
		902	{
		903	int lines = 1;
		904	const char *text = pango_layout_get_text (self->pl);
		905
		906	while (*text)
		907	lines += *text++ == '\n';
		908
		909	RETVAL = lines < pango_layout_get_line_count (self->pl);
		910	}
		911	OUTPUT:
		912	RETVAL
		913
649	SV *	914	SV *
650	get_text (CFClient::Layout self)	915	get_text (CFPlus::Layout self)
651	CODE:	916	CODE:
652	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	917	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
653	SvUTF8_on (RETVAL);	918	sv_utf8_decode (RETVAL);
654	OUTPUT:	919	OUTPUT:
655	RETVAL	920	RETVAL
656		921
657	void	922	void
		923	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
		924	CODE:
		925	self->r = r;
		926	self->g = g;
		927	self->b = b;
		928	self->a = a;
		929
		930	void
		931	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
		932	CODE:
		933	if (self->font != font)
		934	{
		935	self->font = font;
		936	layout_update_font (self);
		937	}
		938
		939	void
658	set_height (CFClient::Layout self, int base_height)	940	set_height (CFPlus::Layout self, int base_height)
659	CODE:	941	CODE:
		942	if (self->base_height != base_height)
		943	{
660	self->base_height = base_height;	944	self->base_height = base_height;
		945	layout_update_font (self);
		946	}
661		947
662	void	948	void
663	set_width (CFClient::Layout self, int max_width = -1)	949	set_width (CFPlus::Layout self, int max_width = -1)
664	CODE:	950	CODE:
665	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	951	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
666		952
667	void	953	void
		954	set_indent (CFPlus::Layout self, int indent)
		955	CODE:
		956	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		957
		958	void
		959	set_spacing (CFPlus::Layout self, int spacing)
		960	CODE:
		961	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		962
		963	void
		964	set_ellipsise (CFPlus::Layout self, int ellipsise)
		965	CODE:
		966	pango_layout_set_ellipsize (self->pl,
		967	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		968	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		969	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		970	: PANGO_ELLIPSIZE_NONE
		971	);
		972
		973	void
		974	set_single_paragraph_mode (CFPlus::Layout self, int spm)
		975	CODE:
		976	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		977
		978	void
668	size (CFClient::Layout self)	979	size (CFPlus::Layout self)
669	PPCODE:	980	PPCODE:
670	{	981	{
671	int w, h;	982	int w, h;
672		983
673	layout_update (self);
674	layout_get_pixel_size (self, &w, &h);	984	layout_get_pixel_size (self, &w, &h);
675		985
676	EXTEND (SP, 2);	986	EXTEND (SP, 2);
677	PUSHs (sv_2mortal (newSViv (w)));	987	PUSHs (sv_2mortal (newSViv (w)));
678	PUSHs (sv_2mortal (newSViv (h)));	988	PUSHs (sv_2mortal (newSViv (h)));
679	}	989	}
680		990
681	int	991	int
		992	descent (CFPlus::Layout self)
		993	CODE:
		994	{
		995	PangoRectangle rect;
		996	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		997	pango_layout_line_get_pixel_extents (line, 0, &rect);
		998	RETVAL = PANGO_DESCENT (rect);
		999	}
		1000	OUTPUT:
		1001	RETVAL
		1002
		1003	int
682	xy_to_index (CFClient::Layout self, int x, int y)	1004	xy_to_index (CFPlus::Layout self, int x, int y)
683	CODE:	1005	CODE:
684	{	1006	{
685	int index, trailing;	1007	int index, trailing;
686
687	layout_update (self);
688	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1008	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
689
690	RETVAL = index;	1009	RETVAL = index;
691	}	1010	}
692	OUTPUT:	1011	OUTPUT:
693	RETVAL	1012	RETVAL
694		1013
695	void	1014	void
696	cursor_pos (CFClient::Layout self, int index)	1015	cursor_pos (CFPlus::Layout self, int index)
697	PPCODE:	1016	PPCODE:
698	{	1017	{
699	PangoRectangle strong_pos;	1018	PangoRectangle strong_pos;
700	layout_update (self);
701	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1019	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
702		1020
703	EXTEND (SP, 3);	1021	EXTEND (SP, 3);
704	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1022	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
705	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1023	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
706	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1024	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
707	}	1025	}
708		1026
709	void	1027	void
710	render (CFClient::Layout self)	1028	render (CFPlus::Layout self, float x, float y)
711	PPCODE:	1029	PPCODE:
712	{	1030	pango_opengl_render_layout_subpixel (
713	SV *retval;	1031	self->pl,
714	int w, h;	1032	x * PANGO_SCALE, y * PANGO_SCALE,
715	FT_Bitmap bitmap;	1033	self->r, self->g, self->b, self->a
		1034	);
716		1035
717	layout_update (self);	1036	MODULE = CFPlus PACKAGE = CFPlus::Texture
718	layout_get_pixel_size (self, &w, &h);
719		1037
720	retval = newSV (w * h);	1038	void
721	SvPOK_only (retval);	1039	pad2pot (SV data_, SV w_, SV *h_)
722	SvCUR_set (retval, w * h);	1040	CODE:
		1041	{
		1042	int ow = SvIV (w_);
		1043	int oh = SvIV (h_);
723		1044
724	bitmap.rows = h;	1045	if (ow && oh)
725	bitmap.width = w;	1046	{
726	bitmap.pitch = w;	1047	int nw = minpot (ow);
727	bitmap.buffer = (unsigned char*)SvPVX (retval);	1048	int nh = minpot (oh);
728	bitmap.num_grays = 256;
729	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
730		1049
731	memset (bitmap.buffer, 0, w * h);	1050	if (nw != ow \|\| nh != oh)
732		1051	{
733	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	1052	if (SvOK (data_))
		1053	{
		1054	STRLEN datalen;
		1055	char *data = SvPVbyte (data_, datalen);
		1056	int bpp = datalen / (ow * oh);
		1057	SV result_ = sv_2mortal (newSV (nw nh * bpp));
734		1058
735	EXTEND (SP, 3);	1059	SvPOK_only (result_);
736	PUSHs (sv_2mortal (newSViv (w)));	1060	SvCUR_set (result_, nw * nh * bpp);
737	PUSHs (sv_2mortal (newSViv (h)));
738	PUSHs (sv_2mortal (retval));
739	}
740		1061
741	MODULE = CFClient PACKAGE = CFClient::Texture	1062	memset (SvPVX (result_), 0, nw * nh * bpp);
		1063	while (oh--)
		1064	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
742		1065
		1066	sv_setsv (data_, result_);
		1067	}
		1068
		1069	sv_setiv (w_, nw);
		1070	sv_setiv (h_, nh);
		1071	}
		1072	}
		1073	}
		1074
743	void	1075	void
744	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1076	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
745	PROTOTYPE: $$$;$$	1077	PROTOTYPE: $$$;$$
		1078	ALIAS:
		1079	draw_quad_alpha = 1
		1080	draw_quad_alpha_premultiplied = 2
746	CODE:	1081	CODE:
747	{	1082	{
748	HV hv = (HV )SvRV (self);	1083	HV hv = (HV )SvRV (self);
749	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1084	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
750	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1085	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
751	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1086	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
752	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
753		1087
754	if (items < 5)	1088	if (items < 5)
755	{	1089	{
756	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1090	w = SvNV (*hv_fetch (hv, "w", 1, 1));
757	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1091	h = SvNV (*hv_fetch (hv, "h", 1, 1));
758	}	1092	}
759		1093
		1094	if (ix)
		1095	{
		1096	glEnable (GL_BLEND);
		1097
		1098	if (ix == 2)
		1099	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1100	else
		1101	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1102	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1103
		1104	glEnable (GL_ALPHA_TEST);
		1105	glAlphaFunc (GL_GREATER, 0.01f);
		1106	}
		1107
760	glBindTexture (GL_TEXTURE_2D, name);	1108	glBindTexture (GL_TEXTURE_2D, name);
761	if (wrap_mode) {	1109
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);	1110	glBegin (GL_QUADS);
766	glTexCoord2f (0, 0); glVertex2f (x , y );	1111	glTexCoord2f (0, 0); glVertex2f (x , y );
767	glTexCoord2f (0, t); glVertex2f (x , y + h);	1112	glTexCoord2f (0, t); glVertex2f (x , y + h);
768	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1113	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
769	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1114	glTexCoord2f (s, 0); glVertex2f (x + w, y );
770	glEnd ();	1115	glEnd ();
771	}
772		1116
		1117	if (ix)
		1118	{
		1119	glDisable (GL_ALPHA_TEST);
		1120	glDisable (GL_BLEND);
		1121	}
		1122	}
		1123
773	MODULE = CFClient PACKAGE = CFClient::Map	1124	MODULE = CFPlus PACKAGE = CFPlus::Map
774		1125
775	CFClient::Map	1126	CFPlus::Map
776	new (SV *class, int map_width, int map_height)	1127	new (SV *class, int map_width, int map_height)
777	CODE:	1128	CODE:
778	New (0, RETVAL, 1, struct map);	1129	New (0, RETVAL, 1, struct map);
779	RETVAL->x = 0;	1130	RETVAL->x = 0;
780	RETVAL->y = 0;	1131	RETVAL->y = 0;
…		…
790	RETVAL->row = 0;	1141	RETVAL->row = 0;
791	OUTPUT:	1142	OUTPUT:
792	RETVAL	1143	RETVAL
793		1144
794	void	1145	void
795	DESTROY (CFClient::Map self)	1146	DESTROY (CFPlus::Map self)
796	CODE:	1147	CODE:
797	{	1148	{
798	map_clear (self);	1149	map_clear (self);
799	Safefree (self->face);	1150	Safefree (self->face);
		1151	Safefree (self->tex);
800	Safefree (self);	1152	Safefree (self);
801	}	1153	}
802		1154
803	void	1155	void
804	clear (CFClient::Map self)	1156	clear (CFPlus::Map self)
805	CODE:	1157	CODE:
806	map_clear (self);	1158	map_clear (self);
807		1159
808	void	1160	void
809	set_face (CFClient::Map self, int face, int texid)	1161	set_face (CFPlus::Map self, int face, int texid)
810	CODE:	1162	CODE:
811	{	1163	{
812	while (self->faces <= face)	1164	while (self->faces <= face)
813	{	1165	{
814	Append (mapface, self->face, self->faces, self->faces);	1166	Append (mapface, self->face, self->faces, self->faces);
…		…
817		1169
818	self->face [face] = texid;	1170	self->face [face] = texid;
819	}	1171	}
820		1172
821	void	1173	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)	1174	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:	1175	CODE:
824	{	1176	{
825	while (self->texs <= texid)	1177	while (self->texs <= texid)
826	{	1178	{
827	Append (maptex, self->tex, self->texs, self->texs);	1179	Append (maptex, self->tex, self->texs, self->texs);
…		…
839	tex->r = r;	1191	tex->r = r;
840	tex->g = g;	1192	tex->g = g;
841	tex->b = b;	1193	tex->b = b;
842	tex->a = a;	1194	tex->a = a;
843	}	1195	}
		1196
		1197	// somewhat hackish, but for textures that require it, it really
		1198	// improves the look, and most others don't suffer.
		1199	glBindTexture (GL_TEXTURE_2D, name);
		1200	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1201	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1202	// use uglier nearest interpolation because linear suffers
		1203	// from transparent color bleeding and ugly wrapping effects.
		1204	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
844	}	1205	}
845		1206
846	int	1207	int
847	ox (CFClient::Map self)	1208	ox (CFPlus::Map self)
848	ALIAS:	1209	ALIAS:
849	oy = 1	1210	oy = 1
		1211	x = 2
		1212	y = 3
		1213	w = 4
		1214	h = 5
850	CODE:	1215	CODE:
851	switch (ix)	1216	switch (ix)
852	{	1217	{
853	case 0: RETVAL = self->ox; break;	1218	case 0: RETVAL = self->ox; break;
854	case 1: RETVAL = self->oy; break;	1219	case 1: RETVAL = self->oy; break;
		1220	case 2: RETVAL = self->x; break;
		1221	case 3: RETVAL = self->y; break;
		1222	case 4: RETVAL = self->w; break;
		1223	case 5: RETVAL = self->h; break;
855	}	1224	}
856	OUTPUT:	1225	OUTPUT:
857	RETVAL	1226	RETVAL
858		1227
859	void	1228	void
860	scroll (CFClient::Map self, int dx, int dy)	1229	scroll (CFPlus::Map self, int dx, int dy)
861	CODE:	1230	CODE:
862	{	1231	{
863	if (dx > 0)	1232	if (dx > 0)
864	map_blank (self, self->x, self->y, dx - 1, self->h);	1233	map_blank (self, self->x, self->y, dx - 1, self->h);
865	else if (dx < 0)	1234	else if (dx < 0)
…		…
881	self->y += MAP_EXTEND_Y;	1250	self->y += MAP_EXTEND_Y;
882	}	1251	}
883	}	1252	}
884		1253
885	void	1254	void
886	map1a_update (CFClient::Map self, SV *data_)	1255	map1a_update (CFPlus::Map self, SV *data_)
887	CODE:	1256	CODE:
888	{	1257	{
889	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1258	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
890	uint8_t data_end = (uint8_t )SvEND (data_);	1259	uint8_t data_end = (uint8_t )SvEND (data_);
891	mapcell *cell;	1260	mapcell *cell;
…		…
893		1262
894	while (data < data_end)	1263	while (data < data_end)
895	{	1264	{
896	flags = (data [0] << 8) + data [1]; data += 2;	1265	flags = (data [0] << 8) + data [1]; data += 2;
897		1266
898	x = ((flags >> 10) & 63) + self->x;	1267	x = self->x + ((flags >> 10) & 63);
899	y = ((flags >> 4) & 63) + self->y;	1268	y = self->y + ((flags >> 4) & 63);
900		1269
901	cell = map_get_cell (self, x, y);	1270	cell = map_get_cell (self, x, y);
902		1271
903	if (flags & 15)	1272	if (flags & 15)
904	{	1273	{
…		…
933	cell->darkness = -1;	1302	cell->darkness = -1;
934	}	1303	}
935	}	1304	}
936		1305
937	SV *	1306	SV *
938	mapmap (CFClient::Map self, int w, int h)	1307	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
939	CODE:	1308	CODE:
940	{	1309	{
941	int x0, x1, x;	1310	int x1, x;
942	int y0, y1, y;	1311	int y1, y;
943	int z;	1312	int z;
944	SV map_sv = newSV (w h * sizeof (uint32_t));	1313	SV map_sv = newSV (w h * sizeof (uint32_t));
945	uint32_t map = (uint32_t )SvPVX (map_sv);	1314	uint32_t map = (uint32_t )SvPVX (map_sv);
946		1315
947	SvPOK_only (map_sv);	1316	SvPOK_only (map_sv);
948	SvCUR_set (map_sv, w * h * sizeof (uint32_t));	1317	SvCUR_set (map_sv, w * h * sizeof (uint32_t));
949		1318
950	x0 = self->x - w / 2; x1 = x0 + w;	1319	x0 += self->x; x1 = x0 + w;
951	y0 = self->y - h / 2; y1 = y0 + h;	1320	y0 += self->y; y1 = y0 + h;
952		1321
953	for (y = y0; y < y1; y++)	1322	for (y = y0; y < y1; y++)
954	{	1323	{
955	maprow *row = 0 <= y && y < self->rows	1324	maprow *row = 0 <= y && y < self->rows
956	? self->row + y	1325	? self->row + y
…		…
993	}	1362	}
994	OUTPUT:	1363	OUTPUT:
995	RETVAL	1364	RETVAL
996		1365
997	void	1366	void
998	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1367	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
999	PPCODE:	1368	CODE:
1000	{	1369	{
1001	int vx, vy;	1370	int vx, vy;
1002	int x, y, z;	1371	int x, y, z;
1003	int last_name;	1372	int last_name;
1004	mapface face;	1373	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		1374
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;	1375	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1014	vy = self->y + (self->h - sh) / 2 - shift_y;	1376	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1015		1377
1016	/*	1378	/*
1017	int vx = self->vx = self->w >= sw	1379	int vx = self->vx = self->w >= sw
1018	? self->x + (self->w - sw) / 2	1380	? self->x + (self->w - sw) / 2
1019	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1381	: 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));	1385	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1024	*/	1386	*/
1025		1387
1026	glColor4ub (255, 255, 255, 255);	1388	glColor4ub (255, 255, 255, 255);
1027		1389
		1390	glEnable (GL_BLEND);
1028	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1391	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1029	glEnable (GL_BLEND);
1030	glEnable (GL_TEXTURE_2D);	1392	glEnable (GL_TEXTURE_2D);
1031	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1393	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1032		1394
1033	glBegin (GL_QUADS);	1395	glBegin (GL_QUADS);
1034		1396
…		…
1042		1404
1043	for (x = 0; x < sw; x++)	1405	for (x = 0; x < sw; x++)
1044	if (row->c0 <= x + vx && x + vx < row->c1)	1406	if (row->c0 <= x + vx && x + vx < row->c1)
1045	{	1407	{
1046	mapcell *cell = row->col + (x + vx - row->c0);	1408	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		1409
1052	face = cell->face [z];	1410	face = cell->face [z];
1053		1411
1054	if (face)	1412	if (face)
1055	{	1413	{
…		…
1076		1434
1077	glEnd ();	1435	glEnd ();
1078		1436
1079	glDisable (GL_TEXTURE_2D);	1437	glDisable (GL_TEXTURE_2D);
1080	glDisable (GL_BLEND);	1438	glDisable (GL_BLEND);
		1439	}
		1440
		1441	void
		1442	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1443	CODE:
		1444	{
		1445	static float color[16][3] = {
		1446	{ 0.00F, 0.00F, 0.00F },
		1447	{ 1.00F, 1.00F, 1.00F },
		1448	{ 0.00F, 0.00F, 0.55F },
		1449	{ 1.00F, 0.00F, 0.00F },
		1450
		1451	{ 1.00F, 0.54F, 0.00F },
		1452	{ 0.11F, 0.56F, 1.00F },
		1453	{ 0.93F, 0.46F, 0.00F },
		1454	{ 0.18F, 0.54F, 0.34F },
		1455
		1456	{ 0.56F, 0.73F, 0.56F },
		1457	{ 0.80F, 0.80F, 0.80F },
		1458	{ 0.55F, 0.41F, 0.13F },
		1459	{ 0.99F, 0.77F, 0.26F },
		1460
		1461	{ 0.74F, 0.65F, 0.41F },
		1462
		1463	{ 0.00F, 1.00F, 1.00F },
		1464	{ 1.00F, 0.00F, 1.00F },
		1465	{ 1.00F, 1.00F, 0.00F },
		1466	};
		1467
		1468	int x, y;
		1469
		1470	glEnable (GL_TEXTURE_2D);
		1471	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1472	glEnable (GL_BLEND);
		1473	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1474	glBegin (GL_QUADS);
		1475
		1476	for (y = 0; y < h; y++)
		1477	for (x = 0; x < w; x++)
		1478	{
		1479	unsigned char m = data [x + y * w];
		1480
		1481	if (m)
		1482	{
		1483	float *c = color [m & 15];
		1484
		1485	float tx1 = m & 0x40 ? 0.5 : 0.;
		1486	float tx2 = tx1 + 0.5;
		1487
		1488	glColor4f (c[0], c[1], c[2], 0.75);
		1489	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1490	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1491	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1492	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1493	}
		1494	}
		1495
		1496	glEnd ();
		1497	glDisable (GL_BLEND);
		1498	glDisable (GL_TEXTURE_2D);
		1499	}
		1500
		1501	void
		1502	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1503	PPCODE:
		1504	{
		1505	int vx, vy;
		1506	int x, y;
		1507	int sw4 = (sw + 3) & ~3;
		1508	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1509	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1510
		1511	memset (darkness, 255, sw4 * sh);
		1512	SvPOK_only (darkness_sv);
		1513	SvCUR_set (darkness_sv, sw4 * sh);
		1514
		1515	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1516	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1517
		1518	for (y = 0; y < sh; y++)
		1519	if (0 <= y + vy && y + vy < self->rows)
		1520	{
		1521	maprow *row = self->row + (y + vy);
		1522
		1523	for (x = 0; x < sw; x++)
		1524	if (row->c0 <= x + vx && x + vx < row->c1)
		1525	{
		1526	mapcell *cell = row->col + (x + vx - row->c0);
		1527
		1528	darkness[y * sw4 + x] = cell->darkness < 0
		1529	? 255 - FOW_DARKNESS
		1530	: 255 - cell->darkness;
		1531	}
		1532	}
1081		1533
1082	EXTEND (SP, 3);	1534	EXTEND (SP, 3);
1083	PUSHs (sv_2mortal (newSViv (sw4)));	1535	PUSHs (sv_2mortal (newSViv (sw4)));
1084	PUSHs (sv_2mortal (newSViv (sh)));	1536	PUSHs (sv_2mortal (newSViv (sh)));
1085	PUSHs (darkness_sv);	1537	PUSHs (darkness_sv);
1086	}	1538	}
1087		1539
1088	SV *	1540	SV *
1089	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1541	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1090	CODE:	1542	CODE:
1091	{	1543	{
1092	int x, y, x1, y1;	1544	int x, y, x1, y1;
1093	SV data_sv = newSV (w h * 7 + 5);	1545	SV data_sv = newSV (w h * 7 + 5);
1094	uint8_t data = (uint8_t )SvPVX (data_sv);	1546	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1096	data++ = 0; / version 0 format */	1548	data++ = 0; / version 0 format */
1097	data++ = w >> 8; data++ = w;	1549	data++ = w >> 8; data++ = w;
1098	data++ = h >> 8; data++ = h;	1550	data++ = h >> 8; data++ = h;
1099		1551
1100	// we need to do this 'cause we don't keep an absolute coord system for rows	1552	// we need to do this 'cause we don't keep an absolute coord system for rows
1101	// TODO: treat rows as we treat	1553	// TODO: treat rows as we treat columns
1102	map_get_row (self, y0 + self->y - self->oy);//D	1554	map_get_row (self, y0 + self->y - self->oy);//D
1103	map_get_row (self, y0 + self->y - self->oy + h - 1);//D	1555	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1104		1556
1105	x0 += self->x - self->ox;	1557	x0 += self->x - self->ox;
1106	y0 += self->y - self->oy;	1558	y0 += self->y - self->oy;
…		…
1156	}	1608	}
1157	OUTPUT:	1609	OUTPUT:
1158	RETVAL	1610	RETVAL
1159		1611
1160	void	1612	void
1161	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1613	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1162	PPCODE:	1614	PPCODE:
1163	{	1615	{
1164	int x, y, z;	1616	int x, y, z;
1165	int w, h;	1617	int w, h;
1166	int x1, y1;	1618	int x1, y1;
…		…
1170		1622
1171	w = data++ << 8; w \|= data++;	1623	w = data++ << 8; w \|= data++;
1172	h = data++ << 8; h \|= data++;	1624	h = data++ << 8; h \|= data++;
1173		1625
1174	// we need to do this 'cause we don't keep an absolute coord system for rows	1626	// we need to do this 'cause we don't keep an absolute coord system for rows
1175	// TODO: treat rows as we treat	1627	// TODO: treat rows as we treat columns
1176	map_get_row (self, y0 + self->y - self->oy);//D	1628	map_get_row (self, y0 + self->y - self->oy);//D
1177	map_get_row (self, y0 + self->y - self->oy + h - 1);//D	1629	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1178		1630
1179	x0 += self->x - self->ox;	1631	x0 += self->x - self->ox;
1180	y0 += self->y - self->oy;	1632	y0 += self->y - self->oy;
…		…
1215	}	1667	}
1216	}	1668	}
1217	}	1669	}
1218	}	1670	}
1219		1671
1220	MODULE = CFClient PACKAGE = CFClient::MixChunk	1672	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1221		1673
1222	CFClient::MixChunk	1674	CFPlus::MixChunk
1223	new_from_file (SV class, char path)	1675	new_from_file (SV class, char path)
1224	CODE:	1676	CODE:
1225	RETVAL = Mix_LoadWAV (path);	1677	RETVAL = Mix_LoadWAV (path);
1226	OUTPUT:	1678	OUTPUT:
1227	RETVAL	1679	RETVAL
1228		1680
1229	void	1681	void
1230	DESTROY (CFClient::MixChunk self)	1682	DESTROY (CFPlus::MixChunk self)
1231	CODE:	1683	CODE:
1232	Mix_FreeChunk (self);	1684	Mix_FreeChunk (self);
1233		1685
1234	int	1686	int
1235	volume (CFClient::MixChunk self, int volume = -1)	1687	volume (CFPlus::MixChunk self, int volume = -1)
1236	CODE:	1688	CODE:
1237	RETVAL = Mix_VolumeChunk (self, volume);	1689	RETVAL = Mix_VolumeChunk (self, volume);
1238	OUTPUT:	1690	OUTPUT:
1239	RETVAL	1691	RETVAL
1240		1692
1241	int	1693	int
1242	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1694	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1243	CODE:	1695	CODE:
1244	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1696	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1245	OUTPUT:	1697	OUTPUT:
1246	RETVAL	1698	RETVAL
1247		1699
1248	MODULE = CFClient PACKAGE = CFClient::MixMusic	1700	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1249		1701
1250	int	1702	int
1251	volume (int volume = -1)	1703	volume (int volume = -1)
1252	CODE:	1704	CODE:
1253	RETVAL = Mix_VolumeMusic (volume);	1705	RETVAL = Mix_VolumeMusic (volume);
1254	OUTPUT:	1706	OUTPUT:
1255	RETVAL	1707	RETVAL
1256		1708
1257	CFClient::MixMusic	1709	CFPlus::MixMusic
1258	new_from_file (SV class, char path)	1710	new_from_file (SV class, char path)
1259	CODE:	1711	CODE:
1260	RETVAL = Mix_LoadMUS (path);	1712	RETVAL = Mix_LoadMUS (path);
1261	OUTPUT:	1713	OUTPUT:
1262	RETVAL	1714	RETVAL
1263		1715
1264	void	1716	void
1265	DESTROY (CFClient::MixMusic self)	1717	DESTROY (CFPlus::MixMusic self)
1266	CODE:	1718	CODE:
1267	Mix_FreeMusic (self);	1719	Mix_FreeMusic (self);
1268		1720
1269	int	1721	int
1270	play (CFClient::MixMusic self, int loops = -1)	1722	play (CFPlus::MixMusic self, int loops = -1)
1271	CODE:	1723	CODE:
1272	RETVAL = Mix_PlayMusic (self, loops);	1724	RETVAL = Mix_PlayMusic (self, loops);
1273	OUTPUT:	1725	OUTPUT:
1274	RETVAL	1726	RETVAL
1275		1727
1276	MODULE = CFClient PACKAGE = CFClient::OpenGL	1728	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1277		1729
1278	BOOT:	1730	BOOT:
1279	{	1731	{
1280	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1732	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1281	static const struct {	1733	static const struct {
1282	const char *name;	1734	const char *name;
1283	IV iv;	1735	IV iv;
1284	} *civ, const_iv[] = {	1736	} *civ, const_iv[] = {
1285	# define const_iv(name) { # name, (IV)name }	1737	# define const_iv(name) { # name, (IV)name }
1286	const_iv (GL_COLOR_MATERIAL),	1738	const_iv (GL_COLOR_MATERIAL),
1287	const_iv (GL_SMOOTH),	1739	const_iv (GL_SMOOTH),
1288	const_iv (GL_FLAT),	1740	const_iv (GL_FLAT),
		1741	const_iv (GL_DITHER),
1289	const_iv (GL_BLEND),	1742	const_iv (GL_BLEND),
		1743	const_iv (GL_CULL_FACE),
		1744	const_iv (GL_SCISSOR_TEST),
		1745	const_iv (GL_DEPTH_TEST),
		1746	const_iv (GL_ALPHA_TEST),
		1747	const_iv (GL_NORMALIZE),
		1748	const_iv (GL_RESCALE_NORMAL),
		1749	const_iv (GL_FRONT),
		1750	const_iv (GL_BACK),
1290	const_iv (GL_AND),	1751	const_iv (GL_AND),
		1752	const_iv (GL_ONE),
		1753	const_iv (GL_ZERO),
1291	const_iv (GL_SRC_ALPHA),	1754	const_iv (GL_SRC_ALPHA),
		1755	const_iv (GL_DST_ALPHA),
1292	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1756	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1757	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1758	const_iv (GL_SRC_ALPHA_SATURATE),
1293	const_iv (GL_RGB),	1759	const_iv (GL_RGB),
1294	const_iv (GL_RGBA),	1760	const_iv (GL_RGBA),
		1761	const_iv (GL_RGBA4),
		1762	const_iv (GL_RGBA8),
		1763	const_iv (GL_RGB5_A1),
1295	const_iv (GL_UNSIGNED_BYTE),	1764	const_iv (GL_UNSIGNED_BYTE),
1296	const_iv (GL_ALPHA4),	1765	const_iv (GL_UNSIGNED_SHORT),
		1766	const_iv (GL_UNSIGNED_INT),
1297	const_iv (GL_ALPHA),	1767	const_iv (GL_ALPHA),
		1768	const_iv (GL_INTENSITY),
		1769	const_iv (GL_LUMINANCE),
		1770	const_iv (GL_LUMINANCE_ALPHA),
1298	const_iv (GL_FLOAT),	1771	const_iv (GL_FLOAT),
1299	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1772	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1300	const_iv (GL_COMPILE),	1773	const_iv (GL_COMPILE),
1301	const_iv (GL_TEXTURE_1D),	1774	const_iv (GL_TEXTURE_1D),
1302	const_iv (GL_TEXTURE_2D),	1775	const_iv (GL_TEXTURE_2D),
…		…
1304	const_iv (GL_TEXTURE_MAG_FILTER),	1777	const_iv (GL_TEXTURE_MAG_FILTER),
1305	const_iv (GL_TEXTURE_MIN_FILTER),	1778	const_iv (GL_TEXTURE_MIN_FILTER),
1306	const_iv (GL_TEXTURE_ENV_MODE),	1779	const_iv (GL_TEXTURE_ENV_MODE),
1307	const_iv (GL_TEXTURE_WRAP_S),	1780	const_iv (GL_TEXTURE_WRAP_S),
1308	const_iv (GL_TEXTURE_WRAP_T),	1781	const_iv (GL_TEXTURE_WRAP_T),
		1782	const_iv (GL_REPEAT),
1309	const_iv (GL_CLAMP),	1783	const_iv (GL_CLAMP),
1310	const_iv (GL_REPEAT),	1784	const_iv (GL_CLAMP_TO_EDGE),
1311	const_iv (GL_NEAREST),	1785	const_iv (GL_NEAREST),
1312	const_iv (GL_LINEAR),	1786	const_iv (GL_LINEAR),
		1787	const_iv (GL_NEAREST_MIPMAP_NEAREST),
		1788	const_iv (GL_LINEAR_MIPMAP_NEAREST),
		1789	const_iv (GL_NEAREST_MIPMAP_LINEAR),
		1790	const_iv (GL_LINEAR_MIPMAP_LINEAR),
		1791	const_iv (GL_GENERATE_MIPMAP),
1313	const_iv (GL_MODULATE),	1792	const_iv (GL_MODULATE),
		1793	const_iv (GL_DECAL),
1314	const_iv (GL_REPLACE),	1794	const_iv (GL_REPLACE),
		1795	const_iv (GL_DEPTH_BUFFER_BIT),
1315	const_iv (GL_COLOR_BUFFER_BIT),	1796	const_iv (GL_COLOR_BUFFER_BIT),
1316	const_iv (GL_PROJECTION),	1797	const_iv (GL_PROJECTION),
1317	const_iv (GL_MODELVIEW),	1798	const_iv (GL_MODELVIEW),
1318	const_iv (GL_COLOR_LOGIC_OP),	1799	const_iv (GL_COLOR_LOGIC_OP),
		1800	const_iv (GL_SEPARABLE_2D),
1319	const_iv (GL_CONVOLUTION_2D),	1801	const_iv (GL_CONVOLUTION_2D),
1320	const_iv (GL_CONVOLUTION_BORDER_MODE),	1802	const_iv (GL_CONVOLUTION_BORDER_MODE),
1321	const_iv (GL_CONSTANT_BORDER),	1803	const_iv (GL_CONSTANT_BORDER),
1322	const_iv (GL_LINES),	1804	const_iv (GL_LINES),
		1805	const_iv (GL_LINE_LOOP),
1323	const_iv (GL_QUADS),	1806	const_iv (GL_QUADS),
		1807	const_iv (GL_QUAD_STRIP),
		1808	const_iv (GL_TRIANGLES),
		1809	const_iv (GL_TRIANGLE_STRIP),
		1810	const_iv (GL_TRIANGLE_FAN),
1324	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1811	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1325	const_iv (GL_FASTEST),	1812	const_iv (GL_FASTEST),
		1813	const_iv (GL_V2F),
		1814	const_iv (GL_V3F),
		1815	const_iv (GL_T2F_V3F),
		1816	const_iv (GL_T2F_N3F_V3F),
1326	# undef const_iv	1817	# undef const_iv
1327	};	1818	};
1328		1819
1329	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1820	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1330	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1821	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1331	}	1822	}
1332		1823
		1824	char *
		1825	gl_vendor ()
		1826	CODE:
		1827	RETVAL = (char *)glGetString (GL_VENDOR);
		1828	OUTPUT:
		1829	RETVAL
		1830
		1831	char *
		1832	gl_version ()
		1833	CODE:
		1834	RETVAL = (char *)glGetString (GL_VERSION);
		1835	OUTPUT:
		1836	RETVAL
		1837
		1838	char *
		1839	gl_extensions ()
		1840	CODE:
		1841	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1842	OUTPUT:
		1843	RETVAL
		1844
1333	int glGetError ()	1845	int glGetError ()
		1846
		1847	void glFinish ()
1334		1848
1335	void glClear (int mask)	1849	void glClear (int mask)
1336		1850
1337	void glClearColor (float r, float g, float b, float a = 1.0)	1851	void glClearColor (float r, float g, float b, float a = 1.0)
1338	PROTOTYPE: @	1852	PROTOTYPE: @
…		…
1345		1859
1346	void glHint (int target, int mode)	1860	void glHint (int target, int mode)
1347		1861
1348	void glBlendFunc (int sfactor, int dfactor)	1862	void glBlendFunc (int sfactor, int dfactor)
1349		1863
		1864	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1865	CODE:
		1866	gl_BlendFuncSeparate (sa, da, saa, daa);
		1867
		1868	void glDepthMask (int flag)
		1869
1350	void glLogicOp (int opcode)	1870	void glLogicOp (int opcode)
1351		1871
		1872	void glColorMask (int red, int green, int blue, int alpha)
		1873
1352	void glMatrixMode (int mode)	1874	void glMatrixMode (int mode)
1353		1875
1354	void glPushMatrix ()	1876	void glPushMatrix ()
1355		1877
1356	void glPopMatrix ()	1878	void glPopMatrix ()
1357		1879
1358	void glLoadIdentity ()	1880	void glLoadIdentity ()
1359		1881
		1882	void glDrawBuffer (int buffer)
		1883
		1884	void glReadBuffer (int buffer)
		1885
		1886	# near_ and far_ are due to microsofts buggy "c" compiler
		1887	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1888
		1889	# 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)	1890	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1361		1891
1362	void glViewport (int x, int y, int width, int height)	1892	void glViewport (int x, int y, int width, int height)
		1893
		1894	void glScissor (int x, int y, int width, int height)
1363		1895
1364	void glTranslate (float x, float y, float z = 0.)	1896	void glTranslate (float x, float y, float z = 0.)
1365	CODE:	1897	CODE:
1366	glTranslatef (x, y, z);	1898	glTranslatef (x, y, z);
1367		1899
1368	void glScale (float x, float y, float z)	1900	void glScale (float x, float y, float z = 1.)
1369	CODE:	1901	CODE:
1370	glScalef (x, y, z);	1902	glScalef (x, y, z);
1371		1903
1372	void glRotate (float angle, float x, float y, float z)	1904	void glRotate (float angle, float x, float y, float z)
1373	CODE:	1905	CODE:
…		…
1377		1909
1378	void glEnd ()	1910	void glEnd ()
1379		1911
1380	void glColor (float r, float g, float b, float a = 1.0)	1912	void glColor (float r, float g, float b, float a = 1.0)
1381	PROTOTYPE: @	1913	PROTOTYPE: @
		1914	ALIAS:
		1915	glColor_premultiply = 1
1382	CODE:	1916	CODE:
		1917	if (ix)
		1918	{
		1919	r *= a;
		1920	g *= a;
		1921	b *= a;
		1922	}
		1923	// microsoft visual "c" rounds instead of truncating...
1383	glColor4f (r, g, b, a);	1924	glColor4f (r, g, b, a);
		1925
		1926	void glInterleavedArrays (int format, int stride, char *data)
		1927
		1928	void glDrawElements (int mode, int count, int type, char *indices)
		1929
		1930	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1931
		1932	void glRasterPos (float x, float y, float z = 0.)
		1933	CODE:
		1934	glRasterPos3f (0, 0, z);
		1935	glBitmap (0, 0, 0, 0, x, y, 0);
1384		1936
1385	void glVertex (float x, float y, float z = 0.)	1937	void glVertex (float x, float y, float z = 0.)
1386	CODE:	1938	CODE:
1387	glVertex3f (x, y, z);	1939	glVertex3f (x, y, z);
1388		1940
…		…
1400		1952
1401	void glBindTexture (int target, int name)	1953	void glBindTexture (int target, int name)
1402		1954
1403	void glConvolutionParameter (int target, int pname, float params)	1955	void glConvolutionParameter (int target, int pname, float params)
1404	CODE:	1956	CODE:
		1957	if (gl.ConvolutionParameterf)
1405	glConvolutionParameterf (target, pname, params);	1958	gl.ConvolutionParameterf (target, pname, params);
1406		1959
1407	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1960	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1961	CODE:
		1962	if (gl.ConvolutionFilter2D)
		1963	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
		1964
		1965	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		1966	CODE:
		1967	if (gl.SeparableFilter2D)
		1968	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1408		1969
1409	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1970	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1410		1971
1411	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1972	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1973
		1974	void glDrawPixels (int width, int height, int format, int type, char *pixels)
		1975
		1976	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1412		1977
1413	int glGenTexture ()	1978	int glGenTexture ()
1414	CODE:	1979	CODE:
1415	{	1980	{
1416	GLuint name;	1981	GLuint name;
…		…
1441		2006
1442	void glEndList ()	2007	void glEndList ()
1443		2008
1444	void glCallList (int list)	2009	void glCallList (int list)
1445		2010
		2011

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.133 by root, Sun Jul 30 13:16:44 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.133 by root, Sun Jul 30 13:16:44 2006 UTC