--- deliantra/Deliantra-Client/DC/UI.pm 2006/04/20 16:29:40 1.142 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/04/21 07:09:11 1.144 @@ -627,7 +627,7 @@ use CFClient::OpenGL; my @tex = - map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } + map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); sub new { @@ -1346,7 +1346,7 @@ use CFClient::OpenGL; my @tex = - map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } + map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } qw(b1_button_active.png); sub new { @@ -1403,7 +1403,7 @@ our @ISA = CFClient::UI::DrawBG::; my @tex = - map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } + map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } qw(c1_checkbox_bg.png c1_checkbox_active.png); use CFClient::OpenGL; @@ -1470,19 +1470,19 @@ my %tex = ( food => [ - map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } + map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ ], grace => [ - map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } + map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ ], hp => [ - map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } + map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ ], mana => [ - map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } + map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ ], ); @@ -1493,7 +1493,6 @@ my $self = $class->SUPER::new ( type => 'food', - scale => 1, @_ ); @@ -1505,10 +1504,9 @@ sub size_request { my ($self) = @_; - my $tex = $tex{$self->{type}}[0]; - - my ($w, $h) = map { $_ * $self->{scale} } @$tex{qw(w h)}; - ($self->{vertical}) ? ($h, $w) : ($w, $h) + #my $tex = $tex{$self->{type}}[0]; + #@$tex{qw(w h)} + (0, 0) } sub set_max { @@ -1591,7 +1589,7 @@ ); $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); - $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, scale => ($self->{scale} || 0.5)); + $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); $self