… | |
… | |
21 | |
21 | |
22 | my $self = $class->SUPER::new (%arg, |
22 | my $self = $class->SUPER::new (%arg, |
23 | setup_req => { |
23 | setup_req => { |
24 | extmap => 1, |
24 | extmap => 1, |
25 | excmd => 1, |
25 | excmd => 1, |
26 | xwidget => 1,#d# |
26 | ywidget => 1,#d# |
27 | %{$arg{setup_req} || {}}, |
27 | %{$arg{setup_req} || {}}, |
28 | }, |
28 | }, |
29 | ); |
29 | ); |
30 | |
30 | |
31 | $self->{map_widget}->clr_commands; |
31 | $self->{map_widget}->clr_commands; |
… | |
… | |
544 | do { |
544 | do { |
545 | $id = pop @{$self->{bg_fetch}} |
545 | $id = pop @{$self->{bg_fetch}} |
546 | or return; |
546 | or return; |
547 | } while $self->{texture}[$id]; |
547 | } while $self->{texture}[$id]; |
548 | |
548 | |
549 | CFPlus::DB::get tilecache => $id, sub { |
549 | CFPlus::DB::exists tilecache => $id, sub { |
550 | my ($data) = @_; |
550 | my ($exists) = @_; |
551 | |
551 | |
552 | return unless $self->{map}; # stop when destroyed |
552 | return unless $self->{map}; # stop when destroyed |
553 | |
553 | |
554 | $self->set_texture ($id => $data) |
554 | $self->have_tile ($id) |
555 | if defined $data; |
555 | if $exists; |
556 | |
556 | |
557 | $self->bg_fetch; |
557 | $self->bg_fetch; |
558 | }; |
558 | }; |
559 | } |
559 | } |
560 | |
560 | |
… | |
… | |
728 | |
728 | |
729 | if ($face->{type} == 0) { # FT_FACE |
729 | if ($face->{type} == 0) { # FT_FACE |
730 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
730 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
731 | if $changed; |
731 | if $changed; |
732 | |
732 | |
733 | $self->set_texture ($face->{id} => delete $face->{data}); |
733 | $self->have_tile ($face->{id}); |
734 | |
734 | |
735 | } elsif ($face->{type} & 1) { # split metadata |
735 | } elsif ($face->{type} & 1) { # split metadata |
736 | my $cb = sub { }; |
736 | my $cb = sub { }; |
737 | |
737 | |
738 | if ($face->{type} == 3) { # FT_MUSIC |
738 | if ($face->{type} == 3) { # FT_MUSIC |
… | |
… | |
777 | my ($self, $facenum, $face) = @_; |
777 | my ($self, $facenum, $face) = @_; |
778 | |
778 | |
779 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
779 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
780 | } |
780 | } |
781 | |
781 | |
782 | sub set_texture { |
782 | sub have_tile { |
783 | my ($self, $id, $data) = @_; |
783 | my ($self, $tile) = @_; |
784 | |
784 | |
785 | return unless $self->{map}; |
785 | return unless $self->{map}; |
786 | |
786 | |
787 | $self->{texture}[$id] = my $tex = |
787 | $self->{texture}[$tile] ||= my $tex = |
788 | new_from_image CFPlus::Texture |
788 | new CFPlus::Texture |
789 | $data, minify => 1, mipmap => 1; |
789 | tile => $tile, minify => 1, mipmap => 1, delay => 1; |
790 | |
790 | |
791 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
|
|
792 | $self->{map_widget}->update; |
|
|
793 | |
|
|
794 | $_->() for @{(delete $self->{face_cb}{$id}) || []}; |
791 | $_->() for @{(delete $self->{face_cb}{$tile}) || []}; |
795 | } |
792 | } |
796 | |
793 | |
797 | sub connect_face_update { |
794 | sub connect_face_update { |
798 | my ($self, $id, $cb) = @_; |
795 | my ($self, $id, $cb) = @_; |
799 | |
796 | |