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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.70 by root, Sun Apr 30 09:21:47 2006 UTC vs.
Revision 1.153 by root, Tue Sep 19 22:02:38 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
38	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
39		51
40	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
41		53
42	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
43	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
44		56
45	#define MIN_FONT_HEIGHT 10	57	#define MIN_FONT_HEIGHT 10
46		58
47	#define GL_CALL(type,func,args) \	59	#if 0
48	{ \	60	# define PARACHUTE SDL_INIT_NOPARACHUTE
49	static int init_; \	61	#else
50	static type fptr_; \	62	# define PARACHUTE 0
51	\	63	#endif
52	if (!init_) \
53	{ \
54	init_ = 1; \
55	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
56	} \
57	\
58	if (fptr_) \
59	fptr_ args; \
60	}
61		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
62	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
63	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
64		90
65	typedef PangoFontDescription *CFClient__Font;	91	typedef PangoFontDescription *CFPlus__Font;
		92
		93	static int
		94	shape_attr_p (PangoLayoutRun *run)
		95	{
		96	GSList *attrs = run->item->analysis.extra_attrs;
		97
		98	while (attrs)
		99	{
		100	PangoAttribute *attr = attrs->data;
		101
		102	if (attr->klass->type == PANGO_ATTR_SHAPE)
		103	return 1;
		104
		105	attrs = attrs->next;
		106	}
		107
		108	return 0;
		109	}
66		110
67	typedef struct cf_layout {	111	typedef struct cf_layout {
68	PangoLayout *pl;	112	PangoLayout *pl;
		113	float r, g, b, a; // default color for rgba mode
69	int base_height;	114	int base_height;
70	CFClient__Font font;	115	CFPlus__Font font;
71	} *CFClient__Layout;	116	} *CFPlus__Layout;
72		117
73	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
74	static PangoContext *context;	119	static PangoContext *opengl_context;
75	static PangoFontMap *fontmap;	120	static PangoFontMap *opengl_fontmap;
76		121
77	static void	122	static void
78	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
79	{	124	{
80	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
81	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
82	}	130	}
83		131
84	static void	132	static void
85	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
86	{	134	{
87	/* 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
88	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
89	*/	137	*/
90	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
94		142
95	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
96	}	144	}
97		145
98	static void	146	static void
99	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
100	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
101	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
102		153
103	w = (w + 3) & ~3;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
104	if (!w) w = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
105	if (!h) h = 1;	156
		157	if (!rect.width) rect.width = 1;
		158	if (!rect.height) rect.height = 1;
		159
		160	*w = rect.width;
		161	*h = rect.height;
106	}	162	}
107		163
108	typedef uint16_t mapface;	164	typedef uint16_t mapface;
109		165
110	typedef struct {	166	typedef struct {
…		…
113	float s, t;	169	float s, t;
114	uint8_t r, g, b, a;	170	uint8_t r, g, b, a;
115	} maptex;	171	} maptex;
116		172
117	typedef struct {	173	typedef struct {
118	int16_t darkness;	174	uint32_t player;
119	mapface face[3];	175	mapface face[3];
		176	uint16_t darkness;
		177	uint8_t stat_width, stat_hp, flags;
120	} mapcell;	178	} mapcell;
121		179
122	typedef struct {	180	typedef struct {
123	int32_t c0, c1;	181	int32_t c0, c1;
124	mapcell *col;	182	mapcell *col;
…		…
133	int texs;	191	int texs;
134	maptex *tex;	192	maptex *tex;
135		193
136	int32_t rows;	194	int32_t rows;
137	maprow *row;	195	maprow *row;
138	} *CFClient__Map;	196	} *CFPlus__Map;
139		197
140	static char *	198	static char *
141	prepend (char *ptr, int sze, int inc)	199	prepend (char *ptr, int sze, int inc)
142	{	200	{
143	char *p;	201	char *p;
…		…
161		219
162	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	220	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
163	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	221	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
164		222
165	static maprow *	223	static maprow *
166	map_get_row (CFClient__Map self, int y)	224	map_get_row (CFPlus__Map self, int y)
167	{	225	{
168	if (0 > y)	226	if (0 > y)
169	{	227	{
170	int extend = - y + MAP_EXTEND_Y;	228	int extend = - y + MAP_EXTEND_Y;
171	Prepend (maprow, self->row, self->rows, extend);	229	Prepend (maprow, self->row, self->rows, extend);
…		…
209		267
210	return row->col + (x - row->c0);	268	return row->col + (x - row->c0);
211	}	269	}
212		270
213	static mapcell *	271	static mapcell *
214	map_get_cell (CFClient__Map self, int x, int y)	272	map_get_cell (CFPlus__Map self, int x, int y)
215	{	273	{
216	return row_get_cell (map_get_row (self, y), x);	274	return row_get_cell (map_get_row (self, y), x);
217	}	275	}
218		276
219	static void	277	static void
220	map_clear (CFClient__Map self)	278	map_clear (CFPlus__Map self)
221	{	279	{
222	int r;	280	int r;
223		281
224	for (r = 0; r < self->rows; r++)	282	for (r = 0; r < self->rows; r++)
225	Safefree (self->row[r].col);	283	Safefree (self->row[r].col);
…		…
233	self->row = 0;	291	self->row = 0;
234	self->rows = 0;	292	self->rows = 0;
235	}	293	}
236		294
237	static void	295	static void
238	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	296	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
239	{	297	{
240	int x, y;	298	int x, y;
241	maprow *row;	299	maprow *row;
		300	mapcell *cell;
242		301
243	for (y = y0; y < y0 + h; y++)	302	for (y = y0; y < y0 + h; y++)
244	if (y >= 0)	303	if (y >= 0)
245	{	304	{
246	if (y >= self->rows)	305	if (y >= self->rows)
…		…
252	if (x >= row->c0)	311	if (x >= row->c0)
253	{	312	{
254	if (x >= row->c1)	313	if (x >= row->c1)
255	break;	314	break;
256		315
257	row->col[x - row->c0].darkness = -1;	316	cell = row->col + x - row->c0;
		317
		318	cell->darkness = 0;
		319	cell->stat_hp = 0;
258	}	320	}
259	}	321	}
260	}	322	}
261		323
262	static void	324	static void
263	music_finished ()	325	music_finished (void)
264	{	326	{
265	SDL_UserEvent ev;	327	SDL_UserEvent ev;
266		328
267	ev.type = SDL_USEREVENT;	329	ev.type = SDL_USEREVENT;
268	ev.code = 0;	330	ev.code = 0;
…		…
270	ev.data2 = 0;	332	ev.data2 = 0;
271		333
272	SDL_PushEvent ((SDL_Event *)&ev);	334	SDL_PushEvent ((SDL_Event *)&ev);
273	}	335	}
274		336
		337	static void
		338	channel_finished (int channel)
		339	{
		340	SDL_UserEvent ev;
		341
		342	ev.type = SDL_USEREVENT;
		343	ev.code = 1;
		344	ev.data1 = (void *)(long)channel;
		345	ev.data2 = 0;
		346
		347	SDL_PushEvent ((SDL_Event *)&ev);
		348	}
		349
		350	static unsigned int
		351	minpot (unsigned int n)
		352	{
		353	if (!n)
		354	return 0;
		355
		356	--n;
		357
		358	n \|= n >> 1;
		359	n \|= n >> 2;
		360	n \|= n >> 4;
		361	n \|= n >> 8;
		362	n \|= n >> 16;
		363
		364	return n + 1;
		365	}
		366
275	MODULE = CFClient PACKAGE = CFClient	367	MODULE = CFPlus PACKAGE = CFPlus
276		368
277	PROTOTYPES: ENABLE	369	PROTOTYPES: ENABLE
278		370
279	BOOT:	371	BOOT:
280	{	372	{
281	HV *stash = gv_stashpv ("CFClient", 1);	373	HV *stash = gv_stashpv ("CFPlus", 1);
282	static const struct {	374	static const struct {
283	const char *name;	375	const char *name;
284	IV iv;	376	IV iv;
285	} *civ, const_iv[] = {	377	} *civ, const_iv[] = {
286	# define const_iv(name) { # name, (IV)name }	378	# define const_iv(name) { # name, (IV)name }
…		…
385	# undef const_iv	477	# undef const_iv
386	};	478	};
387		479
388	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	480	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
389	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	481	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
390
391	fontmap = pango_ft2_font_map_new ();
392	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
393	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
394	}	482	}
395		483
396	int	484	int
		485	in_destruct ()
		486	CODE:
		487	RETVAL = PL_main_cv == Nullcv;
		488	OUTPUT:
		489	RETVAL
		490
		491	NV floor (NV x)
		492
		493	NV ceil (NV x)
		494
		495	void
		496	pango_init ()
		497	CODE:
		498	{
		499	opengl_fontmap = pango_opengl_font_map_new ();
		500	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
		501	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		502	}
		503
		504	int
397	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	505	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
398		506
399	void	507	void
400	SDL_Quit ()	508	SDL_Quit ()
401		509
402	void	510	void
…		…
408	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	516	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
409	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	517	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
410	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	518	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
411	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	519	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
412		520
		521	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		522	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		523
413	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	524	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
414	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	525	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
415	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
416	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
417		528
418	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	529	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		530	#if SDL_VERSION_ATLEAST(1,2,10)
419	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	531	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
420	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	532	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		533	#endif
421		534
422	SDL_EnableUNICODE (1);	535	SDL_EnableUNICODE (1);
423	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	536	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
424		537
425	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	538	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
434		547
435	++m;	548	++m;
436	}	549	}
437	}	550	}
438		551
		552	char *
		553	SDL_GetError ()
		554
439	int	555	int
440	SDL_SetVideoMode (int w, int h, int fullscreen)	556	SDL_SetVideoMode (int w, int h, int fullscreen)
441	CODE:	557	CODE:
442	RETVAL = !!SDL_SetVideoMode (	558	RETVAL = !!SDL_SetVideoMode (
443	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	559	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
444	);	560	);
		561	if (RETVAL)
		562	{
445	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	563	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		564	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		565	# include "glfunc.h"
		566	# undef GL_FUNC
		567	}
446	OUTPUT:	568	OUTPUT:
447	RETVAL	569	RETVAL
448		570
449	void	571	void
450	SDL_GL_SwapBuffers ()	572	SDL_GL_SwapBuffers ()
		573
		574	char *
		575	SDL_GetKeyName (int sym)
451		576
452	void	577	void
453	SDL_PollEvent ()	578	SDL_PollEvent ()
454	PPCODE:	579	PPCODE:
455	{	580	{
…		…
474	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	599	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
475	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	600	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
476	break;	601	break;
477		602
478	case SDL_MOUSEMOTION:	603	case SDL_MOUSEMOTION:
		604	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		605
479	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	606	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
480	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	607	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
481	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	608	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
482	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	609	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
483	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	610	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
484	break;	611	break;
485		612
486	case SDL_MOUSEBUTTONDOWN:	613	case SDL_MOUSEBUTTONDOWN:
487	case SDL_MOUSEBUTTONUP:	614	case SDL_MOUSEBUTTONUP:
		615	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		616
488	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	617	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
489	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	618	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
490	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	619	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
491	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	620	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
492	break;	621	break;
		622
		623	case SDL_USEREVENT:
		624	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		625	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		626	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		627	break;
493	}	628	}
494		629
495	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	630	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
496	}	631	}
497	}	632	}
498		633
499	int	634	int
500	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	635	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
501	POSTCALL:	636	POSTCALL:
502	Mix_HookMusicFinished (music_finished);	637	Mix_HookMusicFinished (music_finished);
		638	Mix_ChannelFinished (channel_finished);
503		639
504	void	640	void
505	Mix_CloseAudio ()	641	Mix_CloseAudio ()
506		642
507	int	643	int
…		…
512	CODE:	648	CODE:
513	#ifndef _WIN32	649	#ifndef _WIN32
514	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	650	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
515	#endif	651	#endif
516		652
517	char *
518	gl_version ()
519	CODE:
520	RETVAL = (char *)glGetString (GL_VERSION);
521	OUTPUT:
522	RETVAL
523
524	char *
525	gl_extensions ()
526	CODE:
527	RETVAL = (char *)glGetString (GL_EXTENSIONS);
528	OUTPUT:
529	RETVAL
530
531	void	653	void
532	add_font (char *file)	654	add_font (char *file)
533	CODE:	655	CODE:
534	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	656	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
535		657
536	void	658	void
537	load_image_inline (SV *image_)	659	load_image_inline (SV *image_)
538	ALIAS:	660	ALIAS:
539	load_image_file = 1	661	load_image_file = 1
…		…
581		703
582	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	704	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
583		705
584	assert (surface2->pitch == surface2->w * 4);	706	assert (surface2->pitch == surface2->w * 4);
585		707
		708	SDL_LockSurface (surface2);
586	EXTEND (SP, 5);	709	EXTEND (SP, 6);
587	PUSHs (sv_2mortal (newSViv (surface2->w)));	710	PUSHs (sv_2mortal (newSViv (surface2->w)));
588	PUSHs (sv_2mortal (newSViv (surface2->h)));	711	PUSHs (sv_2mortal (newSViv (surface2->h)));
589	SDL_LockSurface (surface2);
590	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	712	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
591	SDL_UnlockSurface (surface2);
592	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	713	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
593	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	714	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
594	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	715	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		716	SDL_UnlockSurface (surface2);
595		717
596	SDL_FreeSurface (surface);	718	SDL_FreeSurface (surface);
597	SDL_FreeSurface (surface2);	719	SDL_FreeSurface (surface2);
598	}	720	}
599		721
…		…
623	}	745	}
624		746
625	void	747	void
626	error (char *message)	748	error (char *message)
627	CODE:	749	CODE:
		750	fprintf (stderr, "ERROR: %s\n", message);
628	#ifdef _WIN32	751	#ifdef _WIN32
629	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	752	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
630	#else
631	fprintf (stderr, "ERROR: %s\n", message);
632	#endif	753	#endif
633		754
634	void	755	void
635	fatal (char *message)	756	fatal (char *message)
636	CODE:	757	CODE:
		758	fprintf (stderr, "FATAL: %s\n", message);
637	#ifdef _WIN32	759	#ifdef _WIN32
638	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	760	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
639	#else
640	fprintf (stderr, "FATAL: %s\n", message);
641	#endif	761	#endif
642	exit (1);	762	_exit (1);
643		763
		764	void
		765	_exit (int retval)
		766	CODE:
		767	_exit (retval);
		768
644	MODULE = CFClient PACKAGE = CFClient::Font	769	MODULE = CFPlus PACKAGE = CFPlus::Font
645		770
646	CFClient::Font	771	CFPlus::Font
647	new_from_file (SV class, char path, int id = 0)	772	new_from_file (SV class, char path, int id = 0)
648	CODE:	773	CODE:
649	{	774	{
650	int count;	775	int count;
651	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	776	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
654	}	779	}
655	OUTPUT:	780	OUTPUT:
656	RETVAL	781	RETVAL
657		782
658	void	783	void
659	DESTROY (CFClient::Font self)	784	DESTROY (CFPlus::Font self)
660	CODE:	785	CODE:
661	pango_font_description_free (self);	786	pango_font_description_free (self);
662		787
663	void	788	void
664	make_default (CFClient::Font self)	789	make_default (CFPlus::Font self)
665	CODE:	790	CODE:
666	default_font = self;	791	default_font = self;
667		792
668	MODULE = CFClient PACKAGE = CFClient::Layout	793	MODULE = CFPlus PACKAGE = CFPlus::Layout
669		794
670	CFClient::Layout	795	void
671	new (SV *class, int base_height = MIN_FONT_HEIGHT)	796	reset_glyph_cache ()
		797	CODE:
		798	tc_clear ();
		799
		800	CFPlus::Layout
		801	new (SV *class)
672	CODE:	802	CODE:
673	New (0, RETVAL, 1, struct cf_layout);	803	New (0, RETVAL, 1, struct cf_layout);
		804
674	RETVAL->pl = pango_layout_new (context);	805	RETVAL->pl = pango_layout_new (opengl_context);
675	RETVAL->base_height = base_height;	806	RETVAL->r = 1.;
		807	RETVAL->g = 1.;
		808	RETVAL->b = 1.;
		809	RETVAL->a = 1.;
		810	RETVAL->base_height = MIN_FONT_HEIGHT;
676	RETVAL->font = 0;	811	RETVAL->font = 0;
		812
677	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	813	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
678	pango_layout_set_font_description (RETVAL->pl, default_font);	814	layout_update_font (RETVAL);
679	OUTPUT:	815	OUTPUT:
680	RETVAL	816	RETVAL
681		817
682	void	818	void
683	DESTROY (CFClient::Layout self)	819	DESTROY (CFPlus::Layout self)
684	CODE:	820	CODE:
685	g_object_unref (self->pl);	821	g_object_unref (self->pl);
686	Safefree (self);	822	Safefree (self);
687		823
688	void	824	void
689	set_text (CFClient::Layout self, SV *text_)	825	set_text (CFPlus::Layout self, SV *text_)
690	CODE:	826	CODE:
691	{	827	{
692	STRLEN textlen;	828	STRLEN textlen;
693	char *text = SvPVutf8 (text_, textlen);	829	char *text = SvPVutf8 (text_, textlen);
694		830
695	pango_layout_set_text (self->pl, text, textlen);	831	pango_layout_set_text (self->pl, text, textlen);
696	}	832	}
697		833
698	void	834	void
699	set_markup (CFClient::Layout self, SV *text_)	835	set_markup (CFPlus::Layout self, SV *text_)
700	CODE:	836	CODE:
701	{	837	{
702	STRLEN textlen;	838	STRLEN textlen;
703	char *text = SvPVutf8 (text_, textlen);	839	char *text = SvPVutf8 (text_, textlen);
704		840
705	pango_layout_set_markup (self->pl, text, textlen);	841	pango_layout_set_markup (self->pl, text, textlen);
706	}	842	}
707		843
		844	void
		845	set_shapes (CFPlus::Layout self, ...)
		846	CODE:
		847	{
		848	PangoAttrList *attrs = 0;
		849	const char *text = pango_layout_get_text (self->pl);
		850	const char *pos = text;
		851	int arg = 4;
		852
		853	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		854	{
		855	PangoRectangle inkrect, rect;
		856	PangoAttribute *attr;
		857
		858	int x = SvIV (ST (arg - 3));
		859	int y = SvIV (ST (arg - 2));
		860	int w = SvIV (ST (arg - 1));
		861	int h = SvIV (ST (arg ));
		862
		863	inkrect.x = 0;
		864	inkrect.y = 0;
		865	inkrect.width = 0;
		866	inkrect.height = 0;
		867
		868	rect.x = x * PANGO_SCALE;
		869	rect.y = y * PANGO_SCALE;
		870	rect.width = w * PANGO_SCALE;
		871	rect.height = h * PANGO_SCALE;
		872
		873	if (!attrs)
		874	attrs = pango_layout_get_attributes (self->pl);
		875
		876	attr = pango_attr_shape_new (&inkrect, &rect);
		877	attr->start_index = pos - text;
		878	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		879	pango_attr_list_insert (attrs, attr);
		880
		881	arg += 4;
		882	pos += sizeof (OBJ_STR) - 1;
		883	}
		884
		885	if (attrs)
		886	pango_layout_set_attributes (self->pl, attrs);
		887	}
		888
		889	void
		890	get_shapes (CFPlus::Layout self)
		891	PPCODE:
		892	{
		893	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		894
		895	do
		896	{
		897	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		898
		899	if (run && shape_attr_p (run))
		900	{
		901	PangoRectangle extents;
		902	pango_layout_iter_get_run_extents (iter, 0, &extents);
		903
		904	EXTEND (SP, 2);
		905	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		906	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		907	}
		908	}
		909	while (pango_layout_iter_next_run (iter));
		910
		911	pango_layout_iter_free (iter);
		912	}
		913
		914	int
		915	has_wrapped (CFPlus::Layout self)
		916	CODE:
		917	{
		918	int lines = 1;
		919	const char *text = pango_layout_get_text (self->pl);
		920
		921	while (*text)
		922	lines += *text++ == '\n';
		923
		924	RETVAL = lines < pango_layout_get_line_count (self->pl);
		925	}
		926	OUTPUT:
		927	RETVAL
		928
708	SV *	929	SV *
709	get_text (CFClient::Layout self)	930	get_text (CFPlus::Layout self)
710	CODE:	931	CODE:
711	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	932	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
712	SvUTF8_on (RETVAL);	933	sv_utf8_decode (RETVAL);
713	OUTPUT:	934	OUTPUT:
714	RETVAL	935	RETVAL
715		936
716	void	937	void
		938	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
		939	CODE:
		940	self->r = r;
		941	self->g = g;
		942	self->b = b;
		943	self->a = a;
		944
		945	void
717	set_font (CFClient::Layout self, CFClient::Font font = 0)	946	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
718	CODE:	947	CODE:
719	if (self->font != font)	948	if (self->font != font)
720	{	949	{
721	self->font = font;	950	self->font = font;
722	layout_update_font (self);	951	layout_update_font (self);
723	}	952	}
724		953
725	void	954	void
726	set_height (CFClient::Layout self, int base_height)	955	set_height (CFPlus::Layout self, int base_height)
727	CODE:	956	CODE:
728	if (self->base_height != base_height)	957	if (self->base_height != base_height)
729	{	958	{
730	self->base_height = base_height;	959	self->base_height = base_height;
731	layout_update_font (self);	960	layout_update_font (self);
732	}	961	}
733		962
734	void	963	void
735	set_width (CFClient::Layout self, int max_width = -1)	964	set_width (CFPlus::Layout self, int max_width = -1)
736	CODE:	965	CODE:
737	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	966	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
738		967
739	void	968	void
		969	set_indent (CFPlus::Layout self, int indent)
		970	CODE:
		971	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		972
		973	void
		974	set_spacing (CFPlus::Layout self, int spacing)
		975	CODE:
		976	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		977
		978	void
		979	set_ellipsise (CFPlus::Layout self, int ellipsise)
		980	CODE:
		981	pango_layout_set_ellipsize (self->pl,
		982	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		983	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		984	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		985	: PANGO_ELLIPSIZE_NONE
		986	);
		987
		988	void
		989	set_single_paragraph_mode (CFPlus::Layout self, int spm)
		990	CODE:
		991	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		992
		993	void
740	size (CFClient::Layout self)	994	size (CFPlus::Layout self)
741	PPCODE:	995	PPCODE:
742	{	996	{
743	int w, h;	997	int w, h;
744		998
745	layout_get_pixel_size (self, &w, &h);	999	layout_get_pixel_size (self, &w, &h);
…		…
748	PUSHs (sv_2mortal (newSViv (w)));	1002	PUSHs (sv_2mortal (newSViv (w)));
749	PUSHs (sv_2mortal (newSViv (h)));	1003	PUSHs (sv_2mortal (newSViv (h)));
750	}	1004	}
751		1005
752	int	1006	int
		1007	descent (CFPlus::Layout self)
		1008	CODE:
		1009	{
		1010	PangoRectangle rect;
		1011	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1012	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1013	RETVAL = PANGO_DESCENT (rect);
		1014	}
		1015	OUTPUT:
		1016	RETVAL
		1017
		1018	int
753	xy_to_index (CFClient::Layout self, int x, int y)	1019	xy_to_index (CFPlus::Layout self, int x, int y)
754	CODE:	1020	CODE:
755	{	1021	{
756	int index, trailing;	1022	int index, trailing;
757	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1023	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
758	RETVAL = index;	1024	RETVAL = index;
759	}	1025	}
760	OUTPUT:	1026	OUTPUT:
761	RETVAL	1027	RETVAL
762		1028
763	void	1029	void
764	cursor_pos (CFClient::Layout self, int index)	1030	cursor_pos (CFPlus::Layout self, int index)
765	PPCODE:	1031	PPCODE:
766	{	1032	{
767	PangoRectangle strong_pos;	1033	PangoRectangle strong_pos;
768	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1034	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
769		1035
…		…
772	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1038	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
773	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1039	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
774	}	1040	}
775		1041
776	void	1042	void
777	render (CFClient::Layout self)	1043	render (CFPlus::Layout self, float x, float y, int flags = 0)
778	PPCODE:	1044	PPCODE:
779	{	1045	pango_opengl_render_layout_subpixel (
780	SV *retval;	1046	self->pl,
781	int w, h;	1047	x * PANGO_SCALE, y * PANGO_SCALE,
782	FT_Bitmap bitmap;	1048	self->r, self->g, self->b, self->a,
		1049	flags
		1050	);
783		1051
784	layout_get_pixel_size (self, &w, &h);	1052	MODULE = CFPlus PACKAGE = CFPlus::Texture
785		1053
786	retval = newSV (w * h);	1054	void
787	SvPOK_only (retval);	1055	pad2pot (SV data_, SV w_, SV *h_)
788	SvCUR_set (retval, w * h);	1056	CODE:
		1057	{
		1058	int ow = SvIV (w_);
		1059	int oh = SvIV (h_);
789		1060
790	bitmap.rows = h;	1061	if (ow && oh)
791	bitmap.width = w;	1062	{
792	bitmap.pitch = w;	1063	int nw = minpot (ow);
793	bitmap.buffer = (unsigned char*)SvPVX (retval);	1064	int nh = minpot (oh);
794	bitmap.num_grays = 256;
795	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
796		1065
797	memset (bitmap.buffer, 0, w * h);	1066	if (nw != ow \|\| nh != oh)
798		1067	{
799	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	1068	if (SvOK (data_))
		1069	{
		1070	STRLEN datalen;
		1071	char *data = SvPVbyte (data_, datalen);
		1072	int bpp = datalen / (ow * oh);
		1073	SV result_ = sv_2mortal (newSV (nw nh * bpp));
800		1074
801	EXTEND (SP, 3);	1075	SvPOK_only (result_);
802	PUSHs (sv_2mortal (newSViv (w)));	1076	SvCUR_set (result_, nw * nh * bpp);
803	PUSHs (sv_2mortal (newSViv (h)));
804	PUSHs (sv_2mortal (retval));
805	}
806		1077
807	MODULE = CFClient PACKAGE = CFClient::Texture	1078	memset (SvPVX (result_), 0, nw * nh * bpp);
		1079	while (oh--)
		1080	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
808		1081
		1082	sv_setsv (data_, result_);
		1083	}
		1084
		1085	sv_setiv (w_, nw);
		1086	sv_setiv (h_, nh);
		1087	}
		1088	}
		1089	}
		1090
809	void	1091	void
810	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1092	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
811	PROTOTYPE: $$$;$$	1093	PROTOTYPE: $$$;$$
		1094	ALIAS:
		1095	draw_quad_alpha = 1
		1096	draw_quad_alpha_premultiplied = 2
812	CODE:	1097	CODE:
813	{	1098	{
814	HV hv = (HV )SvRV (self);	1099	HV hv = (HV )SvRV (self);
815	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1100	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
816	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1101	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
817	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1102	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
818	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
819		1103
820	if (items < 5)	1104	if (items < 5)
821	{	1105	{
822	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1106	w = SvNV (*hv_fetch (hv, "w", 1, 1));
823	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1107	h = SvNV (*hv_fetch (hv, "h", 1, 1));
824	}	1108	}
825		1109
		1110	if (ix)
		1111	{
		1112	glEnable (GL_BLEND);
		1113
		1114	if (ix == 2)
		1115	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1116	else
		1117	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1118	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1119
		1120	glEnable (GL_ALPHA_TEST);
		1121	glAlphaFunc (GL_GREATER, 0.01f);
		1122	}
		1123
826	glBindTexture (GL_TEXTURE_2D, name);	1124	glBindTexture (GL_TEXTURE_2D, name);
827	if (wrap_mode) {	1125
828	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
829	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
830	}
831	glBegin (GL_QUADS);	1126	glBegin (GL_QUADS);
832	glTexCoord2f (0, 0); glVertex2f (x , y );	1127	glTexCoord2f (0, 0); glVertex2f (x , y );
833	glTexCoord2f (0, t); glVertex2f (x , y + h);	1128	glTexCoord2f (0, t); glVertex2f (x , y + h);
834	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1129	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
835	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1130	glTexCoord2f (s, 0); glVertex2f (x + w, y );
836	glEnd ();	1131	glEnd ();
837	}
838		1132
		1133	if (ix)
		1134	{
		1135	glDisable (GL_ALPHA_TEST);
		1136	glDisable (GL_BLEND);
		1137	}
		1138	}
		1139
839	MODULE = CFClient PACKAGE = CFClient::Map	1140	MODULE = CFPlus PACKAGE = CFPlus::Map
840		1141
841	CFClient::Map	1142	CFPlus::Map
842	new (SV *class, int map_width, int map_height)	1143	new (SV *class, int map_width, int map_height)
843	CODE:	1144	CODE:
844	New (0, RETVAL, 1, struct map);	1145	New (0, RETVAL, 1, struct map);
845	RETVAL->x = 0;	1146	RETVAL->x = 0;
846	RETVAL->y = 0;	1147	RETVAL->y = 0;
…		…
856	RETVAL->row = 0;	1157	RETVAL->row = 0;
857	OUTPUT:	1158	OUTPUT:
858	RETVAL	1159	RETVAL
859		1160
860	void	1161	void
861	DESTROY (CFClient::Map self)	1162	DESTROY (CFPlus::Map self)
862	CODE:	1163	CODE:
863	{	1164	{
864	map_clear (self);	1165	map_clear (self);
865	Safefree (self->face);	1166	Safefree (self->face);
		1167	Safefree (self->tex);
866	Safefree (self);	1168	Safefree (self);
867	}	1169	}
868		1170
869	void	1171	void
870	clear (CFClient::Map self)	1172	clear (CFPlus::Map self)
871	CODE:	1173	CODE:
872	map_clear (self);	1174	map_clear (self);
873		1175
874	void	1176	void
875	set_face (CFClient::Map self, int face, int texid)	1177	set_face (CFPlus::Map self, int face, int texid)
876	CODE:	1178	CODE:
877	{	1179	{
878	while (self->faces <= face)	1180	while (self->faces <= face)
879	{	1181	{
880	Append (mapface, self->face, self->faces, self->faces);	1182	Append (mapface, self->face, self->faces, self->faces);
…		…
883		1185
884	self->face [face] = texid;	1186	self->face [face] = texid;
885	}	1187	}
886		1188
887	void	1189	void
888	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)	1190	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)
889	CODE:	1191	CODE:
890	{	1192	{
891	while (self->texs <= texid)	1193	while (self->texs <= texid)
892	{	1194	{
893	Append (maptex, self->tex, self->texs, self->texs);	1195	Append (maptex, self->tex, self->texs, self->texs);
…		…
905	tex->r = r;	1207	tex->r = r;
906	tex->g = g;	1208	tex->g = g;
907	tex->b = b;	1209	tex->b = b;
908	tex->a = a;	1210	tex->a = a;
909	}	1211	}
		1212
		1213	// somewhat hackish, but for textures that require it, it really
		1214	// improves the look, and most others don't suffer.
		1215	glBindTexture (GL_TEXTURE_2D, name);
		1216	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1217	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1218	// use uglier nearest interpolation because linear suffers
		1219	// from transparent color bleeding and ugly wrapping effects.
		1220	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
910	}	1221	}
911		1222
912	int	1223	int
913	ox (CFClient::Map self)	1224	ox (CFPlus::Map self)
914	ALIAS:	1225	ALIAS:
915	oy = 1	1226	oy = 1
		1227	x = 2
		1228	y = 3
		1229	w = 4
		1230	h = 5
916	CODE:	1231	CODE:
917	switch (ix)	1232	switch (ix)
918	{	1233	{
919	case 0: RETVAL = self->ox; break;	1234	case 0: RETVAL = self->ox; break;
920	case 1: RETVAL = self->oy; break;	1235	case 1: RETVAL = self->oy; break;
		1236	case 2: RETVAL = self->x; break;
		1237	case 3: RETVAL = self->y; break;
		1238	case 4: RETVAL = self->w; break;
		1239	case 5: RETVAL = self->h; break;
921	}	1240	}
922	OUTPUT:	1241	OUTPUT:
923	RETVAL	1242	RETVAL
924		1243
925	void	1244	void
926	scroll (CFClient::Map self, int dx, int dy)	1245	scroll (CFPlus::Map self, int dx, int dy)
927	CODE:	1246	CODE:
928	{	1247	{
929	if (dx > 0)	1248	if (dx > 0)
930	map_blank (self, self->x, self->y, dx - 1, self->h);	1249	map_blank (self, self->x, self->y, dx - 1, self->h);
931	else if (dx < 0)	1250	else if (dx < 0)
…		…
947	self->y += MAP_EXTEND_Y;	1266	self->y += MAP_EXTEND_Y;
948	}	1267	}
949	}	1268	}
950		1269
951	void	1270	void
952	map1a_update (CFClient::Map self, SV *data_)	1271	map1a_update (CFPlus::Map self, SV *data_, int extmap)
953	CODE:	1272	CODE:
954	{	1273	{
955	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1274	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
956	uint8_t data_end = (uint8_t )SvEND (data_);	1275	uint8_t data_end = (uint8_t )SvEND (data_);
957	mapcell *cell;	1276	mapcell *cell;
958	int x, y, flags;	1277	int x, y, flags;
959		1278
960	while (data < data_end)	1279	while (data < data_end - 1)
961	{	1280	{
962	flags = (data [0] << 8) + data [1]; data += 2;	1281	flags = (data [0] << 8) + data [1]; data += 2;
963		1282
964	x = ((flags >> 10) & 63) + self->x;	1283	x = self->x + ((flags >> 10) & 63);
965	y = ((flags >> 4) & 63) + self->y;	1284	y = self->y + ((flags >> 4) & 63);
966		1285
967	cell = map_get_cell (self, x, y);	1286	cell = map_get_cell (self, x, y);
968		1287
969	if (flags & 15)	1288	if (flags & 15)
970	{	1289	{
971	if (cell->darkness < 0)	1290	if (!cell->darkness)
972	{	1291	{
973	cell->darkness = 0;	1292	cell->darkness = 256;
974	cell->face [0] = 0;	1293	cell->face [0] = 0;
975	cell->face [1] = 0;	1294	cell->face [1] = 0;
976	cell->face [2] = 0;	1295	cell->face [2] = 0;
977	}	1296	}
978		1297
979	cell->darkness = flags & 8 ? *data++ : 255;
980
981	//TODO: don't trust server data to be in-range(!)	1298	//TODO: don't trust server data to be in-range(!)
		1299
		1300	if (flags & 8)
		1301	{
		1302	if (extmap)
		1303	{
		1304	uint8_t ext, cmd;
		1305
		1306	do
		1307	{
		1308	ext = *data++;
		1309	cmd = ext & 0x3f;
		1310
		1311	if (cmd < 4)
		1312	cell->darkness = 255 - ext * 64 + 1;
		1313	else if (cmd == 5) // health
		1314	{
		1315	cell->stat_width = 1;
		1316	cell->stat_hp = *data++;
		1317	}
		1318	else if (cmd == 6) // monster width
		1319	cell->stat_width = *data++ + 1;
		1320	else if (cmd == 0x47) // monster width
		1321	{
		1322	if (*data == 4)
		1323	; // decode player tag
		1324
		1325	data += *data + 1;
		1326	}
		1327	else if (cmd == 8) // cell flags
		1328	cell->flags = *data++;
		1329	else if (ext & 0x40) // unknown, multibyte => skip
		1330	data += *data + 1;
		1331	else
		1332	data++;
		1333	}
		1334	while (ext & 0x80);
		1335	}
		1336	else
		1337	cell->darkness = *data++ + 1;
		1338	}
982		1339
983	if (flags & 4)	1340	if (flags & 4)
984	{	1341	{
985	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1342	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
986	}	1343	}
…		…
994	{	1351	{
995	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1352	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
996	}	1353	}
997	}	1354	}
998	else	1355	else
		1356	{
999	cell->darkness = -1;	1357	cell->darkness = 0;
		1358	cell->stat_hp = 0;
		1359	}
1000	}	1360	}
1001	}	1361	}
1002		1362
1003	SV *	1363	SV *
1004	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1364	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1005	CODE:	1365	CODE:
1006	{	1366	{
1007	int x1, x;	1367	int x1, x;
1008	int y1, y;	1368	int y1, y;
1009	int z;	1369	int z;
…		…
1059	}	1419	}
1060	OUTPUT:	1420	OUTPUT:
1061	RETVAL	1421	RETVAL
1062		1422
1063	void	1423	void
1064	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1424	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1065	PPCODE:	1425	CODE:
1066	{	1426	{
1067	int vx, vy;	1427	int vx, vy;
1068	int x, y, z;	1428	int x, y, z;
1069	int last_name;	1429	int last_name;
1070	mapface face;	1430	mapface face;
1071	int sw4 = (sw + 3) & ~3;
1072	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1073	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1074		1431
1075	memset (darkness, 255, sw4 * sh);
1076	SvPOK_only (darkness_sv);
1077	SvCUR_set (darkness_sv, sw4 * sh);
1078
1079	vx = self->x + (self->w - sw) / 2 - shift_x;	1432	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1080	vy = self->y + (self->h - sh) / 2 - shift_y;	1433	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1081		1434
1082	/*	1435	/*
1083	int vx = self->vx = self->w >= sw	1436	int vx = self->vx = self->w >= sw
1084	? self->x + (self->w - sw) / 2	1437	? self->x + (self->w - sw) / 2
1085	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1438	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1089	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1442	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1090	*/	1443	*/
1091		1444
1092	glColor4ub (255, 255, 255, 255);	1445	glColor4ub (255, 255, 255, 255);
1093		1446
		1447	glEnable (GL_BLEND);
1094	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1448	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1095	glEnable (GL_BLEND);
1096	glEnable (GL_TEXTURE_2D);	1449	glEnable (GL_TEXTURE_2D);
1097	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1450	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1098		1451
1099	glBegin (GL_QUADS);	1452	glBegin (GL_QUADS);
1100		1453
…		…
1109	for (x = 0; x < sw; x++)	1462	for (x = 0; x < sw; x++)
1110	if (row->c0 <= x + vx && x + vx < row->c1)	1463	if (row->c0 <= x + vx && x + vx < row->c1)
1111	{	1464	{
1112	mapcell *cell = row->col + (x + vx - row->c0);	1465	mapcell *cell = row->col + (x + vx - row->c0);
1113		1466
1114	darkness[y * sw4 + x] = cell->darkness < 0
1115	? 255 - FOW_DARKNESS
1116	: 255 - cell->darkness;
1117
1118	face = cell->face [z];	1467	face = cell->face [z];
1119		1468
1120	if (face)	1469	if (face && face < self->texs)
1121	{	1470	{
1122	maptex tex = self->tex [face];	1471	maptex tex = self->tex [face];
1123
1124	int px = (x + 1) * 32 - tex.w;	1472	int px = (x + 1) * 32 - tex.w;
1125	int py = (y + 1) * 32 - tex.h;	1473	int py = (y + 1) * 32 - tex.h;
1126		1474
1127	if (last_name != tex.name)	1475	if (last_name != tex.name)
1128	{	1476	{
1129	glEnd ();	1477	glEnd ();
1130	last_name = tex.name;
1131	glBindTexture (GL_TEXTURE_2D, last_name);	1478	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1132	glBegin (GL_QUADS);	1479	glBegin (GL_QUADS);
1133	}	1480	}
1134		1481
1135	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1482	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1136	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1483	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1137	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1484	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1138	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1485	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1139	}	1486	}
		1487
		1488	if (cell->flags && z == 2)
		1489	{
		1490	if (cell->flags & 1)
		1491	{
		1492	maptex tex = self->tex [1];
		1493	int px = (x + 1) * 32 - tex.w + 2;
		1494	int py = (y + 1) * 32 - tex.h - 6;
		1495
		1496	glEnd ();
		1497	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1498	glBegin (GL_QUADS);
		1499
		1500	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1501	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1502	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1503	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1504	}
		1505	}
1140	}	1506	}
1141	}	1507	}
1142		1508
1143	glEnd ();	1509	glEnd ();
1144		1510
1145	glDisable (GL_TEXTURE_2D);	1511	glDisable (GL_TEXTURE_2D);
1146	glDisable (GL_BLEND);	1512	glDisable (GL_BLEND);
		1513
		1514	// top layer: overlays such as the health bar
		1515	for (y = 0; y < sh; y++)
		1516	if (0 <= y + vy && y + vy < self->rows)
		1517	{
		1518	maprow *row = self->row + (y + vy);
		1519
		1520	for (x = 0; x < sw; x++)
		1521	if (row->c0 <= x + vx && x + vx < row->c1)
		1522	{
		1523	mapcell *cell = row->col + (x + vx - row->c0);
		1524
		1525	int px = x * 32;
		1526	int py = y * 32;
		1527
		1528	if (cell->stat_hp)
		1529	{
		1530	int width = cell->stat_width * 32;
		1531	int thick = sh / 28 + 1 + cell->stat_width;
		1532
		1533	glColor3ub (0, 0, 0);
		1534	glRectf (px + 1, py - thick - 2,
		1535	px + width - 1, py);
		1536
		1537	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1538	glRectf (px + 2,
		1539	py - thick - 1,
		1540	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1541	}
		1542	}
		1543	}
		1544	}
		1545
		1546	void
		1547	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1548	CODE:
		1549	{
		1550	static float color[16][3] = {
		1551	{ 0.00F, 0.00F, 0.00F },
		1552	{ 1.00F, 1.00F, 1.00F },
		1553	{ 0.00F, 0.00F, 0.55F },
		1554	{ 1.00F, 0.00F, 0.00F },
		1555
		1556	{ 1.00F, 0.54F, 0.00F },
		1557	{ 0.11F, 0.56F, 1.00F },
		1558	{ 0.93F, 0.46F, 0.00F },
		1559	{ 0.18F, 0.54F, 0.34F },
		1560
		1561	{ 0.56F, 0.73F, 0.56F },
		1562	{ 0.80F, 0.80F, 0.80F },
		1563	{ 0.55F, 0.41F, 0.13F },
		1564	{ 0.99F, 0.77F, 0.26F },
		1565
		1566	{ 0.74F, 0.65F, 0.41F },
		1567
		1568	{ 0.00F, 1.00F, 1.00F },
		1569	{ 1.00F, 0.00F, 1.00F },
		1570	{ 1.00F, 1.00F, 0.00F },
		1571	};
		1572
		1573	int x, y;
		1574
		1575	glEnable (GL_TEXTURE_2D);
		1576	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1577	glEnable (GL_BLEND);
		1578	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1579	glBegin (GL_QUADS);
		1580
		1581	for (y = 0; y < h; y++)
		1582	for (x = 0; x < w; x++)
		1583	{
		1584	unsigned char m = data [x + y * w];
		1585
		1586	if (m)
		1587	{
		1588	float *c = color [m & 15];
		1589
		1590	float tx1 = m & 0x40 ? 0.5 : 0.;
		1591	float tx2 = tx1 + 0.5;
		1592
		1593	glColor4f (c[0], c[1], c[2], 0.75);
		1594	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1595	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1596	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1597	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1598	}
		1599	}
		1600
		1601	glEnd ();
		1602	glDisable (GL_BLEND);
		1603	glDisable (GL_TEXTURE_2D);
		1604	}
		1605
		1606	void
		1607	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1608	PPCODE:
		1609	{
		1610	int vx, vy;
		1611	int x, y;
		1612	int sw4 = (sw + 3) & ~3;
		1613	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1614	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1615
		1616	memset (darkness, 255, sw4 * sh);
		1617	SvPOK_only (darkness_sv);
		1618	SvCUR_set (darkness_sv, sw4 * sh);
		1619
		1620	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1621	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1622
		1623	for (y = 0; y < sh; y++)
		1624	if (0 <= y + vy && y + vy < self->rows)
		1625	{
		1626	maprow *row = self->row + (y + vy);
		1627
		1628	for (x = 0; x < sw; x++)
		1629	if (row->c0 <= x + vx && x + vx < row->c1)
		1630	{
		1631	mapcell *cell = row->col + (x + vx - row->c0);
		1632
		1633	darkness[y * sw4 + x] = cell->darkness
		1634	? 255 - (cell->darkness - 1)
		1635	: 255 - FOW_DARKNESS;
		1636	}
		1637	}
1147		1638
1148	EXTEND (SP, 3);	1639	EXTEND (SP, 3);
1149	PUSHs (sv_2mortal (newSViv (sw4)));	1640	PUSHs (sv_2mortal (newSViv (sw4)));
1150	PUSHs (sv_2mortal (newSViv (sh)));	1641	PUSHs (sv_2mortal (newSViv (sh)));
1151	PUSHs (darkness_sv);	1642	PUSHs (darkness_sv);
1152	}	1643	}
1153		1644
1154	SV *	1645	SV *
1155	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1646	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1156	CODE:	1647	CODE:
1157	{	1648	{
1158	int x, y, x1, y1;	1649	int x, y, x1, y1;
1159	SV data_sv = newSV (w h * 7 + 5);	1650	SV data_sv = newSV (w h * 7 + 5);
1160	uint8_t data = (uint8_t )SvPVX (data_sv);	1651	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1222	}	1713	}
1223	OUTPUT:	1714	OUTPUT:
1224	RETVAL	1715	RETVAL
1225		1716
1226	void	1717	void
1227	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1718	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1228	PPCODE:	1719	PPCODE:
1229	{	1720	{
1230	int x, y, z;	1721	int x, y, z;
1231	int w, h;	1722	int w, h;
1232	int x1, y1;	1723	int x1, y1;
…		…
1264		1755
1265	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1756	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1266	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1757	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1267	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1758	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1268		1759
1269	if (cell->darkness <= 0)	1760	if (cell->darkness == 0)
1270	{	1761	{
1271	cell->darkness = -1;	1762	cell->darkness = 0;
1272		1763
1273	for (z = 0; z <= 2; z++)	1764	for (z = 0; z <= 2; z++)
1274	{	1765	{
1275	cell->face[z] = face[z];	1766	cell->face[z] = face[z];
1276		1767
…		…
1281	}	1772	}
1282	}	1773	}
1283	}	1774	}
1284	}	1775	}
1285		1776
1286	MODULE = CFClient PACKAGE = CFClient::MixChunk	1777	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1287		1778
1288	CFClient::MixChunk	1779	CFPlus::MixChunk
1289	new_from_file (SV class, char path)	1780	new_from_file (SV class, char path)
1290	CODE:	1781	CODE:
1291	RETVAL = Mix_LoadWAV (path);	1782	RETVAL = Mix_LoadWAV (path);
1292	OUTPUT:	1783	OUTPUT:
1293	RETVAL	1784	RETVAL
1294		1785
1295	void	1786	void
1296	DESTROY (CFClient::MixChunk self)	1787	DESTROY (CFPlus::MixChunk self)
1297	CODE:	1788	CODE:
1298	Mix_FreeChunk (self);	1789	Mix_FreeChunk (self);
1299		1790
1300	int	1791	int
1301	volume (CFClient::MixChunk self, int volume = -1)	1792	volume (CFPlus::MixChunk self, int volume = -1)
1302	CODE:	1793	CODE:
1303	RETVAL = Mix_VolumeChunk (self, volume);	1794	RETVAL = Mix_VolumeChunk (self, volume);
1304	OUTPUT:	1795	OUTPUT:
1305	RETVAL	1796	RETVAL
1306		1797
1307	int	1798	int
1308	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1799	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1309	CODE:	1800	CODE:
1310	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1801	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1311	OUTPUT:	1802	OUTPUT:
1312	RETVAL	1803	RETVAL
1313		1804
1314	MODULE = CFClient PACKAGE = CFClient::MixMusic	1805	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1315		1806
1316	int	1807	int
1317	volume (int volume = -1)	1808	volume (int volume = -1)
1318	CODE:	1809	CODE:
1319	RETVAL = Mix_VolumeMusic (volume);	1810	RETVAL = Mix_VolumeMusic (volume);
1320	OUTPUT:	1811	OUTPUT:
1321	RETVAL	1812	RETVAL
1322		1813
1323	CFClient::MixMusic	1814	CFPlus::MixMusic
1324	new_from_file (SV class, char path)	1815	new_from_file (SV class, char path)
1325	CODE:	1816	CODE:
1326	RETVAL = Mix_LoadMUS (path);	1817	RETVAL = Mix_LoadMUS (path);
1327	OUTPUT:	1818	OUTPUT:
1328	RETVAL	1819	RETVAL
1329		1820
1330	void	1821	void
1331	DESTROY (CFClient::MixMusic self)	1822	DESTROY (CFPlus::MixMusic self)
1332	CODE:	1823	CODE:
1333	Mix_FreeMusic (self);	1824	Mix_FreeMusic (self);
1334		1825
1335	int	1826	int
1336	play (CFClient::MixMusic self, int loops = -1)	1827	play (CFPlus::MixMusic self, int loops = -1)
1337	CODE:	1828	CODE:
1338	RETVAL = Mix_PlayMusic (self, loops);	1829	RETVAL = Mix_PlayMusic (self, loops);
1339	OUTPUT:	1830	OUTPUT:
1340	RETVAL	1831	RETVAL
1341		1832
1342	MODULE = CFClient PACKAGE = CFClient::OpenGL	1833	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1343		1834
1344	BOOT:	1835	BOOT:
1345	{	1836	{
1346	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1837	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1347	static const struct {	1838	static const struct {
1348	const char *name;	1839	const char *name;
1349	IV iv;	1840	IV iv;
1350	} *civ, const_iv[] = {	1841	} *civ, const_iv[] = {
1351	# define const_iv(name) { # name, (IV)name }	1842	# define const_iv(name) { # name, (IV)name }
1352	const_iv (GL_COLOR_MATERIAL),	1843	const_iv (GL_COLOR_MATERIAL),
1353	const_iv (GL_SMOOTH),	1844	const_iv (GL_SMOOTH),
1354	const_iv (GL_FLAT),	1845	const_iv (GL_FLAT),
1355	const_iv (GL_DITHER),	1846	const_iv (GL_DITHER),
1356	const_iv (GL_BLEND),	1847	const_iv (GL_BLEND),
		1848	const_iv (GL_CULL_FACE),
1357	const_iv (GL_SCISSOR_TEST),	1849	const_iv (GL_SCISSOR_TEST),
		1850	const_iv (GL_DEPTH_TEST),
		1851	const_iv (GL_ALPHA_TEST),
		1852	const_iv (GL_NORMALIZE),
		1853	const_iv (GL_RESCALE_NORMAL),
		1854	const_iv (GL_FRONT),
		1855	const_iv (GL_BACK),
1358	const_iv (GL_AND),	1856	const_iv (GL_AND),
1359	const_iv (GL_ONE),	1857	const_iv (GL_ONE),
1360	const_iv (GL_ZERO),	1858	const_iv (GL_ZERO),
1361	const_iv (GL_SRC_ALPHA),	1859	const_iv (GL_SRC_ALPHA),
1362	const_iv (GL_SRC_ALPHA_SATURATE),	1860	const_iv (GL_DST_ALPHA),
1363	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1861	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1364	const_iv (GL_ONE_MINUS_DST_ALPHA),	1862	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1863	const_iv (GL_SRC_ALPHA_SATURATE),
1365	const_iv (GL_RGB),	1864	const_iv (GL_RGB),
1366	const_iv (GL_RGBA),	1865	const_iv (GL_RGBA),
		1866	const_iv (GL_RGBA4),
		1867	const_iv (GL_RGBA8),
		1868	const_iv (GL_RGB5_A1),
1367	const_iv (GL_UNSIGNED_BYTE),	1869	const_iv (GL_UNSIGNED_BYTE),
		1870	const_iv (GL_UNSIGNED_SHORT),
		1871	const_iv (GL_UNSIGNED_INT),
1368	const_iv (GL_ALPHA),	1872	const_iv (GL_ALPHA),
		1873	const_iv (GL_INTENSITY),
		1874	const_iv (GL_LUMINANCE),
		1875	const_iv (GL_LUMINANCE_ALPHA),
1369	const_iv (GL_FLOAT),	1876	const_iv (GL_FLOAT),
1370	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1877	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1371	const_iv (GL_COMPILE),	1878	const_iv (GL_COMPILE),
1372	const_iv (GL_TEXTURE_1D),	1879	const_iv (GL_TEXTURE_1D),
1373	const_iv (GL_TEXTURE_2D),	1880	const_iv (GL_TEXTURE_2D),
…		…
1375	const_iv (GL_TEXTURE_MAG_FILTER),	1882	const_iv (GL_TEXTURE_MAG_FILTER),
1376	const_iv (GL_TEXTURE_MIN_FILTER),	1883	const_iv (GL_TEXTURE_MIN_FILTER),
1377	const_iv (GL_TEXTURE_ENV_MODE),	1884	const_iv (GL_TEXTURE_ENV_MODE),
1378	const_iv (GL_TEXTURE_WRAP_S),	1885	const_iv (GL_TEXTURE_WRAP_S),
1379	const_iv (GL_TEXTURE_WRAP_T),	1886	const_iv (GL_TEXTURE_WRAP_T),
		1887	const_iv (GL_REPEAT),
1380	const_iv (GL_CLAMP),	1888	const_iv (GL_CLAMP),
1381	const_iv (GL_REPEAT),	1889	const_iv (GL_CLAMP_TO_EDGE),
1382	const_iv (GL_NEAREST),	1890	const_iv (GL_NEAREST),
1383	const_iv (GL_LINEAR),	1891	const_iv (GL_LINEAR),
1384	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1892	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1385	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1893	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1386	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1894	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1387	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1895	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1388	const_iv (GL_GENERATE_MIPMAP),	1896	const_iv (GL_GENERATE_MIPMAP),
1389	const_iv (GL_MODULATE),	1897	const_iv (GL_MODULATE),
1390	const_iv (GL_DECAL),	1898	const_iv (GL_DECAL),
1391	const_iv (GL_REPLACE),	1899	const_iv (GL_REPLACE),
		1900	const_iv (GL_DEPTH_BUFFER_BIT),
1392	const_iv (GL_COLOR_BUFFER_BIT),	1901	const_iv (GL_COLOR_BUFFER_BIT),
1393	const_iv (GL_PROJECTION),	1902	const_iv (GL_PROJECTION),
1394	const_iv (GL_MODELVIEW),	1903	const_iv (GL_MODELVIEW),
1395	const_iv (GL_COLOR_LOGIC_OP),	1904	const_iv (GL_COLOR_LOGIC_OP),
1396	const_iv (GL_SEPARABLE_2D),	1905	const_iv (GL_SEPARABLE_2D),
1397	const_iv (GL_CONVOLUTION_2D),	1906	const_iv (GL_CONVOLUTION_2D),
1398	const_iv (GL_CONVOLUTION_BORDER_MODE),	1907	const_iv (GL_CONVOLUTION_BORDER_MODE),
1399	const_iv (GL_CONSTANT_BORDER),	1908	const_iv (GL_CONSTANT_BORDER),
1400	const_iv (GL_LINES),	1909	const_iv (GL_LINES),
		1910	const_iv (GL_LINE_STRIP),
		1911	const_iv (GL_LINE_LOOP),
1401	const_iv (GL_QUADS),	1912	const_iv (GL_QUADS),
1402	const_iv (GL_LINE_LOOP),	1913	const_iv (GL_QUAD_STRIP),
		1914	const_iv (GL_TRIANGLES),
		1915	const_iv (GL_TRIANGLE_STRIP),
		1916	const_iv (GL_TRIANGLE_FAN),
1403	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1917	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1404	const_iv (GL_FASTEST),	1918	const_iv (GL_FASTEST),
		1919	const_iv (GL_V2F),
		1920	const_iv (GL_V3F),
		1921	const_iv (GL_T2F_V3F),
		1922	const_iv (GL_T2F_N3F_V3F),
1405	# undef const_iv	1923	# undef const_iv
1406	};	1924	};
1407		1925
1408	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1926	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1409	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1927	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1410	}	1928	}
1411		1929
		1930	char *
		1931	gl_vendor ()
		1932	CODE:
		1933	RETVAL = (char *)glGetString (GL_VENDOR);
		1934	OUTPUT:
		1935	RETVAL
		1936
		1937	char *
		1938	gl_version ()
		1939	CODE:
		1940	RETVAL = (char *)glGetString (GL_VERSION);
		1941	OUTPUT:
		1942	RETVAL
		1943
		1944	char *
		1945	gl_extensions ()
		1946	CODE:
		1947	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1948	OUTPUT:
		1949	RETVAL
		1950
1412	int glGetError ()	1951	int glGetError ()
		1952
		1953	void glFinish ()
1413		1954
1414	void glClear (int mask)	1955	void glClear (int mask)
1415		1956
1416	void glClearColor (float r, float g, float b, float a = 1.0)	1957	void glClearColor (float r, float g, float b, float a = 1.0)
1417	PROTOTYPE: @	1958	PROTOTYPE: @
…		…
1424		1965
1425	void glHint (int target, int mode)	1966	void glHint (int target, int mode)
1426		1967
1427	void glBlendFunc (int sfactor, int dfactor)	1968	void glBlendFunc (int sfactor, int dfactor)
1428		1969
		1970	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1971	CODE:
		1972	gl_BlendFuncSeparate (sa, da, saa, daa);
		1973
		1974	void glDepthMask (int flag)
		1975
1429	void glLogicOp (int opcode)	1976	void glLogicOp (int opcode)
1430		1977
1431	void glColorMask (int red, int green, int blue, int alpha)	1978	void glColorMask (int red, int green, int blue, int alpha)
1432		1979
1433	void glMatrixMode (int mode)	1980	void glMatrixMode (int mode)
…		…
1436		1983
1437	void glPopMatrix ()	1984	void glPopMatrix ()
1438		1985
1439	void glLoadIdentity ()	1986	void glLoadIdentity ()
1440		1987
		1988	void glDrawBuffer (int buffer)
		1989
		1990	void glReadBuffer (int buffer)
		1991
1441	# near and far are due to microsofts buggy c compiler	1992	# near_ and far_ are due to microsofts buggy "c" compiler
		1993	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1994
		1995	# near_ and far_ are due to microsofts buggy "c" compiler
1442	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1996	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1443		1997
1444	void glViewport (int x, int y, int width, int height)	1998	void glViewport (int x, int y, int width, int height)
1445		1999
1446	void glScissor (int x, int y, int width, int height)	2000	void glScissor (int x, int y, int width, int height)
…		…
1461		2015
1462	void glEnd ()	2016	void glEnd ()
1463		2017
1464	void glColor (float r, float g, float b, float a = 1.0)	2018	void glColor (float r, float g, float b, float a = 1.0)
1465	PROTOTYPE: @	2019	PROTOTYPE: @
		2020	ALIAS:
		2021	glColor_premultiply = 1
1466	CODE:	2022	CODE:
1467	glColor4ub (r * 255., g * 255., b * 255., a * 255.);	2023	if (ix)
		2024	{
		2025	r *= a;
		2026	g *= a;
		2027	b *= a;
		2028	}
		2029	// microsoft visual "c" rounds instead of truncating...
		2030	glColor4f (r, g, b, a);
		2031
		2032	void glInterleavedArrays (int format, int stride, char *data)
		2033
		2034	void glDrawElements (int mode, int count, int type, char *indices)
		2035
		2036	# 1.2 void glDrawRangeElements (int mode, int start, int end
		2037
		2038	void glRasterPos (float x, float y, float z = 0.)
		2039	CODE:
		2040	glRasterPos3f (0, 0, z);
		2041	glBitmap (0, 0, 0, 0, x, y, 0);
1468		2042
1469	void glVertex (float x, float y, float z = 0.)	2043	void glVertex (float x, float y, float z = 0.)
1470	CODE:	2044	CODE:
1471	glVertex3f (x, y, z);	2045	glVertex3f (x, y, z);
1472		2046
…		…
1484		2058
1485	void glBindTexture (int target, int name)	2059	void glBindTexture (int target, int name)
1486		2060
1487	void glConvolutionParameter (int target, int pname, float params)	2061	void glConvolutionParameter (int target, int pname, float params)
1488	CODE:	2062	CODE:
1489	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2063	if (gl.ConvolutionParameterf)
		2064	gl.ConvolutionParameterf (target, pname, params);
1490		2065
1491	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2066	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1492	CODE:	2067	CODE:
1493	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2068	if (gl.ConvolutionFilter2D)
1494	(target, internalformat, width, height, format, type, data));	2069	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1495		2070
1496	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2071	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1497	CODE:	2072	CODE:
1498	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2073	if (gl.SeparableFilter2D)
1499	(target, internalformat, width, height, format, type, row, column));	2074	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1500		2075
1501	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2076	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1502		2077
1503	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2078	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1504		2079
1505	void glRasterPos (int x, int y)	2080	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1506	CODE:
1507	glRasterPos2i (x, y);
1508		2081
1509	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2082	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1510		2083
1511	int glGenTexture ()	2084	int glGenTexture ()
1512	CODE:	2085	CODE:

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.70 by root, Sun Apr 30 09:21:47 2006 UTC vs. Revision 1.153 by root, Tue Sep 19 22:02:38 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.70 by root, Sun Apr 30 09:21:47 2006 UTC vs.
Revision 1.153 by root, Tue Sep 19 22:02:38 2006 UTC