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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.64 by root, Mon Apr 24 08:11:31 2006 UTC vs.
Revision 1.79 by root, Sun May 14 22:24:14 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
9	#include <string.h>	12	#include <string.h>
10	#include <stdio.h>	13	#include <stdio.h>
11		14
12	#include <SDL.h>	15	#include <SDL.h>
		16	#include <SDL_endian.h>
13	#include <SDL_image.h>	17	#include <SDL_image.h>
14	#include <SDL_mixer.h>	18	#include <SDL_mixer.h>
15	#include <SDL_opengl.h>	19	#include <SDL_opengl.h>
16		20
17	#include <glib/gmacros.h>	21	#include <glib/gmacros.h>
18		22
19	#include <pango/pango.h>	23	#include <pango/pango.h>
20	#include <pango/pangofc-fontmap.h>	24	#include <pango/pangofc-fontmap.h>
21	#include <pango/pangoft2.h>	25	#include <pango/pangoft2.h>
		26	#include <pango/pangocairo.h>
22		27
23	#ifndef _WIN32	28	#ifndef _WIN32
24	# include <sys/types.h>	29	# include <sys/types.h>
25	# include <sys/socket.h>	30	# include <sys/socket.h>
26	# include <netinet/in.h>	31	# include <netinet/in.h>
63	typedef Mix_Music *CFClient__MixMusic;	68	typedef Mix_Music *CFClient__MixMusic;
64		69
65	typedef PangoFontDescription *CFClient__Font;	70	typedef PangoFontDescription *CFClient__Font;
66		71
67	typedef struct cf_layout {	72	typedef struct cf_layout {
68	PangoLayout *pl;	73	PangoLayout *pl; // either derived from a cairo or ft2 context
		74	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
		75	float r, g, b, a; // default color for rgba mode
69	int base_height;	76	int base_height;
70	CFClient__Font font;	77	CFClient__Font font;
71	} *CFClient__Layout;	78	} *CFClient__Layout;
72		79
73	static CFClient__Font default_font;	80	static CFClient__Font default_font;
74	static PangoContext *context;	81	static PangoContext ft2_context, cairo_context;
75	static PangoFontMap *fontmap;	82	static PangoFontMap ft2_fontmap, cairo_fontmap;
76		83
77	static void	84	static void
78	substitute_func (FcPattern *pattern, gpointer data)	85	substitute_func (FcPattern *pattern, gpointer data)
79	{	86	{
80	FcPatternAddBool (pattern, FC_HINTING , 1);	87	FcPatternAddBool (pattern, FC_HINTING , 1);
81	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	88	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
82	}	89	}
83		90
84	static void	91	static void
85	layout_update_font (CFClient__Layout self)	92	layout_update_font (CFClient__Layout self)
86	{	93	{
…		…
98	static void	105	static void
99	layout_get_pixel_size (CFClient__Layout self, int w, int h)	106	layout_get_pixel_size (CFClient__Layout self, int w, int h)
100	{	107	{
101	pango_layout_get_pixel_size (self->pl, w, h);	108	pango_layout_get_pixel_size (self->pl, w, h);
102		109
103	w = (w + 3) & ~3;
104	if (!w) w = 1;	110	if (!w) w = 1;
105	if (!h) h = 1;	111	if (!h) h = 1;
		112
		113	w = (w + 3) & ~3;
106	}	114	}
107		115
108	typedef uint16_t mapface;	116	typedef uint16_t mapface;
109		117
110	typedef struct {	118	typedef struct {
…		…
258	}	266	}
259	}	267	}
260	}	268	}
261		269
262	static void	270	static void
263	music_finished ()	271	music_finished (void)
264	{	272	{
265	SDL_UserEvent ev;	273	SDL_UserEvent ev;
266		274
267	ev.type = SDL_USEREVENT;	275	ev.type = SDL_USEREVENT;
268	ev.code = 0;	276	ev.code = 0;
269	ev.data1 = 0;	277	ev.data1 = 0;
		278	ev.data2 = 0;
		279
		280	SDL_PushEvent ((SDL_Event *)&ev);
		281	}
		282
		283	static void
		284	channel_finished (int channel)
		285	{
		286	SDL_UserEvent ev;
		287
		288	ev.type = SDL_USEREVENT;
		289	ev.code = 1;
		290	ev.data1 = (void *)(long)channel;
270	ev.data2 = 0;	291	ev.data2 = 0;
271		292
272	SDL_PushEvent ((SDL_Event *)&ev);	293	SDL_PushEvent ((SDL_Event *)&ev);
273	}	294	}
274		295
…		…
385	# undef const_iv	406	# undef const_iv
386	};	407	};
387		408
388	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	409	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
389	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	410	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		411	}
390		412
		413	void
		414	pango_init ()
		415	CODE:
		416	{
		417	// delayed, so it can pick up new fonts added by AddFontResourceEx
391	fontmap = pango_ft2_font_map_new ();	418	ft2_fontmap = pango_ft2_font_map_new ();
392	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);	419	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
393	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);	420	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
		421
		422	cairo_fontmap = pango_cairo_font_map_get_default ();
		423	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
394	}	424	}
395		425
396	int	426	int
397	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	427	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
398		428
…		…
457		487
458	while (SDL_PollEvent (&ev))	488	while (SDL_PollEvent (&ev))
459	{	489	{
460	HV *hv = newHV ();	490	HV *hv = newHV ();
461	hv_store (hv, "type", 4, newSViv (ev.type), 0);	491	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		492
462	switch (ev.type)	493	switch (ev.type)
463	{	494	{
464	case SDL_KEYDOWN:	495	case SDL_KEYDOWN:
465	case SDL_KEYUP:	496	case SDL_KEYUP:
466	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	497	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
486	case SDL_MOUSEBUTTONUP:	517	case SDL_MOUSEBUTTONUP:
487	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	518	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
488	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	519	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
489	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	520	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
490	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	521	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		522	break;
		523
		524	case SDL_USEREVENT:
		525	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		526	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		527	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		528	break;
491	}	529	}
492		530
493	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	531	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
494	}	532	}
495	}	533	}
496		534
497	int	535	int
498	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	536	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
499	POSTCALL:	537	POSTCALL:
500	Mix_HookMusicFinished (music_finished);	538	Mix_HookMusicFinished (music_finished);
		539	Mix_ChannelFinished (channel_finished);
501		540
502	void	541	void
503	Mix_CloseAudio ()	542	Mix_CloseAudio ()
504		543
505	int	544	int
…		…
528		567
529	void	568	void
530	add_font (char *file)	569	add_font (char *file)
531	CODE:	570	CODE:
532	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	571	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
		572	#ifdef _WIN32
		573	// cairo... sigh... requires win2000
		574	AddFontResourceEx (file, FR_PRIVATE, 0);
		575	#endif
533		576
534	void	577	void
535	load_image_inline (SV *image_)	578	load_image_inline (SV *image_)
536	ALIAS:	579	ALIAS:
537	load_image_file = 1	580	load_image_file = 1
…		…
619	PUSHs (sv_2mortal (newSViv (b / y)));	662	PUSHs (sv_2mortal (newSViv (b / y)));
620	PUSHs (sv_2mortal (newSViv (a / y)));	663	PUSHs (sv_2mortal (newSViv (a / y)));
621	}	664	}
622		665
623	void	666	void
		667	error (char *message)
		668	CODE:
		669	#ifdef _WIN32
		670	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
		671	#else
		672	fprintf (stderr, "ERROR: %s\n", message);
		673	#endif
		674
		675	void
624	fatal (char *message)	676	fatal (char *message)
625	CODE:	677	CODE:
626	#ifdef _WIN32	678	#ifdef _WIN32
627	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	679	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
628	#else	680	#else
…		…
631	exit (1);	683	exit (1);
632		684
633	MODULE = CFClient PACKAGE = CFClient::Font	685	MODULE = CFClient PACKAGE = CFClient::Font
634		686
635	CFClient::Font	687	CFClient::Font
636	new_from_file (SV class, char path)	688	new_from_file (SV class, char path, int id = 0)
637	CODE:	689	CODE:
638	{	690	{
639	int count;	691	int count;
640	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, 0, 0, &count);	692	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
641	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	693	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
642	FcPatternDestroy (pattern);	694	FcPatternDestroy (pattern);
643	}	695	}
644	OUTPUT:	696	OUTPUT:
645	RETVAL	697	RETVAL
…		…
655	default_font = self;	707	default_font = self;
656		708
657	MODULE = CFClient PACKAGE = CFClient::Layout	709	MODULE = CFClient PACKAGE = CFClient::Layout
658		710
659	CFClient::Layout	711	CFClient::Layout
660	new (SV *class, int base_height = MIN_FONT_HEIGHT)	712	new (SV *class, int rgba = 0)
661	CODE:	713	CODE:
662	New (0, RETVAL, 1, struct cf_layout);	714	New (0, RETVAL, 1, struct cf_layout);
663	RETVAL->pl = pango_layout_new (context);	715
664	RETVAL->base_height = base_height;	716	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
		717	RETVAL->rgba = rgba;
		718	RETVAL->r = 1.;
		719	RETVAL->g = 1.;
		720	RETVAL->b = 1.;
		721	RETVAL->a = 1.;
		722	RETVAL->base_height = MIN_FONT_HEIGHT;
665	RETVAL->font = 0;	723	RETVAL->font = 0;
		724
666	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	725	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
667	pango_layout_set_font_description (RETVAL->pl, default_font);	726	layout_update_font (RETVAL);
668	OUTPUT:	727	OUTPUT:
669	RETVAL	728	RETVAL
670		729
671	void	730	void
672	DESTROY (CFClient::Layout self)	731	DESTROY (CFClient::Layout self)
673	CODE:	732	CODE:
674	g_object_unref (self->pl);	733	g_object_unref (self->pl);
675	Safefree (self);	734	Safefree (self);
676		735
		736	int
		737	is_rgba (CFClient::Layout self)
		738	CODE:
		739	RETVAL = self->rgba;
		740	OUTPUT:
		741	RETVAL
		742
677	void	743	void
678	set_text (CFClient::Layout self, SV *text_)	744	set_text (CFClient::Layout self, SV *text_)
679	CODE:	745	CODE:
680	{	746	{
681	STRLEN textlen;	747	STRLEN textlen;
…		…
699	CODE:	765	CODE:
700	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	766	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
701	SvUTF8_on (RETVAL);	767	SvUTF8_on (RETVAL);
702	OUTPUT:	768	OUTPUT:
703	RETVAL	769	RETVAL
		770
		771	void
		772	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
		773	CODE:
		774	self->r = r;
		775	self->g = g;
		776	self->b = b;
		777	self->a = a;
704		778
705	void	779	void
706	set_font (CFClient::Layout self, CFClient::Font font = 0)	780	set_font (CFClient::Layout self, CFClient::Font font = 0)
707	CODE:	781	CODE:
708	if (self->font != font)	782	if (self->font != font)
…		…
766	render (CFClient::Layout self)	840	render (CFClient::Layout self)
767	PPCODE:	841	PPCODE:
768	{	842	{
769	SV *retval;	843	SV *retval;
770	int w, h;	844	int w, h;
771	FT_Bitmap bitmap;
772		845
773	layout_get_pixel_size (self, &w, &h);	846	layout_get_pixel_size (self, &w, &h);
774		847
		848	if (self->rgba)
		849	{
		850	cairo_surface_t *surface;
		851	cairo_t *cairo;
		852
		853	retval = newSV (w * h * 4);
		854	SvPOK_only (retval);
		855	SvCUR_set (retval, w * h * 4);
		856
		857	memset (SvPVX (retval), 0, w * h * 4);
		858
		859	surface = cairo_image_surface_create_for_data (
		860	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		861	cairo = cairo_create (surface);
		862	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		863
		864	pango_cairo_show_layout (cairo, self->pl);
		865
		866	cairo_destroy (cairo);
		867	cairo_surface_destroy (surface);
		868
		869	// what a mess, and its premultiplied, too :(
		870	{
		871	uint32_t p = (uint32_t )SvPVX (retval);
		872	uint32_t e = p + w h;
		873
		874	while (p < e)
		875	{
		876	uint32_t rgba = *p;
		877	rgba = (rgba >> 24) \| (rgba << 8);
		878	rgba = SDL_SwapBE32 (rgba);
		879	*p++ = rgba;
		880	}
		881	}
		882
		883	EXTEND (SP, 5);
		884	PUSHs (sv_2mortal (newSViv (w)));
		885	PUSHs (sv_2mortal (newSViv (h)));
		886	PUSHs (sv_2mortal (retval));
		887	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		888	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		889	}
		890	else
		891	{
		892	FT_Bitmap bitmap;
		893
775	retval = newSV (w * h);	894	retval = newSV (w * h);
776	SvPOK_only (retval);	895	SvPOK_only (retval);
777	SvCUR_set (retval, w * h);	896	SvCUR_set (retval, w * h);
778		897
779	bitmap.rows = h;	898	bitmap.rows = h;
780	bitmap.width = w;	899	bitmap.width = w;
781	bitmap.pitch = w;	900	bitmap.pitch = w;
782	bitmap.buffer = (unsigned char*)SvPVX (retval);	901	bitmap.buffer = (unsigned char*)SvPVX (retval);
783	bitmap.num_grays = 256;	902	bitmap.num_grays = 256;
784	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	903	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
785		904
786	memset (bitmap.buffer, 0, w * h);	905	memset (bitmap.buffer, 0, w * h);
787		906
788	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	907	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
789		908
790	EXTEND (SP, 3);	909	EXTEND (SP, 5);
791	PUSHs (sv_2mortal (newSViv (w)));	910	PUSHs (sv_2mortal (newSViv (w)));
792	PUSHs (sv_2mortal (newSViv (h)));	911	PUSHs (sv_2mortal (newSViv (h)));
793	PUSHs (sv_2mortal (retval));	912	PUSHs (sv_2mortal (retval));
		913	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		914	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		915	}
794	}	916	}
795		917
796	MODULE = CFClient PACKAGE = CFClient::Texture	918	MODULE = CFClient PACKAGE = CFClient::Texture
797		919
798	void	920	void
799	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	921	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
800	PROTOTYPE: $$$;$$	922	PROTOTYPE: $$$;$$
		923	ALIAS:
		924	draw_quad_alpha = 1
		925	draw_quad_alpha_premultiplied = 2
801	CODE:	926	CODE:
802	{	927	{
803	HV hv = (HV )SvRV (self);	928	HV hv = (HV )SvRV (self);
804	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	929	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
805	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	930	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
810	{	935	{
811	w = SvNV (*hv_fetch (hv, "w", 1, 1));	936	w = SvNV (*hv_fetch (hv, "w", 1, 1));
812	h = SvNV (*hv_fetch (hv, "h", 1, 1));	937	h = SvNV (*hv_fetch (hv, "h", 1, 1));
813	}	938	}
814		939
		940	if (ix)
		941	{
		942	glEnable (GL_BLEND);
		943	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		944	}
		945
815	glBindTexture (GL_TEXTURE_2D, name);	946	glBindTexture (GL_TEXTURE_2D, name);
		947
816	if (wrap_mode) {	948	if (wrap_mode)
		949	{
817	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	950	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
818	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	951	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
819	}	952	}
		953
820	glBegin (GL_QUADS);	954	glBegin (GL_QUADS);
821	glTexCoord2f (0, 0); glVertex2f (x , y );	955	glTexCoord2f (0, 0); glVertex2f (x , y );
822	glTexCoord2f (0, t); glVertex2f (x , y + h);	956	glTexCoord2f (0, t); glVertex2f (x , y + h);
823	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	957	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
824	glTexCoord2f (s, 0); glVertex2f (x + w, y );	958	glTexCoord2f (s, 0); glVertex2f (x + w, y );
825	glEnd ();	959	glEnd ();
		960
		961	if (ix)
		962	glDisable (GL_BLEND);
826	}	963	}
827		964
828	MODULE = CFClient PACKAGE = CFClient::Map	965	MODULE = CFClient PACKAGE = CFClient::Map
829		966
830	CFClient::Map	967	CFClient::Map
…		…
1339	} *civ, const_iv[] = {	1476	} *civ, const_iv[] = {
1340	# define const_iv(name) { # name, (IV)name }	1477	# define const_iv(name) { # name, (IV)name }
1341	const_iv (GL_COLOR_MATERIAL),	1478	const_iv (GL_COLOR_MATERIAL),
1342	const_iv (GL_SMOOTH),	1479	const_iv (GL_SMOOTH),
1343	const_iv (GL_FLAT),	1480	const_iv (GL_FLAT),
		1481	const_iv (GL_DITHER),
1344	const_iv (GL_BLEND),	1482	const_iv (GL_BLEND),
		1483	const_iv (GL_SCISSOR_TEST),
1345	const_iv (GL_AND),	1484	const_iv (GL_AND),
		1485	const_iv (GL_ONE),
		1486	const_iv (GL_ZERO),
1346	const_iv (GL_SRC_ALPHA),	1487	const_iv (GL_SRC_ALPHA),
		1488	const_iv (GL_SRC_ALPHA_SATURATE),
1347	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1489	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1490	const_iv (GL_ONE_MINUS_DST_ALPHA),
1348	const_iv (GL_RGB),	1491	const_iv (GL_RGB),
1349	const_iv (GL_RGBA),	1492	const_iv (GL_RGBA),
1350	const_iv (GL_UNSIGNED_BYTE),	1493	const_iv (GL_UNSIGNED_BYTE),
1351	const_iv (GL_ALPHA4),
1352	const_iv (GL_ALPHA),	1494	const_iv (GL_ALPHA),
		1495	const_iv (GL_LUMINANCE),
1353	const_iv (GL_FLOAT),	1496	const_iv (GL_FLOAT),
1354	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1497	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1355	const_iv (GL_COMPILE),	1498	const_iv (GL_COMPILE),
1356	const_iv (GL_TEXTURE_1D),	1499	const_iv (GL_TEXTURE_1D),
1357	const_iv (GL_TEXTURE_2D),	1500	const_iv (GL_TEXTURE_2D),
…		…
1368	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1511	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1369	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1512	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1370	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1513	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1371	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1514	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1372	const_iv (GL_GENERATE_MIPMAP),	1515	const_iv (GL_GENERATE_MIPMAP),
1373	const_iv (GL_LINEAR),
1374	const_iv (GL_MODULATE),	1516	const_iv (GL_MODULATE),
		1517	const_iv (GL_DECAL),
1375	const_iv (GL_REPLACE),	1518	const_iv (GL_REPLACE),
1376	const_iv (GL_COLOR_BUFFER_BIT),	1519	const_iv (GL_COLOR_BUFFER_BIT),
1377	const_iv (GL_PROJECTION),	1520	const_iv (GL_PROJECTION),
1378	const_iv (GL_MODELVIEW),	1521	const_iv (GL_MODELVIEW),
1379	const_iv (GL_COLOR_LOGIC_OP),	1522	const_iv (GL_COLOR_LOGIC_OP),
		1523	const_iv (GL_SEPARABLE_2D),
1380	const_iv (GL_CONVOLUTION_2D),	1524	const_iv (GL_CONVOLUTION_2D),
1381	const_iv (GL_CONVOLUTION_BORDER_MODE),	1525	const_iv (GL_CONVOLUTION_BORDER_MODE),
1382	const_iv (GL_CONSTANT_BORDER),	1526	const_iv (GL_CONSTANT_BORDER),
1383	const_iv (GL_LINES),	1527	const_iv (GL_LINES),
1384	const_iv (GL_QUADS),	1528	const_iv (GL_QUADS),
…		…
1409		1553
1410	void glBlendFunc (int sfactor, int dfactor)	1554	void glBlendFunc (int sfactor, int dfactor)
1411		1555
1412	void glLogicOp (int opcode)	1556	void glLogicOp (int opcode)
1413		1557
		1558	void glColorMask (int red, int green, int blue, int alpha)
		1559
1414	void glMatrixMode (int mode)	1560	void glMatrixMode (int mode)
1415		1561
1416	void glPushMatrix ()	1562	void glPushMatrix ()
1417		1563
1418	void glPopMatrix ()	1564	void glPopMatrix ()
…		…
1421		1567
1422	# near and far are due to microsofts buggy c compiler	1568	# near and far are due to microsofts buggy c compiler
1423	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1569	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1424		1570
1425	void glViewport (int x, int y, int width, int height)	1571	void glViewport (int x, int y, int width, int height)
		1572
		1573	void glScissor (int x, int y, int width, int height)
1426		1574
1427	void glTranslate (float x, float y, float z = 0.)	1575	void glTranslate (float x, float y, float z = 0.)
1428	CODE:	1576	CODE:
1429	glTranslatef (x, y, z);	1577	glTranslatef (x, y, z);
1430		1578
…		…
1441	void glEnd ()	1589	void glEnd ()
1442		1590
1443	void glColor (float r, float g, float b, float a = 1.0)	1591	void glColor (float r, float g, float b, float a = 1.0)
1444	PROTOTYPE: @	1592	PROTOTYPE: @
1445	CODE:	1593	CODE:
1446	glColor4f (r, g, b, a);	1594	// 255.999 is close enough to correctness (256 and clamp)
		1595	glColor4ub (r * 255.999, g * 255.999, b * 255.999, a * 255.999);
1447		1596
1448	void glVertex (float x, float y, float z = 0.)	1597	void glVertex (float x, float y, float z = 0.)
1449	CODE:	1598	CODE:
1450	glVertex3f (x, y, z);	1599	glVertex3f (x, y, z);
1451		1600
…		…
1470	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1619	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1471	CODE:	1620	CODE:
1472	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1621	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1473	(target, internalformat, width, height, format, type, data));	1622	(target, internalformat, width, height, format, type, data));
1474		1623
		1624	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		1625	CODE:
		1626	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
		1627	(target, internalformat, width, height, format, type, row, column));
		1628
1475	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1629	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1476		1630
1477	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1631	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1632
		1633	void glRasterPos (int x, int y)
		1634	CODE:
		1635	glRasterPos2i (x, y);
		1636
		1637	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1478		1638
1479	int glGenTexture ()	1639	int glGenTexture ()
1480	CODE:	1640	CODE:
1481	{	1641	{
1482	GLuint name;	1642	GLuint name;

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.64 by root, Mon Apr 24 08:11:31 2006 UTC vs. Revision 1.79 by root, Sun May 14 22:24:14 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.64 by root, Mon Apr 24 08:11:31 2006 UTC vs.
Revision 1.79 by root, Sun May 14 22:24:14 2006 UTC