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.6 by root, Wed Jan 24 03:13:21 2007 UTC vs.
Revision 1.12 by root, Mon Feb 12 19:57:34 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 $pid = open my $pipe, "-|";
36
37 defined $pid
38 or cf::cleanup "fork: $!";
39
40 unless ($pid) {
41 eval {
42 open my $fh, "convert \Q$path.png\E -depth 8 rgb:- |"
43 or die "convert: $!";
44 binmode $fh;
45
46 binmode $fh;
47 $size * 3 == read $fh, my $data, $size * 3
48 or die "$path.png, expected $size rgb triplets: $!";
49
50 $data =~ s{(...)}{
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 ($!)";
65
66 ($data, \@plt)
67}
68
69sub load_gridmap($) {
70 my ($path) = @_;
71
72 if (! -e "/tmp/xxxx.gridmap") {
73 0 < aio_load "$path/gridmap.meta", my $map
74 or cf::cleanup "$path/gridmap.meta: $!\n";
75
76 $map = cf::from_json $map;
77
78 my $size = $map->{tile_w} * $map->{tile_h} * $map->{grid_w} * $map->{grid_h}
79 or cf::cleanup "$path/gridmap.meta: empty gridmap?";
80
81 ($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;
83
84 Storable::nstore $map, "/tmp/xxxx.gridmap";#d#
85
86 $map
87 } else {
88 Storable::retrieve "/tmp/xxxx.gridmap";
89 }
90}
91
92# this is contorted, but likely the correct way to acquire the lock :)
93cf::sync_job {
94 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};
13 101
14cf::map->register (qr{^/world/world_(\d\d\d)_(\d\d\d)$}, 100); 102cf::map->register (qr{^/world/world_(\d\d\d)_(\d\d\d)$}, 100);
15
16sub init {
17 my ($self) = @_;
18
19 1
20}
21 103
22sub wxwy { 104sub wxwy {
23 $_[0]->path =~ m{/world/world_(\d\d\d)_(\d\d\d)$} 105 $_[0]->path =~ m{/world/world_(\d\d\d)_(\d\d\d)$}
24 ? ($1, $2) 106 ? ($1, $2)
25 : (0, 0) 107 : (0, 0)
26} 108}
27 109
28sub load_header_orig { 110sub load_header_orig {
29 my ($self) = @_; 111 my ($self) = @_;
30 112
31 $self->width ($WORLD->{tilew}); 113 my ($x, $y) = $self->wxwy;
32 $self->height ($WORLD->{tileh});
33 114
34 my ($x, $y) = $self->wxwy; 115 my $guard = cf::lock_acquire "ext::world_gridmap";
116
117 $self->width ($WORLD->{tile_w});
118 $self->height ($WORLD->{tile_h});
119
120 $self->name ("'The World' at +$x+$y");
121 $self->msg ("worldmap dynamically created by map-world extension");
122 $self->outdoor (1);
123 $self->default_region (undef);
35 124
36 $self->tile_path (0, sprintf "/world/world_%03d_%03d", $x, $y - 1) if $y > 0; 125 $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; 126 $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; 127 $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; 128 $self->tile_path (3, sprintf "/world/world_%03d_%03d", $x - 1, $y) if $x > 0;
40 129
41 $self->outdoor (1);
42
43 $self->name ("'The World' at +$x+$y");
44 $self->msg ("worldmap dynamically created by map-world extension");
45
46 #TODO: region
47
48 $self->{load_path} = sprintf "%s/%s/world-overlay/world_%03d_%03d", cf::datadir, cf::mapdir, $x, $y 130 $self->{load_path} = sprintf "%s/%s/world-overlay/world_%03d_%03d", cf::datadir, cf::mapdir, $x, $y
49 if $x >= $WORLD->{minx} && $x <= $WORLD->{maxx} 131 if $x >= 100 && $x <= 129 && $y >= 100 && $y <= 129;
50 && $y >= $WORLD->{miny} && $y <= $WORLD->{maxy};
51
52 132
53 1 133 1
54} 134}
55 135
56sub load { 136sub load {
… …
59 if ($self->{load_path}) { 139 if ($self->{load_path}) {
60 $self->SUPER::load; 140 $self->SUPER::load;
61 } else { 141 } else {
62 $self->alloc; 142 $self->alloc;
63 143
64 for my $X (0 .. $WORLD->{tilew} - 1) { 144 for my $X (0 .. $WORLD->{tile_w} - 1) {
65 Coro::cede; 145 Coro::cede;
66 for my $Y (0 .. $WORLD->{tileh} - 1) { 146 for my $Y (0 .. $WORLD->{tile_h} - 1) {
67 my $ob = cf::object::new "deep_sea"; 147 my $ob = cf::object::new "deep_sea";
148 $ob->flag (cf::FLAG_NO_MAP_SAVE, 1);
68 $self->insert ($ob, $X, $Y); 149 $self->insert ($ob, $X, $Y);
69 } 150 }
70 } 151 }
71 $self->set_object_flag (cf::FLAG_NO_MAP_SAVE, 1); 152 $self->set_object_flag (cf::FLAG_NO_MAP_SAVE, 1);
153 $self->default_region (cf::region::find "panthalassia");
72 154
73 $self->in_memory (cf::MAP_IN_MEMORY); 155 $self->in_memory (cf::MAP_IN_MEMORY);
74 } 156 }
75} 157}
76 158
77sub post_load { 159sub post_load {
78 my ($self) = @_; 160 my ($self) = @_;
79 161
162 my $guard = cf::lock_acquire "ext::world_gridmap";
163
80 my ($x, $y) = $self->wxwy; 164 my ($x, $y) = $self->wxwy;
81 165
82 return 166 return
83 unless $x >= $WORLD->{minx} && $x <= $WORLD->{maxx} 167 unless $x >= 100 && $x <= 129 && $y >= 100 && $y <= 129;
84 && $y >= $WORLD->{miny} && $y <= $WORLD->{maxy};
85 168
86 my $stride = ($WORLD->{maxx} - $WORLD->{minx} + 1) * $WORLD->{tilew}; 169 my $stride = $WORLD->{grid_w} * $WORLD->{tile_w};
87 my $top = ($y - $WORLD->{miny}) * $WORLD->{tileh} * $stride 170 my $top = ($y - 100) * $WORLD->{tile_h} * $stride
88 + ($x - $WORLD->{minx}) * $WORLD->{tilew}; 171 + ($x - 100) * $WORLD->{tile_w};
89 172
173 my $reg;
174
90 for my $Y (0 .. $WORLD->{tileh} - 1) { 175 for my $Y (0 .. $WORLD->{tile_h} - 1) {
91 Coro::cede; 176 Coro::cede;
92 my $row = substr $WORLD->{data}, $top + $Y * $stride, $WORLD->{tilew}; 177 my $row = substr $WORLD->{arc_data}, $top + $Y * $stride, $WORLD->{tile_w};
178 $reg .= substr $WORLD->{reg_data}, $top + $Y * $stride, $WORLD->{tile_w};
93 for my $X (0 .. $WORLD->{tilew} - 1) { 179 for my $X (0 .. $WORLD->{tile_w} - 1) {
94 next if grep $_->flag (cf::FLAG_IS_FLOOR), $self->at ($X, $Y); 180 next if grep $_->flag (cf::FLAG_IS_FLOOR), $self->at ($X, $Y);
95 my $ob = cf::object::new $WORLD->{arch}[ord substr $row, $X]; 181 my $ob = cf::object::new $WORLD->{arc_plt}[ord substr $row, $X];
96 $ob->flag (cf::FLAG_NO_MAP_SAVE, 1); 182 $ob->flag (cf::FLAG_NO_MAP_SAVE, 1);
97 $self->insert ($ob, $X, $Y, undef, cf::INS_ABOVE_FLOOR_ONLY); 183 $self->insert ($ob, $X, $Y, undef, cf::INS_ABOVE_FLOOR_ONLY);
98 } 184 }
99 } 185 }
186
187 $self->set_regiondata ($reg, $WORLD->{reg_plt});
100} 188}
101 189
1021 1901
103 191

Diff Legend

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