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.16 by root, Fri Feb 16 19:43:41 2007 UTC vs.
Revision 1.26 by root, Sat Apr 21 16:56:32 2007 UTC

… …
30 $plt{$rgb} = chr @plt; 30 $plt{$rgb} = chr @plt;
31 push @plt, $name; 31 push @plt, $name;
32 } 32 }
33 } 33 }
34 34
35 my $pid = open my $pipe, "-|"; 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;
36 39
37 defined $pid 40 $size * 3 == read $fh, my $data, $size * 3
38 or cf::cleanup "fork: $!"; 41 or die "$path.png, expected $size rgb triplets: $!";
39 42
40 unless ($pid) { 43 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 44
46 binmode $fh; 45 $data
47 $size * 3 == read $fh, my $data, $size * 3 46 };
48 or die "$path.png, expected $size rgb triplets: $!";
49 47
50 $data =~ s{(...)}{ 48 $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 ($!)"; 49 or cf::cleanup "$path.png, expected $size index octets ($!)";
65 50
66 ($data, \@plt) 51 ($data, \@plt)
67} 52}
68 53
69sub load_gridmap($) { 54sub load_gridmap($) {
70 my ($path) = @_; 55 my ($path) = @_;
71 56
72 if (1 || ! -e "/tmp/xxxx.gridmap") { 57 my $map = cf::cache "ext::map-world/gridmap" =>
73 0 < aio_load "$path/gridmap.meta", my $map 58 [
74 or cf::cleanup "$path/gridmap.meta: $!\n"; 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) = @_;
75 67
76 $map = cf::from_json $map; 68 my $map = cf::from_json $src->[0];
77 69
78 my $size = $map->{tile_w} * $map->{tile_h} * $map->{grid_w} * $map->{grid_h} 70 my $size = $map->{tile_w} * $map->{tile_h} * $map->{grid_w} * $map->{grid_h}
79 or cf::cleanup "$path/gridmap.meta: empty gridmap?"; 71 or cf::cleanup "$path/gridmap.meta: empty gridmap?";
80 72
81 ($map->{arc_data}, $map->{arc_plt}) = load_indexed "$path/gridmap.arch", $size; 73 ($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; 74 ($map->{reg_data}, $map->{reg_plt}) = load_indexed "$path/gridmap.regn", $size;
83 75
84 Storable::nstore $map, "/tmp/xxxx.gridmap";#d# 76 Coro::Storable::freeze $map
77 };
85 78
86 $map 79 Coro::Storable::thaw $map
87 } else { 80}
88 Storable::retrieve "/tmp/xxxx.gridmap"; 81
89 } 82sub reload() {
83 $WORLD = load_gridmap "$MAPDIR/world";
84 warn "worldmap gridmap loaded.";
90} 85}
91 86
92# this is contorted, but likely the correct way to acquire the lock :) 87# this is contorted, but likely the correct way to acquire the lock :)
93cf::sync_job { 88cf::sync_job {
94 my $guard = cf::lock_acquire "ext::world_gridmap"; 89 my $guard = cf::lock_acquire "ext::world_gridmap";
95 cf::async_ext { 90 cf::async_ext {
96 $WORLD = load_gridmap sprintf "%s/%s/%s", cf::datadir, cf::mapdir, "world"; 91 reload;
97 warn "worldmap gridmap loaded.";
98 undef $guard; 92 undef $guard;
99 } 93 };
100}; 94};
101 95
102cf::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);
103 97
104sub wxwy { 98sub wxwy {
… …
118 $self->height ($WORLD->{tile_h}); 112 $self->height ($WORLD->{tile_h});
119 113
120 $self->name ("'The World' at +$x+$y"); 114 $self->name ("'The World' at +$x+$y");
121 $self->msg ("worldmap dynamically created by map-world extension"); 115 $self->msg ("worldmap dynamically created by map-world extension");
122 $self->outdoor (1); 116 $self->outdoor (1);
123 $self->default_region (undef); 117 $self->default_region (cf::region::find "wilderness");
124 118
125 $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;
126 $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;
127 $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;
128 $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;
129 123
130 $self->{load_path} = sprintf "%s/%s/world-overlay/world_%03d_%03d.map", cf::datadir, cf::mapdir, $x, $y 124 $self->{load_path} = sprintf "%s/world-overlay/world_%03d_%03d.map", $cf::MAPDIR, $x, $y
131 if $x >= 100 && $x <= 129 && $y >= 100 && $y <= 129; 125 if $x >= 100 && $x <= 129 && $y >= 100 && $y <= 129;
126
127 $self->{need_create_treasure} = 1;
132 128
133 1 129 1
134} 130}
135 131
136sub fill { 132sub fill {
… …
147 $self->SUPER::load; 143 $self->SUPER::load;
148 } else { 144 } else {
149 $self->alloc; 145 $self->alloc;
150 $self->fill; 146 $self->fill;
151 $self->in_memory (cf::MAP_IN_MEMORY); 147 $self->in_memory (cf::MAP_IN_MEMORY);
148 $self->activate;
152 } 149 }
153} 150}
154 151
155sub post_load { 152sub post_load {
156 my ($self) = @_; 153 my ($self) = @_;
157 154
155 {
158 my $guard = cf::lock_acquire "ext::world_gridmap"; 156 my $guard = cf::lock_acquire "ext::world_gridmap";
159 157
160 my ($x, $y) = $self->wxwy; 158 my ($x, $y) = $self->wxwy;
161 159
162 if ($x >= 100 && $x <= 129 && $y >= 100 && $y <= 129) { 160 if ($x >= 100 && $x <= 129 && $y >= 100 && $y <= 129) {
163 my $stride = $WORLD->{grid_w} * $WORLD->{tile_w}; 161 my $stride = $WORLD->{grid_w} * $WORLD->{tile_w};
164 my $top = ($y - 100) * $WORLD->{tile_h} * $stride 162 my $top = ($y - 100) * $WORLD->{tile_h} * $stride
165 + ($x - 100) * $WORLD->{tile_w}; 163 + ($x - 100) * $WORLD->{tile_w};
166 164
167 $self->add_underlay ($WORLD->{arc_data}, $top, $stride, $WORLD->{arc_plt}); 165 $self->add_underlay ($WORLD->{arc_data}, $top, $stride, $WORLD->{arc_plt});
168 $self->set_regiondata ($WORLD->{reg_data}, $top, $stride, $WORLD->{reg_plt}); 166 $self->set_regiondata ($WORLD->{reg_data}, $top, $stride, $WORLD->{reg_plt});
169 167
170 } else { 168 } else {
171 $self->fill; 169 $self->fill;
170 }
172 } 171 }
172
173 $self->create_region_treasure
174 if delete $self->{need_create_treasure};
173} 175}
174 176
1751 1771
176 178

Diff Legend

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