[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.209 by root, Sat Jul 21 22:54:52 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	PROTOTYPES: ENABLE
		2553
		2554	void glBegin (int mode)
		2555
		2556	void glEnd ()
		2557
		2558	void glPointSize (GLfloat size)
		2559
		2560	void glLineWidth (GLfloat width)
		2561
		2562	void glInterleavedArrays (int format, int stride, char *data)
		2563
		2564	void glDrawElements (int mode, int count, int type, char *indices)
		2565
		2566	# 1.2 void glDrawRangeElements (int mode, int start, int end
2555		2567
2556	void glTexEnv (int target, int pname, float param)	2568	void glTexEnv (int target, int pname, float param)
2557	CODE:	2569	CODE:
2558	glTexEnvf (target, pname, param);	2570	glTexEnvf (target, pname, param);
2559		2571
…		…
2617	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2629	MODULE = CFPlus PACKAGE = CFPlus::UI::Base
2618		2630
2619	PROTOTYPES: DISABLE	2631	PROTOTYPES: DISABLE
2620		2632
2621	void	2633	void
2622	find_widget (SV *widget, NV x, NV y)	2634	find_widget (SV *self, NV x, NV y)
2623	PPCODE:	2635	PPCODE:
2624	{	2636	{
2625	if (within_widget (widget, x, y))	2637	if (within_widget (self, x, y))
2626	XPUSHs (widget);	2638	XPUSHs (self);
2627	}	2639	}
2628		2640
		2641	BOOT:
		2642	{
		2643	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);
		2644
		2645	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);
		2646	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);
		2647	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);
		2648	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);
		2649	}
		2650
		2651	void
		2652	draw (SV *self)
		2653	CODE:
		2654	{
		2655	HV *hv;
		2656	SV **svp;
		2657	NV x, y, w, h;
		2658	SV *draw_x_sv = GvSV (draw_x_gv);
		2659	SV *draw_y_sv = GvSV (draw_y_gv);
		2660	SV *draw_w_sv = GvSV (draw_w_gv);
		2661	SV *draw_h_sv = GvSV (draw_h_gv);
		2662	SV *hover;
		2663	double draw_x, draw_y, draw_w, draw_h;
		2664
		2665	if (!SvROK (self))
		2666	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
		2667
		2668	hv = (HV *)SvRV (self);
		2669
		2670	if (SvTYPE (hv) != SVt_PVHV)
		2671	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));
		2672
		2673	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
		2674	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
		2675
		2676	if (!h \|\| !w)
		2677	XSRETURN_EMPTY;
		2678
		2679	svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
		2680	svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
		2681
		2682	draw_x = SvNV (draw_x_sv) + x;
		2683	draw_y = SvNV (draw_y_sv) + y;
		2684
		2685	if (draw_x + w < 0 \|\| draw_x >= SvNV (draw_w_sv)
		2686	\|\| draw_y + h < 0 \|\| draw_y >= SvNV (draw_h_sv))
		2687	XSRETURN_EMPTY;
		2688
		2689	sv_setnv (draw_x_sv, draw_x);
		2690	sv_setnv (draw_y_sv, draw_y);
		2691
		2692	glPushMatrix ();
		2693	glTranslated (x, y, 0);
		2694
		2695	if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
		2696	{
		2697	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
		2698
		2699	if (svp && SvTRUE (*svp))
		2700	{
		2701	glColor4f (10.2f, 0.80.2f, 0.5*0.2f, 0.2f);
		2702	glEnable (GL_BLEND);
		2703	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		2704	glBegin (GL_QUADS);
		2705	glVertex2f (0, 0);
		2706	glVertex2f (w, 0);
		2707	glVertex2f (w, h);
		2708	glVertex2f (0, h);
		2709	glEnd ();
		2710	glDisable (GL_BLEND);
		2711	}
		2712	}
		2713	#if 0
		2714	if ($ENV{CFPLUS_DEBUG} & 1) {
		2715	glPushMatrix;
		2716	glColor 1, 1, 0, 1;
		2717	glTranslate 0.375, 0.375;
		2718	glBegin GL_LINE_LOOP;
		2719	glVertex 0 , 0;
		2720	glVertex $self->{w} - 1, 0;
		2721	glVertex $self->{w} - 1, $self->{h} - 1;
		2722	glVertex 0 , $self->{h} - 1;
		2723	glEnd;
		2724	glPopMatrix;
		2725	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		2726	}
		2727	#endif
		2728	PUSHMARK (SP);
		2729	XPUSHs (self);
		2730	PUTBACK;
		2731	call_method ("_draw", G_VOID \| G_DISCARD);
		2732	SPAGAIN;
		2733
		2734	glPopMatrix ();
		2735
		2736	draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
		2737	draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
		2738	}
		2739

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.209 by root, Sat Jul 21 22:54:52 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.209 by root, Sat Jul 21 22:54:52 2007 UTC