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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.70 by root, Sun Apr 30 09:21:47 2006 UTC vs.
Revision 1.146 by root, Sat Aug 19 02:49:53 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 10	57	#define MIN_FONT_HEIGHT 10
46		58
47	#define GL_CALL(type,func,args) \	59	#if 0
48	{ \	60	# define PARACHUTE SDL_INIT_NOPARACHUTE
49	static int init_; \	61	#else
50	static type fptr_; \	62	# define PARACHUTE 0
51	\	63	#endif
52	if (!init_) \
53	{ \
54	init_ = 1; \
55	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
56	} \
57	\
58	if (fptr_) \
59	fptr_ args; \
60	}
61		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
62	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
63	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
64		90
65	typedef PangoFontDescription *CFClient__Font;	91	typedef PangoFontDescription *CFPlus__Font;
		92
		93	static int
		94	shape_attr_p (PangoLayoutRun *run)
		95	{
		96	GSList *attrs = run->item->analysis.extra_attrs;
		97
		98	while (attrs)
		99	{
		100	PangoAttribute *attr = attrs->data;
		101
		102	if (attr->klass->type == PANGO_ATTR_SHAPE)
		103	return 1;
		104
		105	attrs = attrs->next;
		106	}
		107
		108	return 0;
		109	}
66		110
67	typedef struct cf_layout {	111	typedef struct cf_layout {
68	PangoLayout *pl;	112	PangoLayout *pl;
		113	float r, g, b, a; // default color for rgba mode
69	int base_height;	114	int base_height;
70	CFClient__Font font;	115	CFPlus__Font font;
71	} *CFClient__Layout;	116	} *CFPlus__Layout;
72		117
73	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
74	static PangoContext *context;	119	static PangoContext *opengl_context;
75	static PangoFontMap *fontmap;	120	static PangoFontMap *opengl_fontmap;
76		121
77	static void	122	static void
78	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
79	{	124	{
80	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
81	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
82	}	130	}
83		131
84	static void	132	static void
85	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
86	{	134	{
87	/* 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
88	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
89	*/	137	*/
90	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
94		142
95	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
96	}	144	}
97		145
98	static void	146	static void
99	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
100	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
101	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
102		153
103	w = (w + 3) & ~3;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
104	if (!w) w = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
105	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;
106	}	162	}
107		163
108	typedef uint16_t mapface;	164	typedef uint16_t mapface;
109		165
110	typedef struct {	166	typedef struct {
…		…
113	float s, t;	169	float s, t;
114	uint8_t r, g, b, a;	170	uint8_t r, g, b, a;
115	} maptex;	171	} maptex;
116		172
117	typedef struct {	173	typedef struct {
118	int16_t darkness;	174	uint16_t darkness;
119	mapface face[3];	175	mapface face[3];
		176	uint8_t stat_hp;
120	} mapcell;	177	} mapcell;
121		178
122	typedef struct {	179	typedef struct {
123	int32_t c0, c1;	180	int32_t c0, c1;
124	mapcell *col;	181	mapcell *col;
…		…
133	int texs;	190	int texs;
134	maptex *tex;	191	maptex *tex;
135		192
136	int32_t rows;	193	int32_t rows;
137	maprow *row;	194	maprow *row;
138	} *CFClient__Map;	195	} *CFPlus__Map;
139		196
140	static char *	197	static char *
141	prepend (char *ptr, int sze, int inc)	198	prepend (char *ptr, int sze, int inc)
142	{	199	{
143	char *p;	200	char *p;
…		…
161		218
162	#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))
163	#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))
164		221
165	static maprow *	222	static maprow *
166	map_get_row (CFClient__Map self, int y)	223	map_get_row (CFPlus__Map self, int y)
167	{	224	{
168	if (0 > y)	225	if (0 > y)
169	{	226	{
170	int extend = - y + MAP_EXTEND_Y;	227	int extend = - y + MAP_EXTEND_Y;
171	Prepend (maprow, self->row, self->rows, extend);	228	Prepend (maprow, self->row, self->rows, extend);
…		…
209		266
210	return row->col + (x - row->c0);	267	return row->col + (x - row->c0);
211	}	268	}
212		269
213	static mapcell *	270	static mapcell *
214	map_get_cell (CFClient__Map self, int x, int y)	271	map_get_cell (CFPlus__Map self, int x, int y)
215	{	272	{
216	return row_get_cell (map_get_row (self, y), x);	273	return row_get_cell (map_get_row (self, y), x);
217	}	274	}
218		275
219	static void	276	static void
220	map_clear (CFClient__Map self)	277	map_clear (CFPlus__Map self)
221	{	278	{
222	int r;	279	int r;
223		280
224	for (r = 0; r < self->rows; r++)	281	for (r = 0; r < self->rows; r++)
225	Safefree (self->row[r].col);	282	Safefree (self->row[r].col);
…		…
233	self->row = 0;	290	self->row = 0;
234	self->rows = 0;	291	self->rows = 0;
235	}	292	}
236		293
237	static void	294	static void
238	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)
239	{	296	{
240	int x, y;	297	int x, y;
241	maprow *row;	298	maprow *row;
		299	mapcell *cell;
242		300
243	for (y = y0; y < y0 + h; y++)	301	for (y = y0; y < y0 + h; y++)
244	if (y >= 0)	302	if (y >= 0)
245	{	303	{
246	if (y >= self->rows)	304	if (y >= self->rows)
…		…
252	if (x >= row->c0)	310	if (x >= row->c0)
253	{	311	{
254	if (x >= row->c1)	312	if (x >= row->c1)
255	break;	313	break;
256		314
257	row->col[x - row->c0].darkness = -1;	315	cell = row->col + x - row->c0;
		316
		317	cell->darkness = 0;
		318	cell->stat_hp = 0;
258	}	319	}
259	}	320	}
260	}	321	}
261		322
262	static void	323	static void
263	music_finished ()	324	music_finished (void)
264	{	325	{
265	SDL_UserEvent ev;	326	SDL_UserEvent ev;
266		327
267	ev.type = SDL_USEREVENT;	328	ev.type = SDL_USEREVENT;
268	ev.code = 0;	329	ev.code = 0;
…		…
270	ev.data2 = 0;	331	ev.data2 = 0;
271		332
272	SDL_PushEvent ((SDL_Event *)&ev);	333	SDL_PushEvent ((SDL_Event *)&ev);
273	}	334	}
274		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
275	MODULE = CFClient PACKAGE = CFClient	366	MODULE = CFPlus PACKAGE = CFPlus
276		367
277	PROTOTYPES: ENABLE	368	PROTOTYPES: ENABLE
278		369
279	BOOT:	370	BOOT:
280	{	371	{
281	HV *stash = gv_stashpv ("CFClient", 1);	372	HV *stash = gv_stashpv ("CFPlus", 1);
282	static const struct {	373	static const struct {
283	const char *name;	374	const char *name;
284	IV iv;	375	IV iv;
285	} *civ, const_iv[] = {	376	} *civ, const_iv[] = {
286	# define const_iv(name) { # name, (IV)name }	377	# define const_iv(name) { # name, (IV)name }
…		…
385	# undef const_iv	476	# undef const_iv
386	};	477	};
387		478
388	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; )
389	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	480	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
390
391	fontmap = pango_ft2_font_map_new ();
392	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
393	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
394	}	481	}
395		482
396	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
397	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	504	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
398		505
399	void	506	void
400	SDL_Quit ()	507	SDL_Quit ()
401		508
402	void	509	void
…		…
408	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	515	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
409	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	516	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
410	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	517	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
411	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	518	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
412		519
		520	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		521	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		522
413	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	523	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
414	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	524	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
415	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	525	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
416	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
417		527
418	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	528	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		529	#if SDL_VERSION_ATLEAST(1,2,10)
419	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	530	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
420	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	531	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		532	#endif
421		533
422	SDL_EnableUNICODE (1);	534	SDL_EnableUNICODE (1);
423	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	535	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
424		536
425	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	537	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
434		546
435	++m;	547	++m;
436	}	548	}
437	}	549	}
438		550
		551	char *
		552	SDL_GetError ()
		553
439	int	554	int
440	SDL_SetVideoMode (int w, int h, int fullscreen)	555	SDL_SetVideoMode (int w, int h, int fullscreen)
441	CODE:	556	CODE:
442	RETVAL = !!SDL_SetVideoMode (	557	RETVAL = !!SDL_SetVideoMode (
443	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	558	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
444	);	559	);
		560	if (RETVAL)
		561	{
445	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	}
446	OUTPUT:	567	OUTPUT:
447	RETVAL	568	RETVAL
448		569
449	void	570	void
450	SDL_GL_SwapBuffers ()	571	SDL_GL_SwapBuffers ()
		572
		573	char *
		574	SDL_GetKeyName (int sym)
451		575
452	void	576	void
453	SDL_PollEvent ()	577	SDL_PollEvent ()
454	PPCODE:	578	PPCODE:
455	{	579	{
…		…
474	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	598	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
475	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	599	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
476	break;	600	break;
477		601
478	case SDL_MOUSEMOTION:	602	case SDL_MOUSEMOTION:
		603	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		604
479	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	605	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
480	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	606	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
481	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	607	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
482	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	608	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
483	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	609	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
484	break;	610	break;
485		611
486	case SDL_MOUSEBUTTONDOWN:	612	case SDL_MOUSEBUTTONDOWN:
487	case SDL_MOUSEBUTTONUP:	613	case SDL_MOUSEBUTTONUP:
		614	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		615
488	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	616	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
489	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	617	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
490	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	618	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
491	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	619	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
492	break;	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;
493	}	627	}
494		628
495	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	629	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
496	}	630	}
497	}	631	}
498		632
499	int	633	int
500	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)
501	POSTCALL:	635	POSTCALL:
502	Mix_HookMusicFinished (music_finished);	636	Mix_HookMusicFinished (music_finished);
		637	Mix_ChannelFinished (channel_finished);
503		638
504	void	639	void
505	Mix_CloseAudio ()	640	Mix_CloseAudio ()
506		641
507	int	642	int
…		…
512	CODE:	647	CODE:
513	#ifndef _WIN32	648	#ifndef _WIN32
514	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	649	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
515	#endif	650	#endif
516		651
517	char *
518	gl_version ()
519	CODE:
520	RETVAL = (char *)glGetString (GL_VERSION);
521	OUTPUT:
522	RETVAL
523
524	char *
525	gl_extensions ()
526	CODE:
527	RETVAL = (char *)glGetString (GL_EXTENSIONS);
528	OUTPUT:
529	RETVAL
530
531	void	652	void
532	add_font (char *file)	653	add_font (char *file)
533	CODE:	654	CODE:
534	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	655	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
535		656
536	void	657	void
537	load_image_inline (SV *image_)	658	load_image_inline (SV *image_)
538	ALIAS:	659	ALIAS:
539	load_image_file = 1	660	load_image_file = 1
…		…
581		702
582	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	703	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
583		704
584	assert (surface2->pitch == surface2->w * 4);	705	assert (surface2->pitch == surface2->w * 4);
585		706
		707	SDL_LockSurface (surface2);
586	EXTEND (SP, 5);	708	EXTEND (SP, 6);
587	PUSHs (sv_2mortal (newSViv (surface2->w)));	709	PUSHs (sv_2mortal (newSViv (surface2->w)));
588	PUSHs (sv_2mortal (newSViv (surface2->h)));	710	PUSHs (sv_2mortal (newSViv (surface2->h)));
589	SDL_LockSurface (surface2);
590	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	711	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
591	SDL_UnlockSurface (surface2);
592	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)));
593	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	713	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
594	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	714	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		715	SDL_UnlockSurface (surface2);
595		716
596	SDL_FreeSurface (surface);	717	SDL_FreeSurface (surface);
597	SDL_FreeSurface (surface2);	718	SDL_FreeSurface (surface2);
598	}	719	}
599		720
…		…
623	}	744	}
624		745
625	void	746	void
626	error (char *message)	747	error (char *message)
627	CODE:	748	CODE:
		749	fprintf (stderr, "ERROR: %s\n", message);
628	#ifdef _WIN32	750	#ifdef _WIN32
629	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	751	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
630	#else
631	fprintf (stderr, "ERROR: %s\n", message);
632	#endif	752	#endif
633		753
634	void	754	void
635	fatal (char *message)	755	fatal (char *message)
636	CODE:	756	CODE:
		757	fprintf (stderr, "FATAL: %s\n", message);
637	#ifdef _WIN32	758	#ifdef _WIN32
638	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	759	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
639	#else
640	fprintf (stderr, "FATAL: %s\n", message);
641	#endif	760	#endif
642	exit (1);	761	_exit (1);
643		762
		763	void
		764	_exit (int retval)
		765	CODE:
		766	_exit (retval);
		767
644	MODULE = CFClient PACKAGE = CFClient::Font	768	MODULE = CFPlus PACKAGE = CFPlus::Font
645		769
646	CFClient::Font	770	CFPlus::Font
647	new_from_file (SV class, char path, int id = 0)	771	new_from_file (SV class, char path, int id = 0)
648	CODE:	772	CODE:
649	{	773	{
650	int count;	774	int count;
651	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	775	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
654	}	778	}
655	OUTPUT:	779	OUTPUT:
656	RETVAL	780	RETVAL
657		781
658	void	782	void
659	DESTROY (CFClient::Font self)	783	DESTROY (CFPlus::Font self)
660	CODE:	784	CODE:
661	pango_font_description_free (self);	785	pango_font_description_free (self);
662		786
663	void	787	void
664	make_default (CFClient::Font self)	788	make_default (CFPlus::Font self)
665	CODE:	789	CODE:
666	default_font = self;	790	default_font = self;
667		791
668	MODULE = CFClient PACKAGE = CFClient::Layout	792	MODULE = CFPlus PACKAGE = CFPlus::Layout
669		793
670	CFClient::Layout	794	void
671	new (SV *class, int base_height = MIN_FONT_HEIGHT)	795	reset_glyph_cache ()
		796	CODE:
		797	tc_clear ();
		798
		799	CFPlus::Layout
		800	new (SV *class)
672	CODE:	801	CODE:
673	New (0, RETVAL, 1, struct cf_layout);	802	New (0, RETVAL, 1, struct cf_layout);
		803
674	RETVAL->pl = pango_layout_new (context);	804	RETVAL->pl = pango_layout_new (opengl_context);
675	RETVAL->base_height = base_height;	805	RETVAL->r = 1.;
		806	RETVAL->g = 1.;
		807	RETVAL->b = 1.;
		808	RETVAL->a = 1.;
		809	RETVAL->base_height = MIN_FONT_HEIGHT;
676	RETVAL->font = 0;	810	RETVAL->font = 0;
		811
677	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	812	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
678	pango_layout_set_font_description (RETVAL->pl, default_font);	813	layout_update_font (RETVAL);
679	OUTPUT:	814	OUTPUT:
680	RETVAL	815	RETVAL
681		816
682	void	817	void
683	DESTROY (CFClient::Layout self)	818	DESTROY (CFPlus::Layout self)
684	CODE:	819	CODE:
685	g_object_unref (self->pl);	820	g_object_unref (self->pl);
686	Safefree (self);	821	Safefree (self);
687		822
688	void	823	void
689	set_text (CFClient::Layout self, SV *text_)	824	set_text (CFPlus::Layout self, SV *text_)
690	CODE:	825	CODE:
691	{	826	{
692	STRLEN textlen;	827	STRLEN textlen;
693	char *text = SvPVutf8 (text_, textlen);	828	char *text = SvPVutf8 (text_, textlen);
694		829
695	pango_layout_set_text (self->pl, text, textlen);	830	pango_layout_set_text (self->pl, text, textlen);
696	}	831	}
697		832
698	void	833	void
699	set_markup (CFClient::Layout self, SV *text_)	834	set_markup (CFPlus::Layout self, SV *text_)
700	CODE:	835	CODE:
701	{	836	{
702	STRLEN textlen;	837	STRLEN textlen;
703	char *text = SvPVutf8 (text_, textlen);	838	char *text = SvPVutf8 (text_, textlen);
704		839
705	pango_layout_set_markup (self->pl, text, textlen);	840	pango_layout_set_markup (self->pl, text, textlen);
706	}	841	}
707		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
708	SV *	928	SV *
709	get_text (CFClient::Layout self)	929	get_text (CFPlus::Layout self)
710	CODE:	930	CODE:
711	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	931	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
712	SvUTF8_on (RETVAL);	932	sv_utf8_decode (RETVAL);
713	OUTPUT:	933	OUTPUT:
714	RETVAL	934	RETVAL
715		935
716	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
717	set_font (CFClient::Layout self, CFClient::Font font = 0)	945	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
718	CODE:	946	CODE:
719	if (self->font != font)	947	if (self->font != font)
720	{	948	{
721	self->font = font;	949	self->font = font;
722	layout_update_font (self);	950	layout_update_font (self);
723	}	951	}
724		952
725	void	953	void
726	set_height (CFClient::Layout self, int base_height)	954	set_height (CFPlus::Layout self, int base_height)
727	CODE:	955	CODE:
728	if (self->base_height != base_height)	956	if (self->base_height != base_height)
729	{	957	{
730	self->base_height = base_height;	958	self->base_height = base_height;
731	layout_update_font (self);	959	layout_update_font (self);
732	}	960	}
733		961
734	void	962	void
735	set_width (CFClient::Layout self, int max_width = -1)	963	set_width (CFPlus::Layout self, int max_width = -1)
736	CODE:	964	CODE:
737	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);
738		966
739	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
740	size (CFClient::Layout self)	993	size (CFPlus::Layout self)
741	PPCODE:	994	PPCODE:
742	{	995	{
743	int w, h;	996	int w, h;
744		997
745	layout_get_pixel_size (self, &w, &h);	998	layout_get_pixel_size (self, &w, &h);
…		…
748	PUSHs (sv_2mortal (newSViv (w)));	1001	PUSHs (sv_2mortal (newSViv (w)));
749	PUSHs (sv_2mortal (newSViv (h)));	1002	PUSHs (sv_2mortal (newSViv (h)));
750	}	1003	}
751		1004
752	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
753	xy_to_index (CFClient::Layout self, int x, int y)	1018	xy_to_index (CFPlus::Layout self, int x, int y)
754	CODE:	1019	CODE:
755	{	1020	{
756	int index, trailing;	1021	int index, trailing;
757	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);
758	RETVAL = index;	1023	RETVAL = index;
759	}	1024	}
760	OUTPUT:	1025	OUTPUT:
761	RETVAL	1026	RETVAL
762		1027
763	void	1028	void
764	cursor_pos (CFClient::Layout self, int index)	1029	cursor_pos (CFPlus::Layout self, int index)
765	PPCODE:	1030	PPCODE:
766	{	1031	{
767	PangoRectangle strong_pos;	1032	PangoRectangle strong_pos;
768	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1033	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
769		1034
…		…
772	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1037	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
773	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1038	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
774	}	1039	}
775		1040
776	void	1041	void
777	render (CFClient::Layout self)	1042	render (CFPlus::Layout self, float x, float y, int flags = 0)
778	PPCODE:	1043	PPCODE:
779	{	1044	pango_opengl_render_layout_subpixel (
780	SV *retval;	1045	self->pl,
781	int w, h;	1046	x * PANGO_SCALE, y * PANGO_SCALE,
782	FT_Bitmap bitmap;	1047	self->r, self->g, self->b, self->a,
		1048	flags
		1049	);
783		1050
784	layout_get_pixel_size (self, &w, &h);	1051	MODULE = CFPlus PACKAGE = CFPlus::Texture
785		1052
786	retval = newSV (w * h);	1053	void
787	SvPOK_only (retval);	1054	pad2pot (SV data_, SV w_, SV *h_)
788	SvCUR_set (retval, w * h);	1055	CODE:
		1056	{
		1057	int ow = SvIV (w_);
		1058	int oh = SvIV (h_);
789		1059
790	bitmap.rows = h;	1060	if (ow && oh)
791	bitmap.width = w;	1061	{
792	bitmap.pitch = w;	1062	int nw = minpot (ow);
793	bitmap.buffer = (unsigned char*)SvPVX (retval);	1063	int nh = minpot (oh);
794	bitmap.num_grays = 256;
795	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
796		1064
797	memset (bitmap.buffer, 0, w * h);	1065	if (nw != ow \|\| nh != oh)
798		1066	{
799	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));
800		1073
801	EXTEND (SP, 3);	1074	SvPOK_only (result_);
802	PUSHs (sv_2mortal (newSViv (w)));	1075	SvCUR_set (result_, nw * nh * bpp);
803	PUSHs (sv_2mortal (newSViv (h)));
804	PUSHs (sv_2mortal (retval));
805	}
806		1076
807	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);
808		1080
		1081	sv_setsv (data_, result_);
		1082	}
		1083
		1084	sv_setiv (w_, nw);
		1085	sv_setiv (h_, nh);
		1086	}
		1087	}
		1088	}
		1089
809	void	1090	void
810	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.)
811	PROTOTYPE: $$$;$$	1092	PROTOTYPE: $$$;$$
		1093	ALIAS:
		1094	draw_quad_alpha = 1
		1095	draw_quad_alpha_premultiplied = 2
812	CODE:	1096	CODE:
813	{	1097	{
814	HV hv = (HV )SvRV (self);	1098	HV hv = (HV )SvRV (self);
815	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1099	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
816	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1100	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
817	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1101	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
818	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
819		1102
820	if (items < 5)	1103	if (items < 5)
821	{	1104	{
822	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1105	w = SvNV (*hv_fetch (hv, "w", 1, 1));
823	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1106	h = SvNV (*hv_fetch (hv, "h", 1, 1));
824	}	1107	}
825		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
826	glBindTexture (GL_TEXTURE_2D, name);	1123	glBindTexture (GL_TEXTURE_2D, name);
827	if (wrap_mode) {	1124
828	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
829	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
830	}
831	glBegin (GL_QUADS);	1125	glBegin (GL_QUADS);
832	glTexCoord2f (0, 0); glVertex2f (x , y );	1126	glTexCoord2f (0, 0); glVertex2f (x , y );
833	glTexCoord2f (0, t); glVertex2f (x , y + h);	1127	glTexCoord2f (0, t); glVertex2f (x , y + h);
834	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1128	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
835	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1129	glTexCoord2f (s, 0); glVertex2f (x + w, y );
836	glEnd ();	1130	glEnd ();
837	}
838		1131
		1132	if (ix)
		1133	{
		1134	glDisable (GL_ALPHA_TEST);
		1135	glDisable (GL_BLEND);
		1136	}
		1137	}
		1138
839	MODULE = CFClient PACKAGE = CFClient::Map	1139	MODULE = CFPlus PACKAGE = CFPlus::Map
840		1140
841	CFClient::Map	1141	CFPlus::Map
842	new (SV *class, int map_width, int map_height)	1142	new (SV *class, int map_width, int map_height)
843	CODE:	1143	CODE:
844	New (0, RETVAL, 1, struct map);	1144	New (0, RETVAL, 1, struct map);
845	RETVAL->x = 0;	1145	RETVAL->x = 0;
846	RETVAL->y = 0;	1146	RETVAL->y = 0;
…		…
856	RETVAL->row = 0;	1156	RETVAL->row = 0;
857	OUTPUT:	1157	OUTPUT:
858	RETVAL	1158	RETVAL
859		1159
860	void	1160	void
861	DESTROY (CFClient::Map self)	1161	DESTROY (CFPlus::Map self)
862	CODE:	1162	CODE:
863	{	1163	{
864	map_clear (self);	1164	map_clear (self);
865	Safefree (self->face);	1165	Safefree (self->face);
		1166	Safefree (self->tex);
866	Safefree (self);	1167	Safefree (self);
867	}	1168	}
868		1169
869	void	1170	void
870	clear (CFClient::Map self)	1171	clear (CFPlus::Map self)
871	CODE:	1172	CODE:
872	map_clear (self);	1173	map_clear (self);
873		1174
874	void	1175	void
875	set_face (CFClient::Map self, int face, int texid)	1176	set_face (CFPlus::Map self, int face, int texid)
876	CODE:	1177	CODE:
877	{	1178	{
878	while (self->faces <= face)	1179	while (self->faces <= face)
879	{	1180	{
880	Append (mapface, self->face, self->faces, self->faces);	1181	Append (mapface, self->face, self->faces, self->faces);
…		…
883		1184
884	self->face [face] = texid;	1185	self->face [face] = texid;
885	}	1186	}
886		1187
887	void	1188	void
888	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)
889	CODE:	1190	CODE:
890	{	1191	{
891	while (self->texs <= texid)	1192	while (self->texs <= texid)
892	{	1193	{
893	Append (maptex, self->tex, self->texs, self->texs);	1194	Append (maptex, self->tex, self->texs, self->texs);
…		…
905	tex->r = r;	1206	tex->r = r;
906	tex->g = g;	1207	tex->g = g;
907	tex->b = b;	1208	tex->b = b;
908	tex->a = a;	1209	tex->a = a;
909	}	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);
910	}	1220	}
911		1221
912	int	1222	int
913	ox (CFClient::Map self)	1223	ox (CFPlus::Map self)
914	ALIAS:	1224	ALIAS:
915	oy = 1	1225	oy = 1
		1226	x = 2
		1227	y = 3
		1228	w = 4
		1229	h = 5
916	CODE:	1230	CODE:
917	switch (ix)	1231	switch (ix)
918	{	1232	{
919	case 0: RETVAL = self->ox; break;	1233	case 0: RETVAL = self->ox; break;
920	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;
921	}	1239	}
922	OUTPUT:	1240	OUTPUT:
923	RETVAL	1241	RETVAL
924		1242
925	void	1243	void
926	scroll (CFClient::Map self, int dx, int dy)	1244	scroll (CFPlus::Map self, int dx, int dy)
927	CODE:	1245	CODE:
928	{	1246	{
929	if (dx > 0)	1247	if (dx > 0)
930	map_blank (self, self->x, self->y, dx - 1, self->h);	1248	map_blank (self, self->x, self->y, dx - 1, self->h);
931	else if (dx < 0)	1249	else if (dx < 0)
…		…
947	self->y += MAP_EXTEND_Y;	1265	self->y += MAP_EXTEND_Y;
948	}	1266	}
949	}	1267	}
950		1268
951	void	1269	void
952	map1a_update (CFClient::Map self, SV *data_)	1270	map1a_update (CFPlus::Map self, SV *data_, int extmap)
953	CODE:	1271	CODE:
954	{	1272	{
955	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1273	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
956	uint8_t data_end = (uint8_t )SvEND (data_);	1274	uint8_t data_end = (uint8_t )SvEND (data_);
957	mapcell *cell;	1275	mapcell *cell;
…		…
959		1277
960	while (data < data_end)	1278	while (data < data_end)
961	{	1279	{
962	flags = (data [0] << 8) + data [1]; data += 2;	1280	flags = (data [0] << 8) + data [1]; data += 2;
963		1281
964	x = ((flags >> 10) & 63) + self->x;	1282	x = self->x + ((flags >> 10) & 63);
965	y = ((flags >> 4) & 63) + self->y;	1283	y = self->y + ((flags >> 4) & 63);
966		1284
967	cell = map_get_cell (self, x, y);	1285	cell = map_get_cell (self, x, y);
968		1286
969	if (flags & 15)	1287	if (flags & 15)
970	{	1288	{
971	if (cell->darkness < 0)	1289	if (!cell->darkness)
972	{	1290	{
973	cell->darkness = 0;	1291	cell->darkness = 256;
974	cell->face [0] = 0;	1292	cell->face [0] = 0;
975	cell->face [1] = 0;	1293	cell->face [1] = 0;
976	cell->face [2] = 0;	1294	cell->face [2] = 0;
977	}	1295	}
978		1296
979	cell->darkness = flags & 8 ? *data++ : 255;
980
981	//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 (ext < 4)
		1311	cell->darkness = 255 - ext * 64 + 1;
		1312	else if (ext == 5) // health
		1313	cell->stat_hp = *data++;
		1314	else if (ext & 0x40) // unknown, multibyte => skip
		1315	data += *data + 1;
		1316	}
		1317	while (cmd & 0x80);
		1318	}
		1319	else
		1320	cell->darkness = *data++ + 1;
		1321	}
982		1322
983	if (flags & 4)	1323	if (flags & 4)
984	{	1324	{
985	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1325	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
986	}	1326	}
…		…
994	{	1334	{
995	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1335	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
996	}	1336	}
997	}	1337	}
998	else	1338	else
		1339	{
999	cell->darkness = -1;	1340	cell->darkness = 0;
		1341	cell->stat_hp = 0;
		1342	}
1000	}	1343	}
1001	}	1344	}
1002		1345
1003	SV *	1346	SV *
1004	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1347	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1005	CODE:	1348	CODE:
1006	{	1349	{
1007	int x1, x;	1350	int x1, x;
1008	int y1, y;	1351	int y1, y;
1009	int z;	1352	int z;
…		…
1059	}	1402	}
1060	OUTPUT:	1403	OUTPUT:
1061	RETVAL	1404	RETVAL
1062		1405
1063	void	1406	void
1064	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1407	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1065	PPCODE:	1408	CODE:
1066	{	1409	{
1067	int vx, vy;	1410	int vx, vy;
1068	int x, y, z;	1411	int x, y, z;
1069	int last_name;	1412	int last_name;
1070	mapface face;	1413	mapface face;
1071	int sw4 = (sw + 3) & ~3;
1072	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1073	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1074		1414
1075	memset (darkness, 255, sw4 * sh);
1076	SvPOK_only (darkness_sv);
1077	SvCUR_set (darkness_sv, sw4 * sh);
1078
1079	vx = self->x + (self->w - sw) / 2 - shift_x;	1415	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1080	vy = self->y + (self->h - sh) / 2 - shift_y;	1416	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1081		1417
1082	/*	1418	/*
1083	int vx = self->vx = self->w >= sw	1419	int vx = self->vx = self->w >= sw
1084	? self->x + (self->w - sw) / 2	1420	? self->x + (self->w - sw) / 2
1085	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1421	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1089	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1425	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1090	*/	1426	*/
1091		1427
1092	glColor4ub (255, 255, 255, 255);	1428	glColor4ub (255, 255, 255, 255);
1093		1429
		1430	glEnable (GL_BLEND);
1094	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1431	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1095	glEnable (GL_BLEND);
1096	glEnable (GL_TEXTURE_2D);	1432	glEnable (GL_TEXTURE_2D);
1097	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1433	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1098		1434
1099	glBegin (GL_QUADS);	1435	glBegin (GL_QUADS);
1100		1436
…		…
1109	for (x = 0; x < sw; x++)	1445	for (x = 0; x < sw; x++)
1110	if (row->c0 <= x + vx && x + vx < row->c1)	1446	if (row->c0 <= x + vx && x + vx < row->c1)
1111	{	1447	{
1112	mapcell *cell = row->col + (x + vx - row->c0);	1448	mapcell *cell = row->col + (x + vx - row->c0);
1113		1449
1114	darkness[y * sw4 + x] = cell->darkness < 0
1115	? 255 - FOW_DARKNESS
1116	: 255 - cell->darkness;
1117
1118	face = cell->face [z];	1450	face = cell->face [z];
1119		1451
1120	if (face)	1452	if (face && face < self->texs)
1121	{	1453	{
1122	maptex tex = self->tex [face];	1454	maptex tex = self->tex [face];
1123		1455
1124	int px = (x + 1) * 32 - tex.w;	1456	int px = (x + 1) * 32 - tex.w;
1125	int py = (y + 1) * 32 - tex.h;	1457	int py = (y + 1) * 32 - tex.h;
…		…
1143	glEnd ();	1475	glEnd ();
1144		1476
1145	glDisable (GL_TEXTURE_2D);	1477	glDisable (GL_TEXTURE_2D);
1146	glDisable (GL_BLEND);	1478	glDisable (GL_BLEND);
1147		1479
		1480	// top layer: overlays such as the health bar
		1481	for (y = 0; y < sh; y++)
		1482	if (0 <= y + vy && y + vy < self->rows)
		1483	{
		1484	maprow *row = self->row + (y + vy);
		1485
		1486	for (x = 0; x < sw; x++)
		1487	if (row->c0 <= x + vx && x + vx < row->c1)
		1488	{
		1489	mapcell *cell = row->col + (x + vx - row->c0);
		1490
		1491	int px = x * 32;
		1492	int py = y * 32;
		1493
		1494	if (cell->stat_hp)
		1495	{
		1496	int width = sh / 28 + 1;
		1497
		1498	glColor3ub (0, 0, 0);
		1499	glRectf (px + 1, py, px + 31, py + width + 2);
		1500
		1501	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1502	glRectf (px + 2, py + 1, px + 30 - cell->stat_hp * 28 / 255, py + width + 1);
		1503	}
		1504	}
		1505	}
		1506	}
		1507
		1508	void
		1509	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1510	CODE:
		1511	{
		1512	static float color[16][3] = {
		1513	{ 0.00F, 0.00F, 0.00F },
		1514	{ 1.00F, 1.00F, 1.00F },
		1515	{ 0.00F, 0.00F, 0.55F },
		1516	{ 1.00F, 0.00F, 0.00F },
		1517
		1518	{ 1.00F, 0.54F, 0.00F },
		1519	{ 0.11F, 0.56F, 1.00F },
		1520	{ 0.93F, 0.46F, 0.00F },
		1521	{ 0.18F, 0.54F, 0.34F },
		1522
		1523	{ 0.56F, 0.73F, 0.56F },
		1524	{ 0.80F, 0.80F, 0.80F },
		1525	{ 0.55F, 0.41F, 0.13F },
		1526	{ 0.99F, 0.77F, 0.26F },
		1527
		1528	{ 0.74F, 0.65F, 0.41F },
		1529
		1530	{ 0.00F, 1.00F, 1.00F },
		1531	{ 1.00F, 0.00F, 1.00F },
		1532	{ 1.00F, 1.00F, 0.00F },
		1533	};
		1534
		1535	int x, y;
		1536
		1537	glEnable (GL_TEXTURE_2D);
		1538	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1539	glEnable (GL_BLEND);
		1540	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1541	glBegin (GL_QUADS);
		1542
		1543	for (y = 0; y < h; y++)
		1544	for (x = 0; x < w; x++)
		1545	{
		1546	unsigned char m = data [x + y * w];
		1547
		1548	if (m)
		1549	{
		1550	float *c = color [m & 15];
		1551
		1552	float tx1 = m & 0x40 ? 0.5 : 0.;
		1553	float tx2 = tx1 + 0.5;
		1554
		1555	glColor4f (c[0], c[1], c[2], 0.75);
		1556	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1557	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1558	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1559	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1560	}
		1561	}
		1562
		1563	glEnd ();
		1564	glDisable (GL_BLEND);
		1565	glDisable (GL_TEXTURE_2D);
		1566	}
		1567
		1568	void
		1569	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1570	PPCODE:
		1571	{
		1572	int vx, vy;
		1573	int x, y;
		1574	int sw4 = (sw + 3) & ~3;
		1575	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1576	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1577
		1578	memset (darkness, 255, sw4 * sh);
		1579	SvPOK_only (darkness_sv);
		1580	SvCUR_set (darkness_sv, sw4 * sh);
		1581
		1582	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1583	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1584
		1585	for (y = 0; y < sh; y++)
		1586	if (0 <= y + vy && y + vy < self->rows)
		1587	{
		1588	maprow *row = self->row + (y + vy);
		1589
		1590	for (x = 0; x < sw; x++)
		1591	if (row->c0 <= x + vx && x + vx < row->c1)
		1592	{
		1593	mapcell *cell = row->col + (x + vx - row->c0);
		1594
		1595	darkness[y * sw4 + x] = cell->darkness
		1596	? 255 - (cell->darkness - 1)
		1597	: 255 - FOW_DARKNESS;
		1598	}
		1599	}
		1600
1148	EXTEND (SP, 3);	1601	EXTEND (SP, 3);
1149	PUSHs (sv_2mortal (newSViv (sw4)));	1602	PUSHs (sv_2mortal (newSViv (sw4)));
1150	PUSHs (sv_2mortal (newSViv (sh)));	1603	PUSHs (sv_2mortal (newSViv (sh)));
1151	PUSHs (darkness_sv);	1604	PUSHs (darkness_sv);
1152	}	1605	}
1153		1606
1154	SV *	1607	SV *
1155	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1608	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1156	CODE:	1609	CODE:
1157	{	1610	{
1158	int x, y, x1, y1;	1611	int x, y, x1, y1;
1159	SV data_sv = newSV (w h * 7 + 5);	1612	SV data_sv = newSV (w h * 7 + 5);
1160	uint8_t data = (uint8_t )SvPVX (data_sv);	1613	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1222	}	1675	}
1223	OUTPUT:	1676	OUTPUT:
1224	RETVAL	1677	RETVAL
1225		1678
1226	void	1679	void
1227	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1680	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1228	PPCODE:	1681	PPCODE:
1229	{	1682	{
1230	int x, y, z;	1683	int x, y, z;
1231	int w, h;	1684	int w, h;
1232	int x1, y1;	1685	int x1, y1;
…		…
1264		1717
1265	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1718	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1266	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1719	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1267	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1720	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1268		1721
1269	if (cell->darkness <= 0)	1722	if (cell->darkness == 0)
1270	{	1723	{
1271	cell->darkness = -1;	1724	cell->darkness = 0;
1272		1725
1273	for (z = 0; z <= 2; z++)	1726	for (z = 0; z <= 2; z++)
1274	{	1727	{
1275	cell->face[z] = face[z];	1728	cell->face[z] = face[z];
1276		1729
…		…
1281	}	1734	}
1282	}	1735	}
1283	}	1736	}
1284	}	1737	}
1285		1738
1286	MODULE = CFClient PACKAGE = CFClient::MixChunk	1739	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1287		1740
1288	CFClient::MixChunk	1741	CFPlus::MixChunk
1289	new_from_file (SV class, char path)	1742	new_from_file (SV class, char path)
1290	CODE:	1743	CODE:
1291	RETVAL = Mix_LoadWAV (path);	1744	RETVAL = Mix_LoadWAV (path);
1292	OUTPUT:	1745	OUTPUT:
1293	RETVAL	1746	RETVAL
1294		1747
1295	void	1748	void
1296	DESTROY (CFClient::MixChunk self)	1749	DESTROY (CFPlus::MixChunk self)
1297	CODE:	1750	CODE:
1298	Mix_FreeChunk (self);	1751	Mix_FreeChunk (self);
1299		1752
1300	int	1753	int
1301	volume (CFClient::MixChunk self, int volume = -1)	1754	volume (CFPlus::MixChunk self, int volume = -1)
1302	CODE:	1755	CODE:
1303	RETVAL = Mix_VolumeChunk (self, volume);	1756	RETVAL = Mix_VolumeChunk (self, volume);
1304	OUTPUT:	1757	OUTPUT:
1305	RETVAL	1758	RETVAL
1306		1759
1307	int	1760	int
1308	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1761	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1309	CODE:	1762	CODE:
1310	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1763	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1311	OUTPUT:	1764	OUTPUT:
1312	RETVAL	1765	RETVAL
1313		1766
1314	MODULE = CFClient PACKAGE = CFClient::MixMusic	1767	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1315		1768
1316	int	1769	int
1317	volume (int volume = -1)	1770	volume (int volume = -1)
1318	CODE:	1771	CODE:
1319	RETVAL = Mix_VolumeMusic (volume);	1772	RETVAL = Mix_VolumeMusic (volume);
1320	OUTPUT:	1773	OUTPUT:
1321	RETVAL	1774	RETVAL
1322		1775
1323	CFClient::MixMusic	1776	CFPlus::MixMusic
1324	new_from_file (SV class, char path)	1777	new_from_file (SV class, char path)
1325	CODE:	1778	CODE:
1326	RETVAL = Mix_LoadMUS (path);	1779	RETVAL = Mix_LoadMUS (path);
1327	OUTPUT:	1780	OUTPUT:
1328	RETVAL	1781	RETVAL
1329		1782
1330	void	1783	void
1331	DESTROY (CFClient::MixMusic self)	1784	DESTROY (CFPlus::MixMusic self)
1332	CODE:	1785	CODE:
1333	Mix_FreeMusic (self);	1786	Mix_FreeMusic (self);
1334		1787
1335	int	1788	int
1336	play (CFClient::MixMusic self, int loops = -1)	1789	play (CFPlus::MixMusic self, int loops = -1)
1337	CODE:	1790	CODE:
1338	RETVAL = Mix_PlayMusic (self, loops);	1791	RETVAL = Mix_PlayMusic (self, loops);
1339	OUTPUT:	1792	OUTPUT:
1340	RETVAL	1793	RETVAL
1341		1794
1342	MODULE = CFClient PACKAGE = CFClient::OpenGL	1795	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1343		1796
1344	BOOT:	1797	BOOT:
1345	{	1798	{
1346	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1799	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1347	static const struct {	1800	static const struct {
1348	const char *name;	1801	const char *name;
1349	IV iv;	1802	IV iv;
1350	} *civ, const_iv[] = {	1803	} *civ, const_iv[] = {
1351	# define const_iv(name) { # name, (IV)name }	1804	# define const_iv(name) { # name, (IV)name }
1352	const_iv (GL_COLOR_MATERIAL),	1805	const_iv (GL_COLOR_MATERIAL),
1353	const_iv (GL_SMOOTH),	1806	const_iv (GL_SMOOTH),
1354	const_iv (GL_FLAT),	1807	const_iv (GL_FLAT),
1355	const_iv (GL_DITHER),	1808	const_iv (GL_DITHER),
1356	const_iv (GL_BLEND),	1809	const_iv (GL_BLEND),
		1810	const_iv (GL_CULL_FACE),
1357	const_iv (GL_SCISSOR_TEST),	1811	const_iv (GL_SCISSOR_TEST),
		1812	const_iv (GL_DEPTH_TEST),
		1813	const_iv (GL_ALPHA_TEST),
		1814	const_iv (GL_NORMALIZE),
		1815	const_iv (GL_RESCALE_NORMAL),
		1816	const_iv (GL_FRONT),
		1817	const_iv (GL_BACK),
1358	const_iv (GL_AND),	1818	const_iv (GL_AND),
1359	const_iv (GL_ONE),	1819	const_iv (GL_ONE),
1360	const_iv (GL_ZERO),	1820	const_iv (GL_ZERO),
1361	const_iv (GL_SRC_ALPHA),	1821	const_iv (GL_SRC_ALPHA),
1362	const_iv (GL_SRC_ALPHA_SATURATE),	1822	const_iv (GL_DST_ALPHA),
1363	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1823	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1364	const_iv (GL_ONE_MINUS_DST_ALPHA),	1824	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1825	const_iv (GL_SRC_ALPHA_SATURATE),
1365	const_iv (GL_RGB),	1826	const_iv (GL_RGB),
1366	const_iv (GL_RGBA),	1827	const_iv (GL_RGBA),
		1828	const_iv (GL_RGBA4),
		1829	const_iv (GL_RGBA8),
		1830	const_iv (GL_RGB5_A1),
1367	const_iv (GL_UNSIGNED_BYTE),	1831	const_iv (GL_UNSIGNED_BYTE),
		1832	const_iv (GL_UNSIGNED_SHORT),
		1833	const_iv (GL_UNSIGNED_INT),
1368	const_iv (GL_ALPHA),	1834	const_iv (GL_ALPHA),
		1835	const_iv (GL_INTENSITY),
		1836	const_iv (GL_LUMINANCE),
		1837	const_iv (GL_LUMINANCE_ALPHA),
1369	const_iv (GL_FLOAT),	1838	const_iv (GL_FLOAT),
1370	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1839	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1371	const_iv (GL_COMPILE),	1840	const_iv (GL_COMPILE),
1372	const_iv (GL_TEXTURE_1D),	1841	const_iv (GL_TEXTURE_1D),
1373	const_iv (GL_TEXTURE_2D),	1842	const_iv (GL_TEXTURE_2D),
…		…
1375	const_iv (GL_TEXTURE_MAG_FILTER),	1844	const_iv (GL_TEXTURE_MAG_FILTER),
1376	const_iv (GL_TEXTURE_MIN_FILTER),	1845	const_iv (GL_TEXTURE_MIN_FILTER),
1377	const_iv (GL_TEXTURE_ENV_MODE),	1846	const_iv (GL_TEXTURE_ENV_MODE),
1378	const_iv (GL_TEXTURE_WRAP_S),	1847	const_iv (GL_TEXTURE_WRAP_S),
1379	const_iv (GL_TEXTURE_WRAP_T),	1848	const_iv (GL_TEXTURE_WRAP_T),
		1849	const_iv (GL_REPEAT),
1380	const_iv (GL_CLAMP),	1850	const_iv (GL_CLAMP),
1381	const_iv (GL_REPEAT),	1851	const_iv (GL_CLAMP_TO_EDGE),
1382	const_iv (GL_NEAREST),	1852	const_iv (GL_NEAREST),
1383	const_iv (GL_LINEAR),	1853	const_iv (GL_LINEAR),
1384	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1854	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1385	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1855	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1386	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1856	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1387	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1857	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1388	const_iv (GL_GENERATE_MIPMAP),	1858	const_iv (GL_GENERATE_MIPMAP),
1389	const_iv (GL_MODULATE),	1859	const_iv (GL_MODULATE),
1390	const_iv (GL_DECAL),	1860	const_iv (GL_DECAL),
1391	const_iv (GL_REPLACE),	1861	const_iv (GL_REPLACE),
		1862	const_iv (GL_DEPTH_BUFFER_BIT),
1392	const_iv (GL_COLOR_BUFFER_BIT),	1863	const_iv (GL_COLOR_BUFFER_BIT),
1393	const_iv (GL_PROJECTION),	1864	const_iv (GL_PROJECTION),
1394	const_iv (GL_MODELVIEW),	1865	const_iv (GL_MODELVIEW),
1395	const_iv (GL_COLOR_LOGIC_OP),	1866	const_iv (GL_COLOR_LOGIC_OP),
1396	const_iv (GL_SEPARABLE_2D),	1867	const_iv (GL_SEPARABLE_2D),
1397	const_iv (GL_CONVOLUTION_2D),	1868	const_iv (GL_CONVOLUTION_2D),
1398	const_iv (GL_CONVOLUTION_BORDER_MODE),	1869	const_iv (GL_CONVOLUTION_BORDER_MODE),
1399	const_iv (GL_CONSTANT_BORDER),	1870	const_iv (GL_CONSTANT_BORDER),
1400	const_iv (GL_LINES),	1871	const_iv (GL_LINES),
		1872	const_iv (GL_LINE_STRIP),
		1873	const_iv (GL_LINE_LOOP),
1401	const_iv (GL_QUADS),	1874	const_iv (GL_QUADS),
1402	const_iv (GL_LINE_LOOP),	1875	const_iv (GL_QUAD_STRIP),
		1876	const_iv (GL_TRIANGLES),
		1877	const_iv (GL_TRIANGLE_STRIP),
		1878	const_iv (GL_TRIANGLE_FAN),
1403	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1879	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1404	const_iv (GL_FASTEST),	1880	const_iv (GL_FASTEST),
		1881	const_iv (GL_V2F),
		1882	const_iv (GL_V3F),
		1883	const_iv (GL_T2F_V3F),
		1884	const_iv (GL_T2F_N3F_V3F),
1405	# undef const_iv	1885	# undef const_iv
1406	};	1886	};
1407		1887
1408	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1888	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1409	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1889	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1410	}	1890	}
1411		1891
		1892	char *
		1893	gl_vendor ()
		1894	CODE:
		1895	RETVAL = (char *)glGetString (GL_VENDOR);
		1896	OUTPUT:
		1897	RETVAL
		1898
		1899	char *
		1900	gl_version ()
		1901	CODE:
		1902	RETVAL = (char *)glGetString (GL_VERSION);
		1903	OUTPUT:
		1904	RETVAL
		1905
		1906	char *
		1907	gl_extensions ()
		1908	CODE:
		1909	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1910	OUTPUT:
		1911	RETVAL
		1912
1412	int glGetError ()	1913	int glGetError ()
		1914
		1915	void glFinish ()
1413		1916
1414	void glClear (int mask)	1917	void glClear (int mask)
1415		1918
1416	void glClearColor (float r, float g, float b, float a = 1.0)	1919	void glClearColor (float r, float g, float b, float a = 1.0)
1417	PROTOTYPE: @	1920	PROTOTYPE: @
…		…
1424		1927
1425	void glHint (int target, int mode)	1928	void glHint (int target, int mode)
1426		1929
1427	void glBlendFunc (int sfactor, int dfactor)	1930	void glBlendFunc (int sfactor, int dfactor)
1428		1931
		1932	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1933	CODE:
		1934	gl_BlendFuncSeparate (sa, da, saa, daa);
		1935
		1936	void glDepthMask (int flag)
		1937
1429	void glLogicOp (int opcode)	1938	void glLogicOp (int opcode)
1430		1939
1431	void glColorMask (int red, int green, int blue, int alpha)	1940	void glColorMask (int red, int green, int blue, int alpha)
1432		1941
1433	void glMatrixMode (int mode)	1942	void glMatrixMode (int mode)
…		…
1436		1945
1437	void glPopMatrix ()	1946	void glPopMatrix ()
1438		1947
1439	void glLoadIdentity ()	1948	void glLoadIdentity ()
1440		1949
		1950	void glDrawBuffer (int buffer)
		1951
		1952	void glReadBuffer (int buffer)
		1953
1441	# near and far are due to microsofts buggy c compiler	1954	# near_ and far_ are due to microsofts buggy "c" compiler
		1955	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1956
		1957	# near_ and far_ are due to microsofts buggy "c" compiler
1442	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1958	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1443		1959
1444	void glViewport (int x, int y, int width, int height)	1960	void glViewport (int x, int y, int width, int height)
1445		1961
1446	void glScissor (int x, int y, int width, int height)	1962	void glScissor (int x, int y, int width, int height)
…		…
1461		1977
1462	void glEnd ()	1978	void glEnd ()
1463		1979
1464	void glColor (float r, float g, float b, float a = 1.0)	1980	void glColor (float r, float g, float b, float a = 1.0)
1465	PROTOTYPE: @	1981	PROTOTYPE: @
		1982	ALIAS:
		1983	glColor_premultiply = 1
1466	CODE:	1984	CODE:
1467	glColor4ub (r * 255., g * 255., b * 255., a * 255.);	1985	if (ix)
		1986	{
		1987	r *= a;
		1988	g *= a;
		1989	b *= a;
		1990	}
		1991	// microsoft visual "c" rounds instead of truncating...
		1992	glColor4f (r, g, b, a);
		1993
		1994	void glInterleavedArrays (int format, int stride, char *data)
		1995
		1996	void glDrawElements (int mode, int count, int type, char *indices)
		1997
		1998	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1999
		2000	void glRasterPos (float x, float y, float z = 0.)
		2001	CODE:
		2002	glRasterPos3f (0, 0, z);
		2003	glBitmap (0, 0, 0, 0, x, y, 0);
1468		2004
1469	void glVertex (float x, float y, float z = 0.)	2005	void glVertex (float x, float y, float z = 0.)
1470	CODE:	2006	CODE:
1471	glVertex3f (x, y, z);	2007	glVertex3f (x, y, z);
1472		2008
…		…
1484		2020
1485	void glBindTexture (int target, int name)	2021	void glBindTexture (int target, int name)
1486		2022
1487	void glConvolutionParameter (int target, int pname, float params)	2023	void glConvolutionParameter (int target, int pname, float params)
1488	CODE:	2024	CODE:
1489	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2025	if (gl.ConvolutionParameterf)
		2026	gl.ConvolutionParameterf (target, pname, params);
1490		2027
1491	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2028	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1492	CODE:	2029	CODE:
1493	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2030	if (gl.ConvolutionFilter2D)
1494	(target, internalformat, width, height, format, type, data));	2031	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1495		2032
1496	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2033	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1497	CODE:	2034	CODE:
1498	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2035	if (gl.SeparableFilter2D)
1499	(target, internalformat, width, height, format, type, row, column));	2036	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1500		2037
1501	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2038	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1502		2039
1503	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2040	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1504		2041
1505	void glRasterPos (int x, int y)	2042	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1506	CODE:
1507	glRasterPos2i (x, y);
1508		2043
1509	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2044	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1510		2045
1511	int glGenTexture ()	2046	int glGenTexture ()
1512	CODE:	2047	CODE:

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.70 by root, Sun Apr 30 09:21:47 2006 UTC vs. Revision 1.146 by root, Sat Aug 19 02:49:53 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.70 by root, Sun Apr 30 09:21:47 2006 UTC vs.
Revision 1.146 by root, Sat Aug 19 02:49:53 2006 UTC