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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.298 by root, Tue Dec 22 00:46:05 2009 UTC vs.
Revision 1.306 by root, Thu Oct 14 00:02:39 2010 UTC

…		…
99		99
100	#define KMOD_LRAM 0x10000 // our extension	100	#define KMOD_LRAM 0x10000 // our extension
101		101
102	#define TEXID_SPEECH 1	102	#define TEXID_SPEECH 1
103	#define TEXID_NOFACE 2	103	#define TEXID_NOFACE 2
		104
		105	static char *
		106	fast_sv_grow (SV *sv, STRLEN need)
		107	{
		108	STRLEN len = SvLEN (sv);
		109	STRLEN want = SvCUR (sv) + need;
		110
		111	if (expect_false (len < want))
		112	{
		113	do
		114	len *= 2;
		115	while (len < want);
		116
		117	sv_grow (sv, len);
		118	}
		119
		120	SvCUR_set (sv, want);
		121	return SvEND (sv) - need;
		122	}
104		123
105	static AV *texture_av;	124	static AV *texture_av;
106		125
107	static struct	126	static struct
108	{	127	{
…		…
460	ev.code = 1;	479	ev.code = 1;
461	ev.data1 = (void *)(long)channel;	480	ev.data1 = (void *)(long)channel;
462	ev.data2 = 0;	481	ev.data2 = 0;
463		482
464	SDL_PushEvent ((SDL_Event *)&ev);	483	SDL_PushEvent ((SDL_Event *)&ev);
		484	}
		485
		486	static unsigned int
		487	div255 (unsigned int n)
		488	{
		489	return (n + (n >> 8)) >> 8;
465	}	490	}
466		491
467	static unsigned int	492	static unsigned int
468	minpot (unsigned int n)	493	minpot (unsigned int n)
469	{	494	{
…		…
930		955
931	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");	956	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
932	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	957	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
933	#include "glfunc.h"	958	#include "glfunc.h"
934	#undef GL_FUNC	959	#undef GL_FUNC
		960
		961	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		962	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
935	}	963	}
936	}	964	}
937	OUTPUT:	965	OUTPUT:
938	RETVAL	966	RETVAL
939		967
…		…
1024		1052
1025	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1053	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1026	}	1054	}
1027	}	1055	}
1028		1056
		1057	char *
		1058	SDL_AudioDriverName ()
		1059	CODE:
		1060	{
		1061	char buf [256];
		1062	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1063	XSRETURN_UNDEF;
		1064
		1065	RETVAL = buf;
		1066	}
		1067	OUTPUT:
		1068	RETVAL
		1069
1029	int	1070	int
1030	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1071	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1031	POSTCALL:	1072	POSTCALL:
1032	Mix_HookMusicFinished (music_finished);	1073	Mix_HookMusicFinished (music_finished);
1033	Mix_ChannelFinished (channel_finished);	1074	Mix_ChannelFinished (channel_finished);
…		…
1095	add_font (char *file)	1136	add_font (char *file)
1096	CODE:	1137	CODE:
1097	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1138	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1098	OUTPUT:	1139	OUTPUT:
1099	RETVAL	1140	RETVAL
		1141
		1142	void
		1143	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
1100		1144
1101	void	1145	void
1102	load_image_inline (SV *image_)	1146	load_image_inline (SV *image_)
1103	ALIAS:	1147	ALIAS:
1104	load_image_file = 1	1148	load_image_file = 1
…		…
1672	void	1716	void
1673	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)	1717	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)
1674	PROTOTYPE: @	1718	PROTOTYPE: @
1675	CODE:	1719	CODE:
1676	{	1720	{
		1721	glEnable (GL_BLEND);
		1722	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1677	glEnable (GL_TEXTURE_2D);	1723	glEnable (GL_TEXTURE_2D);
1678	glEnable (GL_BLEND);
1679	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1680	glBindTexture (GL_TEXTURE_2D, name1);	1724	glBindTexture (GL_TEXTURE_2D, name1);
1681		1725
1682	glColor3f (intensity, intensity, intensity);	1726	glColor3f (intensity, intensity, intensity);
1683	glPushMatrix ();	1727	glPushMatrix ();
1684	glScalef (1./3, 1./3, 1.);	1728	glScalef (1./3, 1./3, 1.);
…		…
1699	glBindTexture (GL_TEXTURE_2D, name2);	1743	glBindTexture (GL_TEXTURE_2D, name2);
1700	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);	1744	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1701		1745
1702	/* rgb == rgb(glcolor) */	1746	/* rgb == rgb(glcolor) */
1703	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);	1747	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1704	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);	1748	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1705	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);	1749	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1706		1750
1707	/* alpha = interpolate t0, t1 by env_alpha */	1751	/* alpha = interpolate t0, t1 by env_alpha */
1708	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);	1752	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1709		1753
…		…
2096	? self->row + y	2140	? self->row + y
2097	: 0;	2141	: 0;
2098		2142
2099	for (x = x0; x < x1; x++)	2143	for (x = x0; x < x1; x++)
2100	{	2144	{
2101	int r = 32, g = 32, b = 32, a = 192;	2145	unsigned int r = 32, g = 32, b = 32, a = 192;
2102		2146
2103	if (row && row->c0 <= x && x < row->c1)	2147	if (row && row->c0 <= x && x < row->c1)
2104	{	2148	{
2105	mapcell *cell = row->col + (x - row->c0);	2149	mapcell *cell = row->col + (x - row->c0);
2106		2150
…		…
2108	{	2152	{
2109	maptex tex = self->tex [cell->tile [z]];	2153	maptex tex = self->tex [cell->tile [z]];
2110	int a0 = 255 - tex.a;	2154	int a0 = 255 - tex.a;
2111	int a1 = tex.a;	2155	int a1 = tex.a;
2112		2156
2113	r = (r * a0 + tex.r * a1) / 255;	2157	r = div255 (r * a0 + tex.r * a1);
2114	g = (g * a0 + tex.g * a1) / 255;	2158	g = div255 (g * a0 + tex.g * a1);
2115	b = (b * a0 + tex.b * a1) / 255;	2159	b = div255 (b * a0 + tex.b * a1);
2116	a = (a * a0 + tex.a * a1) / 255;	2160	a = div255 (a * a0 + tex.a * a1);
2117	}	2161	}
2118	}	2162	}
2119		2163
2120	*map++ = (r )	2164	*map++ = (r )
2121	\| (g << 8)	2165	\| (g << 8)
…		…
2128	}	2172	}
2129	OUTPUT:	2173	OUTPUT:
2130	RETVAL	2174	RETVAL
2131		2175
2132	void	2176	void
2133	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)	2177	draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2134	CODE:	2178	CODE:
2135	{	2179	{
2136	int x, y, z;	2180	int x, y, z;
2137		2181
2138	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2182	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
…		…
2222		2266
2223	key.texname = tex.name;	2267	key.texname = tex.name;
2224	arr = rc_array (rc, &key);	2268	arr = rc_array (rc, &key);
2225	}	2269	}
2226		2270
2227	px = (x + 1) * T - tex.w;	2271	px = (x + 1) * Th - tex.w;
2228	py = (y + 1) * T - tex.h;	2272	py = (y + 1) * Tw - tex.h;
2229		2273
2230	if (expect_false (cell->player == player) && expect_false (z == 2))	2274	if (expect_false (cell->player == player) && expect_false (z == 2))
2231	{	2275	{
2232	pl_x = px;	2276	pl_x = px;
2233	pl_y = py;	2277	pl_y = py;
…		…
2286	if (cell->flags & 1)	2330	if (cell->flags & 1)
2287	{	2331	{
2288	rc_key_t key_ov = key;	2332	rc_key_t key_ov = key;
2289	maptex tex = self->tex [TEXID_SPEECH];	2333	maptex tex = self->tex [TEXID_SPEECH];
2290	rc_array_t *arr;	2334	rc_array_t *arr;
2291	int px = x * T + T * 2 / 32;	2335	int px = x * Tw + Tw * 2 / 32;
2292	int py = y * T - T * 6 / 32;	2336	int py = y * Th - Th * 6 / 32;
2293		2337
2294	key_ov.texname = tex.name;	2338	key_ov.texname = tex.name;
2295	arr = rc_array (rc_ov, &key_ov);	2339	arr = rc_array (rc_ov, &key_ov);
2296		2340
2297	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2341	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2298	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2342	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2299	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);	2343	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2300	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2344	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2301	}	2345	}
2302	}	2346	}
2303	}	2347	}
2304	}	2348	}
2305		2349
…		…
2332	if (!(bits & 0x1000)	2376	if (!(bits & 0x1000)
2333	&& skey->level == level	2377	&& skey->level == level
2334	&& level > smooth_max [skey->x][skey->y])	2378	&& level > smooth_max [skey->x][skey->y])
2335	{	2379	{
2336	maptex tex = self->tex [skey->tile];	2380	maptex tex = self->tex [skey->tile];
2337	int px = (((int)skey->x) - 1) * T;	2381	int px = (((int)skey->x) - 1) * Tw;
2338	int py = (((int)skey->y) - 1) * T;	2382	int py = (((int)skey->y) - 1) * Th;
2339	int border = bits & 15;	2383	int border = bits & 15;
2340	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2384	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2341	float dx = tex.s * .0625f; // 16 images/row	2385	float dx = tex.s * .0625f; // 16 images/row
2342	float dy = tex.t * .5f ; // 2 images/column	2386	float dy = tex.t * .5f ; // 2 images/column
2343		2387
…		…
2356		2400
2357	if (border)	2401	if (border)
2358	{	2402	{
2359	float ox = border * dx;	2403	float ox = border * dx;
2360		2404
2361	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2405	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2362	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2406	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2363	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2407	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2364	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2408	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2365	}	2409	}
2366		2410
2367	if (corner)	2411	if (corner)
2368	{	2412	{
2369	float ox = corner * dx;	2413	float ox = corner * dx;
2370		2414
2371	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2415	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2372	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2416	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2373	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2417	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2374	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2418	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2375	}	2419	}
2376	}	2420	}
2377	}	2421	}
2378	}	2422	}
2379	}	2423	}
…		…
2420	for (x = 0; x < sw; x++)	2464	for (x = 0; x < sw; x++)
2421	if (row->c0 <= x + mx && x + mx < row->c1)	2465	if (row->c0 <= x + mx && x + mx < row->c1)
2422	{	2466	{
2423	mapcell *cell = row->col + (x + mx - row->c0);	2467	mapcell *cell = row->col + (x + mx - row->c0);
2424		2468
2425	int px = x * T;	2469	int px = x * Tw;
2426	int py = y * T;	2470	int py = y * Th;
2427		2471
2428	if (expect_false (cell->player == player))	2472	if (expect_false (cell->player == player))
2429	{	2473	{
2430	px += sdx;	2474	px += sdx;
2431	py += sdy;	2475	py += sdy;
2432	}	2476	}
2433		2477
2434	if (cell->stat_hp)	2478	if (cell->stat_hp)
2435	{	2479	{
2436	int width = cell->stat_width * T;	2480	int width = cell->stat_width * Tw;
2437	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2481	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2438		2482
2439	glColor3ub (0, 0, 0);	2483	glColor3ub (0, 0, 0);
2440	glRectf (px + 1, py - thick - 2,	2484	glRectf (px + 1, py - thick - 2,
2441	px + width - 1, py);	2485	px + width - 1, py);
2442		2486
…		…
2795	if (RETVAL < 0)	2839	if (RETVAL < 0)
2796	{	2840	{
2797	RETVAL = Mix_GroupOldest (-1);	2841	RETVAL = Mix_GroupOldest (-1);
2798		2842
2799	if (RETVAL < 0)	2843	if (RETVAL < 0)
		2844	{
		2845	// happens sometimes, maybe it just stopped playing(?)
		2846	RETVAL = Mix_GroupAvailable (-1);
		2847
		2848	if (RETVAL < 0)
2800	XSRETURN_UNDEF;	2849	XSRETURN_UNDEF;
2801		2850	}
		2851	else
2802	Mix_HaltChannel (RETVAL);	2852	Mix_HaltChannel (RETVAL);
2803	}	2853	}
2804		2854
2805	Mix_UnregisterAllEffects (RETVAL);	2855	Mix_UnregisterAllEffects (RETVAL);
2806	Mix_Volume (RETVAL, 128);	2856	Mix_Volume (RETVAL, 128);
2807	}	2857	}
…		…
2866	Mix_SetReverseStereo (self, flip);	2916	Mix_SetReverseStereo (self, flip);
2867		2917
2868	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2918	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2869		2919
2870	PROTOTYPES: DISABLE	2920	PROTOTYPES: DISABLE
		2921
		2922	void
		2923	decoders ()
		2924	PPCODE:
		2925	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2926	int i, num = Mix_GetNumChunkDecoders ();
		2927	EXTEND (SP, num);
		2928	for (i = 0; i < num; ++i)
		2929	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2930	#else
		2931	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2932	#endif
2871		2933
2872	DC::MixChunk	2934	DC::MixChunk
2873	new (SV *class, DC::RW rwops)	2935	new (SV *class, DC::RW rwops)
2874	CODE:	2936	CODE:
2875	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2937	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2908	OUTPUT:	2970	OUTPUT:
2909	RETVAL	2971	RETVAL
2910		2972
2911	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2973	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2912		2974
		2975	void
		2976	decoders ()
		2977	PPCODE:
		2978	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2979	int i, num = Mix_GetNumMusicDecoders ();
		2980	EXTEND (SP, num);
		2981	for (i = 0; i < num; ++i)
		2982	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		2983	#else
		2984	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2985	#endif
		2986
2913	int	2987	int
2914	volume (int volume = -1)	2988	volume (int volume = -1)
2915	PROTOTYPE: ;$	2989	PROTOTYPE: ;$
2916	CODE:	2990	CODE:
2917	if (items > 0)	2991	if (items > 0)
…		…
2927		3001
2928	void	3002	void
2929	halt ()	3003	halt ()
2930	CODE:	3004	CODE:
2931	Mix_HaltMusic ();	3005	Mix_HaltMusic ();
		3006
		3007	int
		3008	playing ()
		3009	CODE:
		3010	RETVAL = Mix_PlayingMusic ();
		3011	OUTPUT:
		3012	RETVAL
2932		3013
2933	DC::MixMusic	3014	DC::MixMusic
2934	new (SV *class, DC::RW rwops)	3015	new (SV *class, DC::RW rwops)
2935	CODE:	3016	CODE:
2936	RETVAL = Mix_LoadMUS_RW (rwops);	3017	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
3131		3212
3132	int glGetError ()	3213	int glGetError ()
3133		3214
3134	void glFinish ()	3215	void glFinish ()
3135		3216
		3217	void glFlush ()
		3218
3136	void glClear (int mask)	3219	void glClear (int mask)
3137		3220
3138	void glClearColor (float r, float g, float b, float a = 1.0)	3221	void glClearColor (float r, float g, float b, float a = 1.0)
3139	PROTOTYPE: @	3222	PROTOTYPE: @
3140		3223

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.298 by root, Tue Dec 22 00:46:05 2009 UTC vs. Revision 1.306 by root, Thu Oct 14 00:02:39 2010 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.298 by root, Tue Dec 22 00:46:05 2009 UTC vs.
Revision 1.306 by root, Thu Oct 14 00:02:39 2010 UTC