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.17 by root, Sat Feb 17 01:58:55 2007 UTC vs.
Revision 1.38 by root, Thu Apr 29 07:32:34 2010 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)
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;
… …
30 $plt{$rgb} = chr @plt; 32 $plt{$rgb} = chr @plt;
31 push @plt, $name; 33 push @plt, $name;
32 } 34 }
33 } 35 }
34 36
35 my $pid = open my $pipe, "-|"; 37 my $data = cf::fork_call {
38 open my $fh, "convert \Q$path.png\E -depth 8 rgb:- |"
39 or die "convert: $!";
40 binmode $fh;
36 41
37 defined $pid 42 $size * 3 == read $fh, my $data, $size * 3
38 or cf::cleanup "fork: $!"; 43 or die "$path.png, expected $size rgb triplets: $!";
39 44
40 unless ($pid) { 45 cf::_quantise $data, [map "$_$plt{$_}", keys %plt];
41 eval {
42 open my $fh, "convert \Q$path.png\E -depth 8 rgb:- |"
43 or die "convert: $!";
44 binmode $fh;
45 46
46 binmode $fh; 47 $data
47 $size * 3 == read $fh, my $data, $size * 3 48 };
48 or die "$path.png, expected $size rgb triplets: $!";
49 49
50 $data =~ s{(...)}{ 50 $size == length $data
51 $plt{$1} or die "$path.png: color not in palette: #" . unpack "H*", $1
52 }sge;
53
54 binmode STDOUT;
55 syswrite STDOUT, $data;
56 };
57 warn $@ if $@;
58 cf::_exit;
59 }
60
61 $pipe = Coro::Handle::unblock $pipe;
62 binmode $pipe;
63 $size == read $pipe, my $data, $size
64 or cf::cleanup "$path.png, expected $size index octets ($!)"; 51 or cf::cleanup "$path.png, expected $size index octets ($!)";
65 52
66 ($data, \@plt) 53 ($data, \@plt)
67} 54}
68 55
69sub load_gridmap($) { 56sub load_gridmap($) {
70 my ($path) = @_; 57 my ($path) = @_;
71 58
72 if (1 || ! -e "/tmp/xxxx.gridmap") { 59 my $map = cf::cache "ext::map-world/gridmap" =>
73 0 < aio_load "$path/gridmap.meta", my $map 60 [
74 or cf::cleanup "$path/gridmap.meta: $!\n"; 61 "$path/gridmap.meta",
62 "$path/gridmap.arch.plt",
63 "$path/gridmap.arch.png",
64 "$path/gridmap.regn.plt",
65 "$path/gridmap.regn.png",
66 ],
67 1 => sub {
68 my ($src) = @_;
75 69
76 $map = cf::from_json $map; 70 my $map = cf::decode_json $src->[0];
77 71
78 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}
79 or cf::cleanup "$path/gridmap.meta: empty gridmap?"; 73 or cf::cleanup "$path/gridmap.meta: empty gridmap?";
80 74
81 ($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;
82 ($map->{reg_data}, $map->{reg_plt}) = load_indexed "$path/gridmap.regn", $size; 76 ($map->{reg_data}, $map->{reg_plt}) = load_indexed "$path/gridmap.regn", $size;
83 77
84 Storable::nstore $map, "/tmp/xxxx.gridmap" if 0;#d# 78 Coro::Storable::freeze $map
79 };
85 80
86 $map 81 Coro::Storable::thaw $map
87 } else {
88 Storable::retrieve "/tmp/xxxx.gridmap";
89 }
90} 82}
91 83
92# this is contorted, but likely the correct way to acquire the lock :) 84sub reload() {
93cf::sync_job { 85 $WORLD = load_gridmap "$MAPDIR/world";
86 cf::trace "worldmap gridmap loaded.\n";
87}
88
89{
94 my $guard = cf::lock_acquire "ext::world_gridmap"; 90 my $guard = cf::lock_acquire "ext::world_gridmap";
95 cf::async_ext {
96 $WORLD = load_gridmap sprintf "%s/%s/%s", cf::datadir, cf::mapdir, "world";
97 warn "worldmap gridmap loaded.";
98 undef $guard;
99 }
100};
101 91
102cf::map->register (qr{^/world/world_(\d\d\d)_(\d\d\d)$}, 100); 92 cf::post_init {
93 cf::async_ext {
94 $Coro::current->{desc} = "worldmap loader";
95 reload;
96 undef $guard;
97 };
98 };
99}
103 100
104sub wxwy { 101sub wxwy {
105 $_[0]->path =~ m{/world/world_(\d\d\d)_(\d\d\d)$} 102 $_[0]->path =~ m{/world/world_(\d\d\d)_(\d\d\d)$}
106 ? ($1, $2) 103 ? ($1, $2)
107 : (0, 0) 104 : (0, 0)
… …
118 $self->height ($WORLD->{tile_h}); 115 $self->height ($WORLD->{tile_h});
119 116
120 $self->name ("'The World' at +$x+$y"); 117 $self->name ("'The World' at +$x+$y");
121 $self->msg ("worldmap dynamically created by map-world extension"); 118 $self->msg ("worldmap dynamically created by map-world extension");
122 $self->outdoor (1); 119 $self->outdoor (1);
123 $self->default_region (undef); 120 $self->default_region (cf::region::find "wilderness");
124 121
125 $self->tile_path (0, sprintf "/world/world_%03d_%03d", $x, $y - 1) if $y > 0; 122 $self->tile_path (0, sprintf "/world/world_%03d_%03d", $x, $y - 1) if $y > 0;
126 $self->tile_path (1, sprintf "/world/world_%03d_%03d", $x + 1, $y) if $x < 999; 123 $self->tile_path (1, sprintf "/world/world_%03d_%03d", $x + 1, $y) if $x < 999;
127 $self->tile_path (2, sprintf "/world/world_%03d_%03d", $x, $y + 1) if $y < 999; 124 $self->tile_path (2, sprintf "/world/world_%03d_%03d", $x, $y + 1) if $y < 999;
128 $self->tile_path (3, sprintf "/world/world_%03d_%03d", $x - 1, $y) if $x > 0; 125 $self->tile_path (3, sprintf "/world/world_%03d_%03d", $x - 1, $y) if $x > 0;
129 126
130 $self->{load_path} = sprintf "%s/%s/world-overlay/world_%03d_%03d.map", cf::datadir, cf::mapdir, $x, $y 127 my $overlay = sprintf "%s/world/world_%03d_%03d.map", $cf::MAPDIR, $x, $y;
131 if $x >= 100 && $x <= 129 && $y >= 100 && $y <= 129; 128
129 $self->{load_path} = $overlay
130 unless Coro::AIO::aio_stat $overlay;
131
132 $self->{need_create_treasure} = 1;
132 133
133 1 134 1
134} 135}
135 136
136sub fill { 137sub fill {
137 my ($self) = @_; 138 my ($self) = @_;
138 139
139 $self->add_underlay ("\x00" x ($WORLD->{tile_w} * $WORLD->{tile_h}), 0, $WORLD->{tile_w}, $WORLD->{arc_plt}); 140 $self->add_underlay ("\x00" x ($WORLD->{tile_w} * $WORLD->{tile_h}), 0, $WORLD->{tile_w}, $WORLD->{arc_plt});#d#
140 $self->default_region (cf::region::find $WORLD->{reg_plt}[0]); 141 $self->default_region (cf::region::find $WORLD->{reg_plt}[0]);
141} 142}
142 143
143sub load { 144sub load {
144 my ($self) = @_; 145 my ($self) = @_;
… …
146 if ($self->{load_path}) { 147 if ($self->{load_path}) {
147 $self->SUPER::load; 148 $self->SUPER::load;
148 } else { 149 } else {
149 $self->alloc; 150 $self->alloc;
150 $self->fill; 151 $self->fill;
151 $self->in_memory (cf::MAP_IN_MEMORY); 152 $self->in_memory (cf::MAP_ACTIVE);
153 $self->activate;
152 } 154 }
153} 155}
154 156
155sub post_load { 157sub post_load {
156 my ($self) = @_; 158 my ($self) = @_;
157 159
160 {
158 my $guard = cf::lock_acquire "ext::world_gridmap"; 161 my $guard = cf::lock_acquire "ext::world_gridmap";
159 162
160 my ($x, $y) = $self->wxwy; 163 my ($x, $y) = $self->wxwy;
161 164
162 if ($x >= 100 && $x <= 129 && $y >= 100 && $y <= 129) { 165 if ($x >= 100 && $x <= 129 && $y >= 100 && $y <= 129) {
163 my $stride = $WORLD->{grid_w} * $WORLD->{tile_w}; 166 my $stride = $WORLD->{grid_w} * $WORLD->{tile_w};
164 my $top = ($y - 100) * $WORLD->{tile_h} * $stride 167 my $top = ($y - 100) * $WORLD->{tile_h} * $stride
165 + ($x - 100) * $WORLD->{tile_w}; 168 + ($x - 100) * $WORLD->{tile_w};
166 169
167 $self->add_underlay ($WORLD->{arc_data}, $top, $stride, $WORLD->{arc_plt}); 170 $self->add_underlay ($WORLD->{arc_data}, $top, $stride, $WORLD->{arc_plt});
168 $self->set_regiondata ($WORLD->{reg_data}, $top, $stride, $WORLD->{reg_plt}); 171 $self->set_regiondata ($WORLD->{reg_data}, $top, $stride, $WORLD->{reg_plt});
169 172
170 } else { 173 } else {
171 $self->fill; 174 $self->fill;
175 }
172 } 176 }
177
178 $self->create_region_treasure
179 if delete $self->{need_create_treasure};
173} 180}
174 181
1751 1821
176 183

Diff Legend

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