[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.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, $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, $GRAB->translate ($x, $y)) 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	$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	}
17		74
18	sub new {	75	sub new {
19	my $class = shift;	76	my $class = shift;
20		77
21	bless { @_ }, $class	78	bless { @_ }, $class
…		…
42		99
43	$self->{w} = $w;	100	$self->{w} = $w;
44	$self->{h} = $h;	101	$self->{h} = $h;
45	}	102	}
46		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
47	sub focus_in {	111	sub focus_in {
48	my ($widget) = @_;	112	my ($self) = @_;
49	$::FOCUS = $widget;	113
		114	my $focus = $FOCUS; $FOCUS = $self;
		115	$focus->update if $focus;
		116	$FOCUS->update;
50	}	117	}
51		118
52	sub focus_out {	119	sub focus_out {
53	my ($widget) = @_;	120	my ($self) = @_;
54	}
55		121
56	sub key_down {	122	return unless $FOCUS == $self;
57	my ($widget, $sdlev) = @_;
58	}
59		123
60	sub key_up {	124	my $focus = $FOCUS; undef $FOCUS;
61	my ($widget, $sdlev) = @_;	125	$focus->update if $focus; #?
62	}	126	}
63		127
		128	sub mouse_motion { }
		129	sub button_up { }
64	sub button_down {	130	sub button_down { }
65	my ($widget, $sdlev) = @_;	131	sub key_down { }
66	}	132	sub key_up { }
67		133
68	sub button_up {
69	my ($widget, $sdlev) = @_;
70	}
71
72	sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }	134	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
73	sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }	135	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
74	sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }	136	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
75	sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }	137	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
76	sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }	138	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
77		139
78	sub draw {	140	sub draw {
79	my ($self) = @_;	141	my ($self) = @_;
80		142
81	glPushMatrix;	143	glPushMatrix;
82	glTranslate $self->{x}, $self->{y}, 0;	144	glTranslate $self->{x}, $self->{y}, 0;
83	$self->_draw;	145	$self->_draw;
84	if ($self == $::HOVER) {	146	if ($self == $HOVER) {
85	glColor 1, 1, 1, 0.4;	147	glColor 1, 1, 1, 0.4;
		148	glEnable GL_BLEND;
86	glBegin GL_QUADS;	149	glBegin GL_QUADS;
87	glVertex 0, 0;	150	glVertex 0 , 0;
88	glVertex $self->{w} - 1, 0;	151	glVertex $self->{w}, 0;
89	glVertex $self->{w} - 1, $self->{h} - 1;	152	glVertex $self->{w}, $self->{h};
90	glVertex 0, $self->{h} - 1;	153	glVertex 0 , $self->{h};
91	glEnd;	154	glEnd;
		155	glDisable GL_BLEND;
92	}	156	}
93	glPopMatrix;	157	glPopMatrix;
94	}	158	}
95		159
96	sub _draw {	160	sub _draw {
…		…
225	if $self->{children}[0]	289	if $self->{children}[0]
226	}	290	}
227		291
228	#############################################################################	292	#############################################################################
229		293
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;	294	package Crossfire::Client::Widget::Window;
251		295
252	our @ISA = Crossfire::Client::Widget::Bin::;	296	our @ISA = Crossfire::Client::Widget::Bin::;
253		297
254	use SDL::OpenGL;	298	use SDL::OpenGL;
…		…
297	or return;	341	or return;
298		342
299	glEnable GL_BLEND;	343	glEnable GL_BLEND;
300	glEnable GL_TEXTURE_2D;	344	glEnable GL_TEXTURE_2D;
301	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	345	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
302	glBindTexture GL_TEXTURE_2D, $tex->{name};
303		346
304	glBegin GL_QUADS;	347	$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		348
311	glDisable GL_BLEND;	349	glDisable GL_BLEND;
312	glDisable GL_TEXTURE_2D;	350	glDisable GL_TEXTURE_2D;
313	}	351	}
314		352
…		…
347		385
348	my ($w, $h) = $chld->size_request;	386	my ($w, $h) = $chld->size_request;
349		387
350	glBegin GL_QUADS;	388	glBegin GL_QUADS;
351	glColor 0, 0, 0;	389	glColor 0, 0, 0;
352	glTexCoord 0, 0; glVertex 0 , 0;	390	glVertex 0 , 0;
353	glTexCoord 0, 1; glVertex 0 , $h + 4;	391	glVertex 0 , $h + 4;
354	glTexCoord 1, 1; glVertex $w + 4 , $h + 4;	392	glVertex $w + 4 , $h + 4;
355	glTexCoord 1, 0; glVertex $w + 4 , 0;	393	glVertex $w + 4 , 0;
356	glEnd;	394	glEnd;
357		395
358	$chld->draw;	396	$chld->draw;
359	}	397	}
360		398
…		…
410	glEnable GL_TEXTURE_2D;	448	glEnable GL_TEXTURE_2D;
411	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	449	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
412	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	450	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
413		451
414	my $top = $tex[1];	452	my $top = $tex[1];
415	glBindTexture GL_TEXTURE_2D, $top->{name};	453	$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		454
424	my $left = $tex[3];	455	my $left = $tex[3];
425	glBindTexture GL_TEXTURE_2D, $left->{name};	456	$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		457
434	my $right = $tex[2];	458	my $right = $tex[2];
435	glBindTexture GL_TEXTURE_2D, $right->{name};	459	$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		460
444	my $bottom = $tex[4];	461	my $bottom = $tex[4];
445	glBindTexture GL_TEXTURE_2D, $bottom->{name};	462	$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		463
454	my $bg = $tex[0];	464	my $bg = $tex[0];
455	glBindTexture GL_TEXTURE_2D, $bg->{name};	465	glBindTexture GL_TEXTURE_2D, $bg->{name};
456	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	466	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
457	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;	467	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
458	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;	468	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
459		469
460	my $rep_x = $cw / $bg->{width};	470	my $rep_x = $cw / $bg->{width};
461	my $rep_y = $ch / $bg->{height};	471	my $rep_y = $ch / $bg->{height};
462		472
463	glBegin GL_QUADS;	473	$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		474
470	glDisable GL_BLEND;	475	glDisable GL_BLEND;
471	glDisable GL_TEXTURE_2D;	476	glDisable GL_TEXTURE_2D;
472		477
473	$self->child->draw;	478	$self->child->draw;
…		…
630	use SDL::OpenGL;	635	use SDL::OpenGL;
631		636
632	sub new {	637	sub new {
633	my ($class, $x, $y, $z, $height, $text) = @_;	638	my ($class, $x, $y, $z, $height, $text) = @_;
634		639
		640	$height \|\|= $::FONTSIZE;
		641
635	# TODO: color, and make height, xyz etc. optional	642	# TODO: color, and make height, xyz etc. optional
636	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);
637		644
638	$self->set_text ($text);	645	$self->set_text ($text);
639		646
…		…
656	}	663	}
657		664
658	sub size_request {	665	sub size_request {
659	my ($self) = @_;	666	my ($self) = @_;
660		667
661	(	668	if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
		669	(
662	$self->{texture}{width},	670	$self->{texture}{width},
663	$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)
664	)	677	}
		678
665	}	679	}
666		680
667	sub _draw {	681	sub _draw {
668	my ($self) = @_;	682	my ($self) = @_;
669		683
…		…
671		685
672	glEnable GL_BLEND;	686	glEnable GL_BLEND;
673	glEnable GL_TEXTURE_2D;	687	glEnable GL_TEXTURE_2D;
674	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	688	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
675	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	689	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
676	glBindTexture GL_TEXTURE_2D, $tex->{name};
677		690
678	glColor 1, 0, 0, 1; # TODO color	691	glColor 1, 0, 0, 1; # TODO color
679		692
680	glBegin GL_QUADS;	693	$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		694
687	glDisable GL_BLEND;	695	glDisable GL_BLEND;
688	glDisable GL_TEXTURE_2D;	696	glDisable GL_TEXTURE_2D;
689	}	697	}
690		698
691	#############################################################################	699	#############################################################################
692		700
693	package Crossfire::Client::Widget::TextEntry;	701	package Crossfire::Client::Widget::Entry;
694		702
695	our @ISA = Crossfire::Client::Widget::Label::;	703	our @ISA = Crossfire::Client::Widget::Label::;
696		704
697	use SDL;	705	use SDL;
698	use SDL::OpenGL;	706	use SDL::OpenGL;
…		…
701	my ($self, $ev) = @_;	709	my ($self, $ev) = @_;
702		710
703	my $mod = $ev->key_mod;	711	my $mod = $ev->key_mod;
704	my $sym = $ev->key_sym;	712	my $sym = $ev->key_sym;
705		713
706	$ev->set_unicode (1);
707	my $uni = $ev->key_unicode;	714	my $uni = $ev->key_unicode;
708		715
709	my $text = $self->get_text;	716	my $text = $self->get_text;
710		717
711	if ($sym == SDLK_BACKSPACE) {	718	if ($sym == SDLK_BACKSPACE) {
712	substr $text, -1, 1, '';	719	substr $text, -1, 1, '';
713
714	} elsif ($uni) {	720	} elsif ($uni) {
715	$text .= chr $uni;	721	$text .= chr $uni;
716	}	722	}
		723
717	$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;
718	}	755	}
719		756
720	#############################################################################	757	#############################################################################
721		758
722	package Crossfire::Client::Widget::MapWidget;	759	package Crossfire::Client::Widget::MapWidget;
…		…
737		774
738	sub key_up {	775	sub key_up {
739	}	776	}
740		777
741	sub size_request {	778	sub size_request {
742		779	(
743	}	780	1 + int $::WIDTH / 32,
744		781	1 + int $::HEIGHT / 32,
745	sub size_allocate {	782	)
746	}	783	}
747		784
748	sub _draw {	785	sub _draw {
749	my ($self) = @_;	786	my ($self) = @_;
750		787
…		…
773	glEnable GL_TEXTURE_2D;	810	glEnable GL_TEXTURE_2D;
774	glEnable GL_BLEND;	811	glEnable GL_BLEND;
775	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	812	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
776		813
777	my $sw4 = ($sw + 3) & ~3;	814	my $sw4 = ($sw + 3) & ~3;
778	my $lighting = "\x00" x ($sw4 * $sh);	815	my $darkness = "\x00" x ($sw4 * $sh);
779		816
780	for my $x (0 .. $sw - 1) {	817	for my $x (0 .. $sw - 1) {
		818	my $row = $map->[$x + $xofs];
781	for my $y (0 .. $sh - 1) {	819	for my $y (0 .. $sh - 1) {
782		820
783	my $cell = $map->[$x + $xofs][$y + $yofs]	821	my $cell = $row->[$y + $yofs]
784	or next;	822	or next;
785		823
786	my $darkness = $cell->[0] * (1 / 255);	824	my $dark = $cell->[0];
787	if ($darkness < 0) {	825	if ($dark < 0) {
788	$darkness = 0.15;	826	substr $darkness, $y * $sw4 + $x, 1, chr 224;
		827	} else {
		828	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
789	}	829	}
790	substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
791		830
792	for my $num (grep $_, @$cell[1,2,3]) {	831	for my $num (grep $_, @$cell[1,2,3]) {
793	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	832	my $tex = $::CONN->{face}[$num]{texture} \|\| next;
794		833
795	glBindTexture GL_TEXTURE_2D, $tex->{name};
796
797	my $w = $tex->{width};	834	my $w = $tex->{width};
798	my $h = $tex->{height};	835	my $h = $tex->{height};
799		836
800	my $px = ($x + 1) * 32 - $w;	837	$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	}	838	}
810	}	839	}
811	}	840	}
812		841
813	# if (1) { # higher quality darkness	842	# if (1) { # higher quality darkness
…		…
818	#	847	#
819	# $lighting = $pb->get_pixels;	848	# $lighting = $pb->get_pixels;
820	# $lighting =~ s/(.)../$1/gs;	849	# $lighting =~ s/(.)../$1/gs;
821	# }	850	# }
822		851
		852	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		853	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		854
823	$lighting = new Crossfire::Client::Texture	855	$darkness = new Crossfire::Client::Texture
824	width => $sw4,	856	width => $sw4,
825	height => $sh,	857	height => $sh,
826	data => $lighting,	858	data => $darkness,
827	internalformat => GL_ALPHA4,	859	internalformat => GL_ALPHA,
828	format => GL_ALPHA;	860	format => GL_ALPHA;
829		861
830	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	862	glColor 0.45, 0.45, 0.45, 1;
831	glColor 0, 0, 0, 0.75;	863	$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		864
842	glDisable GL_TEXTURE_2D;	865	glDisable GL_TEXTURE_2D;
843	glDisable GL_BLEND;	866	glDisable GL_BLEND;
844	}	867	}
845		868
…		…
904		927
905	sub moveto {	928	sub moveto {
906	my ($self, $x, $y) = @_;	929	my ($self, $x, $y) = @_;
907		930
908	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	931	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
909	$self->{speed} = 0.2;	932	$self->{speed} = 0.001;
910	$self->{time} = 1;	933	$self->{time} = 1;
911		934
912	::animation_start $self;	935	::animation_start $self;
913	}	936	}
914		937
…		…
929		952
930	sub _draw {	953	sub _draw {
931	my ($self) = @_;	954	my ($self) = @_;
932		955
933	glPushMatrix;	956	glPushMatrix;
934	glRotate $self->{time} * 10000, 0, 1, 0;	957	glRotate $self->{time} * 1000, 0, 1, 0;
935	$self->{children}[0]->draw;	958	$self->{children}[0]->draw;
936	glPopMatrix;	959	glPopMatrix;
937	}	960	}
938		961
939	1;	962	#############################################################################
940		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.49 by root, Sun Apr 9 22:26:51 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.49 by root, Sun Apr 9 22:26:51 2006 UTC vs.
Revision 1.58 by root, Tue Apr 11 12:21:29 2006 UTC