[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.210 by root, Tue Jul 24 18:24:03 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;
…		…
2386	const_iv (GL_COLOR_LOGIC_OP),	2389	const_iv (GL_COLOR_LOGIC_OP),
2387	const_iv (GL_SEPARABLE_2D),	2390	const_iv (GL_SEPARABLE_2D),
2388	const_iv (GL_CONVOLUTION_2D),	2391	const_iv (GL_CONVOLUTION_2D),
2389	const_iv (GL_CONVOLUTION_BORDER_MODE),	2392	const_iv (GL_CONVOLUTION_BORDER_MODE),
2390	const_iv (GL_CONSTANT_BORDER),	2393	const_iv (GL_CONSTANT_BORDER),
		2394	const_iv (GL_POINTS),
2391	const_iv (GL_LINES),	2395	const_iv (GL_LINES),
2392	const_iv (GL_LINE_STRIP),	2396	const_iv (GL_LINE_STRIP),
2393	const_iv (GL_LINE_LOOP),	2397	const_iv (GL_LINE_LOOP),
2394	const_iv (GL_QUADS),	2398	const_iv (GL_QUADS),
2395	const_iv (GL_QUAD_STRIP),	2399	const_iv (GL_QUAD_STRIP),
2396	const_iv (GL_TRIANGLES),	2400	const_iv (GL_TRIANGLES),
2397	const_iv (GL_TRIANGLE_STRIP),	2401	const_iv (GL_TRIANGLE_STRIP),
2398	const_iv (GL_TRIANGLE_FAN),	2402	const_iv (GL_TRIANGLE_FAN),
		2403	const_iv (GL_POLYGON),
2399	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2404	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2400	const_iv (GL_POINT_SMOOTH_HINT),	2405	const_iv (GL_POINT_SMOOTH_HINT),
2401	const_iv (GL_LINE_SMOOTH_HINT),	2406	const_iv (GL_LINE_SMOOTH_HINT),
2402	const_iv (GL_POLYGON_SMOOTH_HINT),	2407	const_iv (GL_POLYGON_SMOOTH_HINT),
2403	const_iv (GL_GENERATE_MIPMAP_HINT),	2408	const_iv (GL_GENERATE_MIPMAP_HINT),
…		…
2498	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2503	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2499		2504
2500	# near_ and far_ are due to microsofts buggy "c" compiler	2505	# 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_)	2506	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2502		2507
		2508	PROTOTYPES: DISABLE
		2509
2503	void glViewport (int x, int y, int width, int height)	2510	void glViewport (int x, int y, int width, int height)
2504		2511
2505	void glScissor (int x, int y, int width, int height)	2512	void glScissor (int x, int y, int width, int height)
2506		2513
2507	void glTranslate (float x, float y, float z = 0.)	2514	void glTranslate (float x, float y, float z = 0.)
…		…
2514		2521
2515	void glRotate (float angle, float x, float y, float z)	2522	void glRotate (float angle, float x, float y, float z)
2516	CODE:	2523	CODE:
2517	glRotatef (angle, x, y, z);	2524	glRotatef (angle, x, y, z);
2518		2525
2519	void glBegin (int mode)
2520
2521	void glEnd ()
2522
2523	void glColor (float r, float g, float b, float a = 1.0)	2526	void glColor (float r, float g, float b, float a = 1.0)
2524	PROTOTYPE: @
2525	ALIAS:	2527	ALIAS:
2526	glColor_premultiply = 1	2528	glColor_premultiply = 1
2527	CODE:	2529	CODE:
2528	if (ix)	2530	if (ix)
2529	{	2531	{
…		…
2532	b *= a;	2534	b *= a;
2533	}	2535	}
2534	// microsoft visual "c" rounds instead of truncating...	2536	// microsoft visual "c" rounds instead of truncating...
2535	glColor4f (r, g, b, a);	2537	glColor4f (r, g, b, a);
2536		2538
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.)	2539	void glRasterPos (float x, float y, float z = 0.)
2544	CODE:	2540	CODE:
2545	glRasterPos3f (0, 0, z);	2541	glRasterPos3f (0, 0, z);
2546	glBitmap (0, 0, 0, 0, x, y, 0);	2542	glBitmap (0, 0, 0, 0, x, y, 0);
2547		2543
…		…
2550	glVertex3f (x, y, z);	2546	glVertex3f (x, y, z);
2551		2547
2552	void glTexCoord (float s, float t)	2548	void glTexCoord (float s, float t)
2553	CODE:	2549	CODE:
2554	glTexCoord2f (s, t);	2550	glTexCoord2f (s, t);
		2551
		2552	void glRect (float x1, float y1, float x2, float y2)
		2553	CODE:
		2554	glRectf (x1, y1, x2, y2);
		2555
		2556	PROTOTYPES: ENABLE
		2557
		2558	void glBegin (int mode)
		2559
		2560	void glEnd ()
		2561
		2562	void glPointSize (GLfloat size)
		2563
		2564	void glLineWidth (GLfloat width)
		2565
		2566	void glInterleavedArrays (int format, int stride, char *data)
		2567
		2568	void glDrawElements (int mode, int count, int type, char *indices)
		2569
		2570	# 1.2 void glDrawRangeElements (int mode, int start, int end
2555		2571
2556	void glTexEnv (int target, int pname, float param)	2572	void glTexEnv (int target, int pname, float param)
2557	CODE:	2573	CODE:
2558	glTexEnvf (target, pname, param);	2574	glTexEnvf (target, pname, param);
2559		2575
…		…
2617	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2633	MODULE = CFPlus PACKAGE = CFPlus::UI::Base
2618		2634
2619	PROTOTYPES: DISABLE	2635	PROTOTYPES: DISABLE
2620		2636
2621	void	2637	void
2622	find_widget (SV *widget, NV x, NV y)	2638	find_widget (SV *self, NV x, NV y)
2623	PPCODE:	2639	PPCODE:
2624	{	2640	{
2625	if (within_widget (widget, x, y))	2641	if (within_widget (self, x, y))
2626	XPUSHs (widget);	2642	XPUSHs (self);
2627	}	2643	}
2628		2644
		2645	BOOT:
		2646	{
		2647	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);
		2648
		2649	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);
		2650	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);
		2651	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);
		2652	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);
		2653	}
		2654
		2655	void
		2656	draw (SV *self)
		2657	CODE:
		2658	{
		2659	HV *hv;
		2660	SV **svp;
		2661	NV x, y, w, h;
		2662	SV *draw_x_sv = GvSV (draw_x_gv);
		2663	SV *draw_y_sv = GvSV (draw_y_gv);
		2664	SV *draw_w_sv = GvSV (draw_w_gv);
		2665	SV *draw_h_sv = GvSV (draw_h_gv);
		2666	SV *hover;
		2667	double draw_x, draw_y, draw_w, draw_h;
		2668
		2669	if (!SvROK (self))
		2670	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
		2671
		2672	hv = (HV *)SvRV (self);
		2673
		2674	if (SvTYPE (hv) != SVt_PVHV)
		2675	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));
		2676
		2677	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
		2678	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
		2679
		2680	if (!h \|\| !w)
		2681	XSRETURN_EMPTY;
		2682
		2683	svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
		2684	svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
		2685
		2686	draw_x = SvNV (draw_x_sv) + x;
		2687	draw_y = SvNV (draw_y_sv) + y;
		2688
		2689	if (draw_x + w < 0 \|\| draw_x >= SvNV (draw_w_sv)
		2690	\|\| draw_y + h < 0 \|\| draw_y >= SvNV (draw_h_sv))
		2691	XSRETURN_EMPTY;
		2692
		2693	sv_setnv (draw_x_sv, draw_x);
		2694	sv_setnv (draw_y_sv, draw_y);
		2695
		2696	glPushMatrix ();
		2697	glTranslated (x, y, 0);
		2698
		2699	if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
		2700	{
		2701	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
		2702
		2703	if (svp && SvTRUE (*svp))
		2704	{
		2705	glColor4f (10.2f, 0.80.2f, 0.5*0.2f, 0.2f);
		2706	glEnable (GL_BLEND);
		2707	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		2708	glBegin (GL_QUADS);
		2709	glVertex2f (0, 0);
		2710	glVertex2f (w, 0);
		2711	glVertex2f (w, h);
		2712	glVertex2f (0, h);
		2713	glEnd ();
		2714	glDisable (GL_BLEND);
		2715	}
		2716	}
		2717	#if 0
		2718	if ($ENV{CFPLUS_DEBUG} & 1) {
		2719	glPushMatrix;
		2720	glColor 1, 1, 0, 1;
		2721	glTranslate 0.375, 0.375;
		2722	glBegin GL_LINE_LOOP;
		2723	glVertex 0 , 0;
		2724	glVertex $self->{w} - 1, 0;
		2725	glVertex $self->{w} - 1, $self->{h} - 1;
		2726	glVertex 0 , $self->{h} - 1;
		2727	glEnd;
		2728	glPopMatrix;
		2729	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		2730	}
		2731	#endif
		2732	PUSHMARK (SP);
		2733	XPUSHs (self);
		2734	PUTBACK;
		2735	call_method ("_draw", G_VOID \| G_DISCARD);
		2736	SPAGAIN;
		2737
		2738	glPopMatrix ();
		2739
		2740	draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
		2741	draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
		2742	}
		2743

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.210 by root, Tue Jul 24 18:24:03 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.210 by root, Tue Jul 24 18:24:03 2007 UTC