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.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 if (1 || ! -e "/tmp/xxxx.gridmap") { 33 cf::post_init {
73 0 < aio_load "$path/gridmap.meta", my $map 34 cf::async_ext {
74 or cf::cleanup "$path/gridmap.meta: $!\n"; 35 $Coro::current->{desc} = "worldmap loader";
75 36 reload;
76 $map = cf::from_json $map; 37 undef $guard;
77 38 };
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 } 39 };
90} 40}
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};
101
102cf::map->register (qr{^/world/world_(\d\d\d)_(\d\d\d)$}, 100);
103 41
104sub wxwy { 42sub wxwy {
105 $_[0]->path =~ m{/world/world_(\d\d\d)_(\d\d\d)$} 43 $_[0]->path =~ m{/world/world_(\d\d\d)_(\d\d\d)$}
106 ? ($1, $2) 44 ? ($1, $2)
107 : (0, 0) 45 : (0, 0)
… …
112 50
113 my ($x, $y) = $self->wxwy; 51 my ($x, $y) = $self->wxwy;
114 52
115 my $guard = cf::lock_acquire "ext::world_gridmap"; 53 my $guard = cf::lock_acquire "ext::world_gridmap";
116 54
117 $self->width ($WORLD->{tile_w}); 55 $self->width ($TILE_W);
118 $self->height ($WORLD->{tile_h}); 56 $self->height ($TILE_H);
119 57
120 $self->name ("'The World' at +$x+$y"); 58 $self->name ("'The World' at +$x+$y");
121 $self->msg ("worldmap dynamically created by map-world extension"); 59 $self->msg ("worldmap dynamically created by map-world extension");
122 $self->outdoor (1); 60 $self->outdoor (1);
123 $self->default_region (undef); 61 $self->default_region (cf::region::find "wilderness");
124 62
125 $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;
126 $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;
127 $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;
128 $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;
129 67
130 $self->{load_path} = sprintf "%s/%s/world-overlay/world_%03d_%03d.map", cf::datadir, cf::mapdir, $x, $y 68 my $overlay = sprintf "%s/world/world_%03d_%03d.map", $cf::MAPDIR, $x, $y;
131 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;
132 74
133 1 75 1
134} 76}
135 77
136sub fill { 78sub fill {
137 my ($self) = @_; 79 my ($self) = @_;
138 80
139 $self->add_underlay ("\x00" x ($WORLD->{tile_w} * $WORLD->{tile_h}), 0, $WORLD->{tile_w}, $WORLD->{arc_plt}); 81 $self->add_underlay ("\x00" x ($TILE_W * $TILE_H), 0, $TILE_W, $ARCH->{plt});
140 $self->default_region (cf::region::find $WORLD->{reg_plt}[0]); 82 $self->default_region (cf::region::find $REGN->{plt}[0]);
141} 83}
142 84
143sub load { 85sub load {
144 my ($self) = @_; 86 my ($self) = @_;
145 87
146 if ($self->{load_path}) { 88 if ($self->{load_path}) {
147 $self->SUPER::load; 89 $self->SUPER::load;
148 } else { 90 } else {
149 $self->alloc; 91 $self->alloc;
150 $self->fill; 92 $self->fill;
151 $self->in_memory (cf::MAP_IN_MEMORY); 93 $self->in_memory (cf::MAP_ACTIVE);
94 $self->activate;
152 } 95 }
153} 96}
154 97
155sub post_load { 98sub post_load {
156 my ($self) = @_; 99 my ($self) = @_;
157 100
101 {
158 my $guard = cf::lock_acquire "ext::world_gridmap"; 102 my $guard = cf::lock_acquire "ext::world_gridmap";
159 103
160 my ($x, $y) = $self->wxwy; 104 my ($x, $y) = $self->wxwy;
161 105
162 if ($x >= 100 && $x <= 129 && $y >= 100 && $y <= 129) { 106 if ($x >= 100 && $x <= 129 && $y >= 100 && $y <= 129) {
163 my $stride = $WORLD->{grid_w} * $WORLD->{tile_w}; 107 my $stride = $GRID_W * $TILE_W;
164 my $top = ($y - 100) * $WORLD->{tile_h} * $stride 108 my $top = ($y - 100) * $TILE_H * $stride
165 + ($x - 100) * $WORLD->{tile_w}; 109 + ($x - 100) * $TILE_W;
166 110
167 $self->add_underlay ($WORLD->{arc_data}, $top, $stride, $WORLD->{arc_plt}); 111 $self->add_underlay ($ARCH->{tbl}, $top, $stride, $ARCH->{plt});
168 $self->set_regiondata ($WORLD->{reg_data}, $top, $stride, $WORLD->{reg_plt}); 112 $self->set_regiondata ($REGN->{tbl}, $top, $stride, $REGN->{plt});
169 113
170 } else { 114 } else {
171 $self->fill; 115 $self->fill;
116 }
172 } 117 }
118
119 $self->create_region_treasure
120 if delete $self->{need_create_treasure};
173} 121}
174 122
1751
176

Diff Legend

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