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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.46 by root, Sun Apr 9 22:21:02 2006 UTC vs.
Revision 1.58 by root, Tue Apr 11 12:21:29 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, $GRAB->translate ($x, $y)) 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	$GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
		51
		52	if (!$BUTTON_STATE) {
		53	my $grab = $GRAB; undef $GRAB;
		54	$grab->update if $grab;
		55	$GRAB->update if $GRAB;
		56	}
		57	}
		58
		59	sub feed_sdl_motion_event {
		60	my ($ev) = @_;
		61	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
		62
		63	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);
		64
		65	if ($widget != $HOVER) {
		66	my $hover = $HOVER; $HOVER = $widget;
		67
		68	$hover->update if $hover;
		69	$HOVER->update if $HOVER;
		70	}
		71
		72	$HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
		73	}
19		74
20	sub new {	75	sub new {
21	my $class = shift;	76	my $class = shift;
22		77
23	bless { @_ }, $class	78	bless { @_ }, $class
…		…
44		99
45	$self->{w} = $w;	100	$self->{w} = $w;
46	$self->{h} = $h;	101	$self->{h} = $h;
47	}	102	}
48		103
		104	# translate global koordinates to local coordinate system
		105	sub translate {
		106	my ($self, $x, $y) = @_;
		107
		108	$self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
		109	}
		110
49	sub focus_in {	111	sub focus_in {
50	my ($widget) = @_;	112	my ($self) = @_;
51	$FOCUS = $widget;	113
		114	my $focus = $FOCUS; $FOCUS = $self;
		115	$focus->update if $focus;
		116	$FOCUS->update;
52	}	117	}
53		118
54	sub focus_out {	119	sub focus_out {
55	my ($widget) = @_;	120	my ($self) = @_;
56	}
57		121
58	sub key_down {	122	return unless $FOCUS == $self;
59	my ($widget, $sdlev) = @_;
60	}
61		123
62	sub key_up {	124	my $focus = $FOCUS; undef $FOCUS;
63	my ($widget, $sdlev) = @_;	125	$focus->update if $focus; #?
64	}	126	}
65		127
		128	sub mouse_motion { }
		129	sub button_up { }
66	sub button_down {	130	sub button_down { }
67	my ($widget, $sdlev) = @_;	131	sub key_down { }
68	}	132	sub key_up { }
69		133
70	sub button_up {
71	my ($widget, $sdlev) = @_;
72	}
73
74	sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }	134	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
75	sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }	135	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
76	sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }	136	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
77	sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }	137	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
78	sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }	138	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
79		139
80	sub draw {	140	sub draw {
81	my ($self) = @_;	141	my ($self) = @_;
82		142
83	glPushMatrix;	143	glPushMatrix;
84	glTranslate $self->{x}, $self->{y}, 0;	144	glTranslate $self->{x}, $self->{y}, 0;
85	$self->_draw;	145	$self->_draw;
		146	if ($self == $HOVER) {
		147	glColor 1, 1, 1, 0.4;
		148	glEnable GL_BLEND;
		149	glBegin GL_QUADS;
		150	glVertex 0 , 0;
		151	glVertex $self->{w}, 0;
		152	glVertex $self->{w}, $self->{h};
		153	glVertex 0 , $self->{h};
		154	glEnd;
		155	glDisable GL_BLEND;
		156	}
86	glPopMatrix;	157	glPopMatrix;
87	}	158	}
88		159
89	sub _draw {	160	sub _draw {
90	my ($self) = @_;	161	my ($self) = @_;
…		…
218	if $self->{children}[0]	289	if $self->{children}[0]
219	}	290	}
220		291
221	#############################################################################	292	#############################################################################
222		293
223	package Crossfire::Client::Widget::Toplevel;
224
225	our @ISA = Crossfire::Client::Widget::Container::;
226
227	sub update {
228	my ($self) = @_;
229
230	::refresh ();
231	}
232
233	sub add {
234	my ($self, $widget) = @_;
235
236	$self->SUPER::add ($widget);
237
238	$widget->size_allocate ($widget->size_request);
239	}
240
241	#############################################################################
242
243	package Crossfire::Client::Widget::Window;	294	package Crossfire::Client::Widget::Window;
244		295
245	our @ISA = Crossfire::Client::Widget::Bin::;	296	our @ISA = Crossfire::Client::Widget::Bin::;
246		297
247	use SDL::OpenGL;	298	use SDL::OpenGL;
…		…
290	or return;	341	or return;
291		342
292	glEnable GL_BLEND;	343	glEnable GL_BLEND;
293	glEnable GL_TEXTURE_2D;	344	glEnable GL_TEXTURE_2D;
294	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	345	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
295	glBindTexture GL_TEXTURE_2D, $tex->{name};
296		346
297	glBegin GL_QUADS;	347	$tex->draw_quad (0, 0, $w, $h);
298	glTexCoord 0, 0; glVertex 0, 0;
299	glTexCoord 0, 1; glVertex 0, $h;
300	glTexCoord 1, 1; glVertex $w, $h;
301	glTexCoord 1, 0; glVertex $w, 0;
302	glEnd;
303		348
304	glDisable GL_BLEND;	349	glDisable GL_BLEND;
305	glDisable GL_TEXTURE_2D;	350	glDisable GL_TEXTURE_2D;
306	}	351	}
307		352
…		…
340		385
341	my ($w, $h) = $chld->size_request;	386	my ($w, $h) = $chld->size_request;
342		387
343	glBegin GL_QUADS;	388	glBegin GL_QUADS;
344	glColor 0, 0, 0;	389	glColor 0, 0, 0;
345	glTexCoord 0, 0; glVertex 0 , 0;	390	glVertex 0 , 0;
346	glTexCoord 0, 1; glVertex 0 , $h + 4;	391	glVertex 0 , $h + 4;
347	glTexCoord 1, 1; glVertex $w + 4 , $h + 4;	392	glVertex $w + 4 , $h + 4;
348	glTexCoord 1, 0; glVertex $w + 4 , 0;	393	glVertex $w + 4 , 0;
349	glEnd;	394	glEnd;
350		395
351	$chld->draw;	396	$chld->draw;
352	}	397	}
353		398
…		…
403	glEnable GL_TEXTURE_2D;	448	glEnable GL_TEXTURE_2D;
404	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	449	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
405	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	450	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
406		451
407	my $top = $tex[1];	452	my $top = $tex[1];
408	glBindTexture GL_TEXTURE_2D, $top->{name};	453	$top->draw_quad (0, 0, $w, $top->{height});
409
410	glBegin GL_QUADS;
411	glTexCoord 0, 0; glVertex 0 , 0;
412	glTexCoord 0, 1; glVertex 0 , $top->{height};
413	glTexCoord 1, 1; glVertex $w , $top->{height};
414	glTexCoord 1, 0; glVertex $w , 0;
415	glEnd;
416		454
417	my $left = $tex[3];	455	my $left = $tex[3];
418	glBindTexture GL_TEXTURE_2D, $left->{name};	456	$left->draw_quad (0, $top->{height}, $left->{width}, $ch);
419
420	glBegin GL_QUADS;
421	glTexCoord 0, 0; glVertex 0 , $top->{height};
422	glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
423	glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
424	glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
425	glEnd;
426		457
427	my $right = $tex[2];	458	my $right = $tex[2];
428	glBindTexture GL_TEXTURE_2D, $right->{name};	459	$right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
429
430	glBegin GL_QUADS;
431	glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
432	glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
433	glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
434	glTexCoord 1, 0; glVertex $w , $top->{height};
435	glEnd;
436		460
437	my $bottom = $tex[4];	461	my $bottom = $tex[4];
438	glBindTexture GL_TEXTURE_2D, $bottom->{name};	462	$bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
439
440	glBegin GL_QUADS;
441	glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
442	glTexCoord 0, 1; glVertex 0 , $h;
443	glTexCoord 1, 1; glVertex $w , $h;
444	glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
445	glEnd;
446		463
447	my $bg = $tex[0];	464	my $bg = $tex[0];
448	glBindTexture GL_TEXTURE_2D, $bg->{name};	465	glBindTexture GL_TEXTURE_2D, $bg->{name};
449	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	466	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
450	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;	467	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
451	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;	468	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
452		469
453	my $rep_x = $cw / $bg->{width};	470	my $rep_x = $cw / $bg->{width};
454	my $rep_y = $ch / $bg->{height};	471	my $rep_y = $ch / $bg->{height};
455		472
456	glBegin GL_QUADS;	473	$bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
457	glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
458	glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
459	glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
460	glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
461	glEnd;
462		474
463	glDisable GL_BLEND;	475	glDisable GL_BLEND;
464	glDisable GL_TEXTURE_2D;	476	glDisable GL_TEXTURE_2D;
465		477
466	$self->child->draw;	478	$self->child->draw;
…		…
623	use SDL::OpenGL;	635	use SDL::OpenGL;
624		636
625	sub new {	637	sub new {
626	my ($class, $x, $y, $z, $height, $text) = @_;	638	my ($class, $x, $y, $z, $height, $text) = @_;
627		639
		640	$height \|\|= $::FONTSIZE;
		641
628	# TODO: color, and make height, xyz etc. optional	642	# TODO: color, and make height, xyz etc. optional
629	my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);	643	my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
630		644
631	$self->set_text ($text);	645	$self->set_text ($text);
632		646
…		…
649	}	663	}
650		664
651	sub size_request {	665	sub size_request {
652	my ($self) = @_;	666	my ($self) = @_;
653		667
654	(	668	if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
		669	(
655	$self->{texture}{width},	670	$self->{texture}{width},
656	$self->{texture}{height},	671	$self->{texture}{height},
		672	)
		673	} else {
		674	my ($w, $h, $data) = Crossfire::Client::font_render "Yy", $self->{height};
		675
		676	($w, $h)
657	)	677	}
		678
658	}	679	}
659		680
660	sub _draw {	681	sub _draw {
661	my ($self) = @_;	682	my ($self) = @_;
662		683
…		…
664		685
665	glEnable GL_BLEND;	686	glEnable GL_BLEND;
666	glEnable GL_TEXTURE_2D;	687	glEnable GL_TEXTURE_2D;
667	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	688	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
668	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	689	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
669	glBindTexture GL_TEXTURE_2D, $tex->{name};
670		690
671	glColor 1, 0, 0, 1; # TODO color	691	glColor 1, 0, 0, 1; # TODO color
672		692
673	glBegin GL_QUADS;	693	$tex->draw_quad (0, 0);
674	glTexCoord 0, 0; glVertex 0 , 0;
675	glTexCoord 0, 1; glVertex 0 , $tex->{height};
676	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
677	glTexCoord 1, 0; glVertex $tex->{width}, 0;
678	glEnd;
679		694
680	glDisable GL_BLEND;	695	glDisable GL_BLEND;
681	glDisable GL_TEXTURE_2D;	696	glDisable GL_TEXTURE_2D;
682	}	697	}
683		698
684	#############################################################################	699	#############################################################################
685		700
686	package Crossfire::Client::Widget::TextEntry;	701	package Crossfire::Client::Widget::Entry;
687		702
688	our @ISA = Crossfire::Client::Widget::Label::;	703	our @ISA = Crossfire::Client::Widget::Label::;
689		704
690	use SDL;	705	use SDL;
691	use SDL::OpenGL;	706	use SDL::OpenGL;
…		…
694	my ($self, $ev) = @_;	709	my ($self, $ev) = @_;
695		710
696	my $mod = $ev->key_mod;	711	my $mod = $ev->key_mod;
697	my $sym = $ev->key_sym;	712	my $sym = $ev->key_sym;
698		713
699	$ev->set_unicode (1);
700	my $uni = $ev->key_unicode;	714	my $uni = $ev->key_unicode;
701		715
702	my $text = $self->get_text;	716	my $text = $self->get_text;
703		717
704	if ($sym == SDLK_BACKSPACE) {	718	if ($sym == SDLK_BACKSPACE) {
705	substr $text, -1, 1, '';	719	substr $text, -1, 1, '';
706
707	} elsif ($uni) {	720	} elsif ($uni) {
708	$text .= chr $uni;	721	$text .= chr $uni;
709	}	722	}
		723
710	$self->set_text ($text);	724	$self->set_text ($text);
		725	}
		726
		727	sub button_down {
		728	my ($self, $ev) = @_;
		729
		730	$self->focus_in;
		731	}
		732
		733	sub mouse_motion {
		734	my ($self, $ev, $x, $y) = @_;
		735	printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		736	}
		737
		738	sub _draw {
		739	my ($self) = @_;
		740
		741	if ($FOCUS == $self) {
		742	glColor 1, 1, 1;
		743	} else {
		744	glColor 0.7, 0.7, 0.7;
		745	}
		746
		747	glBegin GL_QUADS;
		748	glVertex 0 , 0;
		749	glVertex 0 , $self->{h} - 1;
		750	glVertex $self->{w} - 1, $self->{h} - 1;
		751	glVertex $self->{w} - 1, 0;
		752	glEnd;
		753
		754	$self->SUPER::_draw;
711	}	755	}
712		756
713	#############################################################################	757	#############################################################################
714		758
715	package Crossfire::Client::Widget::MapWidget;	759	package Crossfire::Client::Widget::MapWidget;
…		…
730		774
731	sub key_up {	775	sub key_up {
732	}	776	}
733		777
734	sub size_request {	778	sub size_request {
735		779	(
736	}	780	1 + int $::WIDTH / 32,
737		781	1 + int $::HEIGHT / 32,
738	sub size_allocate {	782	)
739	}	783	}
740		784
741	sub _draw {	785	sub _draw {
742	my ($self) = @_;	786	my ($self) = @_;
743		787
…		…
766	glEnable GL_TEXTURE_2D;	810	glEnable GL_TEXTURE_2D;
767	glEnable GL_BLEND;	811	glEnable GL_BLEND;
768	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	812	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
769		813
770	my $sw4 = ($sw + 3) & ~3;	814	my $sw4 = ($sw + 3) & ~3;
771	my $lighting = "\x00" x ($sw4 * $sh);	815	my $darkness = "\x00" x ($sw4 * $sh);
772		816
773	for my $x (0 .. $sw - 1) {	817	for my $x (0 .. $sw - 1) {
		818	my $row = $map->[$x + $xofs];
774	for my $y (0 .. $sh - 1) {	819	for my $y (0 .. $sh - 1) {
775		820
776	my $cell = $map->[$x + $xofs][$y + $yofs]	821	my $cell = $row->[$y + $yofs]
777	or next;	822	or next;
778		823
779	my $darkness = $cell->[0] * (1 / 255);	824	my $dark = $cell->[0];
780	if ($darkness < 0) {	825	if ($dark < 0) {
781	$darkness = 0.15;	826	substr $darkness, $y * $sw4 + $x, 1, chr 224;
		827	} else {
		828	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
782	}	829	}
783	substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
784		830
785	for my $num (grep $_, @$cell[1,2,3]) {	831	for my $num (grep $_, @$cell[1,2,3]) {
786	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	832	my $tex = $::CONN->{face}[$num]{texture} \|\| next;
787		833
788	glBindTexture GL_TEXTURE_2D, $tex->{name};
789
790	my $w = $tex->{width};	834	my $w = $tex->{width};
791	my $h = $tex->{height};	835	my $h = $tex->{height};
792		836
793	my $px = ($x + 1) * 32 - $w;	837	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
794	my $py = ($y + 1) * 32 - $h;
795
796	glBegin GL_QUADS;
797	glTexCoord 0, 0; glVertex $px , $py;
798	glTexCoord 0, 1; glVertex $px , $py + $h;
799	glTexCoord 1, 1; glVertex $px + $w, $py + $h;
800	glTexCoord 1, 0; glVertex $px + $w, $py;
801	glEnd;
802	}	838	}
803	}	839	}
804	}	840	}
805		841
806	# if (1) { # higher quality darkness	842	# if (1) { # higher quality darkness
…		…
811	#	847	#
812	# $lighting = $pb->get_pixels;	848	# $lighting = $pb->get_pixels;
813	# $lighting =~ s/(.)../$1/gs;	849	# $lighting =~ s/(.)../$1/gs;
814	# }	850	# }
815		851
		852	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		853	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		854
816	$lighting = new Crossfire::Client::Texture	855	$darkness = new Crossfire::Client::Texture
817	width => $sw4,	856	width => $sw4,
818	height => $sh,	857	height => $sh,
819	data => $lighting,	858	data => $darkness,
820	internalformat => GL_ALPHA4,	859	internalformat => GL_ALPHA,
821	format => GL_ALPHA;	860	format => GL_ALPHA;
822		861
823	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	862	glColor 0.45, 0.45, 0.45, 1;
824	glColor 0, 0, 0, 0.75;	863	$darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
825	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
826	glBindTexture GL_TEXTURE_2D, $lighting->{name};
827	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
828	glBegin GL_QUADS;
829	glTexCoord 0, 0; glVertex 0 , 0;
830	glTexCoord 0, 1; glVertex 0 , $sh * 32;
831	glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
832	glTexCoord 1, 0; glVertex $sw4 * 32, 0;
833	glEnd;
834		864
835	glDisable GL_TEXTURE_2D;	865	glDisable GL_TEXTURE_2D;
836	glDisable GL_BLEND;	866	glDisable GL_BLEND;
837	}	867	}
838		868
…		…
897		927
898	sub moveto {	928	sub moveto {
899	my ($self, $x, $y) = @_;	929	my ($self, $x, $y) = @_;
900		930
901	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	931	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
902	$self->{speed} = 0.2;	932	$self->{speed} = 0.001;
903	$self->{time} = 1;	933	$self->{time} = 1;
904		934
905	::animation_start $self;	935	::animation_start $self;
906	}	936	}
907		937
…		…
922		952
923	sub _draw {	953	sub _draw {
924	my ($self) = @_;	954	my ($self) = @_;
925		955
926	glPushMatrix;	956	glPushMatrix;
927	glRotate $self->{time} * 10000, 0, 1, 0;	957	glRotate $self->{time} * 1000, 0, 1, 0;
928	$self->{children}[0]->draw;	958	$self->{children}[0]->draw;
929	glPopMatrix;	959	glPopMatrix;
930	}	960	}
931		961
932	1;	962	#############################################################################
933		963
		964	package Crossfire::Client::Widget::Toplevel;
		965
		966	our @ISA = Crossfire::Client::Widget::Container::;
		967
		968	sub size_request {
		969	($::WIDTH, $::HEIGHT)
		970	}
		971
		972	sub size_allocate {
		973	my ($self, $w, $h) = @_;
		974
		975	$self->SUPER::size_allocate ($w, $h);
		976
		977	$_->size_allocate ($_->size_request)
		978	for @{$self->{children}};
		979	}
		980
		981	sub translate {
		982	my ($self, $x, $y) = @_;
		983
		984	($x, $y)
		985	}
		986
		987	sub update {
		988	my ($self) = @_;
		989
		990	$self->size_allocate ($self->size_request);
		991	::refresh ();
		992	}
		993
		994	sub add {
		995	my ($self, $widget) = @_;
		996
		997	$self->SUPER::add ($widget);
		998
		999	$widget->size_allocate ($widget->size_request);
		1000	}
		1001
		1002	sub draw {
		1003	my ($self) = @_;
		1004
		1005	$self->_draw;
		1006	}
		1007
		1008	#############################################################################
		1009
		1010	package Crossfire::Client::Widget;
		1011
		1012	$TOPLEVEL = new Crossfire::Client::Widget::Toplevel;
		1013
		1014	1
		1015

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.46 by root, Sun Apr 9 22:21:02 2006 UTC vs. Revision 1.58 by root, Tue Apr 11 12:21:29 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.46 by root, Sun Apr 9 22:21:02 2006 UTC vs.
Revision 1.58 by root, Tue Apr 11 12:21:29 2006 UTC