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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.67 by root, Tue Apr 25 11:18:48 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
…		…
406	SDL_Rect **m;	436	SDL_Rect **m;
407		437
408	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	438	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
409	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	439	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
410	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	440	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
411	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 0);	441	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
412		442
413	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	443	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
414	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	444	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
415	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	445	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
416	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	446	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
…		…
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
…		…
640	exit (1);	683	exit (1);
641		684
642	MODULE = CFClient PACKAGE = CFClient::Font	685	MODULE = CFClient PACKAGE = CFClient::Font
643		686
644	CFClient::Font	687	CFClient::Font
645	new_from_file (SV class, char path)	688	new_from_file (SV class, char path, int id = 0)
646	CODE:	689	CODE:
647	{	690	{
648	int count;	691	int count;
649	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, 0, 0, &count);	692	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
650	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	693	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
651	FcPatternDestroy (pattern);	694	FcPatternDestroy (pattern);
652	}	695	}
653	OUTPUT:	696	OUTPUT:
654	RETVAL	697	RETVAL
…		…
664	default_font = self;	707	default_font = self;
665		708
666	MODULE = CFClient PACKAGE = CFClient::Layout	709	MODULE = CFClient PACKAGE = CFClient::Layout
667		710
668	CFClient::Layout	711	CFClient::Layout
669	new (SV *class, int base_height = MIN_FONT_HEIGHT)	712	new (SV *class, int rgba = 0)
670	CODE:	713	CODE:
671	New (0, RETVAL, 1, struct cf_layout);	714	New (0, RETVAL, 1, struct cf_layout);
672	RETVAL->pl = pango_layout_new (context);	715
673	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;
674	RETVAL->font = 0;	723	RETVAL->font = 0;
		724
675	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	725	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
676	pango_layout_set_font_description (RETVAL->pl, default_font);	726	layout_update_font (RETVAL);
677	OUTPUT:	727	OUTPUT:
678	RETVAL	728	RETVAL
679		729
680	void	730	void
681	DESTROY (CFClient::Layout self)	731	DESTROY (CFClient::Layout self)
682	CODE:	732	CODE:
683	g_object_unref (self->pl);	733	g_object_unref (self->pl);
684	Safefree (self);	734	Safefree (self);
685		735
		736	int
		737	is_rgba (CFClient::Layout self)
		738	CODE:
		739	RETVAL = self->rgba;
		740	OUTPUT:
		741	RETVAL
		742
686	void	743	void
687	set_text (CFClient::Layout self, SV *text_)	744	set_text (CFClient::Layout self, SV *text_)
688	CODE:	745	CODE:
689	{	746	{
690	STRLEN textlen;	747	STRLEN textlen;
…		…
708	CODE:	765	CODE:
709	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	766	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
710	SvUTF8_on (RETVAL);	767	SvUTF8_on (RETVAL);
711	OUTPUT:	768	OUTPUT:
712	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;
713		778
714	void	779	void
715	set_font (CFClient::Layout self, CFClient::Font font = 0)	780	set_font (CFClient::Layout self, CFClient::Font font = 0)
716	CODE:	781	CODE:
717	if (self->font != font)	782	if (self->font != font)
…		…
775	render (CFClient::Layout self)	840	render (CFClient::Layout self)
776	PPCODE:	841	PPCODE:
777	{	842	{
778	SV *retval;	843	SV *retval;
779	int w, h;	844	int w, h;
780	FT_Bitmap bitmap;
781		845
782	layout_get_pixel_size (self, &w, &h);	846	layout_get_pixel_size (self, &w, &h);
783		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
784	retval = newSV (w * h);	894	retval = newSV (w * h);
785	SvPOK_only (retval);	895	SvPOK_only (retval);
786	SvCUR_set (retval, w * h);	896	SvCUR_set (retval, w * h);
787		897
788	bitmap.rows = h;	898	bitmap.rows = h;
789	bitmap.width = w;	899	bitmap.width = w;
790	bitmap.pitch = w;	900	bitmap.pitch = w;
791	bitmap.buffer = (unsigned char*)SvPVX (retval);	901	bitmap.buffer = (unsigned char*)SvPVX (retval);
792	bitmap.num_grays = 256;	902	bitmap.num_grays = 256;
793	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	903	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
794		904
795	memset (bitmap.buffer, 0, w * h);	905	memset (bitmap.buffer, 0, w * h);
796		906
797	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);
798		908
799	EXTEND (SP, 3);	909	EXTEND (SP, 5);
800	PUSHs (sv_2mortal (newSViv (w)));	910	PUSHs (sv_2mortal (newSViv (w)));
801	PUSHs (sv_2mortal (newSViv (h)));	911	PUSHs (sv_2mortal (newSViv (h)));
802	PUSHs (sv_2mortal (retval));	912	PUSHs (sv_2mortal (retval));
		913	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		914	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		915	}
803	}	916	}
804		917
805	MODULE = CFClient PACKAGE = CFClient::Texture	918	MODULE = CFClient PACKAGE = CFClient::Texture
806		919
807	void	920	void
808	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)
809	PROTOTYPE: $$$;$$	922	PROTOTYPE: $$$;$$
		923	ALIAS:
		924	draw_quad_alpha = 1
		925	draw_quad_alpha_premultiplied = 2
810	CODE:	926	CODE:
811	{	927	{
812	HV hv = (HV )SvRV (self);	928	HV hv = (HV )SvRV (self);
813	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	929	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
814	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	930	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
819	{	935	{
820	w = SvNV (*hv_fetch (hv, "w", 1, 1));	936	w = SvNV (*hv_fetch (hv, "w", 1, 1));
821	h = SvNV (*hv_fetch (hv, "h", 1, 1));	937	h = SvNV (*hv_fetch (hv, "h", 1, 1));
822	}	938	}
823		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
824	glBindTexture (GL_TEXTURE_2D, name);	946	glBindTexture (GL_TEXTURE_2D, name);
		947
825	if (wrap_mode) {	948	if (wrap_mode)
		949	{
826	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	950	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
827	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	951	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
828	}	952	}
		953
829	glBegin (GL_QUADS);	954	glBegin (GL_QUADS);
830	glTexCoord2f (0, 0); glVertex2f (x , y );	955	glTexCoord2f (0, 0); glVertex2f (x , y );
831	glTexCoord2f (0, t); glVertex2f (x , y + h);	956	glTexCoord2f (0, t); glVertex2f (x , y + h);
832	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	957	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
833	glTexCoord2f (s, 0); glVertex2f (x + w, y );	958	glTexCoord2f (s, 0); glVertex2f (x + w, y );
834	glEnd ();	959	glEnd ();
		960
		961	if (ix)
		962	glDisable (GL_BLEND);
835	}	963	}
836		964
837	MODULE = CFClient PACKAGE = CFClient::Map	965	MODULE = CFClient PACKAGE = CFClient::Map
838		966
839	CFClient::Map	967	CFClient::Map
…		…
1348	} *civ, const_iv[] = {	1476	} *civ, const_iv[] = {
1349	# define const_iv(name) { # name, (IV)name }	1477	# define const_iv(name) { # name, (IV)name }
1350	const_iv (GL_COLOR_MATERIAL),	1478	const_iv (GL_COLOR_MATERIAL),
1351	const_iv (GL_SMOOTH),	1479	const_iv (GL_SMOOTH),
1352	const_iv (GL_FLAT),	1480	const_iv (GL_FLAT),
		1481	const_iv (GL_DITHER),
1353	const_iv (GL_BLEND),	1482	const_iv (GL_BLEND),
		1483	const_iv (GL_SCISSOR_TEST),
1354	const_iv (GL_AND),	1484	const_iv (GL_AND),
1355	const_iv (GL_ONE),	1485	const_iv (GL_ONE),
1356	const_iv (GL_ZERO),	1486	const_iv (GL_ZERO),
1357	const_iv (GL_SRC_ALPHA),	1487	const_iv (GL_SRC_ALPHA),
1358	const_iv (GL_SRC_ALPHA_SATURATE),	1488	const_iv (GL_SRC_ALPHA_SATURATE),
…		…
1360	const_iv (GL_ONE_MINUS_DST_ALPHA),	1490	const_iv (GL_ONE_MINUS_DST_ALPHA),
1361	const_iv (GL_RGB),	1491	const_iv (GL_RGB),
1362	const_iv (GL_RGBA),	1492	const_iv (GL_RGBA),
1363	const_iv (GL_UNSIGNED_BYTE),	1493	const_iv (GL_UNSIGNED_BYTE),
1364	const_iv (GL_ALPHA),	1494	const_iv (GL_ALPHA),
		1495	const_iv (GL_LUMINANCE),
1365	const_iv (GL_FLOAT),	1496	const_iv (GL_FLOAT),
1366	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1497	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1367	const_iv (GL_COMPILE),	1498	const_iv (GL_COMPILE),
1368	const_iv (GL_TEXTURE_1D),	1499	const_iv (GL_TEXTURE_1D),
1369	const_iv (GL_TEXTURE_2D),	1500	const_iv (GL_TEXTURE_2D),
…		…
1381	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1512	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1382	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1513	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1383	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1514	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1384	const_iv (GL_GENERATE_MIPMAP),	1515	const_iv (GL_GENERATE_MIPMAP),
1385	const_iv (GL_MODULATE),	1516	const_iv (GL_MODULATE),
		1517	const_iv (GL_DECAL),
1386	const_iv (GL_REPLACE),	1518	const_iv (GL_REPLACE),
1387	const_iv (GL_COLOR_BUFFER_BIT),	1519	const_iv (GL_COLOR_BUFFER_BIT),
1388	const_iv (GL_PROJECTION),	1520	const_iv (GL_PROJECTION),
1389	const_iv (GL_MODELVIEW),	1521	const_iv (GL_MODELVIEW),
1390	const_iv (GL_COLOR_LOGIC_OP),	1522	const_iv (GL_COLOR_LOGIC_OP),
		1523	const_iv (GL_SEPARABLE_2D),
1391	const_iv (GL_CONVOLUTION_2D),	1524	const_iv (GL_CONVOLUTION_2D),
1392	const_iv (GL_CONVOLUTION_BORDER_MODE),	1525	const_iv (GL_CONVOLUTION_BORDER_MODE),
1393	const_iv (GL_CONSTANT_BORDER),	1526	const_iv (GL_CONSTANT_BORDER),
1394	const_iv (GL_LINES),	1527	const_iv (GL_LINES),
1395	const_iv (GL_QUADS),	1528	const_iv (GL_QUADS),
…		…
1420		1553
1421	void glBlendFunc (int sfactor, int dfactor)	1554	void glBlendFunc (int sfactor, int dfactor)
1422		1555
1423	void glLogicOp (int opcode)	1556	void glLogicOp (int opcode)
1424		1557
		1558	void glColorMask (int red, int green, int blue, int alpha)
		1559
1425	void glMatrixMode (int mode)	1560	void glMatrixMode (int mode)
1426		1561
1427	void glPushMatrix ()	1562	void glPushMatrix ()
1428		1563
1429	void glPopMatrix ()	1564	void glPopMatrix ()
…		…
1432		1567
1433	# near and far are due to microsofts buggy c compiler	1568	# near and far are due to microsofts buggy c compiler
1434	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_)
1435		1570
1436	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)
1437		1574
1438	void glTranslate (float x, float y, float z = 0.)	1575	void glTranslate (float x, float y, float z = 0.)
1439	CODE:	1576	CODE:
1440	glTranslatef (x, y, z);	1577	glTranslatef (x, y, z);
1441		1578
…		…
1452	void glEnd ()	1589	void glEnd ()
1453		1590
1454	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)
1455	PROTOTYPE: @	1592	PROTOTYPE: @
1456	CODE:	1593	CODE:
1457	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);
1458		1596
1459	void glVertex (float x, float y, float z = 0.)	1597	void glVertex (float x, float y, float z = 0.)
1460	CODE:	1598	CODE:
1461	glVertex3f (x, y, z);	1599	glVertex3f (x, y, z);
1462		1600
…		…
1481	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)
1482	CODE:	1620	CODE:
1483	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1621	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1484	(target, internalformat, width, height, format, type, data));	1622	(target, internalformat, width, height, format, type, data));
1485		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
1486	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)
1487		1630
1488	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)
1489		1638
1490	int glGenTexture ()	1639	int glGenTexture ()
1491	CODE:	1640	CODE:
1492	{	1641	{
1493	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.67 by root, Tue Apr 25 11:18:48 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.67 by root, Tue Apr 25 11:18:48 2006 UTC vs.
Revision 1.79 by root, Sun May 14 22:24:14 2006 UTC