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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.207 by root, Fri Jul 20 18:19:45 2007 UTC vs.
Revision 1.212 by root, Sun Jul 29 03:58:26 2007 UTC

…		…
25	#include <math.h>	25	#include <math.h>
26	#include <string.h>	26	#include <string.h>
27	#include <stdio.h>	27	#include <stdio.h>
28	#include <stdlib.h>	28	#include <stdlib.h>
29		29
		30	#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
		31
30	#include <SDL.h>	32	#include <SDL.h>
31	#include <SDL_thread.h>	33	#include <SDL_thread.h>
32	#include <SDL_endian.h>	34	#include <SDL_endian.h>
33	#include <SDL_image.h>	35	#include <SDL_image.h>
34	#include <SDL_mixer.h>	36	#include <SDL_mixer.h>
…		…
112		114
113	#include "pango-font.c"	115	#include "pango-font.c"
114	#include "pango-fontmap.c"	116	#include "pango-fontmap.c"
115	#include "pango-render.c"	117	#include "pango-render.c"
116		118
		119	typedef IV CFPlus__Channel;
		120	typedef SDL_RWops *CFPlus__RW;
117	typedef Mix_Chunk *CFPlus__MixChunk;	121	typedef Mix_Chunk *CFPlus__MixChunk;
118	typedef Mix_Music *CFPlus__MixMusic;	122	typedef Mix_Music *CFPlus__MixMusic;
119		123
120	typedef PangoFontDescription *CFPlus__Font;	124	typedef PangoFontDescription *CFPlus__Font;
121		125
…		…
434	/* SDL should provide this, really. */	438	/* SDL should provide this, really. */
435	#define SDLK_MODIFIER_MIN 300	439	#define SDLK_MODIFIER_MIN 300
436	#define SDLK_MODIFIER_MAX 314	440	#define SDLK_MODIFIER_MAX 314
437		441
438	/******************************************************************************/	442	/******************************************************************************/
		443
		444	static GV draw_x_gv, draw_y_gv, draw_w_gv, draw_h_gv;
		445	static GV *hover_gv;
439		446
440	static int	447	static int
441	within_widget (SV *widget, NV x, NV y)	448	within_widget (SV *widget, NV x, NV y)
442	{	449	{
443	HV *self;	450	HV *self;
…		…
797	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	804	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
798	}	805	}
799	}	806	}
800		807
801	int	808	int
802	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	809	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
803	POSTCALL:	810	POSTCALL:
804	Mix_HookMusicFinished (music_finished);	811	Mix_HookMusicFinished (music_finished);
805	Mix_ChannelFinished (channel_finished);	812	Mix_ChannelFinished (channel_finished);
806		813
807	void	814	void
…		…
858	STRLEN image_len;	865	STRLEN image_len;
859	char image = (char )SvPVbyte (image_, image_len);	866	char image = (char )SvPVbyte (image_, image_len);
860	SDL_Surface surface, surface2;	867	SDL_Surface surface, surface2;
861	SDL_PixelFormat fmt;	868	SDL_PixelFormat fmt;
862	SDL_RWops *rw = ix	869	SDL_RWops *rw = ix
863	? SDL_RWFromFile (image, "r")	870	? SDL_RWFromFile (image, "rb")
864	: SDL_RWFromConstMem (image, image_len);	871	: SDL_RWFromConstMem (image, image_len);
865		872
866	if (!rw)	873	if (!rw)
867	croak ("load_image: %s", SDL_GetError ());	874	croak ("load_image: %s", SDL_GetError ());
868		875
…		…
2229	}	2236	}
2230	}	2237	}
2231	}	2238	}
2232	}	2239	}
2233		2240
		2241	MODULE = CFPlus PACKAGE = CFPlus::RW
		2242
		2243	CFPlus::RW
		2244	new (SV class, SV data_sv)
		2245	CODE:
		2246	{
		2247	STRLEN datalen;
		2248	char *data = SvPVbyte (data_sv, datalen);
		2249
		2250	RETVAL = SDL_RWFromConstMem (data, datalen);
		2251	}
		2252	OUTPUT:
		2253	RETVAL
		2254
		2255	CFPlus::RW
		2256	new_from_file (SV class, const char path, const char *mode = "rb")
		2257	CODE:
		2258	RETVAL = SDL_RWFromFile (path, mode);
		2259	OUTPUT:
		2260	RETVAL
		2261
		2262	void
		2263	close (CFPlus::RW self)
		2264	CODE:
		2265	SDL_RWclose (self);
		2266
		2267	MODULE = CFPlus PACKAGE = CFPlus::Channel
		2268
		2269	PROTOTYPES: DISABLE
		2270
		2271	int
		2272	volume (CFPlus::Channel self, int volume)
		2273	CODE:
		2274	RETVAL = Mix_Volume (self, volume);
		2275	OUTPUT:
		2276	RETVAL
		2277
		2278	int
		2279	unregister_all_effects (CFPlus::Channel self)
		2280	CODE:
		2281	RETVAL = Mix_UnregisterAllEffects (self);
		2282	OUTPUT:
		2283	RETVAL
		2284
		2285	int
		2286	set_panning (CFPlus::Channel self, int left, int right)
		2287	CODE:
		2288	RETVAL = Mix_SetPanning (self, left, right);
		2289	OUTPUT:
		2290	RETVAL
		2291
		2292	int
		2293	set_distance (CFPlus::Channel self, int distance)
		2294	CODE:
		2295	RETVAL = Mix_SetDistance (self, distance);
		2296	OUTPUT:
		2297	RETVAL
		2298
		2299	int
		2300	set_position (CFPlus::Channel self, int angle, int distance)
		2301	CODE:
		2302	RETVAL = Mix_SetPosition (self, angle, distance);
		2303	OUTPUT:
		2304	RETVAL
		2305
		2306	int
		2307	set_reverse_stereo (CFPlus::Channel self, int flip)
		2308	CODE:
		2309	RETVAL = Mix_SetReverseStereo (self, flip);
		2310	OUTPUT:
		2311	RETVAL
		2312
2234	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2313	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
2235		2314
2236	PROTOTYPES: DISABLE	2315	PROTOTYPES: DISABLE
2237		2316
2238	CFPlus::MixChunk	2317	CFPlus::MixChunk
2239	new_from_file (SV class, char path)	2318	new (SV *class, CFPlus::RW rwops)
2240	CODE:	2319	CODE:
2241	RETVAL = Mix_LoadWAV (path);	2320	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2242	OUTPUT:	2321	OUTPUT:
2243	RETVAL	2322	RETVAL
2244		2323
2245	void	2324	void
2246	DESTROY (CFPlus::MixChunk self)	2325	DESTROY (CFPlus::MixChunk self)
…		…
2252	CODE:	2331	CODE:
2253	RETVAL = Mix_VolumeChunk (self, volume);	2332	RETVAL = Mix_VolumeChunk (self, volume);
2254	OUTPUT:	2333	OUTPUT:
2255	RETVAL	2334	RETVAL
2256		2335
2257	int	2336	CFPlus::Channel
2258	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	2337	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
2259	CODE:	2338	CODE:
2260	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2339	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
		2340	Mix_UnregisterAllEffects (RETVAL);
2261	OUTPUT:	2341	OUTPUT:
2262	RETVAL	2342	RETVAL
2263		2343
2264	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2344	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
2265		2345
…		…
2276	CODE:	2356	CODE:
2277	RETVAL = Mix_FadeOutMusic (ms);	2357	RETVAL = Mix_FadeOutMusic (ms);
2278	OUTPUT:	2358	OUTPUT:
2279	RETVAL	2359	RETVAL
2280		2360
		2361	void
		2362	halt ()
		2363	CODE:
		2364	Mix_HaltMusic ();
		2365
2281	CFPlus::MixMusic	2366	CFPlus::MixMusic
2282	new_from_file (SV class, char path)	2367	new (SV *class, CFPlus::RW rwops)
2283	CODE:	2368	CODE:
2284	RETVAL = Mix_LoadMUS (path);	2369	RETVAL = Mix_LoadMUS_RW (rwops);
2285	OUTPUT:	2370	OUTPUT:
2286	RETVAL	2371	RETVAL
2287		2372
2288	void	2373	void
2289	DESTROY (CFPlus::MixMusic self)	2374	DESTROY (CFPlus::MixMusic self)
…		…
2386	const_iv (GL_COLOR_LOGIC_OP),	2471	const_iv (GL_COLOR_LOGIC_OP),
2387	const_iv (GL_SEPARABLE_2D),	2472	const_iv (GL_SEPARABLE_2D),
2388	const_iv (GL_CONVOLUTION_2D),	2473	const_iv (GL_CONVOLUTION_2D),
2389	const_iv (GL_CONVOLUTION_BORDER_MODE),	2474	const_iv (GL_CONVOLUTION_BORDER_MODE),
2390	const_iv (GL_CONSTANT_BORDER),	2475	const_iv (GL_CONSTANT_BORDER),
		2476	const_iv (GL_POINTS),
2391	const_iv (GL_LINES),	2477	const_iv (GL_LINES),
2392	const_iv (GL_LINE_STRIP),	2478	const_iv (GL_LINE_STRIP),
2393	const_iv (GL_LINE_LOOP),	2479	const_iv (GL_LINE_LOOP),
2394	const_iv (GL_QUADS),	2480	const_iv (GL_QUADS),
2395	const_iv (GL_QUAD_STRIP),	2481	const_iv (GL_QUAD_STRIP),
2396	const_iv (GL_TRIANGLES),	2482	const_iv (GL_TRIANGLES),
2397	const_iv (GL_TRIANGLE_STRIP),	2483	const_iv (GL_TRIANGLE_STRIP),
2398	const_iv (GL_TRIANGLE_FAN),	2484	const_iv (GL_TRIANGLE_FAN),
		2485	const_iv (GL_POLYGON),
2399	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2486	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2400	const_iv (GL_POINT_SMOOTH_HINT),	2487	const_iv (GL_POINT_SMOOTH_HINT),
2401	const_iv (GL_LINE_SMOOTH_HINT),	2488	const_iv (GL_LINE_SMOOTH_HINT),
2402	const_iv (GL_POLYGON_SMOOTH_HINT),	2489	const_iv (GL_POLYGON_SMOOTH_HINT),
2403	const_iv (GL_GENERATE_MIPMAP_HINT),	2490	const_iv (GL_GENERATE_MIPMAP_HINT),
…		…
2498	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2585	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2499		2586
2500	# near_ and far_ are due to microsofts buggy "c" compiler	2587	# near_ and far_ are due to microsofts buggy "c" compiler
2501	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	2588	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2502		2589
		2590	PROTOTYPES: DISABLE
		2591
2503	void glViewport (int x, int y, int width, int height)	2592	void glViewport (int x, int y, int width, int height)
2504		2593
2505	void glScissor (int x, int y, int width, int height)	2594	void glScissor (int x, int y, int width, int height)
2506		2595
2507	void glTranslate (float x, float y, float z = 0.)	2596	void glTranslate (float x, float y, float z = 0.)
…		…
2514		2603
2515	void glRotate (float angle, float x, float y, float z)	2604	void glRotate (float angle, float x, float y, float z)
2516	CODE:	2605	CODE:
2517	glRotatef (angle, x, y, z);	2606	glRotatef (angle, x, y, z);
2518		2607
2519	void glBegin (int mode)
2520
2521	void glEnd ()
2522
2523	void glColor (float r, float g, float b, float a = 1.0)	2608	void glColor (float r, float g, float b, float a = 1.0)
2524	PROTOTYPE: @
2525	ALIAS:	2609	ALIAS:
2526	glColor_premultiply = 1	2610	glColor_premultiply = 1
2527	CODE:	2611	CODE:
2528	if (ix)	2612	if (ix)
2529	{	2613	{
…		…
2532	b *= a;	2616	b *= a;
2533	}	2617	}
2534	// microsoft visual "c" rounds instead of truncating...	2618	// microsoft visual "c" rounds instead of truncating...
2535	glColor4f (r, g, b, a);	2619	glColor4f (r, g, b, a);
2536		2620
2537	void glInterleavedArrays (int format, int stride, char *data)
2538
2539	void glDrawElements (int mode, int count, int type, char *indices)
2540
2541	# 1.2 void glDrawRangeElements (int mode, int start, int end
2542
2543	void glRasterPos (float x, float y, float z = 0.)	2621	void glRasterPos (float x, float y, float z = 0.)
2544	CODE:	2622	CODE:
2545	glRasterPos3f (0, 0, z);	2623	glRasterPos3f (0, 0, z);
2546	glBitmap (0, 0, 0, 0, x, y, 0);	2624	glBitmap (0, 0, 0, 0, x, y, 0);
2547		2625
…		…
2551		2629
2552	void glTexCoord (float s, float t)	2630	void glTexCoord (float s, float t)
2553	CODE:	2631	CODE:
2554	glTexCoord2f (s, t);	2632	glTexCoord2f (s, t);
2555		2633
		2634	void glRect (float x1, float y1, float x2, float y2)
		2635	CODE:
		2636	glRectf (x1, y1, x2, y2);
		2637
		2638	PROTOTYPES: ENABLE
		2639
		2640	void glBegin (int mode)
		2641
		2642	void glEnd ()
		2643
		2644	void glPointSize (GLfloat size)
		2645
		2646	void glLineWidth (GLfloat width)
		2647
		2648	void glInterleavedArrays (int format, int stride, char *data)
		2649
		2650	void glDrawElements (int mode, int count, int type, char *indices)
		2651
		2652	# 1.2 void glDrawRangeElements (int mode, int start, int end
		2653
2556	void glTexEnv (int target, int pname, float param)	2654	void glTexEnv (int target, int pname, float param)
2557	CODE:	2655	CODE:
2558	glTexEnvf (target, pname, param);	2656	glTexEnvf (target, pname, param);
2559		2657
2560	void glTexParameter (int target, int pname, float param)	2658	void glTexParameter (int target, int pname, float param)
…		…
2617	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2715	MODULE = CFPlus PACKAGE = CFPlus::UI::Base
2618		2716
2619	PROTOTYPES: DISABLE	2717	PROTOTYPES: DISABLE
2620		2718
2621	void	2719	void
2622	find_widget (SV *widget, NV x, NV y)	2720	find_widget (SV *self, NV x, NV y)
2623	PPCODE:	2721	PPCODE:
2624	{	2722	{
2625	if (within_widget (widget, x, y))	2723	if (within_widget (self, x, y))
2626	XPUSHs (widget);	2724	XPUSHs (self);
2627	}	2725	}
2628		2726
		2727	BOOT:
		2728	{
		2729	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);
		2730
		2731	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);
		2732	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);
		2733	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);
		2734	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);
		2735	}
		2736
		2737	void
		2738	draw (SV *self)
		2739	CODE:
		2740	{
		2741	HV *hv;
		2742	SV **svp;
		2743	NV x, y, w, h;
		2744	SV *draw_x_sv = GvSV (draw_x_gv);
		2745	SV *draw_y_sv = GvSV (draw_y_gv);
		2746	SV *draw_w_sv = GvSV (draw_w_gv);
		2747	SV *draw_h_sv = GvSV (draw_h_gv);
		2748	SV *hover;
		2749	double draw_x, draw_y, draw_w, draw_h;
		2750
		2751	if (!SvROK (self))
		2752	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
		2753
		2754	hv = (HV *)SvRV (self);
		2755
		2756	if (SvTYPE (hv) != SVt_PVHV)
		2757	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));
		2758
		2759	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
		2760	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
		2761
		2762	if (!h \|\| !w)
		2763	XSRETURN_EMPTY;
		2764
		2765	svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
		2766	svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
		2767
		2768	draw_x = SvNV (draw_x_sv) + x;
		2769	draw_y = SvNV (draw_y_sv) + y;
		2770
		2771	if (draw_x + w < 0 \|\| draw_x >= SvNV (draw_w_sv)
		2772	\|\| draw_y + h < 0 \|\| draw_y >= SvNV (draw_h_sv))
		2773	XSRETURN_EMPTY;
		2774
		2775	sv_setnv (draw_x_sv, draw_x);
		2776	sv_setnv (draw_y_sv, draw_y);
		2777
		2778	glPushMatrix ();
		2779	glTranslated (x, y, 0);
		2780
		2781	if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
		2782	{
		2783	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
		2784
		2785	if (svp && SvTRUE (*svp))
		2786	{
		2787	glColor4f (10.2f, 0.80.2f, 0.5*0.2f, 0.2f);
		2788	glEnable (GL_BLEND);
		2789	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		2790	glBegin (GL_QUADS);
		2791	glVertex2f (0, 0);
		2792	glVertex2f (w, 0);
		2793	glVertex2f (w, h);
		2794	glVertex2f (0, h);
		2795	glEnd ();
		2796	glDisable (GL_BLEND);
		2797	}
		2798	}
		2799	#if 0
		2800	if ($ENV{CFPLUS_DEBUG} & 1) {
		2801	glPushMatrix;
		2802	glColor 1, 1, 0, 1;
		2803	glTranslate 0.375, 0.375;
		2804	glBegin GL_LINE_LOOP;
		2805	glVertex 0 , 0;
		2806	glVertex $self->{w} - 1, 0;
		2807	glVertex $self->{w} - 1, $self->{h} - 1;
		2808	glVertex 0 , $self->{h} - 1;
		2809	glEnd;
		2810	glPopMatrix;
		2811	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		2812	}
		2813	#endif
		2814	PUSHMARK (SP);
		2815	XPUSHs (self);
		2816	PUTBACK;
		2817	call_method ("_draw", G_VOID \| G_DISCARD);
		2818	SPAGAIN;
		2819
		2820	glPopMatrix ();
		2821
		2822	draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
		2823	draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
		2824	}
		2825

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.207 by root, Fri Jul 20 18:19:45 2007 UTC vs. Revision 1.212 by root, Sun Jul 29 03:58:26 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.207 by root, Fri Jul 20 18:19:45 2007 UTC vs.
Revision 1.212 by root, Sun Jul 29 03:58:26 2007 UTC