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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.55 by root, Thu Apr 20 08:11:56 2006 UTC vs. Revision 1.147 by root, Sat Aug 19 03:57:08 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.55 by root, Thu Apr 20 08:11:56 2006 UTC vs.
Revision 1.147 by root, Sat Aug 19 03:57:08 2006 UTC