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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.61 by root, Sun Apr 23 21:47:30 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	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	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	}
51		110
52	typedef struct cf_layout {	111	typedef struct cf_layout {
53	PangoLayout *pl;	112	PangoLayout *pl;
		113	float r, g, b, a; // default color for rgba mode
54	int base_height;	114	int base_height;
55	CFClient__Font font;	115	CFPlus__Font font;
56	} *CFClient__Layout;	116	} *CFPlus__Layout;
57		117
58	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
59	static PangoContext *context;	119	static PangoContext *opengl_context;
60	static PangoFontMap *fontmap;	120	static PangoFontMap *opengl_fontmap;
61		121
62	static void	122	static void
63	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
64	{	124	{
65	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
66	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
67	}	130	}
68		131
69	static void	132	static void
70	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
71	{	134	{
72	/* 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
73	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
74	*/	137	*/
75	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
79		142
80	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
81	}	144	}
82		145
83	static void	146	static void
84	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
85	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
86	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
87		153
88	w = (w + 3) & ~3;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
89	if (!w) w = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
90	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;
91	}	162	}
92		163
93	typedef uint16_t mapface;	164	typedef uint16_t mapface;
94		165
95	typedef struct {	166	typedef struct {
…		…
118	int texs;	189	int texs;
119	maptex *tex;	190	maptex *tex;
120		191
121	int32_t rows;	192	int32_t rows;
122	maprow *row;	193	maprow *row;
123	} *CFClient__Map;	194	} *CFPlus__Map;
124		195
125	static char *	196	static char *
126	prepend (char *ptr, int sze, int inc)	197	prepend (char *ptr, int sze, int inc)
127	{	198	{
128	char *p;	199	char *p;
…		…
146		217
147	#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))
148	#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))
149		220
150	static maprow *	221	static maprow *
151	map_get_row (CFClient__Map self, int y)	222	map_get_row (CFPlus__Map self, int y)
152	{	223	{
153	if (0 > y)	224	if (0 > y)
154	{	225	{
155	int extend = - y + MAP_EXTEND_Y;	226	int extend = - y + MAP_EXTEND_Y;
156	Prepend (maprow, self->row, self->rows, extend);	227	Prepend (maprow, self->row, self->rows, extend);
…		…
194		265
195	return row->col + (x - row->c0);	266	return row->col + (x - row->c0);
196	}	267	}
197		268
198	static mapcell *	269	static mapcell *
199	map_get_cell (CFClient__Map self, int x, int y)	270	map_get_cell (CFPlus__Map self, int x, int y)
200	{	271	{
201	return row_get_cell (map_get_row (self, y), x);	272	return row_get_cell (map_get_row (self, y), x);
202	}	273	}
203		274
204	static void	275	static void
205	map_clear (CFClient__Map self)	276	map_clear (CFPlus__Map self)
206	{	277	{
207	int r;	278	int r;
208		279
209	for (r = 0; r < self->rows; r++)	280	for (r = 0; r < self->rows; r++)
210	Safefree (self->row[r].col);	281	Safefree (self->row[r].col);
…		…
218	self->row = 0;	289	self->row = 0;
219	self->rows = 0;	290	self->rows = 0;
220	}	291	}
221		292
222	static void	293	static void
223	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)
224	{	295	{
225	int x, y;	296	int x, y;
226	maprow *row;	297	maprow *row;
227		298
228	for (y = y0; y < y0 + h; y++)	299	for (y = y0; y < y0 + h; y++)
…		…
243	}	314	}
244	}	315	}
245	}	316	}
246		317
247	static void	318	static void
248	music_finished ()	319	music_finished (void)
249	{	320	{
250	SDL_UserEvent ev;	321	SDL_UserEvent ev;
251		322
252	ev.type = SDL_USEREVENT;	323	ev.type = SDL_USEREVENT;
253	ev.code = 0;	324	ev.code = 0;
…		…
255	ev.data2 = 0;	326	ev.data2 = 0;
256		327
257	SDL_PushEvent ((SDL_Event *)&ev);	328	SDL_PushEvent ((SDL_Event *)&ev);
258	}	329	}
259		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
260	MODULE = CFClient PACKAGE = CFClient	361	MODULE = CFPlus PACKAGE = CFPlus
261		362
262	PROTOTYPES: ENABLE	363	PROTOTYPES: ENABLE
263		364
264	BOOT:	365	BOOT:
265	{	366	{
266	HV *stash = gv_stashpv ("CFClient", 1);	367	HV *stash = gv_stashpv ("CFPlus", 1);
267	static const struct {	368	static const struct {
268	const char *name;	369	const char *name;
269	IV iv;	370	IV iv;
270	} *civ, const_iv[] = {	371	} *civ, const_iv[] = {
271	# define const_iv(name) { # name, (IV)name }	372	# define const_iv(name) { # name, (IV)name }
…		…
370	# undef const_iv	471	# undef const_iv
371	};	472	};
372		473
373	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; )
374	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	475	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
375
376	fontmap = pango_ft2_font_map_new ();
377	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
378	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
379	}	476	}
380		477
381	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
382	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	499	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
383		500
384	void	501	void
385	SDL_Quit ()	502	SDL_Quit ()
386		503
387	void	504	void
…		…
393	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	510	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
394	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	511	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
395	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	512	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
396	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	513	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
397		514
		515	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		516	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		517
398	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	518	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
399	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	519	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
400	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	520	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
401	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
402		522
403	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	523	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		524	#if SDL_VERSION_ATLEAST(1,2,10)
404	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	525	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
405	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		527	#endif
406		528
407	SDL_EnableUNICODE (1);	529	SDL_EnableUNICODE (1);
408	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	530	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
409		531
410	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	532	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
419		541
420	++m;	542	++m;
421	}	543	}
422	}	544	}
423		545
		546	char *
		547	SDL_GetError ()
		548
424	int	549	int
425	SDL_SetVideoMode (int w, int h, int fullscreen)	550	SDL_SetVideoMode (int w, int h, int fullscreen)
426	CODE:	551	CODE:
427	RETVAL = !!SDL_SetVideoMode (	552	RETVAL = !!SDL_SetVideoMode (
428	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	553	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
429	);	554	);
		555	if (RETVAL)
		556	{
430	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	}
431	OUTPUT:	562	OUTPUT:
432	RETVAL	563	RETVAL
433		564
434	void	565	void
435	SDL_GL_SwapBuffers ()	566	SDL_GL_SwapBuffers ()
		567
		568	char *
		569	SDL_GetKeyName (int sym)
436		570
437	void	571	void
438	SDL_PollEvent ()	572	SDL_PollEvent ()
439	PPCODE:	573	PPCODE:
440	{	574	{
…		…
442		576
443	while (SDL_PollEvent (&ev))	577	while (SDL_PollEvent (&ev))
444	{	578	{
445	HV *hv = newHV ();	579	HV *hv = newHV ();
446	hv_store (hv, "type", 4, newSViv (ev.type), 0);	580	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		581
447	switch (ev.type)	582	switch (ev.type)
448	{	583	{
449	case SDL_KEYDOWN:	584	case SDL_KEYDOWN:
450	case SDL_KEYUP:	585	case SDL_KEYUP:
451	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	586	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
458	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	593	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
459	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	594	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
460	break;	595	break;
461		596
462	case SDL_MOUSEMOTION:	597	case SDL_MOUSEMOTION:
		598	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		599
463	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	600	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
464	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	601	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
465	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	602	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
466	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	603	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
467	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	604	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
468	break;	605	break;
469		606
470	case SDL_MOUSEBUTTONDOWN:	607	case SDL_MOUSEBUTTONDOWN:
471	case SDL_MOUSEBUTTONUP:	608	case SDL_MOUSEBUTTONUP:
		609	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		610
472	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	611	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
473	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	612	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
474	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	613	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
475	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;
476	}	622	}
477		623
478	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	624	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
479	}	625	}
480	}	626	}
481		627
482	int	628	int
483	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)
484	POSTCALL:	630	POSTCALL:
485	Mix_HookMusicFinished (music_finished);	631	Mix_HookMusicFinished (music_finished);
		632	Mix_ChannelFinished (channel_finished);
486		633
487	void	634	void
488	Mix_CloseAudio ()	635	Mix_CloseAudio ()
489		636
490	int	637	int
…		…
495	CODE:	642	CODE:
496	#ifndef _WIN32	643	#ifndef _WIN32
497	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	644	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
498	#endif	645	#endif
499		646
500	char *
501	gl_version ()
502	CODE:
503	RETVAL = (char *)glGetString (GL_VERSION);
504	OUTPUT:
505	RETVAL
506
507	char *
508	gl_extensions ()
509	CODE:
510	RETVAL = (char *)glGetString (GL_EXTENSIONS);
511	OUTPUT:
512	RETVAL
513
514	void	647	void
515	add_font (char *file)	648	add_font (char *file)
516	CODE:	649	CODE:
517	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	650	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
518		651
519	void	652	void
520	load_image_inline (SV *image_)	653	load_image_inline (SV *image_)
521	ALIAS:	654	ALIAS:
522	load_image_file = 1	655	load_image_file = 1
…		…
564		697
565	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	698	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
566		699
567	assert (surface2->pitch == surface2->w * 4);	700	assert (surface2->pitch == surface2->w * 4);
568		701
		702	SDL_LockSurface (surface2);
569	EXTEND (SP, 5);	703	EXTEND (SP, 6);
570	PUSHs (sv_2mortal (newSViv (surface2->w)));	704	PUSHs (sv_2mortal (newSViv (surface2->w)));
571	PUSHs (sv_2mortal (newSViv (surface2->h)));	705	PUSHs (sv_2mortal (newSViv (surface2->h)));
572	SDL_LockSurface (surface2);
573	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	706	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
574	SDL_UnlockSurface (surface2);
575	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)));
576	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	708	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
577	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	709	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		710	SDL_UnlockSurface (surface2);
578		711
579	SDL_FreeSurface (surface);	712	SDL_FreeSurface (surface);
580	SDL_FreeSurface (surface2);	713	SDL_FreeSurface (surface2);
581	}	714	}
582		715
…		…
604	PUSHs (sv_2mortal (newSViv (b / y)));	737	PUSHs (sv_2mortal (newSViv (b / y)));
605	PUSHs (sv_2mortal (newSViv (a / y)));	738	PUSHs (sv_2mortal (newSViv (a / y)));
606	}	739	}
607		740
608	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
609	fatal (char *message)	750	fatal (char *message)
610	CODE:	751	CODE:
		752	fprintf (stderr, "FATAL: %s\n", message);
611	#ifdef _WIN32	753	#ifdef _WIN32
612	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	754	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
613	#else
614	fprintf (stderr, "FATAL: %s\n", message);
615	#endif	755	#endif
616	exit (1);	756	_exit (1);
617		757
		758	void
		759	_exit (int retval)
		760	CODE:
		761	_exit (retval);
		762
618	MODULE = CFClient PACKAGE = CFClient::Font	763	MODULE = CFPlus PACKAGE = CFPlus::Font
619		764
620	CFClient::Font	765	CFPlus::Font
621	new_from_file (SV class, char path)	766	new_from_file (SV class, char path, int id = 0)
622	CODE:	767	CODE:
623	{	768	{
624	int count;	769	int count;
625	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, 0, 0, &count);	770	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
626	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	771	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
627	FcPatternDestroy (pattern);	772	FcPatternDestroy (pattern);
628	}	773	}
629	OUTPUT:	774	OUTPUT:
630	RETVAL	775	RETVAL
631		776
632	void	777	void
633	DESTROY (CFClient::Font self)	778	DESTROY (CFPlus::Font self)
634	CODE:	779	CODE:
635	pango_font_description_free (self);	780	pango_font_description_free (self);
636		781
637	void	782	void
638	make_default (CFClient::Font self)	783	make_default (CFPlus::Font self)
639	CODE:	784	CODE:
640	default_font = self;	785	default_font = self;
641		786
642	MODULE = CFClient PACKAGE = CFClient::Layout	787	MODULE = CFPlus PACKAGE = CFPlus::Layout
643		788
644	CFClient::Layout	789	void
645	new (SV *class, int base_height = MIN_FONT_HEIGHT)	790	reset_glyph_cache ()
		791	CODE:
		792	tc_clear ();
		793
		794	CFPlus::Layout
		795	new (SV *class)
646	CODE:	796	CODE:
647	New (0, RETVAL, 1, struct cf_layout);	797	New (0, RETVAL, 1, struct cf_layout);
		798
648	RETVAL->pl = pango_layout_new (context);	799	RETVAL->pl = pango_layout_new (opengl_context);
649	RETVAL->base_height = base_height;	800	RETVAL->r = 1.;
		801	RETVAL->g = 1.;
		802	RETVAL->b = 1.;
		803	RETVAL->a = 1.;
		804	RETVAL->base_height = MIN_FONT_HEIGHT;
650	RETVAL->font = 0;	805	RETVAL->font = 0;
		806
651	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	807	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
652	pango_layout_set_font_description (RETVAL->pl, default_font);	808	layout_update_font (RETVAL);
653	OUTPUT:	809	OUTPUT:
654	RETVAL	810	RETVAL
655		811
656	void	812	void
657	DESTROY (CFClient::Layout self)	813	DESTROY (CFPlus::Layout self)
658	CODE:	814	CODE:
659	g_object_unref (self->pl);	815	g_object_unref (self->pl);
660	Safefree (self);	816	Safefree (self);
661		817
662	void	818	void
663	set_text (CFClient::Layout self, SV *text_)	819	set_text (CFPlus::Layout self, SV *text_)
664	CODE:	820	CODE:
665	{	821	{
666	STRLEN textlen;	822	STRLEN textlen;
667	char *text = SvPVutf8 (text_, textlen);	823	char *text = SvPVutf8 (text_, textlen);
668		824
669	pango_layout_set_text (self->pl, text, textlen);	825	pango_layout_set_text (self->pl, text, textlen);
670	}	826	}
671		827
672	void	828	void
673	set_markup (CFClient::Layout self, SV *text_)	829	set_markup (CFPlus::Layout self, SV *text_)
674	CODE:	830	CODE:
675	{	831	{
676	STRLEN textlen;	832	STRLEN textlen;
677	char *text = SvPVutf8 (text_, textlen);	833	char *text = SvPVutf8 (text_, textlen);
678		834
679	pango_layout_set_markup (self->pl, text, textlen);	835	pango_layout_set_markup (self->pl, text, textlen);
680	}	836	}
681		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
682	SV *	923	SV *
683	get_text (CFClient::Layout self)	924	get_text (CFPlus::Layout self)
684	CODE:	925	CODE:
685	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	926	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
686	SvUTF8_on (RETVAL);	927	sv_utf8_decode (RETVAL);
687	OUTPUT:	928	OUTPUT:
688	RETVAL	929	RETVAL
689		930
690	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
691	set_font (CFClient::Layout self, CFClient::Font font = 0)	940	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
692	CODE:	941	CODE:
693	if (self->font != font)	942	if (self->font != font)
694	{	943	{
695	self->font = font;	944	self->font = font;
696	layout_update_font (self);	945	layout_update_font (self);
697	}	946	}
698		947
699	void	948	void
700	set_height (CFClient::Layout self, int base_height)	949	set_height (CFPlus::Layout self, int base_height)
701	CODE:	950	CODE:
702	if (self->base_height != base_height)	951	if (self->base_height != base_height)
703	{	952	{
704	self->base_height = base_height;	953	self->base_height = base_height;
705	layout_update_font (self);	954	layout_update_font (self);
706	}	955	}
707		956
708	void	957	void
709	set_width (CFClient::Layout self, int max_width = -1)	958	set_width (CFPlus::Layout self, int max_width = -1)
710	CODE:	959	CODE:
711	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);
712		961
713	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
714	size (CFClient::Layout self)	988	size (CFPlus::Layout self)
715	PPCODE:	989	PPCODE:
716	{	990	{
717	int w, h;	991	int w, h;
718		992
719	layout_get_pixel_size (self, &w, &h);	993	layout_get_pixel_size (self, &w, &h);
…		…
722	PUSHs (sv_2mortal (newSViv (w)));	996	PUSHs (sv_2mortal (newSViv (w)));
723	PUSHs (sv_2mortal (newSViv (h)));	997	PUSHs (sv_2mortal (newSViv (h)));
724	}	998	}
725		999
726	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
727	xy_to_index (CFClient::Layout self, int x, int y)	1013	xy_to_index (CFPlus::Layout self, int x, int y)
728	CODE:	1014	CODE:
729	{	1015	{
730	int index, trailing;	1016	int index, trailing;
731	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);
732	RETVAL = index;	1018	RETVAL = index;
733	}	1019	}
734	OUTPUT:	1020	OUTPUT:
735	RETVAL	1021	RETVAL
736		1022
737	void	1023	void
738	cursor_pos (CFClient::Layout self, int index)	1024	cursor_pos (CFPlus::Layout self, int index)
739	PPCODE:	1025	PPCODE:
740	{	1026	{
741	PangoRectangle strong_pos;	1027	PangoRectangle strong_pos;
742	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1028	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
743		1029
…		…
746	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1032	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
747	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1033	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
748	}	1034	}
749		1035
750	void	1036	void
751	render (CFClient::Layout self)	1037	render (CFPlus::Layout self, float x, float y, int flags = 0)
752	PPCODE:	1038	PPCODE:
753	{	1039	pango_opengl_render_layout_subpixel (
754	SV *retval;	1040	self->pl,
755	int w, h;	1041	x * PANGO_SCALE, y * PANGO_SCALE,
756	FT_Bitmap bitmap;	1042	self->r, self->g, self->b, self->a,
		1043	flags
		1044	);
757		1045
758	layout_get_pixel_size (self, &w, &h);	1046	MODULE = CFPlus PACKAGE = CFPlus::Texture
759		1047
760	retval = newSV (w * h);	1048	void
761	SvPOK_only (retval);	1049	pad2pot (SV data_, SV w_, SV *h_)
762	SvCUR_set (retval, w * h);	1050	CODE:
		1051	{
		1052	int ow = SvIV (w_);
		1053	int oh = SvIV (h_);
763		1054
764	bitmap.rows = h;	1055	if (ow && oh)
765	bitmap.width = w;	1056	{
766	bitmap.pitch = w;	1057	int nw = minpot (ow);
767	bitmap.buffer = (unsigned char*)SvPVX (retval);	1058	int nh = minpot (oh);
768	bitmap.num_grays = 256;
769	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
770		1059
771	memset (bitmap.buffer, 0, w * h);	1060	if (nw != ow \|\| nh != oh)
772		1061	{
773	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));
774		1068
775	EXTEND (SP, 3);	1069	SvPOK_only (result_);
776	PUSHs (sv_2mortal (newSViv (w)));	1070	SvCUR_set (result_, nw * nh * bpp);
777	PUSHs (sv_2mortal (newSViv (h)));
778	PUSHs (sv_2mortal (retval));
779	}
780		1071
781	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);
782		1075
		1076	sv_setsv (data_, result_);
		1077	}
		1078
		1079	sv_setiv (w_, nw);
		1080	sv_setiv (h_, nh);
		1081	}
		1082	}
		1083	}
		1084
783	void	1085	void
784	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.)
785	PROTOTYPE: $$$;$$	1087	PROTOTYPE: $$$;$$
		1088	ALIAS:
		1089	draw_quad_alpha = 1
		1090	draw_quad_alpha_premultiplied = 2
786	CODE:	1091	CODE:
787	{	1092	{
788	HV hv = (HV )SvRV (self);	1093	HV hv = (HV )SvRV (self);
789	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1094	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
790	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1095	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
791	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1096	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
792	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
793		1097
794	if (items < 5)	1098	if (items < 5)
795	{	1099	{
796	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1100	w = SvNV (*hv_fetch (hv, "w", 1, 1));
797	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1101	h = SvNV (*hv_fetch (hv, "h", 1, 1));
798	}	1102	}
799		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
800	glBindTexture (GL_TEXTURE_2D, name);	1118	glBindTexture (GL_TEXTURE_2D, name);
801	if (wrap_mode) {	1119
802	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
803	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
804	}
805	glBegin (GL_QUADS);	1120	glBegin (GL_QUADS);
806	glTexCoord2f (0, 0); glVertex2f (x , y );	1121	glTexCoord2f (0, 0); glVertex2f (x , y );
807	glTexCoord2f (0, t); glVertex2f (x , y + h);	1122	glTexCoord2f (0, t); glVertex2f (x , y + h);
808	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1123	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
809	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1124	glTexCoord2f (s, 0); glVertex2f (x + w, y );
810	glEnd ();	1125	glEnd ();
811	}
812		1126
		1127	if (ix)
		1128	{
		1129	glDisable (GL_ALPHA_TEST);
		1130	glDisable (GL_BLEND);
		1131	}
		1132	}
		1133
813	MODULE = CFClient PACKAGE = CFClient::Map	1134	MODULE = CFPlus PACKAGE = CFPlus::Map
814		1135
815	CFClient::Map	1136	CFPlus::Map
816	new (SV *class, int map_width, int map_height)	1137	new (SV *class, int map_width, int map_height)
817	CODE:	1138	CODE:
818	New (0, RETVAL, 1, struct map);	1139	New (0, RETVAL, 1, struct map);
819	RETVAL->x = 0;	1140	RETVAL->x = 0;
820	RETVAL->y = 0;	1141	RETVAL->y = 0;
…		…
830	RETVAL->row = 0;	1151	RETVAL->row = 0;
831	OUTPUT:	1152	OUTPUT:
832	RETVAL	1153	RETVAL
833		1154
834	void	1155	void
835	DESTROY (CFClient::Map self)	1156	DESTROY (CFPlus::Map self)
836	CODE:	1157	CODE:
837	{	1158	{
838	map_clear (self);	1159	map_clear (self);
839	Safefree (self->face);	1160	Safefree (self->face);
		1161	Safefree (self->tex);
840	Safefree (self);	1162	Safefree (self);
841	}	1163	}
842		1164
843	void	1165	void
844	clear (CFClient::Map self)	1166	clear (CFPlus::Map self)
845	CODE:	1167	CODE:
846	map_clear (self);	1168	map_clear (self);
847		1169
848	void	1170	void
849	set_face (CFClient::Map self, int face, int texid)	1171	set_face (CFPlus::Map self, int face, int texid)
850	CODE:	1172	CODE:
851	{	1173	{
852	while (self->faces <= face)	1174	while (self->faces <= face)
853	{	1175	{
854	Append (mapface, self->face, self->faces, self->faces);	1176	Append (mapface, self->face, self->faces, self->faces);
…		…
857		1179
858	self->face [face] = texid;	1180	self->face [face] = texid;
859	}	1181	}
860		1182
861	void	1183	void
862	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)
863	CODE:	1185	CODE:
864	{	1186	{
865	while (self->texs <= texid)	1187	while (self->texs <= texid)
866	{	1188	{
867	Append (maptex, self->tex, self->texs, self->texs);	1189	Append (maptex, self->tex, self->texs, self->texs);
…		…
879	tex->r = r;	1201	tex->r = r;
880	tex->g = g;	1202	tex->g = g;
881	tex->b = b;	1203	tex->b = b;
882	tex->a = a;	1204	tex->a = a;
883	}	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);
884	}	1215	}
885		1216
886	int	1217	int
887	ox (CFClient::Map self)	1218	ox (CFPlus::Map self)
888	ALIAS:	1219	ALIAS:
889	oy = 1	1220	oy = 1
		1221	x = 2
		1222	y = 3
		1223	w = 4
		1224	h = 5
890	CODE:	1225	CODE:
891	switch (ix)	1226	switch (ix)
892	{	1227	{
893	case 0: RETVAL = self->ox; break;	1228	case 0: RETVAL = self->ox; break;
894	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;
895	}	1234	}
896	OUTPUT:	1235	OUTPUT:
897	RETVAL	1236	RETVAL
898		1237
899	void	1238	void
900	scroll (CFClient::Map self, int dx, int dy)	1239	scroll (CFPlus::Map self, int dx, int dy)
901	CODE:	1240	CODE:
902	{	1241	{
903	if (dx > 0)	1242	if (dx > 0)
904	map_blank (self, self->x, self->y, dx - 1, self->h);	1243	map_blank (self, self->x, self->y, dx - 1, self->h);
905	else if (dx < 0)	1244	else if (dx < 0)
…		…
921	self->y += MAP_EXTEND_Y;	1260	self->y += MAP_EXTEND_Y;
922	}	1261	}
923	}	1262	}
924		1263
925	void	1264	void
926	map1a_update (CFClient::Map self, SV *data_)	1265	map1a_update (CFPlus::Map self, SV *data_, int extmap)
927	CODE:	1266	CODE:
928	{	1267	{
929	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1268	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
930	uint8_t data_end = (uint8_t )SvEND (data_);	1269	uint8_t data_end = (uint8_t )SvEND (data_);
931	mapcell *cell;	1270	mapcell *cell;
…		…
933		1272
934	while (data < data_end)	1273	while (data < data_end)
935	{	1274	{
936	flags = (data [0] << 8) + data [1]; data += 2;	1275	flags = (data [0] << 8) + data [1]; data += 2;
937		1276
938	x = ((flags >> 10) & 63) + self->x;	1277	x = self->x + ((flags >> 10) & 63);
939	y = ((flags >> 4) & 63) + self->y;	1278	y = self->y + ((flags >> 4) & 63);
940		1279
941	cell = map_get_cell (self, x, y);	1280	cell = map_get_cell (self, x, y);
942		1281
943	if (flags & 15)	1282	if (flags & 15)
944	{	1283	{
…		…
948	cell->face [0] = 0;	1287	cell->face [0] = 0;
949	cell->face [1] = 0;	1288	cell->face [1] = 0;
950	cell->face [2] = 0;	1289	cell->face [2] = 0;
951	}	1290	}
952		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
953	cell->darkness = flags & 8 ? *data++ : 255;	1313	cell->darkness = flags & 8 ? *data++ : 255;
		1314	}
954		1315
955	//TODO: don't trust server data to be in-range(!)	1316	//TODO: don't trust server data to be in-range(!)
956		1317
957	if (flags & 4)	1318	if (flags & 4)
958	{	1319	{
…		…
973	cell->darkness = -1;	1334	cell->darkness = -1;
974	}	1335	}
975	}	1336	}
976		1337
977	SV *	1338	SV *
978	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)
979	CODE:	1340	CODE:
980	{	1341	{
981	int x1, x;	1342	int x1, x;
982	int y1, y;	1343	int y1, y;
983	int z;	1344	int z;
…		…
1033	}	1394	}
1034	OUTPUT:	1395	OUTPUT:
1035	RETVAL	1396	RETVAL
1036		1397
1037	void	1398	void
1038	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)
1039	PPCODE:	1400	CODE:
1040	{	1401	{
1041	int vx, vy;	1402	int vx, vy;
1042	int x, y, z;	1403	int x, y, z;
1043	int last_name;	1404	int last_name;
1044	mapface face;	1405	mapface face;
1045	int sw4 = (sw + 3) & ~3;
1046	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1047	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1048		1406
1049	memset (darkness, 255, sw4 * sh);
1050	SvPOK_only (darkness_sv);
1051	SvCUR_set (darkness_sv, sw4 * sh);
1052
1053	vx = self->x + (self->w - sw) / 2 - shift_x;	1407	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1054	vy = self->y + (self->h - sh) / 2 - shift_y;	1408	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1055		1409
1056	/*	1410	/*
1057	int vx = self->vx = self->w >= sw	1411	int vx = self->vx = self->w >= sw
1058	? self->x + (self->w - sw) / 2	1412	? self->x + (self->w - sw) / 2
1059	: 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));
…		…
1063	: 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));
1064	*/	1418	*/
1065		1419
1066	glColor4ub (255, 255, 255, 255);	1420	glColor4ub (255, 255, 255, 255);
1067		1421
		1422	glEnable (GL_BLEND);
1068	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1423	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1069	glEnable (GL_BLEND);
1070	glEnable (GL_TEXTURE_2D);	1424	glEnable (GL_TEXTURE_2D);
1071	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1425	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1072		1426
1073	glBegin (GL_QUADS);	1427	glBegin (GL_QUADS);
1074		1428
…		…
1082		1436
1083	for (x = 0; x < sw; x++)	1437	for (x = 0; x < sw; x++)
1084	if (row->c0 <= x + vx && x + vx < row->c1)	1438	if (row->c0 <= x + vx && x + vx < row->c1)
1085	{	1439	{
1086	mapcell *cell = row->col + (x + vx - row->c0);	1440	mapcell *cell = row->col + (x + vx - row->c0);
1087
1088	darkness[y * sw4 + x] = cell->darkness < 0
1089	? 255 - FOW_DARKNESS
1090	: 255 - cell->darkness;
1091		1441
1092	face = cell->face [z];	1442	face = cell->face [z];
1093		1443
1094	if (face)	1444	if (face)
1095	{	1445	{
…		…
1116		1466
1117	glEnd ();	1467	glEnd ();
1118		1468
1119	glDisable (GL_TEXTURE_2D);	1469	glDisable (GL_TEXTURE_2D);
1120	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	}
1121		1565
1122	EXTEND (SP, 3);	1566	EXTEND (SP, 3);
1123	PUSHs (sv_2mortal (newSViv (sw4)));	1567	PUSHs (sv_2mortal (newSViv (sw4)));
1124	PUSHs (sv_2mortal (newSViv (sh)));	1568	PUSHs (sv_2mortal (newSViv (sh)));
1125	PUSHs (darkness_sv);	1569	PUSHs (darkness_sv);
1126	}	1570	}
1127		1571
1128	SV *	1572	SV *
1129	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)
1130	CODE:	1574	CODE:
1131	{	1575	{
1132	int x, y, x1, y1;	1576	int x, y, x1, y1;
1133	SV data_sv = newSV (w h * 7 + 5);	1577	SV data_sv = newSV (w h * 7 + 5);
1134	uint8_t data = (uint8_t )SvPVX (data_sv);	1578	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1196	}	1640	}
1197	OUTPUT:	1641	OUTPUT:
1198	RETVAL	1642	RETVAL
1199		1643
1200	void	1644	void
1201	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)
1202	PPCODE:	1646	PPCODE:
1203	{	1647	{
1204	int x, y, z;	1648	int x, y, z;
1205	int w, h;	1649	int w, h;
1206	int x1, y1;	1650	int x1, y1;
…		…
1255	}	1699	}
1256	}	1700	}
1257	}	1701	}
1258	}	1702	}
1259		1703
1260	MODULE = CFClient PACKAGE = CFClient::MixChunk	1704	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1261		1705
1262	CFClient::MixChunk	1706	CFPlus::MixChunk
1263	new_from_file (SV class, char path)	1707	new_from_file (SV class, char path)
1264	CODE:	1708	CODE:
1265	RETVAL = Mix_LoadWAV (path);	1709	RETVAL = Mix_LoadWAV (path);
1266	OUTPUT:	1710	OUTPUT:
1267	RETVAL	1711	RETVAL
1268		1712
1269	void	1713	void
1270	DESTROY (CFClient::MixChunk self)	1714	DESTROY (CFPlus::MixChunk self)
1271	CODE:	1715	CODE:
1272	Mix_FreeChunk (self);	1716	Mix_FreeChunk (self);
1273		1717
1274	int	1718	int
1275	volume (CFClient::MixChunk self, int volume = -1)	1719	volume (CFPlus::MixChunk self, int volume = -1)
1276	CODE:	1720	CODE:
1277	RETVAL = Mix_VolumeChunk (self, volume);	1721	RETVAL = Mix_VolumeChunk (self, volume);
1278	OUTPUT:	1722	OUTPUT:
1279	RETVAL	1723	RETVAL
1280		1724
1281	int	1725	int
1282	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)
1283	CODE:	1727	CODE:
1284	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1728	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1285	OUTPUT:	1729	OUTPUT:
1286	RETVAL	1730	RETVAL
1287		1731
1288	MODULE = CFClient PACKAGE = CFClient::MixMusic	1732	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1289		1733
1290	int	1734	int
1291	volume (int volume = -1)	1735	volume (int volume = -1)
1292	CODE:	1736	CODE:
1293	RETVAL = Mix_VolumeMusic (volume);	1737	RETVAL = Mix_VolumeMusic (volume);
1294	OUTPUT:	1738	OUTPUT:
1295	RETVAL	1739	RETVAL
1296		1740
1297	CFClient::MixMusic	1741	CFPlus::MixMusic
1298	new_from_file (SV class, char path)	1742	new_from_file (SV class, char path)
1299	CODE:	1743	CODE:
1300	RETVAL = Mix_LoadMUS (path);	1744	RETVAL = Mix_LoadMUS (path);
1301	OUTPUT:	1745	OUTPUT:
1302	RETVAL	1746	RETVAL
1303		1747
1304	void	1748	void
1305	DESTROY (CFClient::MixMusic self)	1749	DESTROY (CFPlus::MixMusic self)
1306	CODE:	1750	CODE:
1307	Mix_FreeMusic (self);	1751	Mix_FreeMusic (self);
1308		1752
1309	int	1753	int
1310	play (CFClient::MixMusic self, int loops = -1)	1754	play (CFPlus::MixMusic self, int loops = -1)
1311	CODE:	1755	CODE:
1312	RETVAL = Mix_PlayMusic (self, loops);	1756	RETVAL = Mix_PlayMusic (self, loops);
1313	OUTPUT:	1757	OUTPUT:
1314	RETVAL	1758	RETVAL
1315		1759
1316	MODULE = CFClient PACKAGE = CFClient::OpenGL	1760	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1317		1761
1318	BOOT:	1762	BOOT:
1319	{	1763	{
1320	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1764	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1321	static const struct {	1765	static const struct {
1322	const char *name;	1766	const char *name;
1323	IV iv;	1767	IV iv;
1324	} *civ, const_iv[] = {	1768	} *civ, const_iv[] = {
1325	# define const_iv(name) { # name, (IV)name }	1769	# define const_iv(name) { # name, (IV)name }
1326	const_iv (GL_COLOR_MATERIAL),	1770	const_iv (GL_COLOR_MATERIAL),
1327	const_iv (GL_SMOOTH),	1771	const_iv (GL_SMOOTH),
1328	const_iv (GL_FLAT),	1772	const_iv (GL_FLAT),
		1773	const_iv (GL_DITHER),
1329	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),
1330	const_iv (GL_AND),	1783	const_iv (GL_AND),
		1784	const_iv (GL_ONE),
		1785	const_iv (GL_ZERO),
1331	const_iv (GL_SRC_ALPHA),	1786	const_iv (GL_SRC_ALPHA),
		1787	const_iv (GL_DST_ALPHA),
1332	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),
1333	const_iv (GL_RGB),	1791	const_iv (GL_RGB),
1334	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),
1335	const_iv (GL_UNSIGNED_BYTE),	1796	const_iv (GL_UNSIGNED_BYTE),
1336	const_iv (GL_ALPHA4),	1797	const_iv (GL_UNSIGNED_SHORT),
		1798	const_iv (GL_UNSIGNED_INT),
1337	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),
1338	const_iv (GL_FLOAT),	1803	const_iv (GL_FLOAT),
1339	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1804	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1340	const_iv (GL_COMPILE),	1805	const_iv (GL_COMPILE),
1341	const_iv (GL_TEXTURE_1D),	1806	const_iv (GL_TEXTURE_1D),
1342	const_iv (GL_TEXTURE_2D),	1807	const_iv (GL_TEXTURE_2D),
…		…
1344	const_iv (GL_TEXTURE_MAG_FILTER),	1809	const_iv (GL_TEXTURE_MAG_FILTER),
1345	const_iv (GL_TEXTURE_MIN_FILTER),	1810	const_iv (GL_TEXTURE_MIN_FILTER),
1346	const_iv (GL_TEXTURE_ENV_MODE),	1811	const_iv (GL_TEXTURE_ENV_MODE),
1347	const_iv (GL_TEXTURE_WRAP_S),	1812	const_iv (GL_TEXTURE_WRAP_S),
1348	const_iv (GL_TEXTURE_WRAP_T),	1813	const_iv (GL_TEXTURE_WRAP_T),
		1814	const_iv (GL_REPEAT),
1349	const_iv (GL_CLAMP),	1815	const_iv (GL_CLAMP),
1350	const_iv (GL_REPEAT),	1816	const_iv (GL_CLAMP_TO_EDGE),
1351	const_iv (GL_NEAREST),	1817	const_iv (GL_NEAREST),
1352	const_iv (GL_LINEAR),	1818	const_iv (GL_LINEAR),
1353	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1819	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1354	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1820	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1355	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1821	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1356	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1822	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1357	const_iv (GL_GENERATE_MIPMAP),	1823	const_iv (GL_GENERATE_MIPMAP),
1358	const_iv (GL_LINEAR),
1359	const_iv (GL_MODULATE),	1824	const_iv (GL_MODULATE),
		1825	const_iv (GL_DECAL),
1360	const_iv (GL_REPLACE),	1826	const_iv (GL_REPLACE),
		1827	const_iv (GL_DEPTH_BUFFER_BIT),
1361	const_iv (GL_COLOR_BUFFER_BIT),	1828	const_iv (GL_COLOR_BUFFER_BIT),
1362	const_iv (GL_PROJECTION),	1829	const_iv (GL_PROJECTION),
1363	const_iv (GL_MODELVIEW),	1830	const_iv (GL_MODELVIEW),
1364	const_iv (GL_COLOR_LOGIC_OP),	1831	const_iv (GL_COLOR_LOGIC_OP),
		1832	const_iv (GL_SEPARABLE_2D),
1365	const_iv (GL_CONVOLUTION_2D),	1833	const_iv (GL_CONVOLUTION_2D),
1366	const_iv (GL_CONVOLUTION_BORDER_MODE),	1834	const_iv (GL_CONVOLUTION_BORDER_MODE),
1367	const_iv (GL_CONSTANT_BORDER),	1835	const_iv (GL_CONSTANT_BORDER),
1368	const_iv (GL_LINES),	1836	const_iv (GL_LINES),
		1837	const_iv (GL_LINE_STRIP),
		1838	const_iv (GL_LINE_LOOP),
1369	const_iv (GL_QUADS),	1839	const_iv (GL_QUADS),
1370	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),
1371	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1844	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1372	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),
1373	# undef const_iv	1850	# undef const_iv
1374	};	1851	};
1375		1852
1376	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; )
1377	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1854	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1378	}	1855	}
1379		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
1380	int glGetError ()	1878	int glGetError ()
		1879
		1880	void glFinish ()
1381		1881
1382	void glClear (int mask)	1882	void glClear (int mask)
1383		1883
1384	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)
1385	PROTOTYPE: @	1885	PROTOTYPE: @
…		…
1392		1892
1393	void glHint (int target, int mode)	1893	void glHint (int target, int mode)
1394		1894
1395	void glBlendFunc (int sfactor, int dfactor)	1895	void glBlendFunc (int sfactor, int dfactor)
1396		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
1397	void glLogicOp (int opcode)	1903	void glLogicOp (int opcode)
1398		1904
		1905	void glColorMask (int red, int green, int blue, int alpha)
		1906
1399	void glMatrixMode (int mode)	1907	void glMatrixMode (int mode)
1400		1908
1401	void glPushMatrix ()	1909	void glPushMatrix ()
1402		1910
1403	void glPopMatrix ()	1911	void glPopMatrix ()
1404		1912
1405	void glLoadIdentity ()	1913	void glLoadIdentity ()
1406		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
1407	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_)
1408		1924
1409	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)
1410		1928
1411	void glTranslate (float x, float y, float z = 0.)	1929	void glTranslate (float x, float y, float z = 0.)
1412	CODE:	1930	CODE:
1413	glTranslatef (x, y, z);	1931	glTranslatef (x, y, z);
1414		1932
1415	void glScale (float x, float y, float z)	1933	void glScale (float x, float y, float z = 1.)
1416	CODE:	1934	CODE:
1417	glScalef (x, y, z);	1935	glScalef (x, y, z);
1418		1936
1419	void glRotate (float angle, float x, float y, float z)	1937	void glRotate (float angle, float x, float y, float z)
1420	CODE:	1938	CODE:
…		…
1424		1942
1425	void glEnd ()	1943	void glEnd ()
1426		1944
1427	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)
1428	PROTOTYPE: @	1946	PROTOTYPE: @
		1947	ALIAS:
		1948	glColor_premultiply = 1
1429	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...
1430	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);
1431		1969
1432	void glVertex (float x, float y, float z = 0.)	1970	void glVertex (float x, float y, float z = 0.)
1433	CODE:	1971	CODE:
1434	glVertex3f (x, y, z);	1972	glVertex3f (x, y, z);
1435		1973
…		…
1447		1985
1448	void glBindTexture (int target, int name)	1986	void glBindTexture (int target, int name)
1449		1987
1450	void glConvolutionParameter (int target, int pname, float params)	1988	void glConvolutionParameter (int target, int pname, float params)
1451	CODE:	1989	CODE:
		1990	if (gl.ConvolutionParameterf)
1452	glConvolutionParameterf (target, pname, params);	1991	gl.ConvolutionParameterf (target, pname, params);
1453		1992
1454	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);
1455		2002
1456	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)
1457		2004
1458	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)
1459		2010
1460	int glGenTexture ()	2011	int glGenTexture ()
1461	CODE:	2012	CODE:
1462	{	2013	{
1463	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.61 by root, Sun Apr 23 21:47:30 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.61 by root, Sun Apr 23 21:47:30 2006 UTC vs.
Revision 1.141 by root, Fri Aug 18 01:01:00 2006 UTC