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.5 by root, Sun Jul 22 20:08:38 2007 UTC vs.
Revision 1.10 by root, Mon Jul 23 23:46:03 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 %PLAYERINFO; 8our %PLAYERINFO;
9
10our ($MAPW, $MAPH) = (1024, 1024); # it's useful to know the map width/height in pixels
8 11
9sub update_worldmap { 12sub update_worldmap {
10 my ($ws) = @_; 13 my ($ws) = @_;
11 14
15 return if $GENCOUNT == $ws->{gencount};
16 $ws->{gencount} = $GENCOUNT;
17
12 my $labels = delete $ws->{labels}; 18 my $old = delete $ws->{labels};
19 my $new;
20
21 my $name = $ws->{ns}->pl->ob->name;
13 22
14 while (my ($k, $v) = each %PLAYERINFO) { 23 while (my ($k, $v) = each %PLAYERINFO) {
15 if (my $old = $labels->{$k}) { 24 my $label = (delete $old->{$k}) || do {
16 $ws->{labels}{$k} = $old;
17 } else {
18 $ws->{labels}{$k} = $ws->new (Label => 25 my $label = $ws->new (Label =>
19 text => $k, 26 text => $k,
20 fontsize => 0.2, 27 fontsize => 0.2,
21 c_rel => 1, 28 );
29
30 my $marker = $ws->new (Face =>
31 size_w => undef,
32 size_h => undef,
33 face => $ws->{ns}->find_face ("res/map-arrow.png"),
34 );
35 my $children = [$label, $marker];
36
37 $ws->{canvas}->add (my $vbox = $ws->new (VBox =>
38 children => $children,
22 c_halign => -.5, 39 c_halign => -.5,
23 c_valign => -1, 40 c_valign => -1,
24 ); 41 ));
25 $ws->{canvas}->add ($ws->{labels}{$k}); 42 $vbox->{children} = $children;
43
44 $vbox
45 };
46
47 $new->{$k} = $label;
48
49 if ($v != $label->{prevpos}) {
50 $label->set (c_x => $v->[0], c_y => $v->[1]);
51 $label->{prevpos} = $v;
52 $ws->{window}->make_visible ($v->[0], $v->[1], .2)
53 if $k eq $name;
26 } 54 }
27 $ws->{labels}{$k}->set (c_x => $v->[0], c_y => $v->[1]);
28 } 55 }
56
57 $ws->{labels} = $new;
29} 58}
30 59
31sub create_widgets { 60sub create_widgets {
32 my ($ns) = @_; 61 my ($ns) = @_;
33 62
… …
41 x => "center", 70 x => "center",
42 y => "center", 71 y => "center",
43 has_close_button => 1, 72 has_close_button => 1,
44 on_delete => sub { shift->hide }, 73 on_delete => sub { shift->hide },
45 on_visibility_change => sub { 74 on_visibility_change => sub {
75 warn "VCHANGE <@_>\n";#d#
46 $_[0]{visibility} = $_[1]; 76 $_[0]{visibility} = $_[1];
47 update_worldmap $_[0]{ws} if $_[1]; 77 update_worldmap $_[0]{ws} if $_[1];
48 }, 78 },
49 ); 79 );
50 80
51 my $face = cf::face::find "res/worldmap.jpg";
52 $ns->send_face ($face);
53 $ns->flush_fx;
54
55 $w->add (my $sw = $ws->new (ScrolledWindow => scroll_x => 1, scroll_y => 1)); 81 $w->add (my $sw = $ws->{window} = $ws->new (ScrolledWindow => scroll_x => 1, scroll_y => 1));
56 $sw->add (my $canvas = $ws->{canvas} = $ws->new (Canvas => expand => 1)); 82 $sw->add (my $canvas = $ws->{canvas} = $ws->new (Canvas => expand => 1));
57 83
58 $ws->{mapface} = $ws->new (Face => 84 $ws->{mapface} = $ws->new (Face =>
59 expand => 1, 85 expand => 1,
60 size_w => undef, 86 size_w => undef,
61 size_h => undef, 87 size_h => undef,
62 face => $face, 88 face => $ws->{ns}->find_face ("res/worldmap.jpg"),
63 ); 89 );
64 90
65 $ws->{canvas}->add ($ws->{mapface}); 91 $ws->{canvas}->add ($ws->{mapface});
66 92
67 $ws 93 $ws
… …
89 115
90 while () { 116 while () {
91 $schedule_interval->interval ($WORLDMAP_UPDATE_INTERVAL); 117 $schedule_interval->interval ($WORLDMAP_UPDATE_INTERVAL);
92 $schedule_interval->next; 118 $schedule_interval->next;
93 119
120 cf::get_slot 0.01, -50, "worldmap update";
121
122 ++$GENCOUNT;
123
94 # recalculate player info 124 # recalculate player info
95 %PLAYERINFO = (); 125 my %new;
96 for (values %cf::PLAYER) { 126 for (values %cf::PLAYER) {
97 my $map = $_->ob->map 127 my $map = $_->ob->map
98 or next; 128 or next;
99 $map =~ /^\/world\/world_(\d\d\d)_(\d\d\d)/ 129 $map =~ /^\/world\/world_(\d\d\d)_(\d\d\d)/
100 or next; 130 or next;
131
101 my $ob = $_->ob; 132 my $ob = $_->ob;
102 my $x = ($1 - 100) * 50 + $ob->x; 133 my $x = ($1 - 100) * 50 + $ob->x;
103 my $y = ($2 - 100) * 50 + $ob->y; 134 my $y = ($2 - 100) * 50 + $ob->y;
104 135
105 0 <= $x && 0 <= $y && $x < 1500 && $y < 1500 136 0 <= $x && 0 <= $y && $x < 1500 && $y < 1500
106 or next; 137 or next;
107 138
108 # rounding saves network bandwidth... 139 $x = int $x * $MAPW / 1500;
109 $PLAYERINFO{$ob->name} = [(sprintf "%.3f", $x / 1500), (sprintf "%.3f", $y / 1500)]; 140 $y = int $y * $MAPH / 1500;
141
142 my $name = $ob->name;
143
144 if (my $pi = delete $PLAYERINFO{$name}) {
145 if ($pi->[0] == $x && $pi->[1] == $y) {
146 $new{$name} = $pi;
147 next;
148 }
149 }
150
151 $new{$name} = [$x, $y];
110 } 152 }
111 153
154 *PLAYERINFO = \%new;
155
156 cf::get_slot 0.03, -50, "worldmap socket update";
112 for (values %cf::PLAYER) { 157 for (values %cf::PLAYER) {
113 my $ns = $_->ns 158 my $ns = $_->ns
114 or next; 159 or next;
160
115 update_worldmap $ns->{ws_worldmap} 161 update_worldmap $ns->{ws_worldmap}
116 if $ns->{ws_worldmap} && $ns->{ws_worldmap}{toplevel}{visibility}; 162 if $ns->{ws_worldmap} && $ns->{ws_worldmap}{toplevel}{visibility};
117 } 163 }
118 } 164 }
119}; 165};

Diff Legend

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