ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.144 by root, Fri Aug 3 02:20:32 2007 UTC vs.
Revision 1.150 by root, Sun Aug 12 09:39:36 2007 UTC

… …
57 57
58 $self->connect_ext (capabilities => sub { 58 $self->connect_ext (capabilities => sub {
59 my (%cap) = @_; 59 my (%cap) = @_;
60 60
61 #$self->send ("setup sound 0"); # we use a different protocol 61 #$self->send ("setup sound 0"); # we use a different protocol
62 62 $self->update_fx_want;
63 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 });
67 63
68 if (my $ts = $cap{tileset}) { 64 if (my $ts = $cap{tileset}) {
69 if (my ($default) = grep $_->[2] & 1, @$ts) { 65 if (my ($default) = grep $_->[2] & 1, @$ts) {
70 $self->{tileset} = $default; 66 $self->{tileset} = $default;
71 $self->{tilesize} = $default->[3]; 67 $self->{tilesize} = $default->[3];
… …
223 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 219 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
224 220
225 $self 221 $self
226} 222}
227 223
224sub update_fx_want {
225 my ($self) = @_;
226
227 $self->send_exti_msg (fx_want => {
228 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
229 5 => !!$::CFG->{audio_enable}, # FT_SOUND
230 });
231}
232
228sub logprint { 233sub logprint {
229 my ($self, @a) = @_; 234 my ($self, @a) = @_;
230 235
231 $self->{log_fh} ||= do { 236 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
232 my $path = "$Crossfire::VARDIR/log.$self->{host}";
233
234 open my $fh, ">>:utf8", $path
235 or die "Couldn't open logfile $path: $!";
236
237 $fh->autoflush (1);
238
239 $fh;
240 };
241
242 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
243
244 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
245 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
246
247 print {$self->{log_fh}} "$ts ", @a, "\n";
248} 237}
249 238
250sub _stat_numdiff { 239sub _stat_numdiff {
251 my ($self, $name, $old, $new) = @_; 240 my ($self, $name, $old, $new) = @_;
252 241
… …
517} 506}
518 507
519sub feed_map1a { 508sub feed_map1a {
520 my ($self, $data) = @_; 509 my ($self, $data) = @_;
521 510
522 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 511 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
512 my $delay;
513
514 for my $tile (@$missing) {
515 next if $self->{delay}{$tile};
516
517 $delay = 1;
518
519 if (my $tex = $::CONN->{texture}[$tile]) {
520 $tex->upload;
521 } else {
522 $self->{delay}{$tile} = 1;
523
524 # we assume the face is in-flight and will eventually come
525 push @{$self->{face_cb}{$tile}}, sub {
526 delete $self->{delay}{$tile};
527 $_[0]->upload;
528 };
529 }
530 }
531
532 if ($delay) {
533 # delay the map drawing a tiny bit in the hope of getting the missing fetched
534 Event->timer (after => 0.03, cb => sub {
535 $_[0]->w->cancel;
536 $self->{map_widget}->update;
537 });
538 } else {
523 $self->{map_widget}->update; 539 $self->{map_widget}->update;
540 }
524} 541}
525 542
526sub magicmap { 543sub magicmap {
527 my ($self, $w, $h, $x, $y, $data) = @_; 544 my ($self, $w, $h, $x, $y, $data) = @_;
528 545
… …
560 do { 577 do {
561 $id = pop @{$self->{bg_fetch}} 578 $id = pop @{$self->{bg_fetch}}
562 or return; 579 or return;
563 } while $self->{texture}[$id]; 580 } while $self->{texture}[$id];
564 581
565 CFPlus::DB::get tilecache => $id, sub { 582 CFPlus::DB::exists tilecache => $id, sub {
566 my ($data) = @_; 583 my ($exists) = @_;
567 584
568 return unless $self->{map}; # stop when destroyed 585 return unless $self->{map}; # stop when destroyed
569 586
570 $self->set_texture ($id => $data) 587 if ($exists) {
571 if defined $data; 588 $self->have_tile ($id)
589 $self->{texture}[$id]->upload;
590 }
572 591
573 $self->bg_fetch; 592 $self->bg_fetch;
574 }; 593 };
575} 594}
576 595
… …
732 $self->{map}->set_tileid ($facenum => $id); 751 $self->{map}->set_tileid ($facenum => $id);
733 752
734 CFPlus::DB::get tilecache => $id, $cb; 753 CFPlus::DB::get tilecache => $id, $cb;
735 754
736 } elsif ($face->{type} & 1) { # with metadata 755 } elsif ($face->{type} & 1) { # with metadata
737 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
738 CFPlus::DB::get res_meta => $face->{name}, $cb; 756 CFPlus::DB::get res_meta => $face->{name}, $cb;
739 } 757 }
740} 758}
741 759
742sub face_update { 760sub face_update {
… …
744 762
745 if ($face->{type} == 0) { # FT_FACE 763 if ($face->{type} == 0) { # FT_FACE
746 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 764 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
747 if $changed; 765 if $changed;
748 766
749 $self->set_texture ($face->{id} => delete $face->{data}); 767 $self->have_tile ($face->{id});
750 768
751 } elsif ($face->{type} & 1) { # split metadata 769 } elsif ($face->{type} & 1) { # split metadata
752 my $cb = sub { };
753
754 if ($face->{type} == 3) { # FT_MUSIC
755 $cb = sub {
756 $self->{music_meta}{$facenum} = $face;
757
758 ::message ({ markup => "downloaded song #$facenum" })
759 if $changed;
760
761 &::audio_music_push ($facenum);
762 };
763 } elsif ($face->{type} == 5) { # FT_SOUND
764 $cb = sub {
765 $self->{sound_meta}{$facenum} = $face;
766
767 ::message ({ markup => "downloaded sound #$facenum" })
768 if $changed;
769
770 &::audio_sound_push ($facenum);
771 };
772 }
773
774 if ($changed) { # new data 770 if ($changed) { # new data
775 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; 771 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
772 $face->{meta} = $self->{json_coder}->decode ($meta_json);
776 773
777 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 774 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
778 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { 775 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
779 $face->{meta} = $self->{json_coder}->decode ($meta_json);
780 ::add_license ($face);
781 $cb->();
782 };
783
784 } else { 776 } else {
785 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 777 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
778 }
779
786 ::add_license ($face); 780 ::add_license ($face);
787 $cb->(); 781
782 if ($face->{type} == 3) { # FT_MUSIC
783 $self->{music_meta}{$facenum} = $face;
784
785 ::message ({ markup => "downloaded song #$facenum" })
786 if $changed;
787
788 &::audio_music_push ($facenum);
789 } elsif ($face->{type} == 5) { # FT_SOUND
790 $self->{sound_meta}{$facenum} = $face;
791
792 ::message ({ markup => "downloaded sound #$facenum" })
793 if $changed;
794
795 &::audio_sound_push ($facenum);
788 } 796 }
797
789 } 798 }
790} 799}
791 800
792sub smooth_update { 801sub smooth_update {
793 my ($self, $facenum, $face) = @_; 802 my ($self, $facenum, $face) = @_;
794 803
795 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 804 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
796} 805}
797 806
798sub set_texture { 807sub have_tile {
799 my ($self, $id, $data) = @_; 808 my ($self, $tile) = @_;
800 809
801 return unless $self->{map}; 810 return unless $self->{map};
802 811
803 $self->{texture}[$id] = my $tex = 812 my $tex = $self->{texture}[$tile] ||=
804 new_from_image CFPlus::Texture 813 new CFPlus::Texture
805 $data, minify => 1, mipmap => 1; 814 tile => $tile, minify => 1, mipmap => 1, delay => 1;
806 815
807 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
808 $self->{map_widget}->update;
809
810 $_->() for @{(delete $self->{face_cb}{$id}) || []}; 816 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
811} 817}
812 818
813sub connect_face_update { 819sub connect_face_update {
814 my ($self, $id, $cb) = @_; 820 my ($self, $id, $cb) = @_;
815 821
… …
1010 } 1016 }
1011 1017
1012 $::FLOORBOX->add_at (@add); 1018 $::FLOORBOX->add_at (@add);
1013 }); 1019 });
1014 1020
1015 $::WANT_REFRESH++; 1021 $::WANT_REFRESH->start;
1016} 1022}
1017 1023
1018sub set_opencont { 1024sub set_opencont {
1019 my ($conn, $tag, $name) = @_; 1025 my ($conn, $tag, $name) = @_;
1020 $conn->{open_container} = $tag; 1026 $conn->{open_container} = $tag;

Diff Legend

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