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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.60 by root, Sun Apr 23 04:47:02 2006 UTC vs.
Revision 1.141 by root, Fri Aug 18 01:01:00 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.60 by root, Sun Apr 23 04:47:02 2006 UTC vs. Revision 1.141 by root, Fri Aug 18 01:01:00 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.60 by root, Sun Apr 23 04:47:02 2006 UTC vs.
Revision 1.141 by root, Fri Aug 18 01:01:00 2006 UTC