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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.54 by root, Wed Apr 19 23:37:48 2006 UTC vs.
Revision 1.143 by root, Fri Aug 18 02:23:39 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.54 by root, Wed Apr 19 23:37:48 2006 UTC vs. Revision 1.143 by root, Fri Aug 18 02:23:39 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.54 by root, Wed Apr 19 23:37:48 2006 UTC vs.
Revision 1.143 by root, Fri Aug 18 02:23:39 2006 UTC