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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.71 by root, Fri May 5 19:05:47 2006 UTC vs. Revision 1.150 by root, Sat Aug 19 17:24:39 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.71 by root, Fri May 5 19:05:47 2006 UTC vs.
Revision 1.150 by root, Sat Aug 19 17:24:39 2006 UTC