[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.143 by root, Fri Aug 18 02:23:39 2006 UTC

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