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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.56 by root, Thu Apr 20 09:13:31 2006 UTC vs.
Revision 1.145 by root, Fri Aug 18 03:19:58 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
244	static void	319	static void
245	music_finished ()	320	music_finished (void)
246	{	321	{
247	SDL_UserEvent ev;	322	SDL_UserEvent ev;
248		323
249	ev.type = SDL_USEREVENT;	324	ev.type = SDL_USEREVENT;
250	ev.code = 0;	325	ev.code = 0;
251	ev.data1 = 0;	326	ev.data1 = 0;
252	ev.data2 = 0;	327	ev.data2 = 0;
253		328
		329	SDL_PushEvent ((SDL_Event *)&ev);
		330	}
		331
		332	static void
		333	channel_finished (int channel)
		334	{
254	SDL_PushEvent (&ev);	335	SDL_UserEvent ev;
255	}
256		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
257	MODULE = CFClient PACKAGE = CFClient	362	MODULE = CFPlus PACKAGE = CFPlus
258		363
259	PROTOTYPES: ENABLE	364	PROTOTYPES: ENABLE
260		365
261	BOOT:	366	BOOT:
262	{	367	{
263	HV *stash = gv_stashpv ("CFClient", 1);	368	HV *stash = gv_stashpv ("CFPlus", 1);
264	static const struct {	369	static const struct {
265	const char *name;	370	const char *name;
266	IV iv;	371	IV iv;
267	} *civ, const_iv[] = {	372	} *civ, const_iv[] = {
268	# define const_iv(name) { # name, (IV)name }	373	# define const_iv(name) { # name, (IV)name }
…		…
367	# undef const_iv	472	# undef const_iv
368	};	473	};
369		474
370	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; )
371	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	476	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
372
373	fontmap = pango_ft2_font_map_new ();
374	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
375	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
376	}	477	}
377		478
378	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
379	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	500	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
380		501
381	void	502	void
382	SDL_Quit ()	503	SDL_Quit ()
383		504
384	void	505	void
…		…
390	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	511	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
391	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	512	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
392	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	513	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
393	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	514	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
394		515
		516	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		517	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		518
395	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	519	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
396	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	520	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
397	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
398	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	522	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
399		523
400	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	524	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		525	#if SDL_VERSION_ATLEAST(1,2,10)
401	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	526	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
402	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		528	#endif
403		529
404	SDL_EnableUNICODE (1);	530	SDL_EnableUNICODE (1);
405	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	531	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
406		532
407	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	533	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
416		542
417	++m;	543	++m;
418	}	544	}
419	}	545	}
420		546
		547	char *
		548	SDL_GetError ()
		549
421	int	550	int
422	SDL_SetVideoMode (int w, int h, int fullscreen)	551	SDL_SetVideoMode (int w, int h, int fullscreen)
423	CODE:	552	CODE:
424	RETVAL = !!SDL_SetVideoMode (	553	RETVAL = !!SDL_SetVideoMode (
425	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	554	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
426	);	555	);
		556	if (RETVAL)
		557	{
427	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	}
428	OUTPUT:	563	OUTPUT:
429	RETVAL	564	RETVAL
430		565
431	void	566	void
432	SDL_GL_SwapBuffers ()	567	SDL_GL_SwapBuffers ()
		568
		569	char *
		570	SDL_GetKeyName (int sym)
433		571
434	void	572	void
435	SDL_PollEvent ()	573	SDL_PollEvent ()
436	PPCODE:	574	PPCODE:
437	{	575	{
…		…
439		577
440	while (SDL_PollEvent (&ev))	578	while (SDL_PollEvent (&ev))
441	{	579	{
442	HV *hv = newHV ();	580	HV *hv = newHV ();
443	hv_store (hv, "type", 4, newSViv (ev.type), 0);	581	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		582
444	switch (ev.type)	583	switch (ev.type)
445	{	584	{
446	case SDL_KEYDOWN:	585	case SDL_KEYDOWN:
447	case SDL_KEYUP:	586	case SDL_KEYUP:
448	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	587	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
455	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	594	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
456	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	595	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
457	break;	596	break;
458		597
459	case SDL_MOUSEMOTION:	598	case SDL_MOUSEMOTION:
		599	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		600
460	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	601	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
461	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	602	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
462	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	603	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
463	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	604	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
464	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	605	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
465	break;	606	break;
466		607
467	case SDL_MOUSEBUTTONDOWN:	608	case SDL_MOUSEBUTTONDOWN:
468	case SDL_MOUSEBUTTONUP:	609	case SDL_MOUSEBUTTONUP:
		610	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		611
469	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	612	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
470	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	613	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
471	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	614	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
472	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;
473	}	623	}
474		624
475	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	625	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
476	}	626	}
477	}	627	}
478		628
479	int	629	int
480	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)
481	POSTCALL:	631	POSTCALL:
482	Mix_HookMusicFinished (music_finished);	632	Mix_HookMusicFinished (music_finished);
		633	Mix_ChannelFinished (channel_finished);
483		634
484	void	635	void
485	Mix_CloseAudio ()	636	Mix_CloseAudio ()
486		637
487	int	638	int
…		…
492	CODE:	643	CODE:
493	#ifndef _WIN32	644	#ifndef _WIN32
494	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	645	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
495	#endif	646	#endif
496		647
497	char *
498	gl_version ()
499	CODE:
500	RETVAL = (char *)glGetString (GL_VERSION);
501	OUTPUT:
502	RETVAL
503
504	char *
505	gl_extensions ()
506	CODE:
507	RETVAL = (char *)glGetString (GL_EXTENSIONS);
508	OUTPUT:
509	RETVAL
510
511	void	648	void
512	add_font (char *file)	649	add_font (char *file)
513	CODE:	650	CODE:
514	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	651	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
515
516	void
517	set_font (char *file)
518	CODE:
519	{
520	int count;
521	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )file, 0, 0, &count);
522	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
523	FcPatternDestroy (pattern);
524	pango_context_set_font_description (context, font);
525	}
526		652
527	void	653	void
528	load_image_inline (SV *image_)	654	load_image_inline (SV *image_)
529	ALIAS:	655	ALIAS:
530	load_image_file = 1	656	load_image_file = 1
…		…
572		698
573	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	699	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
574		700
575	assert (surface2->pitch == surface2->w * 4);	701	assert (surface2->pitch == surface2->w * 4);
576		702
		703	SDL_LockSurface (surface2);
577	EXTEND (SP, 5);	704	EXTEND (SP, 6);
578	PUSHs (sv_2mortal (newSViv (surface2->w)));	705	PUSHs (sv_2mortal (newSViv (surface2->w)));
579	PUSHs (sv_2mortal (newSViv (surface2->h)));	706	PUSHs (sv_2mortal (newSViv (surface2->h)));
580	SDL_LockSurface (surface2);
581	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	707	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
582	SDL_UnlockSurface (surface2);
583	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)));
584	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	709	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
585	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	710	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		711	SDL_UnlockSurface (surface2);
586		712
587	SDL_FreeSurface (surface);	713	SDL_FreeSurface (surface);
588	SDL_FreeSurface (surface2);	714	SDL_FreeSurface (surface2);
589	}	715	}
590		716
…		…
612	PUSHs (sv_2mortal (newSViv (b / y)));	738	PUSHs (sv_2mortal (newSViv (b / y)));
613	PUSHs (sv_2mortal (newSViv (a / y)));	739	PUSHs (sv_2mortal (newSViv (a / y)));
614	}	740	}
615		741
616	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
617	fatal (char *message)	751	fatal (char *message)
618	CODE:	752	CODE:
		753	fprintf (stderr, "FATAL: %s\n", message);
619	#ifdef _WIN32	754	#ifdef _WIN32
620	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	755	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
621	#else
622	fprintf (stderr, "FATAL: %s\n", message);
623	#endif	756	#endif
624	exit (1);	757	_exit (1);
625		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
626	MODULE = CFClient PACKAGE = CFClient::Layout	788	MODULE = CFPlus PACKAGE = CFPlus::Layout
627		789
628	CFClient::Layout	790	void
629	new (SV *class, int base_height = 10)	791	reset_glyph_cache ()
		792	CODE:
		793	tc_clear ();
		794
		795	CFPlus::Layout
		796	new (SV *class)
630	CODE:	797	CODE:
631	New (0, RETVAL, 1, struct cf_layout);	798	New (0, RETVAL, 1, struct cf_layout);
632	RETVAL->base_height = base_height;	799
633	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
634	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);
635	OUTPUT:	810	OUTPUT:
636	RETVAL	811	RETVAL
637		812
638	void	813	void
639	DESTROY (CFClient::Layout self)	814	DESTROY (CFPlus::Layout self)
640	CODE:	815	CODE:
641	g_object_unref (self->pl);	816	g_object_unref (self->pl);
642	Safefree (self);	817	Safefree (self);
643		818
644	void	819	void
645	set_text (CFClient::Layout self, SV *text_)	820	set_text (CFPlus::Layout self, SV *text_)
646	CODE:	821	CODE:
647	{	822	{
648	STRLEN textlen;	823	STRLEN textlen;
649	char *text = SvPVutf8 (text_, textlen);	824	char *text = SvPVutf8 (text_, textlen);
650		825
651	pango_layout_set_text (self->pl, text, textlen);	826	pango_layout_set_text (self->pl, text, textlen);
652	}	827	}
653		828
654	void	829	void
655	set_markup (CFClient::Layout self, SV *text_)	830	set_markup (CFPlus::Layout self, SV *text_)
656	CODE:	831	CODE:
657	{	832	{
658	STRLEN textlen;	833	STRLEN textlen;
659	char *text = SvPVutf8 (text_, textlen);	834	char *text = SvPVutf8 (text_, textlen);
660		835
661	pango_layout_set_markup (self->pl, text, textlen);	836	pango_layout_set_markup (self->pl, text, textlen);
662	}	837	}
663		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
664	SV *	924	SV *
665	get_text (CFClient::Layout self)	925	get_text (CFPlus::Layout self)
666	CODE:	926	CODE:
667	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	927	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
668	SvUTF8_on (RETVAL);	928	sv_utf8_decode (RETVAL);
669	OUTPUT:	929	OUTPUT:
670	RETVAL	930	RETVAL
671		931
672	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
673	set_height (CFClient::Layout self, int base_height)	950	set_height (CFPlus::Layout self, int base_height)
674	CODE:	951	CODE:
		952	if (self->base_height != base_height)
		953	{
675	self->base_height = base_height;	954	self->base_height = base_height;
		955	layout_update_font (self);
		956	}
676		957
677	void	958	void
678	set_width (CFClient::Layout self, int max_width = -1)	959	set_width (CFPlus::Layout self, int max_width = -1)
679	CODE:	960	CODE:
680	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);
681		962
682	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
683	size (CFClient::Layout self)	989	size (CFPlus::Layout self)
684	PPCODE:	990	PPCODE:
685	{	991	{
686	int w, h;	992	int w, h;
687		993
688	layout_update (self);
689	layout_get_pixel_size (self, &w, &h);	994	layout_get_pixel_size (self, &w, &h);
690		995
691	EXTEND (SP, 2);	996	EXTEND (SP, 2);
692	PUSHs (sv_2mortal (newSViv (w)));	997	PUSHs (sv_2mortal (newSViv (w)));
693	PUSHs (sv_2mortal (newSViv (h)));	998	PUSHs (sv_2mortal (newSViv (h)));
694	}	999	}
695		1000
696	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
697	xy_to_index (CFClient::Layout self, int x, int y)	1014	xy_to_index (CFPlus::Layout self, int x, int y)
698	CODE:	1015	CODE:
699	{	1016	{
700	int index, trailing;	1017	int index, trailing;
701
702	layout_update (self);
703	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);
704
705	RETVAL = index;	1019	RETVAL = index;
706	}	1020	}
707	OUTPUT:	1021	OUTPUT:
708	RETVAL	1022	RETVAL
709		1023
710	void	1024	void
711	cursor_pos (CFClient::Layout self, int index)	1025	cursor_pos (CFPlus::Layout self, int index)
712	PPCODE:	1026	PPCODE:
713	{	1027	{
714	PangoRectangle strong_pos;	1028	PangoRectangle strong_pos;
715	layout_update (self);
716	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1029	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
717		1030
718	EXTEND (SP, 3);	1031	EXTEND (SP, 3);
719	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1032	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
720	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1033	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
721	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1034	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
722	}	1035	}
723		1036
724	void	1037	void
725	render (CFClient::Layout self)	1038	render (CFPlus::Layout self, float x, float y, int flags = 0)
726	PPCODE:	1039	PPCODE:
727	{	1040	pango_opengl_render_layout_subpixel (
728	SV *retval;	1041	self->pl,
729	int w, h;	1042	x * PANGO_SCALE, y * PANGO_SCALE,
730	FT_Bitmap bitmap;	1043	self->r, self->g, self->b, self->a,
		1044	flags
		1045	);
731		1046
732	layout_update (self);	1047	MODULE = CFPlus PACKAGE = CFPlus::Texture
733	layout_get_pixel_size (self, &w, &h);
734		1048
735	retval = newSV (w * h);	1049	void
736	SvPOK_only (retval);	1050	pad2pot (SV data_, SV w_, SV *h_)
737	SvCUR_set (retval, w * h);	1051	CODE:
		1052	{
		1053	int ow = SvIV (w_);
		1054	int oh = SvIV (h_);
738		1055
739	bitmap.rows = h;	1056	if (ow && oh)
740	bitmap.width = w;	1057	{
741	bitmap.pitch = w;	1058	int nw = minpot (ow);
742	bitmap.buffer = (unsigned char*)SvPVX (retval);	1059	int nh = minpot (oh);
743	bitmap.num_grays = 256;
744	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
745		1060
746	memset (bitmap.buffer, 0, w * h);	1061	if (nw != ow \|\| nh != oh)
747		1062	{
748	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));
749		1069
750	EXTEND (SP, 3);	1070	SvPOK_only (result_);
751	PUSHs (sv_2mortal (newSViv (w)));	1071	SvCUR_set (result_, nw * nh * bpp);
752	PUSHs (sv_2mortal (newSViv (h)));
753	PUSHs (sv_2mortal (retval));
754	}
755		1072
756	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);
757		1076
		1077	sv_setsv (data_, result_);
		1078	}
		1079
		1080	sv_setiv (w_, nw);
		1081	sv_setiv (h_, nh);
		1082	}
		1083	}
		1084	}
		1085
758	void	1086	void
759	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.)
760	PROTOTYPE: $$$;$$	1088	PROTOTYPE: $$$;$$
		1089	ALIAS:
		1090	draw_quad_alpha = 1
		1091	draw_quad_alpha_premultiplied = 2
761	CODE:	1092	CODE:
762	{	1093	{
763	HV hv = (HV )SvRV (self);	1094	HV hv = (HV )SvRV (self);
764	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1095	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
765	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1096	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
766	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1097	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
767	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
768		1098
769	if (items < 5)	1099	if (items < 5)
770	{	1100	{
771	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1101	w = SvNV (*hv_fetch (hv, "w", 1, 1));
772	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1102	h = SvNV (*hv_fetch (hv, "h", 1, 1));
773	}	1103	}
774		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
775	glBindTexture (GL_TEXTURE_2D, name);	1119	glBindTexture (GL_TEXTURE_2D, name);
776	if (wrap_mode) {	1120
777	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
778	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
779	}
780	glBegin (GL_QUADS);	1121	glBegin (GL_QUADS);
781	glTexCoord2f (0, 0); glVertex2f (x , y );	1122	glTexCoord2f (0, 0); glVertex2f (x , y );
782	glTexCoord2f (0, t); glVertex2f (x , y + h);	1123	glTexCoord2f (0, t); glVertex2f (x , y + h);
783	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1124	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
784	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1125	glTexCoord2f (s, 0); glVertex2f (x + w, y );
785	glEnd ();	1126	glEnd ();
786	}
787		1127
		1128	if (ix)
		1129	{
		1130	glDisable (GL_ALPHA_TEST);
		1131	glDisable (GL_BLEND);
		1132	}
		1133	}
		1134
788	MODULE = CFClient PACKAGE = CFClient::Map	1135	MODULE = CFPlus PACKAGE = CFPlus::Map
789		1136
790	CFClient::Map	1137	CFPlus::Map
791	new (SV *class, int map_width, int map_height)	1138	new (SV *class, int map_width, int map_height)
792	CODE:	1139	CODE:
793	New (0, RETVAL, 1, struct map);	1140	New (0, RETVAL, 1, struct map);
794	RETVAL->x = 0;	1141	RETVAL->x = 0;
795	RETVAL->y = 0;	1142	RETVAL->y = 0;
…		…
805	RETVAL->row = 0;	1152	RETVAL->row = 0;
806	OUTPUT:	1153	OUTPUT:
807	RETVAL	1154	RETVAL
808		1155
809	void	1156	void
810	DESTROY (CFClient::Map self)	1157	DESTROY (CFPlus::Map self)
811	CODE:	1158	CODE:
812	{	1159	{
813	map_clear (self);	1160	map_clear (self);
814	Safefree (self->face);	1161	Safefree (self->face);
		1162	Safefree (self->tex);
815	Safefree (self);	1163	Safefree (self);
816	}	1164	}
817		1165
818	void	1166	void
819	clear (CFClient::Map self)	1167	clear (CFPlus::Map self)
820	CODE:	1168	CODE:
821	map_clear (self);	1169	map_clear (self);
822		1170
823	void	1171	void
824	set_face (CFClient::Map self, int face, int texid)	1172	set_face (CFPlus::Map self, int face, int texid)
825	CODE:	1173	CODE:
826	{	1174	{
827	while (self->faces <= face)	1175	while (self->faces <= face)
828	{	1176	{
829	Append (mapface, self->face, self->faces, self->faces);	1177	Append (mapface, self->face, self->faces, self->faces);
…		…
832		1180
833	self->face [face] = texid;	1181	self->face [face] = texid;
834	}	1182	}
835		1183
836	void	1184	void
837	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)
838	CODE:	1186	CODE:
839	{	1187	{
840	while (self->texs <= texid)	1188	while (self->texs <= texid)
841	{	1189	{
842	Append (maptex, self->tex, self->texs, self->texs);	1190	Append (maptex, self->tex, self->texs, self->texs);
…		…
854	tex->r = r;	1202	tex->r = r;
855	tex->g = g;	1203	tex->g = g;
856	tex->b = b;	1204	tex->b = b;
857	tex->a = a;	1205	tex->a = a;
858	}	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);
859	}	1216	}
860		1217
861	int	1218	int
862	ox (CFClient::Map self)	1219	ox (CFPlus::Map self)
863	ALIAS:	1220	ALIAS:
864	oy = 1	1221	oy = 1
		1222	x = 2
		1223	y = 3
		1224	w = 4
		1225	h = 5
865	CODE:	1226	CODE:
866	switch (ix)	1227	switch (ix)
867	{	1228	{
868	case 0: RETVAL = self->ox; break;	1229	case 0: RETVAL = self->ox; break;
869	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;
870	}	1235	}
871	OUTPUT:	1236	OUTPUT:
872	RETVAL	1237	RETVAL
873		1238
874	void	1239	void
875	scroll (CFClient::Map self, int dx, int dy)	1240	scroll (CFPlus::Map self, int dx, int dy)
876	CODE:	1241	CODE:
877	{	1242	{
878	if (dx > 0)	1243	if (dx > 0)
879	map_blank (self, self->x, self->y, dx - 1, self->h);	1244	map_blank (self, self->x, self->y, dx - 1, self->h);
880	else if (dx < 0)	1245	else if (dx < 0)
…		…
896	self->y += MAP_EXTEND_Y;	1261	self->y += MAP_EXTEND_Y;
897	}	1262	}
898	}	1263	}
899		1264
900	void	1265	void
901	map1a_update (CFClient::Map self, SV *data_)	1266	map1a_update (CFPlus::Map self, SV *data_, int extmap)
902	CODE:	1267	CODE:
903	{	1268	{
904	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1269	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
905	uint8_t data_end = (uint8_t )SvEND (data_);	1270	uint8_t data_end = (uint8_t )SvEND (data_);
906	mapcell *cell;	1271	mapcell *cell;
…		…
908		1273
909	while (data < data_end)	1274	while (data < data_end)
910	{	1275	{
911	flags = (data [0] << 8) + data [1]; data += 2;	1276	flags = (data [0] << 8) + data [1]; data += 2;
912		1277
913	x = ((flags >> 10) & 63) + self->x;	1278	x = self->x + ((flags >> 10) & 63);
914	y = ((flags >> 4) & 63) + self->y;	1279	y = self->y + ((flags >> 4) & 63);
915		1280
916	cell = map_get_cell (self, x, y);	1281	cell = map_get_cell (self, x, y);
917		1282
918	if (flags & 15)	1283	if (flags & 15)
919	{	1284	{
920	if (cell->darkness < 0)	1285	if (!cell->darkness)
921	{	1286	{
922	cell->darkness = 0;	1287	cell->darkness = 256;
923	cell->face [0] = 0;	1288	cell->face [0] = 0;
924	cell->face [1] = 0;	1289	cell->face [1] = 0;
925	cell->face [2] = 0;	1290	cell->face [2] = 0;
		1291	cell->stat_hp = 0;
926	}	1292	}
927		1293
928	cell->darkness = flags & 8 ? *data++ : 255;
929
930	//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 & 0x3f;
		1306
		1307	if (ext < 4)
		1308	cell->darkness = 255 - ext * 64 + 1;
		1309	else if (ext == 5) // health
		1310	cell->stat_hp = *data++;
		1311	else if (ext & 0x40) // unknown, multibyte => skip
		1312	data += *data + 1;
		1313	}
		1314	while (cmd & 0x80);
		1315	}
		1316	else
		1317	cell->darkness = *data++ + 1;
		1318	}
931		1319
932	if (flags & 4)	1320	if (flags & 4)
933	{	1321	{
934	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1322	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
935	}	1323	}
…		…
943	{	1331	{
944	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1332	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
945	}	1333	}
946	}	1334	}
947	else	1335	else
948	cell->darkness = -1;	1336	cell->darkness = 0;
949	}	1337	}
950	}	1338	}
951		1339
952	SV *	1340	SV *
953	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1341	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
954	CODE:	1342	CODE:
955	{	1343	{
956	int x1, x;	1344	int x1, x;
957	int y1, y;	1345	int y1, y;
958	int z;	1346	int z;
…		…
1008	}	1396	}
1009	OUTPUT:	1397	OUTPUT:
1010	RETVAL	1398	RETVAL
1011		1399
1012	void	1400	void
1013	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1401	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1014	PPCODE:	1402	CODE:
1015	{	1403	{
1016	int vx, vy;	1404	int vx, vy;
1017	int x, y, z;	1405	int x, y, z;
1018	int last_name;	1406	int last_name;
1019	mapface face;	1407	mapface face;
1020	int sw4 = (sw + 3) & ~3;
1021	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1022	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1023		1408
1024	memset (darkness, 255, sw4 * sh);
1025	SvPOK_only (darkness_sv);
1026	SvCUR_set (darkness_sv, sw4 * sh);
1027
1028	vx = self->x + (self->w - sw) / 2 - shift_x;	1409	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1029	vy = self->y + (self->h - sh) / 2 - shift_y;	1410	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1030		1411
1031	/*	1412	/*
1032	int vx = self->vx = self->w >= sw	1413	int vx = self->vx = self->w >= sw
1033	? self->x + (self->w - sw) / 2	1414	? self->x + (self->w - sw) / 2
1034	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1415	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1038	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1419	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1039	*/	1420	*/
1040		1421
1041	glColor4ub (255, 255, 255, 255);	1422	glColor4ub (255, 255, 255, 255);
1042		1423
		1424	glEnable (GL_BLEND);
1043	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1425	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1044	glEnable (GL_BLEND);
1045	glEnable (GL_TEXTURE_2D);	1426	glEnable (GL_TEXTURE_2D);
1046	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1427	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1047		1428
1048	glBegin (GL_QUADS);	1429	glBegin (GL_QUADS);
1049		1430
…		…
1058	for (x = 0; x < sw; x++)	1439	for (x = 0; x < sw; x++)
1059	if (row->c0 <= x + vx && x + vx < row->c1)	1440	if (row->c0 <= x + vx && x + vx < row->c1)
1060	{	1441	{
1061	mapcell *cell = row->col + (x + vx - row->c0);	1442	mapcell *cell = row->col + (x + vx - row->c0);
1062		1443
1063	darkness[y * sw4 + x] = cell->darkness < 0
1064	? 255 - FOW_DARKNESS
1065	: 255 - cell->darkness;
1066
1067	face = cell->face [z];	1444	face = cell->face [z];
1068		1445
1069	if (face)	1446	if (face && face < self->texs)
1070	{	1447	{
1071	maptex tex = self->tex [face];	1448	maptex tex = self->tex [face];
1072		1449
1073	int px = (x + 1) * 32 - tex.w;	1450	int px = (x + 1) * 32 - tex.w;
1074	int py = (y + 1) * 32 - tex.h;	1451	int py = (y + 1) * 32 - tex.h;
…		…
1092	glEnd ();	1469	glEnd ();
1093		1470
1094	glDisable (GL_TEXTURE_2D);	1471	glDisable (GL_TEXTURE_2D);
1095	glDisable (GL_BLEND);	1472	glDisable (GL_BLEND);
1096		1473
		1474	// top layer: overlays such as the health bar
		1475	for (y = 0; y < sh; y++)
		1476	if (0 <= y + vy && y + vy < self->rows)
		1477	{
		1478	maprow *row = self->row + (y + vy);
		1479
		1480	for (x = 0; x < sw; x++)
		1481	if (row->c0 <= x + vx && x + vx < row->c1)
		1482	{
		1483	mapcell *cell = row->col + (x + vx - row->c0);
		1484
		1485	int px = x * 32;
		1486	int py = y * 32;
		1487
		1488	if (cell->stat_hp)
		1489	{
		1490	int width = sh / 28 + 1;
		1491
		1492	glColor3ub (0, 0, 0);
		1493	glRectf (px + 1, py, px + 31, py + width + 2);
		1494
		1495	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1496	glRectf (px + 2, py + 1, px + 30 - cell->stat_hp * 28 / 255, py + width + 1);
		1497	}
		1498	}
		1499	}
		1500	}
		1501
		1502	void
		1503	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1504	CODE:
		1505	{
		1506	static float color[16][3] = {
		1507	{ 0.00F, 0.00F, 0.00F },
		1508	{ 1.00F, 1.00F, 1.00F },
		1509	{ 0.00F, 0.00F, 0.55F },
		1510	{ 1.00F, 0.00F, 0.00F },
		1511
		1512	{ 1.00F, 0.54F, 0.00F },
		1513	{ 0.11F, 0.56F, 1.00F },
		1514	{ 0.93F, 0.46F, 0.00F },
		1515	{ 0.18F, 0.54F, 0.34F },
		1516
		1517	{ 0.56F, 0.73F, 0.56F },
		1518	{ 0.80F, 0.80F, 0.80F },
		1519	{ 0.55F, 0.41F, 0.13F },
		1520	{ 0.99F, 0.77F, 0.26F },
		1521
		1522	{ 0.74F, 0.65F, 0.41F },
		1523
		1524	{ 0.00F, 1.00F, 1.00F },
		1525	{ 1.00F, 0.00F, 1.00F },
		1526	{ 1.00F, 1.00F, 0.00F },
		1527	};
		1528
		1529	int x, y;
		1530
		1531	glEnable (GL_TEXTURE_2D);
		1532	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1533	glEnable (GL_BLEND);
		1534	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1535	glBegin (GL_QUADS);
		1536
		1537	for (y = 0; y < h; y++)
		1538	for (x = 0; x < w; x++)
		1539	{
		1540	unsigned char m = data [x + y * w];
		1541
		1542	if (m)
		1543	{
		1544	float *c = color [m & 15];
		1545
		1546	float tx1 = m & 0x40 ? 0.5 : 0.;
		1547	float tx2 = tx1 + 0.5;
		1548
		1549	glColor4f (c[0], c[1], c[2], 0.75);
		1550	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1551	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1552	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1553	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1554	}
		1555	}
		1556
		1557	glEnd ();
		1558	glDisable (GL_BLEND);
		1559	glDisable (GL_TEXTURE_2D);
		1560	}
		1561
		1562	void
		1563	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1564	PPCODE:
		1565	{
		1566	int vx, vy;
		1567	int x, y;
		1568	int sw4 = (sw + 3) & ~3;
		1569	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1570	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1571
		1572	memset (darkness, 255, sw4 * sh);
		1573	SvPOK_only (darkness_sv);
		1574	SvCUR_set (darkness_sv, sw4 * sh);
		1575
		1576	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1577	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1578
		1579	for (y = 0; y < sh; y++)
		1580	if (0 <= y + vy && y + vy < self->rows)
		1581	{
		1582	maprow *row = self->row + (y + vy);
		1583
		1584	for (x = 0; x < sw; x++)
		1585	if (row->c0 <= x + vx && x + vx < row->c1)
		1586	{
		1587	mapcell *cell = row->col + (x + vx - row->c0);
		1588
		1589	darkness[y * sw4 + x] = cell->darkness
		1590	? 255 - (cell->darkness - 1)
		1591	: 255 - FOW_DARKNESS;
		1592	}
		1593	}
		1594
1097	EXTEND (SP, 3);	1595	EXTEND (SP, 3);
1098	PUSHs (sv_2mortal (newSViv (sw4)));	1596	PUSHs (sv_2mortal (newSViv (sw4)));
1099	PUSHs (sv_2mortal (newSViv (sh)));	1597	PUSHs (sv_2mortal (newSViv (sh)));
1100	PUSHs (darkness_sv);	1598	PUSHs (darkness_sv);
1101	}	1599	}
1102		1600
1103	SV *	1601	SV *
1104	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1602	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1105	CODE:	1603	CODE:
1106	{	1604	{
1107	int x, y, x1, y1;	1605	int x, y, x1, y1;
1108	SV data_sv = newSV (w h * 7 + 5);	1606	SV data_sv = newSV (w h * 7 + 5);
1109	uint8_t data = (uint8_t )SvPVX (data_sv);	1607	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1171	}	1669	}
1172	OUTPUT:	1670	OUTPUT:
1173	RETVAL	1671	RETVAL
1174		1672
1175	void	1673	void
1176	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1674	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1177	PPCODE:	1675	PPCODE:
1178	{	1676	{
1179	int x, y, z;	1677	int x, y, z;
1180	int w, h;	1678	int w, h;
1181	int x1, y1;	1679	int x1, y1;
…		…
1213		1711
1214	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1712	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1215	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1713	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1216	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1714	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1217		1715
1218	if (cell->darkness <= 0)	1716	if (cell->darkness == 0)
1219	{	1717	{
1220	cell->darkness = -1;	1718	cell->darkness = 0;
1221		1719
1222	for (z = 0; z <= 2; z++)	1720	for (z = 0; z <= 2; z++)
1223	{	1721	{
1224	cell->face[z] = face[z];	1722	cell->face[z] = face[z];
1225		1723
…		…
1230	}	1728	}
1231	}	1729	}
1232	}	1730	}
1233	}	1731	}
1234		1732
1235	MODULE = CFClient PACKAGE = CFClient::MixChunk	1733	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1236		1734
1237	CFClient::MixChunk	1735	CFPlus::MixChunk
1238	new_from_file (SV class, char path)	1736	new_from_file (SV class, char path)
1239	CODE:	1737	CODE:
1240	RETVAL = Mix_LoadWAV (path);	1738	RETVAL = Mix_LoadWAV (path);
1241	OUTPUT:	1739	OUTPUT:
1242	RETVAL	1740	RETVAL
1243		1741
1244	void	1742	void
1245	DESTROY (CFClient::MixChunk self)	1743	DESTROY (CFPlus::MixChunk self)
1246	CODE:	1744	CODE:
1247	Mix_FreeChunk (self);	1745	Mix_FreeChunk (self);
1248		1746
1249	int	1747	int
1250	volume (CFClient::MixChunk self, int volume = -1)	1748	volume (CFPlus::MixChunk self, int volume = -1)
1251	CODE:	1749	CODE:
1252	RETVAL = Mix_VolumeChunk (self, volume);	1750	RETVAL = Mix_VolumeChunk (self, volume);
1253	OUTPUT:	1751	OUTPUT:
1254	RETVAL	1752	RETVAL
1255		1753
1256	int	1754	int
1257	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1755	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1258	CODE:	1756	CODE:
1259	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1757	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1260	OUTPUT:	1758	OUTPUT:
1261	RETVAL	1759	RETVAL
1262		1760
1263	MODULE = CFClient PACKAGE = CFClient::MixMusic	1761	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1264		1762
1265	int	1763	int
1266	volume (int volume = -1)	1764	volume (int volume = -1)
1267	CODE:	1765	CODE:
1268	RETVAL = Mix_VolumeMusic (volume);	1766	RETVAL = Mix_VolumeMusic (volume);
1269	OUTPUT:	1767	OUTPUT:
1270	RETVAL	1768	RETVAL
1271		1769
1272	CFClient::MixMusic	1770	CFPlus::MixMusic
1273	new_from_file (SV class, char path)	1771	new_from_file (SV class, char path)
1274	CODE:	1772	CODE:
1275	RETVAL = Mix_LoadMUS (path);	1773	RETVAL = Mix_LoadMUS (path);
1276	OUTPUT:	1774	OUTPUT:
1277	RETVAL	1775	RETVAL
1278		1776
1279	void	1777	void
1280	DESTROY (CFClient::MixMusic self)	1778	DESTROY (CFPlus::MixMusic self)
1281	CODE:	1779	CODE:
1282	Mix_FreeMusic (self);	1780	Mix_FreeMusic (self);
1283		1781
1284	int	1782	int
1285	play (CFClient::MixMusic self, int loops = -1)	1783	play (CFPlus::MixMusic self, int loops = -1)
1286	CODE:	1784	CODE:
1287	RETVAL = Mix_PlayMusic (self, loops);	1785	RETVAL = Mix_PlayMusic (self, loops);
1288	OUTPUT:	1786	OUTPUT:
1289	RETVAL	1787	RETVAL
1290		1788
1291	MODULE = CFClient PACKAGE = CFClient::OpenGL	1789	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1292		1790
1293	BOOT:	1791	BOOT:
1294	{	1792	{
1295	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1793	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1296	static const struct {	1794	static const struct {
1297	const char *name;	1795	const char *name;
1298	IV iv;	1796	IV iv;
1299	} *civ, const_iv[] = {	1797	} *civ, const_iv[] = {
1300	# define const_iv(name) { # name, (IV)name }	1798	# define const_iv(name) { # name, (IV)name }
1301	const_iv (GL_COLOR_MATERIAL),	1799	const_iv (GL_COLOR_MATERIAL),
1302	const_iv (GL_SMOOTH),	1800	const_iv (GL_SMOOTH),
1303	const_iv (GL_FLAT),	1801	const_iv (GL_FLAT),
		1802	const_iv (GL_DITHER),
1304	const_iv (GL_BLEND),	1803	const_iv (GL_BLEND),
		1804	const_iv (GL_CULL_FACE),
		1805	const_iv (GL_SCISSOR_TEST),
		1806	const_iv (GL_DEPTH_TEST),
		1807	const_iv (GL_ALPHA_TEST),
		1808	const_iv (GL_NORMALIZE),
		1809	const_iv (GL_RESCALE_NORMAL),
		1810	const_iv (GL_FRONT),
		1811	const_iv (GL_BACK),
1305	const_iv (GL_AND),	1812	const_iv (GL_AND),
		1813	const_iv (GL_ONE),
		1814	const_iv (GL_ZERO),
1306	const_iv (GL_SRC_ALPHA),	1815	const_iv (GL_SRC_ALPHA),
		1816	const_iv (GL_DST_ALPHA),
1307	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1817	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1818	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1819	const_iv (GL_SRC_ALPHA_SATURATE),
1308	const_iv (GL_RGB),	1820	const_iv (GL_RGB),
1309	const_iv (GL_RGBA),	1821	const_iv (GL_RGBA),
		1822	const_iv (GL_RGBA4),
		1823	const_iv (GL_RGBA8),
		1824	const_iv (GL_RGB5_A1),
1310	const_iv (GL_UNSIGNED_BYTE),	1825	const_iv (GL_UNSIGNED_BYTE),
1311	const_iv (GL_ALPHA4),	1826	const_iv (GL_UNSIGNED_SHORT),
		1827	const_iv (GL_UNSIGNED_INT),
1312	const_iv (GL_ALPHA),	1828	const_iv (GL_ALPHA),
		1829	const_iv (GL_INTENSITY),
		1830	const_iv (GL_LUMINANCE),
		1831	const_iv (GL_LUMINANCE_ALPHA),
1313	const_iv (GL_FLOAT),	1832	const_iv (GL_FLOAT),
1314	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1833	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1315	const_iv (GL_COMPILE),	1834	const_iv (GL_COMPILE),
1316	const_iv (GL_TEXTURE_1D),	1835	const_iv (GL_TEXTURE_1D),
1317	const_iv (GL_TEXTURE_2D),	1836	const_iv (GL_TEXTURE_2D),
…		…
1319	const_iv (GL_TEXTURE_MAG_FILTER),	1838	const_iv (GL_TEXTURE_MAG_FILTER),
1320	const_iv (GL_TEXTURE_MIN_FILTER),	1839	const_iv (GL_TEXTURE_MIN_FILTER),
1321	const_iv (GL_TEXTURE_ENV_MODE),	1840	const_iv (GL_TEXTURE_ENV_MODE),
1322	const_iv (GL_TEXTURE_WRAP_S),	1841	const_iv (GL_TEXTURE_WRAP_S),
1323	const_iv (GL_TEXTURE_WRAP_T),	1842	const_iv (GL_TEXTURE_WRAP_T),
		1843	const_iv (GL_REPEAT),
1324	const_iv (GL_CLAMP),	1844	const_iv (GL_CLAMP),
1325	const_iv (GL_REPEAT),	1845	const_iv (GL_CLAMP_TO_EDGE),
1326	const_iv (GL_NEAREST),	1846	const_iv (GL_NEAREST),
1327	const_iv (GL_LINEAR),	1847	const_iv (GL_LINEAR),
		1848	const_iv (GL_NEAREST_MIPMAP_NEAREST),
		1849	const_iv (GL_LINEAR_MIPMAP_NEAREST),
		1850	const_iv (GL_NEAREST_MIPMAP_LINEAR),
		1851	const_iv (GL_LINEAR_MIPMAP_LINEAR),
		1852	const_iv (GL_GENERATE_MIPMAP),
1328	const_iv (GL_MODULATE),	1853	const_iv (GL_MODULATE),
		1854	const_iv (GL_DECAL),
1329	const_iv (GL_REPLACE),	1855	const_iv (GL_REPLACE),
		1856	const_iv (GL_DEPTH_BUFFER_BIT),
1330	const_iv (GL_COLOR_BUFFER_BIT),	1857	const_iv (GL_COLOR_BUFFER_BIT),
1331	const_iv (GL_PROJECTION),	1858	const_iv (GL_PROJECTION),
1332	const_iv (GL_MODELVIEW),	1859	const_iv (GL_MODELVIEW),
1333	const_iv (GL_COLOR_LOGIC_OP),	1860	const_iv (GL_COLOR_LOGIC_OP),
		1861	const_iv (GL_SEPARABLE_2D),
1334	const_iv (GL_CONVOLUTION_2D),	1862	const_iv (GL_CONVOLUTION_2D),
1335	const_iv (GL_CONVOLUTION_BORDER_MODE),	1863	const_iv (GL_CONVOLUTION_BORDER_MODE),
1336	const_iv (GL_CONSTANT_BORDER),	1864	const_iv (GL_CONSTANT_BORDER),
1337	const_iv (GL_LINES),	1865	const_iv (GL_LINES),
		1866	const_iv (GL_LINE_STRIP),
		1867	const_iv (GL_LINE_LOOP),
1338	const_iv (GL_QUADS),	1868	const_iv (GL_QUADS),
1339	const_iv (GL_LINE_LOOP),	1869	const_iv (GL_QUAD_STRIP),
		1870	const_iv (GL_TRIANGLES),
		1871	const_iv (GL_TRIANGLE_STRIP),
		1872	const_iv (GL_TRIANGLE_FAN),
1340	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1873	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1341	const_iv (GL_FASTEST),	1874	const_iv (GL_FASTEST),
		1875	const_iv (GL_V2F),
		1876	const_iv (GL_V3F),
		1877	const_iv (GL_T2F_V3F),
		1878	const_iv (GL_T2F_N3F_V3F),
1342	# undef const_iv	1879	# undef const_iv
1343	};	1880	};
1344		1881
1345	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1882	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1346	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1883	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1347	}	1884	}
1348		1885
		1886	char *
		1887	gl_vendor ()
		1888	CODE:
		1889	RETVAL = (char *)glGetString (GL_VENDOR);
		1890	OUTPUT:
		1891	RETVAL
		1892
		1893	char *
		1894	gl_version ()
		1895	CODE:
		1896	RETVAL = (char *)glGetString (GL_VERSION);
		1897	OUTPUT:
		1898	RETVAL
		1899
		1900	char *
		1901	gl_extensions ()
		1902	CODE:
		1903	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1904	OUTPUT:
		1905	RETVAL
		1906
1349	int glGetError ()	1907	int glGetError ()
		1908
		1909	void glFinish ()
1350		1910
1351	void glClear (int mask)	1911	void glClear (int mask)
1352		1912
1353	void glClearColor (float r, float g, float b, float a = 1.0)	1913	void glClearColor (float r, float g, float b, float a = 1.0)
1354	PROTOTYPE: @	1914	PROTOTYPE: @
…		…
1361		1921
1362	void glHint (int target, int mode)	1922	void glHint (int target, int mode)
1363		1923
1364	void glBlendFunc (int sfactor, int dfactor)	1924	void glBlendFunc (int sfactor, int dfactor)
1365		1925
		1926	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1927	CODE:
		1928	gl_BlendFuncSeparate (sa, da, saa, daa);
		1929
		1930	void glDepthMask (int flag)
		1931
1366	void glLogicOp (int opcode)	1932	void glLogicOp (int opcode)
1367		1933
		1934	void glColorMask (int red, int green, int blue, int alpha)
		1935
1368	void glMatrixMode (int mode)	1936	void glMatrixMode (int mode)
1369		1937
1370	void glPushMatrix ()	1938	void glPushMatrix ()
1371		1939
1372	void glPopMatrix ()	1940	void glPopMatrix ()
1373		1941
1374	void glLoadIdentity ()	1942	void glLoadIdentity ()
1375		1943
		1944	void glDrawBuffer (int buffer)
		1945
		1946	void glReadBuffer (int buffer)
		1947
		1948	# near_ and far_ are due to microsofts buggy "c" compiler
		1949	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1950
		1951	# near_ and far_ are due to microsofts buggy "c" compiler
1376	void glOrtho (double left, double right, double bottom, double top, double near, double far)	1952	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1377		1953
1378	void glViewport (int x, int y, int width, int height)	1954	void glViewport (int x, int y, int width, int height)
		1955
		1956	void glScissor (int x, int y, int width, int height)
1379		1957
1380	void glTranslate (float x, float y, float z = 0.)	1958	void glTranslate (float x, float y, float z = 0.)
1381	CODE:	1959	CODE:
1382	glTranslatef (x, y, z);	1960	glTranslatef (x, y, z);
1383		1961
1384	void glScale (float x, float y, float z)	1962	void glScale (float x, float y, float z = 1.)
1385	CODE:	1963	CODE:
1386	glScalef (x, y, z);	1964	glScalef (x, y, z);
1387		1965
1388	void glRotate (float angle, float x, float y, float z)	1966	void glRotate (float angle, float x, float y, float z)
1389	CODE:	1967	CODE:
…		…
1393		1971
1394	void glEnd ()	1972	void glEnd ()
1395		1973
1396	void glColor (float r, float g, float b, float a = 1.0)	1974	void glColor (float r, float g, float b, float a = 1.0)
1397	PROTOTYPE: @	1975	PROTOTYPE: @
		1976	ALIAS:
		1977	glColor_premultiply = 1
1398	CODE:	1978	CODE:
		1979	if (ix)
		1980	{
		1981	r *= a;
		1982	g *= a;
		1983	b *= a;
		1984	}
		1985	// microsoft visual "c" rounds instead of truncating...
1399	glColor4f (r, g, b, a);	1986	glColor4f (r, g, b, a);
		1987
		1988	void glInterleavedArrays (int format, int stride, char *data)
		1989
		1990	void glDrawElements (int mode, int count, int type, char *indices)
		1991
		1992	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1993
		1994	void glRasterPos (float x, float y, float z = 0.)
		1995	CODE:
		1996	glRasterPos3f (0, 0, z);
		1997	glBitmap (0, 0, 0, 0, x, y, 0);
1400		1998
1401	void glVertex (float x, float y, float z = 0.)	1999	void glVertex (float x, float y, float z = 0.)
1402	CODE:	2000	CODE:
1403	glVertex3f (x, y, z);	2001	glVertex3f (x, y, z);
1404		2002
…		…
1416		2014
1417	void glBindTexture (int target, int name)	2015	void glBindTexture (int target, int name)
1418		2016
1419	void glConvolutionParameter (int target, int pname, float params)	2017	void glConvolutionParameter (int target, int pname, float params)
1420	CODE:	2018	CODE:
		2019	if (gl.ConvolutionParameterf)
1421	glConvolutionParameterf (target, pname, params);	2020	gl.ConvolutionParameterf (target, pname, params);
1422		2021
1423	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2022	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		2023	CODE:
		2024	if (gl.ConvolutionFilter2D)
		2025	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
		2026
		2027	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		2028	CODE:
		2029	if (gl.SeparableFilter2D)
		2030	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1424		2031
1425	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2032	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1426		2033
1427	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2034	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		2035
		2036	void glDrawPixels (int width, int height, int format, int type, char *pixels)
		2037
		2038	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1428		2039
1429	int glGenTexture ()	2040	int glGenTexture ()
1430	CODE:	2041	CODE:
1431	{	2042	{
1432	GLuint name;	2043	GLuint name;

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.56 by root, Thu Apr 20 09:13:31 2006 UTC vs. Revision 1.145 by root, Fri Aug 18 03:19:58 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.56 by root, Thu Apr 20 09:13:31 2006 UTC vs.
Revision 1.145 by root, Fri Aug 18 03:19:58 2006 UTC