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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.75 by root, Mon May 8 18:28:40 2006 UTC vs.
Revision 1.148 by root, Sat Aug 19 03:57:25 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>
3	# pragma warning(disable:4244)	6	# pragma warning(disable:4244)
4	#endif	7	#endif
5		8
6	#include "EXTERN.h"	9	#include "EXTERN.h"
7	#include "perl.h"	10	#include "perl.h"
8	#include "XSUB.h"	11	#include "XSUB.h"
9		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
		17	#include <math.h>
10	#include <string.h>	18	#include <string.h>
11	#include <stdio.h>	19	#include <stdio.h>
		20	#include <stdlib.h>
12		21
13	#include <SDL.h>	22	#include <SDL.h>
		23	#include <SDL_endian.h>
14	#include <SDL_image.h>	24	#include <SDL_image.h>
15	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
16	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
17		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
18	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
19		32
20	#include <pango/pango.h>	33	#include <pango/pango.h>
21	#include <pango/pangofc-fontmap.h>
22	#include <pango/pangoft2.h>
23		34
24	#ifndef _WIN32	35	#ifndef _WIN32
25	# include <sys/types.h>	36	# include <sys/types.h>
26	# include <sys/socket.h>	37	# include <sys/socket.h>
27	# include <netinet/in.h>	38	# include <netinet/in.h>
34	typedef signed char int8_t;	45	typedef signed char int8_t;
35	typedef signed short int16_t;	46	typedef signed short int16_t;
36	typedef signed int int32_t;	47	typedef signed int int32_t;
37	#endif	48	#endif
38		49
39	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
40		51
41	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
42		53
43	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
44	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
45		56
46	#define MIN_FONT_HEIGHT 10	57	#define MIN_FONT_HEIGHT 10
47		58
48	#define GL_CALL(type,func,args) \	59	#if 0
49	{ \	60	# define PARACHUTE SDL_INIT_NOPARACHUTE
50	static int init_; \	61	#else
51	static type fptr_; \	62	# define PARACHUTE 0
52	\	63	#endif
53	if (!init_) \
54	{ \
55	init_ = 1; \
56	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
57	} \
58	\
59	if (fptr_) \
60	fptr_ args; \
61	}
62		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
63	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
64	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
65		90
66	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	}
67		110
68	typedef struct cf_layout {	111	typedef struct cf_layout {
69	PangoLayout *pl;	112	PangoLayout *pl;
		113	float r, g, b, a; // default color for rgba mode
70	int base_height;	114	int base_height;
71	CFClient__Font font;	115	CFPlus__Font font;
72	} *CFClient__Layout;	116	} *CFPlus__Layout;
73		117
74	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
75	static PangoContext *context;	119	static PangoContext *opengl_context;
76	static PangoFontMap *fontmap;	120	static PangoFontMap *opengl_fontmap;
77		121
78	static void	122	static void
79	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
80	{	124	{
81	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
82	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
83	}	130	}
84		131
85	static void	132	static void
86	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
87	{	134	{
88	/* 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
89	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
90	*/	137	*/
91	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
95		142
96	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
97	}	144	}
98		145
99	static void	146	static void
100	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
101	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
102	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
103		153
104	w = (w + 3) & ~3;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
105	if (!w) w = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
106	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;
107	}	162	}
108		163
109	typedef uint16_t mapface;	164	typedef uint16_t mapface;
110		165
111	typedef struct {	166	typedef struct {
…		…
114	float s, t;	169	float s, t;
115	uint8_t r, g, b, a;	170	uint8_t r, g, b, a;
116	} maptex;	171	} maptex;
117		172
118	typedef struct {	173	typedef struct {
119	int16_t darkness;	174	uint16_t darkness;
120	mapface face[3];	175	mapface face[3];
		176	uint8_t stat_width, stat_hp;
121	} mapcell;	177	} mapcell;
122		178
123	typedef struct {	179	typedef struct {
124	int32_t c0, c1;	180	int32_t c0, c1;
125	mapcell *col;	181	mapcell *col;
…		…
134	int texs;	190	int texs;
135	maptex *tex;	191	maptex *tex;
136		192
137	int32_t rows;	193	int32_t rows;
138	maprow *row;	194	maprow *row;
139	} *CFClient__Map;	195	} *CFPlus__Map;
140		196
141	static char *	197	static char *
142	prepend (char *ptr, int sze, int inc)	198	prepend (char *ptr, int sze, int inc)
143	{	199	{
144	char *p;	200	char *p;
…		…
162		218
163	#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))
164	#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))
165		221
166	static maprow *	222	static maprow *
167	map_get_row (CFClient__Map self, int y)	223	map_get_row (CFPlus__Map self, int y)
168	{	224	{
169	if (0 > y)	225	if (0 > y)
170	{	226	{
171	int extend = - y + MAP_EXTEND_Y;	227	int extend = - y + MAP_EXTEND_Y;
172	Prepend (maprow, self->row, self->rows, extend);	228	Prepend (maprow, self->row, self->rows, extend);
…		…
210		266
211	return row->col + (x - row->c0);	267	return row->col + (x - row->c0);
212	}	268	}
213		269
214	static mapcell *	270	static mapcell *
215	map_get_cell (CFClient__Map self, int x, int y)	271	map_get_cell (CFPlus__Map self, int x, int y)
216	{	272	{
217	return row_get_cell (map_get_row (self, y), x);	273	return row_get_cell (map_get_row (self, y), x);
218	}	274	}
219		275
220	static void	276	static void
221	map_clear (CFClient__Map self)	277	map_clear (CFPlus__Map self)
222	{	278	{
223	int r;	279	int r;
224		280
225	for (r = 0; r < self->rows; r++)	281	for (r = 0; r < self->rows; r++)
226	Safefree (self->row[r].col);	282	Safefree (self->row[r].col);
…		…
234	self->row = 0;	290	self->row = 0;
235	self->rows = 0;	291	self->rows = 0;
236	}	292	}
237		293
238	static void	294	static void
239	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)
240	{	296	{
241	int x, y;	297	int x, y;
242	maprow *row;	298	maprow *row;
		299	mapcell *cell;
243		300
244	for (y = y0; y < y0 + h; y++)	301	for (y = y0; y < y0 + h; y++)
245	if (y >= 0)	302	if (y >= 0)
246	{	303	{
247	if (y >= self->rows)	304	if (y >= self->rows)
…		…
253	if (x >= row->c0)	310	if (x >= row->c0)
254	{	311	{
255	if (x >= row->c1)	312	if (x >= row->c1)
256	break;	313	break;
257		314
258	row->col[x - row->c0].darkness = -1;	315	cell = row->col + x - row->c0;
		316
		317	cell->darkness = 0;
		318	cell->stat_hp = 0;
259	}	319	}
260	}	320	}
261	}	321	}
262		322
263	static void	323	static void
…		…
284	ev.data2 = 0;	344	ev.data2 = 0;
285		345
286	SDL_PushEvent ((SDL_Event *)&ev);	346	SDL_PushEvent ((SDL_Event *)&ev);
287	}	347	}
288		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
289	MODULE = CFClient PACKAGE = CFClient	366	MODULE = CFPlus PACKAGE = CFPlus
290		367
291	PROTOTYPES: ENABLE	368	PROTOTYPES: ENABLE
292		369
293	BOOT:	370	BOOT:
294	{	371	{
295	HV *stash = gv_stashpv ("CFClient", 1);	372	HV *stash = gv_stashpv ("CFPlus", 1);
296	static const struct {	373	static const struct {
297	const char *name;	374	const char *name;
298	IV iv;	375	IV iv;
299	} *civ, const_iv[] = {	376	} *civ, const_iv[] = {
300	# define const_iv(name) { # name, (IV)name }	377	# define const_iv(name) { # name, (IV)name }
…		…
399	# undef const_iv	476	# undef const_iv
400	};	477	};
401		478
402	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; )
403	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	480	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
404
405	fontmap = pango_ft2_font_map_new ();
406	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
407	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
408	}	481	}
409		482
410	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
411	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	504	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
412		505
413	void	506	void
414	SDL_Quit ()	507	SDL_Quit ()
415		508
416	void	509	void
…		…
422	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	515	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
423	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	516	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
424	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	517	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
425	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	518	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
426		519
		520	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		521	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		522
427	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	523	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
428	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	524	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
429	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	525	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
430	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
431		527
432	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	528	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		529	#if SDL_VERSION_ATLEAST(1,2,10)
433	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	530	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
434	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	531	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		532	#endif
435		533
436	SDL_EnableUNICODE (1);	534	SDL_EnableUNICODE (1);
437	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	535	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
438		536
439	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	537	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
448		546
449	++m;	547	++m;
450	}	548	}
451	}	549	}
452		550
		551	char *
		552	SDL_GetError ()
		553
453	int	554	int
454	SDL_SetVideoMode (int w, int h, int fullscreen)	555	SDL_SetVideoMode (int w, int h, int fullscreen)
455	CODE:	556	CODE:
456	RETVAL = !!SDL_SetVideoMode (	557	RETVAL = !!SDL_SetVideoMode (
457	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	558	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
458	);	559	);
		560	if (RETVAL)
		561	{
459	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	}
460	OUTPUT:	567	OUTPUT:
461	RETVAL	568	RETVAL
462		569
463	void	570	void
464	SDL_GL_SwapBuffers ()	571	SDL_GL_SwapBuffers ()
		572
		573	char *
		574	SDL_GetKeyName (int sym)
465		575
466	void	576	void
467	SDL_PollEvent ()	577	SDL_PollEvent ()
468	PPCODE:	578	PPCODE:
469	{	579	{
…		…
488	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	598	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
489	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	599	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
490	break;	600	break;
491		601
492	case SDL_MOUSEMOTION:	602	case SDL_MOUSEMOTION:
		603	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		604
493	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	605	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
494	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	606	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
495	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	607	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
496	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	608	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
497	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	609	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
498	break;	610	break;
499		611
500	case SDL_MOUSEBUTTONDOWN:	612	case SDL_MOUSEBUTTONDOWN:
501	case SDL_MOUSEBUTTONUP:	613	case SDL_MOUSEBUTTONUP:
		614	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		615
502	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	616	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
503	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	617	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
504	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	618	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
505	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	619	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
506	break;	620	break;
…		…
510	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	624	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
511	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	625	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
512	break;	626	break;
513	}	627	}
514		628
515	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	629	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
516	}	630	}
517	}	631	}
518		632
519	int	633	int
520	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)
…		…
533	CODE:	647	CODE:
534	#ifndef _WIN32	648	#ifndef _WIN32
535	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	649	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
536	#endif	650	#endif
537		651
538	char *
539	gl_version ()
540	CODE:
541	RETVAL = (char *)glGetString (GL_VERSION);
542	OUTPUT:
543	RETVAL
544
545	char *
546	gl_extensions ()
547	CODE:
548	RETVAL = (char *)glGetString (GL_EXTENSIONS);
549	OUTPUT:
550	RETVAL
551
552	void	652	void
553	add_font (char *file)	653	add_font (char *file)
554	CODE:	654	CODE:
555	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	655	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
556		656
557	void	657	void
558	load_image_inline (SV *image_)	658	load_image_inline (SV *image_)
559	ALIAS:	659	ALIAS:
560	load_image_file = 1	660	load_image_file = 1
…		…
602		702
603	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	703	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
604		704
605	assert (surface2->pitch == surface2->w * 4);	705	assert (surface2->pitch == surface2->w * 4);
606		706
		707	SDL_LockSurface (surface2);
607	EXTEND (SP, 5);	708	EXTEND (SP, 6);
608	PUSHs (sv_2mortal (newSViv (surface2->w)));	709	PUSHs (sv_2mortal (newSViv (surface2->w)));
609	PUSHs (sv_2mortal (newSViv (surface2->h)));	710	PUSHs (sv_2mortal (newSViv (surface2->h)));
610	SDL_LockSurface (surface2);
611	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	711	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
612	SDL_UnlockSurface (surface2);
613	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)));
614	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	713	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
615	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	714	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		715	SDL_UnlockSurface (surface2);
616		716
617	SDL_FreeSurface (surface);	717	SDL_FreeSurface (surface);
618	SDL_FreeSurface (surface2);	718	SDL_FreeSurface (surface2);
619	}	719	}
620		720
…		…
644	}	744	}
645		745
646	void	746	void
647	error (char *message)	747	error (char *message)
648	CODE:	748	CODE:
		749	fprintf (stderr, "ERROR: %s\n", message);
649	#ifdef _WIN32	750	#ifdef _WIN32
650	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	751	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
651	#else
652	fprintf (stderr, "ERROR: %s\n", message);
653	#endif	752	#endif
654		753
655	void	754	void
656	fatal (char *message)	755	fatal (char *message)
657	CODE:	756	CODE:
		757	fprintf (stderr, "FATAL: %s\n", message);
658	#ifdef _WIN32	758	#ifdef _WIN32
659	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	759	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
660	#else
661	fprintf (stderr, "FATAL: %s\n", message);
662	#endif	760	#endif
663	exit (1);	761	_exit (1);
664		762
		763	void
		764	_exit (int retval)
		765	CODE:
		766	_exit (retval);
		767
665	MODULE = CFClient PACKAGE = CFClient::Font	768	MODULE = CFPlus PACKAGE = CFPlus::Font
666		769
667	CFClient::Font	770	CFPlus::Font
668	new_from_file (SV class, char path, int id = 0)	771	new_from_file (SV class, char path, int id = 0)
669	CODE:	772	CODE:
670	{	773	{
671	int count;	774	int count;
672	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	775	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
675	}	778	}
676	OUTPUT:	779	OUTPUT:
677	RETVAL	780	RETVAL
678		781
679	void	782	void
680	DESTROY (CFClient::Font self)	783	DESTROY (CFPlus::Font self)
681	CODE:	784	CODE:
682	pango_font_description_free (self);	785	pango_font_description_free (self);
683		786
684	void	787	void
685	make_default (CFClient::Font self)	788	make_default (CFPlus::Font self)
686	CODE:	789	CODE:
687	default_font = self;	790	default_font = self;
688		791
689	MODULE = CFClient PACKAGE = CFClient::Layout	792	MODULE = CFPlus PACKAGE = CFPlus::Layout
690		793
691	CFClient::Layout	794	void
692	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)
693	CODE:	801	CODE:
694	New (0, RETVAL, 1, struct cf_layout);	802	New (0, RETVAL, 1, struct cf_layout);
		803
695	RETVAL->pl = pango_layout_new (context);	804	RETVAL->pl = pango_layout_new (opengl_context);
696	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;
697	RETVAL->font = 0;	810	RETVAL->font = 0;
		811
698	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	812	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
699	pango_layout_set_font_description (RETVAL->pl, default_font);	813	layout_update_font (RETVAL);
700	OUTPUT:	814	OUTPUT:
701	RETVAL	815	RETVAL
702		816
703	void	817	void
704	DESTROY (CFClient::Layout self)	818	DESTROY (CFPlus::Layout self)
705	CODE:	819	CODE:
706	g_object_unref (self->pl);	820	g_object_unref (self->pl);
707	Safefree (self);	821	Safefree (self);
708		822
709	void	823	void
710	set_text (CFClient::Layout self, SV *text_)	824	set_text (CFPlus::Layout self, SV *text_)
711	CODE:	825	CODE:
712	{	826	{
713	STRLEN textlen;	827	STRLEN textlen;
714	char *text = SvPVutf8 (text_, textlen);	828	char *text = SvPVutf8 (text_, textlen);
715		829
716	pango_layout_set_text (self->pl, text, textlen);	830	pango_layout_set_text (self->pl, text, textlen);
717	}	831	}
718		832
719	void	833	void
720	set_markup (CFClient::Layout self, SV *text_)	834	set_markup (CFPlus::Layout self, SV *text_)
721	CODE:	835	CODE:
722	{	836	{
723	STRLEN textlen;	837	STRLEN textlen;
724	char *text = SvPVutf8 (text_, textlen);	838	char *text = SvPVutf8 (text_, textlen);
725		839
726	pango_layout_set_markup (self->pl, text, textlen);	840	pango_layout_set_markup (self->pl, text, textlen);
727	}	841	}
728		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
729	SV *	928	SV *
730	get_text (CFClient::Layout self)	929	get_text (CFPlus::Layout self)
731	CODE:	930	CODE:
732	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	931	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
733	SvUTF8_on (RETVAL);	932	sv_utf8_decode (RETVAL);
734	OUTPUT:	933	OUTPUT:
735	RETVAL	934	RETVAL
736		935
737	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
738	set_font (CFClient::Layout self, CFClient::Font font = 0)	945	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
739	CODE:	946	CODE:
740	if (self->font != font)	947	if (self->font != font)
741	{	948	{
742	self->font = font;	949	self->font = font;
743	layout_update_font (self);	950	layout_update_font (self);
744	}	951	}
745		952
746	void	953	void
747	set_height (CFClient::Layout self, int base_height)	954	set_height (CFPlus::Layout self, int base_height)
748	CODE:	955	CODE:
749	if (self->base_height != base_height)	956	if (self->base_height != base_height)
750	{	957	{
751	self->base_height = base_height;	958	self->base_height = base_height;
752	layout_update_font (self);	959	layout_update_font (self);
753	}	960	}
754		961
755	void	962	void
756	set_width (CFClient::Layout self, int max_width = -1)	963	set_width (CFPlus::Layout self, int max_width = -1)
757	CODE:	964	CODE:
758	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);
759		966
760	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
761	size (CFClient::Layout self)	993	size (CFPlus::Layout self)
762	PPCODE:	994	PPCODE:
763	{	995	{
764	int w, h;	996	int w, h;
765		997
766	layout_get_pixel_size (self, &w, &h);	998	layout_get_pixel_size (self, &w, &h);
…		…
769	PUSHs (sv_2mortal (newSViv (w)));	1001	PUSHs (sv_2mortal (newSViv (w)));
770	PUSHs (sv_2mortal (newSViv (h)));	1002	PUSHs (sv_2mortal (newSViv (h)));
771	}	1003	}
772		1004
773	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
774	xy_to_index (CFClient::Layout self, int x, int y)	1018	xy_to_index (CFPlus::Layout self, int x, int y)
775	CODE:	1019	CODE:
776	{	1020	{
777	int index, trailing;	1021	int index, trailing;
778	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);
779	RETVAL = index;	1023	RETVAL = index;
780	}	1024	}
781	OUTPUT:	1025	OUTPUT:
782	RETVAL	1026	RETVAL
783		1027
784	void	1028	void
785	cursor_pos (CFClient::Layout self, int index)	1029	cursor_pos (CFPlus::Layout self, int index)
786	PPCODE:	1030	PPCODE:
787	{	1031	{
788	PangoRectangle strong_pos;	1032	PangoRectangle strong_pos;
789	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1033	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
790		1034
…		…
793	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1037	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
794	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1038	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
795	}	1039	}
796		1040
797	void	1041	void
798	render (CFClient::Layout self)	1042	render (CFPlus::Layout self, float x, float y, int flags = 0)
799	PPCODE:	1043	PPCODE:
800	{	1044	pango_opengl_render_layout_subpixel (
801	SV *retval;	1045	self->pl,
802	int w, h;	1046	x * PANGO_SCALE, y * PANGO_SCALE,
803	FT_Bitmap bitmap;	1047	self->r, self->g, self->b, self->a,
		1048	flags
		1049	);
804		1050
805	layout_get_pixel_size (self, &w, &h);	1051	MODULE = CFPlus PACKAGE = CFPlus::Texture
806		1052
807	retval = newSV (w * h);	1053	void
808	SvPOK_only (retval);	1054	pad2pot (SV data_, SV w_, SV *h_)
809	SvCUR_set (retval, w * h);	1055	CODE:
		1056	{
		1057	int ow = SvIV (w_);
		1058	int oh = SvIV (h_);
810		1059
811	bitmap.rows = h;	1060	if (ow && oh)
812	bitmap.width = w;	1061	{
813	bitmap.pitch = w;	1062	int nw = minpot (ow);
814	bitmap.buffer = (unsigned char*)SvPVX (retval);	1063	int nh = minpot (oh);
815	bitmap.num_grays = 256;
816	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
817		1064
818	memset (bitmap.buffer, 0, w * h);	1065	if (nw != ow \|\| nh != oh)
819		1066	{
820	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));
821		1073
822	EXTEND (SP, 3);	1074	SvPOK_only (result_);
823	PUSHs (sv_2mortal (newSViv (w)));	1075	SvCUR_set (result_, nw * nh * bpp);
824	PUSHs (sv_2mortal (newSViv (h)));
825	PUSHs (sv_2mortal (retval));
826	}
827		1076
828	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);
829		1080
		1081	sv_setsv (data_, result_);
		1082	}
		1083
		1084	sv_setiv (w_, nw);
		1085	sv_setiv (h_, nh);
		1086	}
		1087	}
		1088	}
		1089
830	void	1090	void
831	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.)
832	PROTOTYPE: $$$;$$	1092	PROTOTYPE: $$$;$$
		1093	ALIAS:
		1094	draw_quad_alpha = 1
		1095	draw_quad_alpha_premultiplied = 2
833	CODE:	1096	CODE:
834	{	1097	{
835	HV hv = (HV )SvRV (self);	1098	HV hv = (HV )SvRV (self);
836	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1099	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
837	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1100	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
838	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1101	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
839	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
840		1102
841	if (items < 5)	1103	if (items < 5)
842	{	1104	{
843	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1105	w = SvNV (*hv_fetch (hv, "w", 1, 1));
844	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1106	h = SvNV (*hv_fetch (hv, "h", 1, 1));
845	}	1107	}
846		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
847	glBindTexture (GL_TEXTURE_2D, name);	1123	glBindTexture (GL_TEXTURE_2D, name);
848	if (wrap_mode) {	1124
849	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
850	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
851	}
852	glBegin (GL_QUADS);	1125	glBegin (GL_QUADS);
853	glTexCoord2f (0, 0); glVertex2f (x , y );	1126	glTexCoord2f (0, 0); glVertex2f (x , y );
854	glTexCoord2f (0, t); glVertex2f (x , y + h);	1127	glTexCoord2f (0, t); glVertex2f (x , y + h);
855	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1128	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
856	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1129	glTexCoord2f (s, 0); glVertex2f (x + w, y );
857	glEnd ();	1130	glEnd ();
858	}
859		1131
		1132	if (ix)
		1133	{
		1134	glDisable (GL_ALPHA_TEST);
		1135	glDisable (GL_BLEND);
		1136	}
		1137	}
		1138
860	MODULE = CFClient PACKAGE = CFClient::Map	1139	MODULE = CFPlus PACKAGE = CFPlus::Map
861		1140
862	CFClient::Map	1141	CFPlus::Map
863	new (SV *class, int map_width, int map_height)	1142	new (SV *class, int map_width, int map_height)
864	CODE:	1143	CODE:
865	New (0, RETVAL, 1, struct map);	1144	New (0, RETVAL, 1, struct map);
866	RETVAL->x = 0;	1145	RETVAL->x = 0;
867	RETVAL->y = 0;	1146	RETVAL->y = 0;
…		…
877	RETVAL->row = 0;	1156	RETVAL->row = 0;
878	OUTPUT:	1157	OUTPUT:
879	RETVAL	1158	RETVAL
880		1159
881	void	1160	void
882	DESTROY (CFClient::Map self)	1161	DESTROY (CFPlus::Map self)
883	CODE:	1162	CODE:
884	{	1163	{
885	map_clear (self);	1164	map_clear (self);
886	Safefree (self->face);	1165	Safefree (self->face);
		1166	Safefree (self->tex);
887	Safefree (self);	1167	Safefree (self);
888	}	1168	}
889		1169
890	void	1170	void
891	clear (CFClient::Map self)	1171	clear (CFPlus::Map self)
892	CODE:	1172	CODE:
893	map_clear (self);	1173	map_clear (self);
894		1174
895	void	1175	void
896	set_face (CFClient::Map self, int face, int texid)	1176	set_face (CFPlus::Map self, int face, int texid)
897	CODE:	1177	CODE:
898	{	1178	{
899	while (self->faces <= face)	1179	while (self->faces <= face)
900	{	1180	{
901	Append (mapface, self->face, self->faces, self->faces);	1181	Append (mapface, self->face, self->faces, self->faces);
…		…
904		1184
905	self->face [face] = texid;	1185	self->face [face] = texid;
906	}	1186	}
907		1187
908	void	1188	void
909	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)
910	CODE:	1190	CODE:
911	{	1191	{
912	while (self->texs <= texid)	1192	while (self->texs <= texid)
913	{	1193	{
914	Append (maptex, self->tex, self->texs, self->texs);	1194	Append (maptex, self->tex, self->texs, self->texs);
…		…
926	tex->r = r;	1206	tex->r = r;
927	tex->g = g;	1207	tex->g = g;
928	tex->b = b;	1208	tex->b = b;
929	tex->a = a;	1209	tex->a = a;
930	}	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);
931	}	1220	}
932		1221
933	int	1222	int
934	ox (CFClient::Map self)	1223	ox (CFPlus::Map self)
935	ALIAS:	1224	ALIAS:
936	oy = 1	1225	oy = 1
		1226	x = 2
		1227	y = 3
		1228	w = 4
		1229	h = 5
937	CODE:	1230	CODE:
938	switch (ix)	1231	switch (ix)
939	{	1232	{
940	case 0: RETVAL = self->ox; break;	1233	case 0: RETVAL = self->ox; break;
941	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;
942	}	1239	}
943	OUTPUT:	1240	OUTPUT:
944	RETVAL	1241	RETVAL
945		1242
946	void	1243	void
947	scroll (CFClient::Map self, int dx, int dy)	1244	scroll (CFPlus::Map self, int dx, int dy)
948	CODE:	1245	CODE:
949	{	1246	{
950	if (dx > 0)	1247	if (dx > 0)
951	map_blank (self, self->x, self->y, dx - 1, self->h);	1248	map_blank (self, self->x, self->y, dx - 1, self->h);
952	else if (dx < 0)	1249	else if (dx < 0)
…		…
968	self->y += MAP_EXTEND_Y;	1265	self->y += MAP_EXTEND_Y;
969	}	1266	}
970	}	1267	}
971		1268
972	void	1269	void
973	map1a_update (CFClient::Map self, SV *data_)	1270	map1a_update (CFPlus::Map self, SV *data_, int extmap)
974	CODE:	1271	CODE:
975	{	1272	{
976	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1273	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
977	uint8_t data_end = (uint8_t )SvEND (data_);	1274	uint8_t data_end = (uint8_t )SvEND (data_);
978	mapcell *cell;	1275	mapcell *cell;
…		…
980		1277
981	while (data < data_end)	1278	while (data < data_end)
982	{	1279	{
983	flags = (data [0] << 8) + data [1]; data += 2;	1280	flags = (data [0] << 8) + data [1]; data += 2;
984		1281
985	x = ((flags >> 10) & 63) + self->x;	1282	x = self->x + ((flags >> 10) & 63);
986	y = ((flags >> 4) & 63) + self->y;	1283	y = self->y + ((flags >> 4) & 63);
987		1284
988	cell = map_get_cell (self, x, y);	1285	cell = map_get_cell (self, x, y);
989		1286
990	if (flags & 15)	1287	if (flags & 15)
991	{	1288	{
992	if (cell->darkness < 0)	1289	if (!cell->darkness)
993	{	1290	{
994	cell->darkness = 0;	1291	cell->darkness = 256;
995	cell->face [0] = 0;	1292	cell->face [0] = 0;
996	cell->face [1] = 0;	1293	cell->face [1] = 0;
997	cell->face [2] = 0;	1294	cell->face [2] = 0;
998	}	1295	}
999		1296
1000	cell->darkness = flags & 8 ? *data++ : 255;
1001
1002	//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	}
1003		1329
1004	if (flags & 4)	1330	if (flags & 4)
1005	{	1331	{
1006	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;
1007	}	1333	}
…		…
1015	{	1341	{
1016	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;
1017	}	1343	}
1018	}	1344	}
1019	else	1345	else
		1346	{
1020	cell->darkness = -1;	1347	cell->darkness = 0;
		1348	cell->stat_hp = 0;
		1349	}
1021	}	1350	}
1022	}	1351	}
1023		1352
1024	SV *	1353	SV *
1025	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)
1026	CODE:	1355	CODE:
1027	{	1356	{
1028	int x1, x;	1357	int x1, x;
1029	int y1, y;	1358	int y1, y;
1030	int z;	1359	int z;
…		…
1080	}	1409	}
1081	OUTPUT:	1410	OUTPUT:
1082	RETVAL	1411	RETVAL
1083		1412
1084	void	1413	void
1085	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)
1086	PPCODE:	1415	CODE:
1087	{	1416	{
1088	int vx, vy;	1417	int vx, vy;
1089	int x, y, z;	1418	int x, y, z;
1090	int last_name;	1419	int last_name;
1091	mapface face;	1420	mapface face;
1092	int sw4 = (sw + 3) & ~3;
1093	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1094	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1095		1421
1096	memset (darkness, 255, sw4 * sh);
1097	SvPOK_only (darkness_sv);
1098	SvCUR_set (darkness_sv, sw4 * sh);
1099
1100	vx = self->x + (self->w - sw) / 2 - shift_x;	1422	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1101	vy = self->y + (self->h - sh) / 2 - shift_y;	1423	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1102		1424
1103	/*	1425	/*
1104	int vx = self->vx = self->w >= sw	1426	int vx = self->vx = self->w >= sw
1105	? self->x + (self->w - sw) / 2	1427	? self->x + (self->w - sw) / 2
1106	: 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));
…		…
1110	: 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));
1111	*/	1433	*/
1112		1434
1113	glColor4ub (255, 255, 255, 255);	1435	glColor4ub (255, 255, 255, 255);
1114		1436
		1437	glEnable (GL_BLEND);
1115	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1438	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1116	glEnable (GL_BLEND);
1117	glEnable (GL_TEXTURE_2D);	1439	glEnable (GL_TEXTURE_2D);
1118	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1440	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1119		1441
1120	glBegin (GL_QUADS);	1442	glBegin (GL_QUADS);
1121		1443
…		…
1130	for (x = 0; x < sw; x++)	1452	for (x = 0; x < sw; x++)
1131	if (row->c0 <= x + vx && x + vx < row->c1)	1453	if (row->c0 <= x + vx && x + vx < row->c1)
1132	{	1454	{
1133	mapcell *cell = row->col + (x + vx - row->c0);	1455	mapcell *cell = row->col + (x + vx - row->c0);
1134		1456
1135	darkness[y * sw4 + x] = cell->darkness < 0
1136	? 255 - FOW_DARKNESS
1137	: 255 - cell->darkness;
1138
1139	face = cell->face [z];	1457	face = cell->face [z];
1140		1458
1141	if (face)	1459	if (face && face < self->texs)
1142	{	1460	{
1143	maptex tex = self->tex [face];	1461	maptex tex = self->tex [face];
1144		1462
1145	int px = (x + 1) * 32 - tex.w;	1463	int px = (x + 1) * 32 - tex.w;
1146	int py = (y + 1) * 32 - tex.h;	1464	int py = (y + 1) * 32 - tex.h;
…		…
1162	}	1480	}
1163		1481
1164	glEnd ();	1482	glEnd ();
1165		1483
1166	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, 127);
		1506	glRectf (px + 1, py,
		1507	px + width - 1, py + thick + 2);
		1508
		1509	glColor4ub (cell->stat_hp, 255 - cell->stat_hp, 0, 255);
		1510	glRectf (px + 2,
		1511	py + 1,
		1512	px + width - 2 - cell->stat_hp * (width - 4) / 255, py + thick + 1);
		1513	}
		1514	}
		1515	}
		1516
1167	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	}
1168		1612
1169	EXTEND (SP, 3);	1613	EXTEND (SP, 3);
1170	PUSHs (sv_2mortal (newSViv (sw4)));	1614	PUSHs (sv_2mortal (newSViv (sw4)));
1171	PUSHs (sv_2mortal (newSViv (sh)));	1615	PUSHs (sv_2mortal (newSViv (sh)));
1172	PUSHs (darkness_sv);	1616	PUSHs (darkness_sv);
1173	}	1617	}
1174		1618
1175	SV *	1619	SV *
1176	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)
1177	CODE:	1621	CODE:
1178	{	1622	{
1179	int x, y, x1, y1;	1623	int x, y, x1, y1;
1180	SV data_sv = newSV (w h * 7 + 5);	1624	SV data_sv = newSV (w h * 7 + 5);
1181	uint8_t data = (uint8_t )SvPVX (data_sv);	1625	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1243	}	1687	}
1244	OUTPUT:	1688	OUTPUT:
1245	RETVAL	1689	RETVAL
1246		1690
1247	void	1691	void
1248	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)
1249	PPCODE:	1693	PPCODE:
1250	{	1694	{
1251	int x, y, z;	1695	int x, y, z;
1252	int w, h;	1696	int w, h;
1253	int x1, y1;	1697	int x1, y1;
…		…
1285		1729
1286	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1730	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1287	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1731	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1288	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1732	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1289		1733
1290	if (cell->darkness <= 0)	1734	if (cell->darkness == 0)
1291	{	1735	{
1292	cell->darkness = -1;	1736	cell->darkness = 0;
1293		1737
1294	for (z = 0; z <= 2; z++)	1738	for (z = 0; z <= 2; z++)
1295	{	1739	{
1296	cell->face[z] = face[z];	1740	cell->face[z] = face[z];
1297		1741
…		…
1302	}	1746	}
1303	}	1747	}
1304	}	1748	}
1305	}	1749	}
1306		1750
1307	MODULE = CFClient PACKAGE = CFClient::MixChunk	1751	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1308		1752
1309	CFClient::MixChunk	1753	CFPlus::MixChunk
1310	new_from_file (SV class, char path)	1754	new_from_file (SV class, char path)
1311	CODE:	1755	CODE:
1312	RETVAL = Mix_LoadWAV (path);	1756	RETVAL = Mix_LoadWAV (path);
1313	OUTPUT:	1757	OUTPUT:
1314	RETVAL	1758	RETVAL
1315		1759
1316	void	1760	void
1317	DESTROY (CFClient::MixChunk self)	1761	DESTROY (CFPlus::MixChunk self)
1318	CODE:	1762	CODE:
1319	Mix_FreeChunk (self);	1763	Mix_FreeChunk (self);
1320		1764
1321	int	1765	int
1322	volume (CFClient::MixChunk self, int volume = -1)	1766	volume (CFPlus::MixChunk self, int volume = -1)
1323	CODE:	1767	CODE:
1324	RETVAL = Mix_VolumeChunk (self, volume);	1768	RETVAL = Mix_VolumeChunk (self, volume);
1325	OUTPUT:	1769	OUTPUT:
1326	RETVAL	1770	RETVAL
1327		1771
1328	int	1772	int
1329	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)
1330	CODE:	1774	CODE:
1331	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1775	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1332	OUTPUT:	1776	OUTPUT:
1333	RETVAL	1777	RETVAL
1334		1778
1335	MODULE = CFClient PACKAGE = CFClient::MixMusic	1779	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1336		1780
1337	int	1781	int
1338	volume (int volume = -1)	1782	volume (int volume = -1)
1339	CODE:	1783	CODE:
1340	RETVAL = Mix_VolumeMusic (volume);	1784	RETVAL = Mix_VolumeMusic (volume);
1341	OUTPUT:	1785	OUTPUT:
1342	RETVAL	1786	RETVAL
1343		1787
1344	CFClient::MixMusic	1788	CFPlus::MixMusic
1345	new_from_file (SV class, char path)	1789	new_from_file (SV class, char path)
1346	CODE:	1790	CODE:
1347	RETVAL = Mix_LoadMUS (path);	1791	RETVAL = Mix_LoadMUS (path);
1348	OUTPUT:	1792	OUTPUT:
1349	RETVAL	1793	RETVAL
1350		1794
1351	void	1795	void
1352	DESTROY (CFClient::MixMusic self)	1796	DESTROY (CFPlus::MixMusic self)
1353	CODE:	1797	CODE:
1354	Mix_FreeMusic (self);	1798	Mix_FreeMusic (self);
1355		1799
1356	int	1800	int
1357	play (CFClient::MixMusic self, int loops = -1)	1801	play (CFPlus::MixMusic self, int loops = -1)
1358	CODE:	1802	CODE:
1359	RETVAL = Mix_PlayMusic (self, loops);	1803	RETVAL = Mix_PlayMusic (self, loops);
1360	OUTPUT:	1804	OUTPUT:
1361	RETVAL	1805	RETVAL
1362		1806
1363	MODULE = CFClient PACKAGE = CFClient::OpenGL	1807	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1364		1808
1365	BOOT:	1809	BOOT:
1366	{	1810	{
1367	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1811	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1368	static const struct {	1812	static const struct {
1369	const char *name;	1813	const char *name;
1370	IV iv;	1814	IV iv;
1371	} *civ, const_iv[] = {	1815	} *civ, const_iv[] = {
1372	# define const_iv(name) { # name, (IV)name }	1816	# define const_iv(name) { # name, (IV)name }
1373	const_iv (GL_COLOR_MATERIAL),	1817	const_iv (GL_COLOR_MATERIAL),
1374	const_iv (GL_SMOOTH),	1818	const_iv (GL_SMOOTH),
1375	const_iv (GL_FLAT),	1819	const_iv (GL_FLAT),
1376	const_iv (GL_DITHER),	1820	const_iv (GL_DITHER),
1377	const_iv (GL_BLEND),	1821	const_iv (GL_BLEND),
		1822	const_iv (GL_CULL_FACE),
1378	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),
1379	const_iv (GL_AND),	1830	const_iv (GL_AND),
1380	const_iv (GL_ONE),	1831	const_iv (GL_ONE),
1381	const_iv (GL_ZERO),	1832	const_iv (GL_ZERO),
1382	const_iv (GL_SRC_ALPHA),	1833	const_iv (GL_SRC_ALPHA),
1383	const_iv (GL_SRC_ALPHA_SATURATE),	1834	const_iv (GL_DST_ALPHA),
1384	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1835	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1385	const_iv (GL_ONE_MINUS_DST_ALPHA),	1836	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1837	const_iv (GL_SRC_ALPHA_SATURATE),
1386	const_iv (GL_RGB),	1838	const_iv (GL_RGB),
1387	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),
1388	const_iv (GL_UNSIGNED_BYTE),	1843	const_iv (GL_UNSIGNED_BYTE),
		1844	const_iv (GL_UNSIGNED_SHORT),
		1845	const_iv (GL_UNSIGNED_INT),
1389	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),
1390	const_iv (GL_FLOAT),	1850	const_iv (GL_FLOAT),
1391	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1851	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1392	const_iv (GL_COMPILE),	1852	const_iv (GL_COMPILE),
1393	const_iv (GL_TEXTURE_1D),	1853	const_iv (GL_TEXTURE_1D),
1394	const_iv (GL_TEXTURE_2D),	1854	const_iv (GL_TEXTURE_2D),
…		…
1396	const_iv (GL_TEXTURE_MAG_FILTER),	1856	const_iv (GL_TEXTURE_MAG_FILTER),
1397	const_iv (GL_TEXTURE_MIN_FILTER),	1857	const_iv (GL_TEXTURE_MIN_FILTER),
1398	const_iv (GL_TEXTURE_ENV_MODE),	1858	const_iv (GL_TEXTURE_ENV_MODE),
1399	const_iv (GL_TEXTURE_WRAP_S),	1859	const_iv (GL_TEXTURE_WRAP_S),
1400	const_iv (GL_TEXTURE_WRAP_T),	1860	const_iv (GL_TEXTURE_WRAP_T),
		1861	const_iv (GL_REPEAT),
1401	const_iv (GL_CLAMP),	1862	const_iv (GL_CLAMP),
1402	const_iv (GL_REPEAT),	1863	const_iv (GL_CLAMP_TO_EDGE),
1403	const_iv (GL_NEAREST),	1864	const_iv (GL_NEAREST),
1404	const_iv (GL_LINEAR),	1865	const_iv (GL_LINEAR),
1405	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1866	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1406	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1867	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1407	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1868	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1408	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1869	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1409	const_iv (GL_GENERATE_MIPMAP),	1870	const_iv (GL_GENERATE_MIPMAP),
1410	const_iv (GL_MODULATE),	1871	const_iv (GL_MODULATE),
1411	const_iv (GL_DECAL),	1872	const_iv (GL_DECAL),
1412	const_iv (GL_REPLACE),	1873	const_iv (GL_REPLACE),
		1874	const_iv (GL_DEPTH_BUFFER_BIT),
1413	const_iv (GL_COLOR_BUFFER_BIT),	1875	const_iv (GL_COLOR_BUFFER_BIT),
1414	const_iv (GL_PROJECTION),	1876	const_iv (GL_PROJECTION),
1415	const_iv (GL_MODELVIEW),	1877	const_iv (GL_MODELVIEW),
1416	const_iv (GL_COLOR_LOGIC_OP),	1878	const_iv (GL_COLOR_LOGIC_OP),
1417	const_iv (GL_SEPARABLE_2D),	1879	const_iv (GL_SEPARABLE_2D),
1418	const_iv (GL_CONVOLUTION_2D),	1880	const_iv (GL_CONVOLUTION_2D),
1419	const_iv (GL_CONVOLUTION_BORDER_MODE),	1881	const_iv (GL_CONVOLUTION_BORDER_MODE),
1420	const_iv (GL_CONSTANT_BORDER),	1882	const_iv (GL_CONSTANT_BORDER),
1421	const_iv (GL_LINES),	1883	const_iv (GL_LINES),
		1884	const_iv (GL_LINE_STRIP),
		1885	const_iv (GL_LINE_LOOP),
1422	const_iv (GL_QUADS),	1886	const_iv (GL_QUADS),
1423	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),
1424	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1891	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1425	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),
1426	# undef const_iv	1897	# undef const_iv
1427	};	1898	};
1428		1899
1429	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; )
1430	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1901	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1431	}	1902	}
1432		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
1433	int glGetError ()	1925	int glGetError ()
		1926
		1927	void glFinish ()
1434		1928
1435	void glClear (int mask)	1929	void glClear (int mask)
1436		1930
1437	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)
1438	PROTOTYPE: @	1932	PROTOTYPE: @
…		…
1445		1939
1446	void glHint (int target, int mode)	1940	void glHint (int target, int mode)
1447		1941
1448	void glBlendFunc (int sfactor, int dfactor)	1942	void glBlendFunc (int sfactor, int dfactor)
1449		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
1450	void glLogicOp (int opcode)	1950	void glLogicOp (int opcode)
1451		1951
1452	void glColorMask (int red, int green, int blue, int alpha)	1952	void glColorMask (int red, int green, int blue, int alpha)
1453		1953
1454	void glMatrixMode (int mode)	1954	void glMatrixMode (int mode)
…		…
1457		1957
1458	void glPopMatrix ()	1958	void glPopMatrix ()
1459		1959
1460	void glLoadIdentity ()	1960	void glLoadIdentity ()
1461		1961
		1962	void glDrawBuffer (int buffer)
		1963
		1964	void glReadBuffer (int buffer)
		1965
1462	# 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
1463	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_)
1464		1971
1465	void glViewport (int x, int y, int width, int height)	1972	void glViewport (int x, int y, int width, int height)
1466		1973
1467	void glScissor (int x, int y, int width, int height)	1974	void glScissor (int x, int y, int width, int height)
…		…
1482		1989
1483	void glEnd ()	1990	void glEnd ()
1484		1991
1485	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)
1486	PROTOTYPE: @	1993	PROTOTYPE: @
		1994	ALIAS:
		1995	glColor_premultiply = 1
1487	CODE:	1996	CODE:
1488	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);
1489		2016
1490	void glVertex (float x, float y, float z = 0.)	2017	void glVertex (float x, float y, float z = 0.)
1491	CODE:	2018	CODE:
1492	glVertex3f (x, y, z);	2019	glVertex3f (x, y, z);
1493		2020
…		…
1505		2032
1506	void glBindTexture (int target, int name)	2033	void glBindTexture (int target, int name)
1507		2034
1508	void glConvolutionParameter (int target, int pname, float params)	2035	void glConvolutionParameter (int target, int pname, float params)
1509	CODE:	2036	CODE:
1510	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2037	if (gl.ConvolutionParameterf)
		2038	gl.ConvolutionParameterf (target, pname, params);
1511		2039
1512	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)
1513	CODE:	2041	CODE:
1514	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2042	if (gl.ConvolutionFilter2D)
1515	(target, internalformat, width, height, format, type, data));	2043	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1516		2044
1517	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)
1518	CODE:	2046	CODE:
1519	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2047	if (gl.SeparableFilter2D)
1520	(target, internalformat, width, height, format, type, row, column));	2048	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1521		2049
1522	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)
1523		2051
1524	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)
1525		2053
1526	void glRasterPos (int x, int y)	2054	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1527	CODE:
1528	glRasterPos2i (x, y);
1529		2055
1530	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)
1531		2057
1532	int glGenTexture ()	2058	int glGenTexture ()
1533	CODE:	2059	CODE:

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.75 by root, Mon May 8 18:28:40 2006 UTC vs. Revision 1.148 by root, Sat Aug 19 03:57:25 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.75 by root, Mon May 8 18:28:40 2006 UTC vs.
Revision 1.148 by root, Sat Aug 19 03:57:25 2006 UTC