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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.62 by root, Mon Apr 24 02:41:47 2006 UTC vs.
Revision 1.80 by root, Sun May 14 22:58:24 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2	# include <malloc.h>	3	# include <malloc.h>
		4	# include <windows.h>
		5	# pragma warning(disable:4244)
3	#endif	6	#endif
4		7
5	#include "EXTERN.h"	8	#include "EXTERN.h"
6	#include "perl.h"	9	#include "perl.h"
7	#include "XSUB.h"	10	#include "XSUB.h"
8		11
		12	#include <math.h>
9	#include <string.h>	13	#include <string.h>
10	#include <stdio.h>	14	#include <stdio.h>
11		15
12	#include <SDL.h>	16	#include <SDL.h>
		17	#include <SDL_endian.h>
13	#include <SDL_image.h>	18	#include <SDL_image.h>
14	#include <SDL_mixer.h>	19	#include <SDL_mixer.h>
15	#include <SDL_opengl.h>	20	#include <SDL_opengl.h>
16		21
17	#include <glib/gmacros.h>	22	#include <glib/gmacros.h>
18		23
19	#include <pango/pango.h>	24	#include <pango/pango.h>
20	#include <pango/pangofc-fontmap.h>	25	#include <pango/pangofc-fontmap.h>
21	#include <pango/pangoft2.h>	26	#include <pango/pangoft2.h>
		27	#include <pango/pangocairo.h>
22		28
23	#ifndef _WIN32	29	#ifndef _WIN32
24	# include <sys/types.h>	30	# include <sys/types.h>
25	# include <sys/socket.h>	31	# include <sys/socket.h>
26	# include <netinet/in.h>	32	# include <netinet/in.h>
40	#define FOW_DARKNESS 32	46	#define FOW_DARKNESS 32
41		47
42	#define MAP_EXTEND_X 32	48	#define MAP_EXTEND_X 32
43	#define MAP_EXTEND_Y 512	49	#define MAP_EXTEND_Y 512
44		50
45	#define MIN_FONT_HEIGHT 8	51	#define MIN_FONT_HEIGHT 10
		52
		53	#define GL_CALL(type,func,args) \
		54	{ \
		55	static int init_; \
		56	static type fptr_; \
		57	\
		58	if (!init_) \
		59	{ \
		60	init_ = 1; \
		61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
		62	} \
		63	\
		64	if (fptr_) \
		65	fptr_ args; \
		66	}
46		67
47	typedef Mix_Chunk *CFClient__MixChunk;	68	typedef Mix_Chunk *CFClient__MixChunk;
48	typedef Mix_Music *CFClient__MixMusic;	69	typedef Mix_Music *CFClient__MixMusic;
49		70
50	typedef PangoFontDescription *CFClient__Font;	71	typedef PangoFontDescription *CFClient__Font;
51		72
52	typedef struct cf_layout {	73	typedef struct cf_layout {
53	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
54	int base_height;	77	int base_height;
55	CFClient__Font font;	78	CFClient__Font font;
56	} *CFClient__Layout;	79	} *CFClient__Layout;
57		80
58	static CFClient__Font default_font;	81	static CFClient__Font default_font;
59	static PangoContext *context;	82	static PangoContext ft2_context, cairo_context;
60	static PangoFontMap *fontmap;	83	static PangoFontMap ft2_fontmap, cairo_fontmap;
61		84
62	static void	85	static void
63	substitute_func (FcPattern *pattern, gpointer data)	86	substitute_func (FcPattern *pattern, gpointer data)
64	{	87	{
65	FcPatternAddBool (pattern, FC_HINTING , 1);	88	FcPatternAddBool (pattern, FC_HINTING , 1);
66	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	89	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
67	}	90	}
68		91
69	static void	92	static void
70	layout_update_font (CFClient__Layout self)	93	layout_update_font (CFClient__Layout self)
71	{	94	{
…		…
83	static void	106	static void
84	layout_get_pixel_size (CFClient__Layout self, int w, int h)	107	layout_get_pixel_size (CFClient__Layout self, int w, int h)
85	{	108	{
86	pango_layout_get_pixel_size (self->pl, w, h);	109	pango_layout_get_pixel_size (self->pl, w, h);
87		110
88	w = (w + 3) & ~3;
89	if (!w) w = 1;	111	if (!w) w = 1;
90	if (!h) h = 1;	112	if (!h) h = 1;
		113
		114	w = (w + 3) & ~3;
91	}	115	}
92		116
93	typedef uint16_t mapface;	117	typedef uint16_t mapface;
94		118
95	typedef struct {	119	typedef struct {
…		…
243	}	267	}
244	}	268	}
245	}	269	}
246		270
247	static void	271	static void
248	music_finished ()	272	music_finished (void)
249	{	273	{
250	SDL_UserEvent ev;	274	SDL_UserEvent ev;
251		275
252	ev.type = SDL_USEREVENT;	276	ev.type = SDL_USEREVENT;
253	ev.code = 0;	277	ev.code = 0;
254	ev.data1 = 0;	278	ev.data1 = 0;
		279	ev.data2 = 0;
		280
		281	SDL_PushEvent ((SDL_Event *)&ev);
		282	}
		283
		284	static void
		285	channel_finished (int channel)
		286	{
		287	SDL_UserEvent ev;
		288
		289	ev.type = SDL_USEREVENT;
		290	ev.code = 1;
		291	ev.data1 = (void *)(long)channel;
255	ev.data2 = 0;	292	ev.data2 = 0;
256		293
257	SDL_PushEvent ((SDL_Event *)&ev);	294	SDL_PushEvent ((SDL_Event *)&ev);
258	}	295	}
259		296
…		…
370	# undef const_iv	407	# undef const_iv
371	};	408	};
372		409
373	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	410	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
374	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	411	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		412	}
375		413
		414	void
		415	pango_init ()
		416	CODE:
		417	{
		418	// delayed, so it can pick up new fonts added by AddFontResourceEx
376	fontmap = pango_ft2_font_map_new ();	419	ft2_fontmap = pango_ft2_font_map_new ();
377	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);	420	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
378	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);	421	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
		422
		423	cairo_fontmap = pango_cairo_font_map_get_default ();
		424	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
379	}	425	}
380		426
381	int	427	int
382	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	428	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
383		429
…		…
442		488
443	while (SDL_PollEvent (&ev))	489	while (SDL_PollEvent (&ev))
444	{	490	{
445	HV *hv = newHV ();	491	HV *hv = newHV ();
446	hv_store (hv, "type", 4, newSViv (ev.type), 0);	492	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		493
447	switch (ev.type)	494	switch (ev.type)
448	{	495	{
449	case SDL_KEYDOWN:	496	case SDL_KEYDOWN:
450	case SDL_KEYUP:	497	case SDL_KEYUP:
451	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	498	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
471	case SDL_MOUSEBUTTONUP:	518	case SDL_MOUSEBUTTONUP:
472	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	519	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
473	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	520	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
474	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	521	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
475	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	522	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		523	break;
		524
		525	case SDL_USEREVENT:
		526	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		527	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		528	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		529	break;
476	}	530	}
477		531
478	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	532	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
479	}	533	}
480	}	534	}
481		535
482	int	536	int
483	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	537	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
484	POSTCALL:	538	POSTCALL:
485	Mix_HookMusicFinished (music_finished);	539	Mix_HookMusicFinished (music_finished);
		540	Mix_ChannelFinished (channel_finished);
486		541
487	void	542	void
488	Mix_CloseAudio ()	543	Mix_CloseAudio ()
489		544
490	int	545	int
…		…
513		568
514	void	569	void
515	add_font (char *file)	570	add_font (char *file)
516	CODE:	571	CODE:
517	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	572	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
		573	#ifdef _WIN32
		574	// cairo... sigh... requires win2000
		575	AddFontResourceEx (file, FR_PRIVATE, 0);
		576	#endif
518		577
519	void	578	void
520	load_image_inline (SV *image_)	579	load_image_inline (SV *image_)
521	ALIAS:	580	ALIAS:
522	load_image_file = 1	581	load_image_file = 1
…		…
604	PUSHs (sv_2mortal (newSViv (b / y)));	663	PUSHs (sv_2mortal (newSViv (b / y)));
605	PUSHs (sv_2mortal (newSViv (a / y)));	664	PUSHs (sv_2mortal (newSViv (a / y)));
606	}	665	}
607		666
608	void	667	void
		668	error (char *message)
		669	CODE:
		670	#ifdef _WIN32
		671	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
		672	#else
		673	fprintf (stderr, "ERROR: %s\n", message);
		674	#endif
		675
		676	void
609	fatal (char *message)	677	fatal (char *message)
610	CODE:	678	CODE:
611	#ifdef _WIN32	679	#ifdef _WIN32
612	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	680	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
613	#else	681	#else
…		…
616	exit (1);	684	exit (1);
617		685
618	MODULE = CFClient PACKAGE = CFClient::Font	686	MODULE = CFClient PACKAGE = CFClient::Font
619		687
620	CFClient::Font	688	CFClient::Font
621	new_from_file (SV class, char path)	689	new_from_file (SV class, char path, int id = 0)
622	CODE:	690	CODE:
623	{	691	{
624	int count;	692	int count;
625	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, 0, 0, &count);	693	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
626	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	694	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
627	FcPatternDestroy (pattern);	695	FcPatternDestroy (pattern);
628	}	696	}
629	OUTPUT:	697	OUTPUT:
630	RETVAL	698	RETVAL
…		…
640	default_font = self;	708	default_font = self;
641		709
642	MODULE = CFClient PACKAGE = CFClient::Layout	710	MODULE = CFClient PACKAGE = CFClient::Layout
643		711
644	CFClient::Layout	712	CFClient::Layout
645	new (SV *class, int base_height = MIN_FONT_HEIGHT)	713	new (SV *class, int rgba = 0)
646	CODE:	714	CODE:
647	New (0, RETVAL, 1, struct cf_layout);	715	New (0, RETVAL, 1, struct cf_layout);
648	RETVAL->pl = pango_layout_new (context);	716
649	RETVAL->base_height = base_height;	717	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
		718	RETVAL->rgba = rgba;
		719	RETVAL->r = 1.;
		720	RETVAL->g = 1.;
		721	RETVAL->b = 1.;
		722	RETVAL->a = 1.;
		723	RETVAL->base_height = MIN_FONT_HEIGHT;
650	RETVAL->font = 0;	724	RETVAL->font = 0;
		725
651	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	726	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
652	pango_layout_set_font_description (RETVAL->pl, default_font);	727	layout_update_font (RETVAL);
653	OUTPUT:	728	OUTPUT:
654	RETVAL	729	RETVAL
655		730
656	void	731	void
657	DESTROY (CFClient::Layout self)	732	DESTROY (CFClient::Layout self)
658	CODE:	733	CODE:
659	g_object_unref (self->pl);	734	g_object_unref (self->pl);
660	Safefree (self);	735	Safefree (self);
661		736
		737	int
		738	is_rgba (CFClient::Layout self)
		739	CODE:
		740	RETVAL = self->rgba;
		741	OUTPUT:
		742	RETVAL
		743
662	void	744	void
663	set_text (CFClient::Layout self, SV *text_)	745	set_text (CFClient::Layout self, SV *text_)
664	CODE:	746	CODE:
665	{	747	{
666	STRLEN textlen;	748	STRLEN textlen;
…		…
684	CODE:	766	CODE:
685	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	767	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
686	SvUTF8_on (RETVAL);	768	SvUTF8_on (RETVAL);
687	OUTPUT:	769	OUTPUT:
688	RETVAL	770	RETVAL
		771
		772	void
		773	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
		774	CODE:
		775	self->r = r;
		776	self->g = g;
		777	self->b = b;
		778	self->a = a;
689		779
690	void	780	void
691	set_font (CFClient::Layout self, CFClient::Font font = 0)	781	set_font (CFClient::Layout self, CFClient::Font font = 0)
692	CODE:	782	CODE:
693	if (self->font != font)	783	if (self->font != font)
…		…
751	render (CFClient::Layout self)	841	render (CFClient::Layout self)
752	PPCODE:	842	PPCODE:
753	{	843	{
754	SV *retval;	844	SV *retval;
755	int w, h;	845	int w, h;
756	FT_Bitmap bitmap;
757		846
758	layout_get_pixel_size (self, &w, &h);	847	layout_get_pixel_size (self, &w, &h);
759		848
		849	if (self->rgba)
		850	{
		851	cairo_surface_t *surface;
		852	cairo_t *cairo;
		853
		854	retval = newSV (w * h * 4);
		855	SvPOK_only (retval);
		856	SvCUR_set (retval, w * h * 4);
		857
		858	memset (SvPVX (retval), 0, w * h * 4);
		859
		860	surface = cairo_image_surface_create_for_data (
		861	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		862	cairo = cairo_create (surface);
		863	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		864
		865	pango_cairo_show_layout (cairo, self->pl);
		866
		867	cairo_destroy (cairo);
		868	cairo_surface_destroy (surface);
		869
		870	// what a mess, and its premultiplied, too :(
		871	{
		872	uint32_t p = (uint32_t )SvPVX (retval);
		873	uint32_t e = p + w h;
		874
		875	while (p < e)
		876	{
		877	uint32_t rgba = *p;
		878	rgba = (rgba >> 24) \| (rgba << 8);
		879	rgba = SDL_SwapBE32 (rgba);
		880	*p++ = rgba;
		881	}
		882	}
		883
		884	EXTEND (SP, 5);
		885	PUSHs (sv_2mortal (newSViv (w)));
		886	PUSHs (sv_2mortal (newSViv (h)));
		887	PUSHs (sv_2mortal (retval));
		888	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		889	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		890	}
		891	else
		892	{
		893	FT_Bitmap bitmap;
		894
760	retval = newSV (w * h);	895	retval = newSV (w * h);
761	SvPOK_only (retval);	896	SvPOK_only (retval);
762	SvCUR_set (retval, w * h);	897	SvCUR_set (retval, w * h);
763		898
764	bitmap.rows = h;	899	bitmap.rows = h;
765	bitmap.width = w;	900	bitmap.width = w;
766	bitmap.pitch = w;	901	bitmap.pitch = w;
767	bitmap.buffer = (unsigned char*)SvPVX (retval);	902	bitmap.buffer = (unsigned char*)SvPVX (retval);
768	bitmap.num_grays = 256;	903	bitmap.num_grays = 256;
769	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	904	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
770		905
771	memset (bitmap.buffer, 0, w * h);	906	memset (bitmap.buffer, 0, w * h);
772		907
773	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	908	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
774		909
775	EXTEND (SP, 3);	910	EXTEND (SP, 5);
776	PUSHs (sv_2mortal (newSViv (w)));	911	PUSHs (sv_2mortal (newSViv (w)));
777	PUSHs (sv_2mortal (newSViv (h)));	912	PUSHs (sv_2mortal (newSViv (h)));
778	PUSHs (sv_2mortal (retval));	913	PUSHs (sv_2mortal (retval));
		914	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		915	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		916	}
779	}	917	}
780		918
781	MODULE = CFClient PACKAGE = CFClient::Texture	919	MODULE = CFClient PACKAGE = CFClient::Texture
782		920
783	void	921	void
784	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	922	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
785	PROTOTYPE: $$$;$$	923	PROTOTYPE: $$$;$$
		924	ALIAS:
		925	draw_quad_alpha = 1
		926	draw_quad_alpha_premultiplied = 2
786	CODE:	927	CODE:
787	{	928	{
788	HV hv = (HV )SvRV (self);	929	HV hv = (HV )SvRV (self);
789	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	930	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
790	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	931	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
795	{	936	{
796	w = SvNV (*hv_fetch (hv, "w", 1, 1));	937	w = SvNV (*hv_fetch (hv, "w", 1, 1));
797	h = SvNV (*hv_fetch (hv, "h", 1, 1));	938	h = SvNV (*hv_fetch (hv, "h", 1, 1));
798	}	939	}
799		940
		941	if (ix)
		942	{
		943	glEnable (GL_BLEND);
		944	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		945	}
		946
800	glBindTexture (GL_TEXTURE_2D, name);	947	glBindTexture (GL_TEXTURE_2D, name);
		948
801	if (wrap_mode) {	949	if (wrap_mode)
		950	{
802	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	951	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
803	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	952	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
804	}	953	}
		954
805	glBegin (GL_QUADS);	955	glBegin (GL_QUADS);
806	glTexCoord2f (0, 0); glVertex2f (x , y );	956	glTexCoord2f (0, 0); glVertex2f (x , y );
807	glTexCoord2f (0, t); glVertex2f (x , y + h);	957	glTexCoord2f (0, t); glVertex2f (x , y + h);
808	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	958	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
809	glTexCoord2f (s, 0); glVertex2f (x + w, y );	959	glTexCoord2f (s, 0); glVertex2f (x + w, y );
810	glEnd ();	960	glEnd ();
		961
		962	if (ix)
		963	glDisable (GL_BLEND);
811	}	964	}
812		965
813	MODULE = CFClient PACKAGE = CFClient::Map	966	MODULE = CFClient PACKAGE = CFClient::Map
814		967
815	CFClient::Map	968	CFClient::Map
…		…
1324	} *civ, const_iv[] = {	1477	} *civ, const_iv[] = {
1325	# define const_iv(name) { # name, (IV)name }	1478	# define const_iv(name) { # name, (IV)name }
1326	const_iv (GL_COLOR_MATERIAL),	1479	const_iv (GL_COLOR_MATERIAL),
1327	const_iv (GL_SMOOTH),	1480	const_iv (GL_SMOOTH),
1328	const_iv (GL_FLAT),	1481	const_iv (GL_FLAT),
		1482	const_iv (GL_DITHER),
1329	const_iv (GL_BLEND),	1483	const_iv (GL_BLEND),
		1484	const_iv (GL_SCISSOR_TEST),
1330	const_iv (GL_AND),	1485	const_iv (GL_AND),
		1486	const_iv (GL_ONE),
		1487	const_iv (GL_ZERO),
1331	const_iv (GL_SRC_ALPHA),	1488	const_iv (GL_SRC_ALPHA),
		1489	const_iv (GL_SRC_ALPHA_SATURATE),
1332	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1490	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1491	const_iv (GL_ONE_MINUS_DST_ALPHA),
1333	const_iv (GL_RGB),	1492	const_iv (GL_RGB),
1334	const_iv (GL_RGBA),	1493	const_iv (GL_RGBA),
1335	const_iv (GL_UNSIGNED_BYTE),	1494	const_iv (GL_UNSIGNED_BYTE),
1336	const_iv (GL_ALPHA4),
1337	const_iv (GL_ALPHA),	1495	const_iv (GL_ALPHA),
		1496	const_iv (GL_LUMINANCE),
1338	const_iv (GL_FLOAT),	1497	const_iv (GL_FLOAT),
1339	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1498	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1340	const_iv (GL_COMPILE),	1499	const_iv (GL_COMPILE),
1341	const_iv (GL_TEXTURE_1D),	1500	const_iv (GL_TEXTURE_1D),
1342	const_iv (GL_TEXTURE_2D),	1501	const_iv (GL_TEXTURE_2D),
…		…
1353	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1512	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1354	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1513	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1355	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1514	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1356	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1515	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1357	const_iv (GL_GENERATE_MIPMAP),	1516	const_iv (GL_GENERATE_MIPMAP),
1358	const_iv (GL_LINEAR),
1359	const_iv (GL_MODULATE),	1517	const_iv (GL_MODULATE),
		1518	const_iv (GL_DECAL),
1360	const_iv (GL_REPLACE),	1519	const_iv (GL_REPLACE),
1361	const_iv (GL_COLOR_BUFFER_BIT),	1520	const_iv (GL_COLOR_BUFFER_BIT),
1362	const_iv (GL_PROJECTION),	1521	const_iv (GL_PROJECTION),
1363	const_iv (GL_MODELVIEW),	1522	const_iv (GL_MODELVIEW),
1364	const_iv (GL_COLOR_LOGIC_OP),	1523	const_iv (GL_COLOR_LOGIC_OP),
		1524	const_iv (GL_SEPARABLE_2D),
1365	const_iv (GL_CONVOLUTION_2D),	1525	const_iv (GL_CONVOLUTION_2D),
1366	const_iv (GL_CONVOLUTION_BORDER_MODE),	1526	const_iv (GL_CONVOLUTION_BORDER_MODE),
1367	const_iv (GL_CONSTANT_BORDER),	1527	const_iv (GL_CONSTANT_BORDER),
1368	const_iv (GL_LINES),	1528	const_iv (GL_LINES),
1369	const_iv (GL_QUADS),	1529	const_iv (GL_QUADS),
…		…
1394		1554
1395	void glBlendFunc (int sfactor, int dfactor)	1555	void glBlendFunc (int sfactor, int dfactor)
1396		1556
1397	void glLogicOp (int opcode)	1557	void glLogicOp (int opcode)
1398		1558
		1559	void glColorMask (int red, int green, int blue, int alpha)
		1560
1399	void glMatrixMode (int mode)	1561	void glMatrixMode (int mode)
1400		1562
1401	void glPushMatrix ()	1563	void glPushMatrix ()
1402		1564
1403	void glPopMatrix ()	1565	void glPopMatrix ()
1404		1566
1405	void glLoadIdentity ()	1567	void glLoadIdentity ()
1406		1568
		1569	# 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)	1570	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1408		1571
1409	void glViewport (int x, int y, int width, int height)	1572	void glViewport (int x, int y, int width, int height)
		1573
		1574	void glScissor (int x, int y, int width, int height)
1410		1575
1411	void glTranslate (float x, float y, float z = 0.)	1576	void glTranslate (float x, float y, float z = 0.)
1412	CODE:	1577	CODE:
1413	glTranslatef (x, y, z);	1578	glTranslatef (x, y, z);
1414		1579
…		…
1425	void glEnd ()	1590	void glEnd ()
1426		1591
1427	void glColor (float r, float g, float b, float a = 1.0)	1592	void glColor (float r, float g, float b, float a = 1.0)
1428	PROTOTYPE: @	1593	PROTOTYPE: @
1429	CODE:	1594	CODE:
1430	glColor4f (r, g, b, a);	1595	glColor4ub (MIN ((int)r * 256., 255),
		1596	MIN ((int)g * 256., 255),
		1597	MIN ((int)b * 256., 255),
		1598	MIN ((int)a * 256., 255));
1431		1599
1432	void glVertex (float x, float y, float z = 0.)	1600	void glVertex (float x, float y, float z = 0.)
1433	CODE:	1601	CODE:
1434	glVertex3f (x, y, z);	1602	glVertex3f (x, y, z);
1435		1603
…		…
1447		1615
1448	void glBindTexture (int target, int name)	1616	void glBindTexture (int target, int name)
1449		1617
1450	void glConvolutionParameter (int target, int pname, float params)	1618	void glConvolutionParameter (int target, int pname, float params)
1451	CODE:	1619	CODE:
1452	glConvolutionParameterf (target, pname, params);	1620	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1453		1621
1454	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1622	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1623	CODE:
		1624	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
		1625	(target, internalformat, width, height, format, type, data));
		1626
		1627	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		1628	CODE:
		1629	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
		1630	(target, internalformat, width, height, format, type, row, column));
1455		1631
1456	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1632	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1457		1633
1458	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1634	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1635
		1636	void glRasterPos (int x, int y)
		1637	CODE:
		1638	glRasterPos2i (x, y);
		1639
		1640	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1459		1641
1460	int glGenTexture ()	1642	int glGenTexture ()
1461	CODE:	1643	CODE:
1462	{	1644	{
1463	GLuint name;	1645	GLuint name;

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.62 by root, Mon Apr 24 02:41:47 2006 UTC vs. Revision 1.80 by root, Sun May 14 22:58:24 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.62 by root, Mon Apr 24 02:41:47 2006 UTC vs.
Revision 1.80 by root, Sun May 14 22:58:24 2006 UTC