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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.297 by root, Tue Dec 22 00:08:11 2009 UTC vs.
Revision 1.305 by root, Sun May 2 21:22:20 2010 UTC

…		…
41	#include <SDL_opengl.h>	41	#include <SDL_opengl.h>
42		42
43	/* work around os x broken headers */	43	/* work around os x broken headers */
44	#ifdef __MACOSX__	44	#ifdef __MACOSX__
45	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);	45	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
		46	typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
		47	typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
46	#endif	48	#endif
47		49
48	#define PANGO_ENABLE_BACKEND	50	#define PANGO_ENABLE_BACKEND
49	#define G_DISABLE_CAST_CHECKS	51	#define G_DISABLE_CAST_CHECKS
50		52
…		…
928		930
929	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");	931	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
930	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	932	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
931	#include "glfunc.h"	933	#include "glfunc.h"
932	#undef GL_FUNC	934	#undef GL_FUNC
		935
		936	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		937	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
933	}	938	}
934	}	939	}
935	OUTPUT:	940	OUTPUT:
936	RETVAL	941	RETVAL
937		942
…		…
1022		1027
1023	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1028	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1024	}	1029	}
1025	}	1030	}
1026		1031
		1032	char *
		1033	SDL_AudioDriverName ()
		1034	CODE:
		1035	{
		1036	char buf [256];
		1037	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1038	XSRETURN_UNDEF;
		1039
		1040	RETVAL = buf;
		1041	}
		1042	OUTPUT:
		1043	RETVAL
		1044
1027	int	1045	int
1028	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1046	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1029	POSTCALL:	1047	POSTCALL:
1030	Mix_HookMusicFinished (music_finished);	1048	Mix_HookMusicFinished (music_finished);
1031	Mix_ChannelFinished (channel_finished);	1049	Mix_ChannelFinished (channel_finished);
…		…
1093	add_font (char *file)	1111	add_font (char *file)
1094	CODE:	1112	CODE:
1095	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1113	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1096	OUTPUT:	1114	OUTPUT:
1097	RETVAL	1115	RETVAL
		1116
		1117	void
		1118	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
1098		1119
1099	void	1120	void
1100	load_image_inline (SV *image_)	1121	load_image_inline (SV *image_)
1101	ALIAS:	1122	ALIAS:
1102	load_image_file = 1	1123	load_image_file = 1
…		…
1670	void	1691	void
1671	draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t data2 = data1)	1692	draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t data2 = data1)
1672	PROTOTYPE: @	1693	PROTOTYPE: @
1673	CODE:	1694	CODE:
1674	{	1695	{
		1696	glEnable (GL_BLEND);
		1697	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1675	glEnable (GL_TEXTURE_2D);	1698	glEnable (GL_TEXTURE_2D);
1676	glEnable (GL_BLEND);
1677	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1678	glBindTexture (GL_TEXTURE_2D, name1);	1699	glBindTexture (GL_TEXTURE_2D, name1);
1679		1700
1680	glColor3f (intensity, intensity, intensity);	1701	glColor3f (intensity, intensity, intensity);
1681	glPushMatrix ();	1702	glPushMatrix ();
1682	glScalef (1./3, 1./3, 1.);	1703	glScalef (1./3, 1./3, 1.);
…		…
1697	glBindTexture (GL_TEXTURE_2D, name2);	1718	glBindTexture (GL_TEXTURE_2D, name2);
1698	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);	1719	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1699		1720
1700	/* rgb == rgb(glcolor) */	1721	/* rgb == rgb(glcolor) */
1701	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);	1722	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1702	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);	1723	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1703	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);	1724	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1704		1725
1705	/* alpha = interpolate t0, t1 by env_alpha */	1726	/* alpha = interpolate t0, t1 by env_alpha */
1706	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);	1727	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1707		1728
…		…
2793	if (RETVAL < 0)	2814	if (RETVAL < 0)
2794	{	2815	{
2795	RETVAL = Mix_GroupOldest (-1);	2816	RETVAL = Mix_GroupOldest (-1);
2796		2817
2797	if (RETVAL < 0)	2818	if (RETVAL < 0)
		2819	{
		2820	// happens sometimes, maybe it just stopped playing(?)
		2821	RETVAL = Mix_GroupAvailable (-1);
		2822
		2823	if (RETVAL < 0)
2798	XSRETURN_UNDEF;	2824	XSRETURN_UNDEF;
2799		2825	}
		2826	else
2800	Mix_HaltChannel (RETVAL);	2827	Mix_HaltChannel (RETVAL);
2801	}	2828	}
2802		2829
2803	Mix_UnregisterAllEffects (RETVAL);	2830	Mix_UnregisterAllEffects (RETVAL);
2804	Mix_Volume (RETVAL, 128);	2831	Mix_Volume (RETVAL, 128);
2805	}	2832	}
…		…
2864	Mix_SetReverseStereo (self, flip);	2891	Mix_SetReverseStereo (self, flip);
2865		2892
2866	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2893	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2867		2894
2868	PROTOTYPES: DISABLE	2895	PROTOTYPES: DISABLE
		2896
		2897	void
		2898	decoders ()
		2899	PPCODE:
		2900	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2901	int i, num = Mix_GetNumChunkDecoders ();
		2902	EXTEND (SP, num);
		2903	for (i = 0; i < num; ++i)
		2904	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2905	#else
		2906	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2907	#endif
2869		2908
2870	DC::MixChunk	2909	DC::MixChunk
2871	new (SV *class, DC::RW rwops)	2910	new (SV *class, DC::RW rwops)
2872	CODE:	2911	CODE:
2873	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2912	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2906	OUTPUT:	2945	OUTPUT:
2907	RETVAL	2946	RETVAL
2908		2947
2909	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2948	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2910		2949
		2950	void
		2951	decoders ()
		2952	PPCODE:
		2953	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2954	int i, num = Mix_GetNumMusicDecoders ();
		2955	EXTEND (SP, num);
		2956	for (i = 0; i < num; ++i)
		2957	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		2958	#else
		2959	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2960	#endif
		2961
2911	int	2962	int
2912	volume (int volume = -1)	2963	volume (int volume = -1)
2913	PROTOTYPE: ;$	2964	PROTOTYPE: ;$
2914	CODE:	2965	CODE:
2915	if (items > 0)	2966	if (items > 0)
…		…
2925		2976
2926	void	2977	void
2927	halt ()	2978	halt ()
2928	CODE:	2979	CODE:
2929	Mix_HaltMusic ();	2980	Mix_HaltMusic ();
		2981
		2982	int
		2983	playing ()
		2984	CODE:
		2985	RETVAL = Mix_PlayingMusic ();
		2986	OUTPUT:
		2987	RETVAL
2930		2988
2931	DC::MixMusic	2989	DC::MixMusic
2932	new (SV *class, DC::RW rwops)	2990	new (SV *class, DC::RW rwops)
2933	CODE:	2991	CODE:
2934	RETVAL = Mix_LoadMUS_RW (rwops);	2992	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
3129		3187
3130	int glGetError ()	3188	int glGetError ()
3131		3189
3132	void glFinish ()	3190	void glFinish ()
3133		3191
		3192	void glFlush ()
		3193
3134	void glClear (int mask)	3194	void glClear (int mask)
3135		3195
3136	void glClearColor (float r, float g, float b, float a = 1.0)	3196	void glClearColor (float r, float g, float b, float a = 1.0)
3137	PROTOTYPE: @	3197	PROTOTYPE: @
3138		3198

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.297 by root, Tue Dec 22 00:08:11 2009 UTC vs. Revision 1.305 by root, Sun May 2 21:22:20 2010 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.297 by root, Tue Dec 22 00:08:11 2009 UTC vs.
Revision 1.305 by root, Sun May 2 21:22:20 2010 UTC