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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.155 by root, Fri Aug 17 21:18:01 2007 UTC vs.
Revision 1.158 by root, Tue Aug 21 11:23:04 2007 UTC

    $self->connect_ext (capabilities => sub {
       my (%cap) = @_;
       #$self->send ("setup sound 0"); # we use a different protocol
       $self->update_fx_want;
+      $self->send_exti_req (resource => "exp_table", sub {
+         my ($exp_table) = @_;
+         $self->register_face_handler ($exp_table, sub {
+            my ($face) = @_;
+            $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
+            $_->() for values %{ $self->{on_exp_update} || {} };
+         });
+         ()
+      });
       if (my $ts = $cap{tileset}) {
          if (my ($default) = grep $_->[2] & 1, @$ts) {
             $self->{tileset} = $default;
             $self->{tilesize} = $default->[3];
          statusbox      => $::SDTATUSBOX,
          inv            => $::INV,
          invr           => $::INVR,
          invr_hb        => $::INVR_HB,
       );
       while (my ($id, $name) = each %ass) {
          $self->widget_associate (undef, $id => $wkw{$name})
             or warn "server failed to associate non-existent well-known widget $name\n";
    my ($self) = @_;
    $self->send_exti_msg (fx_want => {
       3 => !!$::CFG->{bgm_enable},   # FT_MUSIC
       5 => !!$::CFG->{audio_enable}, # FT_SOUND
+      6 => 1,                        # FT_RSRC
    });
 }
 sub logprint {
    my ($self, @a) = @_;
    $::GAUGES->{mana}    ->set_value ($sp, $sp_m);
    $::GAUGES->{food}    ->set_value ($fo, $fo_m);
    $::GAUGES->{grace}   ->set_value ($gr, $gr_m);
    $::GAUGES->{exp}     ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
                                     . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
+   $::GAUGES->{prg}     ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
    $::GAUGES->{range}   ->set_text ($stats->{+CS_STAT_RANGE});
    my $title = $stats->{+CS_STAT_TITLE};
    $title =~ s/^Player: //;
    $::STATWIDS->{title} ->set_text ("Title: " . $title);
    my @skills = keys %{ $self->{skill_info} };
    if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
       $sktbl->clear;
-      my @add;
+      my $sw = $self->{skillwid}{""} ||= [
-      push @add,
          0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
          1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
+         2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
-         2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
+         3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
-         3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
+         4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
-         4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
+         5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
+         6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
-         5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
+         7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
-      ;
+      ];
+      my @add = @$sw;
       my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
       my @TOOLTIP_LVL  = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
       my @TOOLTIP_EXP  = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
             }
             1
          };
+         my $sw = $self->{skillwid}{$idx} ||= [
+            # exp
+            (new CFPlus::UI::Label
+             align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
+            # level
+            (new CFPlus::UI::Label
+             text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
+            # progress
+            (new CFPlus::UI::ExperienceProgress),
+            # label
+            (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
+             can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
+         ];
          push @add,
-            $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
+            $x * 4 + 0, $y, $sw->[0],
-                             align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
+            $x * 4 + 1, $y, $sw->[1],
-            $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
+            $x * 4 + 2, $y, $sw->[2],
-                             text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
+            $x * 4 + 3, $y, $sw->[3],
-            $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
-                             can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
          ;
          $x++ and ($x, $y) = (0, $y + 1);
       }
       $sktbl->add_at (@add);
    }
    for (grep exists $stats->{$_}, @skills) {
+      my $sw = $self->{skillwid}{$_};
-      $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
+      $sw->[0]->set_text (::formsep ($stats->{$_}[1]));
-      $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
+      $sw->[1]->set_text ($stats->{$_}[0] * 1);
+      $sw->[2]->set_value (@{$stats->{$_}});
    }
 }
 sub macro_send {
    my ($self, $macro) = @_;
          $tex->upload;
       } else {
          $self->{delay}{$tile} = 1;
          # we assume the face is in-flight and will eventually come
-         push @{$self->{face_cb}{$tile}}, sub {
+         push @{$self->{tile_cb}{$tile}}, sub {
             delete $self->{delay}{$tile};
             $_[0]->upload;
          };
       }
    }
 }
 sub bg_fetch {
    my ($self) = @_;
-   my $id;
+   my $tile;
    do {
-      $id = pop @{$self->{bg_fetch}}
+      $tile = pop @{$self->{bg_fetch}}
          or return;
-   } while $self->{texture}[$id];
+   } while $self->{texture}[$tile];
-   CFPlus::DB::exists tilecache => $id, sub {
+   CFPlus::DB::get tilecache => $tile, sub {
-      my ($exists) = @_;
+      my ($data) = @_;
       return unless $self->{map}; # stop when destroyed
-      if ($exists) {
+      if (defined $data) {
-         $self->have_tile ($id);
+         $self->have_tile ($tile, $data);
-         $self->{texture}[$id]->upload;
+         $self->{texture}[$tile]->upload;
       }
       $self->bg_fetch;
    };
 }
    my ($self, $facenum, $face, $cb) = @_;
    if ($face->{type} == 0) { # FT_FACE
       my $id = CFPlus::DB::get_tile_id_sync $face->{name};
-      $face->{id}               = $id;
+      $face->{id} = $id;
-      $self->{faceid}[$facenum] = $id;
       $self->{map}->set_tileid ($facenum => $id);
       CFPlus::DB::get tilecache => $id, $cb;
    } elsif ($face->{type} & 1) { # with metadata
       CFPlus::DB::get res_meta => $face->{name}, $cb;
+   } else { # no metadata
+      CFPlus::DB::get res_data => $face->{name}, $cb;
    }
 }
 sub face_update {
    my ($self, $facenum, $face, $changed) = @_;
-   if ($face->{type} == 0) { # FT_FACE
+   if ($face->{type} == 0) {
+      # image, FT_FACE
       CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
          if $changed;
-      $self->have_tile ($face->{id});
+      $self->have_tile ($face->{id}, delete $face->{data});
-   } elsif ($face->{type} & 1) { # split metadata
+   } elsif ($face->{type} & 1) {
+      # split metadata case, FT_MUSIC, FT_SOUND
       if ($changed) { # new data
-         my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
+         my ($meta, $data) = unpack "(w/a*)*", $face->{data};
-         $face->{meta} = $self->{json_coder}->decode ($meta_json);
+         $face->{data} = $meta;
          CFPlus::DB::put res_data => $face->{name} => $data, sub { };
-         CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
+         CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
-      } else {
+      }
-         $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
+      $face->{data} = $self->{json_coder}->decode ($face->{data});
-      }
       ::add_license ($face);
       if ($face->{type} == 3) { # FT_MUSIC
-         $self->{music_meta}{$facenum} = $face;
          ::message ({ markup => "downloaded song #$facenum" })
             if $changed;
          &::audio_music_push ($facenum);
       } elsif ($face->{type} == 5) { # FT_SOUND
-         $self->{sound_meta}{$facenum} = $face;
          ::message ({ markup => "downloaded sound #$facenum" })
             if $changed;
          &::audio_sound_push ($facenum);
       }
+   } else {
+      # flat resource case, FT_RSRC
+      CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
+         if $changed;
+   }
+   if (my $cbs = $self->{face_cb}{$facenum}) {
+      $_->($face, $changed) for @$cbs;
    }
 }
 sub smooth_update {
    my ($self, $facenum, $face) = @_;
    $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
 }
 sub have_tile {
-   my ($self, $tile) = @_;
+   my ($self, $tile, $data) = @_;
    return unless $self->{map};
    my $tex = $self->{texture}[$tile] ||=
       new CFPlus::Texture
-         tile => $tile, minify => 1, mipmap => 1, delay => 1;
+         tile => $tile,
+         image => $data, delete_image => 1,
+         minify => 1, mipmap => 1;
-   $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
+   if (my $cbs = delete $self->{tile_cb}{$tile}) {
+      $_->($tex) for @$cbs;
+   }
 }
-sub connect_face_update {
+# call in non-void context registers a temporary
+# hook with handle, otherwise its permanent
+sub on_face_change {
-   my ($self, $id, $cb) = @_;
+   my ($self, $num, $cb) = @_;
-   push @{$self->{face_cb}{$id}}, $cb;
+   push @{$self->{face_cb}{$num}}, $cb;
+   defined wantarray
-   CFPlus::guard {
+      ? CFPlus::guard {
-      @{$self->{face_cb}{$id}}
+           @{$self->{face_cb}{$num}}
-         = grep $_ != $cb,
+              = grep $_ != $cb,
-              @{$self->{face_cb}{$id}};
+                   @{$self->{face_cb}{$num}};
-   }
+        }
+      : ()
+}
+# call in non-void context registers a temporary
+# hook with handle, otherwise its permanent
+sub register_face_handler {
+   my ($self, $num, $cb) = @_;
+   return unless $num;
+   # invoke if available right now
+   $cb->($self->{face}[$num], 0)
+      unless exists $self->{face}[$num]{loading};
+   # future changes
+   $self->on_face_change ($num => $cb)
 }
 sub sound_play {
    my ($self, $type, $face, $dx, $dy, $vol) = @_;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.155 by root, Fri Aug 17 21:18:01 2007 UTC vs. Revision 1.158 by root, Tue Aug 21 11:23:04 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.155 by root, Fri Aug 17 21:18:01 2007 UTC vs.
Revision 1.158 by root, Tue Aug 21 11:23:04 2007 UTC