[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.211 by root, Sat Jul 28 00:45:28 2007 UTC

…		…
434	/* SDL should provide this, really. */	434	/* SDL should provide this, really. */
435	#define SDLK_MODIFIER_MIN 300	435	#define SDLK_MODIFIER_MIN 300
436	#define SDLK_MODIFIER_MAX 314	436	#define SDLK_MODIFIER_MAX 314
437		437
438	/******************************************************************************/	438	/******************************************************************************/
		439
		440	static GV draw_x_gv, draw_y_gv, draw_w_gv, draw_h_gv;
		441	static GV *hover_gv;
439		442
440	static int	443	static int
441	within_widget (SV *widget, NV x, NV y)	444	within_widget (SV *widget, NV x, NV y)
442	{	445	{
443	HV *self;	446	HV *self;
…		…
797	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	800	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
798	}	801	}
799	}	802	}
800		803
801	int	804	int
802	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	805	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
803	POSTCALL:	806	POSTCALL:
804	Mix_HookMusicFinished (music_finished);	807	Mix_HookMusicFinished (music_finished);
805	Mix_ChannelFinished (channel_finished);	808	Mix_ChannelFinished (channel_finished);
806		809
807	void	810	void
…		…
2232	}	2235	}
2233		2236
2234	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2237	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
2235		2238
2236	PROTOTYPES: DISABLE	2239	PROTOTYPES: DISABLE
		2240
		2241	CFPlus::MixChunk
		2242	new (SV class, SV data_sv)
		2243	CODE:
		2244	{
		2245	STRLEN datalen;
		2246	char *data = SvPVbyte (data_sv, datalen);
		2247
		2248	RETVAL = Mix_LoadWAV_RW (SDL_RWFromConstMem (data, datalen), 1);
		2249	}
		2250	OUTPUT:
		2251	RETVAL
2237		2252
2238	CFPlus::MixChunk	2253	CFPlus::MixChunk
2239	new_from_file (SV class, char path)	2254	new_from_file (SV class, char path)
2240	CODE:	2255	CODE:
2241	RETVAL = Mix_LoadWAV (path);	2256	RETVAL = Mix_LoadWAV (path);
…		…
2386	const_iv (GL_COLOR_LOGIC_OP),	2401	const_iv (GL_COLOR_LOGIC_OP),
2387	const_iv (GL_SEPARABLE_2D),	2402	const_iv (GL_SEPARABLE_2D),
2388	const_iv (GL_CONVOLUTION_2D),	2403	const_iv (GL_CONVOLUTION_2D),
2389	const_iv (GL_CONVOLUTION_BORDER_MODE),	2404	const_iv (GL_CONVOLUTION_BORDER_MODE),
2390	const_iv (GL_CONSTANT_BORDER),	2405	const_iv (GL_CONSTANT_BORDER),
		2406	const_iv (GL_POINTS),
2391	const_iv (GL_LINES),	2407	const_iv (GL_LINES),
2392	const_iv (GL_LINE_STRIP),	2408	const_iv (GL_LINE_STRIP),
2393	const_iv (GL_LINE_LOOP),	2409	const_iv (GL_LINE_LOOP),
2394	const_iv (GL_QUADS),	2410	const_iv (GL_QUADS),
2395	const_iv (GL_QUAD_STRIP),	2411	const_iv (GL_QUAD_STRIP),
2396	const_iv (GL_TRIANGLES),	2412	const_iv (GL_TRIANGLES),
2397	const_iv (GL_TRIANGLE_STRIP),	2413	const_iv (GL_TRIANGLE_STRIP),
2398	const_iv (GL_TRIANGLE_FAN),	2414	const_iv (GL_TRIANGLE_FAN),
		2415	const_iv (GL_POLYGON),
2399	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2416	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2400	const_iv (GL_POINT_SMOOTH_HINT),	2417	const_iv (GL_POINT_SMOOTH_HINT),
2401	const_iv (GL_LINE_SMOOTH_HINT),	2418	const_iv (GL_LINE_SMOOTH_HINT),
2402	const_iv (GL_POLYGON_SMOOTH_HINT),	2419	const_iv (GL_POLYGON_SMOOTH_HINT),
2403	const_iv (GL_GENERATE_MIPMAP_HINT),	2420	const_iv (GL_GENERATE_MIPMAP_HINT),
…		…
2498	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2515	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2499		2516
2500	# near_ and far_ are due to microsofts buggy "c" compiler	2517	# 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_)	2518	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2502		2519
		2520	PROTOTYPES: DISABLE
		2521
2503	void glViewport (int x, int y, int width, int height)	2522	void glViewport (int x, int y, int width, int height)
2504		2523
2505	void glScissor (int x, int y, int width, int height)	2524	void glScissor (int x, int y, int width, int height)
2506		2525
2507	void glTranslate (float x, float y, float z = 0.)	2526	void glTranslate (float x, float y, float z = 0.)
…		…
2514		2533
2515	void glRotate (float angle, float x, float y, float z)	2534	void glRotate (float angle, float x, float y, float z)
2516	CODE:	2535	CODE:
2517	glRotatef (angle, x, y, z);	2536	glRotatef (angle, x, y, z);
2518		2537
2519	void glBegin (int mode)
2520
2521	void glEnd ()
2522
2523	void glColor (float r, float g, float b, float a = 1.0)	2538	void glColor (float r, float g, float b, float a = 1.0)
2524	PROTOTYPE: @
2525	ALIAS:	2539	ALIAS:
2526	glColor_premultiply = 1	2540	glColor_premultiply = 1
2527	CODE:	2541	CODE:
2528	if (ix)	2542	if (ix)
2529	{	2543	{
…		…
2532	b *= a;	2546	b *= a;
2533	}	2547	}
2534	// microsoft visual "c" rounds instead of truncating...	2548	// microsoft visual "c" rounds instead of truncating...
2535	glColor4f (r, g, b, a);	2549	glColor4f (r, g, b, a);
2536		2550
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.)	2551	void glRasterPos (float x, float y, float z = 0.)
2544	CODE:	2552	CODE:
2545	glRasterPos3f (0, 0, z);	2553	glRasterPos3f (0, 0, z);
2546	glBitmap (0, 0, 0, 0, x, y, 0);	2554	glBitmap (0, 0, 0, 0, x, y, 0);
2547		2555
…		…
2551		2559
2552	void glTexCoord (float s, float t)	2560	void glTexCoord (float s, float t)
2553	CODE:	2561	CODE:
2554	glTexCoord2f (s, t);	2562	glTexCoord2f (s, t);
2555		2563
		2564	void glRect (float x1, float y1, float x2, float y2)
		2565	CODE:
		2566	glRectf (x1, y1, x2, y2);
		2567
		2568	PROTOTYPES: ENABLE
		2569
		2570	void glBegin (int mode)
		2571
		2572	void glEnd ()
		2573
		2574	void glPointSize (GLfloat size)
		2575
		2576	void glLineWidth (GLfloat width)
		2577
		2578	void glInterleavedArrays (int format, int stride, char *data)
		2579
		2580	void glDrawElements (int mode, int count, int type, char *indices)
		2581
		2582	# 1.2 void glDrawRangeElements (int mode, int start, int end
		2583
2556	void glTexEnv (int target, int pname, float param)	2584	void glTexEnv (int target, int pname, float param)
2557	CODE:	2585	CODE:
2558	glTexEnvf (target, pname, param);	2586	glTexEnvf (target, pname, param);
2559		2587
2560	void glTexParameter (int target, int pname, float param)	2588	void glTexParameter (int target, int pname, float param)
…		…
2617	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2645	MODULE = CFPlus PACKAGE = CFPlus::UI::Base
2618		2646
2619	PROTOTYPES: DISABLE	2647	PROTOTYPES: DISABLE
2620		2648
2621	void	2649	void
2622	find_widget (SV *widget, NV x, NV y)	2650	find_widget (SV *self, NV x, NV y)
2623	PPCODE:	2651	PPCODE:
2624	{	2652	{
2625	if (within_widget (widget, x, y))	2653	if (within_widget (self, x, y))
2626	XPUSHs (widget);	2654	XPUSHs (self);
2627	}	2655	}
2628		2656
		2657	BOOT:
		2658	{
		2659	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);
		2660
		2661	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);
		2662	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);
		2663	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);
		2664	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);
		2665	}
		2666
		2667	void
		2668	draw (SV *self)
		2669	CODE:
		2670	{
		2671	HV *hv;
		2672	SV **svp;
		2673	NV x, y, w, h;
		2674	SV *draw_x_sv = GvSV (draw_x_gv);
		2675	SV *draw_y_sv = GvSV (draw_y_gv);
		2676	SV *draw_w_sv = GvSV (draw_w_gv);
		2677	SV *draw_h_sv = GvSV (draw_h_gv);
		2678	SV *hover;
		2679	double draw_x, draw_y, draw_w, draw_h;
		2680
		2681	if (!SvROK (self))
		2682	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
		2683
		2684	hv = (HV *)SvRV (self);
		2685
		2686	if (SvTYPE (hv) != SVt_PVHV)
		2687	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));
		2688
		2689	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
		2690	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
		2691
		2692	if (!h \|\| !w)
		2693	XSRETURN_EMPTY;
		2694
		2695	svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
		2696	svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
		2697
		2698	draw_x = SvNV (draw_x_sv) + x;
		2699	draw_y = SvNV (draw_y_sv) + y;
		2700
		2701	if (draw_x + w < 0 \|\| draw_x >= SvNV (draw_w_sv)
		2702	\|\| draw_y + h < 0 \|\| draw_y >= SvNV (draw_h_sv))
		2703	XSRETURN_EMPTY;
		2704
		2705	sv_setnv (draw_x_sv, draw_x);
		2706	sv_setnv (draw_y_sv, draw_y);
		2707
		2708	glPushMatrix ();
		2709	glTranslated (x, y, 0);
		2710
		2711	if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
		2712	{
		2713	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
		2714
		2715	if (svp && SvTRUE (*svp))
		2716	{
		2717	glColor4f (10.2f, 0.80.2f, 0.5*0.2f, 0.2f);
		2718	glEnable (GL_BLEND);
		2719	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		2720	glBegin (GL_QUADS);
		2721	glVertex2f (0, 0);
		2722	glVertex2f (w, 0);
		2723	glVertex2f (w, h);
		2724	glVertex2f (0, h);
		2725	glEnd ();
		2726	glDisable (GL_BLEND);
		2727	}
		2728	}
		2729	#if 0
		2730	if ($ENV{CFPLUS_DEBUG} & 1) {
		2731	glPushMatrix;
		2732	glColor 1, 1, 0, 1;
		2733	glTranslate 0.375, 0.375;
		2734	glBegin GL_LINE_LOOP;
		2735	glVertex 0 , 0;
		2736	glVertex $self->{w} - 1, 0;
		2737	glVertex $self->{w} - 1, $self->{h} - 1;
		2738	glVertex 0 , $self->{h} - 1;
		2739	glEnd;
		2740	glPopMatrix;
		2741	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		2742	}
		2743	#endif
		2744	PUSHMARK (SP);
		2745	XPUSHs (self);
		2746	PUTBACK;
		2747	call_method ("_draw", G_VOID \| G_DISCARD);
		2748	SPAGAIN;
		2749
		2750	glPopMatrix ();
		2751
		2752	draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
		2753	draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
		2754	}
		2755

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.211 by root, Sat Jul 28 00:45:28 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.211 by root, Sat Jul 28 00:45:28 2007 UTC