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

Diff Legend

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