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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.43 by root, Sun Apr 9 22:12:11 2006 UTC vs.
Revision 1.56 by root, Mon Apr 10 22:16:34 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; # the widget with current focus	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
		13
		14	our $TOPLEVEL;
		15	our $BUTTON_STATE;
13		16
14	# class methods for events	17	# class methods for events
15	sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }	18	sub feed_sdl_key_down_event {
16	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
17	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
18	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	}
19		72
20	sub new {	73	sub new {
21	my $class = shift;	74	my $class = shift;
22		75
23	bless { @_ }, $class	76	bless { @_ }, $class
…		…
45	$self->{w} = $w;	98	$self->{w} = $w;
46	$self->{h} = $h;	99	$self->{h} = $h;
47	}	100	}
48		101
49	sub focus_in {	102	sub focus_in {
50	my ($widget) = @_;	103	my ($self) = @_;
51	$FOCUS = $widget;	104
		105	my $focus = $FOCUS; $FOCUS = $self;
		106	$focus->update if $focus;
		107	$FOCUS->update;
52	}	108	}
53		109
54	sub focus_out {	110	sub focus_out {
55	my ($widget) = @_;	111	my ($self) = @_;
56	}
57		112
58	sub key_down {	113	return unless $FOCUS == $self;
59	my ($widget, $sdlev) = @_;
60	}
61		114
62	sub key_up {	115	my $focus = $FOCUS; undef $FOCUS;
63	my ($widget, $sdlev) = @_;	116	$focus->update if $focus; #?
64	}	117	}
65		118
		119	sub mouse_motion { }
		120	sub button_up { }
66	sub button_down {	121	sub button_down { }
67	my ($widget, $sdlev) = @_;	122	sub key_down { }
68	}	123	sub key_up { }
69		124
70	sub button_up {
71	my ($widget, $sdlev) = @_;
72	}
73
74	sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }	125	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
75	sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }	126	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
76	sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }	127	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
77	sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }	128	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
78	sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }	129	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
79		130
80	sub draw {	131	sub draw {
81	my ($self) = @_;	132	my ($self) = @_;
82		133
83	glPushMatrix;	134	glPushMatrix;
84	glTranslate $self->{x}, $self->{y}, 0;	135	glTranslate $self->{x}, $self->{y}, 0;
85	$self->_draw;	136	$self->_draw;
		137	if ($self == $HOVER) {
		138	glColor 1, 1, 1, 0.4;
		139	glEnable GL_BLEND;
		140	glBegin GL_QUADS;
		141	glVertex 0 , 0;
		142	glVertex $self->{w}, 0;
		143	glVertex $self->{w}, $self->{h};
		144	glVertex 0 , $self->{h};
		145	glEnd;
		146	glDisable GL_BLEND;
		147	}
86	glPopMatrix;	148	glPopMatrix;
87	}	149	}
88		150
89	sub _draw {	151	sub _draw {
90	my ($self) = @_;	152	my ($self) = @_;
…		…
177	}	239	}
178		240
179	sub find_widget {	241	sub find_widget {
180	my ($self, $x, $y) = @_;	242	my ($self, $x, $y) = @_;
181		243
		244	$x -= $self->{x};
		245	$y -= $self->{y};
		246
182	my $res;	247	my $res;
183		248
184	for (@{ $self->{children} }) {	249	for (reverse @{ $self->{children} }) {
185	$res = $_->find_widget ($x, $y)	250	$res = $_->find_widget ($x, $y)
186	and return $res;	251	and return $res;
187	}	252	}
188		253
189	()	254	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
190	}	255	}
191		256
192	sub _draw {	257	sub _draw {
193	my ($self) = @_;	258	my ($self) = @_;
194		259
…		…
211	my ($self, $w, $h) = @_;	276	my ($self, $w, $h) = @_;
212		277
213	$self->SUPER::size_allocate ($w, $h);	278	$self->SUPER::size_allocate ($w, $h);
214	$self->{children}[0]->size_allocate ($w, $h)	279	$self->{children}[0]->size_allocate ($w, $h)
215	if $self->{children}[0]	280	if $self->{children}[0]
216	}
217
218	#############################################################################
219
220	package Crossfire::Client::Widget::Toplevel;
221
222	our @ISA = Crossfire::Client::Widget::Container::;
223
224	sub update {
225	my ($self) = @_;
226
227	::refresh ();
228	}
229
230	sub add {
231	my ($self, $widget) = @_;
232
233	$self->SUPER::add ($widget);
234
235	$widget->size_allocate ($widget->size_request);
236	}	281	}
237		282
238	#############################################################################	283	#############################################################################
239		284
240	package Crossfire::Client::Widget::Window;	285	package Crossfire::Client::Widget::Window;
…		…
287	or return;	332	or return;
288		333
289	glEnable GL_BLEND;	334	glEnable GL_BLEND;
290	glEnable GL_TEXTURE_2D;	335	glEnable GL_TEXTURE_2D;
291	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	336	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
292	glBindTexture GL_TEXTURE_2D, $tex->{name};
293		337
294	glBegin GL_QUADS;	338	$tex->draw_quad (0, 0, $w, $h);
295	glTexCoord 0, 0; glVertex 0, 0;
296	glTexCoord 0, 1; glVertex 0, $h;
297	glTexCoord 1, 1; glVertex $w, $h;
298	glTexCoord 1, 0; glVertex $w, 0;
299	glEnd;
300		339
301	glDisable GL_BLEND;	340	glDisable GL_BLEND;
302	glDisable GL_TEXTURE_2D;	341	glDisable GL_TEXTURE_2D;
303	}	342	}
304		343
…		…
337		376
338	my ($w, $h) = $chld->size_request;	377	my ($w, $h) = $chld->size_request;
339		378
340	glBegin GL_QUADS;	379	glBegin GL_QUADS;
341	glColor 0, 0, 0;	380	glColor 0, 0, 0;
342	glTexCoord 0, 0; glVertex 0 , 0;	381	glVertex 0 , 0;
343	glTexCoord 0, 1; glVertex 0 , $h + 4;	382	glVertex 0 , $h + 4;
344	glTexCoord 1, 1; glVertex $w + 4 , $h + 4;	383	glVertex $w + 4 , $h + 4;
345	glTexCoord 1, 0; glVertex $w + 4 , 0;	384	glVertex $w + 4 , 0;
346	glEnd;	385	glEnd;
347		386
348	$chld->draw;	387	$chld->draw;
349	}	388	}
350		389
…		…
400	glEnable GL_TEXTURE_2D;	439	glEnable GL_TEXTURE_2D;
401	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	440	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
402	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	441	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
403		442
404	my $top = $tex[1];	443	my $top = $tex[1];
405	glBindTexture GL_TEXTURE_2D, $top->{name};	444	$top->draw_quad (0, 0, $w, $top->{height});
406
407	glBegin GL_QUADS;
408	glTexCoord 0, 0; glVertex 0 , 0;
409	glTexCoord 0, 1; glVertex 0 , $top->{height};
410	glTexCoord 1, 1; glVertex $w , $top->{height};
411	glTexCoord 1, 0; glVertex $w , 0;
412	glEnd;
413		445
414	my $left = $tex[3];	446	my $left = $tex[3];
415	glBindTexture GL_TEXTURE_2D, $left->{name};	447	$left->draw_quad (0, $top->{height}, $left->{width}, $ch);
416
417	glBegin GL_QUADS;
418	glTexCoord 0, 0; glVertex 0 , $top->{height};
419	glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
420	glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
421	glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
422	glEnd;
423		448
424	my $right = $tex[2];	449	my $right = $tex[2];
425	glBindTexture GL_TEXTURE_2D, $right->{name};	450	$right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
426
427	glBegin GL_QUADS;
428	glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
429	glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
430	glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
431	glTexCoord 1, 0; glVertex $w , $top->{height};
432	glEnd;
433		451
434	my $bottom = $tex[4];	452	my $bottom = $tex[4];
435	glBindTexture GL_TEXTURE_2D, $bottom->{name};	453	$bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
436
437	glBegin GL_QUADS;
438	glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
439	glTexCoord 0, 1; glVertex 0 , $h;
440	glTexCoord 1, 1; glVertex $w , $h;
441	glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
442	glEnd;
443		454
444	my $bg = $tex[0];	455	my $bg = $tex[0];
445	glBindTexture GL_TEXTURE_2D, $bg->{name};	456	glBindTexture GL_TEXTURE_2D, $bg->{name};
446	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	457	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
447	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;	458	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
448	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;	459	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
449		460
450	my $rep_x = $cw / $bg->{width};	461	my $rep_x = $cw / $bg->{width};
451	my $rep_y = $ch / $bg->{height};	462	my $rep_y = $ch / $bg->{height};
452		463
453	glBegin GL_QUADS;	464	$bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
454	glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
455	glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
456	glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
457	glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
458	glEnd;
459		465
460	glDisable GL_BLEND;	466	glDisable GL_BLEND;
461	glDisable GL_TEXTURE_2D;	467	glDisable GL_TEXTURE_2D;
462		468
463	$self->child->draw;	469	$self->child->draw;
…		…
620	use SDL::OpenGL;	626	use SDL::OpenGL;
621		627
622	sub new {	628	sub new {
623	my ($class, $x, $y, $z, $height, $text) = @_;	629	my ($class, $x, $y, $z, $height, $text) = @_;
624		630
		631	$height \|\|= $::FONTSIZE;
		632
625	# TODO: color, and make height, xyz etc. optional	633	# TODO: color, and make height, xyz etc. optional
626	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);
627		635
628	$self->set_text ($text);	636	$self->set_text ($text);
629		637
…		…
646	}	654	}
647		655
648	sub size_request {	656	sub size_request {
649	my ($self) = @_;	657	my ($self) = @_;
650		658
651	(	659	if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
		660	(
652	$self->{texture}{width},	661	$self->{texture}{width},
653	$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)
654	)	668	}
		669
655	}	670	}
656		671
657	sub _draw {	672	sub _draw {
658	my ($self) = @_;	673	my ($self) = @_;
659		674
…		…
661		676
662	glEnable GL_BLEND;	677	glEnable GL_BLEND;
663	glEnable GL_TEXTURE_2D;	678	glEnable GL_TEXTURE_2D;
664	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	679	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
665	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	680	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
666	glBindTexture GL_TEXTURE_2D, $tex->{name};
667		681
668	glColor 1, 0, 0, 1; # TODO color	682	glColor 1, 0, 0, 1; # TODO color
669		683
670	glBegin GL_QUADS;	684	$tex->draw_quad (0, 0);
671	glTexCoord 0, 0; glVertex 0 , 0;
672	glTexCoord 0, 1; glVertex 0 , $tex->{height};
673	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
674	glTexCoord 1, 0; glVertex $tex->{width}, 0;
675	glEnd;
676		685
677	glDisable GL_BLEND;	686	glDisable GL_BLEND;
678	glDisable GL_TEXTURE_2D;	687	glDisable GL_TEXTURE_2D;
679	}	688	}
680		689
681	#############################################################################	690	#############################################################################
682		691
683	package Crossfire::Client::Widget::TextEntry;	692	package Crossfire::Client::Widget::Entry;
684		693
685	our @ISA = Crossfire::Client::Widget::Label::;	694	our @ISA = Crossfire::Client::Widget::Label::;
686		695
687	use SDL;	696	use SDL;
688	use SDL::OpenGL;	697	use SDL::OpenGL;
…		…
691	my ($self, $ev) = @_;	700	my ($self, $ev) = @_;
692		701
693	my $mod = $ev->key_mod;	702	my $mod = $ev->key_mod;
694	my $sym = $ev->key_sym;	703	my $sym = $ev->key_sym;
695		704
696	$ev->set_unicode (1);
697	my $uni = $ev->key_unicode;	705	my $uni = $ev->key_unicode;
698		706
699	my $text = $self->get_text;	707	my $text = $self->get_text;
700		708
701	if ($sym == SDLK_BACKSPACE) {	709	if ($sym == SDLK_BACKSPACE) {
702	substr $text, -1, 1, '';	710	substr $text, -1, 1, '';
703
704	} elsif ($uni) {	711	} elsif ($uni) {
705	$text .= chr $uni;	712	$text .= chr $uni;
		713	print "$uni <$text>\n";#d#
706	}	714	}
		715
707	$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;
708	}	742	}
709		743
710	#############################################################################	744	#############################################################################
711		745
712	package Crossfire::Client::Widget::MapWidget;	746	package Crossfire::Client::Widget::MapWidget;
…		…
727		761
728	sub key_up {	762	sub key_up {
729	}	763	}
730		764
731	sub size_request {	765	sub size_request {
732		766	(
733	}	767	1 + int $::WIDTH / 32,
734		768	1 + int $::HEIGHT / 32,
735	sub size_allocate {	769	)
736	}	770	}
737		771
738	sub _draw {	772	sub _draw {
739	my ($self) = @_;	773	my ($self) = @_;
740		774
…		…
773	my $cell = $map->[$x + $xofs][$y + $yofs]	807	my $cell = $map->[$x + $xofs][$y + $yofs]
774	or next;	808	or next;
775		809
776	my $darkness = $cell->[0] * (1 / 255);	810	my $darkness = $cell->[0] * (1 / 255);
777	if ($darkness < 0) {	811	if ($darkness < 0) {
778	$darkness = 0.15;	812	$darkness = $cell->[1] ? 0.1 : 0;
779	}	813	}
780	substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;	814	substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
781		815
782	for my $num (grep $_, @$cell[1,2,3]) {	816	for my $num (grep $_, @$cell[1,2,3]) {
783	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	817	my $tex = $::CONN->{face}[$num]{texture} \|\| next;
784		818
785	glBindTexture GL_TEXTURE_2D, $tex->{name};
786
787	my $w = $tex->{width};	819	my $w = $tex->{width};
788	my $h = $tex->{height};	820	my $h = $tex->{height};
789		821
790	my $px = ($x + 1) * 32 - $w;	822	my $px = ($x + 1) * 32 - $w;
791	my $py = ($y + 1) * 32 - $h;	823	my $py = ($y + 1) * 32 - $h;
792		824
793	glBegin GL_QUADS;	825	$tex->draw_quad ($px, $py, $w, $h);
794	glTexCoord 0, 0; glVertex $px , $py;
795	glTexCoord 0, 1; glVertex $px , $py + $h;
796	glTexCoord 1, 1; glVertex $px + $w, $py + $h;
797	glTexCoord 1, 0; glVertex $px + $w, $py;
798	glEnd;
799	}	826	}
800	}	827	}
801	}	828	}
802		829
803	# if (1) { # higher quality darkness	830	# if (1) { # higher quality darkness
…		…
812		839
813	$lighting = new Crossfire::Client::Texture	840	$lighting = new Crossfire::Client::Texture
814	width => $sw4,	841	width => $sw4,
815	height => $sh,	842	height => $sh,
816	data => $lighting,	843	data => $lighting,
817	internalformat => GL_ALPHA4,	844	internalformat => GL_ALPHA,
818	format => GL_ALPHA;	845	format => GL_ALPHA;
819		846
820	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	847	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
821	glColor 0, 0, 0, 0.75;	848	glColor 0.45, 0.45, 0.45, 1;
822	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	849	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
823	glBindTexture GL_TEXTURE_2D, $lighting->{name};	850	glBindTexture GL_TEXTURE_2D, $lighting->{name};
824	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;	851	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
825	glBegin GL_QUADS;	852
826	glTexCoord 0, 0; glVertex 0 , 0;	853	$lighting->draw_quad (0, 0, $sw4 * 32, $sh * 32);
827	glTexCoord 0, 1; glVertex 0 , $sh * 32;
828	glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
829	glTexCoord 1, 0; glVertex $sw4 * 32, 0;
830	glEnd;
831		854
832	glDisable GL_TEXTURE_2D;	855	glDisable GL_TEXTURE_2D;
833	glDisable GL_BLEND;	856	glDisable GL_BLEND;
834	}	857	}
835		858
…		…
894		917
895	sub moveto {	918	sub moveto {
896	my ($self, $x, $y) = @_;	919	my ($self, $x, $y) = @_;
897		920
898	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	921	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
899	$self->{speed} = 0.2;	922	$self->{speed} = 0.001;
900	$self->{time} = 1;	923	$self->{time} = 1;
901		924
902	::animation_start $self;	925	::animation_start $self;
903	}	926	}
904		927
905	sub animate {	928	sub animate {
906	my ($self, $interval) = @_;	929	my ($self, $interval) = @_;
		930
		931	printf "%5.2f\n", 1 / $interval;#d#
907		932
908	$self->{time} -= $interval * $self->{speed};	933	$self->{time} -= $interval * $self->{speed};
909	if ($self->{time} <= 0) {	934	if ($self->{time} <= 0) {
910	$self->{time} = 0;	935	$self->{time} = 0;
911	::animation_stop $self;	936	::animation_stop $self;
…		…
919		944
920	sub _draw {	945	sub _draw {
921	my ($self) = @_;	946	my ($self) = @_;
922		947
923	glPushMatrix;	948	glPushMatrix;
924	glRotate $self->{time} * 10000, 0, 1, 0;	949	glRotate $self->{time} * 1000, 0, 1, 0;
925	$self->{children}[0]->draw;	950	$self->{children}[0]->draw;
926	glPopMatrix;	951	glPopMatrix;
927	}	952	}
928		953
929	1;	954	#############################################################################
930		955
		956	package Crossfire::Client::Widget::Toplevel;
		957
		958	our @ISA = Crossfire::Client::Widget::Container::;
		959
		960	sub size_request {
		961	($::WIDTH, $::HEIGHT)
		962	}
		963
		964	sub size_allocate {
		965	my ($self, $w, $h) = @_;
		966
		967	$self->SUPER::size_allocate ($w, $h);
		968
		969	$_->size_allocate ($_->size_request)
		970	for @{$self->{children}};
		971	}
		972
		973	sub update {
		974	my ($self) = @_;
		975
		976	$self->size_allocate ($self->size_request);
		977	::refresh ();
		978	}
		979
		980	sub add {
		981	my ($self, $widget) = @_;
		982
		983	$self->SUPER::add ($widget);
		984
		985	$widget->size_allocate ($widget->size_request);
		986	}
		987
		988	sub draw {
		989	my ($self) = @_;
		990
		991	$self->_draw;
		992	}
		993
		994	#############################################################################
		995
		996	package Crossfire::Client::Widget;
		997
		998	$TOPLEVEL = new Crossfire::Client::Widget::Toplevel;
		999
		1000	1
		1001

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.43 by root, Sun Apr 9 22:12:11 2006 UTC vs. Revision 1.56 by root, Mon Apr 10 22:16:34 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.43 by root, Sun Apr 9 22:12:11 2006 UTC vs.
Revision 1.56 by root, Mon Apr 10 22:16:34 2006 UTC