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.27 by root, Mon Jun 11 21:38:13 2007 UTC vs.
Revision 1.40 by root, Fri Apr 22 02:03:11 2011 UTC

… …
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 8
9cf::map->register (qr{^/world/world_(\d\d\d)_(\d\d\d)$}, 100);
10
9use Coro::Handle; 11use Coro::Handle;
10use Coro::AIO; 12use Coro::AIO;
11 13
12our $WORLD; 14my $TILE_W = 50;
15my $TILE_H = 50;
13 16
14sub load_indexed($$) { 17my $GRID_W = 30;
15 my ($path, $size) = @_; 18my $GRID_H = 30;
16 19
17 use bytes; 20our $ARCH;
21our $REGN;
18 22
19 0 < aio_load "$path.plt", my $plt 23sub reload() {
20 or cf::cleanup "$path.plt: $!"; 24 cf::trace "loading world+100+100 table.\n";
21 25 $ARCH = cf::decode_storable cf::unlzf cf::load_file "$DATADIR/world+100+100.arch";
22 my %plt; 26 $REGN = cf::decode_storable cf::unlzf cf::load_file "$DATADIR/world+100+100.regn";
23 my @plt; 27 cf::trace "loaded world+100+100 table.\n";
24
25 for (split /\n/, $plt) {
26 my ($name, $rgb) = split /\s+/;
27 if (/^(\S+)\s+(\S+)$/) {
28 my ($name, $rgb) = ($1, $2);
29 $rgb = join "", map chr, map $_ * 17, map hex, split //, $rgb;
30 $plt{$rgb} = chr @plt;
31 push @plt, $name;
32 }
33 }
34
35 my $data = cf::fork_call {
36 open my $fh, "convert \Q$path.png\E -depth 8 rgb:- |"
37 or die "convert: $!";
38 binmode $fh;
39
40 $size * 3 == read $fh, my $data, $size * 3
41 or die "$path.png, expected $size rgb triplets: $!";
42
43 cf::_quantise $data, [map "$_$plt{$_}", keys %plt];
44
45 $data
46 };
47
48 $size == length $data
49 or cf::cleanup "$path.png, expected $size index octets ($!)";
50
51 ($data, \@plt)
52} 28}
53 29
54sub load_gridmap($) { 30{
55 my ($path) = @_; 31 my $guard = cf::lock_acquire "ext::world_gridmap";
56 32
57 my $map = cf::cache "ext::map-world/gridmap" => 33 cf::post_init {
58 [ 34 cf::async_ext {
59 "$path/gridmap.meta", 35 $Coro::current->{desc} = "worldmap loader";
60 "$path/gridmap.arch.plt", 36 reload;
61 "$path/gridmap.arch.png", 37 undef $guard;
62 "$path/gridmap.regn.plt",
63 "$path/gridmap.regn.png",
64 ],
65 1 => sub {
66 my ($src) = @_;
67
68 my $map = cf::from_json $src->[0];
69
70 my $size = $map->{tile_w} * $map->{tile_h} * $map->{grid_w} * $map->{grid_h}
71 or cf::cleanup "$path/gridmap.meta: empty gridmap?";
72
73 ($map->{arc_data}, $map->{arc_plt}) = load_indexed "$path/gridmap.arch", $size;
74 ($map->{reg_data}, $map->{reg_plt}) = load_indexed "$path/gridmap.regn", $size;
75
76 Coro::Storable::freeze $map
77 }; 38 };
78 39 };
79 Coro::Storable::thaw $map
80} 40}
81
82sub reload() {
83 $WORLD = load_gridmap "$MAPDIR/world";
84 warn "worldmap gridmap loaded.";
85}
86
87# this is contorted, but likely the correct way to acquire the lock :)
88cf::sync_job {
89 my $guard = cf::lock_acquire "ext::world_gridmap";
90 cf::async_ext {
91 reload;
92 undef $guard;
93 };
94};
95
96cf::map->register (qr{^/world/world_(\d\d\d)_(\d\d\d)$}, 100);
97 41
98sub wxwy { 42sub wxwy {
99 $_[0]->path =~ m{/world/world_(\d\d\d)_(\d\d\d)$} 43 $_[0]->path =~ m{/world/world_(\d\d\d)_(\d\d\d)$}
100 ? ($1, $2) 44 ? ($1, $2)
101 : (0, 0) 45 : (0, 0)
… …
106 50
107 my ($x, $y) = $self->wxwy; 51 my ($x, $y) = $self->wxwy;
108 52
109 my $guard = cf::lock_acquire "ext::world_gridmap"; 53 my $guard = cf::lock_acquire "ext::world_gridmap";
110 54
111 $self->width ($WORLD->{tile_w}); 55 $self->width ($TILE_W);
112 $self->height ($WORLD->{tile_h}); 56 $self->height ($TILE_H);
113 57
114 $self->name ("'The World' at +$x+$y"); 58 $self->name ("'The World' at +$x+$y");
115 $self->msg ("worldmap dynamically created by map-world extension"); 59 $self->msg ("worldmap dynamically created by map-world extension");
116 $self->outdoor (1); 60 $self->outdoor (1);
117 $self->default_region (cf::region::find "wilderness"); 61 $self->default_region (cf::region::find "wilderness");
… …
119 $self->tile_path (0, sprintf "/world/world_%03d_%03d", $x, $y - 1) if $y > 0; 63 $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; 64 $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; 65 $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; 66 $self->tile_path (3, sprintf "/world/world_%03d_%03d", $x - 1, $y) if $x > 0;
123 67
124 $self->{load_path} = sprintf "%s/world-overlay/world_%03d_%03d.map", $cf::MAPDIR, $x, $y 68 my $overlay = sprintf "%s/world/world_%03d_%03d.map", $cf::MAPDIR, $x, $y;
125 if $x >= 100 && $x <= 129 && $y >= 100 && $y <= 129; 69
70 $self->{load_path} = $overlay
71 unless Coro::AIO::aio_stat $overlay;
126 72
127 $self->{need_create_treasure} = 1; 73 $self->{need_create_treasure} = 1;
128 74
129 1 75 1
130} 76}
131 77
132sub fill { 78sub fill {
133 my ($self) = @_; 79 my ($self) = @_;
134 80
135 $self->add_underlay ("\x00" x ($WORLD->{tile_w} * $WORLD->{tile_h}), 0, $WORLD->{tile_w}, $WORLD->{arc_plt}); 81 $self->add_underlay ("\x00" x ($TILE_W * $TILE_H), 0, $TILE_W, $ARCH->{plt});
136 $self->default_region (cf::region::find $WORLD->{reg_plt}[0]); 82 $self->default_region (cf::region::find $REGN->{plt}[0]);
137} 83}
138 84
139sub load { 85sub load {
140 my ($self) = @_; 86 my ($self) = @_;
141 87
142 if ($self->{load_path}) { 88 if ($self->{load_path}) {
143 $self->SUPER::load; 89 $self->SUPER::load;
144 } else { 90 } else {
145 $self->alloc; 91 $self->alloc;
146 $self->fill; 92 $self->fill;
147 $self->in_memory (cf::MAP_IN_MEMORY); 93 $self->in_memory (cf::MAP_ACTIVE);
148 $self->activate; 94 $self->activate;
149 } 95 }
150} 96}
151 97
152sub post_load { 98sub post_load {
… …
156 my $guard = cf::lock_acquire "ext::world_gridmap"; 102 my $guard = cf::lock_acquire "ext::world_gridmap";
157 103
158 my ($x, $y) = $self->wxwy; 104 my ($x, $y) = $self->wxwy;
159 105
160 if ($x >= 100 && $x <= 129 && $y >= 100 && $y <= 129) { 106 if ($x >= 100 && $x <= 129 && $y >= 100 && $y <= 129) {
161 my $stride = $WORLD->{grid_w} * $WORLD->{tile_w}; 107 my $stride = $GRID_W * $TILE_W;
162 my $top = ($y - 100) * $WORLD->{tile_h} * $stride 108 my $top = ($y - 100) * $TILE_H * $stride
163 + ($x - 100) * $WORLD->{tile_w}; 109 + ($x - 100) * $TILE_W;
164 110
165 $self->add_underlay ($WORLD->{arc_data}, $top, $stride, $WORLD->{arc_plt}); 111 $self->add_underlay ($ARCH->{tbl}, $top, $stride, $ARCH->{plt});
166 $self->set_regiondata ($WORLD->{reg_data}, $top, $stride, $WORLD->{reg_plt}); 112 $self->set_regiondata ($REGN->{tbl}, $top, $stride, $REGN->{plt});
167 113
168 } else { 114 } else {
169 $self->fill; 115 $self->fill;
170 } 116 }
171 } 117 }
172 118
173 $self->create_region_treasure 119 $self->create_region_treasure
174 if delete $self->{need_create_treasure}; 120 if delete $self->{need_create_treasure};
175} 121}
176 122
1771
178

Diff Legend

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