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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.68 by root, Tue Apr 25 11:48:30 2006 UTC vs.
Revision 1.85 by root, Fri May 19 03:49:47 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2	# include <malloc.h>	3	# include <malloc.h>
		4	# include <windows.h>
		5	# pragma warning(disable:4244)
3	#endif	6	#endif
4		7
5	#include "EXTERN.h"	8	#include "EXTERN.h"
6	#include "perl.h"	9	#include "perl.h"
7	#include "XSUB.h"	10	#include "XSUB.h"
8		11
		12	#include <math.h>
9	#include <string.h>	13	#include <string.h>
10	#include <stdio.h>	14	#include <stdio.h>
11		15
12	#include <SDL.h>	16	#include <SDL.h>
		17	#include <SDL_endian.h>
13	#include <SDL_image.h>	18	#include <SDL_image.h>
14	#include <SDL_mixer.h>	19	#include <SDL_mixer.h>
15	#include <SDL_opengl.h>	20	#include <SDL_opengl.h>
16		21
17	#include <glib/gmacros.h>	22	#include <glib/gmacros.h>
18		23
19	#include <pango/pango.h>	24	#include <pango/pango.h>
20	#include <pango/pangofc-fontmap.h>	25	#include <pango/pangofc-fontmap.h>
21	#include <pango/pangoft2.h>	26	#include <pango/pangoft2.h>
		27	#include <pango/pangocairo.h>
22		28
23	#ifndef _WIN32	29	#ifndef _WIN32
24	# include <sys/types.h>	30	# include <sys/types.h>
25	# include <sys/socket.h>	31	# include <sys/socket.h>
26	# include <netinet/in.h>	32	# include <netinet/in.h>
63	typedef Mix_Music *CFClient__MixMusic;	69	typedef Mix_Music *CFClient__MixMusic;
64		70
65	typedef PangoFontDescription *CFClient__Font;	71	typedef PangoFontDescription *CFClient__Font;
66		72
67	typedef struct cf_layout {	73	typedef struct cf_layout {
68	PangoLayout *pl;	74	PangoLayout *pl; // either derived from a cairo or ft2 context
		75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
		76	float r, g, b, a; // default color for rgba mode
69	int base_height;	77	int base_height;
70	CFClient__Font font;	78	CFClient__Font font;
71	} *CFClient__Layout;	79	} *CFClient__Layout;
72		80
73	static CFClient__Font default_font;	81	static CFClient__Font default_font;
74	static PangoContext *context;	82	static PangoContext ft2_context, cairo_context;
75	static PangoFontMap *fontmap;	83	static PangoFontMap ft2_fontmap, cairo_fontmap;
76		84
77	static void	85	static void
78	substitute_func (FcPattern *pattern, gpointer data)	86	substitute_func (FcPattern *pattern, gpointer data)
79	{	87	{
80	FcPatternAddBool (pattern, FC_HINTING , 1);	88	FcPatternAddBool (pattern, FC_HINTING , 1);
		89	#ifdef _WIN32
		90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
		91	#else
81	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
		93	#endif
82	}	94	}
83		95
84	static void	96	static void
85	layout_update_font (CFClient__Layout self)	97	layout_update_font (CFClient__Layout self)
86	{	98	{
…		…
98	static void	110	static void
99	layout_get_pixel_size (CFClient__Layout self, int w, int h)	111	layout_get_pixel_size (CFClient__Layout self, int w, int h)
100	{	112	{
101	pango_layout_get_pixel_size (self->pl, w, h);	113	pango_layout_get_pixel_size (self->pl, w, h);
102		114
103	w = (w + 3) & ~3;
104	if (!w) w = 1;	115	if (!w) w = 1;
105	if (!h) h = 1;	116	if (!h) h = 1;
		117
		118	w = (w + 3) & ~3;
106	}	119	}
107		120
108	typedef uint16_t mapface;	121	typedef uint16_t mapface;
109		122
110	typedef struct {	123	typedef struct {
…		…
258	}	271	}
259	}	272	}
260	}	273	}
261		274
262	static void	275	static void
263	music_finished ()	276	music_finished (void)
264	{	277	{
265	SDL_UserEvent ev;	278	SDL_UserEvent ev;
266		279
267	ev.type = SDL_USEREVENT;	280	ev.type = SDL_USEREVENT;
268	ev.code = 0;	281	ev.code = 0;
269	ev.data1 = 0;	282	ev.data1 = 0;
		283	ev.data2 = 0;
		284
		285	SDL_PushEvent ((SDL_Event *)&ev);
		286	}
		287
		288	static void
		289	channel_finished (int channel)
		290	{
		291	SDL_UserEvent ev;
		292
		293	ev.type = SDL_USEREVENT;
		294	ev.code = 1;
		295	ev.data1 = (void *)(long)channel;
270	ev.data2 = 0;	296	ev.data2 = 0;
271		297
272	SDL_PushEvent ((SDL_Event *)&ev);	298	SDL_PushEvent ((SDL_Event *)&ev);
273	}	299	}
274		300
…		…
385	# undef const_iv	411	# undef const_iv
386	};	412	};
387		413
388	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
389	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		416	}
390		417
		418	void
		419	pango_init ()
		420	CODE:
		421	{
		422	// delayed, so it can pick up new fonts added by AddFontResourceEx
391	fontmap = pango_ft2_font_map_new ();	423	ft2_fontmap = pango_ft2_font_map_new ();
392	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);	424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
393	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);	425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
		426
		427	cairo_fontmap = pango_cairo_font_map_get_default ();
		428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
394	}	429	}
395		430
396	int	431	int
397	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
398		433
…		…
408	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	443	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
409	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
410	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
411	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
412		447
		448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		450
413	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
414	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
415	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
416	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
417		455
418	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
419	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
420	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
421		457
422	SDL_EnableUNICODE (1);	458	SDL_EnableUNICODE (1);
423	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
424		460
425	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	461	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
457		493
458	while (SDL_PollEvent (&ev))	494	while (SDL_PollEvent (&ev))
459	{	495	{
460	HV *hv = newHV ();	496	HV *hv = newHV ();
461	hv_store (hv, "type", 4, newSViv (ev.type), 0);	497	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		498
462	switch (ev.type)	499	switch (ev.type)
463	{	500	{
464	case SDL_KEYDOWN:	501	case SDL_KEYDOWN:
465	case SDL_KEYUP:	502	case SDL_KEYUP:
466	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	503	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
486	case SDL_MOUSEBUTTONUP:	523	case SDL_MOUSEBUTTONUP:
487	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	524	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
488	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	525	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
489	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	526	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
490	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	527	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		528	break;
		529
		530	case SDL_USEREVENT:
		531	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		532	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		533	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		534	break;
491	}	535	}
492		536
493	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	537	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
494	}	538	}
495	}	539	}
496		540
497	int	541	int
498	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	542	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
499	POSTCALL:	543	POSTCALL:
500	Mix_HookMusicFinished (music_finished);	544	Mix_HookMusicFinished (music_finished);
		545	Mix_ChannelFinished (channel_finished);
501		546
502	void	547	void
503	Mix_CloseAudio ()	548	Mix_CloseAudio ()
504		549
505	int	550	int
…		…
528		573
529	void	574	void
530	add_font (char *file)	575	add_font (char *file)
531	CODE:	576	CODE:
532	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	577	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
		578	#ifdef _WIN32
		579	// cairo... sigh... requires win2000
		580	AddFontResourceEx (file, FR_PRIVATE, 0);
		581	#endif
533		582
534	void	583	void
535	load_image_inline (SV *image_)	584	load_image_inline (SV *image_)
536	ALIAS:	585	ALIAS:
537	load_image_file = 1	586	load_image_file = 1
…		…
640	exit (1);	689	exit (1);
641		690
642	MODULE = CFClient PACKAGE = CFClient::Font	691	MODULE = CFClient PACKAGE = CFClient::Font
643		692
644	CFClient::Font	693	CFClient::Font
645	new_from_file (SV class, char path)	694	new_from_file (SV class, char path, int id = 0)
646	CODE:	695	CODE:
647	{	696	{
648	int count;	697	int count;
649	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, 0, 0, &count);	698	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
650	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	699	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
651	FcPatternDestroy (pattern);	700	FcPatternDestroy (pattern);
652	}	701	}
653	OUTPUT:	702	OUTPUT:
654	RETVAL	703	RETVAL
…		…
664	default_font = self;	713	default_font = self;
665		714
666	MODULE = CFClient PACKAGE = CFClient::Layout	715	MODULE = CFClient PACKAGE = CFClient::Layout
667		716
668	CFClient::Layout	717	CFClient::Layout
669	new (SV *class, int base_height = MIN_FONT_HEIGHT)	718	new (SV *class, int rgba = 0)
670	CODE:	719	CODE:
671	New (0, RETVAL, 1, struct cf_layout);	720	New (0, RETVAL, 1, struct cf_layout);
672	RETVAL->pl = pango_layout_new (context);	721
673	RETVAL->base_height = base_height;	722	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
		723	RETVAL->rgba = rgba;
		724	RETVAL->r = 1.;
		725	RETVAL->g = 1.;
		726	RETVAL->b = 1.;
		727	RETVAL->a = 1.;
		728	RETVAL->base_height = MIN_FONT_HEIGHT;
674	RETVAL->font = 0;	729	RETVAL->font = 0;
		730
675	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	731	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
676	pango_layout_set_font_description (RETVAL->pl, default_font);	732	layout_update_font (RETVAL);
677	OUTPUT:	733	OUTPUT:
678	RETVAL	734	RETVAL
679		735
680	void	736	void
681	DESTROY (CFClient::Layout self)	737	DESTROY (CFClient::Layout self)
682	CODE:	738	CODE:
683	g_object_unref (self->pl);	739	g_object_unref (self->pl);
684	Safefree (self);	740	Safefree (self);
685		741
		742	int
		743	is_rgba (CFClient::Layout self)
		744	CODE:
		745	RETVAL = self->rgba;
		746	OUTPUT:
		747	RETVAL
		748
686	void	749	void
687	set_text (CFClient::Layout self, SV *text_)	750	set_text (CFClient::Layout self, SV *text_)
688	CODE:	751	CODE:
689	{	752	{
690	STRLEN textlen;	753	STRLEN textlen;
…		…
708	CODE:	771	CODE:
709	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	772	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
710	SvUTF8_on (RETVAL);	773	SvUTF8_on (RETVAL);
711	OUTPUT:	774	OUTPUT:
712	RETVAL	775	RETVAL
		776
		777	void
		778	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
		779	CODE:
		780	self->r = r;
		781	self->g = g;
		782	self->b = b;
		783	self->a = a;
713		784
714	void	785	void
715	set_font (CFClient::Layout self, CFClient::Font font = 0)	786	set_font (CFClient::Layout self, CFClient::Font font = 0)
716	CODE:	787	CODE:
717	if (self->font != font)	788	if (self->font != font)
…		…
733	set_width (CFClient::Layout self, int max_width = -1)	804	set_width (CFClient::Layout self, int max_width = -1)
734	CODE:	805	CODE:
735	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	806	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
736		807
737	void	808	void
		809	set_indent (CFClient::Layout self, int indent)
		810	CODE:
		811	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		812
		813	void
		814	set_spacing (CFClient::Layout self, int spacing)
		815	CODE:
		816	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		817
		818	void
		819	set_ellipsise (CFClient::Layout self, int ellipsise)
		820	CODE:
		821	pango_layout_set_ellipsize (self->pl,
		822	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		823	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		824	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		825	: PANGO_ELLIPSIZE_NONE
		826	);
		827
		828	void
		829	set_single_paragraph_mode (CFClient::Layout self, int spm)
		830	CODE:
		831	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		832
		833	void
738	size (CFClient::Layout self)	834	size (CFClient::Layout self)
739	PPCODE:	835	PPCODE:
740	{	836	{
741	int w, h;	837	int w, h;
742		838
…		…
775	render (CFClient::Layout self)	871	render (CFClient::Layout self)
776	PPCODE:	872	PPCODE:
777	{	873	{
778	SV *retval;	874	SV *retval;
779	int w, h;	875	int w, h;
780	FT_Bitmap bitmap;
781		876
782	layout_get_pixel_size (self, &w, &h);	877	layout_get_pixel_size (self, &w, &h);
783		878
		879	if (self->rgba)
		880	{
		881	cairo_surface_t *surface;
		882	cairo_t *cairo;
		883
		884	retval = newSV (w * h * 4);
		885	SvPOK_only (retval);
		886	SvCUR_set (retval, w * h * 4);
		887
		888	memset (SvPVX (retval), 0, w * h * 4);
		889
		890	surface = cairo_image_surface_create_for_data (
		891	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		892	cairo = cairo_create (surface);
		893	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		894
		895	pango_cairo_show_layout (cairo, self->pl);
		896
		897	cairo_destroy (cairo);
		898	cairo_surface_destroy (surface);
		899
		900	// what a mess, and its premultiplied, too :(
		901	{
		902	uint32_t p = (uint32_t )SvPVX (retval);
		903	uint32_t e = p + w h;
		904
		905	while (p < e)
		906	{
		907	uint32_t rgba = *p;
		908	rgba = (rgba >> 24) \| (rgba << 8);
		909	rgba = SDL_SwapBE32 (rgba);
		910	*p++ = rgba;
		911	}
		912	}
		913
		914	EXTEND (SP, 5);
		915	PUSHs (sv_2mortal (newSViv (w)));
		916	PUSHs (sv_2mortal (newSViv (h)));
		917	PUSHs (sv_2mortal (retval));
		918	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		919	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		920	}
		921	else
		922	{
		923	FT_Bitmap bitmap;
		924
784	retval = newSV (w * h);	925	retval = newSV (w * h);
785	SvPOK_only (retval);	926	SvPOK_only (retval);
786	SvCUR_set (retval, w * h);	927	SvCUR_set (retval, w * h);
787		928
788	bitmap.rows = h;	929	bitmap.rows = h;
789	bitmap.width = w;	930	bitmap.width = w;
790	bitmap.pitch = w;	931	bitmap.pitch = w;
791	bitmap.buffer = (unsigned char*)SvPVX (retval);	932	bitmap.buffer = (unsigned char*)SvPVX (retval);
792	bitmap.num_grays = 256;	933	bitmap.num_grays = 256;
793	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	934	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
794		935
795	memset (bitmap.buffer, 0, w * h);	936	memset (bitmap.buffer, 0, w * h);
796		937
797	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	938	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
798		939
799	EXTEND (SP, 3);	940	EXTEND (SP, 5);
800	PUSHs (sv_2mortal (newSViv (w)));	941	PUSHs (sv_2mortal (newSViv (w)));
801	PUSHs (sv_2mortal (newSViv (h)));	942	PUSHs (sv_2mortal (newSViv (h)));
802	PUSHs (sv_2mortal (retval));	943	PUSHs (sv_2mortal (retval));
		944	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		945	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		946	}
803	}	947	}
804		948
805	MODULE = CFClient PACKAGE = CFClient::Texture	949	MODULE = CFClient PACKAGE = CFClient::Texture
806		950
807	void	951	void
808	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	952	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
809	PROTOTYPE: $$$;$$	953	PROTOTYPE: $$$;$$
		954	ALIAS:
		955	draw_quad_alpha = 1
		956	draw_quad_alpha_premultiplied = 2
810	CODE:	957	CODE:
811	{	958	{
812	HV hv = (HV )SvRV (self);	959	HV hv = (HV )SvRV (self);
813	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	960	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
814	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	961	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
819	{	966	{
820	w = SvNV (*hv_fetch (hv, "w", 1, 1));	967	w = SvNV (*hv_fetch (hv, "w", 1, 1));
821	h = SvNV (*hv_fetch (hv, "h", 1, 1));	968	h = SvNV (*hv_fetch (hv, "h", 1, 1));
822	}	969	}
823		970
		971	if (ix)
		972	{
		973	glEnable (GL_BLEND);
		974	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		975	}
		976
824	glBindTexture (GL_TEXTURE_2D, name);	977	glBindTexture (GL_TEXTURE_2D, name);
		978
825	if (wrap_mode) {	979	if (wrap_mode)
		980	{
826	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	981	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
827	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	982	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
828	}	983	}
		984
829	glBegin (GL_QUADS);	985	glBegin (GL_QUADS);
830	glTexCoord2f (0, 0); glVertex2f (x , y );	986	glTexCoord2f (0, 0); glVertex2f (x , y );
831	glTexCoord2f (0, t); glVertex2f (x , y + h);	987	glTexCoord2f (0, t); glVertex2f (x , y + h);
832	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	988	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
833	glTexCoord2f (s, 0); glVertex2f (x + w, y );	989	glTexCoord2f (s, 0); glVertex2f (x + w, y );
834	glEnd ();	990	glEnd ();
		991
		992	if (ix)
		993	glDisable (GL_BLEND);
835	}	994	}
836		995
837	MODULE = CFClient PACKAGE = CFClient::Map	996	MODULE = CFClient PACKAGE = CFClient::Map
838		997
839	CFClient::Map	998	CFClient::Map
…		…
1348	} *civ, const_iv[] = {	1507	} *civ, const_iv[] = {
1349	# define const_iv(name) { # name, (IV)name }	1508	# define const_iv(name) { # name, (IV)name }
1350	const_iv (GL_COLOR_MATERIAL),	1509	const_iv (GL_COLOR_MATERIAL),
1351	const_iv (GL_SMOOTH),	1510	const_iv (GL_SMOOTH),
1352	const_iv (GL_FLAT),	1511	const_iv (GL_FLAT),
		1512	const_iv (GL_DITHER),
1353	const_iv (GL_BLEND),	1513	const_iv (GL_BLEND),
		1514	const_iv (GL_SCISSOR_TEST),
1354	const_iv (GL_AND),	1515	const_iv (GL_AND),
1355	const_iv (GL_ONE),	1516	const_iv (GL_ONE),
1356	const_iv (GL_ZERO),	1517	const_iv (GL_ZERO),
1357	const_iv (GL_SRC_ALPHA),	1518	const_iv (GL_SRC_ALPHA),
1358	const_iv (GL_SRC_ALPHA_SATURATE),	1519	const_iv (GL_SRC_ALPHA_SATURATE),
…		…
1360	const_iv (GL_ONE_MINUS_DST_ALPHA),	1521	const_iv (GL_ONE_MINUS_DST_ALPHA),
1361	const_iv (GL_RGB),	1522	const_iv (GL_RGB),
1362	const_iv (GL_RGBA),	1523	const_iv (GL_RGBA),
1363	const_iv (GL_UNSIGNED_BYTE),	1524	const_iv (GL_UNSIGNED_BYTE),
1364	const_iv (GL_ALPHA),	1525	const_iv (GL_ALPHA),
		1526	const_iv (GL_LUMINANCE),
1365	const_iv (GL_FLOAT),	1527	const_iv (GL_FLOAT),
1366	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1528	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1367	const_iv (GL_COMPILE),	1529	const_iv (GL_COMPILE),
1368	const_iv (GL_TEXTURE_1D),	1530	const_iv (GL_TEXTURE_1D),
1369	const_iv (GL_TEXTURE_2D),	1531	const_iv (GL_TEXTURE_2D),
…		…
1381	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1543	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1382	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1544	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1383	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1545	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1384	const_iv (GL_GENERATE_MIPMAP),	1546	const_iv (GL_GENERATE_MIPMAP),
1385	const_iv (GL_MODULATE),	1547	const_iv (GL_MODULATE),
		1548	const_iv (GL_DECAL),
1386	const_iv (GL_REPLACE),	1549	const_iv (GL_REPLACE),
1387	const_iv (GL_COLOR_BUFFER_BIT),	1550	const_iv (GL_COLOR_BUFFER_BIT),
1388	const_iv (GL_PROJECTION),	1551	const_iv (GL_PROJECTION),
1389	const_iv (GL_MODELVIEW),	1552	const_iv (GL_MODELVIEW),
1390	const_iv (GL_COLOR_LOGIC_OP),	1553	const_iv (GL_COLOR_LOGIC_OP),
		1554	const_iv (GL_SEPARABLE_2D),
1391	const_iv (GL_CONVOLUTION_2D),	1555	const_iv (GL_CONVOLUTION_2D),
1392	const_iv (GL_CONVOLUTION_BORDER_MODE),	1556	const_iv (GL_CONVOLUTION_BORDER_MODE),
1393	const_iv (GL_CONSTANT_BORDER),	1557	const_iv (GL_CONSTANT_BORDER),
1394	const_iv (GL_LINES),	1558	const_iv (GL_LINES),
1395	const_iv (GL_QUADS),	1559	const_iv (GL_QUADS),
…		…
1435	# near and far are due to microsofts buggy c compiler	1599	# near and far are due to microsofts buggy c compiler
1436	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1600	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1437		1601
1438	void glViewport (int x, int y, int width, int height)	1602	void glViewport (int x, int y, int width, int height)
1439		1603
		1604	void glScissor (int x, int y, int width, int height)
		1605
1440	void glTranslate (float x, float y, float z = 0.)	1606	void glTranslate (float x, float y, float z = 0.)
1441	CODE:	1607	CODE:
1442	glTranslatef (x, y, z);	1608	glTranslatef (x, y, z);
1443		1609
1444	void glScale (float x, float y, float z = 1.)	1610	void glScale (float x, float y, float z = 1.)
…		…
1454	void glEnd ()	1620	void glEnd ()
1455		1621
1456	void glColor (float r, float g, float b, float a = 1.0)	1622	void glColor (float r, float g, float b, float a = 1.0)
1457	PROTOTYPE: @	1623	PROTOTYPE: @
1458	CODE:	1624	CODE:
1459	glColor4f (r, g, b, a);	1625	glColor4ub (MIN ((int)(r * 255.f), 255),
		1626	MIN ((int)(g * 255.f), 255),
		1627	MIN ((int)(b * 255.f), 255),
		1628	MIN ((int)(a * 255.f), 255));
1460		1629
1461	void glVertex (float x, float y, float z = 0.)	1630	void glVertex (float x, float y, float z = 0.)
1462	CODE:	1631	CODE:
1463	glVertex3f (x, y, z);	1632	glVertex3f (x, y, z);
1464		1633
…		…
1483	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1652	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1484	CODE:	1653	CODE:
1485	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1654	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1486	(target, internalformat, width, height, format, type, data));	1655	(target, internalformat, width, height, format, type, data));
1487		1656
		1657	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		1658	CODE:
		1659	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
		1660	(target, internalformat, width, height, format, type, row, column));
		1661
1488	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1662	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1489		1663
1490	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1664	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1491		1665
1492	void glRasterPos (int x, int y)	1666	void glRasterPos (int x, int y)

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.68 by root, Tue Apr 25 11:48:30 2006 UTC vs. Revision 1.85 by root, Fri May 19 03:49:47 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.68 by root, Tue Apr 25 11:48:30 2006 UTC vs.
Revision 1.85 by root, Fri May 19 03:49:47 2006 UTC