ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/ext/item-worldmap.ext
(Generate patch)

Comparing deliantra/server/ext/item-worldmap.ext (file contents):
Revision 1.6 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.8 by root, Mon Jul 23 21:02:50 2007 UTC

1#! perl # depends=widget mandatory 1#! perl # depends=widget mandatory
2 2
3# this module implements a rather fancy worldmap 3# this module implements a rather fancy worldmap
4 4
5our $WORLDMAP_UPDATE_INTERVAL = $cf::CFG{worldmap_update_interval} || 10; 5our $WORLDMAP_UPDATE_INTERVAL = $cf::CFG{worldmap_update_interval} || 2;
6 6
7our $GENCOUNT = 0; 7our $GENCOUNT = 0;
8our %PLAYERINFO; 8our %PLAYERINFO;
9 9
10our ($MAPW, $MAPH) = (1024, 1024); # it's useful to know the map width/height in pixels
11
10sub update_worldmap { 12sub update_worldmap {
11 my ($ws) = @_; 13 my ($ws) = @_;
12 14
15 return if $GENCOUNT == $ws->{gencount};
16 $ws->{gencount} = $GENCOUNT;
17
13 my $labels = delete $ws->{labels}; 18 my $old = delete $ws->{labels};
19 my $new;
20
21 my $name = $ws->{ns}->pl->ob->name;
14 22
15 while (my ($k, $v) = each %PLAYERINFO) { 23 while (my ($k, $v) = each %PLAYERINFO) {
16 if (my $old = $labels->{$k}) { 24 my $label = (delete $old->{$k}) || do {
17 $ws->{labels}{$k} = $old;
18 } else {
19 $ws->{labels}{$k} = $ws->new (Label => 25 my $label = $ws->new (Label =>
20 text => $k, 26 text => $k,
21 fontsize => 0.2, 27 fontsize => 0.2,
22 c_rel => 1,
23 c_halign => -.5, 28 c_halign => -.5,
24 c_valign => -1, 29 c_valign => -1,
25 ); 30 );
26 $ws->{canvas}->add ($ws->{labels}{$k}); 31 $ws->{canvas}->add ($label);
32 $label
33 };
34
35 $new->{$k} = $label;
36
37 if ($v != $label->{prevpos}) {
38 $label->set (c_x => $v->[0], c_y => $v->[1]);
39 $label->{prevpos} = $v;
40 $ws->{window}->make_visible ($v->[0], $v->[1], .2)
41 if $k eq $name;
27 } 42 }
28 $ws->{labels}{$k}->set (c_x => $v->[0], c_y => $v->[1]);
29 } 43 }
44
45 $ws->{labels} = $new;
46
47 #$_->destroy for values %$old;#d#
30} 48}
31 49
32sub create_widgets { 50sub create_widgets {
33 my ($ns) = @_; 51 my ($ns) = @_;
34 52
… …
51 69
52 my $face = cf::face::find "res/worldmap.jpg"; 70 my $face = cf::face::find "res/worldmap.jpg";
53 $ns->send_face ($face); 71 $ns->send_face ($face);
54 $ns->flush_fx; 72 $ns->flush_fx;
55 73
56 $w->add (my $sw = $ws->new (ScrolledWindow => scroll_x => 1, scroll_y => 1)); 74 $w->add (my $sw = $ws->{window} = $ws->new (ScrolledWindow => scroll_x => 1, scroll_y => 1));
57 $sw->add (my $canvas = $ws->{canvas} = $ws->new (Canvas => expand => 1)); 75 $sw->add (my $canvas = $ws->{canvas} = $ws->new (Canvas => expand => 1));
58 76
59 $ws->{mapface} = $ws->new (Face => 77 $ws->{mapface} = $ws->new (Face =>
60 expand => 1, 78 expand => 1,
61 size_w => undef, 79 size_w => undef,
… …
90 108
91 while () { 109 while () {
92 $schedule_interval->interval ($WORLDMAP_UPDATE_INTERVAL); 110 $schedule_interval->interval ($WORLDMAP_UPDATE_INTERVAL);
93 $schedule_interval->next; 111 $schedule_interval->next;
94 112
95 cf::get_slot 0.05; 113 cf::get_slot 0.01, -50, "worldmap update";
96 114
97 ++$GENCOUNT; 115 ++$GENCOUNT;
98 116
99 # recalculate player info 117 # recalculate player info
100 my %new; 118 my %new;
… …
109 my $y = ($2 - 100) * 50 + $ob->y; 127 my $y = ($2 - 100) * 50 + $ob->y;
110 128
111 0 <= $x && 0 <= $y && $x < 1500 && $y < 1500 129 0 <= $x && 0 <= $y && $x < 1500 && $y < 1500
112 or next; 130 or next;
113 131
114 # rounding saves network bandwidth... 132 $x = int $x * $MAPW / 1500;
115 $x = sprintf "%.3f", $x / 1500; 133 $y = int $y * $MAPH / 1500;
116 $y = sprintf "%.3f", $y / 1500;
117 134
118 my $name = $ob->name; 135 my $name = $ob->name;
119 136
120 if (my $pi = delete $PLAYERINFO{$name}) { 137 if (my $pi = delete $PLAYERINFO{$name}) {
121 if ($pi->[0] == $x && $pi->[1] == $y) { 138 if ($pi->[0] == $x && $pi->[1] == $y) {
… …
125 } 142 }
126 143
127 $new{$name} = [$x, $y]; 144 $new{$name} = [$x, $y];
128 } 145 }
129 146
147 *PLAYERINFO = \%new;
148
149 cf::get_slot 0.03, -50, "worldmap socket update";
130 for (values %cf::PLAYER) { 150 for (values %cf::PLAYER) {
131 my $ns = $_->ns 151 my $ns = $_->ns
132 or next; 152 or next;
133 153
134 update_worldmap $ns->{ws_worldmap} 154 update_worldmap $ns->{ws_worldmap}

Diff Legend

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