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.9 by root, Sat Feb 3 21:41:06 2007 UTC vs.
Revision 1.40 by root, Fri Apr 22 02:03:11 2011 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 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 $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} 28}
68 29
69sub load_gridmap($) { 30{
70 my ($path) = @_; 31 my $guard = cf::lock_acquire "ext::world_gridmap";
71 32
72 0 < aio_load "$path/gridmap.meta", my $map 33 cf::post_init {
73 or cf::cleanup "$path/gridmap.meta: $!\n"; 34 cf::async_ext {
74 35 $Coro::current->{desc} = "worldmap loader";
75 $map = cf::from_json $map; 36 reload;
76 37 undef $guard;
77 my $size = $map->{tile_w} * $map->{tile_h} * $map->{grid_w} * $map->{grid_h} 38 };
78 or cf::cleanup "$path/gridmap.meta: empty gridmap?"; 39 };
79
80 ($map->{arc_data}, $map->{arc_plt}) = load_indexed "$path/gridmap.arch", $size;
81 ($map->{reg_data}, $map->{reg_plt}) = load_indexed "$path/gridmap.regn", $size;
82
83 $map
84} 40}
85
86# this is contorted, but likely the correct way to acquire the lock :)
87cf::sync_job {
88 my $guard = cf::lock_acquire "ext::world_gridmap";
89 cf::async_ext {
90 $WORLD = load_gridmap sprintf "%s/%s/%s", cf::datadir, cf::mapdir, "world";
91 warn "worldmap gridmap loaded.";
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 (undef); 61 $self->default_region (cf::region::find "wilderness");
118 62
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/%s/world-overlay/world_%03d_%03d", cf::datadir, 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;
72
73 $self->{need_create_treasure} = 1;
126 74
127 1 75 1
76}
77
78sub fill {
79 my ($self) = @_;
80
81 $self->add_underlay ("\x00" x ($TILE_W * $TILE_H), 0, $TILE_W, $ARCH->{plt});
82 $self->default_region (cf::region::find $REGN->{plt}[0]);
128} 83}
129 84
130sub load { 85sub load {
131 my ($self) = @_; 86 my ($self) = @_;
132 87
133 if ($self->{load_path}) { 88 if ($self->{load_path}) {
134 $self->SUPER::load; 89 $self->SUPER::load;
135 } else { 90 } else {
136 $self->alloc; 91 $self->alloc;
137 92 $self->fill;
138 for my $X (0 .. $WORLD->{tile_w} - 1) {
139 Coro::cede;
140 for my $Y (0 .. $WORLD->{tile_h} - 1) {
141 my $ob = cf::object::new "deep_sea";
142 $self->insert ($ob, $X, $Y);
143 }
144 }
145 $self->set_object_flag (cf::FLAG_NO_MAP_SAVE, 1);
146 $self->default_region (cf::region::find "ocean");
147
148 $self->in_memory (cf::MAP_IN_MEMORY); 93 $self->in_memory (cf::MAP_ACTIVE);
94 $self->activate;
149 } 95 }
150} 96}
151 97
152sub post_load { 98sub post_load {
153 my ($self) = @_; 99 my ($self) = @_;
154 100
101 {
155 my $guard = cf::lock_acquire "ext::world_gridmap"; 102 my $guard = cf::lock_acquire "ext::world_gridmap";
156 103
157 my ($x, $y) = $self->wxwy; 104 my ($x, $y) = $self->wxwy;
158 105
159 return
160 unless $x >= 100 && $x <= 129 && $y >= 100 && $y <= 129; 106 if ($x >= 100 && $x <= 129 && $y >= 100 && $y <= 129) {
107 my $stride = $GRID_W * $TILE_W;
108 my $top = ($y - 100) * $TILE_H * $stride
109 + ($x - 100) * $TILE_W;
161 110
162 my $stride = $WORLD->{grid_w} * $WORLD->{tile_w}; 111 $self->add_underlay ($ARCH->{tbl}, $top, $stride, $ARCH->{plt});
163 my $top = ($y - 100) * $WORLD->{tile_h} * $stride 112 $self->set_regiondata ($REGN->{tbl}, $top, $stride, $REGN->{plt});
164 + ($x - 100) * $WORLD->{tile_w};
165 113
166 my $reg; 114 } else {
167 115 $self->fill;
168 for my $Y (0 .. $WORLD->{tile_h} - 1) {
169 Coro::cede;
170 my $row = substr $WORLD->{arc_data}, $top + $Y * $stride, $WORLD->{tile_w};
171 $reg .= substr $WORLD->{reg_data}, $top + $Y * $stride, $WORLD->{tile_w};
172 for my $X (0 .. $WORLD->{tile_w} - 1) {
173 next if grep $_->flag (cf::FLAG_IS_FLOOR), $self->at ($X, $Y);
174 my $ob = cf::object::new $WORLD->{arc_plt}[ord substr $row, $X];
175 $ob->flag (cf::FLAG_NO_MAP_SAVE, 1);
176 $self->insert ($ob, $X, $Y, undef, cf::INS_ABOVE_FLOOR_ONLY);
177 } 116 }
178 } 117 }
179 118
180 $self->set_regiondata ($reg, $WORLD->{reg_plt}); 119 $self->create_region_treasure
120 if delete $self->{need_create_treasure};
181} 121}
182 122
1831
184

Diff Legend

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