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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.75 by root, Mon May 8 18:28:40 2006 UTC vs.
Revision 1.92 by elmex, Tue May 23 17:30:18 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>
3	# pragma warning(disable:4244)	5	# pragma warning(disable:4244)
4	#endif	6	#endif
5		7
6	#include "EXTERN.h"	8	#include "EXTERN.h"
7	#include "perl.h"	9	#include "perl.h"
8	#include "XSUB.h"	10	#include "XSUB.h"
9		11
		12	#include <math.h>
10	#include <string.h>	13	#include <string.h>
11	#include <stdio.h>	14	#include <stdio.h>
12		15
13	#include <SDL.h>	16	#include <SDL.h>
		17	#include <SDL_endian.h>
14	#include <SDL_image.h>	18	#include <SDL_image.h>
15	#include <SDL_mixer.h>	19	#include <SDL_mixer.h>
16	#include <SDL_opengl.h>	20	#include <SDL_opengl.h>
17		21
18	#include <glib/gmacros.h>	22	#include <glib/gmacros.h>
19		23
20	#include <pango/pango.h>	24	#include <pango/pango.h>
21	#include <pango/pangofc-fontmap.h>	25	#include <pango/pangofc-fontmap.h>
22	#include <pango/pangoft2.h>	26	#include <pango/pangoft2.h>
		27	#include <pango/pangocairo.h>
23		28
24	#ifndef _WIN32	29	#ifndef _WIN32
25	# include <sys/types.h>	30	# include <sys/types.h>
26	# include <sys/socket.h>	31	# include <sys/socket.h>
27	# include <netinet/in.h>	32	# include <netinet/in.h>
64	typedef Mix_Music *CFClient__MixMusic;	69	typedef Mix_Music *CFClient__MixMusic;
65		70
66	typedef PangoFontDescription *CFClient__Font;	71	typedef PangoFontDescription *CFClient__Font;
67		72
68	typedef struct cf_layout {	73	typedef struct cf_layout {
69	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
70	int base_height;	77	int base_height;
71	CFClient__Font font;	78	CFClient__Font font;
72	} *CFClient__Layout;	79	} *CFClient__Layout;
73		80
74	static CFClient__Font default_font;	81	static CFClient__Font default_font;
75	static PangoContext *context;	82	static PangoContext ft2_context, cairo_context;
76	static PangoFontMap *fontmap;	83	static PangoFontMap ft2_fontmap, cairo_fontmap;
77		84
78	static void	85	static void
79	substitute_func (FcPattern *pattern, gpointer data)	86	substitute_func (FcPattern *pattern, gpointer data)
80	{	87	{
81	FcPatternAddBool (pattern, FC_HINTING , 1);	88	FcPatternAddBool (pattern, FC_HINTING , 1);
		89	#ifdef _WIN32
		90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
		91	#else
82	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
		93	#endif
83	}	94	}
84		95
85	static void	96	static void
86	layout_update_font (CFClient__Layout self)	97	layout_update_font (CFClient__Layout self)
87	{	98	{
…		…
99	static void	110	static void
100	layout_get_pixel_size (CFClient__Layout self, int w, int h)	111	layout_get_pixel_size (CFClient__Layout self, int w, int h)
101	{	112	{
102	pango_layout_get_pixel_size (self->pl, w, h);	113	pango_layout_get_pixel_size (self->pl, w, h);
103		114
104	w = (w + 3) & ~3;
105	if (!w) w = 1;	115	if (!w) w = 1;
106	if (!h) h = 1;	116	if (!h) h = 1;
		117
		118	w = (w + 3) & ~3;
107	}	119	}
108		120
109	typedef uint16_t mapface;	121	typedef uint16_t mapface;
110		122
111	typedef struct {	123	typedef struct {
…		…
399	# undef const_iv	411	# undef const_iv
400	};	412	};
401		413
402	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; )
403	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		416	}
404		417
		418	void
		419	pango_init ()
		420	CODE:
		421	{
		422	// delayed, so it can pick up new fonts added by AddFontResourceEx
405	fontmap = pango_ft2_font_map_new ();	423	ft2_fontmap = pango_ft2_font_map_new ();
406	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);
407	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);
408	}	429	}
409		430
410	int	431	int
411	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
412		433
…		…
422	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	443	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
423	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
424	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
425	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
426		447
		448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
		450
427	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
428	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
429	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
430	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
431		455
432	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
433	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
434	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
435		457
436	SDL_EnableUNICODE (1);	458	SDL_EnableUNICODE (1);
437	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
438		460
439	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	461	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
447	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	469	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
448		470
449	++m;	471	++m;
450	}	472	}
451	}	473	}
		474
		475	char *
		476	SDL_GetError ()
452		477
453	int	478	int
454	SDL_SetVideoMode (int w, int h, int fullscreen)	479	SDL_SetVideoMode (int w, int h, int fullscreen)
455	CODE:	480	CODE:
456	RETVAL = !!SDL_SetVideoMode (	481	RETVAL = !!SDL_SetVideoMode (
…		…
534	#ifndef _WIN32	559	#ifndef _WIN32
535	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	560	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
536	#endif	561	#endif
537		562
538	char *	563	char *
		564	gl_vendor ()
		565	CODE:
		566	RETVAL = (char *)glGetString (GL_VENDOR);
		567	OUTPUT:
		568	RETVAL
		569
		570	char *
539	gl_version ()	571	gl_version ()
540	CODE:	572	CODE:
541	RETVAL = (char *)glGetString (GL_VERSION);	573	RETVAL = (char *)glGetString (GL_VERSION);
542	OUTPUT:	574	OUTPUT:
543	RETVAL	575	RETVAL
…		…
551		583
552	void	584	void
553	add_font (char *file)	585	add_font (char *file)
554	CODE:	586	CODE:
555	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	587	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
		588	#ifdef _WIN32
		589	// cairo... sigh... requires win2000
		590	AddFontResourceEx (file, FR_PRIVATE, 0);
		591	#endif
556		592
557	void	593	void
558	load_image_inline (SV *image_)	594	load_image_inline (SV *image_)
559	ALIAS:	595	ALIAS:
560	load_image_file = 1	596	load_image_file = 1
…		…
644	}	680	}
645		681
646	void	682	void
647	error (char *message)	683	error (char *message)
648	CODE:	684	CODE:
		685	fprintf (stderr, "ERROR: %s\n", message);
649	#ifdef _WIN32	686	#ifdef _WIN32
650	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	687	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
651	#else
652	fprintf (stderr, "ERROR: %s\n", message);
653	#endif	688	#endif
654		689
655	void	690	void
656	fatal (char *message)	691	fatal (char *message)
657	CODE:	692	CODE:
		693	fprintf (stderr, "FATAL: %s\n", message);
658	#ifdef _WIN32	694	#ifdef _WIN32
659	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	695	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
660	#else
661	fprintf (stderr, "FATAL: %s\n", message);
662	#endif	696	#endif
663	exit (1);	697	exit (1);
664		698
665	MODULE = CFClient PACKAGE = CFClient::Font	699	MODULE = CFClient PACKAGE = CFClient::Font
666		700
…		…
687	default_font = self;	721	default_font = self;
688		722
689	MODULE = CFClient PACKAGE = CFClient::Layout	723	MODULE = CFClient PACKAGE = CFClient::Layout
690		724
691	CFClient::Layout	725	CFClient::Layout
692	new (SV *class, int base_height = MIN_FONT_HEIGHT)	726	new (SV *class, int rgba = 0)
693	CODE:	727	CODE:
		728	#if _WIN32
		729	rgba = 0;//D
		730	#endif
694	New (0, RETVAL, 1, struct cf_layout);	731	New (0, RETVAL, 1, struct cf_layout);
695	RETVAL->pl = pango_layout_new (context);	732
696	RETVAL->base_height = base_height;	733	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
		734	RETVAL->rgba = rgba;
		735	RETVAL->r = 1.;
		736	RETVAL->g = 1.;
		737	RETVAL->b = 1.;
		738	RETVAL->a = 1.;
		739	RETVAL->base_height = MIN_FONT_HEIGHT;
697	RETVAL->font = 0;	740	RETVAL->font = 0;
		741
698	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	742	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
699	pango_layout_set_font_description (RETVAL->pl, default_font);	743	layout_update_font (RETVAL);
700	OUTPUT:	744	OUTPUT:
701	RETVAL	745	RETVAL
702		746
703	void	747	void
704	DESTROY (CFClient::Layout self)	748	DESTROY (CFClient::Layout self)
705	CODE:	749	CODE:
706	g_object_unref (self->pl);	750	g_object_unref (self->pl);
707	Safefree (self);	751	Safefree (self);
708		752
		753	int
		754	is_rgba (CFClient::Layout self)
		755	CODE:
		756	RETVAL = self->rgba;
		757	OUTPUT:
		758	RETVAL
		759
709	void	760	void
710	set_text (CFClient::Layout self, SV *text_)	761	set_text (CFClient::Layout self, SV *text_)
711	CODE:	762	CODE:
712	{	763	{
713	STRLEN textlen;	764	STRLEN textlen;
…		…
731	CODE:	782	CODE:
732	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	783	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
733	SvUTF8_on (RETVAL);	784	SvUTF8_on (RETVAL);
734	OUTPUT:	785	OUTPUT:
735	RETVAL	786	RETVAL
		787
		788	void
		789	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
		790	CODE:
		791	self->r = r;
		792	self->g = g;
		793	self->b = b;
		794	self->a = a;
736		795
737	void	796	void
738	set_font (CFClient::Layout self, CFClient::Font font = 0)	797	set_font (CFClient::Layout self, CFClient::Font font = 0)
739	CODE:	798	CODE:
740	if (self->font != font)	799	if (self->font != font)
…		…
756	set_width (CFClient::Layout self, int max_width = -1)	815	set_width (CFClient::Layout self, int max_width = -1)
757	CODE:	816	CODE:
758	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	817	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
759		818
760	void	819	void
		820	set_indent (CFClient::Layout self, int indent)
		821	CODE:
		822	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		823
		824	void
		825	set_spacing (CFClient::Layout self, int spacing)
		826	CODE:
		827	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		828
		829	void
		830	set_ellipsise (CFClient::Layout self, int ellipsise)
		831	CODE:
		832	pango_layout_set_ellipsize (self->pl,
		833	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		834	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		835	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		836	: PANGO_ELLIPSIZE_NONE
		837	);
		838
		839	void
		840	set_single_paragraph_mode (CFClient::Layout self, int spm)
		841	CODE:
		842	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		843
		844	void
761	size (CFClient::Layout self)	845	size (CFClient::Layout self)
762	PPCODE:	846	PPCODE:
763	{	847	{
764	int w, h;	848	int w, h;
765		849
…		…
798	render (CFClient::Layout self)	882	render (CFClient::Layout self)
799	PPCODE:	883	PPCODE:
800	{	884	{
801	SV *retval;	885	SV *retval;
802	int w, h;	886	int w, h;
803	FT_Bitmap bitmap;
804		887
805	layout_get_pixel_size (self, &w, &h);	888	layout_get_pixel_size (self, &w, &h);
806		889
		890	if (self->rgba)
		891	{
		892	cairo_surface_t *surface;
		893	cairo_t *cairo;
		894
		895	retval = newSV (w * h * 4);
		896	SvPOK_only (retval);
		897	SvCUR_set (retval, w * h * 4);
		898
		899	memset (SvPVX (retval), 0, w * h * 4);
		900
		901	surface = cairo_image_surface_create_for_data (
		902	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		903	cairo = cairo_create (surface);
		904	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		905
		906	pango_cairo_show_layout (cairo, self->pl);
		907
		908	cairo_destroy (cairo);
		909	cairo_surface_destroy (surface);
		910
		911	// what a mess, and its premultiplied, too :(
		912	{
		913	uint32_t p = (uint32_t )SvPVX (retval);
		914	uint32_t e = p + w h;
		915
		916	while (p < e)
		917	{
		918	uint32_t rgba = *p;
		919	rgba = (rgba >> 24) \| (rgba << 8);
		920	#if 0
		921	#ifdef _WIN32
		922	{//D
		923	uint8_t r = rgba >> 24;
		924	uint8_t g = rgba >> 16;
		925	uint8_t b = rgba >> 8;
		926	uint8_t a = rgba >> 0;
		927
		928	rgba = (rgba & 0xffffff00) \| a;
		929	}
		930	#endif
		931	#endif
		932	rgba = SDL_SwapBE32 (rgba);
		933	*p++ = rgba;
		934	}
		935	}
		936
		937	EXTEND (SP, 5);
		938	PUSHs (sv_2mortal (newSViv (w)));
		939	PUSHs (sv_2mortal (newSViv (h)));
		940	PUSHs (sv_2mortal (retval));
		941	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		942	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		943	}
		944	else
		945	{
		946	FT_Bitmap bitmap;
		947
807	retval = newSV (w * h);	948	retval = newSV (w * h);
808	SvPOK_only (retval);	949	SvPOK_only (retval);
809	SvCUR_set (retval, w * h);	950	SvCUR_set (retval, w * h);
810		951
811	bitmap.rows = h;	952	bitmap.rows = h;
812	bitmap.width = w;	953	bitmap.width = w;
813	bitmap.pitch = w;	954	bitmap.pitch = w;
814	bitmap.buffer = (unsigned char*)SvPVX (retval);	955	bitmap.buffer = (unsigned char*)SvPVX (retval);
815	bitmap.num_grays = 256;	956	bitmap.num_grays = 256;
816	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	957	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
817		958
818	memset (bitmap.buffer, 0, w * h);	959	memset (bitmap.buffer, 0, w * h);
819		960
820	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	961	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
821		962
822	EXTEND (SP, 3);	963	EXTEND (SP, 5);
823	PUSHs (sv_2mortal (newSViv (w)));	964	PUSHs (sv_2mortal (newSViv (w)));
824	PUSHs (sv_2mortal (newSViv (h)));	965	PUSHs (sv_2mortal (newSViv (h)));
825	PUSHs (sv_2mortal (retval));	966	PUSHs (sv_2mortal (retval));
		967	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		968	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		969	}
826	}	970	}
827		971
828	MODULE = CFClient PACKAGE = CFClient::Texture	972	MODULE = CFClient PACKAGE = CFClient::Texture
829		973
830	void	974	void
831	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	975	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
832	PROTOTYPE: $$$;$$	976	PROTOTYPE: $$$;$$
		977	ALIAS:
		978	draw_quad_alpha = 1
		979	draw_quad_alpha_premultiplied = 2
833	CODE:	980	CODE:
834	{	981	{
835	HV hv = (HV )SvRV (self);	982	HV hv = (HV )SvRV (self);
836	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	983	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
837	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	984	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
842	{	989	{
843	w = SvNV (*hv_fetch (hv, "w", 1, 1));	990	w = SvNV (*hv_fetch (hv, "w", 1, 1));
844	h = SvNV (*hv_fetch (hv, "h", 1, 1));	991	h = SvNV (*hv_fetch (hv, "h", 1, 1));
845	}	992	}
846		993
		994	if (ix)
		995	{
		996	glEnable (GL_BLEND);
		997	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		998	glEnable (GL_ALPHA_TEST);
		999	glAlphaFunc (GL_GREATER, 0.01f);
		1000	}
		1001
847	glBindTexture (GL_TEXTURE_2D, name);	1002	glBindTexture (GL_TEXTURE_2D, name);
		1003
848	if (wrap_mode) {	1004	if (wrap_mode)
		1005	{
849	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	1006	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
850	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	1007	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
851	}	1008	}
		1009
852	glBegin (GL_QUADS);	1010	glBegin (GL_QUADS);
853	glTexCoord2f (0, 0); glVertex2f (x , y );	1011	glTexCoord2f (0, 0); glVertex2f (x , y );
854	glTexCoord2f (0, t); glVertex2f (x , y + h);	1012	glTexCoord2f (0, t); glVertex2f (x , y + h);
855	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1013	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
856	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1014	glTexCoord2f (s, 0); glVertex2f (x + w, y );
857	glEnd ();	1015	glEnd ();
		1016
		1017	if (ix)
		1018	{
		1019	glDisable (GL_ALPHA_TEST);
		1020	glDisable (GL_BLEND);
		1021	}
858	}	1022	}
859		1023
860	MODULE = CFClient PACKAGE = CFClient::Map	1024	MODULE = CFClient PACKAGE = CFClient::Map
861		1025
862	CFClient::Map	1026	CFClient::Map
…		…
1373	const_iv (GL_COLOR_MATERIAL),	1537	const_iv (GL_COLOR_MATERIAL),
1374	const_iv (GL_SMOOTH),	1538	const_iv (GL_SMOOTH),
1375	const_iv (GL_FLAT),	1539	const_iv (GL_FLAT),
1376	const_iv (GL_DITHER),	1540	const_iv (GL_DITHER),
1377	const_iv (GL_BLEND),	1541	const_iv (GL_BLEND),
		1542	const_iv (GL_CULL_FACE),
1378	const_iv (GL_SCISSOR_TEST),	1543	const_iv (GL_SCISSOR_TEST),
		1544	const_iv (GL_DEPTH_TEST),
		1545	const_iv (GL_ALPHA_TEST),
		1546	const_iv (GL_NORMALIZE),
		1547	const_iv (GL_RESCALE_NORMAL),
1379	const_iv (GL_AND),	1548	const_iv (GL_AND),
1380	const_iv (GL_ONE),	1549	const_iv (GL_ONE),
1381	const_iv (GL_ZERO),	1550	const_iv (GL_ZERO),
1382	const_iv (GL_SRC_ALPHA),	1551	const_iv (GL_SRC_ALPHA),
1383	const_iv (GL_SRC_ALPHA_SATURATE),	1552	const_iv (GL_SRC_ALPHA_SATURATE),
1384	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1553	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1385	const_iv (GL_ONE_MINUS_DST_ALPHA),	1554	const_iv (GL_ONE_MINUS_DST_ALPHA),
1386	const_iv (GL_RGB),	1555	const_iv (GL_RGB),
1387	const_iv (GL_RGBA),	1556	const_iv (GL_RGBA),
1388	const_iv (GL_UNSIGNED_BYTE),	1557	const_iv (GL_UNSIGNED_BYTE),
		1558	const_iv (GL_UNSIGNED_SHORT),
		1559	const_iv (GL_UNSIGNED_INT),
1389	const_iv (GL_ALPHA),	1560	const_iv (GL_ALPHA),
		1561	const_iv (GL_INTENSITY),
		1562	const_iv (GL_LUMINANCE),
		1563	const_iv (GL_LUMINANCE_ALPHA),
1390	const_iv (GL_FLOAT),	1564	const_iv (GL_FLOAT),
1391	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1565	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1392	const_iv (GL_COMPILE),	1566	const_iv (GL_COMPILE),
1393	const_iv (GL_TEXTURE_1D),	1567	const_iv (GL_TEXTURE_1D),
1394	const_iv (GL_TEXTURE_2D),	1568	const_iv (GL_TEXTURE_2D),
…		…
1408	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1582	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1409	const_iv (GL_GENERATE_MIPMAP),	1583	const_iv (GL_GENERATE_MIPMAP),
1410	const_iv (GL_MODULATE),	1584	const_iv (GL_MODULATE),
1411	const_iv (GL_DECAL),	1585	const_iv (GL_DECAL),
1412	const_iv (GL_REPLACE),	1586	const_iv (GL_REPLACE),
		1587	const_iv (GL_DEPTH_BUFFER_BIT),
1413	const_iv (GL_COLOR_BUFFER_BIT),	1588	const_iv (GL_COLOR_BUFFER_BIT),
1414	const_iv (GL_PROJECTION),	1589	const_iv (GL_PROJECTION),
1415	const_iv (GL_MODELVIEW),	1590	const_iv (GL_MODELVIEW),
1416	const_iv (GL_COLOR_LOGIC_OP),	1591	const_iv (GL_COLOR_LOGIC_OP),
1417	const_iv (GL_SEPARABLE_2D),	1592	const_iv (GL_SEPARABLE_2D),
1418	const_iv (GL_CONVOLUTION_2D),	1593	const_iv (GL_CONVOLUTION_2D),
1419	const_iv (GL_CONVOLUTION_BORDER_MODE),	1594	const_iv (GL_CONVOLUTION_BORDER_MODE),
1420	const_iv (GL_CONSTANT_BORDER),	1595	const_iv (GL_CONSTANT_BORDER),
1421	const_iv (GL_LINES),	1596	const_iv (GL_LINES),
		1597	const_iv (GL_LINE_LOOP),
1422	const_iv (GL_QUADS),	1598	const_iv (GL_QUADS),
1423	const_iv (GL_LINE_LOOP),	1599	const_iv (GL_QUAD_STRIP),
		1600	const_iv (GL_TRIANGLES),
		1601	const_iv (GL_TRIANGLE_STRIP),
		1602	const_iv (GL_TRIANGLE_FAN),
1424	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1603	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1425	const_iv (GL_FASTEST),	1604	const_iv (GL_FASTEST),
		1605	const_iv (GL_V2F),
		1606	const_iv (GL_V3F),
		1607	const_iv (GL_T2F_V3F),
		1608	const_iv (GL_T2F_N3F_V3F),
1426	# undef const_iv	1609	# undef const_iv
1427	};	1610	};
1428		1611
1429	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1612	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1430	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1613	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
1445		1628
1446	void glHint (int target, int mode)	1629	void glHint (int target, int mode)
1447		1630
1448	void glBlendFunc (int sfactor, int dfactor)	1631	void glBlendFunc (int sfactor, int dfactor)
1449		1632
		1633	void glDepthMask (int flag)
		1634
1450	void glLogicOp (int opcode)	1635	void glLogicOp (int opcode)
1451		1636
1452	void glColorMask (int red, int green, int blue, int alpha)	1637	void glColorMask (int red, int green, int blue, int alpha)
1453		1638
1454	void glMatrixMode (int mode)	1639	void glMatrixMode (int mode)
…		…
1457		1642
1458	void glPopMatrix ()	1643	void glPopMatrix ()
1459		1644
1460	void glLoadIdentity ()	1645	void glLoadIdentity ()
1461		1646
1462	# near and far are due to microsofts buggy c compiler	1647	# near_ and far_ are due to microsofts buggy "c" compiler
		1648	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1649
		1650	# near_ and far_ are due to microsofts buggy "c" compiler
1463	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1651	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1464		1652
1465	void glViewport (int x, int y, int width, int height)	1653	void glViewport (int x, int y, int width, int height)
1466		1654
1467	void glScissor (int x, int y, int width, int height)	1655	void glScissor (int x, int y, int width, int height)
…		…
1483	void glEnd ()	1671	void glEnd ()
1484		1672
1485	void glColor (float r, float g, float b, float a = 1.0)	1673	void glColor (float r, float g, float b, float a = 1.0)
1486	PROTOTYPE: @	1674	PROTOTYPE: @
1487	CODE:	1675	CODE:
1488	glColor4ub (r * 255., g * 255., b * 255., a * 255.);	1676	// microsoft visual "c" rounds instead of truncating...
		1677	glColor4ub (MIN ((int)(r * 255.f), 255),
		1678	MIN ((int)(g * 255.f), 255),
		1679	MIN ((int)(b * 255.f), 255),
		1680	MIN ((int)(a * 255.f), 255));
		1681
		1682	void glInterleavedArrays (int format, int stride, char *data)
		1683
		1684	void glDrawElements (int mode, int count, int type, char *indices)
		1685
		1686	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1687
		1688	void glRasterPos (float x, float y, float z = 0.)
		1689	CODE:
		1690	glRasterPos3f (0, 0, z);
		1691	glBitmap (0, 0, 0, 0, x, y, 0);
1489		1692
1490	void glVertex (float x, float y, float z = 0.)	1693	void glVertex (float x, float y, float z = 0.)
1491	CODE:	1694	CODE:
1492	glVertex3f (x, y, z);	1695	glVertex3f (x, y, z);
1493		1696
…		…
1521		1724
1522	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1725	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1523		1726
1524	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1727	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1525		1728
1526	void glRasterPos (int x, int y)	1729	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1527	CODE:
1528	glRasterPos2i (x, y);
1529		1730
1530	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1731	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1531		1732
1532	int glGenTexture ()	1733	int glGenTexture ()
1533	CODE:	1734	CODE:
…		…
1560		1761
1561	void glEndList ()	1762	void glEndList ()
1562		1763
1563	void glCallList (int list)	1764	void glCallList (int list)
1564		1765
		1766

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.75 by root, Mon May 8 18:28:40 2006 UTC vs. Revision 1.92 by elmex, Tue May 23 17:30:18 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.75 by root, Mon May 8 18:28:40 2006 UTC vs.
Revision 1.92 by elmex, Tue May 23 17:30:18 2006 UTC