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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.96 by root, Wed May 24 22:28:43 2006 UTC vs.
Revision 1.146 by root, Sat Aug 19 02:49:53 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3	# include <malloc.h>	4	# include <malloc.h>
4	# include <windows.h>	5	# include <windows.h>
5	# pragma warning(disable:4244)	6	# pragma warning(disable:4244)
6	#endif	7	#endif
7		8
8	#include "EXTERN.h"	9	#include "EXTERN.h"
9	#include "perl.h"	10	#include "perl.h"
10	#include "XSUB.h"	11	#include "XSUB.h"
11		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
12	#include <math.h>	17	#include <math.h>
13	#include <string.h>	18	#include <string.h>
14	#include <stdio.h>	19	#include <stdio.h>
		20	#include <stdlib.h>
15		21
16	#include <SDL.h>	22	#include <SDL.h>
17	#include <SDL_endian.h>	23	#include <SDL_endian.h>
18	#include <SDL_image.h>	24	#include <SDL_image.h>
19	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
21		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
22	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
23		32
24	#include <pango/pango.h>	33	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		34
29	#ifndef _WIN32	35	#ifndef _WIN32
30	# include <sys/types.h>	36	# include <sys/types.h>
31	# include <sys/socket.h>	37	# include <sys/socket.h>
32	# include <netinet/in.h>	38	# include <netinet/in.h>
39	typedef signed char int8_t;	45	typedef signed char int8_t;
40	typedef signed short int16_t;	46	typedef signed short int16_t;
41	typedef signed int int32_t;	47	typedef signed int int32_t;
42	#endif	48	#endif
43		49
44	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45		51
46	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
47		53
48	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
50		56
51	#define MIN_FONT_HEIGHT 10	57	#define MIN_FONT_HEIGHT 10
52		58
53	#define GL_CALL(type,func,args) \	59	#if 0
54	{ \	60	# define PARACHUTE SDL_INIT_NOPARACHUTE
55	static int init_; \	61	#else
56	static type fptr_; \	62	# define PARACHUTE 0
57	\	63	#endif
58	if (!init_) \
59	{ \
60	init_ = 1; \
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62	} \
63	\
64	if (fptr_) \
65	fptr_ args; \
66	}
67		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
68	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
70		90
71	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	}
72		110
73	typedef struct cf_layout {	111	typedef struct cf_layout {
74	PangoLayout *pl; // either derived from a cairo or ft2 context	112	PangoLayout *pl;
75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
77	int base_height;	114	int base_height;
78	CFClient__Font font;	115	CFPlus__Font font;
79	} *CFClient__Layout;	116	} *CFPlus__Layout;
80		117
81	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
82	static PangoContext ft2_context, cairo_context;	119	static PangoContext *opengl_context;
83	static PangoFontMap ft2_fontmap, cairo_fontmap;	120	static PangoFontMap *opengl_fontmap;
84		121
85	static void	122	static void
86	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
87	{	124	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
89	#ifdef _WIN32	126	#ifdef FC_HINT_STYLE
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91	#else	128	#endif
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif
94	}	130	}
95		131
96	static void	132	static void
97	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
98	{	134	{
99	/* 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
100	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
101	*/	137	*/
102	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
106		142
107	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
108	}	144	}
109		145
110	static void	146	static void
111	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
112	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
113	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
114		153
115	if (!w) w = 1;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
116	if (!h) h = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
117		156
118	w = (w + 3) & ~3;	157	if (!rect.width) rect.width = 1;
		158	if (!rect.height) rect.height = 1;
		159
		160	*w = rect.width;
		161	*h = rect.height;
119	}	162	}
120		163
121	typedef uint16_t mapface;	164	typedef uint16_t mapface;
122		165
123	typedef struct {	166	typedef struct {
…		…
126	float s, t;	169	float s, t;
127	uint8_t r, g, b, a;	170	uint8_t r, g, b, a;
128	} maptex;	171	} maptex;
129		172
130	typedef struct {	173	typedef struct {
131	int16_t darkness;	174	uint16_t darkness;
132	mapface face[3];	175	mapface face[3];
		176	uint8_t stat_hp;
133	} mapcell;	177	} mapcell;
134		178
135	typedef struct {	179	typedef struct {
136	int32_t c0, c1;	180	int32_t c0, c1;
137	mapcell *col;	181	mapcell *col;
…		…
146	int texs;	190	int texs;
147	maptex *tex;	191	maptex *tex;
148		192
149	int32_t rows;	193	int32_t rows;
150	maprow *row;	194	maprow *row;
151	} *CFClient__Map;	195	} *CFPlus__Map;
152		196
153	static char *	197	static char *
154	prepend (char *ptr, int sze, int inc)	198	prepend (char *ptr, int sze, int inc)
155	{	199	{
156	char *p;	200	char *p;
…		…
174		218
175	#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))
176	#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))
177		221
178	static maprow *	222	static maprow *
179	map_get_row (CFClient__Map self, int y)	223	map_get_row (CFPlus__Map self, int y)
180	{	224	{
181	if (0 > y)	225	if (0 > y)
182	{	226	{
183	int extend = - y + MAP_EXTEND_Y;	227	int extend = - y + MAP_EXTEND_Y;
184	Prepend (maprow, self->row, self->rows, extend);	228	Prepend (maprow, self->row, self->rows, extend);
…		…
222		266
223	return row->col + (x - row->c0);	267	return row->col + (x - row->c0);
224	}	268	}
225		269
226	static mapcell *	270	static mapcell *
227	map_get_cell (CFClient__Map self, int x, int y)	271	map_get_cell (CFPlus__Map self, int x, int y)
228	{	272	{
229	return row_get_cell (map_get_row (self, y), x);	273	return row_get_cell (map_get_row (self, y), x);
230	}	274	}
231		275
232	static void	276	static void
233	map_clear (CFClient__Map self)	277	map_clear (CFPlus__Map self)
234	{	278	{
235	int r;	279	int r;
236		280
237	for (r = 0; r < self->rows; r++)	281	for (r = 0; r < self->rows; r++)
238	Safefree (self->row[r].col);	282	Safefree (self->row[r].col);
…		…
246	self->row = 0;	290	self->row = 0;
247	self->rows = 0;	291	self->rows = 0;
248	}	292	}
249		293
250	static void	294	static void
251	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)
252	{	296	{
253	int x, y;	297	int x, y;
254	maprow *row;	298	maprow *row;
		299	mapcell *cell;
255		300
256	for (y = y0; y < y0 + h; y++)	301	for (y = y0; y < y0 + h; y++)
257	if (y >= 0)	302	if (y >= 0)
258	{	303	{
259	if (y >= self->rows)	304	if (y >= self->rows)
…		…
265	if (x >= row->c0)	310	if (x >= row->c0)
266	{	311	{
267	if (x >= row->c1)	312	if (x >= row->c1)
268	break;	313	break;
269		314
270	row->col[x - row->c0].darkness = -1;	315	cell = row->col + x - row->c0;
		316
		317	cell->darkness = 0;
		318	cell->stat_hp = 0;
271	}	319	}
272	}	320	}
273	}	321	}
274		322
275	static void	323	static void
…		…
296	ev.data2 = 0;	344	ev.data2 = 0;
297		345
298	SDL_PushEvent ((SDL_Event *)&ev);	346	SDL_PushEvent ((SDL_Event *)&ev);
299	}	347	}
300		348
		349	static unsigned int
		350	minpot (unsigned int n)
		351	{
		352	if (!n)
		353	return 0;
		354
		355	--n;
		356
		357	n \|= n >> 1;
		358	n \|= n >> 2;
		359	n \|= n >> 4;
		360	n \|= n >> 8;
		361	n \|= n >> 16;
		362
		363	return n + 1;
		364	}
		365
301	MODULE = CFClient PACKAGE = CFClient	366	MODULE = CFPlus PACKAGE = CFPlus
302		367
303	PROTOTYPES: ENABLE	368	PROTOTYPES: ENABLE
304		369
305	BOOT:	370	BOOT:
306	{	371	{
307	HV *stash = gv_stashpv ("CFClient", 1);	372	HV *stash = gv_stashpv ("CFPlus", 1);
308	static const struct {	373	static const struct {
309	const char *name;	374	const char *name;
310	IV iv;	375	IV iv;
311	} *civ, const_iv[] = {	376	} *civ, const_iv[] = {
312	# define const_iv(name) { # name, (IV)name }	377	# define const_iv(name) { # name, (IV)name }
…		…
413		478
414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	479	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	480	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416	}	481	}
417		482
		483	int
		484	in_destruct ()
		485	CODE:
		486	RETVAL = PL_main_cv == Nullcv;
		487	OUTPUT:
		488	RETVAL
		489
		490	NV floor (NV x)
		491
		492	NV ceil (NV x)
		493
418	void	494	void
419	pango_init ()	495	pango_init ()
420	CODE:	496	CODE:
421	{	497	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx
423	ft2_fontmap = pango_ft2_font_map_new ();	498	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	499	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	500	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426
427	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
429	}	501	}
430		502
431	int	503	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	504	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
433		505
434	void	506	void
435	SDL_Quit ()	507	SDL_Quit ()
436		508
437	void	509	void
…		…
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	516	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	517	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	518	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		519
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	520	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	521	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450		522
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	523	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	524	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	525	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455		527
456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	528	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		529	#if SDL_VERSION_ATLEAST(1,2,10)
		530	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		531	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		532	#endif
457		533
458	SDL_EnableUNICODE (1);	534	SDL_EnableUNICODE (1);
459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	535	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460		536
461	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	537	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	555	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	556	CODE:
481	RETVAL = !!SDL_SetVideoMode (	557	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	558	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	559	);
		560	if (RETVAL)
		561	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	562	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		563	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		564	# include "glfunc.h"
		565	# undef GL_FUNC
		566	}
485	OUTPUT:	567	OUTPUT:
486	RETVAL	568	RETVAL
487		569
488	void	570	void
489	SDL_GL_SwapBuffers ()	571	SDL_GL_SwapBuffers ()
…		…
542	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	624	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
543	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	625	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
544	break;	626	break;
545	}	627	}
546		628
547	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	629	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
548	}	630	}
549	}	631	}
550		632
551	int	633	int
552	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	634	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
565	CODE:	647	CODE:
566	#ifndef _WIN32	648	#ifndef _WIN32
567	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	649	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
568	#endif	650	#endif
569		651
570	char *
571	gl_vendor ()
572	CODE:
573	RETVAL = (char *)glGetString (GL_VENDOR);
574	OUTPUT:
575	RETVAL
576
577	char *
578	gl_version ()
579	CODE:
580	RETVAL = (char *)glGetString (GL_VERSION);
581	OUTPUT:
582	RETVAL
583
584	char *
585	gl_extensions ()
586	CODE:
587	RETVAL = (char *)glGetString (GL_EXTENSIONS);
588	OUTPUT:
589	RETVAL
590
591	void	652	void
592	add_font (char *file)	653	add_font (char *file)
593	CODE:	654	CODE:
594	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	655	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
595	#ifdef _WIN32
596	// cairo... sigh... requires win2000
597	AddFontResourceEx (file, FR_PRIVATE, 0);
598	#endif
599		656
600	void	657	void
601	load_image_inline (SV *image_)	658	load_image_inline (SV *image_)
602	ALIAS:	659	ALIAS:
603	load_image_file = 1	660	load_image_file = 1
…		…
645		702
646	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	703	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
647		704
648	assert (surface2->pitch == surface2->w * 4);	705	assert (surface2->pitch == surface2->w * 4);
649		706
		707	SDL_LockSurface (surface2);
650	EXTEND (SP, 5);	708	EXTEND (SP, 6);
651	PUSHs (sv_2mortal (newSViv (surface2->w)));	709	PUSHs (sv_2mortal (newSViv (surface2->w)));
652	PUSHs (sv_2mortal (newSViv (surface2->h)));	710	PUSHs (sv_2mortal (newSViv (surface2->h)));
653	SDL_LockSurface (surface2);
654	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	711	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
655	SDL_UnlockSurface (surface2);
656	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	712	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
657	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	713	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
658	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	714	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		715	SDL_UnlockSurface (surface2);
659		716
660	SDL_FreeSurface (surface);	717	SDL_FreeSurface (surface);
661	SDL_FreeSurface (surface2);	718	SDL_FreeSurface (surface2);
662	}	719	}
663		720
…		…
699	CODE:	756	CODE:
700	fprintf (stderr, "FATAL: %s\n", message);	757	fprintf (stderr, "FATAL: %s\n", message);
701	#ifdef _WIN32	758	#ifdef _WIN32
702	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	759	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
703	#endif	760	#endif
704	exit (1);	761	_exit (1);
705		762
		763	void
		764	_exit (int retval)
		765	CODE:
		766	_exit (retval);
		767
706	MODULE = CFClient PACKAGE = CFClient::Font	768	MODULE = CFPlus PACKAGE = CFPlus::Font
707		769
708	CFClient::Font	770	CFPlus::Font
709	new_from_file (SV class, char path, int id = 0)	771	new_from_file (SV class, char path, int id = 0)
710	CODE:	772	CODE:
711	{	773	{
712	int count;	774	int count;
713	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	775	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
716	}	778	}
717	OUTPUT:	779	OUTPUT:
718	RETVAL	780	RETVAL
719		781
720	void	782	void
721	DESTROY (CFClient::Font self)	783	DESTROY (CFPlus::Font self)
722	CODE:	784	CODE:
723	pango_font_description_free (self);	785	pango_font_description_free (self);
724		786
725	void	787	void
726	make_default (CFClient::Font self)	788	make_default (CFPlus::Font self)
727	CODE:	789	CODE:
728	default_font = self;	790	default_font = self;
729		791
730	MODULE = CFClient PACKAGE = CFClient::Layout	792	MODULE = CFPlus PACKAGE = CFPlus::Layout
731		793
732	CFClient::Layout	794	void
733	new (SV *class, int rgba = 0)	795	reset_glyph_cache ()
734	CODE:	796	CODE:
735	#if _WIN32	797	tc_clear ();
736	//rgba = 0;//D make stext nicer, breaks TextView	798
737	#endif	799	CFPlus::Layout
		800	new (SV *class)
		801	CODE:
738	New (0, RETVAL, 1, struct cf_layout);	802	New (0, RETVAL, 1, struct cf_layout);
739		803
740	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	804	RETVAL->pl = pango_layout_new (opengl_context);
741	RETVAL->rgba = rgba;
742	RETVAL->r = 1.;	805	RETVAL->r = 1.;
743	RETVAL->g = 1.;	806	RETVAL->g = 1.;
744	RETVAL->b = 1.;	807	RETVAL->b = 1.;
745	RETVAL->a = 1.;	808	RETVAL->a = 1.;
746	RETVAL->base_height = MIN_FONT_HEIGHT;	809	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
750	layout_update_font (RETVAL);	813	layout_update_font (RETVAL);
751	OUTPUT:	814	OUTPUT:
752	RETVAL	815	RETVAL
753		816
754	void	817	void
755	DESTROY (CFClient::Layout self)	818	DESTROY (CFPlus::Layout self)
756	CODE:	819	CODE:
757	g_object_unref (self->pl);	820	g_object_unref (self->pl);
758	Safefree (self);	821	Safefree (self);
759		822
760	int
761	is_rgba (CFClient::Layout self)
762	CODE:
763	RETVAL = self->rgba;
764	OUTPUT:
765	RETVAL
766
767	void	823	void
768	set_text (CFClient::Layout self, SV *text_)	824	set_text (CFPlus::Layout self, SV *text_)
769	CODE:	825	CODE:
770	{	826	{
771	STRLEN textlen;	827	STRLEN textlen;
772	char *text = SvPVutf8 (text_, textlen);	828	char *text = SvPVutf8 (text_, textlen);
773		829
774	pango_layout_set_text (self->pl, text, textlen);	830	pango_layout_set_text (self->pl, text, textlen);
775	}	831	}
776		832
777	void	833	void
778	set_markup (CFClient::Layout self, SV *text_)	834	set_markup (CFPlus::Layout self, SV *text_)
779	CODE:	835	CODE:
780	{	836	{
781	STRLEN textlen;	837	STRLEN textlen;
782	char *text = SvPVutf8 (text_, textlen);	838	char *text = SvPVutf8 (text_, textlen);
783		839
784	pango_layout_set_markup (self->pl, text, textlen);	840	pango_layout_set_markup (self->pl, text, textlen);
785	}	841	}
786		842
		843	void
		844	set_shapes (CFPlus::Layout self, ...)
		845	CODE:
		846	{
		847	PangoAttrList *attrs = 0;
		848	const char *text = pango_layout_get_text (self->pl);
		849	const char *pos = text;
		850	int arg = 4;
		851
		852	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		853	{
		854	PangoRectangle inkrect, rect;
		855	PangoAttribute *attr;
		856
		857	int x = SvIV (ST (arg - 3));
		858	int y = SvIV (ST (arg - 2));
		859	int w = SvIV (ST (arg - 1));
		860	int h = SvIV (ST (arg ));
		861
		862	inkrect.x = 0;
		863	inkrect.y = 0;
		864	inkrect.width = 0;
		865	inkrect.height = 0;
		866
		867	rect.x = x * PANGO_SCALE;
		868	rect.y = y * PANGO_SCALE;
		869	rect.width = w * PANGO_SCALE;
		870	rect.height = h * PANGO_SCALE;
		871
		872	if (!attrs)
		873	attrs = pango_layout_get_attributes (self->pl);
		874
		875	attr = pango_attr_shape_new (&inkrect, &rect);
		876	attr->start_index = pos - text;
		877	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		878	pango_attr_list_insert (attrs, attr);
		879
		880	arg += 4;
		881	pos += sizeof (OBJ_STR) - 1;
		882	}
		883
		884	if (attrs)
		885	pango_layout_set_attributes (self->pl, attrs);
		886	}
		887
		888	void
		889	get_shapes (CFPlus::Layout self)
		890	PPCODE:
		891	{
		892	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		893
		894	do
		895	{
		896	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		897
		898	if (run && shape_attr_p (run))
		899	{
		900	PangoRectangle extents;
		901	pango_layout_iter_get_run_extents (iter, 0, &extents);
		902
		903	EXTEND (SP, 2);
		904	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		905	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		906	}
		907	}
		908	while (pango_layout_iter_next_run (iter));
		909
		910	pango_layout_iter_free (iter);
		911	}
		912
		913	int
		914	has_wrapped (CFPlus::Layout self)
		915	CODE:
		916	{
		917	int lines = 1;
		918	const char *text = pango_layout_get_text (self->pl);
		919
		920	while (*text)
		921	lines += *text++ == '\n';
		922
		923	RETVAL = lines < pango_layout_get_line_count (self->pl);
		924	}
		925	OUTPUT:
		926	RETVAL
		927
787	SV *	928	SV *
788	get_text (CFClient::Layout self)	929	get_text (CFPlus::Layout self)
789	CODE:	930	CODE:
790	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	931	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
791	SvUTF8_on (RETVAL);	932	sv_utf8_decode (RETVAL);
792	OUTPUT:	933	OUTPUT:
793	RETVAL	934	RETVAL
794		935
795	void	936	void
796	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	937	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
797	CODE:	938	CODE:
798	self->r = r;	939	self->r = r;
799	self->g = g;	940	self->g = g;
800	self->b = b;	941	self->b = b;
801	self->a = a;	942	self->a = a;
802		943
803	void	944	void
804	set_font (CFClient::Layout self, CFClient::Font font = 0)	945	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
805	CODE:	946	CODE:
806	if (self->font != font)	947	if (self->font != font)
807	{	948	{
808	self->font = font;	949	self->font = font;
809	layout_update_font (self);	950	layout_update_font (self);
810	}	951	}
811		952
812	void	953	void
813	set_height (CFClient::Layout self, int base_height)	954	set_height (CFPlus::Layout self, int base_height)
814	CODE:	955	CODE:
815	if (self->base_height != base_height)	956	if (self->base_height != base_height)
816	{	957	{
817	self->base_height = base_height;	958	self->base_height = base_height;
818	layout_update_font (self);	959	layout_update_font (self);
819	}	960	}
820		961
821	void	962	void
822	set_width (CFClient::Layout self, int max_width = -1)	963	set_width (CFPlus::Layout self, int max_width = -1)
823	CODE:	964	CODE:
824	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	965	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
825		966
826	void	967	void
827	set_indent (CFClient::Layout self, int indent)	968	set_indent (CFPlus::Layout self, int indent)
828	CODE:	969	CODE:
829	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	970	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
830		971
831	void	972	void
832	set_spacing (CFClient::Layout self, int spacing)	973	set_spacing (CFPlus::Layout self, int spacing)
833	CODE:	974	CODE:
834	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	975	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
835		976
836	void	977	void
837	set_ellipsise (CFClient::Layout self, int ellipsise)	978	set_ellipsise (CFPlus::Layout self, int ellipsise)
838	CODE:	979	CODE:
839	pango_layout_set_ellipsize (self->pl,	980	pango_layout_set_ellipsize (self->pl,
840	ellipsise == 1 ? PANGO_ELLIPSIZE_START	981	ellipsise == 1 ? PANGO_ELLIPSIZE_START
841	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	982	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
842	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	983	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
843	: PANGO_ELLIPSIZE_NONE	984	: PANGO_ELLIPSIZE_NONE
844	);	985	);
845		986
846	void	987	void
847	set_single_paragraph_mode (CFClient::Layout self, int spm)	988	set_single_paragraph_mode (CFPlus::Layout self, int spm)
848	CODE:	989	CODE:
849	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	990	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
850		991
851	void	992	void
852	size (CFClient::Layout self)	993	size (CFPlus::Layout self)
853	PPCODE:	994	PPCODE:
854	{	995	{
855	int w, h;	996	int w, h;
856		997
857	layout_get_pixel_size (self, &w, &h);	998	layout_get_pixel_size (self, &w, &h);
…		…
860	PUSHs (sv_2mortal (newSViv (w)));	1001	PUSHs (sv_2mortal (newSViv (w)));
861	PUSHs (sv_2mortal (newSViv (h)));	1002	PUSHs (sv_2mortal (newSViv (h)));
862	}	1003	}
863		1004
864	int	1005	int
		1006	descent (CFPlus::Layout self)
		1007	CODE:
		1008	{
		1009	PangoRectangle rect;
		1010	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1011	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1012	RETVAL = PANGO_DESCENT (rect);
		1013	}
		1014	OUTPUT:
		1015	RETVAL
		1016
		1017	int
865	xy_to_index (CFClient::Layout self, int x, int y)	1018	xy_to_index (CFPlus::Layout self, int x, int y)
866	CODE:	1019	CODE:
867	{	1020	{
868	int index, trailing;	1021	int index, trailing;
869	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1022	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
870	RETVAL = index;	1023	RETVAL = index;
871	}	1024	}
872	OUTPUT:	1025	OUTPUT:
873	RETVAL	1026	RETVAL
874		1027
875	void	1028	void
876	cursor_pos (CFClient::Layout self, int index)	1029	cursor_pos (CFPlus::Layout self, int index)
877	PPCODE:	1030	PPCODE:
878	{	1031	{
879	PangoRectangle strong_pos;	1032	PangoRectangle strong_pos;
880	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1033	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
881		1034
…		…
884	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1037	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
885	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1038	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
886	}	1039	}
887		1040
888	void	1041	void
889	render (CFClient::Layout self)	1042	render (CFPlus::Layout self, float x, float y, int flags = 0)
890	PPCODE:	1043	PPCODE:
891	{	1044	pango_opengl_render_layout_subpixel (
892	SV *retval;	1045	self->pl,
893	int w, h;	1046	x * PANGO_SCALE, y * PANGO_SCALE,
		1047	self->r, self->g, self->b, self->a,
		1048	flags
		1049	);
894		1050
895	layout_get_pixel_size (self, &w, &h);	1051	MODULE = CFPlus PACKAGE = CFPlus::Texture
896		1052
897	if (self->rgba)	1053	void
		1054	pad2pot (SV data_, SV w_, SV *h_)
		1055	CODE:
		1056	{
		1057	int ow = SvIV (w_);
		1058	int oh = SvIV (h_);
		1059
		1060	if (ow && oh)
898	{	1061	{
899	cairo_surface_t *surface;	1062	int nw = minpot (ow);
900	cairo_t *cairo;	1063	int nh = minpot (oh);
901		1064
902	retval = newSV (w * h * 4);	1065	if (nw != ow \|\| nh != oh)
903	SvPOK_only (retval);
904	SvCUR_set (retval, w * h * 4);
905
906	memset (SvPVX (retval), 0, w * h * 4);
907
908	surface = cairo_image_surface_create_for_data (
909	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
910	cairo = cairo_create (surface);
911	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
912
913	pango_cairo_show_layout (cairo, self->pl);
914
915	cairo_destroy (cairo);
916	cairo_surface_destroy (surface);
917
918	// what a mess, and its premultiplied, too :(
919	{	1066	{
920	uint32_t p = (uint32_t )SvPVX (retval);	1067	if (SvOK (data_))
921	uint32_t e = p + w h;
922
923	while (p < e)
924	{	1068	{
925	uint32_t rgba = *p;	1069	STRLEN datalen;
926	rgba = (rgba >> 24) \| (rgba << 8);	1070	char *data = SvPVbyte (data_, datalen);
927	#if 0	1071	int bpp = datalen / (ow * oh);
928	#ifdef _WIN32	1072	SV result_ = sv_2mortal (newSV (nw nh * bpp));
929	{//D
930	uint8_t r = rgba >> 24;
931	uint8_t g = rgba >> 16;
932	uint8_t b = rgba >> 8;
933	uint8_t a = rgba >> 0;
934		1073
935	rgba = (rgba & 0xffffff00) \| a;	1074	SvPOK_only (result_);
		1075	SvCUR_set (result_, nw * nh * bpp);
		1076
		1077	memset (SvPVX (result_), 0, nw * nh * bpp);
		1078	while (oh--)
		1079	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1080
		1081	sv_setsv (data_, result_);
936	}	1082	}
937	#endif	1083
938	#endif	1084	sv_setiv (w_, nw);
939	rgba = SDL_SwapBE32 (rgba);	1085	sv_setiv (h_, nh);
940	*p++ = rgba;
941	}	1086	}
942	}
943
944	EXTEND (SP, 5);
945	PUSHs (sv_2mortal (newSViv (w)));
946	PUSHs (sv_2mortal (newSViv (h)));
947	PUSHs (sv_2mortal (retval));
948	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
949	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
950	}	1087	}
951	else
952	{
953	FT_Bitmap bitmap;
954
955	retval = newSV (w * h);
956	SvPOK_only (retval);
957	SvCUR_set (retval, w * h);
958
959	bitmap.rows = h;
960	bitmap.width = w;
961	bitmap.pitch = w;
962	bitmap.buffer = (unsigned char*)SvPVX (retval);
963	bitmap.num_grays = 256;
964	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
965
966	memset (bitmap.buffer, 0, w * h);
967
968	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
969
970	EXTEND (SP, 5);
971	PUSHs (sv_2mortal (newSViv (w)));
972	PUSHs (sv_2mortal (newSViv (h)));
973	PUSHs (sv_2mortal (retval));
974	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
975	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
976	}
977	}	1088	}
978		1089
979	MODULE = CFClient PACKAGE = CFClient::Texture
980
981	void	1090	void
982	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1091	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
983	PROTOTYPE: $$$;$$	1092	PROTOTYPE: $$$;$$
984	ALIAS:	1093	ALIAS:
985	draw_quad_alpha = 1	1094	draw_quad_alpha = 1
986	draw_quad_alpha_premultiplied = 2	1095	draw_quad_alpha_premultiplied = 2
987	CODE:	1096	CODE:
988	{	1097	{
989	HV hv = (HV )SvRV (self);	1098	HV hv = (HV )SvRV (self);
990	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1099	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
991	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1100	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
992	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1101	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
993	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
994		1102
995	if (items < 5)	1103	if (items < 5)
996	{	1104	{
997	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1105	w = SvNV (*hv_fetch (hv, "w", 1, 1));
998	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1106	h = SvNV (*hv_fetch (hv, "h", 1, 1));
999	}	1107	}
1000		1108
1001	if (ix)	1109	if (ix)
1002	{	1110	{
1003	glEnable (GL_BLEND);	1111	glEnable (GL_BLEND);
		1112
		1113	if (ix == 2)
1004	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1114	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1115	else
		1116	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1117	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1118
1005	glEnable (GL_ALPHA_TEST);	1119	glEnable (GL_ALPHA_TEST);
1006	glAlphaFunc (GL_GREATER, 0.01f);	1120	glAlphaFunc (GL_GREATER, 0.01f);
1007	}	1121	}
1008		1122
1009	glBindTexture (GL_TEXTURE_2D, name);	1123	glBindTexture (GL_TEXTURE_2D, name);
1010
1011	if (wrap_mode)
1012	{
1013	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1014	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1015	}
1016		1124
1017	glBegin (GL_QUADS);	1125	glBegin (GL_QUADS);
1018	glTexCoord2f (0, 0); glVertex2f (x , y );	1126	glTexCoord2f (0, 0); glVertex2f (x , y );
1019	glTexCoord2f (0, t); glVertex2f (x , y + h);	1127	glTexCoord2f (0, t); glVertex2f (x , y + h);
1020	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1128	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1026	glDisable (GL_ALPHA_TEST);	1134	glDisable (GL_ALPHA_TEST);
1027	glDisable (GL_BLEND);	1135	glDisable (GL_BLEND);
1028	}	1136	}
1029	}	1137	}
1030		1138
1031	MODULE = CFClient PACKAGE = CFClient::Map	1139	MODULE = CFPlus PACKAGE = CFPlus::Map
1032		1140
1033	CFClient::Map	1141	CFPlus::Map
1034	new (SV *class, int map_width, int map_height)	1142	new (SV *class, int map_width, int map_height)
1035	CODE:	1143	CODE:
1036	New (0, RETVAL, 1, struct map);	1144	New (0, RETVAL, 1, struct map);
1037	RETVAL->x = 0;	1145	RETVAL->x = 0;
1038	RETVAL->y = 0;	1146	RETVAL->y = 0;
…		…
1048	RETVAL->row = 0;	1156	RETVAL->row = 0;
1049	OUTPUT:	1157	OUTPUT:
1050	RETVAL	1158	RETVAL
1051		1159
1052	void	1160	void
1053	DESTROY (CFClient::Map self)	1161	DESTROY (CFPlus::Map self)
1054	CODE:	1162	CODE:
1055	{	1163	{
1056	map_clear (self);	1164	map_clear (self);
1057	Safefree (self->face);	1165	Safefree (self->face);
		1166	Safefree (self->tex);
1058	Safefree (self);	1167	Safefree (self);
1059	}	1168	}
1060		1169
1061	void	1170	void
1062	clear (CFClient::Map self)	1171	clear (CFPlus::Map self)
1063	CODE:	1172	CODE:
1064	map_clear (self);	1173	map_clear (self);
1065		1174
1066	void	1175	void
1067	set_face (CFClient::Map self, int face, int texid)	1176	set_face (CFPlus::Map self, int face, int texid)
1068	CODE:	1177	CODE:
1069	{	1178	{
1070	while (self->faces <= face)	1179	while (self->faces <= face)
1071	{	1180	{
1072	Append (mapface, self->face, self->faces, self->faces);	1181	Append (mapface, self->face, self->faces, self->faces);
…		…
1075		1184
1076	self->face [face] = texid;	1185	self->face [face] = texid;
1077	}	1186	}
1078		1187
1079	void	1188	void
1080	set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1189	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1081	CODE:	1190	CODE:
1082	{	1191	{
1083	while (self->texs <= texid)	1192	while (self->texs <= texid)
1084	{	1193	{
1085	Append (maptex, self->tex, self->texs, self->texs);	1194	Append (maptex, self->tex, self->texs, self->texs);
…		…
1101	}	1210	}
1102		1211
1103	// somewhat hackish, but for textures that require it, it really	1212	// somewhat hackish, but for textures that require it, it really
1104	// improves the look, and most others don't suffer.	1213	// improves the look, and most others don't suffer.
1105	glBindTexture (GL_TEXTURE_2D, name);	1214	glBindTexture (GL_TEXTURE_2D, name);
1106	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	1215	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1107	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	1216	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1217	// use uglier nearest interpolation because linear suffers
		1218	// from transparent color bleeding and ugly wrapping effects.
		1219	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1108	}	1220	}
1109		1221
1110	int	1222	int
1111	ox (CFClient::Map self)	1223	ox (CFPlus::Map self)
1112	ALIAS:	1224	ALIAS:
1113	oy = 1	1225	oy = 1
		1226	x = 2
		1227	y = 3
		1228	w = 4
		1229	h = 5
1114	CODE:	1230	CODE:
1115	switch (ix)	1231	switch (ix)
1116	{	1232	{
1117	case 0: RETVAL = self->ox; break;	1233	case 0: RETVAL = self->ox; break;
1118	case 1: RETVAL = self->oy; break;	1234	case 1: RETVAL = self->oy; break;
		1235	case 2: RETVAL = self->x; break;
		1236	case 3: RETVAL = self->y; break;
		1237	case 4: RETVAL = self->w; break;
		1238	case 5: RETVAL = self->h; break;
1119	}	1239	}
1120	OUTPUT:	1240	OUTPUT:
1121	RETVAL	1241	RETVAL
1122		1242
1123	void	1243	void
1124	scroll (CFClient::Map self, int dx, int dy)	1244	scroll (CFPlus::Map self, int dx, int dy)
1125	CODE:	1245	CODE:
1126	{	1246	{
1127	if (dx > 0)	1247	if (dx > 0)
1128	map_blank (self, self->x, self->y, dx - 1, self->h);	1248	map_blank (self, self->x, self->y, dx - 1, self->h);
1129	else if (dx < 0)	1249	else if (dx < 0)
…		…
1145	self->y += MAP_EXTEND_Y;	1265	self->y += MAP_EXTEND_Y;
1146	}	1266	}
1147	}	1267	}
1148		1268
1149	void	1269	void
1150	map1a_update (CFClient::Map self, SV *data_)	1270	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1151	CODE:	1271	CODE:
1152	{	1272	{
1153	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1273	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1154	uint8_t data_end = (uint8_t )SvEND (data_);	1274	uint8_t data_end = (uint8_t )SvEND (data_);
1155	mapcell *cell;	1275	mapcell *cell;
…		…
1157		1277
1158	while (data < data_end)	1278	while (data < data_end)
1159	{	1279	{
1160	flags = (data [0] << 8) + data [1]; data += 2;	1280	flags = (data [0] << 8) + data [1]; data += 2;
1161		1281
1162	x = ((flags >> 10) & 63) + self->x;	1282	x = self->x + ((flags >> 10) & 63);
1163	y = ((flags >> 4) & 63) + self->y;	1283	y = self->y + ((flags >> 4) & 63);
1164		1284
1165	cell = map_get_cell (self, x, y);	1285	cell = map_get_cell (self, x, y);
1166		1286
1167	if (flags & 15)	1287	if (flags & 15)
1168	{	1288	{
1169	if (cell->darkness < 0)	1289	if (!cell->darkness)
1170	{	1290	{
1171	cell->darkness = 0;	1291	cell->darkness = 256;
1172	cell->face [0] = 0;	1292	cell->face [0] = 0;
1173	cell->face [1] = 0;	1293	cell->face [1] = 0;
1174	cell->face [2] = 0;	1294	cell->face [2] = 0;
1175	}	1295	}
1176		1296
1177	cell->darkness = flags & 8 ? *data++ : 255;
1178
1179	//TODO: don't trust server data to be in-range(!)	1297	//TODO: don't trust server data to be in-range(!)
		1298
		1299	if (flags & 8)
		1300	{
		1301	if (extmap)
		1302	{
		1303	uint8_t ext, cmd;
		1304
		1305	do
		1306	{
		1307	ext = *data++;
		1308	cmd = ext & 0x3f;
		1309
		1310	if (ext < 4)
		1311	cell->darkness = 255 - ext * 64 + 1;
		1312	else if (ext == 5) // health
		1313	cell->stat_hp = *data++;
		1314	else if (ext & 0x40) // unknown, multibyte => skip
		1315	data += *data + 1;
		1316	}
		1317	while (cmd & 0x80);
		1318	}
		1319	else
		1320	cell->darkness = *data++ + 1;
		1321	}
1180		1322
1181	if (flags & 4)	1323	if (flags & 4)
1182	{	1324	{
1183	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1325	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1184	}	1326	}
…		…
1192	{	1334	{
1193	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1335	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1194	}	1336	}
1195	}	1337	}
1196	else	1338	else
		1339	{
1197	cell->darkness = -1;	1340	cell->darkness = 0;
		1341	cell->stat_hp = 0;
		1342	}
1198	}	1343	}
1199	}	1344	}
1200		1345
1201	SV *	1346	SV *
1202	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1347	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1203	CODE:	1348	CODE:
1204	{	1349	{
1205	int x1, x;	1350	int x1, x;
1206	int y1, y;	1351	int y1, y;
1207	int z;	1352	int z;
…		…
1257	}	1402	}
1258	OUTPUT:	1403	OUTPUT:
1259	RETVAL	1404	RETVAL
1260		1405
1261	void	1406	void
1262	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1407	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1263	PPCODE:	1408	CODE:
1264	{	1409	{
1265	int vx, vy;	1410	int vx, vy;
1266	int x, y, z;	1411	int x, y, z;
1267	int last_name;	1412	int last_name;
1268	mapface face;	1413	mapface face;
1269	int sw4 = (sw + 3) & ~3;
1270	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1271	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1272		1414
1273	memset (darkness, 255, sw4 * sh);
1274	SvPOK_only (darkness_sv);
1275	SvCUR_set (darkness_sv, sw4 * sh);
1276
1277	vx = self->x + (self->w - sw) / 2 - shift_x;	1415	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1278	vy = self->y + (self->h - sh) / 2 - shift_y;	1416	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1279		1417
1280	/*	1418	/*
1281	int vx = self->vx = self->w >= sw	1419	int vx = self->vx = self->w >= sw
1282	? self->x + (self->w - sw) / 2	1420	? self->x + (self->w - sw) / 2
1283	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1421	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1287	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1425	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1288	*/	1426	*/
1289		1427
1290	glColor4ub (255, 255, 255, 255);	1428	glColor4ub (255, 255, 255, 255);
1291		1429
		1430	glEnable (GL_BLEND);
1292	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1431	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1293	glEnable (GL_BLEND);
1294	glEnable (GL_TEXTURE_2D);	1432	glEnable (GL_TEXTURE_2D);
1295	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1433	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1296		1434
1297	glBegin (GL_QUADS);	1435	glBegin (GL_QUADS);
1298		1436
…		…
1307	for (x = 0; x < sw; x++)	1445	for (x = 0; x < sw; x++)
1308	if (row->c0 <= x + vx && x + vx < row->c1)	1446	if (row->c0 <= x + vx && x + vx < row->c1)
1309	{	1447	{
1310	mapcell *cell = row->col + (x + vx - row->c0);	1448	mapcell *cell = row->col + (x + vx - row->c0);
1311		1449
1312	darkness[y * sw4 + x] = cell->darkness < 0
1313	? 255 - FOW_DARKNESS
1314	: 255 - cell->darkness;
1315
1316	face = cell->face [z];	1450	face = cell->face [z];
1317		1451
1318	if (face)	1452	if (face && face < self->texs)
1319	{	1453	{
1320	maptex tex = self->tex [face];	1454	maptex tex = self->tex [face];
1321		1455
1322	int px = (x + 1) * 32 - tex.w;	1456	int px = (x + 1) * 32 - tex.w;
1323	int py = (y + 1) * 32 - tex.h;	1457	int py = (y + 1) * 32 - tex.h;
…		…
1341	glEnd ();	1475	glEnd ();
1342		1476
1343	glDisable (GL_TEXTURE_2D);	1477	glDisable (GL_TEXTURE_2D);
1344	glDisable (GL_BLEND);	1478	glDisable (GL_BLEND);
1345		1479
		1480	// top layer: overlays such as the health bar
		1481	for (y = 0; y < sh; y++)
		1482	if (0 <= y + vy && y + vy < self->rows)
		1483	{
		1484	maprow *row = self->row + (y + vy);
		1485
		1486	for (x = 0; x < sw; x++)
		1487	if (row->c0 <= x + vx && x + vx < row->c1)
		1488	{
		1489	mapcell *cell = row->col + (x + vx - row->c0);
		1490
		1491	int px = x * 32;
		1492	int py = y * 32;
		1493
		1494	if (cell->stat_hp)
		1495	{
		1496	int width = sh / 28 + 1;
		1497
		1498	glColor3ub (0, 0, 0);
		1499	glRectf (px + 1, py, px + 31, py + width + 2);
		1500
		1501	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1502	glRectf (px + 2, py + 1, px + 30 - cell->stat_hp * 28 / 255, py + width + 1);
		1503	}
		1504	}
		1505	}
		1506	}
		1507
		1508	void
		1509	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1510	CODE:
		1511	{
		1512	static float color[16][3] = {
		1513	{ 0.00F, 0.00F, 0.00F },
		1514	{ 1.00F, 1.00F, 1.00F },
		1515	{ 0.00F, 0.00F, 0.55F },
		1516	{ 1.00F, 0.00F, 0.00F },
		1517
		1518	{ 1.00F, 0.54F, 0.00F },
		1519	{ 0.11F, 0.56F, 1.00F },
		1520	{ 0.93F, 0.46F, 0.00F },
		1521	{ 0.18F, 0.54F, 0.34F },
		1522
		1523	{ 0.56F, 0.73F, 0.56F },
		1524	{ 0.80F, 0.80F, 0.80F },
		1525	{ 0.55F, 0.41F, 0.13F },
		1526	{ 0.99F, 0.77F, 0.26F },
		1527
		1528	{ 0.74F, 0.65F, 0.41F },
		1529
		1530	{ 0.00F, 1.00F, 1.00F },
		1531	{ 1.00F, 0.00F, 1.00F },
		1532	{ 1.00F, 1.00F, 0.00F },
		1533	};
		1534
		1535	int x, y;
		1536
		1537	glEnable (GL_TEXTURE_2D);
		1538	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1539	glEnable (GL_BLEND);
		1540	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1541	glBegin (GL_QUADS);
		1542
		1543	for (y = 0; y < h; y++)
		1544	for (x = 0; x < w; x++)
		1545	{
		1546	unsigned char m = data [x + y * w];
		1547
		1548	if (m)
		1549	{
		1550	float *c = color [m & 15];
		1551
		1552	float tx1 = m & 0x40 ? 0.5 : 0.;
		1553	float tx2 = tx1 + 0.5;
		1554
		1555	glColor4f (c[0], c[1], c[2], 0.75);
		1556	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1557	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1558	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1559	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1560	}
		1561	}
		1562
		1563	glEnd ();
		1564	glDisable (GL_BLEND);
		1565	glDisable (GL_TEXTURE_2D);
		1566	}
		1567
		1568	void
		1569	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1570	PPCODE:
		1571	{
		1572	int vx, vy;
		1573	int x, y;
		1574	int sw4 = (sw + 3) & ~3;
		1575	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1576	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1577
		1578	memset (darkness, 255, sw4 * sh);
		1579	SvPOK_only (darkness_sv);
		1580	SvCUR_set (darkness_sv, sw4 * sh);
		1581
		1582	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1583	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1584
		1585	for (y = 0; y < sh; y++)
		1586	if (0 <= y + vy && y + vy < self->rows)
		1587	{
		1588	maprow *row = self->row + (y + vy);
		1589
		1590	for (x = 0; x < sw; x++)
		1591	if (row->c0 <= x + vx && x + vx < row->c1)
		1592	{
		1593	mapcell *cell = row->col + (x + vx - row->c0);
		1594
		1595	darkness[y * sw4 + x] = cell->darkness
		1596	? 255 - (cell->darkness - 1)
		1597	: 255 - FOW_DARKNESS;
		1598	}
		1599	}
		1600
1346	EXTEND (SP, 3);	1601	EXTEND (SP, 3);
1347	PUSHs (sv_2mortal (newSViv (sw4)));	1602	PUSHs (sv_2mortal (newSViv (sw4)));
1348	PUSHs (sv_2mortal (newSViv (sh)));	1603	PUSHs (sv_2mortal (newSViv (sh)));
1349	PUSHs (darkness_sv);	1604	PUSHs (darkness_sv);
1350	}	1605	}
1351		1606
1352	SV *	1607	SV *
1353	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1608	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1354	CODE:	1609	CODE:
1355	{	1610	{
1356	int x, y, x1, y1;	1611	int x, y, x1, y1;
1357	SV data_sv = newSV (w h * 7 + 5);	1612	SV data_sv = newSV (w h * 7 + 5);
1358	uint8_t data = (uint8_t )SvPVX (data_sv);	1613	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1420	}	1675	}
1421	OUTPUT:	1676	OUTPUT:
1422	RETVAL	1677	RETVAL
1423		1678
1424	void	1679	void
1425	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1680	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1426	PPCODE:	1681	PPCODE:
1427	{	1682	{
1428	int x, y, z;	1683	int x, y, z;
1429	int w, h;	1684	int w, h;
1430	int x1, y1;	1685	int x1, y1;
…		…
1462		1717
1463	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1718	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1464	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1719	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1465	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1720	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1466		1721
1467	if (cell->darkness <= 0)	1722	if (cell->darkness == 0)
1468	{	1723	{
1469	cell->darkness = -1;	1724	cell->darkness = 0;
1470		1725
1471	for (z = 0; z <= 2; z++)	1726	for (z = 0; z <= 2; z++)
1472	{	1727	{
1473	cell->face[z] = face[z];	1728	cell->face[z] = face[z];
1474		1729
…		…
1479	}	1734	}
1480	}	1735	}
1481	}	1736	}
1482	}	1737	}
1483		1738
1484	MODULE = CFClient PACKAGE = CFClient::MixChunk	1739	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1485		1740
1486	CFClient::MixChunk	1741	CFPlus::MixChunk
1487	new_from_file (SV class, char path)	1742	new_from_file (SV class, char path)
1488	CODE:	1743	CODE:
1489	RETVAL = Mix_LoadWAV (path);	1744	RETVAL = Mix_LoadWAV (path);
1490	OUTPUT:	1745	OUTPUT:
1491	RETVAL	1746	RETVAL
1492		1747
1493	void	1748	void
1494	DESTROY (CFClient::MixChunk self)	1749	DESTROY (CFPlus::MixChunk self)
1495	CODE:	1750	CODE:
1496	Mix_FreeChunk (self);	1751	Mix_FreeChunk (self);
1497		1752
1498	int	1753	int
1499	volume (CFClient::MixChunk self, int volume = -1)	1754	volume (CFPlus::MixChunk self, int volume = -1)
1500	CODE:	1755	CODE:
1501	RETVAL = Mix_VolumeChunk (self, volume);	1756	RETVAL = Mix_VolumeChunk (self, volume);
1502	OUTPUT:	1757	OUTPUT:
1503	RETVAL	1758	RETVAL
1504		1759
1505	int	1760	int
1506	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1761	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1507	CODE:	1762	CODE:
1508	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1763	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1509	OUTPUT:	1764	OUTPUT:
1510	RETVAL	1765	RETVAL
1511		1766
1512	MODULE = CFClient PACKAGE = CFClient::MixMusic	1767	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1513		1768
1514	int	1769	int
1515	volume (int volume = -1)	1770	volume (int volume = -1)
1516	CODE:	1771	CODE:
1517	RETVAL = Mix_VolumeMusic (volume);	1772	RETVAL = Mix_VolumeMusic (volume);
1518	OUTPUT:	1773	OUTPUT:
1519	RETVAL	1774	RETVAL
1520		1775
1521	CFClient::MixMusic	1776	CFPlus::MixMusic
1522	new_from_file (SV class, char path)	1777	new_from_file (SV class, char path)
1523	CODE:	1778	CODE:
1524	RETVAL = Mix_LoadMUS (path);	1779	RETVAL = Mix_LoadMUS (path);
1525	OUTPUT:	1780	OUTPUT:
1526	RETVAL	1781	RETVAL
1527		1782
1528	void	1783	void
1529	DESTROY (CFClient::MixMusic self)	1784	DESTROY (CFPlus::MixMusic self)
1530	CODE:	1785	CODE:
1531	Mix_FreeMusic (self);	1786	Mix_FreeMusic (self);
1532		1787
1533	int	1788	int
1534	play (CFClient::MixMusic self, int loops = -1)	1789	play (CFPlus::MixMusic self, int loops = -1)
1535	CODE:	1790	CODE:
1536	RETVAL = Mix_PlayMusic (self, loops);	1791	RETVAL = Mix_PlayMusic (self, loops);
1537	OUTPUT:	1792	OUTPUT:
1538	RETVAL	1793	RETVAL
1539		1794
1540	MODULE = CFClient PACKAGE = CFClient::OpenGL	1795	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1541		1796
1542	BOOT:	1797	BOOT:
1543	{	1798	{
1544	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1799	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1545	static const struct {	1800	static const struct {
1546	const char *name;	1801	const char *name;
1547	IV iv;	1802	IV iv;
1548	} *civ, const_iv[] = {	1803	} *civ, const_iv[] = {
1549	# define const_iv(name) { # name, (IV)name }	1804	# define const_iv(name) { # name, (IV)name }
…		…
1556	const_iv (GL_SCISSOR_TEST),	1811	const_iv (GL_SCISSOR_TEST),
1557	const_iv (GL_DEPTH_TEST),	1812	const_iv (GL_DEPTH_TEST),
1558	const_iv (GL_ALPHA_TEST),	1813	const_iv (GL_ALPHA_TEST),
1559	const_iv (GL_NORMALIZE),	1814	const_iv (GL_NORMALIZE),
1560	const_iv (GL_RESCALE_NORMAL),	1815	const_iv (GL_RESCALE_NORMAL),
		1816	const_iv (GL_FRONT),
		1817	const_iv (GL_BACK),
1561	const_iv (GL_AND),	1818	const_iv (GL_AND),
1562	const_iv (GL_ONE),	1819	const_iv (GL_ONE),
1563	const_iv (GL_ZERO),	1820	const_iv (GL_ZERO),
1564	const_iv (GL_SRC_ALPHA),	1821	const_iv (GL_SRC_ALPHA),
1565	const_iv (GL_SRC_ALPHA_SATURATE),	1822	const_iv (GL_DST_ALPHA),
1566	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1823	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1567	const_iv (GL_ONE_MINUS_DST_ALPHA),	1824	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1825	const_iv (GL_SRC_ALPHA_SATURATE),
1568	const_iv (GL_RGB),	1826	const_iv (GL_RGB),
1569	const_iv (GL_RGBA),	1827	const_iv (GL_RGBA),
		1828	const_iv (GL_RGBA4),
		1829	const_iv (GL_RGBA8),
		1830	const_iv (GL_RGB5_A1),
1570	const_iv (GL_UNSIGNED_BYTE),	1831	const_iv (GL_UNSIGNED_BYTE),
1571	const_iv (GL_UNSIGNED_SHORT),	1832	const_iv (GL_UNSIGNED_SHORT),
1572	const_iv (GL_UNSIGNED_INT),	1833	const_iv (GL_UNSIGNED_INT),
1573	const_iv (GL_ALPHA),	1834	const_iv (GL_ALPHA),
1574	const_iv (GL_INTENSITY),	1835	const_iv (GL_INTENSITY),
…		…
1583	const_iv (GL_TEXTURE_MAG_FILTER),	1844	const_iv (GL_TEXTURE_MAG_FILTER),
1584	const_iv (GL_TEXTURE_MIN_FILTER),	1845	const_iv (GL_TEXTURE_MIN_FILTER),
1585	const_iv (GL_TEXTURE_ENV_MODE),	1846	const_iv (GL_TEXTURE_ENV_MODE),
1586	const_iv (GL_TEXTURE_WRAP_S),	1847	const_iv (GL_TEXTURE_WRAP_S),
1587	const_iv (GL_TEXTURE_WRAP_T),	1848	const_iv (GL_TEXTURE_WRAP_T),
		1849	const_iv (GL_REPEAT),
1588	const_iv (GL_CLAMP),	1850	const_iv (GL_CLAMP),
1589	const_iv (GL_REPEAT),	1851	const_iv (GL_CLAMP_TO_EDGE),
1590	const_iv (GL_NEAREST),	1852	const_iv (GL_NEAREST),
1591	const_iv (GL_LINEAR),	1853	const_iv (GL_LINEAR),
1592	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1854	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1593	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1855	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1594	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1856	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1605	const_iv (GL_SEPARABLE_2D),	1867	const_iv (GL_SEPARABLE_2D),
1606	const_iv (GL_CONVOLUTION_2D),	1868	const_iv (GL_CONVOLUTION_2D),
1607	const_iv (GL_CONVOLUTION_BORDER_MODE),	1869	const_iv (GL_CONVOLUTION_BORDER_MODE),
1608	const_iv (GL_CONSTANT_BORDER),	1870	const_iv (GL_CONSTANT_BORDER),
1609	const_iv (GL_LINES),	1871	const_iv (GL_LINES),
		1872	const_iv (GL_LINE_STRIP),
1610	const_iv (GL_LINE_LOOP),	1873	const_iv (GL_LINE_LOOP),
1611	const_iv (GL_QUADS),	1874	const_iv (GL_QUADS),
1612	const_iv (GL_QUAD_STRIP),	1875	const_iv (GL_QUAD_STRIP),
1613	const_iv (GL_TRIANGLES),	1876	const_iv (GL_TRIANGLES),
1614	const_iv (GL_TRIANGLE_STRIP),	1877	const_iv (GL_TRIANGLE_STRIP),
…		…
1624		1887
1625	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1888	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1626	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1889	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1627	}	1890	}
1628		1891
		1892	char *
		1893	gl_vendor ()
		1894	CODE:
		1895	RETVAL = (char *)glGetString (GL_VENDOR);
		1896	OUTPUT:
		1897	RETVAL
		1898
		1899	char *
		1900	gl_version ()
		1901	CODE:
		1902	RETVAL = (char *)glGetString (GL_VERSION);
		1903	OUTPUT:
		1904	RETVAL
		1905
		1906	char *
		1907	gl_extensions ()
		1908	CODE:
		1909	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1910	OUTPUT:
		1911	RETVAL
		1912
1629	int glGetError ()	1913	int glGetError ()
		1914
		1915	void glFinish ()
1630		1916
1631	void glClear (int mask)	1917	void glClear (int mask)
1632		1918
1633	void glClearColor (float r, float g, float b, float a = 1.0)	1919	void glClearColor (float r, float g, float b, float a = 1.0)
1634	PROTOTYPE: @	1920	PROTOTYPE: @
…		…
1641		1927
1642	void glHint (int target, int mode)	1928	void glHint (int target, int mode)
1643		1929
1644	void glBlendFunc (int sfactor, int dfactor)	1930	void glBlendFunc (int sfactor, int dfactor)
1645		1931
		1932	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1933	CODE:
		1934	gl_BlendFuncSeparate (sa, da, saa, daa);
		1935
1646	void glDepthMask (int flag)	1936	void glDepthMask (int flag)
1647		1937
1648	void glLogicOp (int opcode)	1938	void glLogicOp (int opcode)
1649		1939
1650	void glColorMask (int red, int green, int blue, int alpha)	1940	void glColorMask (int red, int green, int blue, int alpha)
…		…
1654	void glPushMatrix ()	1944	void glPushMatrix ()
1655		1945
1656	void glPopMatrix ()	1946	void glPopMatrix ()
1657		1947
1658	void glLoadIdentity ()	1948	void glLoadIdentity ()
		1949
		1950	void glDrawBuffer (int buffer)
		1951
		1952	void glReadBuffer (int buffer)
1659		1953
1660	# near_ and far_ are due to microsofts buggy "c" compiler	1954	# near_ and far_ are due to microsofts buggy "c" compiler
1661	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1955	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1662		1956
1663	# near_ and far_ are due to microsofts buggy "c" compiler	1957	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1683		1977
1684	void glEnd ()	1978	void glEnd ()
1685		1979
1686	void glColor (float r, float g, float b, float a = 1.0)	1980	void glColor (float r, float g, float b, float a = 1.0)
1687	PROTOTYPE: @	1981	PROTOTYPE: @
		1982	ALIAS:
		1983	glColor_premultiply = 1
1688	CODE:	1984	CODE:
		1985	if (ix)
		1986	{
		1987	r *= a;
		1988	g *= a;
		1989	b *= a;
		1990	}
1689	// microsoft visual "c" rounds instead of truncating...	1991	// microsoft visual "c" rounds instead of truncating...
1690	glColor4ub (MIN ((int)(r * 255.f), 255),	1992	glColor4f (r, g, b, a);
1691	MIN ((int)(g * 255.f), 255),
1692	MIN ((int)(b * 255.f), 255),
1693	MIN ((int)(a * 255.f), 255));
1694		1993
1695	void glInterleavedArrays (int format, int stride, char *data)	1994	void glInterleavedArrays (int format, int stride, char *data)
1696		1995
1697	void glDrawElements (int mode, int count, int type, char *indices)	1996	void glDrawElements (int mode, int count, int type, char *indices)
1698		1997
…		…
1721		2020
1722	void glBindTexture (int target, int name)	2021	void glBindTexture (int target, int name)
1723		2022
1724	void glConvolutionParameter (int target, int pname, float params)	2023	void glConvolutionParameter (int target, int pname, float params)
1725	CODE:	2024	CODE:
1726	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2025	if (gl.ConvolutionParameterf)
		2026	gl.ConvolutionParameterf (target, pname, params);
1727		2027
1728	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2028	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1729	CODE:	2029	CODE:
1730	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2030	if (gl.ConvolutionFilter2D)
1731	(target, internalformat, width, height, format, type, data));	2031	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1732		2032
1733	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2033	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1734	CODE:	2034	CODE:
1735	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2035	if (gl.SeparableFilter2D)
1736	(target, internalformat, width, height, format, type, row, column));	2036	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1737		2037
1738	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2038	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1739		2039
1740	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2040	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1741		2041
…		…
1774		2074
1775	void glEndList ()	2075	void glEndList ()
1776		2076
1777	void glCallList (int list)	2077	void glCallList (int list)
1778		2078
1779

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.96 by root, Wed May 24 22:28:43 2006 UTC vs. Revision 1.146 by root, Sat Aug 19 02:49:53 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.96 by root, Wed May 24 22:28:43 2006 UTC vs.
Revision 1.146 by root, Sat Aug 19 02:49:53 2006 UTC