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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.74 by root, Sat May 6 20:14:57 2006 UTC vs.
Revision 1.152 by root, Sat Aug 19 18:18:36 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;
…		…
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;
…		…
509	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	624	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
510	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	625	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
511	break;	626	break;
512	}	627	}
513		628
514	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	629	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
515	}	630	}
516	}	631	}
517		632
518	int	633	int
519	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	634	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
532	CODE:	647	CODE:
533	#ifndef _WIN32	648	#ifndef _WIN32
534	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	649	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
535	#endif	650	#endif
536		651
537	char *
538	gl_version ()
539	CODE:
540	RETVAL = (char *)glGetString (GL_VERSION);
541	OUTPUT:
542	RETVAL
543
544	char *
545	gl_extensions ()
546	CODE:
547	RETVAL = (char *)glGetString (GL_EXTENSIONS);
548	OUTPUT:
549	RETVAL
550
551	void	652	void
552	add_font (char *file)	653	add_font (char *file)
553	CODE:	654	CODE:
554	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	655	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
555		656
556	void	657	void
557	load_image_inline (SV *image_)	658	load_image_inline (SV *image_)
558	ALIAS:	659	ALIAS:
559	load_image_file = 1	660	load_image_file = 1
…		…
601		702
602	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	703	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
603		704
604	assert (surface2->pitch == surface2->w * 4);	705	assert (surface2->pitch == surface2->w * 4);
605		706
		707	SDL_LockSurface (surface2);
606	EXTEND (SP, 5);	708	EXTEND (SP, 6);
607	PUSHs (sv_2mortal (newSViv (surface2->w)));	709	PUSHs (sv_2mortal (newSViv (surface2->w)));
608	PUSHs (sv_2mortal (newSViv (surface2->h)));	710	PUSHs (sv_2mortal (newSViv (surface2->h)));
609	SDL_LockSurface (surface2);
610	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	711	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
611	SDL_UnlockSurface (surface2);
612	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)));
613	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	713	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
614	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	714	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		715	SDL_UnlockSurface (surface2);
615		716
616	SDL_FreeSurface (surface);	717	SDL_FreeSurface (surface);
617	SDL_FreeSurface (surface2);	718	SDL_FreeSurface (surface2);
618	}	719	}
619		720
…		…
643	}	744	}
644		745
645	void	746	void
646	error (char *message)	747	error (char *message)
647	CODE:	748	CODE:
		749	fprintf (stderr, "ERROR: %s\n", message);
648	#ifdef _WIN32	750	#ifdef _WIN32
649	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	751	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
650	#else
651	fprintf (stderr, "ERROR: %s\n", message);
652	#endif	752	#endif
653		753
654	void	754	void
655	fatal (char *message)	755	fatal (char *message)
656	CODE:	756	CODE:
		757	fprintf (stderr, "FATAL: %s\n", message);
657	#ifdef _WIN32	758	#ifdef _WIN32
658	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	759	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
659	#else
660	fprintf (stderr, "FATAL: %s\n", message);
661	#endif	760	#endif
662	exit (1);	761	_exit (1);
663		762
		763	void
		764	_exit (int retval)
		765	CODE:
		766	_exit (retval);
		767
664	MODULE = CFClient PACKAGE = CFClient::Font	768	MODULE = CFPlus PACKAGE = CFPlus::Font
665		769
666	CFClient::Font	770	CFPlus::Font
667	new_from_file (SV class, char path, int id = 0)	771	new_from_file (SV class, char path, int id = 0)
668	CODE:	772	CODE:
669	{	773	{
670	int count;	774	int count;
671	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	775	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
674	}	778	}
675	OUTPUT:	779	OUTPUT:
676	RETVAL	780	RETVAL
677		781
678	void	782	void
679	DESTROY (CFClient::Font self)	783	DESTROY (CFPlus::Font self)
680	CODE:	784	CODE:
681	pango_font_description_free (self);	785	pango_font_description_free (self);
682		786
683	void	787	void
684	make_default (CFClient::Font self)	788	make_default (CFPlus::Font self)
685	CODE:	789	CODE:
686	default_font = self;	790	default_font = self;
687		791
688	MODULE = CFClient PACKAGE = CFClient::Layout	792	MODULE = CFPlus PACKAGE = CFPlus::Layout
689		793
690	CFClient::Layout	794	void
691	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)
692	CODE:	801	CODE:
693	New (0, RETVAL, 1, struct cf_layout);	802	New (0, RETVAL, 1, struct cf_layout);
		803
694	RETVAL->pl = pango_layout_new (context);	804	RETVAL->pl = pango_layout_new (opengl_context);
695	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;
696	RETVAL->font = 0;	810	RETVAL->font = 0;
		811
697	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	812	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
698	pango_layout_set_font_description (RETVAL->pl, default_font);	813	layout_update_font (RETVAL);
699	OUTPUT:	814	OUTPUT:
700	RETVAL	815	RETVAL
701		816
702	void	817	void
703	DESTROY (CFClient::Layout self)	818	DESTROY (CFPlus::Layout self)
704	CODE:	819	CODE:
705	g_object_unref (self->pl);	820	g_object_unref (self->pl);
706	Safefree (self);	821	Safefree (self);
707		822
708	void	823	void
709	set_text (CFClient::Layout self, SV *text_)	824	set_text (CFPlus::Layout self, SV *text_)
710	CODE:	825	CODE:
711	{	826	{
712	STRLEN textlen;	827	STRLEN textlen;
713	char *text = SvPVutf8 (text_, textlen);	828	char *text = SvPVutf8 (text_, textlen);
714		829
715	pango_layout_set_text (self->pl, text, textlen);	830	pango_layout_set_text (self->pl, text, textlen);
716	}	831	}
717		832
718	void	833	void
719	set_markup (CFClient::Layout self, SV *text_)	834	set_markup (CFPlus::Layout self, SV *text_)
720	CODE:	835	CODE:
721	{	836	{
722	STRLEN textlen;	837	STRLEN textlen;
723	char *text = SvPVutf8 (text_, textlen);	838	char *text = SvPVutf8 (text_, textlen);
724		839
725	pango_layout_set_markup (self->pl, text, textlen);	840	pango_layout_set_markup (self->pl, text, textlen);
726	}	841	}
727		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
728	SV *	928	SV *
729	get_text (CFClient::Layout self)	929	get_text (CFPlus::Layout self)
730	CODE:	930	CODE:
731	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	931	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
732	SvUTF8_on (RETVAL);	932	sv_utf8_decode (RETVAL);
733	OUTPUT:	933	OUTPUT:
734	RETVAL	934	RETVAL
735		935
736	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
737	set_font (CFClient::Layout self, CFClient::Font font = 0)	945	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
738	CODE:	946	CODE:
739	if (self->font != font)	947	if (self->font != font)
740	{	948	{
741	self->font = font;	949	self->font = font;
742	layout_update_font (self);	950	layout_update_font (self);
743	}	951	}
744		952
745	void	953	void
746	set_height (CFClient::Layout self, int base_height)	954	set_height (CFPlus::Layout self, int base_height)
747	CODE:	955	CODE:
748	if (self->base_height != base_height)	956	if (self->base_height != base_height)
749	{	957	{
750	self->base_height = base_height;	958	self->base_height = base_height;
751	layout_update_font (self);	959	layout_update_font (self);
752	}	960	}
753		961
754	void	962	void
755	set_width (CFClient::Layout self, int max_width = -1)	963	set_width (CFPlus::Layout self, int max_width = -1)
756	CODE:	964	CODE:
757	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);
758		966
759	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
760	size (CFClient::Layout self)	993	size (CFPlus::Layout self)
761	PPCODE:	994	PPCODE:
762	{	995	{
763	int w, h;	996	int w, h;
764		997
765	layout_get_pixel_size (self, &w, &h);	998	layout_get_pixel_size (self, &w, &h);
…		…
768	PUSHs (sv_2mortal (newSViv (w)));	1001	PUSHs (sv_2mortal (newSViv (w)));
769	PUSHs (sv_2mortal (newSViv (h)));	1002	PUSHs (sv_2mortal (newSViv (h)));
770	}	1003	}
771		1004
772	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
773	xy_to_index (CFClient::Layout self, int x, int y)	1018	xy_to_index (CFPlus::Layout self, int x, int y)
774	CODE:	1019	CODE:
775	{	1020	{
776	int index, trailing;	1021	int index, trailing;
777	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);
778	RETVAL = index;	1023	RETVAL = index;
779	}	1024	}
780	OUTPUT:	1025	OUTPUT:
781	RETVAL	1026	RETVAL
782		1027
783	void	1028	void
784	cursor_pos (CFClient::Layout self, int index)	1029	cursor_pos (CFPlus::Layout self, int index)
785	PPCODE:	1030	PPCODE:
786	{	1031	{
787	PangoRectangle strong_pos;	1032	PangoRectangle strong_pos;
788	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1033	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
789		1034
…		…
792	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1037	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
793	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1038	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
794	}	1039	}
795		1040
796	void	1041	void
797	render (CFClient::Layout self)	1042	render (CFPlus::Layout self, float x, float y, int flags = 0)
798	PPCODE:	1043	PPCODE:
799	{	1044	pango_opengl_render_layout_subpixel (
800	SV *retval;	1045	self->pl,
801	int w, h;	1046	x * PANGO_SCALE, y * PANGO_SCALE,
802	FT_Bitmap bitmap;	1047	self->r, self->g, self->b, self->a,
		1048	flags
		1049	);
803		1050
804	layout_get_pixel_size (self, &w, &h);	1051	MODULE = CFPlus PACKAGE = CFPlus::Texture
805		1052
806	retval = newSV (w * h);	1053	void
807	SvPOK_only (retval);	1054	pad2pot (SV data_, SV w_, SV *h_)
808	SvCUR_set (retval, w * h);	1055	CODE:
		1056	{
		1057	int ow = SvIV (w_);
		1058	int oh = SvIV (h_);
809		1059
810	bitmap.rows = h;	1060	if (ow && oh)
811	bitmap.width = w;	1061	{
812	bitmap.pitch = w;	1062	int nw = minpot (ow);
813	bitmap.buffer = (unsigned char*)SvPVX (retval);	1063	int nh = minpot (oh);
814	bitmap.num_grays = 256;
815	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
816		1064
817	memset (bitmap.buffer, 0, w * h);	1065	if (nw != ow \|\| nh != oh)
818		1066	{
819	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));
820		1073
821	EXTEND (SP, 3);	1074	SvPOK_only (result_);
822	PUSHs (sv_2mortal (newSViv (w)));	1075	SvCUR_set (result_, nw * nh * bpp);
823	PUSHs (sv_2mortal (newSViv (h)));
824	PUSHs (sv_2mortal (retval));
825	}
826		1076
827	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);
828		1080
		1081	sv_setsv (data_, result_);
		1082	}
		1083
		1084	sv_setiv (w_, nw);
		1085	sv_setiv (h_, nh);
		1086	}
		1087	}
		1088	}
		1089
829	void	1090	void
830	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.)
831	PROTOTYPE: $$$;$$	1092	PROTOTYPE: $$$;$$
		1093	ALIAS:
		1094	draw_quad_alpha = 1
		1095	draw_quad_alpha_premultiplied = 2
832	CODE:	1096	CODE:
833	{	1097	{
834	HV hv = (HV )SvRV (self);	1098	HV hv = (HV )SvRV (self);
835	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1099	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
836	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1100	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
837	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1101	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
838	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
839		1102
840	if (items < 5)	1103	if (items < 5)
841	{	1104	{
842	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1105	w = SvNV (*hv_fetch (hv, "w", 1, 1));
843	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1106	h = SvNV (*hv_fetch (hv, "h", 1, 1));
844	}	1107	}
845		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
846	glBindTexture (GL_TEXTURE_2D, name);	1123	glBindTexture (GL_TEXTURE_2D, name);
847	if (wrap_mode) {	1124
848	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
849	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
850	}
851	glBegin (GL_QUADS);	1125	glBegin (GL_QUADS);
852	glTexCoord2f (0, 0); glVertex2f (x , y );	1126	glTexCoord2f (0, 0); glVertex2f (x , y );
853	glTexCoord2f (0, t); glVertex2f (x , y + h);	1127	glTexCoord2f (0, t); glVertex2f (x , y + h);
854	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1128	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
855	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1129	glTexCoord2f (s, 0); glVertex2f (x + w, y );
856	glEnd ();	1130	glEnd ();
857	}
858		1131
		1132	if (ix)
		1133	{
		1134	glDisable (GL_ALPHA_TEST);
		1135	glDisable (GL_BLEND);
		1136	}
		1137	}
		1138
859	MODULE = CFClient PACKAGE = CFClient::Map	1139	MODULE = CFPlus PACKAGE = CFPlus::Map
860		1140
861	CFClient::Map	1141	CFPlus::Map
862	new (SV *class, int map_width, int map_height)	1142	new (SV *class, int map_width, int map_height)
863	CODE:	1143	CODE:
864	New (0, RETVAL, 1, struct map);	1144	New (0, RETVAL, 1, struct map);
865	RETVAL->x = 0;	1145	RETVAL->x = 0;
866	RETVAL->y = 0;	1146	RETVAL->y = 0;
…		…
876	RETVAL->row = 0;	1156	RETVAL->row = 0;
877	OUTPUT:	1157	OUTPUT:
878	RETVAL	1158	RETVAL
879		1159
880	void	1160	void
881	DESTROY (CFClient::Map self)	1161	DESTROY (CFPlus::Map self)
882	CODE:	1162	CODE:
883	{	1163	{
884	map_clear (self);	1164	map_clear (self);
885	Safefree (self->face);	1165	Safefree (self->face);
		1166	Safefree (self->tex);
886	Safefree (self);	1167	Safefree (self);
887	}	1168	}
888		1169
889	void	1170	void
890	clear (CFClient::Map self)	1171	clear (CFPlus::Map self)
891	CODE:	1172	CODE:
892	map_clear (self);	1173	map_clear (self);
893		1174
894	void	1175	void
895	set_face (CFClient::Map self, int face, int texid)	1176	set_face (CFPlus::Map self, int face, int texid)
896	CODE:	1177	CODE:
897	{	1178	{
898	while (self->faces <= face)	1179	while (self->faces <= face)
899	{	1180	{
900	Append (mapface, self->face, self->faces, self->faces);	1181	Append (mapface, self->face, self->faces, self->faces);
…		…
903		1184
904	self->face [face] = texid;	1185	self->face [face] = texid;
905	}	1186	}
906		1187
907	void	1188	void
908	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)
909	CODE:	1190	CODE:
910	{	1191	{
911	while (self->texs <= texid)	1192	while (self->texs <= texid)
912	{	1193	{
913	Append (maptex, self->tex, self->texs, self->texs);	1194	Append (maptex, self->tex, self->texs, self->texs);
…		…
925	tex->r = r;	1206	tex->r = r;
926	tex->g = g;	1207	tex->g = g;
927	tex->b = b;	1208	tex->b = b;
928	tex->a = a;	1209	tex->a = a;
929	}	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);
930	}	1220	}
931		1221
932	int	1222	int
933	ox (CFClient::Map self)	1223	ox (CFPlus::Map self)
934	ALIAS:	1224	ALIAS:
935	oy = 1	1225	oy = 1
		1226	x = 2
		1227	y = 3
		1228	w = 4
		1229	h = 5
936	CODE:	1230	CODE:
937	switch (ix)	1231	switch (ix)
938	{	1232	{
939	case 0: RETVAL = self->ox; break;	1233	case 0: RETVAL = self->ox; break;
940	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;
941	}	1239	}
942	OUTPUT:	1240	OUTPUT:
943	RETVAL	1241	RETVAL
944		1242
945	void	1243	void
946	scroll (CFClient::Map self, int dx, int dy)	1244	scroll (CFPlus::Map self, int dx, int dy)
947	CODE:	1245	CODE:
948	{	1246	{
949	if (dx > 0)	1247	if (dx > 0)
950	map_blank (self, self->x, self->y, dx - 1, self->h);	1248	map_blank (self, self->x, self->y, dx - 1, self->h);
951	else if (dx < 0)	1249	else if (dx < 0)
…		…
967	self->y += MAP_EXTEND_Y;	1265	self->y += MAP_EXTEND_Y;
968	}	1266	}
969	}	1267	}
970		1268
971	void	1269	void
972	map1a_update (CFClient::Map self, SV *data_)	1270	map1a_update (CFPlus::Map self, SV *data_, int extmap)
973	CODE:	1271	CODE:
974	{	1272	{
975	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1273	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
976	uint8_t data_end = (uint8_t )SvEND (data_);	1274	uint8_t data_end = (uint8_t )SvEND (data_);
977	mapcell *cell;	1275	mapcell *cell;
978	int x, y, flags;	1276	int x, y, flags;
979		1277
980	while (data < data_end)	1278	while (data < data_end - 1)
981	{	1279	{
982	flags = (data [0] << 8) + data [1]; data += 2;	1280	flags = (data [0] << 8) + data [1]; data += 2;
983		1281
984	x = ((flags >> 10) & 63) + self->x;	1282	x = self->x + ((flags >> 10) & 63);
985	y = ((flags >> 4) & 63) + self->y;	1283	y = self->y + ((flags >> 4) & 63);
986		1284
987	cell = map_get_cell (self, x, y);	1285	cell = map_get_cell (self, x, y);
988		1286
989	if (flags & 15)	1287	if (flags & 15)
990	{	1288	{
991	if (cell->darkness < 0)	1289	if (!cell->darkness)
992	{	1290	{
993	cell->darkness = 0;	1291	cell->darkness = 256;
994	cell->face [0] = 0;	1292	cell->face [0] = 0;
995	cell->face [1] = 0;	1293	cell->face [1] = 0;
996	cell->face [2] = 0;	1294	cell->face [2] = 0;
997	}	1295	}
998		1296
999	cell->darkness = flags & 8 ? *data++ : 255;
1000
1001	//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	}
1002		1329
1003	if (flags & 4)	1330	if (flags & 4)
1004	{	1331	{
1005	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;
1006	}	1333	}
…		…
1014	{	1341	{
1015	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;
1016	}	1343	}
1017	}	1344	}
1018	else	1345	else
		1346	{
1019	cell->darkness = -1;	1347	cell->darkness = 0;
		1348	cell->stat_hp = 0;
		1349	}
1020	}	1350	}
1021	}	1351	}
1022		1352
1023	SV *	1353	SV *
1024	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)
1025	CODE:	1355	CODE:
1026	{	1356	{
1027	int x1, x;	1357	int x1, x;
1028	int y1, y;	1358	int y1, y;
1029	int z;	1359	int z;
…		…
1079	}	1409	}
1080	OUTPUT:	1410	OUTPUT:
1081	RETVAL	1411	RETVAL
1082		1412
1083	void	1413	void
1084	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)
1085	PPCODE:	1415	CODE:
1086	{	1416	{
1087	int vx, vy;	1417	int vx, vy;
1088	int x, y, z;	1418	int x, y, z;
1089	int last_name;	1419	int last_name;
1090	mapface face;	1420	mapface face;
1091	int sw4 = (sw + 3) & ~3;
1092	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1093	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1094		1421
1095	memset (darkness, 255, sw4 * sh);
1096	SvPOK_only (darkness_sv);
1097	SvCUR_set (darkness_sv, sw4 * sh);
1098
1099	vx = self->x + (self->w - sw) / 2 - shift_x;	1422	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1100	vy = self->y + (self->h - sh) / 2 - shift_y;	1423	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1101		1424
1102	/*	1425	/*
1103	int vx = self->vx = self->w >= sw	1426	int vx = self->vx = self->w >= sw
1104	? self->x + (self->w - sw) / 2	1427	? self->x + (self->w - sw) / 2
1105	: 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));
…		…
1109	: 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));
1110	*/	1433	*/
1111		1434
1112	glColor4ub (255, 255, 255, 255);	1435	glColor4ub (255, 255, 255, 255);
1113		1436
		1437	glEnable (GL_BLEND);
1114	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1438	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1115	glEnable (GL_BLEND);
1116	glEnable (GL_TEXTURE_2D);	1439	glEnable (GL_TEXTURE_2D);
1117	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1440	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1118		1441
1119	glBegin (GL_QUADS);	1442	glBegin (GL_QUADS);
1120		1443
…		…
1129	for (x = 0; x < sw; x++)	1452	for (x = 0; x < sw; x++)
1130	if (row->c0 <= x + vx && x + vx < row->c1)	1453	if (row->c0 <= x + vx && x + vx < row->c1)
1131	{	1454	{
1132	mapcell *cell = row->col + (x + vx - row->c0);	1455	mapcell *cell = row->col + (x + vx - row->c0);
1133		1456
1134	darkness[y * sw4 + x] = cell->darkness < 0
1135	? 255 - FOW_DARKNESS
1136	: 255 - cell->darkness;
1137
1138	face = cell->face [z];	1457	face = cell->face [z];
1139		1458
1140	if (face)	1459	if (face && face < self->texs)
1141	{	1460	{
1142	maptex tex = self->tex [face];	1461	maptex tex = self->tex [face];
1143		1462
1144	int px = (x + 1) * 32 - tex.w;	1463	int px = (x + 1) * 32 - tex.w;
1145	int py = (y + 1) * 32 - tex.h;	1464	int py = (y + 1) * 32 - tex.h;
…		…
1163	glEnd ();	1482	glEnd ();
1164		1483
1165	glDisable (GL_TEXTURE_2D);	1484	glDisable (GL_TEXTURE_2D);
1166	glDisable (GL_BLEND);	1485	glDisable (GL_BLEND);
1167		1486
		1487	// top layer: overlays such as the health bar
		1488	for (y = 0; y < sh; y++)
		1489	if (0 <= y + vy && y + vy < self->rows)
		1490	{
		1491	maprow *row = self->row + (y + vy);
		1492
		1493	for (x = 0; x < sw; x++)
		1494	if (row->c0 <= x + vx && x + vx < row->c1)
		1495	{
		1496	mapcell *cell = row->col + (x + vx - row->c0);
		1497
		1498	int px = x * 32;
		1499	int py = y * 32;
		1500
		1501	if (cell->stat_hp)
		1502	{
		1503	int width = cell->stat_width * 32;
		1504	int thick = sh / 28 + 1 + cell->stat_width;
		1505
		1506	glColor3ub (0, 0, 0);
		1507	glRectf (px + 1, py - thick - 2,
		1508	px + width - 1, py);
		1509
		1510	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1511	glRectf (px + 2,
		1512	py - thick - 1,
		1513	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1514	}
		1515	}
		1516	}
		1517	}
		1518
		1519	void
		1520	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1521	CODE:
		1522	{
		1523	static float color[16][3] = {
		1524	{ 0.00F, 0.00F, 0.00F },
		1525	{ 1.00F, 1.00F, 1.00F },
		1526	{ 0.00F, 0.00F, 0.55F },
		1527	{ 1.00F, 0.00F, 0.00F },
		1528
		1529	{ 1.00F, 0.54F, 0.00F },
		1530	{ 0.11F, 0.56F, 1.00F },
		1531	{ 0.93F, 0.46F, 0.00F },
		1532	{ 0.18F, 0.54F, 0.34F },
		1533
		1534	{ 0.56F, 0.73F, 0.56F },
		1535	{ 0.80F, 0.80F, 0.80F },
		1536	{ 0.55F, 0.41F, 0.13F },
		1537	{ 0.99F, 0.77F, 0.26F },
		1538
		1539	{ 0.74F, 0.65F, 0.41F },
		1540
		1541	{ 0.00F, 1.00F, 1.00F },
		1542	{ 1.00F, 0.00F, 1.00F },
		1543	{ 1.00F, 1.00F, 0.00F },
		1544	};
		1545
		1546	int x, y;
		1547
		1548	glEnable (GL_TEXTURE_2D);
		1549	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1550	glEnable (GL_BLEND);
		1551	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1552	glBegin (GL_QUADS);
		1553
		1554	for (y = 0; y < h; y++)
		1555	for (x = 0; x < w; x++)
		1556	{
		1557	unsigned char m = data [x + y * w];
		1558
		1559	if (m)
		1560	{
		1561	float *c = color [m & 15];
		1562
		1563	float tx1 = m & 0x40 ? 0.5 : 0.;
		1564	float tx2 = tx1 + 0.5;
		1565
		1566	glColor4f (c[0], c[1], c[2], 0.75);
		1567	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1568	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1569	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1570	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1571	}
		1572	}
		1573
		1574	glEnd ();
		1575	glDisable (GL_BLEND);
		1576	glDisable (GL_TEXTURE_2D);
		1577	}
		1578
		1579	void
		1580	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1581	PPCODE:
		1582	{
		1583	int vx, vy;
		1584	int x, y;
		1585	int sw4 = (sw + 3) & ~3;
		1586	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1587	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1588
		1589	memset (darkness, 255, sw4 * sh);
		1590	SvPOK_only (darkness_sv);
		1591	SvCUR_set (darkness_sv, sw4 * sh);
		1592
		1593	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1594	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1595
		1596	for (y = 0; y < sh; y++)
		1597	if (0 <= y + vy && y + vy < self->rows)
		1598	{
		1599	maprow *row = self->row + (y + vy);
		1600
		1601	for (x = 0; x < sw; x++)
		1602	if (row->c0 <= x + vx && x + vx < row->c1)
		1603	{
		1604	mapcell *cell = row->col + (x + vx - row->c0);
		1605
		1606	darkness[y * sw4 + x] = cell->darkness
		1607	? 255 - (cell->darkness - 1)
		1608	: 255 - FOW_DARKNESS;
		1609	}
		1610	}
		1611
1168	EXTEND (SP, 3);	1612	EXTEND (SP, 3);
1169	PUSHs (sv_2mortal (newSViv (sw4)));	1613	PUSHs (sv_2mortal (newSViv (sw4)));
1170	PUSHs (sv_2mortal (newSViv (sh)));	1614	PUSHs (sv_2mortal (newSViv (sh)));
1171	PUSHs (darkness_sv);	1615	PUSHs (darkness_sv);
1172	}	1616	}
1173		1617
1174	SV *	1618	SV *
1175	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1619	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1176	CODE:	1620	CODE:
1177	{	1621	{
1178	int x, y, x1, y1;	1622	int x, y, x1, y1;
1179	SV data_sv = newSV (w h * 7 + 5);	1623	SV data_sv = newSV (w h * 7 + 5);
1180	uint8_t data = (uint8_t )SvPVX (data_sv);	1624	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1242	}	1686	}
1243	OUTPUT:	1687	OUTPUT:
1244	RETVAL	1688	RETVAL
1245		1689
1246	void	1690	void
1247	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1691	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1248	PPCODE:	1692	PPCODE:
1249	{	1693	{
1250	int x, y, z;	1694	int x, y, z;
1251	int w, h;	1695	int w, h;
1252	int x1, y1;	1696	int x1, y1;
…		…
1284		1728
1285	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1729	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1286	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1730	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1287	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1731	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1288		1732
1289	if (cell->darkness <= 0)	1733	if (cell->darkness == 0)
1290	{	1734	{
1291	cell->darkness = -1;	1735	cell->darkness = 0;
1292		1736
1293	for (z = 0; z <= 2; z++)	1737	for (z = 0; z <= 2; z++)
1294	{	1738	{
1295	cell->face[z] = face[z];	1739	cell->face[z] = face[z];
1296		1740
…		…
1301	}	1745	}
1302	}	1746	}
1303	}	1747	}
1304	}	1748	}
1305		1749
1306	MODULE = CFClient PACKAGE = CFClient::MixChunk	1750	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1307		1751
1308	CFClient::MixChunk	1752	CFPlus::MixChunk
1309	new_from_file (SV class, char path)	1753	new_from_file (SV class, char path)
1310	CODE:	1754	CODE:
1311	RETVAL = Mix_LoadWAV (path);	1755	RETVAL = Mix_LoadWAV (path);
1312	OUTPUT:	1756	OUTPUT:
1313	RETVAL	1757	RETVAL
1314		1758
1315	void	1759	void
1316	DESTROY (CFClient::MixChunk self)	1760	DESTROY (CFPlus::MixChunk self)
1317	CODE:	1761	CODE:
1318	Mix_FreeChunk (self);	1762	Mix_FreeChunk (self);
1319		1763
1320	int	1764	int
1321	volume (CFClient::MixChunk self, int volume = -1)	1765	volume (CFPlus::MixChunk self, int volume = -1)
1322	CODE:	1766	CODE:
1323	RETVAL = Mix_VolumeChunk (self, volume);	1767	RETVAL = Mix_VolumeChunk (self, volume);
1324	OUTPUT:	1768	OUTPUT:
1325	RETVAL	1769	RETVAL
1326		1770
1327	int	1771	int
1328	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1772	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1329	CODE:	1773	CODE:
1330	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1774	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1331	OUTPUT:	1775	OUTPUT:
1332	RETVAL	1776	RETVAL
1333		1777
1334	MODULE = CFClient PACKAGE = CFClient::MixMusic	1778	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1335		1779
1336	int	1780	int
1337	volume (int volume = -1)	1781	volume (int volume = -1)
1338	CODE:	1782	CODE:
1339	RETVAL = Mix_VolumeMusic (volume);	1783	RETVAL = Mix_VolumeMusic (volume);
1340	OUTPUT:	1784	OUTPUT:
1341	RETVAL	1785	RETVAL
1342		1786
1343	CFClient::MixMusic	1787	CFPlus::MixMusic
1344	new_from_file (SV class, char path)	1788	new_from_file (SV class, char path)
1345	CODE:	1789	CODE:
1346	RETVAL = Mix_LoadMUS (path);	1790	RETVAL = Mix_LoadMUS (path);
1347	OUTPUT:	1791	OUTPUT:
1348	RETVAL	1792	RETVAL
1349		1793
1350	void	1794	void
1351	DESTROY (CFClient::MixMusic self)	1795	DESTROY (CFPlus::MixMusic self)
1352	CODE:	1796	CODE:
1353	Mix_FreeMusic (self);	1797	Mix_FreeMusic (self);
1354		1798
1355	int	1799	int
1356	play (CFClient::MixMusic self, int loops = -1)	1800	play (CFPlus::MixMusic self, int loops = -1)
1357	CODE:	1801	CODE:
1358	RETVAL = Mix_PlayMusic (self, loops);	1802	RETVAL = Mix_PlayMusic (self, loops);
1359	OUTPUT:	1803	OUTPUT:
1360	RETVAL	1804	RETVAL
1361		1805
1362	MODULE = CFClient PACKAGE = CFClient::OpenGL	1806	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1363		1807
1364	BOOT:	1808	BOOT:
1365	{	1809	{
1366	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1810	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1367	static const struct {	1811	static const struct {
1368	const char *name;	1812	const char *name;
1369	IV iv;	1813	IV iv;
1370	} *civ, const_iv[] = {	1814	} *civ, const_iv[] = {
1371	# define const_iv(name) { # name, (IV)name }	1815	# define const_iv(name) { # name, (IV)name }
1372	const_iv (GL_COLOR_MATERIAL),	1816	const_iv (GL_COLOR_MATERIAL),
1373	const_iv (GL_SMOOTH),	1817	const_iv (GL_SMOOTH),
1374	const_iv (GL_FLAT),	1818	const_iv (GL_FLAT),
1375	const_iv (GL_DITHER),	1819	const_iv (GL_DITHER),
1376	const_iv (GL_BLEND),	1820	const_iv (GL_BLEND),
		1821	const_iv (GL_CULL_FACE),
1377	const_iv (GL_SCISSOR_TEST),	1822	const_iv (GL_SCISSOR_TEST),
		1823	const_iv (GL_DEPTH_TEST),
		1824	const_iv (GL_ALPHA_TEST),
		1825	const_iv (GL_NORMALIZE),
		1826	const_iv (GL_RESCALE_NORMAL),
		1827	const_iv (GL_FRONT),
		1828	const_iv (GL_BACK),
1378	const_iv (GL_AND),	1829	const_iv (GL_AND),
1379	const_iv (GL_ONE),	1830	const_iv (GL_ONE),
1380	const_iv (GL_ZERO),	1831	const_iv (GL_ZERO),
1381	const_iv (GL_SRC_ALPHA),	1832	const_iv (GL_SRC_ALPHA),
1382	const_iv (GL_SRC_ALPHA_SATURATE),	1833	const_iv (GL_DST_ALPHA),
1383	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1834	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1384	const_iv (GL_ONE_MINUS_DST_ALPHA),	1835	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1836	const_iv (GL_SRC_ALPHA_SATURATE),
1385	const_iv (GL_RGB),	1837	const_iv (GL_RGB),
1386	const_iv (GL_RGBA),	1838	const_iv (GL_RGBA),
		1839	const_iv (GL_RGBA4),
		1840	const_iv (GL_RGBA8),
		1841	const_iv (GL_RGB5_A1),
1387	const_iv (GL_UNSIGNED_BYTE),	1842	const_iv (GL_UNSIGNED_BYTE),
		1843	const_iv (GL_UNSIGNED_SHORT),
		1844	const_iv (GL_UNSIGNED_INT),
1388	const_iv (GL_ALPHA),	1845	const_iv (GL_ALPHA),
		1846	const_iv (GL_INTENSITY),
		1847	const_iv (GL_LUMINANCE),
		1848	const_iv (GL_LUMINANCE_ALPHA),
1389	const_iv (GL_FLOAT),	1849	const_iv (GL_FLOAT),
1390	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1850	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1391	const_iv (GL_COMPILE),	1851	const_iv (GL_COMPILE),
1392	const_iv (GL_TEXTURE_1D),	1852	const_iv (GL_TEXTURE_1D),
1393	const_iv (GL_TEXTURE_2D),	1853	const_iv (GL_TEXTURE_2D),
…		…
1395	const_iv (GL_TEXTURE_MAG_FILTER),	1855	const_iv (GL_TEXTURE_MAG_FILTER),
1396	const_iv (GL_TEXTURE_MIN_FILTER),	1856	const_iv (GL_TEXTURE_MIN_FILTER),
1397	const_iv (GL_TEXTURE_ENV_MODE),	1857	const_iv (GL_TEXTURE_ENV_MODE),
1398	const_iv (GL_TEXTURE_WRAP_S),	1858	const_iv (GL_TEXTURE_WRAP_S),
1399	const_iv (GL_TEXTURE_WRAP_T),	1859	const_iv (GL_TEXTURE_WRAP_T),
		1860	const_iv (GL_REPEAT),
1400	const_iv (GL_CLAMP),	1861	const_iv (GL_CLAMP),
1401	const_iv (GL_REPEAT),	1862	const_iv (GL_CLAMP_TO_EDGE),
1402	const_iv (GL_NEAREST),	1863	const_iv (GL_NEAREST),
1403	const_iv (GL_LINEAR),	1864	const_iv (GL_LINEAR),
1404	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1865	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1405	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1866	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1406	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1867	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1407	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1868	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1408	const_iv (GL_GENERATE_MIPMAP),	1869	const_iv (GL_GENERATE_MIPMAP),
1409	const_iv (GL_MODULATE),	1870	const_iv (GL_MODULATE),
1410	const_iv (GL_DECAL),	1871	const_iv (GL_DECAL),
1411	const_iv (GL_REPLACE),	1872	const_iv (GL_REPLACE),
		1873	const_iv (GL_DEPTH_BUFFER_BIT),
1412	const_iv (GL_COLOR_BUFFER_BIT),	1874	const_iv (GL_COLOR_BUFFER_BIT),
1413	const_iv (GL_PROJECTION),	1875	const_iv (GL_PROJECTION),
1414	const_iv (GL_MODELVIEW),	1876	const_iv (GL_MODELVIEW),
1415	const_iv (GL_COLOR_LOGIC_OP),	1877	const_iv (GL_COLOR_LOGIC_OP),
1416	const_iv (GL_SEPARABLE_2D),	1878	const_iv (GL_SEPARABLE_2D),
1417	const_iv (GL_CONVOLUTION_2D),	1879	const_iv (GL_CONVOLUTION_2D),
1418	const_iv (GL_CONVOLUTION_BORDER_MODE),	1880	const_iv (GL_CONVOLUTION_BORDER_MODE),
1419	const_iv (GL_CONSTANT_BORDER),	1881	const_iv (GL_CONSTANT_BORDER),
1420	const_iv (GL_LINES),	1882	const_iv (GL_LINES),
		1883	const_iv (GL_LINE_STRIP),
		1884	const_iv (GL_LINE_LOOP),
1421	const_iv (GL_QUADS),	1885	const_iv (GL_QUADS),
1422	const_iv (GL_LINE_LOOP),	1886	const_iv (GL_QUAD_STRIP),
		1887	const_iv (GL_TRIANGLES),
		1888	const_iv (GL_TRIANGLE_STRIP),
		1889	const_iv (GL_TRIANGLE_FAN),
1423	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1890	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1424	const_iv (GL_FASTEST),	1891	const_iv (GL_FASTEST),
		1892	const_iv (GL_V2F),
		1893	const_iv (GL_V3F),
		1894	const_iv (GL_T2F_V3F),
		1895	const_iv (GL_T2F_N3F_V3F),
1425	# undef const_iv	1896	# undef const_iv
1426	};	1897	};
1427		1898
1428	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1899	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1429	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1900	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1430	}	1901	}
1431		1902
		1903	char *
		1904	gl_vendor ()
		1905	CODE:
		1906	RETVAL = (char *)glGetString (GL_VENDOR);
		1907	OUTPUT:
		1908	RETVAL
		1909
		1910	char *
		1911	gl_version ()
		1912	CODE:
		1913	RETVAL = (char *)glGetString (GL_VERSION);
		1914	OUTPUT:
		1915	RETVAL
		1916
		1917	char *
		1918	gl_extensions ()
		1919	CODE:
		1920	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1921	OUTPUT:
		1922	RETVAL
		1923
1432	int glGetError ()	1924	int glGetError ()
		1925
		1926	void glFinish ()
1433		1927
1434	void glClear (int mask)	1928	void glClear (int mask)
1435		1929
1436	void glClearColor (float r, float g, float b, float a = 1.0)	1930	void glClearColor (float r, float g, float b, float a = 1.0)
1437	PROTOTYPE: @	1931	PROTOTYPE: @
…		…
1444		1938
1445	void glHint (int target, int mode)	1939	void glHint (int target, int mode)
1446		1940
1447	void glBlendFunc (int sfactor, int dfactor)	1941	void glBlendFunc (int sfactor, int dfactor)
1448		1942
		1943	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1944	CODE:
		1945	gl_BlendFuncSeparate (sa, da, saa, daa);
		1946
		1947	void glDepthMask (int flag)
		1948
1449	void glLogicOp (int opcode)	1949	void glLogicOp (int opcode)
1450		1950
1451	void glColorMask (int red, int green, int blue, int alpha)	1951	void glColorMask (int red, int green, int blue, int alpha)
1452		1952
1453	void glMatrixMode (int mode)	1953	void glMatrixMode (int mode)
…		…
1456		1956
1457	void glPopMatrix ()	1957	void glPopMatrix ()
1458		1958
1459	void glLoadIdentity ()	1959	void glLoadIdentity ()
1460		1960
		1961	void glDrawBuffer (int buffer)
		1962
		1963	void glReadBuffer (int buffer)
		1964
1461	# near and far are due to microsofts buggy c compiler	1965	# near_ and far_ are due to microsofts buggy "c" compiler
		1966	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1967
		1968	# near_ and far_ are due to microsofts buggy "c" compiler
1462	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1969	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1463		1970
1464	void glViewport (int x, int y, int width, int height)	1971	void glViewport (int x, int y, int width, int height)
1465		1972
1466	void glScissor (int x, int y, int width, int height)	1973	void glScissor (int x, int y, int width, int height)
…		…
1481		1988
1482	void glEnd ()	1989	void glEnd ()
1483		1990
1484	void glColor (float r, float g, float b, float a = 1.0)	1991	void glColor (float r, float g, float b, float a = 1.0)
1485	PROTOTYPE: @	1992	PROTOTYPE: @
		1993	ALIAS:
		1994	glColor_premultiply = 1
1486	CODE:	1995	CODE:
1487	glColor4ub (r * 255., g * 255., b * 255., a * 255.);	1996	if (ix)
		1997	{
		1998	r *= a;
		1999	g *= a;
		2000	b *= a;
		2001	}
		2002	// microsoft visual "c" rounds instead of truncating...
		2003	glColor4f (r, g, b, a);
		2004
		2005	void glInterleavedArrays (int format, int stride, char *data)
		2006
		2007	void glDrawElements (int mode, int count, int type, char *indices)
		2008
		2009	# 1.2 void glDrawRangeElements (int mode, int start, int end
		2010
		2011	void glRasterPos (float x, float y, float z = 0.)
		2012	CODE:
		2013	glRasterPos3f (0, 0, z);
		2014	glBitmap (0, 0, 0, 0, x, y, 0);
1488		2015
1489	void glVertex (float x, float y, float z = 0.)	2016	void glVertex (float x, float y, float z = 0.)
1490	CODE:	2017	CODE:
1491	glVertex3f (x, y, z);	2018	glVertex3f (x, y, z);
1492		2019
…		…
1504		2031
1505	void glBindTexture (int target, int name)	2032	void glBindTexture (int target, int name)
1506		2033
1507	void glConvolutionParameter (int target, int pname, float params)	2034	void glConvolutionParameter (int target, int pname, float params)
1508	CODE:	2035	CODE:
1509	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2036	if (gl.ConvolutionParameterf)
		2037	gl.ConvolutionParameterf (target, pname, params);
1510		2038
1511	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2039	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1512	CODE:	2040	CODE:
1513	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2041	if (gl.ConvolutionFilter2D)
1514	(target, internalformat, width, height, format, type, data));	2042	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1515		2043
1516	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2044	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1517	CODE:	2045	CODE:
1518	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2046	if (gl.SeparableFilter2D)
1519	(target, internalformat, width, height, format, type, row, column));	2047	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1520		2048
1521	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2049	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1522		2050
1523	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2051	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1524		2052
1525	void glRasterPos (int x, int y)	2053	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1526	CODE:
1527	glRasterPos2i (x, y);
1528		2054
1529	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2055	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1530		2056
1531	int glGenTexture ()	2057	int glGenTexture ()
1532	CODE:	2058	CODE:

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.74 by root, Sat May 6 20:14:57 2006 UTC vs. Revision 1.152 by root, Sat Aug 19 18:18:36 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.74 by root, Sat May 6 20:14:57 2006 UTC vs.
Revision 1.152 by root, Sat Aug 19 18:18:36 2006 UTC