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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.61 by root, Sun Apr 23 21:47:30 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>
40	#define FOW_DARKNESS 32	45	#define FOW_DARKNESS 32
41		46
42	#define MAP_EXTEND_X 32	47	#define MAP_EXTEND_X 32
43	#define MAP_EXTEND_Y 512	48	#define MAP_EXTEND_Y 512
44		49
45	#define MIN_FONT_HEIGHT 8	50	#define MIN_FONT_HEIGHT 10
		51
		52	#define GL_CALL(type,func,args) \
		53	{ \
		54	static int init_; \
		55	static type fptr_; \
		56	\
		57	if (!init_) \
		58	{ \
		59	init_ = 1; \
		60	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
		61	} \
		62	\
		63	if (fptr_) \
		64	fptr_ args; \
		65	}
46		66
47	typedef Mix_Chunk *CFClient__MixChunk;	67	typedef Mix_Chunk *CFClient__MixChunk;
48	typedef Mix_Music *CFClient__MixMusic;	68	typedef Mix_Music *CFClient__MixMusic;
49		69
50	typedef PangoFontDescription *CFClient__Font;	70	typedef PangoFontDescription *CFClient__Font;
51		71
52	typedef struct cf_layout {	72	typedef struct cf_layout {
53	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
54	int base_height;	76	int base_height;
55	CFClient__Font font;	77	CFClient__Font font;
56	} *CFClient__Layout;	78	} *CFClient__Layout;
57		79
58	static CFClient__Font default_font;	80	static CFClient__Font default_font;
59	static PangoContext *context;	81	static PangoContext ft2_context, cairo_context;
60	static PangoFontMap *fontmap;	82	static PangoFontMap ft2_fontmap, cairo_fontmap;
61		83
62	static void	84	static void
63	substitute_func (FcPattern *pattern, gpointer data)	85	substitute_func (FcPattern *pattern, gpointer data)
64	{	86	{
65	FcPatternAddBool (pattern, FC_HINTING , 1);	87	FcPatternAddBool (pattern, FC_HINTING , 1);
66	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	88	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
67	}	89	}
68		90
69	static void	91	static void
70	layout_update_font (CFClient__Layout self)	92	layout_update_font (CFClient__Layout self)
71	{	93	{
…		…
83	static void	105	static void
84	layout_get_pixel_size (CFClient__Layout self, int w, int h)	106	layout_get_pixel_size (CFClient__Layout self, int w, int h)
85	{	107	{
86	pango_layout_get_pixel_size (self->pl, w, h);	108	pango_layout_get_pixel_size (self->pl, w, h);
87		109
88	w = (w + 3) & ~3;
89	if (!w) w = 1;	110	if (!w) w = 1;
90	if (!h) h = 1;	111	if (!h) h = 1;
		112
		113	w = (w + 3) & ~3;
91	}	114	}
92		115
93	typedef uint16_t mapface;	116	typedef uint16_t mapface;
94		117
95	typedef struct {	118	typedef struct {
…		…
243	}	266	}
244	}	267	}
245	}	268	}
246		269
247	static void	270	static void
248	music_finished ()	271	music_finished (void)
249	{	272	{
250	SDL_UserEvent ev;	273	SDL_UserEvent ev;
251		274
252	ev.type = SDL_USEREVENT;	275	ev.type = SDL_USEREVENT;
253	ev.code = 0;	276	ev.code = 0;
254	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;
255	ev.data2 = 0;	291	ev.data2 = 0;
256		292
257	SDL_PushEvent ((SDL_Event *)&ev);	293	SDL_PushEvent ((SDL_Event *)&ev);
258	}	294	}
259		295
…		…
370	# undef const_iv	406	# undef const_iv
371	};	407	};
372		408
373	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; )
374	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	410	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		411	}
375		412
		413	void
		414	pango_init ()
		415	CODE:
		416	{
		417	// delayed, so it can pick up new fonts added by AddFontResourceEx
376	fontmap = pango_ft2_font_map_new ();	418	ft2_fontmap = pango_ft2_font_map_new ();
377	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);
378	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);
379	}	424	}
380		425
381	int	426	int
382	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	427	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
383		428
…		…
442		487
443	while (SDL_PollEvent (&ev))	488	while (SDL_PollEvent (&ev))
444	{	489	{
445	HV *hv = newHV ();	490	HV *hv = newHV ();
446	hv_store (hv, "type", 4, newSViv (ev.type), 0);	491	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		492
447	switch (ev.type)	493	switch (ev.type)
448	{	494	{
449	case SDL_KEYDOWN:	495	case SDL_KEYDOWN:
450	case SDL_KEYUP:	496	case SDL_KEYUP:
451	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	497	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
471	case SDL_MOUSEBUTTONUP:	517	case SDL_MOUSEBUTTONUP:
472	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	518	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
473	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	519	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
474	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	520	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
475	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;
476	}	529	}
477		530
478	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	531	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
479	}	532	}
480	}	533	}
481		534
482	int	535	int
483	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)
484	POSTCALL:	537	POSTCALL:
485	Mix_HookMusicFinished (music_finished);	538	Mix_HookMusicFinished (music_finished);
		539	Mix_ChannelFinished (channel_finished);
486		540
487	void	541	void
488	Mix_CloseAudio ()	542	Mix_CloseAudio ()
489		543
490	int	544	int
…		…
513		567
514	void	568	void
515	add_font (char *file)	569	add_font (char *file)
516	CODE:	570	CODE:
517	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
518		576
519	void	577	void
520	load_image_inline (SV *image_)	578	load_image_inline (SV *image_)
521	ALIAS:	579	ALIAS:
522	load_image_file = 1	580	load_image_file = 1
…		…
604	PUSHs (sv_2mortal (newSViv (b / y)));	662	PUSHs (sv_2mortal (newSViv (b / y)));
605	PUSHs (sv_2mortal (newSViv (a / y)));	663	PUSHs (sv_2mortal (newSViv (a / y)));
606	}	664	}
607		665
608	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
609	fatal (char *message)	676	fatal (char *message)
610	CODE:	677	CODE:
611	#ifdef _WIN32	678	#ifdef _WIN32
612	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);
613	#else	680	#else
…		…
616	exit (1);	683	exit (1);
617		684
618	MODULE = CFClient PACKAGE = CFClient::Font	685	MODULE = CFClient PACKAGE = CFClient::Font
619		686
620	CFClient::Font	687	CFClient::Font
621	new_from_file (SV class, char path)	688	new_from_file (SV class, char path, int id = 0)
622	CODE:	689	CODE:
623	{	690	{
624	int count;	691	int count;
625	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, 0, 0, &count);	692	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
626	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	693	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
627	FcPatternDestroy (pattern);	694	FcPatternDestroy (pattern);
628	}	695	}
629	OUTPUT:	696	OUTPUT:
630	RETVAL	697	RETVAL
…		…
640	default_font = self;	707	default_font = self;
641		708
642	MODULE = CFClient PACKAGE = CFClient::Layout	709	MODULE = CFClient PACKAGE = CFClient::Layout
643		710
644	CFClient::Layout	711	CFClient::Layout
645	new (SV *class, int base_height = MIN_FONT_HEIGHT)	712	new (SV *class, int rgba = 0)
646	CODE:	713	CODE:
647	New (0, RETVAL, 1, struct cf_layout);	714	New (0, RETVAL, 1, struct cf_layout);
648	RETVAL->pl = pango_layout_new (context);	715
649	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;
650	RETVAL->font = 0;	723	RETVAL->font = 0;
		724
651	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	725	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
652	pango_layout_set_font_description (RETVAL->pl, default_font);	726	layout_update_font (RETVAL);
653	OUTPUT:	727	OUTPUT:
654	RETVAL	728	RETVAL
655		729
656	void	730	void
657	DESTROY (CFClient::Layout self)	731	DESTROY (CFClient::Layout self)
658	CODE:	732	CODE:
659	g_object_unref (self->pl);	733	g_object_unref (self->pl);
660	Safefree (self);	734	Safefree (self);
661		735
		736	int
		737	is_rgba (CFClient::Layout self)
		738	CODE:
		739	RETVAL = self->rgba;
		740	OUTPUT:
		741	RETVAL
		742
662	void	743	void
663	set_text (CFClient::Layout self, SV *text_)	744	set_text (CFClient::Layout self, SV *text_)
664	CODE:	745	CODE:
665	{	746	{
666	STRLEN textlen;	747	STRLEN textlen;
…		…
684	CODE:	765	CODE:
685	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	766	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
686	SvUTF8_on (RETVAL);	767	SvUTF8_on (RETVAL);
687	OUTPUT:	768	OUTPUT:
688	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;
689		778
690	void	779	void
691	set_font (CFClient::Layout self, CFClient::Font font = 0)	780	set_font (CFClient::Layout self, CFClient::Font font = 0)
692	CODE:	781	CODE:
693	if (self->font != font)	782	if (self->font != font)
…		…
751	render (CFClient::Layout self)	840	render (CFClient::Layout self)
752	PPCODE:	841	PPCODE:
753	{	842	{
754	SV *retval;	843	SV *retval;
755	int w, h;	844	int w, h;
756	FT_Bitmap bitmap;
757		845
758	layout_get_pixel_size (self, &w, &h);	846	layout_get_pixel_size (self, &w, &h);
759		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
760	retval = newSV (w * h);	894	retval = newSV (w * h);
761	SvPOK_only (retval);	895	SvPOK_only (retval);
762	SvCUR_set (retval, w * h);	896	SvCUR_set (retval, w * h);
763		897
764	bitmap.rows = h;	898	bitmap.rows = h;
765	bitmap.width = w;	899	bitmap.width = w;
766	bitmap.pitch = w;	900	bitmap.pitch = w;
767	bitmap.buffer = (unsigned char*)SvPVX (retval);	901	bitmap.buffer = (unsigned char*)SvPVX (retval);
768	bitmap.num_grays = 256;	902	bitmap.num_grays = 256;
769	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	903	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
770		904
771	memset (bitmap.buffer, 0, w * h);	905	memset (bitmap.buffer, 0, w * h);
772		906
773	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);
774		908
775	EXTEND (SP, 3);	909	EXTEND (SP, 5);
776	PUSHs (sv_2mortal (newSViv (w)));	910	PUSHs (sv_2mortal (newSViv (w)));
777	PUSHs (sv_2mortal (newSViv (h)));	911	PUSHs (sv_2mortal (newSViv (h)));
778	PUSHs (sv_2mortal (retval));	912	PUSHs (sv_2mortal (retval));
		913	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		914	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		915	}
779	}	916	}
780		917
781	MODULE = CFClient PACKAGE = CFClient::Texture	918	MODULE = CFClient PACKAGE = CFClient::Texture
782		919
783	void	920	void
784	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)
785	PROTOTYPE: $$$;$$	922	PROTOTYPE: $$$;$$
		923	ALIAS:
		924	draw_quad_alpha = 1
		925	draw_quad_alpha_premultiplied = 2
786	CODE:	926	CODE:
787	{	927	{
788	HV hv = (HV )SvRV (self);	928	HV hv = (HV )SvRV (self);
789	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	929	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
790	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	930	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
795	{	935	{
796	w = SvNV (*hv_fetch (hv, "w", 1, 1));	936	w = SvNV (*hv_fetch (hv, "w", 1, 1));
797	h = SvNV (*hv_fetch (hv, "h", 1, 1));	937	h = SvNV (*hv_fetch (hv, "h", 1, 1));
798	}	938	}
799		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
800	glBindTexture (GL_TEXTURE_2D, name);	946	glBindTexture (GL_TEXTURE_2D, name);
		947
801	if (wrap_mode) {	948	if (wrap_mode)
		949	{
802	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	950	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
803	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	951	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
804	}	952	}
		953
805	glBegin (GL_QUADS);	954	glBegin (GL_QUADS);
806	glTexCoord2f (0, 0); glVertex2f (x , y );	955	glTexCoord2f (0, 0); glVertex2f (x , y );
807	glTexCoord2f (0, t); glVertex2f (x , y + h);	956	glTexCoord2f (0, t); glVertex2f (x , y + h);
808	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	957	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
809	glTexCoord2f (s, 0); glVertex2f (x + w, y );	958	glTexCoord2f (s, 0); glVertex2f (x + w, y );
810	glEnd ();	959	glEnd ();
		960
		961	if (ix)
		962	glDisable (GL_BLEND);
811	}	963	}
812		964
813	MODULE = CFClient PACKAGE = CFClient::Map	965	MODULE = CFClient PACKAGE = CFClient::Map
814		966
815	CFClient::Map	967	CFClient::Map
…		…
1324	} *civ, const_iv[] = {	1476	} *civ, const_iv[] = {
1325	# define const_iv(name) { # name, (IV)name }	1477	# define const_iv(name) { # name, (IV)name }
1326	const_iv (GL_COLOR_MATERIAL),	1478	const_iv (GL_COLOR_MATERIAL),
1327	const_iv (GL_SMOOTH),	1479	const_iv (GL_SMOOTH),
1328	const_iv (GL_FLAT),	1480	const_iv (GL_FLAT),
		1481	const_iv (GL_DITHER),
1329	const_iv (GL_BLEND),	1482	const_iv (GL_BLEND),
		1483	const_iv (GL_SCISSOR_TEST),
1330	const_iv (GL_AND),	1484	const_iv (GL_AND),
		1485	const_iv (GL_ONE),
		1486	const_iv (GL_ZERO),
1331	const_iv (GL_SRC_ALPHA),	1487	const_iv (GL_SRC_ALPHA),
		1488	const_iv (GL_SRC_ALPHA_SATURATE),
1332	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1489	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1490	const_iv (GL_ONE_MINUS_DST_ALPHA),
1333	const_iv (GL_RGB),	1491	const_iv (GL_RGB),
1334	const_iv (GL_RGBA),	1492	const_iv (GL_RGBA),
1335	const_iv (GL_UNSIGNED_BYTE),	1493	const_iv (GL_UNSIGNED_BYTE),
1336	const_iv (GL_ALPHA4),
1337	const_iv (GL_ALPHA),	1494	const_iv (GL_ALPHA),
		1495	const_iv (GL_LUMINANCE),
1338	const_iv (GL_FLOAT),	1496	const_iv (GL_FLOAT),
1339	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1497	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1340	const_iv (GL_COMPILE),	1498	const_iv (GL_COMPILE),
1341	const_iv (GL_TEXTURE_1D),	1499	const_iv (GL_TEXTURE_1D),
1342	const_iv (GL_TEXTURE_2D),	1500	const_iv (GL_TEXTURE_2D),
…		…
1353	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1511	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1354	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1512	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1355	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1513	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1356	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1514	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1357	const_iv (GL_GENERATE_MIPMAP),	1515	const_iv (GL_GENERATE_MIPMAP),
1358	const_iv (GL_LINEAR),
1359	const_iv (GL_MODULATE),	1516	const_iv (GL_MODULATE),
		1517	const_iv (GL_DECAL),
1360	const_iv (GL_REPLACE),	1518	const_iv (GL_REPLACE),
1361	const_iv (GL_COLOR_BUFFER_BIT),	1519	const_iv (GL_COLOR_BUFFER_BIT),
1362	const_iv (GL_PROJECTION),	1520	const_iv (GL_PROJECTION),
1363	const_iv (GL_MODELVIEW),	1521	const_iv (GL_MODELVIEW),
1364	const_iv (GL_COLOR_LOGIC_OP),	1522	const_iv (GL_COLOR_LOGIC_OP),
		1523	const_iv (GL_SEPARABLE_2D),
1365	const_iv (GL_CONVOLUTION_2D),	1524	const_iv (GL_CONVOLUTION_2D),
1366	const_iv (GL_CONVOLUTION_BORDER_MODE),	1525	const_iv (GL_CONVOLUTION_BORDER_MODE),
1367	const_iv (GL_CONSTANT_BORDER),	1526	const_iv (GL_CONSTANT_BORDER),
1368	const_iv (GL_LINES),	1527	const_iv (GL_LINES),
1369	const_iv (GL_QUADS),	1528	const_iv (GL_QUADS),
…		…
1394		1553
1395	void glBlendFunc (int sfactor, int dfactor)	1554	void glBlendFunc (int sfactor, int dfactor)
1396		1555
1397	void glLogicOp (int opcode)	1556	void glLogicOp (int opcode)
1398		1557
		1558	void glColorMask (int red, int green, int blue, int alpha)
		1559
1399	void glMatrixMode (int mode)	1560	void glMatrixMode (int mode)
1400		1561
1401	void glPushMatrix ()	1562	void glPushMatrix ()
1402		1563
1403	void glPopMatrix ()	1564	void glPopMatrix ()
1404		1565
1405	void glLoadIdentity ()	1566	void glLoadIdentity ()
1406		1567
		1568	# near and far are due to microsofts buggy c compiler
1407	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_)
1408		1570
1409	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)
1410		1574
1411	void glTranslate (float x, float y, float z = 0.)	1575	void glTranslate (float x, float y, float z = 0.)
1412	CODE:	1576	CODE:
1413	glTranslatef (x, y, z);	1577	glTranslatef (x, y, z);
1414		1578
1415	void glScale (float x, float y, float z)	1579	void glScale (float x, float y, float z = 1.)
1416	CODE:	1580	CODE:
1417	glScalef (x, y, z);	1581	glScalef (x, y, z);
1418		1582
1419	void glRotate (float angle, float x, float y, float z)	1583	void glRotate (float angle, float x, float y, float z)
1420	CODE:	1584	CODE:
…		…
1425	void glEnd ()	1589	void glEnd ()
1426		1590
1427	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)
1428	PROTOTYPE: @	1592	PROTOTYPE: @
1429	CODE:	1593	CODE:
1430	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);
1431		1596
1432	void glVertex (float x, float y, float z = 0.)	1597	void glVertex (float x, float y, float z = 0.)
1433	CODE:	1598	CODE:
1434	glVertex3f (x, y, z);	1599	glVertex3f (x, y, z);
1435		1600
…		…
1447		1612
1448	void glBindTexture (int target, int name)	1613	void glBindTexture (int target, int name)
1449		1614
1450	void glConvolutionParameter (int target, int pname, float params)	1615	void glConvolutionParameter (int target, int pname, float params)
1451	CODE:	1616	CODE:
1452	glConvolutionParameterf (target, pname, params);	1617	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1453		1618
1454	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)
		1620	CODE:
		1621	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
		1622	(target, internalformat, width, height, format, type, data));
		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));
1455		1628
1456	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)
1457		1630
1458	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)
1459		1638
1460	int glGenTexture ()	1639	int glGenTexture ()
1461	CODE:	1640	CODE:
1462	{	1641	{
1463	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.61 by root, Sun Apr 23 21:47:30 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.61 by root, Sun Apr 23 21:47:30 2006 UTC vs.
Revision 1.79 by root, Sun May 14 22:24:14 2006 UTC