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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.61 by root, Sun Apr 23 21:47:30 2006 UTC vs.
Revision 1.144 by root, Fri Aug 18 02:25:12 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
		3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2	# include <malloc.h>	4	# include <malloc.h>
		5	# include <windows.h>
		6	# pragma warning(disable:4244)
3	#endif	7	#endif
4		8
5	#include "EXTERN.h"	9	#include "EXTERN.h"
6	#include "perl.h"	10	#include "perl.h"
7	#include "XSUB.h"	11	#include "XSUB.h"
8		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
		17	#include <math.h>
9	#include <string.h>	18	#include <string.h>
10	#include <stdio.h>	19	#include <stdio.h>
		20	#include <stdlib.h>
11		21
12	#include <SDL.h>	22	#include <SDL.h>
		23	#include <SDL_endian.h>
13	#include <SDL_image.h>	24	#include <SDL_image.h>
14	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
15	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
16		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
17	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
18		32
19	#include <pango/pango.h>	33	#include <pango/pango.h>
20	#include <pango/pangofc-fontmap.h>
21	#include <pango/pangoft2.h>
22		34
23	#ifndef _WIN32	35	#ifndef _WIN32
24	# include <sys/types.h>	36	# include <sys/types.h>
25	# include <sys/socket.h>	37	# include <sys/socket.h>
26	# include <netinet/in.h>	38	# include <netinet/in.h>
33	typedef signed char int8_t;	45	typedef signed char int8_t;
34	typedef signed short int16_t;	46	typedef signed short int16_t;
35	typedef signed int int32_t;	47	typedef signed int int32_t;
36	#endif	48	#endif
37		49
38	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
39		51
40	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
41		53
42	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
43	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
44		56
45	#define MIN_FONT_HEIGHT 8	57	#define MIN_FONT_HEIGHT 10
46		58
		59	#if 0
		60	# define PARACHUTE SDL_INIT_NOPARACHUTE
		61	#else
		62	# define PARACHUTE 0
		63	#endif
		64
		65	static struct
		66	{
		67	#define GL_FUNC(ptr,name) ptr name;
		68	#include "glfunc.h"
		69	#undef GL_FUNC
		70	} gl;
		71
		72	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
		73	{
		74	if (gl.BlendFuncSeparate)
		75	gl.BlendFuncSeparate (sa, da, saa, daa);
		76	else if (gl.BlendFuncSeparateEXT)
		77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
		78	else
		79	glBlendFunc (sa, da);
		80	}
		81
		82	#include "texcache.c"
		83
		84	#include "pango-font.c"
		85	#include "pango-fontmap.c"
		86	#include "pango-render.c"
		87
47	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
48	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
49		90
50	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	}
51		110
52	typedef struct cf_layout {	111	typedef struct cf_layout {
53	PangoLayout *pl;	112	PangoLayout *pl;
		113	float r, g, b, a; // default color for rgba mode
54	int base_height;	114	int base_height;
55	CFClient__Font font;	115	CFPlus__Font font;
56	} *CFClient__Layout;	116	} *CFPlus__Layout;
57		117
58	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
59	static PangoContext *context;	119	static PangoContext *opengl_context;
60	static PangoFontMap *fontmap;	120	static PangoFontMap *opengl_fontmap;
61		121
62	static void	122	static void
63	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
64	{	124	{
65	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
66	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
67	}	130	}
68		131
69	static void	132	static void
70	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
71	{	134	{
72	/* 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
73	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
74	*/	137	*/
75	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
79		142
80	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
81	}	144	}
82		145
83	static void	146	static void
84	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
85	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
86	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
87		153
88	w = (w + 3) & ~3;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
89	if (!w) w = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
90	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;
91	}	162	}
92		163
93	typedef uint16_t mapface;	164	typedef uint16_t mapface;
94		165
95	typedef struct {	166	typedef struct {
…		…
98	float s, t;	169	float s, t;
99	uint8_t r, g, b, a;	170	uint8_t r, g, b, a;
100	} maptex;	171	} maptex;
101		172
102	typedef struct {	173	typedef struct {
103	int16_t darkness;	174	uint16_t darkness;
104	mapface face[3];	175	mapface face[3];
		176	uint8_t stat_hp;
105	} mapcell;	177	} mapcell;
106		178
107	typedef struct {	179	typedef struct {
108	int32_t c0, c1;	180	int32_t c0, c1;
109	mapcell *col;	181	mapcell *col;
…		…
118	int texs;	190	int texs;
119	maptex *tex;	191	maptex *tex;
120		192
121	int32_t rows;	193	int32_t rows;
122	maprow *row;	194	maprow *row;
123	} *CFClient__Map;	195	} *CFPlus__Map;
124		196
125	static char *	197	static char *
126	prepend (char *ptr, int sze, int inc)	198	prepend (char *ptr, int sze, int inc)
127	{	199	{
128	char *p;	200	char *p;
…		…
146		218
147	#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))
148	#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))
149		221
150	static maprow *	222	static maprow *
151	map_get_row (CFClient__Map self, int y)	223	map_get_row (CFPlus__Map self, int y)
152	{	224	{
153	if (0 > y)	225	if (0 > y)
154	{	226	{
155	int extend = - y + MAP_EXTEND_Y;	227	int extend = - y + MAP_EXTEND_Y;
156	Prepend (maprow, self->row, self->rows, extend);	228	Prepend (maprow, self->row, self->rows, extend);
…		…
194		266
195	return row->col + (x - row->c0);	267	return row->col + (x - row->c0);
196	}	268	}
197		269
198	static mapcell *	270	static mapcell *
199	map_get_cell (CFClient__Map self, int x, int y)	271	map_get_cell (CFPlus__Map self, int x, int y)
200	{	272	{
201	return row_get_cell (map_get_row (self, y), x);	273	return row_get_cell (map_get_row (self, y), x);
202	}	274	}
203		275
204	static void	276	static void
205	map_clear (CFClient__Map self)	277	map_clear (CFPlus__Map self)
206	{	278	{
207	int r;	279	int r;
208		280
209	for (r = 0; r < self->rows; r++)	281	for (r = 0; r < self->rows; r++)
210	Safefree (self->row[r].col);	282	Safefree (self->row[r].col);
…		…
218	self->row = 0;	290	self->row = 0;
219	self->rows = 0;	291	self->rows = 0;
220	}	292	}
221		293
222	static void	294	static void
223	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)
224	{	296	{
225	int x, y;	297	int x, y;
226	maprow *row;	298	maprow *row;
227		299
228	for (y = y0; y < y0 + h; y++)	300	for (y = y0; y < y0 + h; y++)
…		…
237	if (x >= row->c0)	309	if (x >= row->c0)
238	{	310	{
239	if (x >= row->c1)	311	if (x >= row->c1)
240	break;	312	break;
241		313
242	row->col[x - row->c0].darkness = -1;	314	row->col[x - row->c0].darkness = 0;
243	}	315	}
244	}	316	}
245	}	317	}
246		318
247	static void	319	static void
248	music_finished ()	320	music_finished (void)
249	{	321	{
250	SDL_UserEvent ev;	322	SDL_UserEvent ev;
251		323
252	ev.type = SDL_USEREVENT;	324	ev.type = SDL_USEREVENT;
253	ev.code = 0;	325	ev.code = 0;
…		…
255	ev.data2 = 0;	327	ev.data2 = 0;
256		328
257	SDL_PushEvent ((SDL_Event *)&ev);	329	SDL_PushEvent ((SDL_Event *)&ev);
258	}	330	}
259		331
		332	static void
		333	channel_finished (int channel)
		334	{
		335	SDL_UserEvent ev;
		336
		337	ev.type = SDL_USEREVENT;
		338	ev.code = 1;
		339	ev.data1 = (void *)(long)channel;
		340	ev.data2 = 0;
		341
		342	SDL_PushEvent ((SDL_Event *)&ev);
		343	}
		344
		345	static unsigned int
		346	minpot (unsigned int n)
		347	{
		348	if (!n)
		349	return 0;
		350
		351	--n;
		352
		353	n \|= n >> 1;
		354	n \|= n >> 2;
		355	n \|= n >> 4;
		356	n \|= n >> 8;
		357	n \|= n >> 16;
		358
		359	return n + 1;
		360	}
		361
260	MODULE = CFClient PACKAGE = CFClient	362	MODULE = CFPlus PACKAGE = CFPlus
261		363
262	PROTOTYPES: ENABLE	364	PROTOTYPES: ENABLE
263		365
264	BOOT:	366	BOOT:
265	{	367	{
266	HV *stash = gv_stashpv ("CFClient", 1);	368	HV *stash = gv_stashpv ("CFPlus", 1);
267	static const struct {	369	static const struct {
268	const char *name;	370	const char *name;
269	IV iv;	371	IV iv;
270	} *civ, const_iv[] = {	372	} *civ, const_iv[] = {
271	# define const_iv(name) { # name, (IV)name }	373	# define const_iv(name) { # name, (IV)name }
…		…
370	# undef const_iv	472	# undef const_iv
371	};	473	};
372		474
373	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; )
374	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	476	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
375
376	fontmap = pango_ft2_font_map_new ();
377	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
378	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
379	}	477	}
380		478
381	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
382	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	500	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
383		501
384	void	502	void
385	SDL_Quit ()	503	SDL_Quit ()
386		504
387	void	505	void
…		…
393	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	511	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
394	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	512	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
395	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	513	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
396	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	514	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
397		515
		516	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		517	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		518
398	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	519	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
399	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	520	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
400	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
401	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	522	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
402		523
403	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	524	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		525	#if SDL_VERSION_ATLEAST(1,2,10)
404	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	526	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
405	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		528	#endif
406		529
407	SDL_EnableUNICODE (1);	530	SDL_EnableUNICODE (1);
408	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	531	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
409		532
410	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	533	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
419		542
420	++m;	543	++m;
421	}	544	}
422	}	545	}
423		546
		547	char *
		548	SDL_GetError ()
		549
424	int	550	int
425	SDL_SetVideoMode (int w, int h, int fullscreen)	551	SDL_SetVideoMode (int w, int h, int fullscreen)
426	CODE:	552	CODE:
427	RETVAL = !!SDL_SetVideoMode (	553	RETVAL = !!SDL_SetVideoMode (
428	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	554	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
429	);	555	);
		556	if (RETVAL)
		557	{
430	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	}
431	OUTPUT:	563	OUTPUT:
432	RETVAL	564	RETVAL
433		565
434	void	566	void
435	SDL_GL_SwapBuffers ()	567	SDL_GL_SwapBuffers ()
		568
		569	char *
		570	SDL_GetKeyName (int sym)
436		571
437	void	572	void
438	SDL_PollEvent ()	573	SDL_PollEvent ()
439	PPCODE:	574	PPCODE:
440	{	575	{
…		…
442		577
443	while (SDL_PollEvent (&ev))	578	while (SDL_PollEvent (&ev))
444	{	579	{
445	HV *hv = newHV ();	580	HV *hv = newHV ();
446	hv_store (hv, "type", 4, newSViv (ev.type), 0);	581	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		582
447	switch (ev.type)	583	switch (ev.type)
448	{	584	{
449	case SDL_KEYDOWN:	585	case SDL_KEYDOWN:
450	case SDL_KEYUP:	586	case SDL_KEYUP:
451	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	587	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
458	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	594	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
459	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	595	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
460	break;	596	break;
461		597
462	case SDL_MOUSEMOTION:	598	case SDL_MOUSEMOTION:
		599	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		600
463	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	601	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
464	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	602	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
465	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	603	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
466	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	604	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
467	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	605	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
468	break;	606	break;
469		607
470	case SDL_MOUSEBUTTONDOWN:	608	case SDL_MOUSEBUTTONDOWN:
471	case SDL_MOUSEBUTTONUP:	609	case SDL_MOUSEBUTTONUP:
		610	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		611
472	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	612	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
473	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	613	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
474	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	614	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
475	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;
476	}	623	}
477		624
478	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	625	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
479	}	626	}
480	}	627	}
481		628
482	int	629	int
483	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)
484	POSTCALL:	631	POSTCALL:
485	Mix_HookMusicFinished (music_finished);	632	Mix_HookMusicFinished (music_finished);
		633	Mix_ChannelFinished (channel_finished);
486		634
487	void	635	void
488	Mix_CloseAudio ()	636	Mix_CloseAudio ()
489		637
490	int	638	int
…		…
495	CODE:	643	CODE:
496	#ifndef _WIN32	644	#ifndef _WIN32
497	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	645	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
498	#endif	646	#endif
499		647
500	char *
501	gl_version ()
502	CODE:
503	RETVAL = (char *)glGetString (GL_VERSION);
504	OUTPUT:
505	RETVAL
506
507	char *
508	gl_extensions ()
509	CODE:
510	RETVAL = (char *)glGetString (GL_EXTENSIONS);
511	OUTPUT:
512	RETVAL
513
514	void	648	void
515	add_font (char *file)	649	add_font (char *file)
516	CODE:	650	CODE:
517	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	651	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
518		652
519	void	653	void
520	load_image_inline (SV *image_)	654	load_image_inline (SV *image_)
521	ALIAS:	655	ALIAS:
522	load_image_file = 1	656	load_image_file = 1
…		…
564		698
565	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	699	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
566		700
567	assert (surface2->pitch == surface2->w * 4);	701	assert (surface2->pitch == surface2->w * 4);
568		702
		703	SDL_LockSurface (surface2);
569	EXTEND (SP, 5);	704	EXTEND (SP, 6);
570	PUSHs (sv_2mortal (newSViv (surface2->w)));	705	PUSHs (sv_2mortal (newSViv (surface2->w)));
571	PUSHs (sv_2mortal (newSViv (surface2->h)));	706	PUSHs (sv_2mortal (newSViv (surface2->h)));
572	SDL_LockSurface (surface2);
573	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	707	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
574	SDL_UnlockSurface (surface2);
575	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)));
576	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	709	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
577	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	710	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		711	SDL_UnlockSurface (surface2);
578		712
579	SDL_FreeSurface (surface);	713	SDL_FreeSurface (surface);
580	SDL_FreeSurface (surface2);	714	SDL_FreeSurface (surface2);
581	}	715	}
582		716
…		…
604	PUSHs (sv_2mortal (newSViv (b / y)));	738	PUSHs (sv_2mortal (newSViv (b / y)));
605	PUSHs (sv_2mortal (newSViv (a / y)));	739	PUSHs (sv_2mortal (newSViv (a / y)));
606	}	740	}
607		741
608	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
609	fatal (char *message)	751	fatal (char *message)
610	CODE:	752	CODE:
		753	fprintf (stderr, "FATAL: %s\n", message);
611	#ifdef _WIN32	754	#ifdef _WIN32
612	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	755	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
613	#else
614	fprintf (stderr, "FATAL: %s\n", message);
615	#endif	756	#endif
616	exit (1);	757	_exit (1);
617		758
		759	void
		760	_exit (int retval)
		761	CODE:
		762	_exit (retval);
		763
618	MODULE = CFClient PACKAGE = CFClient::Font	764	MODULE = CFPlus PACKAGE = CFPlus::Font
619		765
620	CFClient::Font	766	CFPlus::Font
621	new_from_file (SV class, char path)	767	new_from_file (SV class, char path, int id = 0)
622	CODE:	768	CODE:
623	{	769	{
624	int count;	770	int count;
625	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, 0, 0, &count);	771	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
626	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	772	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
627	FcPatternDestroy (pattern);	773	FcPatternDestroy (pattern);
628	}	774	}
629	OUTPUT:	775	OUTPUT:
630	RETVAL	776	RETVAL
631		777
632	void	778	void
633	DESTROY (CFClient::Font self)	779	DESTROY (CFPlus::Font self)
634	CODE:	780	CODE:
635	pango_font_description_free (self);	781	pango_font_description_free (self);
636		782
637	void	783	void
638	make_default (CFClient::Font self)	784	make_default (CFPlus::Font self)
639	CODE:	785	CODE:
640	default_font = self;	786	default_font = self;
641		787
642	MODULE = CFClient PACKAGE = CFClient::Layout	788	MODULE = CFPlus PACKAGE = CFPlus::Layout
643		789
644	CFClient::Layout	790	void
645	new (SV *class, int base_height = MIN_FONT_HEIGHT)	791	reset_glyph_cache ()
		792	CODE:
		793	tc_clear ();
		794
		795	CFPlus::Layout
		796	new (SV *class)
646	CODE:	797	CODE:
647	New (0, RETVAL, 1, struct cf_layout);	798	New (0, RETVAL, 1, struct cf_layout);
		799
648	RETVAL->pl = pango_layout_new (context);	800	RETVAL->pl = pango_layout_new (opengl_context);
649	RETVAL->base_height = base_height;	801	RETVAL->r = 1.;
		802	RETVAL->g = 1.;
		803	RETVAL->b = 1.;
		804	RETVAL->a = 1.;
		805	RETVAL->base_height = MIN_FONT_HEIGHT;
650	RETVAL->font = 0;	806	RETVAL->font = 0;
		807
651	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	808	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
652	pango_layout_set_font_description (RETVAL->pl, default_font);	809	layout_update_font (RETVAL);
653	OUTPUT:	810	OUTPUT:
654	RETVAL	811	RETVAL
655		812
656	void	813	void
657	DESTROY (CFClient::Layout self)	814	DESTROY (CFPlus::Layout self)
658	CODE:	815	CODE:
659	g_object_unref (self->pl);	816	g_object_unref (self->pl);
660	Safefree (self);	817	Safefree (self);
661		818
662	void	819	void
663	set_text (CFClient::Layout self, SV *text_)	820	set_text (CFPlus::Layout self, SV *text_)
664	CODE:	821	CODE:
665	{	822	{
666	STRLEN textlen;	823	STRLEN textlen;
667	char *text = SvPVutf8 (text_, textlen);	824	char *text = SvPVutf8 (text_, textlen);
668		825
669	pango_layout_set_text (self->pl, text, textlen);	826	pango_layout_set_text (self->pl, text, textlen);
670	}	827	}
671		828
672	void	829	void
673	set_markup (CFClient::Layout self, SV *text_)	830	set_markup (CFPlus::Layout self, SV *text_)
674	CODE:	831	CODE:
675	{	832	{
676	STRLEN textlen;	833	STRLEN textlen;
677	char *text = SvPVutf8 (text_, textlen);	834	char *text = SvPVutf8 (text_, textlen);
678		835
679	pango_layout_set_markup (self->pl, text, textlen);	836	pango_layout_set_markup (self->pl, text, textlen);
680	}	837	}
681		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
682	SV *	924	SV *
683	get_text (CFClient::Layout self)	925	get_text (CFPlus::Layout self)
684	CODE:	926	CODE:
685	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	927	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
686	SvUTF8_on (RETVAL);	928	sv_utf8_decode (RETVAL);
687	OUTPUT:	929	OUTPUT:
688	RETVAL	930	RETVAL
689		931
690	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
691	set_font (CFClient::Layout self, CFClient::Font font = 0)	941	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
692	CODE:	942	CODE:
693	if (self->font != font)	943	if (self->font != font)
694	{	944	{
695	self->font = font;	945	self->font = font;
696	layout_update_font (self);	946	layout_update_font (self);
697	}	947	}
698		948
699	void	949	void
700	set_height (CFClient::Layout self, int base_height)	950	set_height (CFPlus::Layout self, int base_height)
701	CODE:	951	CODE:
702	if (self->base_height != base_height)	952	if (self->base_height != base_height)
703	{	953	{
704	self->base_height = base_height;	954	self->base_height = base_height;
705	layout_update_font (self);	955	layout_update_font (self);
706	}	956	}
707		957
708	void	958	void
709	set_width (CFClient::Layout self, int max_width = -1)	959	set_width (CFPlus::Layout self, int max_width = -1)
710	CODE:	960	CODE:
711	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);
712		962
713	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
714	size (CFClient::Layout self)	989	size (CFPlus::Layout self)
715	PPCODE:	990	PPCODE:
716	{	991	{
717	int w, h;	992	int w, h;
718		993
719	layout_get_pixel_size (self, &w, &h);	994	layout_get_pixel_size (self, &w, &h);
…		…
722	PUSHs (sv_2mortal (newSViv (w)));	997	PUSHs (sv_2mortal (newSViv (w)));
723	PUSHs (sv_2mortal (newSViv (h)));	998	PUSHs (sv_2mortal (newSViv (h)));
724	}	999	}
725		1000
726	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
727	xy_to_index (CFClient::Layout self, int x, int y)	1014	xy_to_index (CFPlus::Layout self, int x, int y)
728	CODE:	1015	CODE:
729	{	1016	{
730	int index, trailing;	1017	int index, trailing;
731	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);
732	RETVAL = index;	1019	RETVAL = index;
733	}	1020	}
734	OUTPUT:	1021	OUTPUT:
735	RETVAL	1022	RETVAL
736		1023
737	void	1024	void
738	cursor_pos (CFClient::Layout self, int index)	1025	cursor_pos (CFPlus::Layout self, int index)
739	PPCODE:	1026	PPCODE:
740	{	1027	{
741	PangoRectangle strong_pos;	1028	PangoRectangle strong_pos;
742	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1029	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
743		1030
…		…
746	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1033	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
747	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1034	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
748	}	1035	}
749		1036
750	void	1037	void
751	render (CFClient::Layout self)	1038	render (CFPlus::Layout self, float x, float y, int flags = 0)
752	PPCODE:	1039	PPCODE:
753	{	1040	pango_opengl_render_layout_subpixel (
754	SV *retval;	1041	self->pl,
755	int w, h;	1042	x * PANGO_SCALE, y * PANGO_SCALE,
756	FT_Bitmap bitmap;	1043	self->r, self->g, self->b, self->a,
		1044	flags
		1045	);
757		1046
758	layout_get_pixel_size (self, &w, &h);	1047	MODULE = CFPlus PACKAGE = CFPlus::Texture
759		1048
760	retval = newSV (w * h);	1049	void
761	SvPOK_only (retval);	1050	pad2pot (SV data_, SV w_, SV *h_)
762	SvCUR_set (retval, w * h);	1051	CODE:
		1052	{
		1053	int ow = SvIV (w_);
		1054	int oh = SvIV (h_);
763		1055
764	bitmap.rows = h;	1056	if (ow && oh)
765	bitmap.width = w;	1057	{
766	bitmap.pitch = w;	1058	int nw = minpot (ow);
767	bitmap.buffer = (unsigned char*)SvPVX (retval);	1059	int nh = minpot (oh);
768	bitmap.num_grays = 256;
769	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
770		1060
771	memset (bitmap.buffer, 0, w * h);	1061	if (nw != ow \|\| nh != oh)
772		1062	{
773	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));
774		1069
775	EXTEND (SP, 3);	1070	SvPOK_only (result_);
776	PUSHs (sv_2mortal (newSViv (w)));	1071	SvCUR_set (result_, nw * nh * bpp);
777	PUSHs (sv_2mortal (newSViv (h)));
778	PUSHs (sv_2mortal (retval));
779	}
780		1072
781	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);
782		1076
		1077	sv_setsv (data_, result_);
		1078	}
		1079
		1080	sv_setiv (w_, nw);
		1081	sv_setiv (h_, nh);
		1082	}
		1083	}
		1084	}
		1085
783	void	1086	void
784	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.)
785	PROTOTYPE: $$$;$$	1088	PROTOTYPE: $$$;$$
		1089	ALIAS:
		1090	draw_quad_alpha = 1
		1091	draw_quad_alpha_premultiplied = 2
786	CODE:	1092	CODE:
787	{	1093	{
788	HV hv = (HV )SvRV (self);	1094	HV hv = (HV )SvRV (self);
789	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1095	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
790	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1096	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
791	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1097	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
792	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
793		1098
794	if (items < 5)	1099	if (items < 5)
795	{	1100	{
796	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1101	w = SvNV (*hv_fetch (hv, "w", 1, 1));
797	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1102	h = SvNV (*hv_fetch (hv, "h", 1, 1));
798	}	1103	}
799		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
800	glBindTexture (GL_TEXTURE_2D, name);	1119	glBindTexture (GL_TEXTURE_2D, name);
801	if (wrap_mode) {	1120
802	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
803	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
804	}
805	glBegin (GL_QUADS);	1121	glBegin (GL_QUADS);
806	glTexCoord2f (0, 0); glVertex2f (x , y );	1122	glTexCoord2f (0, 0); glVertex2f (x , y );
807	glTexCoord2f (0, t); glVertex2f (x , y + h);	1123	glTexCoord2f (0, t); glVertex2f (x , y + h);
808	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1124	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
809	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1125	glTexCoord2f (s, 0); glVertex2f (x + w, y );
810	glEnd ();	1126	glEnd ();
811	}
812		1127
		1128	if (ix)
		1129	{
		1130	glDisable (GL_ALPHA_TEST);
		1131	glDisable (GL_BLEND);
		1132	}
		1133	}
		1134
813	MODULE = CFClient PACKAGE = CFClient::Map	1135	MODULE = CFPlus PACKAGE = CFPlus::Map
814		1136
815	CFClient::Map	1137	CFPlus::Map
816	new (SV *class, int map_width, int map_height)	1138	new (SV *class, int map_width, int map_height)
817	CODE:	1139	CODE:
818	New (0, RETVAL, 1, struct map);	1140	New (0, RETVAL, 1, struct map);
819	RETVAL->x = 0;	1141	RETVAL->x = 0;
820	RETVAL->y = 0;	1142	RETVAL->y = 0;
…		…
830	RETVAL->row = 0;	1152	RETVAL->row = 0;
831	OUTPUT:	1153	OUTPUT:
832	RETVAL	1154	RETVAL
833		1155
834	void	1156	void
835	DESTROY (CFClient::Map self)	1157	DESTROY (CFPlus::Map self)
836	CODE:	1158	CODE:
837	{	1159	{
838	map_clear (self);	1160	map_clear (self);
839	Safefree (self->face);	1161	Safefree (self->face);
		1162	Safefree (self->tex);
840	Safefree (self);	1163	Safefree (self);
841	}	1164	}
842		1165
843	void	1166	void
844	clear (CFClient::Map self)	1167	clear (CFPlus::Map self)
845	CODE:	1168	CODE:
846	map_clear (self);	1169	map_clear (self);
847		1170
848	void	1171	void
849	set_face (CFClient::Map self, int face, int texid)	1172	set_face (CFPlus::Map self, int face, int texid)
850	CODE:	1173	CODE:
851	{	1174	{
852	while (self->faces <= face)	1175	while (self->faces <= face)
853	{	1176	{
854	Append (mapface, self->face, self->faces, self->faces);	1177	Append (mapface, self->face, self->faces, self->faces);
…		…
857		1180
858	self->face [face] = texid;	1181	self->face [face] = texid;
859	}	1182	}
860		1183
861	void	1184	void
862	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)
863	CODE:	1186	CODE:
864	{	1187	{
865	while (self->texs <= texid)	1188	while (self->texs <= texid)
866	{	1189	{
867	Append (maptex, self->tex, self->texs, self->texs);	1190	Append (maptex, self->tex, self->texs, self->texs);
…		…
879	tex->r = r;	1202	tex->r = r;
880	tex->g = g;	1203	tex->g = g;
881	tex->b = b;	1204	tex->b = b;
882	tex->a = a;	1205	tex->a = a;
883	}	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);
884	}	1216	}
885		1217
886	int	1218	int
887	ox (CFClient::Map self)	1219	ox (CFPlus::Map self)
888	ALIAS:	1220	ALIAS:
889	oy = 1	1221	oy = 1
		1222	x = 2
		1223	y = 3
		1224	w = 4
		1225	h = 5
890	CODE:	1226	CODE:
891	switch (ix)	1227	switch (ix)
892	{	1228	{
893	case 0: RETVAL = self->ox; break;	1229	case 0: RETVAL = self->ox; break;
894	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;
895	}	1235	}
896	OUTPUT:	1236	OUTPUT:
897	RETVAL	1237	RETVAL
898		1238
899	void	1239	void
900	scroll (CFClient::Map self, int dx, int dy)	1240	scroll (CFPlus::Map self, int dx, int dy)
901	CODE:	1241	CODE:
902	{	1242	{
903	if (dx > 0)	1243	if (dx > 0)
904	map_blank (self, self->x, self->y, dx - 1, self->h);	1244	map_blank (self, self->x, self->y, dx - 1, self->h);
905	else if (dx < 0)	1245	else if (dx < 0)
…		…
921	self->y += MAP_EXTEND_Y;	1261	self->y += MAP_EXTEND_Y;
922	}	1262	}
923	}	1263	}
924		1264
925	void	1265	void
926	map1a_update (CFClient::Map self, SV *data_)	1266	map1a_update (CFPlus::Map self, SV *data_, int extmap)
927	CODE:	1267	CODE:
928	{	1268	{
929	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1269	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
930	uint8_t data_end = (uint8_t )SvEND (data_);	1270	uint8_t data_end = (uint8_t )SvEND (data_);
931	mapcell *cell;	1271	mapcell *cell;
…		…
933		1273
934	while (data < data_end)	1274	while (data < data_end)
935	{	1275	{
936	flags = (data [0] << 8) + data [1]; data += 2;	1276	flags = (data [0] << 8) + data [1]; data += 2;
937		1277
938	x = ((flags >> 10) & 63) + self->x;	1278	x = self->x + ((flags >> 10) & 63);
939	y = ((flags >> 4) & 63) + self->y;	1279	y = self->y + ((flags >> 4) & 63);
940		1280
941	cell = map_get_cell (self, x, y);	1281	cell = map_get_cell (self, x, y);
942		1282
943	if (flags & 15)	1283	if (flags & 15)
944	{	1284	{
945	if (cell->darkness < 0)	1285	if (!cell->darkness)
946	{	1286	{
947	cell->darkness = 0;	1287	cell->darkness = 256;
948	cell->face [0] = 0;	1288	cell->face [0] = 0;
949	cell->face [1] = 0;	1289	cell->face [1] = 0;
950	cell->face [2] = 0;	1290	cell->face [2] = 0;
		1291	cell->stat_hp = 0;
951	}	1292	}
952		1293
953	cell->darkness = flags & 8 ? *data++ : 255;
954
955	//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	}
956		1319
957	if (flags & 4)	1320	if (flags & 4)
958	{	1321	{
959	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;
960	}	1323	}
…		…
968	{	1331	{
969	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;
970	}	1333	}
971	}	1334	}
972	else	1335	else
973	cell->darkness = -1;	1336	cell->darkness = 0;
974	}	1337	}
975	}	1338	}
976		1339
977	SV *	1340	SV *
978	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)
979	CODE:	1342	CODE:
980	{	1343	{
981	int x1, x;	1344	int x1, x;
982	int y1, y;	1345	int y1, y;
983	int z;	1346	int z;
…		…
1033	}	1396	}
1034	OUTPUT:	1397	OUTPUT:
1035	RETVAL	1398	RETVAL
1036		1399
1037	void	1400	void
1038	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)
1039	PPCODE:	1402	CODE:
1040	{	1403	{
1041	int vx, vy;	1404	int vx, vy;
1042	int x, y, z;	1405	int x, y, z;
1043	int last_name;	1406	int last_name;
1044	mapface face;	1407	mapface face;
1045	int sw4 = (sw + 3) & ~3;
1046	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1047	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1048		1408
1049	memset (darkness, 255, sw4 * sh);
1050	SvPOK_only (darkness_sv);
1051	SvCUR_set (darkness_sv, sw4 * sh);
1052
1053	vx = self->x + (self->w - sw) / 2 - shift_x;	1409	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1054	vy = self->y + (self->h - sh) / 2 - shift_y;	1410	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1055		1411
1056	/*	1412	/*
1057	int vx = self->vx = self->w >= sw	1413	int vx = self->vx = self->w >= sw
1058	? self->x + (self->w - sw) / 2	1414	? self->x + (self->w - sw) / 2
1059	: 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));
…		…
1063	: 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));
1064	*/	1420	*/
1065		1421
1066	glColor4ub (255, 255, 255, 255);	1422	glColor4ub (255, 255, 255, 255);
1067		1423
		1424	glEnable (GL_BLEND);
1068	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1425	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1069	glEnable (GL_BLEND);
1070	glEnable (GL_TEXTURE_2D);	1426	glEnable (GL_TEXTURE_2D);
1071	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1427	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1072		1428
1073	glBegin (GL_QUADS);	1429	glBegin (GL_QUADS);
1074		1430
…		…
1082		1438
1083	for (x = 0; x < sw; x++)	1439	for (x = 0; x < sw; x++)
1084	if (row->c0 <= x + vx && x + vx < row->c1)	1440	if (row->c0 <= x + vx && x + vx < row->c1)
1085	{	1441	{
1086	mapcell *cell = row->col + (x + vx - row->c0);	1442	mapcell *cell = row->col + (x + vx - row->c0);
1087
1088	darkness[y * sw4 + x] = cell->darkness < 0
1089	? 255 - FOW_DARKNESS
1090	: 255 - cell->darkness;
1091		1443
1092	face = cell->face [z];	1444	face = cell->face [z];
1093		1445
1094	if (face)	1446	if (face)
1095	{	1447	{
…		…
1117	glEnd ();	1469	glEnd ();
1118		1470
1119	glDisable (GL_TEXTURE_2D);	1471	glDisable (GL_TEXTURE_2D);
1120	glDisable (GL_BLEND);	1472	glDisable (GL_BLEND);
1121		1473
		1474	for (y = 0; y < sh; y++)
		1475	if (0 <= y + vy && y + vy < self->rows)
		1476	{
		1477	maprow *row = self->row + (y + vy);
		1478
		1479	for (x = 0; x < sw; x++)
		1480	if (row->c0 <= x + vx && x + vx < row->c1)
		1481	{
		1482	mapcell *cell = row->col + (x + vx - row->c0);
		1483
		1484	int px = x * 32;
		1485	int py = y * 32;
		1486
		1487	if (cell->stat_hp)
		1488	{
		1489	glColor3ub (0, 0, 0);
		1490	glRectf (px + 1, py + 1, px + 31, py + 4);
		1491
		1492	glColor3ub (0, 255, 0);
		1493	glBegin (GL_LINES);
		1494	glVertex2f (px + 2, py + 2.5f);
		1495	glVertex2f (px + 29.f - cell->stat_hp * (28.f / 255.f), py + 2.5f);
		1496	glEnd ();
		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
1122	EXTEND (SP, 3);	1595	EXTEND (SP, 3);
1123	PUSHs (sv_2mortal (newSViv (sw4)));	1596	PUSHs (sv_2mortal (newSViv (sw4)));
1124	PUSHs (sv_2mortal (newSViv (sh)));	1597	PUSHs (sv_2mortal (newSViv (sh)));
1125	PUSHs (darkness_sv);	1598	PUSHs (darkness_sv);
1126	}	1599	}
1127		1600
1128	SV *	1601	SV *
1129	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)
1130	CODE:	1603	CODE:
1131	{	1604	{
1132	int x, y, x1, y1;	1605	int x, y, x1, y1;
1133	SV data_sv = newSV (w h * 7 + 5);	1606	SV data_sv = newSV (w h * 7 + 5);
1134	uint8_t data = (uint8_t )SvPVX (data_sv);	1607	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1196	}	1669	}
1197	OUTPUT:	1670	OUTPUT:
1198	RETVAL	1671	RETVAL
1199		1672
1200	void	1673	void
1201	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)
1202	PPCODE:	1675	PPCODE:
1203	{	1676	{
1204	int x, y, z;	1677	int x, y, z;
1205	int w, h;	1678	int w, h;
1206	int x1, y1;	1679	int x1, y1;
…		…
1238		1711
1239	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1712	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1240	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1713	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1241	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1714	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1242		1715
1243	if (cell->darkness <= 0)	1716	if (cell->darkness == 0)
1244	{	1717	{
1245	cell->darkness = -1;	1718	cell->darkness = 0;
1246		1719
1247	for (z = 0; z <= 2; z++)	1720	for (z = 0; z <= 2; z++)
1248	{	1721	{
1249	cell->face[z] = face[z];	1722	cell->face[z] = face[z];
1250		1723
…		…
1255	}	1728	}
1256	}	1729	}
1257	}	1730	}
1258	}	1731	}
1259		1732
1260	MODULE = CFClient PACKAGE = CFClient::MixChunk	1733	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1261		1734
1262	CFClient::MixChunk	1735	CFPlus::MixChunk
1263	new_from_file (SV class, char path)	1736	new_from_file (SV class, char path)
1264	CODE:	1737	CODE:
1265	RETVAL = Mix_LoadWAV (path);	1738	RETVAL = Mix_LoadWAV (path);
1266	OUTPUT:	1739	OUTPUT:
1267	RETVAL	1740	RETVAL
1268		1741
1269	void	1742	void
1270	DESTROY (CFClient::MixChunk self)	1743	DESTROY (CFPlus::MixChunk self)
1271	CODE:	1744	CODE:
1272	Mix_FreeChunk (self);	1745	Mix_FreeChunk (self);
1273		1746
1274	int	1747	int
1275	volume (CFClient::MixChunk self, int volume = -1)	1748	volume (CFPlus::MixChunk self, int volume = -1)
1276	CODE:	1749	CODE:
1277	RETVAL = Mix_VolumeChunk (self, volume);	1750	RETVAL = Mix_VolumeChunk (self, volume);
1278	OUTPUT:	1751	OUTPUT:
1279	RETVAL	1752	RETVAL
1280		1753
1281	int	1754	int
1282	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)
1283	CODE:	1756	CODE:
1284	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1757	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1285	OUTPUT:	1758	OUTPUT:
1286	RETVAL	1759	RETVAL
1287		1760
1288	MODULE = CFClient PACKAGE = CFClient::MixMusic	1761	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1289		1762
1290	int	1763	int
1291	volume (int volume = -1)	1764	volume (int volume = -1)
1292	CODE:	1765	CODE:
1293	RETVAL = Mix_VolumeMusic (volume);	1766	RETVAL = Mix_VolumeMusic (volume);
1294	OUTPUT:	1767	OUTPUT:
1295	RETVAL	1768	RETVAL
1296		1769
1297	CFClient::MixMusic	1770	CFPlus::MixMusic
1298	new_from_file (SV class, char path)	1771	new_from_file (SV class, char path)
1299	CODE:	1772	CODE:
1300	RETVAL = Mix_LoadMUS (path);	1773	RETVAL = Mix_LoadMUS (path);
1301	OUTPUT:	1774	OUTPUT:
1302	RETVAL	1775	RETVAL
1303		1776
1304	void	1777	void
1305	DESTROY (CFClient::MixMusic self)	1778	DESTROY (CFPlus::MixMusic self)
1306	CODE:	1779	CODE:
1307	Mix_FreeMusic (self);	1780	Mix_FreeMusic (self);
1308		1781
1309	int	1782	int
1310	play (CFClient::MixMusic self, int loops = -1)	1783	play (CFPlus::MixMusic self, int loops = -1)
1311	CODE:	1784	CODE:
1312	RETVAL = Mix_PlayMusic (self, loops);	1785	RETVAL = Mix_PlayMusic (self, loops);
1313	OUTPUT:	1786	OUTPUT:
1314	RETVAL	1787	RETVAL
1315		1788
1316	MODULE = CFClient PACKAGE = CFClient::OpenGL	1789	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1317		1790
1318	BOOT:	1791	BOOT:
1319	{	1792	{
1320	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1793	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1321	static const struct {	1794	static const struct {
1322	const char *name;	1795	const char *name;
1323	IV iv;	1796	IV iv;
1324	} *civ, const_iv[] = {	1797	} *civ, const_iv[] = {
1325	# define const_iv(name) { # name, (IV)name }	1798	# define const_iv(name) { # name, (IV)name }
1326	const_iv (GL_COLOR_MATERIAL),	1799	const_iv (GL_COLOR_MATERIAL),
1327	const_iv (GL_SMOOTH),	1800	const_iv (GL_SMOOTH),
1328	const_iv (GL_FLAT),	1801	const_iv (GL_FLAT),
		1802	const_iv (GL_DITHER),
1329	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),
1330	const_iv (GL_AND),	1812	const_iv (GL_AND),
		1813	const_iv (GL_ONE),
		1814	const_iv (GL_ZERO),
1331	const_iv (GL_SRC_ALPHA),	1815	const_iv (GL_SRC_ALPHA),
		1816	const_iv (GL_DST_ALPHA),
1332	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),
1333	const_iv (GL_RGB),	1820	const_iv (GL_RGB),
1334	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),
1335	const_iv (GL_UNSIGNED_BYTE),	1825	const_iv (GL_UNSIGNED_BYTE),
1336	const_iv (GL_ALPHA4),	1826	const_iv (GL_UNSIGNED_SHORT),
		1827	const_iv (GL_UNSIGNED_INT),
1337	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),
1338	const_iv (GL_FLOAT),	1832	const_iv (GL_FLOAT),
1339	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1833	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1340	const_iv (GL_COMPILE),	1834	const_iv (GL_COMPILE),
1341	const_iv (GL_TEXTURE_1D),	1835	const_iv (GL_TEXTURE_1D),
1342	const_iv (GL_TEXTURE_2D),	1836	const_iv (GL_TEXTURE_2D),
…		…
1344	const_iv (GL_TEXTURE_MAG_FILTER),	1838	const_iv (GL_TEXTURE_MAG_FILTER),
1345	const_iv (GL_TEXTURE_MIN_FILTER),	1839	const_iv (GL_TEXTURE_MIN_FILTER),
1346	const_iv (GL_TEXTURE_ENV_MODE),	1840	const_iv (GL_TEXTURE_ENV_MODE),
1347	const_iv (GL_TEXTURE_WRAP_S),	1841	const_iv (GL_TEXTURE_WRAP_S),
1348	const_iv (GL_TEXTURE_WRAP_T),	1842	const_iv (GL_TEXTURE_WRAP_T),
		1843	const_iv (GL_REPEAT),
1349	const_iv (GL_CLAMP),	1844	const_iv (GL_CLAMP),
1350	const_iv (GL_REPEAT),	1845	const_iv (GL_CLAMP_TO_EDGE),
1351	const_iv (GL_NEAREST),	1846	const_iv (GL_NEAREST),
1352	const_iv (GL_LINEAR),	1847	const_iv (GL_LINEAR),
1353	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1848	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1354	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1849	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1355	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1850	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1356	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1851	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1357	const_iv (GL_GENERATE_MIPMAP),	1852	const_iv (GL_GENERATE_MIPMAP),
1358	const_iv (GL_LINEAR),
1359	const_iv (GL_MODULATE),	1853	const_iv (GL_MODULATE),
		1854	const_iv (GL_DECAL),
1360	const_iv (GL_REPLACE),	1855	const_iv (GL_REPLACE),
		1856	const_iv (GL_DEPTH_BUFFER_BIT),
1361	const_iv (GL_COLOR_BUFFER_BIT),	1857	const_iv (GL_COLOR_BUFFER_BIT),
1362	const_iv (GL_PROJECTION),	1858	const_iv (GL_PROJECTION),
1363	const_iv (GL_MODELVIEW),	1859	const_iv (GL_MODELVIEW),
1364	const_iv (GL_COLOR_LOGIC_OP),	1860	const_iv (GL_COLOR_LOGIC_OP),
		1861	const_iv (GL_SEPARABLE_2D),
1365	const_iv (GL_CONVOLUTION_2D),	1862	const_iv (GL_CONVOLUTION_2D),
1366	const_iv (GL_CONVOLUTION_BORDER_MODE),	1863	const_iv (GL_CONVOLUTION_BORDER_MODE),
1367	const_iv (GL_CONSTANT_BORDER),	1864	const_iv (GL_CONSTANT_BORDER),
1368	const_iv (GL_LINES),	1865	const_iv (GL_LINES),
		1866	const_iv (GL_LINE_STRIP),
		1867	const_iv (GL_LINE_LOOP),
1369	const_iv (GL_QUADS),	1868	const_iv (GL_QUADS),
1370	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),
1371	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1873	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1372	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),
1373	# undef const_iv	1879	# undef const_iv
1374	};	1880	};
1375		1881
1376	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; )
1377	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1883	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1378	}	1884	}
1379		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
1380	int glGetError ()	1907	int glGetError ()
		1908
		1909	void glFinish ()
1381		1910
1382	void glClear (int mask)	1911	void glClear (int mask)
1383		1912
1384	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)
1385	PROTOTYPE: @	1914	PROTOTYPE: @
…		…
1392		1921
1393	void glHint (int target, int mode)	1922	void glHint (int target, int mode)
1394		1923
1395	void glBlendFunc (int sfactor, int dfactor)	1924	void glBlendFunc (int sfactor, int dfactor)
1396		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
1397	void glLogicOp (int opcode)	1932	void glLogicOp (int opcode)
1398		1933
		1934	void glColorMask (int red, int green, int blue, int alpha)
		1935
1399	void glMatrixMode (int mode)	1936	void glMatrixMode (int mode)
1400		1937
1401	void glPushMatrix ()	1938	void glPushMatrix ()
1402		1939
1403	void glPopMatrix ()	1940	void glPopMatrix ()
1404		1941
1405	void glLoadIdentity ()	1942	void glLoadIdentity ()
1406		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
1407	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_)
1408		1953
1409	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)
1410		1957
1411	void glTranslate (float x, float y, float z = 0.)	1958	void glTranslate (float x, float y, float z = 0.)
1412	CODE:	1959	CODE:
1413	glTranslatef (x, y, z);	1960	glTranslatef (x, y, z);
1414		1961
1415	void glScale (float x, float y, float z)	1962	void glScale (float x, float y, float z = 1.)
1416	CODE:	1963	CODE:
1417	glScalef (x, y, z);	1964	glScalef (x, y, z);
1418		1965
1419	void glRotate (float angle, float x, float y, float z)	1966	void glRotate (float angle, float x, float y, float z)
1420	CODE:	1967	CODE:
…		…
1424		1971
1425	void glEnd ()	1972	void glEnd ()
1426		1973
1427	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)
1428	PROTOTYPE: @	1975	PROTOTYPE: @
		1976	ALIAS:
		1977	glColor_premultiply = 1
1429	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...
1430	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);
1431		1998
1432	void glVertex (float x, float y, float z = 0.)	1999	void glVertex (float x, float y, float z = 0.)
1433	CODE:	2000	CODE:
1434	glVertex3f (x, y, z);	2001	glVertex3f (x, y, z);
1435		2002
…		…
1447		2014
1448	void glBindTexture (int target, int name)	2015	void glBindTexture (int target, int name)
1449		2016
1450	void glConvolutionParameter (int target, int pname, float params)	2017	void glConvolutionParameter (int target, int pname, float params)
1451	CODE:	2018	CODE:
		2019	if (gl.ConvolutionParameterf)
1452	glConvolutionParameterf (target, pname, params);	2020	gl.ConvolutionParameterf (target, pname, params);
1453		2021
1454	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);
1455		2031
1456	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)
1457		2033
1458	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)
1459		2039
1460	int glGenTexture ()	2040	int glGenTexture ()
1461	CODE:	2041	CODE:
1462	{	2042	{
1463	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.61 by root, Sun Apr 23 21:47:30 2006 UTC vs. Revision 1.144 by root, Fri Aug 18 02:25:12 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.61 by root, Sun Apr 23 21:47:30 2006 UTC vs.
Revision 1.144 by root, Fri Aug 18 02:25:12 2006 UTC