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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.58 by root, Sun Apr 23 00:57:38 2006 UTC vs.
Revision 1.150 by root, Sat Aug 19 17:24:39 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
		3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2	# include <malloc.h>	4	# include <malloc.h>
		5	# include <windows.h>
		6	# pragma warning(disable:4244)
3	#endif	7	#endif
4		8
5	#include "EXTERN.h"	9	#include "EXTERN.h"
6	#include "perl.h"	10	#include "perl.h"
7	#include "XSUB.h"	11	#include "XSUB.h"
8		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
		17	#include <math.h>
9	#include <string.h>	18	#include <string.h>
10	#include <stdio.h>	19	#include <stdio.h>
		20	#include <stdlib.h>
11		21
12	#include <SDL.h>	22	#include <SDL.h>
		23	#include <SDL_endian.h>
13	#include <SDL_image.h>	24	#include <SDL_image.h>
14	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
15	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
16		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
17	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
18		32
19	#include <pango/pango.h>	33	#include <pango/pango.h>
20	#include <pango/pangofc-fontmap.h>
21	#include <pango/pangoft2.h>
22		34
23	#ifndef _WIN32	35	#ifndef _WIN32
24	# include <sys/types.h>	36	# include <sys/types.h>
25	# include <sys/socket.h>	37	# include <sys/socket.h>
26	# include <netinet/in.h>	38	# include <netinet/in.h>
33	typedef signed char int8_t;	45	typedef signed char int8_t;
34	typedef signed short int16_t;	46	typedef signed short int16_t;
35	typedef signed int int32_t;	47	typedef signed int int32_t;
36	#endif	48	#endif
37		49
38	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
39		51
40	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
41		53
42	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
43	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
44		56
45	#define MIN_FONT_HEIGHT 8 * PANGO_SCALE	57	#define MIN_FONT_HEIGHT 10
46		58
		59	#if 0
		60	# define PARACHUTE SDL_INIT_NOPARACHUTE
		61	#else
		62	# define PARACHUTE 0
		63	#endif
		64
		65	static struct
		66	{
		67	#define GL_FUNC(ptr,name) ptr name;
		68	#include "glfunc.h"
		69	#undef GL_FUNC
		70	} gl;
		71
		72	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
		73	{
		74	if (gl.BlendFuncSeparate)
		75	gl.BlendFuncSeparate (sa, da, saa, daa);
		76	else if (gl.BlendFuncSeparateEXT)
		77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
		78	else
		79	glBlendFunc (sa, da);
		80	}
		81
		82	#include "texcache.c"
		83
		84	#include "pango-font.c"
		85	#include "pango-fontmap.c"
		86	#include "pango-render.c"
		87
47	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
48	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
49		90
50	static PangoContext *context;	91	typedef PangoFontDescription *CFPlus__Font;
51	static PangoFontMap *fontmap;	92
		93	static int
		94	shape_attr_p (PangoLayoutRun *run)
		95	{
		96	GSList *attrs = run->item->analysis.extra_attrs;
		97
		98	while (attrs)
		99	{
		100	PangoAttribute *attr = attrs->data;
		101
		102	if (attr->klass->type == PANGO_ATTR_SHAPE)
		103	return 1;
		104
		105	attrs = attrs->next;
		106	}
		107
		108	return 0;
		109	}
52		110
53	typedef struct cf_layout {	111	typedef struct cf_layout {
54	PangoLayout *pl;	112	PangoLayout *pl;
		113	float r, g, b, a; // default color for rgba mode
55	int base_height;	114	int base_height;
		115	CFPlus__Font font;
56	} *CFClient__Layout;	116	} *CFPlus__Layout;
		117
		118	static CFPlus__Font default_font;
		119	static PangoContext *opengl_context;
		120	static PangoFontMap *opengl_fontmap;
57		121
58	static void	122	static void
59	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
60	{	124	{
61	FcPatternAddBool (pattern, FC_HINTING , 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
		126	#ifdef FC_HINT_STYLE
		127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		128	#endif
62	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
63	}	130	}
64		131
65	static void	132	static void
66	layout_update (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
67	{	134	{
68	/* use a random scale factor to account for unknown descenders, 0.8 works	135	/* use a random scale factor to account for unknown descenders, 0.8 works
69	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
70	*/	137	*/
71	PangoFontDescription *font = pango_context_get_font_description (context);	138	PangoFontDescription *font = self->font ? self->font : default_font;
72		139
73	int height = self->base_height * (PANGO_SCALE * 8 / 10);
74
75	if (height < MIN_FONT_HEIGHT)
76	height = MIN_FONT_HEIGHT;
77
78	if (pango_font_description_get_size (font) != height)
79	{
80	pango_font_description_set_absolute_size (font, height);	140	pango_font_description_set_absolute_size (font,
81	pango_layout_context_changed (self->pl);	141	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
82	}	142
		143	pango_layout_set_font_description (self->pl, font);
83	}	144	}
84		145
85	static void	146	static void
86	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
87	{	148	{
88	layout_update (self);	149	PangoRectangle rect;
89		150
		151	// get_pixel_* wrongly rounds down
90	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
91		153
92	w = (w + 3) & ~3;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
93	if (!w) w = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
94	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;
95	}	162	}
96		163
97	typedef uint16_t mapface;	164	typedef uint16_t mapface;
98		165
99	typedef struct {	166	typedef struct {
…		…
102	float s, t;	169	float s, t;
103	uint8_t r, g, b, a;	170	uint8_t r, g, b, a;
104	} maptex;	171	} maptex;
105		172
106	typedef struct {	173	typedef struct {
107	int16_t darkness;	174	uint16_t darkness;
108	mapface face[3];	175	mapface face[3];
		176	uint8_t stat_width, stat_hp;
109	} mapcell;	177	} mapcell;
110		178
111	typedef struct {	179	typedef struct {
112	int32_t c0, c1;	180	int32_t c0, c1;
113	mapcell *col;	181	mapcell *col;
…		…
122	int texs;	190	int texs;
123	maptex *tex;	191	maptex *tex;
124		192
125	int32_t rows;	193	int32_t rows;
126	maprow *row;	194	maprow *row;
127	} *CFClient__Map;	195	} *CFPlus__Map;
128		196
129	static char *	197	static char *
130	prepend (char *ptr, int sze, int inc)	198	prepend (char *ptr, int sze, int inc)
131	{	199	{
132	char *p;	200	char *p;
…		…
150		218
151	#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))
152	#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))
153		221
154	static maprow *	222	static maprow *
155	map_get_row (CFClient__Map self, int y)	223	map_get_row (CFPlus__Map self, int y)
156	{	224	{
157	if (0 > y)	225	if (0 > y)
158	{	226	{
159	int extend = - y + MAP_EXTEND_Y;	227	int extend = - y + MAP_EXTEND_Y;
160	Prepend (maprow, self->row, self->rows, extend);	228	Prepend (maprow, self->row, self->rows, extend);
…		…
198		266
199	return row->col + (x - row->c0);	267	return row->col + (x - row->c0);
200	}	268	}
201		269
202	static mapcell *	270	static mapcell *
203	map_get_cell (CFClient__Map self, int x, int y)	271	map_get_cell (CFPlus__Map self, int x, int y)
204	{	272	{
205	return row_get_cell (map_get_row (self, y), x);	273	return row_get_cell (map_get_row (self, y), x);
206	}	274	}
207		275
208	static void	276	static void
209	map_clear (CFClient__Map self)	277	map_clear (CFPlus__Map self)
210	{	278	{
211	int r;	279	int r;
212		280
213	for (r = 0; r < self->rows; r++)	281	for (r = 0; r < self->rows; r++)
214	Safefree (self->row[r].col);	282	Safefree (self->row[r].col);
…		…
222	self->row = 0;	290	self->row = 0;
223	self->rows = 0;	291	self->rows = 0;
224	}	292	}
225		293
226	static void	294	static void
227	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)
228	{	296	{
229	int x, y;	297	int x, y;
230	maprow *row;	298	maprow *row;
		299	mapcell *cell;
231		300
232	for (y = y0; y < y0 + h; y++)	301	for (y = y0; y < y0 + h; y++)
233	if (y >= 0)	302	if (y >= 0)
234	{	303	{
235	if (y >= self->rows)	304	if (y >= self->rows)
…		…
241	if (x >= row->c0)	310	if (x >= row->c0)
242	{	311	{
243	if (x >= row->c1)	312	if (x >= row->c1)
244	break;	313	break;
245		314
246	row->col[x - row->c0].darkness = -1;	315	cell = row->col + x - row->c0;
		316
		317	cell->darkness = 0;
		318	cell->stat_hp = 0;
247	}	319	}
248	}	320	}
249	}	321	}
250		322
251	static void	323	static void
252	music_finished ()	324	music_finished (void)
253	{	325	{
254	SDL_UserEvent ev;	326	SDL_UserEvent ev;
255		327
256	ev.type = SDL_USEREVENT;	328	ev.type = SDL_USEREVENT;
257	ev.code = 0;	329	ev.code = 0;
…		…
259	ev.data2 = 0;	331	ev.data2 = 0;
260		332
261	SDL_PushEvent ((SDL_Event *)&ev);	333	SDL_PushEvent ((SDL_Event *)&ev);
262	}	334	}
263		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
264	MODULE = CFClient PACKAGE = CFClient	366	MODULE = CFPlus PACKAGE = CFPlus
265		367
266	PROTOTYPES: ENABLE	368	PROTOTYPES: ENABLE
267		369
268	BOOT:	370	BOOT:
269	{	371	{
270	HV *stash = gv_stashpv ("CFClient", 1);	372	HV *stash = gv_stashpv ("CFPlus", 1);
271	static const struct {	373	static const struct {
272	const char *name;	374	const char *name;
273	IV iv;	375	IV iv;
274	} *civ, const_iv[] = {	376	} *civ, const_iv[] = {
275	# define const_iv(name) { # name, (IV)name }	377	# define const_iv(name) { # name, (IV)name }
…		…
374	# undef const_iv	476	# undef const_iv
375	};	477	};
376		478
377	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; )
378	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	480	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
379
380	fontmap = pango_ft2_font_map_new ();
381	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
382	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
383	}	481	}
384		482
385	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
386	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	504	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
387		505
388	void	506	void
389	SDL_Quit ()	507	SDL_Quit ()
390		508
391	void	509	void
…		…
397	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	515	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
398	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	516	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
399	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	517	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
400	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	518	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
401		519
		520	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		521	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		522
402	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	523	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
403	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	524	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
404	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	525	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
405	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
406		527
407	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	528	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		529	#if SDL_VERSION_ATLEAST(1,2,10)
408	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	530	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
409	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	531	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		532	#endif
410		533
411	SDL_EnableUNICODE (1);	534	SDL_EnableUNICODE (1);
412	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	535	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
413		536
414	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	537	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
423		546
424	++m;	547	++m;
425	}	548	}
426	}	549	}
427		550
		551	char *
		552	SDL_GetError ()
		553
428	int	554	int
429	SDL_SetVideoMode (int w, int h, int fullscreen)	555	SDL_SetVideoMode (int w, int h, int fullscreen)
430	CODE:	556	CODE:
431	RETVAL = !!SDL_SetVideoMode (	557	RETVAL = !!SDL_SetVideoMode (
432	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	558	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
433	);	559	);
		560	if (RETVAL)
		561	{
434	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	}
435	OUTPUT:	567	OUTPUT:
436	RETVAL	568	RETVAL
437		569
438	void	570	void
439	SDL_GL_SwapBuffers ()	571	SDL_GL_SwapBuffers ()
		572
		573	char *
		574	SDL_GetKeyName (int sym)
440		575
441	void	576	void
442	SDL_PollEvent ()	577	SDL_PollEvent ()
443	PPCODE:	578	PPCODE:
444	{	579	{
…		…
446		581
447	while (SDL_PollEvent (&ev))	582	while (SDL_PollEvent (&ev))
448	{	583	{
449	HV *hv = newHV ();	584	HV *hv = newHV ();
450	hv_store (hv, "type", 4, newSViv (ev.type), 0);	585	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		586
451	switch (ev.type)	587	switch (ev.type)
452	{	588	{
453	case SDL_KEYDOWN:	589	case SDL_KEYDOWN:
454	case SDL_KEYUP:	590	case SDL_KEYUP:
455	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	591	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
462	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	598	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
463	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	599	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
464	break;	600	break;
465		601
466	case SDL_MOUSEMOTION:	602	case SDL_MOUSEMOTION:
		603	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		604
467	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	605	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
468	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	606	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
469	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	607	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
470	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	608	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
471	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	609	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
472	break;	610	break;
473		611
474	case SDL_MOUSEBUTTONDOWN:	612	case SDL_MOUSEBUTTONDOWN:
475	case SDL_MOUSEBUTTONUP:	613	case SDL_MOUSEBUTTONUP:
		614	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		615
476	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	616	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
477	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	617	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
478	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	618	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
479	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;
480	}	627	}
481		628
482	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	629	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
483	}	630	}
484	}	631	}
485		632
486	int	633	int
487	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)
488	POSTCALL:	635	POSTCALL:
489	Mix_HookMusicFinished (music_finished);	636	Mix_HookMusicFinished (music_finished);
		637	Mix_ChannelFinished (channel_finished);
490		638
491	void	639	void
492	Mix_CloseAudio ()	640	Mix_CloseAudio ()
493		641
494	int	642	int
…		…
499	CODE:	647	CODE:
500	#ifndef _WIN32	648	#ifndef _WIN32
501	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	649	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
502	#endif	650	#endif
503		651
504	char *
505	gl_version ()
506	CODE:
507	RETVAL = (char *)glGetString (GL_VERSION);
508	OUTPUT:
509	RETVAL
510
511	char *
512	gl_extensions ()
513	CODE:
514	RETVAL = (char *)glGetString (GL_EXTENSIONS);
515	OUTPUT:
516	RETVAL
517
518	void	652	void
519	add_font (char *file)	653	add_font (char *file)
520	CODE:	654	CODE:
521	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	655	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
522
523	void
524	set_font (char *file)
525	CODE:
526	{
527	int count;
528	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )file, 0, 0, &count);
529	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
530	FcPatternDestroy (pattern);
531	pango_context_set_font_description (context, font);
532	}
533		656
534	void	657	void
535	load_image_inline (SV *image_)	658	load_image_inline (SV *image_)
536	ALIAS:	659	ALIAS:
537	load_image_file = 1	660	load_image_file = 1
…		…
579		702
580	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	703	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
581		704
582	assert (surface2->pitch == surface2->w * 4);	705	assert (surface2->pitch == surface2->w * 4);
583		706
		707	SDL_LockSurface (surface2);
584	EXTEND (SP, 5);	708	EXTEND (SP, 6);
585	PUSHs (sv_2mortal (newSViv (surface2->w)));	709	PUSHs (sv_2mortal (newSViv (surface2->w)));
586	PUSHs (sv_2mortal (newSViv (surface2->h)));	710	PUSHs (sv_2mortal (newSViv (surface2->h)));
587	SDL_LockSurface (surface2);
588	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	711	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
589	SDL_UnlockSurface (surface2);
590	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)));
591	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	713	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
592	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	714	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		715	SDL_UnlockSurface (surface2);
593		716
594	SDL_FreeSurface (surface);	717	SDL_FreeSurface (surface);
595	SDL_FreeSurface (surface2);	718	SDL_FreeSurface (surface2);
596	}	719	}
597		720
…		…
619	PUSHs (sv_2mortal (newSViv (b / y)));	742	PUSHs (sv_2mortal (newSViv (b / y)));
620	PUSHs (sv_2mortal (newSViv (a / y)));	743	PUSHs (sv_2mortal (newSViv (a / y)));
621	}	744	}
622		745
623	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
624	fatal (char *message)	755	fatal (char *message)
625	CODE:	756	CODE:
		757	fprintf (stderr, "FATAL: %s\n", message);
626	#ifdef _WIN32	758	#ifdef _WIN32
627	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	759	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
628	#else
629	fprintf (stderr, "FATAL: %s\n", message);
630	#endif	760	#endif
631	exit (1);	761	_exit (1);
632		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
633	MODULE = CFClient PACKAGE = CFClient::Layout	792	MODULE = CFPlus PACKAGE = CFPlus::Layout
634		793
635	CFClient::Layout	794	void
636	new (SV *class, int base_height = 10)	795	reset_glyph_cache ()
		796	CODE:
		797	tc_clear ();
		798
		799	CFPlus::Layout
		800	new (SV *class)
637	CODE:	801	CODE:
638	New (0, RETVAL, 1, struct cf_layout);	802	New (0, RETVAL, 1, struct cf_layout);
639	RETVAL->base_height = base_height;	803
640	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
641	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);
642	OUTPUT:	814	OUTPUT:
643	RETVAL	815	RETVAL
644		816
645	void	817	void
646	DESTROY (CFClient::Layout self)	818	DESTROY (CFPlus::Layout self)
647	CODE:	819	CODE:
648	g_object_unref (self->pl);	820	g_object_unref (self->pl);
649	Safefree (self);	821	Safefree (self);
650		822
651	void	823	void
652	set_text (CFClient::Layout self, SV *text_)	824	set_text (CFPlus::Layout self, SV *text_)
653	CODE:	825	CODE:
654	{	826	{
655	STRLEN textlen;	827	STRLEN textlen;
656	char *text = SvPVutf8 (text_, textlen);	828	char *text = SvPVutf8 (text_, textlen);
657		829
658	pango_layout_set_text (self->pl, text, textlen);	830	pango_layout_set_text (self->pl, text, textlen);
659	}	831	}
660		832
661	void	833	void
662	set_markup (CFClient::Layout self, SV *text_)	834	set_markup (CFPlus::Layout self, SV *text_)
663	CODE:	835	CODE:
664	{	836	{
665	STRLEN textlen;	837	STRLEN textlen;
666	char *text = SvPVutf8 (text_, textlen);	838	char *text = SvPVutf8 (text_, textlen);
667		839
668	pango_layout_set_markup (self->pl, text, textlen);	840	pango_layout_set_markup (self->pl, text, textlen);
669	}	841	}
670		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
671	SV *	928	SV *
672	get_text (CFClient::Layout self)	929	get_text (CFPlus::Layout self)
673	CODE:	930	CODE:
674	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	931	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
675	SvUTF8_on (RETVAL);	932	sv_utf8_decode (RETVAL);
676	OUTPUT:	933	OUTPUT:
677	RETVAL	934	RETVAL
678		935
679	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
680	set_height (CFClient::Layout self, int base_height)	954	set_height (CFPlus::Layout self, int base_height)
681	CODE:	955	CODE:
		956	if (self->base_height != base_height)
		957	{
682	self->base_height = base_height;	958	self->base_height = base_height;
		959	layout_update_font (self);
		960	}
683		961
684	void	962	void
685	set_width (CFClient::Layout self, int max_width = -1)	963	set_width (CFPlus::Layout self, int max_width = -1)
686	CODE:	964	CODE:
687	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);
688		966
689	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
690	size (CFClient::Layout self)	993	size (CFPlus::Layout self)
691	PPCODE:	994	PPCODE:
692	{	995	{
693	int w, h;	996	int w, h;
694		997
695	layout_update (self);
696	layout_get_pixel_size (self, &w, &h);	998	layout_get_pixel_size (self, &w, &h);
697		999
698	EXTEND (SP, 2);	1000	EXTEND (SP, 2);
699	PUSHs (sv_2mortal (newSViv (w)));	1001	PUSHs (sv_2mortal (newSViv (w)));
700	PUSHs (sv_2mortal (newSViv (h)));	1002	PUSHs (sv_2mortal (newSViv (h)));
701	}	1003	}
702		1004
703	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
704	xy_to_index (CFClient::Layout self, int x, int y)	1018	xy_to_index (CFPlus::Layout self, int x, int y)
705	CODE:	1019	CODE:
706	{	1020	{
707	int index, trailing;	1021	int index, trailing;
708
709	layout_update (self);
710	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);
711
712	RETVAL = index;	1023	RETVAL = index;
713	}	1024	}
714	OUTPUT:	1025	OUTPUT:
715	RETVAL	1026	RETVAL
716		1027
717	void	1028	void
718	cursor_pos (CFClient::Layout self, int index)	1029	cursor_pos (CFPlus::Layout self, int index)
719	PPCODE:	1030	PPCODE:
720	{	1031	{
721	PangoRectangle strong_pos;	1032	PangoRectangle strong_pos;
722	layout_update (self);
723	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1033	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
724		1034
725	EXTEND (SP, 3);	1035	EXTEND (SP, 3);
726	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1036	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
727	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1037	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
728	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1038	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
729	}	1039	}
730		1040
731	void	1041	void
732	render (CFClient::Layout self)	1042	render (CFPlus::Layout self, float x, float y, int flags = 0)
733	PPCODE:	1043	PPCODE:
734	{	1044	pango_opengl_render_layout_subpixel (
735	SV *retval;	1045	self->pl,
736	int w, h;	1046	x * PANGO_SCALE, y * PANGO_SCALE,
737	FT_Bitmap bitmap;	1047	self->r, self->g, self->b, self->a,
		1048	flags
		1049	);
738		1050
739	layout_update (self);	1051	MODULE = CFPlus PACKAGE = CFPlus::Texture
740	layout_get_pixel_size (self, &w, &h);
741		1052
742	retval = newSV (w * h);	1053	void
743	SvPOK_only (retval);	1054	pad2pot (SV data_, SV w_, SV *h_)
744	SvCUR_set (retval, w * h);	1055	CODE:
		1056	{
		1057	int ow = SvIV (w_);
		1058	int oh = SvIV (h_);
745		1059
746	bitmap.rows = h;	1060	if (ow && oh)
747	bitmap.width = w;	1061	{
748	bitmap.pitch = w;	1062	int nw = minpot (ow);
749	bitmap.buffer = (unsigned char*)SvPVX (retval);	1063	int nh = minpot (oh);
750	bitmap.num_grays = 256;
751	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
752		1064
753	memset (bitmap.buffer, 0, w * h);	1065	if (nw != ow \|\| nh != oh)
754		1066	{
755	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));
756		1073
757	EXTEND (SP, 3);	1074	SvPOK_only (result_);
758	PUSHs (sv_2mortal (newSViv (w)));	1075	SvCUR_set (result_, nw * nh * bpp);
759	PUSHs (sv_2mortal (newSViv (h)));
760	PUSHs (sv_2mortal (retval));
761	}
762		1076
763	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);
764		1080
		1081	sv_setsv (data_, result_);
		1082	}
		1083
		1084	sv_setiv (w_, nw);
		1085	sv_setiv (h_, nh);
		1086	}
		1087	}
		1088	}
		1089
765	void	1090	void
766	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.)
767	PROTOTYPE: $$$;$$	1092	PROTOTYPE: $$$;$$
		1093	ALIAS:
		1094	draw_quad_alpha = 1
		1095	draw_quad_alpha_premultiplied = 2
768	CODE:	1096	CODE:
769	{	1097	{
770	HV hv = (HV )SvRV (self);	1098	HV hv = (HV )SvRV (self);
771	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1099	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
772	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1100	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
773	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1101	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
774	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
775		1102
776	if (items < 5)	1103	if (items < 5)
777	{	1104	{
778	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1105	w = SvNV (*hv_fetch (hv, "w", 1, 1));
779	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1106	h = SvNV (*hv_fetch (hv, "h", 1, 1));
780	}	1107	}
781		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
782	glBindTexture (GL_TEXTURE_2D, name);	1123	glBindTexture (GL_TEXTURE_2D, name);
783	if (wrap_mode) {	1124
784	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
785	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
786	}
787	glBegin (GL_QUADS);	1125	glBegin (GL_QUADS);
788	glTexCoord2f (0, 0); glVertex2f (x , y );	1126	glTexCoord2f (0, 0); glVertex2f (x , y );
789	glTexCoord2f (0, t); glVertex2f (x , y + h);	1127	glTexCoord2f (0, t); glVertex2f (x , y + h);
790	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1128	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
791	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1129	glTexCoord2f (s, 0); glVertex2f (x + w, y );
792	glEnd ();	1130	glEnd ();
793	}
794		1131
		1132	if (ix)
		1133	{
		1134	glDisable (GL_ALPHA_TEST);
		1135	glDisable (GL_BLEND);
		1136	}
		1137	}
		1138
795	MODULE = CFClient PACKAGE = CFClient::Map	1139	MODULE = CFPlus PACKAGE = CFPlus::Map
796		1140
797	CFClient::Map	1141	CFPlus::Map
798	new (SV *class, int map_width, int map_height)	1142	new (SV *class, int map_width, int map_height)
799	CODE:	1143	CODE:
800	New (0, RETVAL, 1, struct map);	1144	New (0, RETVAL, 1, struct map);
801	RETVAL->x = 0;	1145	RETVAL->x = 0;
802	RETVAL->y = 0;	1146	RETVAL->y = 0;
…		…
812	RETVAL->row = 0;	1156	RETVAL->row = 0;
813	OUTPUT:	1157	OUTPUT:
814	RETVAL	1158	RETVAL
815		1159
816	void	1160	void
817	DESTROY (CFClient::Map self)	1161	DESTROY (CFPlus::Map self)
818	CODE:	1162	CODE:
819	{	1163	{
820	map_clear (self);	1164	map_clear (self);
821	Safefree (self->face);	1165	Safefree (self->face);
		1166	Safefree (self->tex);
822	Safefree (self);	1167	Safefree (self);
823	}	1168	}
824		1169
825	void	1170	void
826	clear (CFClient::Map self)	1171	clear (CFPlus::Map self)
827	CODE:	1172	CODE:
828	map_clear (self);	1173	map_clear (self);
829		1174
830	void	1175	void
831	set_face (CFClient::Map self, int face, int texid)	1176	set_face (CFPlus::Map self, int face, int texid)
832	CODE:	1177	CODE:
833	{	1178	{
834	while (self->faces <= face)	1179	while (self->faces <= face)
835	{	1180	{
836	Append (mapface, self->face, self->faces, self->faces);	1181	Append (mapface, self->face, self->faces, self->faces);
…		…
839		1184
840	self->face [face] = texid;	1185	self->face [face] = texid;
841	}	1186	}
842		1187
843	void	1188	void
844	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)
845	CODE:	1190	CODE:
846	{	1191	{
847	while (self->texs <= texid)	1192	while (self->texs <= texid)
848	{	1193	{
849	Append (maptex, self->tex, self->texs, self->texs);	1194	Append (maptex, self->tex, self->texs, self->texs);
…		…
861	tex->r = r;	1206	tex->r = r;
862	tex->g = g;	1207	tex->g = g;
863	tex->b = b;	1208	tex->b = b;
864	tex->a = a;	1209	tex->a = a;
865	}	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);
866	}	1220	}
867		1221
868	int	1222	int
869	ox (CFClient::Map self)	1223	ox (CFPlus::Map self)
870	ALIAS:	1224	ALIAS:
871	oy = 1	1225	oy = 1
		1226	x = 2
		1227	y = 3
		1228	w = 4
		1229	h = 5
872	CODE:	1230	CODE:
873	switch (ix)	1231	switch (ix)
874	{	1232	{
875	case 0: RETVAL = self->ox; break;	1233	case 0: RETVAL = self->ox; break;
876	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;
877	}	1239	}
878	OUTPUT:	1240	OUTPUT:
879	RETVAL	1241	RETVAL
880		1242
881	void	1243	void
882	scroll (CFClient::Map self, int dx, int dy)	1244	scroll (CFPlus::Map self, int dx, int dy)
883	CODE:	1245	CODE:
884	{	1246	{
885	if (dx > 0)	1247	if (dx > 0)
886	map_blank (self, self->x, self->y, dx - 1, self->h);	1248	map_blank (self, self->x, self->y, dx - 1, self->h);
887	else if (dx < 0)	1249	else if (dx < 0)
…		…
903	self->y += MAP_EXTEND_Y;	1265	self->y += MAP_EXTEND_Y;
904	}	1266	}
905	}	1267	}
906		1268
907	void	1269	void
908	map1a_update (CFClient::Map self, SV *data_)	1270	map1a_update (CFPlus::Map self, SV *data_, int extmap)
909	CODE:	1271	CODE:
910	{	1272	{
911	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1273	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
912	uint8_t data_end = (uint8_t )SvEND (data_);	1274	uint8_t data_end = (uint8_t )SvEND (data_);
913	mapcell *cell;	1275	mapcell *cell;
914	int x, y, flags;	1276	int x, y, flags;
915		1277
916	while (data < data_end)	1278	while (data < data_end - 1)
917	{	1279	{
918	flags = (data [0] << 8) + data [1]; data += 2;	1280	flags = (data [0] << 8) + data [1]; data += 2;
919		1281
920	x = ((flags >> 10) & 63) + self->x;	1282	x = self->x + ((flags >> 10) & 63);
921	y = ((flags >> 4) & 63) + self->y;	1283	y = self->y + ((flags >> 4) & 63);
922		1284
923	cell = map_get_cell (self, x, y);	1285	cell = map_get_cell (self, x, y);
924		1286
925	if (flags & 15)	1287	if (flags & 15)
926	{	1288	{
927	if (cell->darkness < 0)	1289	if (!cell->darkness)
928	{	1290	{
929	cell->darkness = 0;	1291	cell->darkness = 256;
930	cell->face [0] = 0;	1292	cell->face [0] = 0;
931	cell->face [1] = 0;	1293	cell->face [1] = 0;
932	cell->face [2] = 0;	1294	cell->face [2] = 0;
933	}	1295	}
934		1296
935	cell->darkness = flags & 8 ? *data++ : 255;
936
937	//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	}
938		1329
939	if (flags & 4)	1330	if (flags & 4)
940	{	1331	{
941	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;
942	}	1333	}
…		…
950	{	1341	{
951	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;
952	}	1343	}
953	}	1344	}
954	else	1345	else
		1346	{
955	cell->darkness = -1;	1347	cell->darkness = 0;
		1348	cell->stat_hp = 0;
		1349	}
956	}	1350	}
957	}	1351	}
958		1352
959	SV *	1353	SV *
960	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)
961	CODE:	1355	CODE:
962	{	1356	{
963	int x1, x;	1357	int x1, x;
964	int y1, y;	1358	int y1, y;
965	int z;	1359	int z;
…		…
1015	}	1409	}
1016	OUTPUT:	1410	OUTPUT:
1017	RETVAL	1411	RETVAL
1018		1412
1019	void	1413	void
1020	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)
1021	PPCODE:	1415	CODE:
1022	{	1416	{
1023	int vx, vy;	1417	int vx, vy;
1024	int x, y, z;	1418	int x, y, z;
1025	int last_name;	1419	int last_name;
1026	mapface face;	1420	mapface face;
1027	int sw4 = (sw + 3) & ~3;
1028	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1029	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1030		1421
1031	memset (darkness, 255, sw4 * sh);
1032	SvPOK_only (darkness_sv);
1033	SvCUR_set (darkness_sv, sw4 * sh);
1034
1035	vx = self->x + (self->w - sw) / 2 - shift_x;	1422	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1036	vy = self->y + (self->h - sh) / 2 - shift_y;	1423	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1037		1424
1038	/*	1425	/*
1039	int vx = self->vx = self->w >= sw	1426	int vx = self->vx = self->w >= sw
1040	? self->x + (self->w - sw) / 2	1427	? self->x + (self->w - sw) / 2
1041	: 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));
…		…
1045	: 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));
1046	*/	1433	*/
1047		1434
1048	glColor4ub (255, 255, 255, 255);	1435	glColor4ub (255, 255, 255, 255);
1049		1436
		1437	glEnable (GL_BLEND);
1050	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1438	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1051	glEnable (GL_BLEND);
1052	glEnable (GL_TEXTURE_2D);	1439	glEnable (GL_TEXTURE_2D);
1053	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1440	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1054		1441
1055	glBegin (GL_QUADS);	1442	glBegin (GL_QUADS);
1056		1443
…		…
1065	for (x = 0; x < sw; x++)	1452	for (x = 0; x < sw; x++)
1066	if (row->c0 <= x + vx && x + vx < row->c1)	1453	if (row->c0 <= x + vx && x + vx < row->c1)
1067	{	1454	{
1068	mapcell *cell = row->col + (x + vx - row->c0);	1455	mapcell *cell = row->col + (x + vx - row->c0);
1069		1456
1070	darkness[y * sw4 + x] = cell->darkness < 0
1071	? 255 - FOW_DARKNESS
1072	: 255 - cell->darkness;
1073
1074	face = cell->face [z];	1457	face = cell->face [z];
1075		1458
1076	if (face)	1459	if (face && face < self->texs)
1077	{	1460	{
1078	maptex tex = self->tex [face];	1461	maptex tex = self->tex [face];
1079		1462
1080	int px = (x + 1) * 32 - tex.w;	1463	int px = (x + 1) * 32 - tex.w;
1081	int py = (y + 1) * 32 - tex.h;	1464	int py = (y + 1) * 32 - tex.h;
…		…
1097	}	1480	}
1098		1481
1099	glEnd ();	1482	glEnd ();
1100		1483
1101	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, 223);
		1506	glRectf (px + 1, py,
		1507	px + width - 1, py + thick + 2);
		1508
		1509	glColor4ub (cell->stat_hp, 255 - cell->stat_hp, 0, 223);
		1510	glRectf (px + 2,
		1511	py + 1,
		1512	px + width - 2 - cell->stat_hp * (width - 4) / 255, py + thick + 1);
		1513	}
		1514	}
		1515	}
		1516
1102	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	}
1103		1612
1104	EXTEND (SP, 3);	1613	EXTEND (SP, 3);
1105	PUSHs (sv_2mortal (newSViv (sw4)));	1614	PUSHs (sv_2mortal (newSViv (sw4)));
1106	PUSHs (sv_2mortal (newSViv (sh)));	1615	PUSHs (sv_2mortal (newSViv (sh)));
1107	PUSHs (darkness_sv);	1616	PUSHs (darkness_sv);
1108	}	1617	}
1109		1618
1110	SV *	1619	SV *
1111	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)
1112	CODE:	1621	CODE:
1113	{	1622	{
1114	int x, y, x1, y1;	1623	int x, y, x1, y1;
1115	SV data_sv = newSV (w h * 7 + 5);	1624	SV data_sv = newSV (w h * 7 + 5);
1116	uint8_t data = (uint8_t )SvPVX (data_sv);	1625	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1178	}	1687	}
1179	OUTPUT:	1688	OUTPUT:
1180	RETVAL	1689	RETVAL
1181		1690
1182	void	1691	void
1183	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)
1184	PPCODE:	1693	PPCODE:
1185	{	1694	{
1186	int x, y, z;	1695	int x, y, z;
1187	int w, h;	1696	int w, h;
1188	int x1, y1;	1697	int x1, y1;
…		…
1220		1729
1221	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1730	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1222	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1731	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1223	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1732	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1224		1733
1225	if (cell->darkness <= 0)	1734	if (cell->darkness == 0)
1226	{	1735	{
1227	cell->darkness = -1;	1736	cell->darkness = 0;
1228		1737
1229	for (z = 0; z <= 2; z++)	1738	for (z = 0; z <= 2; z++)
1230	{	1739	{
1231	cell->face[z] = face[z];	1740	cell->face[z] = face[z];
1232		1741
…		…
1237	}	1746	}
1238	}	1747	}
1239	}	1748	}
1240	}	1749	}
1241		1750
1242	MODULE = CFClient PACKAGE = CFClient::MixChunk	1751	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1243		1752
1244	CFClient::MixChunk	1753	CFPlus::MixChunk
1245	new_from_file (SV class, char path)	1754	new_from_file (SV class, char path)
1246	CODE:	1755	CODE:
1247	RETVAL = Mix_LoadWAV (path);	1756	RETVAL = Mix_LoadWAV (path);
1248	OUTPUT:	1757	OUTPUT:
1249	RETVAL	1758	RETVAL
1250		1759
1251	void	1760	void
1252	DESTROY (CFClient::MixChunk self)	1761	DESTROY (CFPlus::MixChunk self)
1253	CODE:	1762	CODE:
1254	Mix_FreeChunk (self);	1763	Mix_FreeChunk (self);
1255		1764
1256	int	1765	int
1257	volume (CFClient::MixChunk self, int volume = -1)	1766	volume (CFPlus::MixChunk self, int volume = -1)
1258	CODE:	1767	CODE:
1259	RETVAL = Mix_VolumeChunk (self, volume);	1768	RETVAL = Mix_VolumeChunk (self, volume);
1260	OUTPUT:	1769	OUTPUT:
1261	RETVAL	1770	RETVAL
1262		1771
1263	int	1772	int
1264	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)
1265	CODE:	1774	CODE:
1266	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1775	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1267	OUTPUT:	1776	OUTPUT:
1268	RETVAL	1777	RETVAL
1269		1778
1270	MODULE = CFClient PACKAGE = CFClient::MixMusic	1779	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1271		1780
1272	int	1781	int
1273	volume (int volume = -1)	1782	volume (int volume = -1)
1274	CODE:	1783	CODE:
1275	RETVAL = Mix_VolumeMusic (volume);	1784	RETVAL = Mix_VolumeMusic (volume);
1276	OUTPUT:	1785	OUTPUT:
1277	RETVAL	1786	RETVAL
1278		1787
1279	CFClient::MixMusic	1788	CFPlus::MixMusic
1280	new_from_file (SV class, char path)	1789	new_from_file (SV class, char path)
1281	CODE:	1790	CODE:
1282	RETVAL = Mix_LoadMUS (path);	1791	RETVAL = Mix_LoadMUS (path);
1283	OUTPUT:	1792	OUTPUT:
1284	RETVAL	1793	RETVAL
1285		1794
1286	void	1795	void
1287	DESTROY (CFClient::MixMusic self)	1796	DESTROY (CFPlus::MixMusic self)
1288	CODE:	1797	CODE:
1289	Mix_FreeMusic (self);	1798	Mix_FreeMusic (self);
1290		1799
1291	int	1800	int
1292	play (CFClient::MixMusic self, int loops = -1)	1801	play (CFPlus::MixMusic self, int loops = -1)
1293	CODE:	1802	CODE:
1294	RETVAL = Mix_PlayMusic (self, loops);	1803	RETVAL = Mix_PlayMusic (self, loops);
1295	OUTPUT:	1804	OUTPUT:
1296	RETVAL	1805	RETVAL
1297		1806
1298	MODULE = CFClient PACKAGE = CFClient::OpenGL	1807	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1299		1808
1300	BOOT:	1809	BOOT:
1301	{	1810	{
1302	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1811	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1303	static const struct {	1812	static const struct {
1304	const char *name;	1813	const char *name;
1305	IV iv;	1814	IV iv;
1306	} *civ, const_iv[] = {	1815	} *civ, const_iv[] = {
1307	# define const_iv(name) { # name, (IV)name }	1816	# define const_iv(name) { # name, (IV)name }
1308	const_iv (GL_COLOR_MATERIAL),	1817	const_iv (GL_COLOR_MATERIAL),
1309	const_iv (GL_SMOOTH),	1818	const_iv (GL_SMOOTH),
1310	const_iv (GL_FLAT),	1819	const_iv (GL_FLAT),
		1820	const_iv (GL_DITHER),
1311	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),
1312	const_iv (GL_AND),	1830	const_iv (GL_AND),
		1831	const_iv (GL_ONE),
		1832	const_iv (GL_ZERO),
1313	const_iv (GL_SRC_ALPHA),	1833	const_iv (GL_SRC_ALPHA),
		1834	const_iv (GL_DST_ALPHA),
1314	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),
1315	const_iv (GL_RGB),	1838	const_iv (GL_RGB),
1316	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),
1317	const_iv (GL_UNSIGNED_BYTE),	1843	const_iv (GL_UNSIGNED_BYTE),
1318	const_iv (GL_ALPHA4),	1844	const_iv (GL_UNSIGNED_SHORT),
		1845	const_iv (GL_UNSIGNED_INT),
1319	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),
1320	const_iv (GL_FLOAT),	1850	const_iv (GL_FLOAT),
1321	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1851	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1322	const_iv (GL_COMPILE),	1852	const_iv (GL_COMPILE),
1323	const_iv (GL_TEXTURE_1D),	1853	const_iv (GL_TEXTURE_1D),
1324	const_iv (GL_TEXTURE_2D),	1854	const_iv (GL_TEXTURE_2D),
…		…
1326	const_iv (GL_TEXTURE_MAG_FILTER),	1856	const_iv (GL_TEXTURE_MAG_FILTER),
1327	const_iv (GL_TEXTURE_MIN_FILTER),	1857	const_iv (GL_TEXTURE_MIN_FILTER),
1328	const_iv (GL_TEXTURE_ENV_MODE),	1858	const_iv (GL_TEXTURE_ENV_MODE),
1329	const_iv (GL_TEXTURE_WRAP_S),	1859	const_iv (GL_TEXTURE_WRAP_S),
1330	const_iv (GL_TEXTURE_WRAP_T),	1860	const_iv (GL_TEXTURE_WRAP_T),
		1861	const_iv (GL_REPEAT),
1331	const_iv (GL_CLAMP),	1862	const_iv (GL_CLAMP),
1332	const_iv (GL_REPEAT),	1863	const_iv (GL_CLAMP_TO_EDGE),
1333	const_iv (GL_NEAREST),	1864	const_iv (GL_NEAREST),
1334	const_iv (GL_LINEAR),	1865	const_iv (GL_LINEAR),
1335	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1866	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1336	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1867	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1337	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1868	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1338	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1869	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1339	const_iv (GL_GENERATE_MIPMAP),	1870	const_iv (GL_GENERATE_MIPMAP),
1340	const_iv (GL_LINEAR),
1341	const_iv (GL_MODULATE),	1871	const_iv (GL_MODULATE),
		1872	const_iv (GL_DECAL),
1342	const_iv (GL_REPLACE),	1873	const_iv (GL_REPLACE),
		1874	const_iv (GL_DEPTH_BUFFER_BIT),
1343	const_iv (GL_COLOR_BUFFER_BIT),	1875	const_iv (GL_COLOR_BUFFER_BIT),
1344	const_iv (GL_PROJECTION),	1876	const_iv (GL_PROJECTION),
1345	const_iv (GL_MODELVIEW),	1877	const_iv (GL_MODELVIEW),
1346	const_iv (GL_COLOR_LOGIC_OP),	1878	const_iv (GL_COLOR_LOGIC_OP),
		1879	const_iv (GL_SEPARABLE_2D),
1347	const_iv (GL_CONVOLUTION_2D),	1880	const_iv (GL_CONVOLUTION_2D),
1348	const_iv (GL_CONVOLUTION_BORDER_MODE),	1881	const_iv (GL_CONVOLUTION_BORDER_MODE),
1349	const_iv (GL_CONSTANT_BORDER),	1882	const_iv (GL_CONSTANT_BORDER),
1350	const_iv (GL_LINES),	1883	const_iv (GL_LINES),
		1884	const_iv (GL_LINE_STRIP),
		1885	const_iv (GL_LINE_LOOP),
1351	const_iv (GL_QUADS),	1886	const_iv (GL_QUADS),
1352	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),
1353	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1891	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1354	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),
1355	# undef const_iv	1897	# undef const_iv
1356	};	1898	};
1357		1899
1358	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; )
1359	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1901	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1360	}	1902	}
1361		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
1362	int glGetError ()	1925	int glGetError ()
		1926
		1927	void glFinish ()
1363		1928
1364	void glClear (int mask)	1929	void glClear (int mask)
1365		1930
1366	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)
1367	PROTOTYPE: @	1932	PROTOTYPE: @
…		…
1374		1939
1375	void glHint (int target, int mode)	1940	void glHint (int target, int mode)
1376		1941
1377	void glBlendFunc (int sfactor, int dfactor)	1942	void glBlendFunc (int sfactor, int dfactor)
1378		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
1379	void glLogicOp (int opcode)	1950	void glLogicOp (int opcode)
1380		1951
		1952	void glColorMask (int red, int green, int blue, int alpha)
		1953
1381	void glMatrixMode (int mode)	1954	void glMatrixMode (int mode)
1382		1955
1383	void glPushMatrix ()	1956	void glPushMatrix ()
1384		1957
1385	void glPopMatrix ()	1958	void glPopMatrix ()
1386		1959
1387	void glLoadIdentity ()	1960	void glLoadIdentity ()
1388		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
1389	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_)
1390		1971
1391	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)
1392		1975
1393	void glTranslate (float x, float y, float z = 0.)	1976	void glTranslate (float x, float y, float z = 0.)
1394	CODE:	1977	CODE:
1395	glTranslatef (x, y, z);	1978	glTranslatef (x, y, z);
1396		1979
1397	void glScale (float x, float y, float z)	1980	void glScale (float x, float y, float z = 1.)
1398	CODE:	1981	CODE:
1399	glScalef (x, y, z);	1982	glScalef (x, y, z);
1400		1983
1401	void glRotate (float angle, float x, float y, float z)	1984	void glRotate (float angle, float x, float y, float z)
1402	CODE:	1985	CODE:
…		…
1406		1989
1407	void glEnd ()	1990	void glEnd ()
1408		1991
1409	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)
1410	PROTOTYPE: @	1993	PROTOTYPE: @
		1994	ALIAS:
		1995	glColor_premultiply = 1
1411	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...
1412	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);
1413		2016
1414	void glVertex (float x, float y, float z = 0.)	2017	void glVertex (float x, float y, float z = 0.)
1415	CODE:	2018	CODE:
1416	glVertex3f (x, y, z);	2019	glVertex3f (x, y, z);
1417		2020
…		…
1429		2032
1430	void glBindTexture (int target, int name)	2033	void glBindTexture (int target, int name)
1431		2034
1432	void glConvolutionParameter (int target, int pname, float params)	2035	void glConvolutionParameter (int target, int pname, float params)
1433	CODE:	2036	CODE:
		2037	if (gl.ConvolutionParameterf)
1434	glConvolutionParameterf (target, pname, params);	2038	gl.ConvolutionParameterf (target, pname, params);
1435		2039
1436	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);
1437		2049
1438	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)
1439		2051
1440	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)
1441		2057
1442	int glGenTexture ()	2058	int glGenTexture ()
1443	CODE:	2059	CODE:
1444	{	2060	{
1445	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.58 by root, Sun Apr 23 00:57:38 2006 UTC vs. Revision 1.150 by root, Sat Aug 19 17:24:39 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.58 by root, Sun Apr 23 00:57:38 2006 UTC vs.
Revision 1.150 by root, Sat Aug 19 17:24:39 2006 UTC