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

Comparing deliantra/server/ext/map-world.ext (file contents):
Revision 1.28 by root, Tue Jul 17 11:24:48 2007 UTC vs.
Revision 1.32 by root, Wed Dec 5 11:08:34 2007 UTC

3# optional plug-in to speed up worldmap rendering by dynamically 3# optional plug-in to speed up worldmap rendering by dynamically
4# generating it out of an image 4# generating it out of an image
5# - saves loading time (less data to read) 5# - saves loading time (less data to read)
6# - saves temporary space (only overlay stuff needs to be saved) 6# - saves temporary space (only overlay stuff needs to be saved)
7# - might get reused as a generic tiled map 7# - might get reused as a generic tiled map
8
9cf::map->register (qr{^/world/world_(\d\d\d)_(\d\d\d)$}, 100);
8 10
9use Coro::Handle; 11use Coro::Handle;
10use Coro::AIO; 12use Coro::AIO;
11 13
12our $WORLD; 14our $WORLD;
63 "$path/gridmap.regn.png", 65 "$path/gridmap.regn.png",
64 ], 66 ],
65 1 => sub { 67 1 => sub {
66 my ($src) = @_; 68 my ($src) = @_;
67 69
68 my $map = cf::from_json $src->[0]; 70 my $map = cf::decode_json $src->[0];
69 71
70 my $size = $map->{tile_w} * $map->{tile_h} * $map->{grid_w} * $map->{grid_h} 72 my $size = $map->{tile_w} * $map->{tile_h} * $map->{grid_w} * $map->{grid_h}
71 or cf::cleanup "$path/gridmap.meta: empty gridmap?"; 73 or cf::cleanup "$path/gridmap.meta: empty gridmap?";
72 74
73 ($map->{arc_data}, $map->{arc_plt}) = load_indexed "$path/gridmap.arch", $size; 75 ($map->{arc_data}, $map->{arc_plt}) = load_indexed "$path/gridmap.arch", $size;
86 88
87# this is contorted, but likely the correct way to acquire the lock :) 89# this is contorted, but likely the correct way to acquire the lock :)
88cf::sync_job { 90cf::sync_job {
89 my $guard = cf::lock_acquire "ext::world_gridmap"; 91 my $guard = cf::lock_acquire "ext::world_gridmap";
90 cf::async_ext { 92 cf::async_ext {
93 $Coro::current->{desc} = "worldmap loader";
91 reload; 94 reload;
92 undef $guard; 95 undef $guard;
93 }; 96 };
94}; 97};
95
96cf::map->register (qr{^/world/world_(\d\d\d)_(\d\d\d)$}, 100);
97 98
98sub wxwy { 99sub wxwy {
99 $_[0]->path =~ m{/world/world_(\d\d\d)_(\d\d\d)$} 100 $_[0]->path =~ m{/world/world_(\d\d\d)_(\d\d\d)$}
100 ? ($1, $2) 101 ? ($1, $2)
101 : (0, 0) 102 : (0, 0)
119 $self->tile_path (0, sprintf "/world/world_%03d_%03d", $x, $y - 1) if $y > 0; 120 $self->tile_path (0, sprintf "/world/world_%03d_%03d", $x, $y - 1) if $y > 0;
120 $self->tile_path (1, sprintf "/world/world_%03d_%03d", $x + 1, $y) if $x < 999; 121 $self->tile_path (1, sprintf "/world/world_%03d_%03d", $x + 1, $y) if $x < 999;
121 $self->tile_path (2, sprintf "/world/world_%03d_%03d", $x, $y + 1) if $y < 999; 122 $self->tile_path (2, sprintf "/world/world_%03d_%03d", $x, $y + 1) if $y < 999;
122 $self->tile_path (3, sprintf "/world/world_%03d_%03d", $x - 1, $y) if $x > 0; 123 $self->tile_path (3, sprintf "/world/world_%03d_%03d", $x - 1, $y) if $x > 0;
123 124
124 my $overlay = sprintf "%s/world-overlay/world_%03d_%03d.map", $cf::MAPDIR, $x, $y; 125 my $overlay = sprintf "%s/world/world_%03d_%03d.map", $cf::MAPDIR, $x, $y;
125 126
126 $self->{load_path} = $overlay 127 $self->{load_path} = $overlay
127 unless Coro::AIO::aio_stat $overlay; 128 unless Coro::AIO::aio_stat $overlay;
128 129
129 $self->{need_create_treasure} = 1; 130 $self->{need_create_treasure} = 1;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines