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.21 by root, Tue Apr 17 20:41:15 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 $size * 3 == read $fh, my $data, $size * 3 45 $data
47 or die "$path.png, expected $size rgb triplets: $!"; 46 };
48 47
49 cf::_quantise $data, [map "$_$plt{$_}", keys %plt]; 48 $size == length $data
50
51 binmode STDOUT;
52 syswrite STDOUT, $data;
53 };
54 warn $@ if $@;
55 cf::_exit;
56 }
57
58 $pipe = Coro::Handle::unblock $pipe;
59 binmode $pipe;
60 $size == read $pipe, my $data, $size
61 or cf::cleanup "$path.png, expected $size index octets ($!)"; 49 or cf::cleanup "$path.png, expected $size index octets ($!)";
62 50
63 ($data, \@plt) 51 ($data, \@plt)
64} 52}
65 53
66sub load_gridmap($) { 54sub load_gridmap($) {
67 my ($path) = @_; 55 my ($path) = @_;
68 56
69# if (! -e "/tmp/xxxx.gridmap") { 57 my $map = cf::cache "ext::map-world/gridmap" =>
70 0 < aio_load "$path/gridmap.meta", my $map 58 [
71 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) = @_;
72 67
73 $map = cf::from_json $map; 68 my $map = cf::from_json $src->[0];
74 69
75 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}
76 or cf::cleanup "$path/gridmap.meta: empty gridmap?"; 71 or cf::cleanup "$path/gridmap.meta: empty gridmap?";
77 72
78 ($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;
79 ($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;
80 75
81# Storable::nstore $map, "/tmp/xxxx.gridmap" if 0;#d# 76 Coro::Storable::freeze $map
77 };
82 78
83 $map 79 Coro::Storable::thaw $map
84# } else { 80}
85# Storable::retrieve "/tmp/xxxx.gridmap"; 81
86# } 82sub reload() {
83 $WORLD = load_gridmap "$MAPDIR/world";
84 warn "worldmap gridmap loaded.";
87} 85}
88 86
89# 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 :)
90cf::sync_job { 88cf::sync_job {
91 my $guard = cf::lock_acquire "ext::world_gridmap"; 89 my $guard = cf::lock_acquire "ext::world_gridmap";
92 cf::async_ext { 90 cf::async_ext {
93 $WORLD = load_gridmap sprintf "%s/%s/%s", cf::datadir, cf::mapdir, "world"; 91 reload;
94 warn "worldmap gridmap loaded.";
95 undef $guard; 92 undef $guard;
96 } 93 };
97}; 94};
98 95
99cf::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);
100 97
101sub wxwy { 98sub wxwy {
… …
122 $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;
123 $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;
124 $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;
125 $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;
126 123
127 $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
128 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;
129 128
130 1 129 1
131} 130}
132 131
133sub fill { 132sub fill {
… …
144 $self->SUPER::load; 143 $self->SUPER::load;
145 } else { 144 } else {
146 $self->alloc; 145 $self->alloc;
147 $self->fill; 146 $self->fill;
148 $self->in_memory (cf::MAP_IN_MEMORY); 147 $self->in_memory (cf::MAP_IN_MEMORY);
148 $self->activate;
149 } 149 }
150} 150}
151 151
152sub post_load { 152sub post_load {
153 my ($self) = @_; 153 my ($self) = @_;
154 154
155 {
155 my $guard = cf::lock_acquire "ext::world_gridmap"; 156 my $guard = cf::lock_acquire "ext::world_gridmap";
156 157
157 my ($x, $y) = $self->wxwy; 158 my ($x, $y) = $self->wxwy;
158 159
159 if ($x >= 100 && $x <= 129 && $y >= 100 && $y <= 129) { 160 if ($x >= 100 && $x <= 129 && $y >= 100 && $y <= 129) {
160 my $stride = $WORLD->{grid_w} * $WORLD->{tile_w}; 161 my $stride = $WORLD->{grid_w} * $WORLD->{tile_w};
161 my $top = ($y - 100) * $WORLD->{tile_h} * $stride 162 my $top = ($y - 100) * $WORLD->{tile_h} * $stride
162 + ($x - 100) * $WORLD->{tile_w}; 163 + ($x - 100) * $WORLD->{tile_w};
163 164
164 $self->add_underlay ($WORLD->{arc_data}, $top, $stride, $WORLD->{arc_plt}); 165 $self->add_underlay ($WORLD->{arc_data}, $top, $stride, $WORLD->{arc_plt});
165 $self->set_regiondata ($WORLD->{reg_data}, $top, $stride, $WORLD->{reg_plt}); 166 $self->set_regiondata ($WORLD->{reg_data}, $top, $stride, $WORLD->{reg_plt});
166 167
167 } else { 168 } else {
168 $self->fill; 169 $self->fill;
170 }
169 } 171 }
172
173 $self->create_region_treasure
174 if delete $self->{need_create_treasure};
170} 175}
171 176
1721 1771
173 178

Diff Legend

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