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.22 by root, Wed Apr 18 14:24:09 2007 UTC vs.
Revision 1.28 by root, Tue Jul 17 11:24:48 2007 UTC

1#! perl # OPTIONAL 1#! perl # optional
2 2
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)
78 78
79 Coro::Storable::thaw $map 79 Coro::Storable::thaw $map
80} 80}
81 81
82sub reload() { 82sub reload() {
83 $WORLD = load_gridmap sprintf "%s/%s/%s", cf::datadir, cf::mapdir, "world"; 83 $WORLD = load_gridmap "$MAPDIR/world";
84 warn "worldmap gridmap loaded."; 84 warn "worldmap gridmap loaded.";
85} 85}
86 86
87# this is contorted, but likely the correct way to acquire the lock :) 87# this is contorted, but likely the correct way to acquire the lock :)
88cf::sync_job { 88cf::sync_job {
89 my $guard = cf::lock_acquire "ext::world_gridmap"; 89 my $guard = cf::lock_acquire "ext::world_gridmap";
90 cf::async_ext { 90 cf::async_ext {
91 reload; 91 reload;
92 undef $guard; 92 undef $guard;
93 } 93 };
94}; 94};
95 95
96cf::map->register (qr{^/world/world_(\d\d\d)_(\d\d\d)$}, 100); 96cf::map->register (qr{^/world/world_(\d\d\d)_(\d\d\d)$}, 100);
97 97
98sub wxwy { 98sub wxwy {
119 $self->tile_path (0, sprintf "/world/world_%03d_%03d", $x, $y - 1) if $y > 0; 119 $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; 120 $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; 121 $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; 122 $self->tile_path (3, sprintf "/world/world_%03d_%03d", $x - 1, $y) if $x > 0;
123 123
124 $self->{load_path} = sprintf "%s/%s/world-overlay/world_%03d_%03d.map", cf::datadir, cf::mapdir, $x, $y 124 my $overlay = sprintf "%s/world-overlay/world_%03d_%03d.map", $cf::MAPDIR, $x, $y;
125 if $x >= 100 && $x <= 129 && $y >= 100 && $y <= 129; 125
126 $self->{load_path} = $overlay
127 unless Coro::AIO::aio_stat $overlay;
128
129 $self->{need_create_treasure} = 1;
126 130
127 1 131 1
128} 132}
129 133
130sub fill { 134sub fill {
141 $self->SUPER::load; 145 $self->SUPER::load;
142 } else { 146 } else {
143 $self->alloc; 147 $self->alloc;
144 $self->fill; 148 $self->fill;
145 $self->in_memory (cf::MAP_IN_MEMORY); 149 $self->in_memory (cf::MAP_IN_MEMORY);
150 $self->activate;
146 } 151 }
147} 152}
148 153
149sub post_load { 154sub post_load {
150 my ($self) = @_; 155 my ($self) = @_;
151 156
157 {
152 my $guard = cf::lock_acquire "ext::world_gridmap"; 158 my $guard = cf::lock_acquire "ext::world_gridmap";
153 159
154 my ($x, $y) = $self->wxwy; 160 my ($x, $y) = $self->wxwy;
155 161
156 if ($x >= 100 && $x <= 129 && $y >= 100 && $y <= 129) { 162 if ($x >= 100 && $x <= 129 && $y >= 100 && $y <= 129) {
157 my $stride = $WORLD->{grid_w} * $WORLD->{tile_w}; 163 my $stride = $WORLD->{grid_w} * $WORLD->{tile_w};
158 my $top = ($y - 100) * $WORLD->{tile_h} * $stride 164 my $top = ($y - 100) * $WORLD->{tile_h} * $stride
159 + ($x - 100) * $WORLD->{tile_w}; 165 + ($x - 100) * $WORLD->{tile_w};
160 166
161 $self->add_underlay ($WORLD->{arc_data}, $top, $stride, $WORLD->{arc_plt}); 167 $self->add_underlay ($WORLD->{arc_data}, $top, $stride, $WORLD->{arc_plt});
162 $self->set_regiondata ($WORLD->{reg_data}, $top, $stride, $WORLD->{reg_plt}); 168 $self->set_regiondata ($WORLD->{reg_data}, $top, $stride, $WORLD->{reg_plt});
163 169
164 } else { 170 } else {
165 $self->fill; 171 $self->fill;
172 }
166 } 173 }
174
175 $self->create_region_treasure
176 if delete $self->{need_create_treasure};
167} 177}
168 178
1691 1791
170 180

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines