[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.49 by root, Sun Apr 9 22:26:51 2006 UTC vs.
Revision 1.57 by root, Mon Apr 10 22:53:49 2006 UTC

…		…
7	use SDL::OpenGL;	7	use SDL::OpenGL;
8	use SDL::OpenGL::Constants;	8	use SDL::OpenGL::Constants;
9		9
10	use Crossfire::Client;	10	use Crossfire::Client;
11		11
		12	our ($FOCUS, $HOVER, $GRAB); # various widgets
		13
		14	our $TOPLEVEL;
		15	our $BUTTON_STATE;
		16
12	# class methods for events	17	# class methods for events
13	sub feed_sdl_key_down_event { $::FOCUS->key_down ($_[0]) if $::FOCUS }	18	sub feed_sdl_key_down_event {
14	sub feed_sdl_key_up_event { $::FOCUS->key_up ($_[0]) if $::FOCUS }	19	$FOCUS->key_down ($_[0]) if $FOCUS;
		20	}
		21
		22	sub feed_sdl_key_up_event {
		23	$FOCUS->key_up ($_[0]) if $FOCUS;
		24	}
		25
15	sub feed_sdl_button_down_event { }	26	sub feed_sdl_button_down_event {
		27	my ($ev) = @_;
		28	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
		29
		30	if (!$BUTTON_STATE) {
		31	my $widget = $TOPLEVEL->find_widget ($x, $y);
		32
		33	$GRAB = $widget;
		34	$GRAB->update if $GRAB;
		35	}
		36
		37	$BUTTON_STATE \|= 1 << ($ev->button - 1);
		38
		39	$GRAB->button_down ($ev) if $GRAB;
		40	}
		41
16	sub feed_sdl_button_up_event { }	42	sub feed_sdl_button_up_event {
		43	my ($ev) = @_;
		44	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
		45
		46	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);
		47
		48	$BUTTON_STATE &= ~(1 << ($ev->button - 1));
		49
		50	if (!$BUTTON_STATE) {
		51	my $grab = $GRAB; undef $GRAB;
		52	$grab->update if $grab;
		53	$GRAB->update if $GRAB;
		54	}
		55	}
		56
		57	sub feed_sdl_motion_event {
		58	my ($ev) = @_;
		59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
		60
		61	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);
		62
		63	if ($widget != $HOVER) {
		64	my $hover = $HOVER; $HOVER = $widget;
		65
		66	$hover->update if $hover;
		67	$HOVER->update if $HOVER;
		68	}
		69
		70	$HOVER->mouse_motion ($ev) if $HOVER;
		71	}
17		72
18	sub new {	73	sub new {
19	my $class = shift;	74	my $class = shift;
20		75
21	bless { @_ }, $class	76	bless { @_ }, $class
…		…
43	$self->{w} = $w;	98	$self->{w} = $w;
44	$self->{h} = $h;	99	$self->{h} = $h;
45	}	100	}
46		101
47	sub focus_in {	102	sub focus_in {
48	my ($widget) = @_;	103	my ($self) = @_;
49	$::FOCUS = $widget;	104
		105	my $focus = $FOCUS; $FOCUS = $self;
		106	$focus->update if $focus;
		107	$FOCUS->update;
50	}	108	}
51		109
52	sub focus_out {	110	sub focus_out {
53	my ($widget) = @_;	111	my ($self) = @_;
54	}
55		112
56	sub key_down {	113	return unless $FOCUS == $self;
57	my ($widget, $sdlev) = @_;
58	}
59		114
60	sub key_up {	115	my $focus = $FOCUS; undef $FOCUS;
61	my ($widget, $sdlev) = @_;	116	$focus->update if $focus; #?
62	}	117	}
63		118
		119	sub mouse_motion { }
		120	sub button_up { }
64	sub button_down {	121	sub button_down { }
65	my ($widget, $sdlev) = @_;	122	sub key_down { }
66	}	123	sub key_up { }
67		124
68	sub button_up {
69	my ($widget, $sdlev) = @_;
70	}
71
72	sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }	125	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
73	sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }	126	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
74	sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }	127	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
75	sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }	128	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
76	sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }	129	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
77		130
78	sub draw {	131	sub draw {
79	my ($self) = @_;	132	my ($self) = @_;
80		133
81	glPushMatrix;	134	glPushMatrix;
82	glTranslate $self->{x}, $self->{y}, 0;	135	glTranslate $self->{x}, $self->{y}, 0;
83	$self->_draw;	136	$self->_draw;
84	if ($self == $::HOVER) {	137	if ($self == $HOVER) {
85	glColor 1, 1, 1, 0.4;	138	glColor 1, 1, 1, 0.4;
		139	glEnable GL_BLEND;
86	glBegin GL_QUADS;	140	glBegin GL_QUADS;
87	glVertex 0, 0;	141	glVertex 0 , 0;
88	glVertex $self->{w} - 1, 0;	142	glVertex $self->{w}, 0;
89	glVertex $self->{w} - 1, $self->{h} - 1;	143	glVertex $self->{w}, $self->{h};
90	glVertex 0, $self->{h} - 1;	144	glVertex 0 , $self->{h};
91	glEnd;	145	glEnd;
		146	glDisable GL_BLEND;
92	}	147	}
93	glPopMatrix;	148	glPopMatrix;
94	}	149	}
95		150
96	sub _draw {	151	sub _draw {
…		…
225	if $self->{children}[0]	280	if $self->{children}[0]
226	}	281	}
227		282
228	#############################################################################	283	#############################################################################
229		284
230	package Crossfire::Client::Widget::Toplevel;
231
232	our @ISA = Crossfire::Client::Widget::Container::;
233
234	sub update {
235	my ($self) = @_;
236
237	::refresh ();
238	}
239
240	sub add {
241	my ($self, $widget) = @_;
242
243	$self->SUPER::add ($widget);
244
245	$widget->size_allocate ($widget->size_request);
246	}
247
248	#############################################################################
249
250	package Crossfire::Client::Widget::Window;	285	package Crossfire::Client::Widget::Window;
251		286
252	our @ISA = Crossfire::Client::Widget::Bin::;	287	our @ISA = Crossfire::Client::Widget::Bin::;
253		288
254	use SDL::OpenGL;	289	use SDL::OpenGL;
…		…
297	or return;	332	or return;
298		333
299	glEnable GL_BLEND;	334	glEnable GL_BLEND;
300	glEnable GL_TEXTURE_2D;	335	glEnable GL_TEXTURE_2D;
301	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	336	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
302	glBindTexture GL_TEXTURE_2D, $tex->{name};
303		337
304	glBegin GL_QUADS;	338	$tex->draw_quad (0, 0, $w, $h);
305	glTexCoord 0, 0; glVertex 0, 0;
306	glTexCoord 0, 1; glVertex 0, $h;
307	glTexCoord 1, 1; glVertex $w, $h;
308	glTexCoord 1, 0; glVertex $w, 0;
309	glEnd;
310		339
311	glDisable GL_BLEND;	340	glDisable GL_BLEND;
312	glDisable GL_TEXTURE_2D;	341	glDisable GL_TEXTURE_2D;
313	}	342	}
314		343
…		…
347		376
348	my ($w, $h) = $chld->size_request;	377	my ($w, $h) = $chld->size_request;
349		378
350	glBegin GL_QUADS;	379	glBegin GL_QUADS;
351	glColor 0, 0, 0;	380	glColor 0, 0, 0;
352	glTexCoord 0, 0; glVertex 0 , 0;	381	glVertex 0 , 0;
353	glTexCoord 0, 1; glVertex 0 , $h + 4;	382	glVertex 0 , $h + 4;
354	glTexCoord 1, 1; glVertex $w + 4 , $h + 4;	383	glVertex $w + 4 , $h + 4;
355	glTexCoord 1, 0; glVertex $w + 4 , 0;	384	glVertex $w + 4 , 0;
356	glEnd;	385	glEnd;
357		386
358	$chld->draw;	387	$chld->draw;
359	}	388	}
360		389
…		…
410	glEnable GL_TEXTURE_2D;	439	glEnable GL_TEXTURE_2D;
411	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	440	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
412	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	441	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
413		442
414	my $top = $tex[1];	443	my $top = $tex[1];
415	glBindTexture GL_TEXTURE_2D, $top->{name};	444	$top->draw_quad (0, 0, $w, $top->{height});
416
417	glBegin GL_QUADS;
418	glTexCoord 0, 0; glVertex 0 , 0;
419	glTexCoord 0, 1; glVertex 0 , $top->{height};
420	glTexCoord 1, 1; glVertex $w , $top->{height};
421	glTexCoord 1, 0; glVertex $w , 0;
422	glEnd;
423		445
424	my $left = $tex[3];	446	my $left = $tex[3];
425	glBindTexture GL_TEXTURE_2D, $left->{name};	447	$left->draw_quad (0, $top->{height}, $left->{width}, $ch);
426
427	glBegin GL_QUADS;
428	glTexCoord 0, 0; glVertex 0 , $top->{height};
429	glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
430	glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
431	glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
432	glEnd;
433		448
434	my $right = $tex[2];	449	my $right = $tex[2];
435	glBindTexture GL_TEXTURE_2D, $right->{name};	450	$right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
436
437	glBegin GL_QUADS;
438	glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
439	glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
440	glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
441	glTexCoord 1, 0; glVertex $w , $top->{height};
442	glEnd;
443		451
444	my $bottom = $tex[4];	452	my $bottom = $tex[4];
445	glBindTexture GL_TEXTURE_2D, $bottom->{name};	453	$bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
446
447	glBegin GL_QUADS;
448	glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
449	glTexCoord 0, 1; glVertex 0 , $h;
450	glTexCoord 1, 1; glVertex $w , $h;
451	glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
452	glEnd;
453		454
454	my $bg = $tex[0];	455	my $bg = $tex[0];
455	glBindTexture GL_TEXTURE_2D, $bg->{name};	456	glBindTexture GL_TEXTURE_2D, $bg->{name};
456	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	457	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
457	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;	458	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
458	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;	459	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
459		460
460	my $rep_x = $cw / $bg->{width};	461	my $rep_x = $cw / $bg->{width};
461	my $rep_y = $ch / $bg->{height};	462	my $rep_y = $ch / $bg->{height};
462		463
463	glBegin GL_QUADS;	464	$bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
464	glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
465	glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
466	glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
467	glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
468	glEnd;
469		465
470	glDisable GL_BLEND;	466	glDisable GL_BLEND;
471	glDisable GL_TEXTURE_2D;	467	glDisable GL_TEXTURE_2D;
472		468
473	$self->child->draw;	469	$self->child->draw;
…		…
630	use SDL::OpenGL;	626	use SDL::OpenGL;
631		627
632	sub new {	628	sub new {
633	my ($class, $x, $y, $z, $height, $text) = @_;	629	my ($class, $x, $y, $z, $height, $text) = @_;
634		630
		631	$height \|\|= $::FONTSIZE;
		632
635	# TODO: color, and make height, xyz etc. optional	633	# TODO: color, and make height, xyz etc. optional
636	my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);	634	my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
637		635
638	$self->set_text ($text);	636	$self->set_text ($text);
639		637
…		…
656	}	654	}
657		655
658	sub size_request {	656	sub size_request {
659	my ($self) = @_;	657	my ($self) = @_;
660		658
661	(	659	if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
		660	(
662	$self->{texture}{width},	661	$self->{texture}{width},
663	$self->{texture}{height},	662	$self->{texture}{height},
		663	)
		664	} else {
		665	my ($w, $h, $data) = Crossfire::Client::font_render "Yy", $self->{height};
		666
		667	($w, $h)
664	)	668	}
		669
665	}	670	}
666		671
667	sub _draw {	672	sub _draw {
668	my ($self) = @_;	673	my ($self) = @_;
669		674
…		…
671		676
672	glEnable GL_BLEND;	677	glEnable GL_BLEND;
673	glEnable GL_TEXTURE_2D;	678	glEnable GL_TEXTURE_2D;
674	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	679	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
675	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	680	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
676	glBindTexture GL_TEXTURE_2D, $tex->{name};
677		681
678	glColor 1, 0, 0, 1; # TODO color	682	glColor 1, 0, 0, 1; # TODO color
679		683
680	glBegin GL_QUADS;	684	$tex->draw_quad (0, 0);
681	glTexCoord 0, 0; glVertex 0 , 0;
682	glTexCoord 0, 1; glVertex 0 , $tex->{height};
683	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
684	glTexCoord 1, 0; glVertex $tex->{width}, 0;
685	glEnd;
686		685
687	glDisable GL_BLEND;	686	glDisable GL_BLEND;
688	glDisable GL_TEXTURE_2D;	687	glDisable GL_TEXTURE_2D;
689	}	688	}
690		689
691	#############################################################################	690	#############################################################################
692		691
693	package Crossfire::Client::Widget::TextEntry;	692	package Crossfire::Client::Widget::Entry;
694		693
695	our @ISA = Crossfire::Client::Widget::Label::;	694	our @ISA = Crossfire::Client::Widget::Label::;
696		695
697	use SDL;	696	use SDL;
698	use SDL::OpenGL;	697	use SDL::OpenGL;
…		…
701	my ($self, $ev) = @_;	700	my ($self, $ev) = @_;
702		701
703	my $mod = $ev->key_mod;	702	my $mod = $ev->key_mod;
704	my $sym = $ev->key_sym;	703	my $sym = $ev->key_sym;
705		704
706	$ev->set_unicode (1);
707	my $uni = $ev->key_unicode;	705	my $uni = $ev->key_unicode;
708		706
709	my $text = $self->get_text;	707	my $text = $self->get_text;
710		708
711	if ($sym == SDLK_BACKSPACE) {	709	if ($sym == SDLK_BACKSPACE) {
712	substr $text, -1, 1, '';	710	substr $text, -1, 1, '';
713
714	} elsif ($uni) {	711	} elsif ($uni) {
715	$text .= chr $uni;	712	$text .= chr $uni;
		713	print "$uni <$text>\n";#d#
716	}	714	}
		715
717	$self->set_text ($text);	716	$self->set_text ($text);
		717	}
		718
		719	sub button_down {
		720	my ($self, $ev) = @_;
		721
		722	$self->focus_in;
		723	}
		724
		725	sub _draw {
		726	my ($self) = @_;
		727
		728	if ($FOCUS == $self) {
		729	glColor 1, 1, 1;
		730	} else {
		731	glColor 0.7, 0.7, 0.7;
		732	}
		733
		734	glBegin GL_QUADS;
		735	glVertex 0 , 0;
		736	glVertex 0 , $self->{h} - 1;
		737	glVertex $self->{w} - 1, $self->{h} - 1;
		738	glVertex $self->{w} - 1, 0;
		739	glEnd;
		740
		741	$self->SUPER::_draw;
718	}	742	}
719		743
720	#############################################################################	744	#############################################################################
721		745
722	package Crossfire::Client::Widget::MapWidget;	746	package Crossfire::Client::Widget::MapWidget;
…		…
737		761
738	sub key_up {	762	sub key_up {
739	}	763	}
740		764
741	sub size_request {	765	sub size_request {
742		766	(
743	}	767	1 + int $::WIDTH / 32,
744		768	1 + int $::HEIGHT / 32,
745	sub size_allocate {	769	)
746	}	770	}
747		771
748	sub _draw {	772	sub _draw {
749	my ($self) = @_;	773	my ($self) = @_;
750		774
…		…
773	glEnable GL_TEXTURE_2D;	797	glEnable GL_TEXTURE_2D;
774	glEnable GL_BLEND;	798	glEnable GL_BLEND;
775	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	799	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
776		800
777	my $sw4 = ($sw + 3) & ~3;	801	my $sw4 = ($sw + 3) & ~3;
778	my $lighting = "\x00" x ($sw4 * $sh);	802	my $darkness = "\x00" x ($sw4 * $sh);
779		803
780	for my $x (0 .. $sw - 1) {	804	for my $x (0 .. $sw - 1) {
		805	my $row = $map->[$x + $xofs];
781	for my $y (0 .. $sh - 1) {	806	for my $y (0 .. $sh - 1) {
782		807
783	my $cell = $map->[$x + $xofs][$y + $yofs]	808	my $cell = $row->[$y + $yofs]
784	or next;	809	or next;
785		810
786	my $darkness = $cell->[0] * (1 / 255);	811	my $dark = $cell->[0];
787	if ($darkness < 0) {	812	if ($dark < 0) {
788	$darkness = 0.15;	813	substr $darkness, $y * $sw4 + $x, 1, chr 224;
		814	} else {
		815	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
789	}	816	}
790	substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
791		817
792	for my $num (grep $_, @$cell[1,2,3]) {	818	for my $num (grep $_, @$cell[1,2,3]) {
793	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	819	my $tex = $::CONN->{face}[$num]{texture} \|\| next;
794		820
795	glBindTexture GL_TEXTURE_2D, $tex->{name};
796
797	my $w = $tex->{width};	821	my $w = $tex->{width};
798	my $h = $tex->{height};	822	my $h = $tex->{height};
799		823
800	my $px = ($x + 1) * 32 - $w;	824	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
801	my $py = ($y + 1) * 32 - $h;
802
803	glBegin GL_QUADS;
804	glTexCoord 0, 0; glVertex $px , $py;
805	glTexCoord 0, 1; glVertex $px , $py + $h;
806	glTexCoord 1, 1; glVertex $px + $w, $py + $h;
807	glTexCoord 1, 0; glVertex $px + $w, $py;
808	glEnd;
809	}	825	}
810	}	826	}
811	}	827	}
812		828
813	# if (1) { # higher quality darkness	829	# if (1) { # higher quality darkness
…		…
818	#	834	#
819	# $lighting = $pb->get_pixels;	835	# $lighting = $pb->get_pixels;
820	# $lighting =~ s/(.)../$1/gs;	836	# $lighting =~ s/(.)../$1/gs;
821	# }	837	# }
822		838
		839	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		840	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		841
823	$lighting = new Crossfire::Client::Texture	842	$darkness = new Crossfire::Client::Texture
824	width => $sw4,	843	width => $sw4,
825	height => $sh,	844	height => $sh,
826	data => $lighting,	845	data => $darkness,
827	internalformat => GL_ALPHA4,	846	internalformat => GL_ALPHA,
828	format => GL_ALPHA;	847	format => GL_ALPHA;
829		848
830	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	849	glColor 0.45, 0.45, 0.45, 1;
831	glColor 0, 0, 0, 0.75;	850	$darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
832	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
833	glBindTexture GL_TEXTURE_2D, $lighting->{name};
834	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
835	glBegin GL_QUADS;
836	glTexCoord 0, 0; glVertex 0 , 0;
837	glTexCoord 0, 1; glVertex 0 , $sh * 32;
838	glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
839	glTexCoord 1, 0; glVertex $sw4 * 32, 0;
840	glEnd;
841		851
842	glDisable GL_TEXTURE_2D;	852	glDisable GL_TEXTURE_2D;
843	glDisable GL_BLEND;	853	glDisable GL_BLEND;
844	}	854	}
845		855
…		…
904		914
905	sub moveto {	915	sub moveto {
906	my ($self, $x, $y) = @_;	916	my ($self, $x, $y) = @_;
907		917
908	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	918	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
909	$self->{speed} = 0.2;	919	$self->{speed} = 0.001;
910	$self->{time} = 1;	920	$self->{time} = 1;
911		921
912	::animation_start $self;	922	::animation_start $self;
913	}	923	}
914		924
915	sub animate {	925	sub animate {
916	my ($self, $interval) = @_;	926	my ($self, $interval) = @_;
		927
		928	printf "%5.2f\n", 1 / $interval if $interval;#d#
917		929
918	$self->{time} -= $interval * $self->{speed};	930	$self->{time} -= $interval * $self->{speed};
919	if ($self->{time} <= 0) {	931	if ($self->{time} <= 0) {
920	$self->{time} = 0;	932	$self->{time} = 0;
921	::animation_stop $self;	933	::animation_stop $self;
…		…
929		941
930	sub _draw {	942	sub _draw {
931	my ($self) = @_;	943	my ($self) = @_;
932		944
933	glPushMatrix;	945	glPushMatrix;
934	glRotate $self->{time} * 10000, 0, 1, 0;	946	glRotate $self->{time} * 1000, 0, 1, 0;
935	$self->{children}[0]->draw;	947	$self->{children}[0]->draw;
936	glPopMatrix;	948	glPopMatrix;
937	}	949	}
938		950
939	1;	951	#############################################################################
940		952
		953	package Crossfire::Client::Widget::Toplevel;
		954
		955	our @ISA = Crossfire::Client::Widget::Container::;
		956
		957	sub size_request {
		958	($::WIDTH, $::HEIGHT)
		959	}
		960
		961	sub size_allocate {
		962	my ($self, $w, $h) = @_;
		963
		964	$self->SUPER::size_allocate ($w, $h);
		965
		966	$_->size_allocate ($_->size_request)
		967	for @{$self->{children}};
		968	}
		969
		970	sub update {
		971	my ($self) = @_;
		972
		973	$self->size_allocate ($self->size_request);
		974	::refresh ();
		975	}
		976
		977	sub add {
		978	my ($self, $widget) = @_;
		979
		980	$self->SUPER::add ($widget);
		981
		982	$widget->size_allocate ($widget->size_request);
		983	}
		984
		985	sub draw {
		986	my ($self) = @_;
		987
		988	$self->_draw;
		989	}
		990
		991	#############################################################################
		992
		993	package Crossfire::Client::Widget;
		994
		995	$TOPLEVEL = new Crossfire::Client::Widget::Toplevel;
		996
		997	1
		998

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.49 by root, Sun Apr 9 22:26:51 2006 UTC vs. Revision 1.57 by root, Mon Apr 10 22:53:49 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.49 by root, Sun Apr 9 22:26:51 2006 UTC vs.
Revision 1.57 by root, Mon Apr 10 22:53:49 2006 UTC