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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.93 by root, Tue May 23 18:54:37 2006 UTC vs.
Revision 1.115 by root, Wed Jun 14 18:59:30 2006 UTC

…		…
10	#include "XSUB.h"	10	#include "XSUB.h"
11		11
12	#include <math.h>	12	#include <math.h>
13	#include <string.h>	13	#include <string.h>
14	#include <stdio.h>	14	#include <stdio.h>
		15	#include <stdlib.h>
15		16
16	#include <SDL.h>	17	#include <SDL.h>
17	#include <SDL_endian.h>	18	#include <SDL_endian.h>
18	#include <SDL_image.h>	19	#include <SDL_image.h>
19	#include <SDL_mixer.h>	20	#include <SDL_mixer.h>
…		…
48	#define MAP_EXTEND_X 32	49	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	50	#define MAP_EXTEND_Y 512
50		51
51	#define MIN_FONT_HEIGHT 10	52	#define MIN_FONT_HEIGHT 10
52		53
53	#define GL_CALL(type,func,args) \	54	static struct
54	{ \	55	{
55	static int init_; \	56	#define GL_FUNC(ptr,name) ptr name;
56	static type fptr_; \	57	#include "glfunc.h"
57	\	58	#undef GL_FUNC
58	if (!init_) \	59	} gl;
59	{ \	60
60	init_ = 1; \	61	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \	62	{
62	} \	63	if (gl.BlendFuncSeparate)
63	\	64	gl.BlendFuncSeparate (sa, da, saa, daa);
64	if (fptr_) \	65	else if (gl.BlendFuncSeparateEXT)
65	fptr_ args; \	66	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	}	67	else
		68	glBlendFunc (sa, da);
		69	}
67		70
68	typedef Mix_Chunk *CFClient__MixChunk;	71	typedef Mix_Chunk *CFClient__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	72	typedef Mix_Music *CFClient__MixMusic;
70		73
71	typedef PangoFontDescription *CFClient__Font;	74	typedef PangoFontDescription *CFClient__Font;
…		…
83	static PangoFontMap ft2_fontmap, cairo_fontmap;	86	static PangoFontMap ft2_fontmap, cairo_fontmap;
84		87
85	static void	88	static void
86	substitute_func (FcPattern *pattern, gpointer data)	89	substitute_func (FcPattern *pattern, gpointer data)
87	{	90	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	91	FcPatternAddBool (pattern, FC_HINTING, 1);
		92	#ifdef FC_HINT_STYLE
		93	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		94	#endif
89	#ifdef _WIN32	95	#ifdef _WIN32
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91	#else	97	#else
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif	99	#endif
…		…
294	ev.code = 1;	300	ev.code = 1;
295	ev.data1 = (void *)(long)channel;	301	ev.data1 = (void *)(long)channel;
296	ev.data2 = 0;	302	ev.data2 = 0;
297		303
298	SDL_PushEvent ((SDL_Event *)&ev);	304	SDL_PushEvent ((SDL_Event *)&ev);
		305	}
		306
		307	static unsigned int
		308	minpot (unsigned int n)
		309	{
		310	if (!n)
		311	return 0;
		312
		313	--n;
		314
		315	n \|= n >> 1;
		316	n \|= n >> 2;
		317	n \|= n >> 4;
		318	n \|= n >> 8;
		319	n \|= n >> 16;
		320
		321	return n + 1;
299	}	322	}
300		323
301	MODULE = CFClient PACKAGE = CFClient	324	MODULE = CFClient PACKAGE = CFClient
302		325
303	PROTOTYPES: ENABLE	326	PROTOTYPES: ENABLE
…		…
416	}	439	}
417		440
418	void	441	void
419	pango_init ()	442	pango_init ()
420	CODE:	443	CODE:
421	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx	444	// delayed, so it can pick up new fonts added by AddFontResourceEx
		445	{
		446	{
423	ft2_fontmap = pango_ft2_font_map_new ();	447	ft2_fontmap = pango_ft2_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	448	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	449	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426		450	}
		451	{
		452	cairo_font_options_t *fopt = cairo_font_options_create ();
427	cairo_fontmap = pango_cairo_font_map_get_default ();	453	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);	454	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
		455	#ifdef _WIN32
		456	// cairo looks like shit eaten twice on windows
		457	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
		458	#else
		459	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
		460	#endif
		461	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
		462	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
		463	pango_cairo_context_set_font_options (cairo_context, fopt);
		464	cairo_font_options_destroy (fopt);
		465	}
429	}	466	}
430		467
431	int	468	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	469	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
433		470
…		…
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	481	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	482	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	483	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		484
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	485	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	486	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450		487
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	488	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	489	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	490	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	491	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	516	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	517	CODE:
481	RETVAL = !!SDL_SetVideoMode (	518	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	519	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	520	);
		521	if (RETVAL)
		522	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	523	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		524	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		525	# include "glfunc.h"
		526	# undef GL_FUNC
		527	}
485	OUTPUT:	528	OUTPUT:
486	RETVAL	529	RETVAL
487		530
488	void	531	void
489	SDL_GL_SwapBuffers ()	532	SDL_GL_SwapBuffers ()
		533
		534	char *
		535	SDL_GetKeyName (int sym)
490		536
491	void	537	void
492	SDL_PollEvent ()	538	SDL_PollEvent ()
493	PPCODE:	539	PPCODE:
494	{	540	{
495	SDL_Event ev;	541	SDL_Event ev;
496	int i;
497	static int modifier;
498	static int modkey[] = {
499	SDLK_RSHIFT, KMOD_RSHIFT,
500	SDLK_LSHIFT, KMOD_LSHIFT,
501	SDLK_RCTRL, KMOD_RCTRL,
502	SDLK_LCTRL, KMOD_LCTRL,
503	SDLK_RALT, KMOD_RALT,
504	SDLK_LALT, KMOD_LALT,
505	SDLK_RMETA, KMOD_RMETA,
506	SDLK_LMETA, KMOD_LMETA,
507	};
508		542
509	while (SDL_PollEvent (&ev))	543	while (SDL_PollEvent (&ev))
510	{	544	{
511	HV *hv = newHV ();	545	HV *hv = newHV ();
512	hv_store (hv, "type", 4, newSViv (ev.type), 0);	546	hv_store (hv, "type", 4, newSViv (ev.type), 0);
513		547
514	switch (ev.type)	548	switch (ev.type)
515	{	549	{
516	case SDL_KEYDOWN:	550	case SDL_KEYDOWN:
517	case SDL_KEYUP:	551	case SDL_KEYUP:
518
519	for (i = 0; i < sizeof (modkey) / (sizeof (int) * 2); i++)
520	if (modkey [i * 2] == ev.key.keysym.sym)
521	{
522	if (ev.type == SDL_KEYDOWN)
523	modifier \|= modkey [i * 2 + 1];
524	else
525	modifier &= ~modkey [i * 2 + 1];
526	break;
527	}
528
529	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	552	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
530	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	553	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
531	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	554	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
532	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	555	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
533	break;	556	break;
…		…
536	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	559	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
537	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	560	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
538	break;	561	break;
539		562
540	case SDL_MOUSEMOTION:	563	case SDL_MOUSEMOTION:
541	hv_store (hv, "mod", 3, newSViv (modifier), 0);	564	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
542		565
543	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	566	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
544	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	567	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
545	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	568	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
546	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	569	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
547	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	570	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
548	break;	571	break;
549		572
550	case SDL_MOUSEBUTTONDOWN:	573	case SDL_MOUSEBUTTONDOWN:
551	case SDL_MOUSEBUTTONUP:	574	case SDL_MOUSEBUTTONUP:
552	hv_store (hv, "mod", 3, newSViv (modifier), 0);	575	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
553		576
554	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	577	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
555	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	578	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
556	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	579	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
557	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	580	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
584	lowdelay (int fd, int val = 1)	607	lowdelay (int fd, int val = 1)
585	CODE:	608	CODE:
586	#ifndef _WIN32	609	#ifndef _WIN32
587	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	610	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
588	#endif	611	#endif
589
590	char *
591	gl_vendor ()
592	CODE:
593	RETVAL = (char *)glGetString (GL_VENDOR);
594	OUTPUT:
595	RETVAL
596
597	char *
598	gl_version ()
599	CODE:
600	RETVAL = (char *)glGetString (GL_VERSION);
601	OUTPUT:
602	RETVAL
603
604	char *
605	gl_extensions ()
606	CODE:
607	RETVAL = (char *)glGetString (GL_EXTENSIONS);
608	OUTPUT:
609	RETVAL
610		612
611	void	613	void
612	add_font (char *file)	614	add_font (char *file)
613	CODE:	615	CODE:
614	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	616	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
671	PUSHs (sv_2mortal (newSViv (surface2->w)));	673	PUSHs (sv_2mortal (newSViv (surface2->w)));
672	PUSHs (sv_2mortal (newSViv (surface2->h)));	674	PUSHs (sv_2mortal (newSViv (surface2->h)));
673	SDL_LockSurface (surface2);	675	SDL_LockSurface (surface2);
674	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	676	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
675	SDL_UnlockSurface (surface2);	677	SDL_UnlockSurface (surface2);
676	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	678	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA8 : GL_RGB8)));
677	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	679	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
678	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	680	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
679		681
680	SDL_FreeSurface (surface);	682	SDL_FreeSurface (surface);
681	SDL_FreeSurface (surface2);	683	SDL_FreeSurface (surface2);
…		…
719	CODE:	721	CODE:
720	fprintf (stderr, "FATAL: %s\n", message);	722	fprintf (stderr, "FATAL: %s\n", message);
721	#ifdef _WIN32	723	#ifdef _WIN32
722	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	724	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
723	#endif	725	#endif
724	exit (1);	726	_exit (1);
		727
		728	void
		729	_exit (int retval)
		730	CODE:
		731	_exit (retval);
725		732
726	MODULE = CFClient PACKAGE = CFClient::Font	733	MODULE = CFClient PACKAGE = CFClient::Font
727		734
728	CFClient::Font	735	CFClient::Font
729	new_from_file (SV class, char path, int id = 0)	736	new_from_file (SV class, char path, int id = 0)
…		…
750	MODULE = CFClient PACKAGE = CFClient::Layout	757	MODULE = CFClient PACKAGE = CFClient::Layout
751		758
752	CFClient::Layout	759	CFClient::Layout
753	new (SV *class, int rgba = 0)	760	new (SV *class, int rgba = 0)
754	CODE:	761	CODE:
755	#if _WIN32
756	rgba = 0;//D
757	#endif
758	New (0, RETVAL, 1, struct cf_layout);	762	New (0, RETVAL, 1, struct cf_layout);
759		763
760	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	764	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
761	RETVAL->rgba = rgba;	765	RETVAL->rgba = rgba;
762	RETVAL->r = 1.;	766	RETVAL->r = 1.;
…		…
806		810
807	SV *	811	SV *
808	get_text (CFClient::Layout self)	812	get_text (CFClient::Layout self)
809	CODE:	813	CODE:
810	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	814	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
811	SvUTF8_on (RETVAL);	815	sv_utf8_decode (RETVAL);
812	OUTPUT:	816	OUTPUT:
813	RETVAL	817	RETVAL
814		818
815	void	819	void
816	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	820	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
…		…
963		967
964	EXTEND (SP, 5);	968	EXTEND (SP, 5);
965	PUSHs (sv_2mortal (newSViv (w)));	969	PUSHs (sv_2mortal (newSViv (w)));
966	PUSHs (sv_2mortal (newSViv (h)));	970	PUSHs (sv_2mortal (newSViv (h)));
967	PUSHs (sv_2mortal (retval));	971	PUSHs (sv_2mortal (retval));
968	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	972	PUSHs (sv_2mortal (newSViv (GL_RGBA8)));
969	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	973	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
970	}	974	}
971	else	975	else
972	{	976	{
973	FT_Bitmap bitmap;	977	FT_Bitmap bitmap;
…		…
997	}	1001	}
998		1002
999	MODULE = CFClient PACKAGE = CFClient::Texture	1003	MODULE = CFClient PACKAGE = CFClient::Texture
1000		1004
1001	void	1005	void
		1006	pad2pot (SV data_, SV w_, SV *h_)
		1007	CODE:
		1008	{
		1009	int ow = SvIV (w_);
		1010	int oh = SvIV (h_);
		1011
		1012	if (ow && oh)
		1013	{
		1014	int nw = minpot (ow);
		1015	int nh = minpot (oh);
		1016
		1017	if (nw != ow \|\| nh != oh)
		1018	{
		1019	if (SvOK (data_))
		1020	{
		1021	STRLEN datalen;
		1022	char *data = SvPVbyte (data_, datalen);
		1023	int bpp = datalen / (ow * oh);
		1024	SV result_ = sv_2mortal (newSV (nw nh * bpp));
		1025
		1026	SvPOK_only (result_);
		1027	SvCUR_set (result_, nw * nh * bpp);
		1028
		1029	memset (SvPVX (result_), 0, nw * nh * bpp);
		1030	while (oh--)
		1031	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1032
		1033	sv_setsv (data_, result_);
		1034	}
		1035
		1036	sv_setiv (w_, nw);
		1037	sv_setiv (h_, nh);
		1038	}
		1039	}
		1040	}
		1041
		1042	void
1002	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1043	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1003	PROTOTYPE: $$$;$$	1044	PROTOTYPE: $$$;$$
1004	ALIAS:	1045	ALIAS:
1005	draw_quad_alpha = 1	1046	draw_quad_alpha = 1
1006	draw_quad_alpha_premultiplied = 2	1047	draw_quad_alpha_premultiplied = 2
1007	CODE:	1048	CODE:
1008	{	1049	{
1009	HV hv = (HV )SvRV (self);	1050	HV hv = (HV )SvRV (self);
1010	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1051	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1011	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1052	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1012	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1053	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1013	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
1014		1054
1015	if (items < 5)	1055	if (items < 5)
1016	{	1056	{
1017	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1057	w = SvNV (*hv_fetch (hv, "w", 1, 1));
1018	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1058	h = SvNV (*hv_fetch (hv, "h", 1, 1));
1019	}	1059	}
1020		1060
1021	if (ix)	1061	if (ix)
1022	{	1062	{
1023	glEnable (GL_BLEND);	1063	glEnable (GL_BLEND);
		1064
		1065	if (ix == 2)
1024	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1066	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1067	else
		1068	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1069	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1070
1025	glEnable (GL_ALPHA_TEST);	1071	glEnable (GL_ALPHA_TEST);
1026	glAlphaFunc (GL_GREATER, 0.01f);	1072	glAlphaFunc (GL_GREATER, 0.01f);
1027	}	1073	}
1028		1074
1029	glBindTexture (GL_TEXTURE_2D, name);	1075	glBindTexture (GL_TEXTURE_2D, name);
1030
1031	if (wrap_mode)
1032	{
1033	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1034	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1035	}
1036		1076
1037	glBegin (GL_QUADS);	1077	glBegin (GL_QUADS);
1038	glTexCoord2f (0, 0); glVertex2f (x , y );	1078	glTexCoord2f (0, 0); glVertex2f (x , y );
1039	glTexCoord2f (0, t); glVertex2f (x , y + h);	1079	glTexCoord2f (0, t); glVertex2f (x , y + h);
1040	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1080	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1073	DESTROY (CFClient::Map self)	1113	DESTROY (CFClient::Map self)
1074	CODE:	1114	CODE:
1075	{	1115	{
1076	map_clear (self);	1116	map_clear (self);
1077	Safefree (self->face);	1117	Safefree (self->face);
		1118	Safefree (self->tex);
1078	Safefree (self);	1119	Safefree (self);
1079	}	1120	}
1080		1121
1081	void	1122	void
1082	clear (CFClient::Map self)	1123	clear (CFClient::Map self)
…		…
1117	tex->r = r;	1158	tex->r = r;
1118	tex->g = g;	1159	tex->g = g;
1119	tex->b = b;	1160	tex->b = b;
1120	tex->a = a;	1161	tex->a = a;
1121	}	1162	}
		1163
		1164	// somewhat hackish, but for textures that require it, it really
		1165	// improves the look, and most others don't suffer.
		1166	glBindTexture (GL_TEXTURE_2D, name);
		1167	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1168	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1169	// use uglier nearest interpolation because linear suffers
		1170	// from transparent color bleeding and ugly wrapping effects.
		1171	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1122	}	1172	}
1123		1173
1124	int	1174	int
1125	ox (CFClient::Map self)	1175	ox (CFClient::Map self)
1126	ALIAS:	1176	ALIAS:
1127	oy = 1	1177	oy = 1
		1178	x = 2
		1179	y = 3
		1180	w = 4
		1181	h = 5
1128	CODE:	1182	CODE:
1129	switch (ix)	1183	switch (ix)
1130	{	1184	{
1131	case 0: RETVAL = self->ox; break;	1185	case 0: RETVAL = self->ox; break;
1132	case 1: RETVAL = self->oy; break;	1186	case 1: RETVAL = self->oy; break;
		1187	case 2: RETVAL = self->x; break;
		1188	case 3: RETVAL = self->y; break;
		1189	case 4: RETVAL = self->w; break;
		1190	case 5: RETVAL = self->h; break;
1133	}	1191	}
1134	OUTPUT:	1192	OUTPUT:
1135	RETVAL	1193	RETVAL
1136		1194
1137	void	1195	void
…		…
1574	const_iv (GL_RESCALE_NORMAL),	1632	const_iv (GL_RESCALE_NORMAL),
1575	const_iv (GL_AND),	1633	const_iv (GL_AND),
1576	const_iv (GL_ONE),	1634	const_iv (GL_ONE),
1577	const_iv (GL_ZERO),	1635	const_iv (GL_ZERO),
1578	const_iv (GL_SRC_ALPHA),	1636	const_iv (GL_SRC_ALPHA),
1579	const_iv (GL_SRC_ALPHA_SATURATE),	1637	const_iv (GL_DST_ALPHA),
1580	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1638	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1581	const_iv (GL_ONE_MINUS_DST_ALPHA),	1639	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1640	const_iv (GL_SRC_ALPHA_SATURATE),
1582	const_iv (GL_RGB),	1641	const_iv (GL_RGB),
1583	const_iv (GL_RGBA),	1642	const_iv (GL_RGBA),
		1643	const_iv (GL_RGBA4),
		1644	const_iv (GL_RGBA8),
		1645	const_iv (GL_RGB5_A1),
1584	const_iv (GL_UNSIGNED_BYTE),	1646	const_iv (GL_UNSIGNED_BYTE),
1585	const_iv (GL_UNSIGNED_SHORT),	1647	const_iv (GL_UNSIGNED_SHORT),
1586	const_iv (GL_UNSIGNED_INT),	1648	const_iv (GL_UNSIGNED_INT),
1587	const_iv (GL_ALPHA),	1649	const_iv (GL_ALPHA),
1588	const_iv (GL_INTENSITY),	1650	const_iv (GL_INTENSITY),
…		…
1597	const_iv (GL_TEXTURE_MAG_FILTER),	1659	const_iv (GL_TEXTURE_MAG_FILTER),
1598	const_iv (GL_TEXTURE_MIN_FILTER),	1660	const_iv (GL_TEXTURE_MIN_FILTER),
1599	const_iv (GL_TEXTURE_ENV_MODE),	1661	const_iv (GL_TEXTURE_ENV_MODE),
1600	const_iv (GL_TEXTURE_WRAP_S),	1662	const_iv (GL_TEXTURE_WRAP_S),
1601	const_iv (GL_TEXTURE_WRAP_T),	1663	const_iv (GL_TEXTURE_WRAP_T),
		1664	const_iv (GL_REPEAT),
1602	const_iv (GL_CLAMP),	1665	const_iv (GL_CLAMP),
1603	const_iv (GL_REPEAT),	1666	const_iv (GL_CLAMP_TO_EDGE),
1604	const_iv (GL_NEAREST),	1667	const_iv (GL_NEAREST),
1605	const_iv (GL_LINEAR),	1668	const_iv (GL_LINEAR),
1606	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1669	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1607	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1670	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1608	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1671	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1638		1701
1639	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1702	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1640	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1703	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1641	}	1704	}
1642		1705
		1706	char *
		1707	gl_vendor ()
		1708	CODE:
		1709	RETVAL = (char *)glGetString (GL_VENDOR);
		1710	OUTPUT:
		1711	RETVAL
		1712
		1713	char *
		1714	gl_version ()
		1715	CODE:
		1716	RETVAL = (char *)glGetString (GL_VERSION);
		1717	OUTPUT:
		1718	RETVAL
		1719
		1720	char *
		1721	gl_extensions ()
		1722	CODE:
		1723	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1724	OUTPUT:
		1725	RETVAL
		1726
1643	int glGetError ()	1727	int glGetError ()
		1728
		1729	void glFinish ()
1644		1730
1645	void glClear (int mask)	1731	void glClear (int mask)
1646		1732
1647	void glClearColor (float r, float g, float b, float a = 1.0)	1733	void glClearColor (float r, float g, float b, float a = 1.0)
1648	PROTOTYPE: @	1734	PROTOTYPE: @
…		…
1654	void glShadeModel (int mode)	1740	void glShadeModel (int mode)
1655		1741
1656	void glHint (int target, int mode)	1742	void glHint (int target, int mode)
1657		1743
1658	void glBlendFunc (int sfactor, int dfactor)	1744	void glBlendFunc (int sfactor, int dfactor)
		1745
		1746	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1747	CODE:
		1748	gl_BlendFuncSeparate (sa, da, saa, daa);
1659		1749
1660	void glDepthMask (int flag)	1750	void glDepthMask (int flag)
1661		1751
1662	void glLogicOp (int opcode)	1752	void glLogicOp (int opcode)
1663		1753
…		…
1697		1787
1698	void glEnd ()	1788	void glEnd ()
1699		1789
1700	void glColor (float r, float g, float b, float a = 1.0)	1790	void glColor (float r, float g, float b, float a = 1.0)
1701	PROTOTYPE: @	1791	PROTOTYPE: @
		1792	ALIAS:
		1793	glColor_premultiply = 1
1702	CODE:	1794	CODE:
		1795	if (ix)
		1796	{
		1797	r *= a;
		1798	g *= a;
		1799	b *= a;
		1800	}
1703	// microsoft visual "c" rounds instead of truncating...	1801	// microsoft visual "c" rounds instead of truncating...
1704	glColor4ub (MIN ((int)(r * 255.f), 255),	1802	glColor4ub (MIN ((int)(r * 256.f), 255),
1705	MIN ((int)(g * 255.f), 255),	1803	MIN ((int)(g * 256.f), 255),
1706	MIN ((int)(b * 255.f), 255),	1804	MIN ((int)(b * 256.f), 255),
1707	MIN ((int)(a * 255.f), 255));	1805	MIN ((int)(a * 256.f), 255));
1708		1806
1709	void glInterleavedArrays (int format, int stride, char *data)	1807	void glInterleavedArrays (int format, int stride, char *data)
1710		1808
1711	void glDrawElements (int mode, int count, int type, char *indices)	1809	void glDrawElements (int mode, int count, int type, char *indices)
1712		1810
…		…
1735		1833
1736	void glBindTexture (int target, int name)	1834	void glBindTexture (int target, int name)
1737		1835
1738	void glConvolutionParameter (int target, int pname, float params)	1836	void glConvolutionParameter (int target, int pname, float params)
1739	CODE:	1837	CODE:
1740	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1838	if (gl.ConvolutionParameterf)
		1839	gl.ConvolutionParameterf (target, pname, params);
1741		1840
1742	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1841	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1743	CODE:	1842	CODE:
1744	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1843	if (gl.ConvolutionFilter2D)
1745	(target, internalformat, width, height, format, type, data));	1844	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1746		1845
1747	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1846	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1748	CODE:	1847	CODE:
1749	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1848	if (gl.SeparableFilter2D)
1750	(target, internalformat, width, height, format, type, row, column));	1849	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1751		1850
1752	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1851	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1753		1852
1754	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1853	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1755		1854

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.93 by root, Tue May 23 18:54:37 2006 UTC vs. Revision 1.115 by root, Wed Jun 14 18:59:30 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.93 by root, Tue May 23 18:54:37 2006 UTC vs.
Revision 1.115 by root, Wed Jun 14 18:59:30 2006 UTC