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.5 by root, Sun Jan 21 21:28:27 2007 UTC vs.
Revision 1.35 by root, Tue Sep 23 05:01:41 2008 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 a 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 7# - might get reused as a generic tiled map
8our $WORLD = Storable::retrieve cf::datadir . "/world.pst"
9 or die "unable to load world.pst";
10
11$WORLD->{version} == 1
12 or die "world.pst version mismatch, expected version 1, got $WORLD->{version}";
13 8
14cf::map->register (qr{^/world/world_(\d\d\d)_(\d\d\d)$}, 100); 9cf::map->register (qr{^/world/world_(\d\d\d)_(\d\d\d)$}, 100);
15 10
16sub init { 11use Coro::Handle;
17 my ($self) = @_; 12use Coro::AIO;
18 13
14our $WORLD;
15
16sub load_indexed($$) {
17 my ($path, $size) = @_;
18
19 use bytes;
20
21 0 < aio_load "$path.plt", my $plt
22 or cf::cleanup "$path.plt: $!";
23
24 my %plt;
25 my @plt;
26
27 for (split /\n/, $plt) {
28 my ($name, $rgb) = split /\s+/;
29 if (/^(\S+)\s+(\S+)$/) {
30 my ($name, $rgb) = ($1, $2);
31 $rgb = join "", map chr, map $_ * 17, map hex, split //, $rgb;
32 $plt{$rgb} = chr @plt;
33 push @plt, $name;
34 }
19 1 35 }
36
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;
41
42 $size * 3 == read $fh, my $data, $size * 3
43 or die "$path.png, expected $size rgb triplets: $!";
44
45 cf::_quantise $data, [map "$_$plt{$_}", keys %plt];
46
47 $data
48 };
49
50 $size == length $data
51 or cf::cleanup "$path.png, expected $size index octets ($!)";
52
53 ($data, \@plt)
54}
55
56sub load_gridmap($) {
57 my ($path) = @_;
58
59 my $map = cf::cache "ext::map-world/gridmap" =>
60 [
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) = @_;
69
70 my $map = cf::decode_json $src->[0];
71
72 my $size = $map->{tile_w} * $map->{tile_h} * $map->{grid_w} * $map->{grid_h}
73 or cf::cleanup "$path/gridmap.meta: empty gridmap?";
74
75 ($map->{arc_data}, $map->{arc_plt}) = load_indexed "$path/gridmap.arch", $size;
76 ($map->{reg_data}, $map->{reg_plt}) = load_indexed "$path/gridmap.regn", $size;
77
78 Coro::Storable::freeze $map
79 };
80
81 Coro::Storable::thaw $map
82}
83
84sub reload() {
85 $WORLD = load_gridmap "$MAPDIR/world";
86 warn "worldmap gridmap loaded.";
87}
88
89{
90 my $guard = cf::lock_acquire "ext::world_gridmap";
91
92 cf::post_init {
93 cf::async_ext {
94 $Coro::current->{desc} = "worldmap loader";
95 reload;
96 undef $guard;
97 };
98 };
20} 99}
21 100
22sub wxwy { 101sub wxwy {
23 $_[0]->path =~ m{/world/world_(\d\d\d)_(\d\d\d)$} 102 $_[0]->path =~ m{/world/world_(\d\d\d)_(\d\d\d)$}
24 ? ($1, $2) 103 ? ($1, $2)
… …
26} 105}
27 106
28sub load_header_orig { 107sub load_header_orig {
29 my ($self) = @_; 108 my ($self) = @_;
30 109
31 $self->width ($WORLD->{tilew}); 110 my ($x, $y) = $self->wxwy;
32 $self->height ($WORLD->{tileh});
33 111
34 my ($x, $y) = $self->wxwy; 112 my $guard = cf::lock_acquire "ext::world_gridmap";
113
114 $self->width ($WORLD->{tile_w});
115 $self->height ($WORLD->{tile_h});
116
117 $self->name ("'The World' at +$x+$y");
118 $self->msg ("worldmap dynamically created by map-world extension");
119 $self->outdoor (1);
120 $self->default_region (cf::region::find "wilderness");
35 121
36 $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;
37 $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;
38 $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;
39 $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;
40 126
41 $self->outdoor (1); 127 my $overlay = sprintf "%s/world/world_%03d_%03d.map", $cf::MAPDIR, $x, $y;
42 128
43 $self->msg ("worldmap dynamically created by map-world extension"); 129 $self->{load_path} = $overlay
130 unless Coro::AIO::aio_stat $overlay;
44 131
45 #TODO: region 132 $self->{need_create_treasure} = 1;
46
47 $self->{load_path} = sprintf "%s/%s/world-overlay/world_%03d_%03d", cf::datadir, cf::mapdir, $x, $y
48 if $x >= $WORLD->{minx} && $x <= $WORLD->{maxx}
49 && $y >= $WORLD->{miny} && $y <= $WORLD->{maxy};
50
51 133
52 1 134 1
135}
136
137sub fill {
138 my ($self) = @_;
139
140 $self->add_underlay ("\x00" x ($WORLD->{tile_w} * $WORLD->{tile_h}), 0, $WORLD->{tile_w}, $WORLD->{arc_plt});
141 $self->default_region (cf::region::find $WORLD->{reg_plt}[0]);
53} 142}
54 143
55sub load { 144sub load {
56 my ($self) = @_; 145 my ($self) = @_;
57 146
58 if ($self->{load_path}) { 147 if ($self->{load_path}) {
59 $self->SUPER::load; 148 $self->SUPER::load;
60 } else { 149 } else {
61 $self->alloc; 150 $self->alloc;
62 151 $self->fill;
63 for my $X (0 .. $WORLD->{tilew} - 1) {
64 Coro::cede;
65 for my $Y (0 .. $WORLD->{tileh} - 1) {
66 my $ob = cf::object::new "deep_sea";
67 $self->insert ($ob, $X, $Y);
68 }
69 }
70 $self->set_object_flag (cf::FLAG_NO_MAP_SAVE, 1);
71
72 $self->in_memory (cf::MAP_IN_MEMORY); 152 $self->in_memory (cf::MAP_ACTIVE);
153 $self->activate;
73 } 154 }
74} 155}
75 156
76sub post_load { 157sub post_load {
77 my ($self) = @_; 158 my ($self) = @_;
78 159
79 my ($x, $y) = $self->wxwy; 160 {
161 my $guard = cf::lock_acquire "ext::world_gridmap";
80 162
81 return 163 my ($x, $y) = $self->wxwy;
82 unless $x >= $WORLD->{minx} && $x <= $WORLD->{maxx}
83 && $y >= $WORLD->{miny} && $y <= $WORLD->{maxy};
84 164
85 my $stride = ($WORLD->{maxx} - $WORLD->{minx} + 1) * $WORLD->{tilew}; 165 if ($x >= 100 && $x <= 129 && $y >= 100 && $y <= 129) {
166 my $stride = $WORLD->{grid_w} * $WORLD->{tile_w};
86 my $top = ($y - $WORLD->{miny}) * $WORLD->{tileh} * $stride 167 my $top = ($y - 100) * $WORLD->{tile_h} * $stride
87 + ($x - $WORLD->{minx}) * $WORLD->{tilew}; 168 + ($x - 100) * $WORLD->{tile_w};
88 169
89 for my $Y (0 .. $WORLD->{tileh} - 1) { 170 $self->add_underlay ($WORLD->{arc_data}, $top, $stride, $WORLD->{arc_plt});
90 Coro::cede; 171 $self->set_regiondata ($WORLD->{reg_data}, $top, $stride, $WORLD->{reg_plt});
91 my $row = substr $WORLD->{data}, $top + $Y * $stride, $WORLD->{tilew}; 172
92 for my $X (0 .. $WORLD->{tilew} - 1) { 173 } else {
93 next if grep $_->flag (cf::FLAG_IS_FLOOR), $self->at ($X, $Y); 174 $self->fill;
94 my $ob = cf::object::new $WORLD->{arch}[ord substr $row, $X];
95 $ob->flag (cf::FLAG_NO_MAP_SAVE, 1);
96 $self->insert ($ob, $X, $Y, undef, cf::INS_ABOVE_FLOOR_ONLY);
97 } 175 }
98 } 176 }
177
178 $self->create_region_treasure
179 if delete $self->{need_create_treasure};
99} 180}
100 181
1011 1821
102 183

Diff Legend

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