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.153 by root, Mon Aug 13 14:24:17 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
… …
535 my $map_info = delete $self->{map_info} 552 my $map_info = delete $self->{map_info}
536 or return; 553 or return;
537 554
538 my ($hash, $x, $y, $w, $h) = @$map_info; 555 my ($hash, $x, $y, $w, $h) = @$map_info;
539 556
540 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 557 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
558 $self->{map_cache_new}{$hash} = \$data;
541 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 559 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
542 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
543} 560}
544 561
545sub map_clear { 562sub map_clear {
546 my ($self) = @_; 563 my ($self) = @_;
547 564
… …
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
577sub load_map($$$) { 596sub load_map($$$) {
578 my ($self, $hash, $x, $y) = @_; 597 my ($self, $hash, $x, $y) = @_;
579 598
580 my $gen = $self->{map_change_gen}; 599 my $gen = $self->{map_change_gen};
581 600
582 CFPlus::DB::get $self->{mapcache} => $hash, sub { 601 my $cb = sub {
583 return unless $gen == $self->{map_change_gen}; 602 return unless $gen == $self->{map_change_gen};
584 603
585 my ($data) = @_; 604 my ($data) = @_;
586 605
587 if (defined $data) { 606 if (defined $data) {
607 $self->{map_cache_new}{$hash} = \$data;
608
588 $data = Compress::LZF::decompress $data; 609 my $data = Compress::LZF::decompress $data;
589 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
590 610
591 my $inprogress = @{ $self->{bg_fetch} || [] }; 611 my $inprogress = @{ $self->{bg_fetch} || [] };
592 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 612 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
593 $self->bg_fetch unless $inprogress; 613 $self->bg_fetch unless $inprogress;
594 } 614 }
595 }; 615 };
616
617 if (my $rdata = $self->{map_cache_old}{$hash}) {
618 $cb->($$rdata);
619 } else {
620 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
621 }
596} 622}
597 623
598# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 624# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
599# (server resource,s latency, bandwidth), so this hack is warranted. 625# (server resource,s latency, bandwidth), so this hack is warranted.
600# the right fix is to make real tiled maps with an overview file 626# the right fix is to make real tiled maps with an overview file
… …
693 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 719 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
694 720
695 $self->flush_map; 721 $self->flush_map;
696 722
697 ++$self->{map_change_gen}; 723 ++$self->{map_change_gen};
724 $self->{map_cache_old} = delete $self->{map_cache_new};
698 725
699 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 726 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
700 727
701 my $mapmapw = $self->{mapmap}->{w}; 728 my $mapmapw = $self->{mapmap}->{w};
702 my $mapmaph = $self->{mapmap}->{h}; 729 my $mapmaph = $self->{mapmap}->{h};
… …
732 $self->{map}->set_tileid ($facenum => $id); 759 $self->{map}->set_tileid ($facenum => $id);
733 760
734 CFPlus::DB::get tilecache => $id, $cb; 761 CFPlus::DB::get tilecache => $id, $cb;
735 762
736 } elsif ($face->{type} & 1) { # with metadata 763 } 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; 764 CFPlus::DB::get res_meta => $face->{name}, $cb;
739 } 765 }
740} 766}
741 767
742sub face_update { 768sub face_update {
… …
744 770
745 if ($face->{type} == 0) { # FT_FACE 771 if ($face->{type} == 0) { # FT_FACE
746 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 772 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
747 if $changed; 773 if $changed;
748 774
749 $self->set_texture ($face->{id} => delete $face->{data}); 775 $self->have_tile ($face->{id});
750 776
751 } elsif ($face->{type} & 1) { # split metadata 777 } 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 778 if ($changed) { # new data
775 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; 779 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
780 $face->{meta} = $self->{json_coder}->decode ($meta_json);
776 781
777 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 782 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
778 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { 783 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 { 784 } else {
785 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 785 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
786 }
787
786 ::add_license ($face); 788 ::add_license ($face);
787 $cb->(); 789
790 if ($face->{type} == 3) { # FT_MUSIC
791 $self->{music_meta}{$facenum} = $face;
792
793 ::message ({ markup => "downloaded song #$facenum" })
794 if $changed;
795
796 &::audio_music_push ($facenum);
797 } elsif ($face->{type} == 5) { # FT_SOUND
798 $self->{sound_meta}{$facenum} = $face;
799
800 ::message ({ markup => "downloaded sound #$facenum" })
801 if $changed;
802
803 &::audio_sound_push ($facenum);
788 } 804 }
805
789 } 806 }
790} 807}
791 808
792sub smooth_update { 809sub smooth_update {
793 my ($self, $facenum, $face) = @_; 810 my ($self, $facenum, $face) = @_;
794 811
795 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 812 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
796} 813}
797 814
798sub set_texture { 815sub have_tile {
799 my ($self, $id, $data) = @_; 816 my ($self, $tile) = @_;
800 817
801 return unless $self->{map}; 818 return unless $self->{map};
802 819
803 $self->{texture}[$id] = my $tex = 820 my $tex = $self->{texture}[$tile] ||=
804 new_from_image CFPlus::Texture 821 new CFPlus::Texture
805 $data, minify => 1, mipmap => 1; 822 tile => $tile, minify => 1, mipmap => 1, delay => 1;
806 823
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}) || []}; 824 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
811} 825}
812 826
813sub connect_face_update { 827sub connect_face_update {
814 my ($self, $id, $cb) = @_; 828 my ($self, $id, $cb) = @_;
815 829
… …
1010 } 1024 }
1011 1025
1012 $::FLOORBOX->add_at (@add); 1026 $::FLOORBOX->add_at (@add);
1013 }); 1027 });
1014 1028
1015 $::WANT_REFRESH++; 1029 $::WANT_REFRESH->start;
1016} 1030}
1017 1031
1018sub set_opencont { 1032sub set_opencont {
1019 my ($conn, $tag, $name) = @_; 1033 my ($conn, $tag, $name) = @_;
1020 $conn->{open_container} = $tag; 1034 $conn->{open_container} = $tag;

Diff Legend

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