--- deliantra/Deliantra-Client/DC/Protocol.pm 2007/08/06 02:11:45 1.145 +++ deliantra/Deliantra-Client/DC/Protocol.pm 2007/08/06 05:06:33 1.146 @@ -23,7 +23,7 @@ setup_req => { extmap => 1, excmd => 1, - xwidget => 1,#d# + ywidget => 1,#d# %{$arg{setup_req} || {}}, }, ); @@ -546,13 +546,13 @@ or return; } while $self->{texture}[$id]; - CFPlus::DB::get tilecache => $id, sub { - my ($data) = @_; + CFPlus::DB::exists tilecache => $id, sub { + my ($exists) = @_; return unless $self->{map}; # stop when destroyed - $self->set_texture ($id => $data) - if defined $data; + $self->have_tile ($id) + if $exists; $self->bg_fetch; }; @@ -730,7 +730,7 @@ CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } if $changed; - $self->set_texture ($face->{id} => delete $face->{data}); + $self->have_tile ($face->{id}); } elsif ($face->{type} & 1) { # split metadata my $cb = sub { }; @@ -779,19 +779,16 @@ $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); } -sub set_texture { - my ($self, $id, $data) = @_; +sub have_tile { + my ($self, $tile) = @_; return unless $self->{map}; - $self->{texture}[$id] = my $tex = - new_from_image CFPlus::Texture - $data, minify => 1, mipmap => 1; - - $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); - $self->{map_widget}->update; + $self->{texture}[$tile] ||= my $tex = + new CFPlus::Texture + tile => $tile, minify => 1, mipmap => 1, delay => 1; - $_->() for @{(delete $self->{face_cb}{$id}) || []}; + $_->() for @{(delete $self->{face_cb}{$tile}) || []}; } sub connect_face_update {