--- deliantra/server/ext/map-world.ext	2007/01/26 20:59:57	1.7
+++ deliantra/server/ext/map-world.ext	2007/09/11 13:27:54	1.30
@@ -1,24 +1,100 @@
-#! perl # OPTIONAL
+#! perl # optional
 
 # optional plug-in to speed up worldmap rendering by dynamically
-# generating it out of a image
+# generating it out of an image
 # - saves loading time (less data to read)
 # - saves temporary space (only overlay stuff needs to be saved)
+# - might get reused as a generic tiled map
 
-our $WORLD = Storable::retrieve cf::datadir . "/world.pst"
-   or die "unable to load world.pst";
+cf::map->register (qr{^/world/world_(\d\d\d)_(\d\d\d)$}, 100);
 
-$WORLD->{version} == 1
-   or die "world.pst version mismatch, expected version 1, got $WORLD->{version}";
+use Coro::Handle;
+use Coro::AIO;
 
-cf::map->register (qr{^/world/world_(\d\d\d)_(\d\d\d)$}, 100);
+our $WORLD;
 
-sub init {
-   my ($self) = @_;
+sub load_indexed($$) {
+   my ($path, $size) = @_;
 
-   1
+   use bytes;
+
+   0 < aio_load "$path.plt", my $plt
+      or cf::cleanup "$path.plt: $!";
+
+   my %plt;
+   my @plt;
+
+   for (split /\n/, $plt) {
+      my ($name, $rgb) = split /\s+/;
+      if (/^(\S+)\s+(\S+)$/) {
+         my ($name, $rgb) = ($1, $2);
+         $rgb = join "", map chr, map $_ * 17, map hex, split //, $rgb;
+         $plt{$rgb} = chr @plt;
+         push @plt, $name;
+      }
+   }
+
+   my $data = cf::fork_call {
+      open my $fh, "convert \Q$path.png\E -depth 8 rgb:- |"
+         or die "convert: $!";
+      binmode $fh;
+
+      $size * 3 == read $fh, my $data, $size * 3
+         or die "$path.png, expected $size rgb triplets: $!";
+
+      cf::_quantise $data, [map "$_$plt{$_}", keys %plt];
+
+      $data
+   };
+
+   $size == length $data
+      or cf::cleanup "$path.png, expected $size index octets ($!)";
+
+   ($data, \@plt)
 }
 
+sub load_gridmap($) {
+   my ($path) = @_;
+
+   my $map = cf::cache "ext::map-world/gridmap" =>
+      [
+         "$path/gridmap.meta",
+         "$path/gridmap.arch.plt",
+         "$path/gridmap.arch.png",
+         "$path/gridmap.regn.plt",
+         "$path/gridmap.regn.png",
+      ],
+      1 => sub {
+         my ($src) = @_;
+
+         my $map = cf::from_json $src->[0];
+
+         my $size = $map->{tile_w} * $map->{tile_h} * $map->{grid_w} * $map->{grid_h}
+            or cf::cleanup "$path/gridmap.meta: empty gridmap?";
+
+         ($map->{arc_data}, $map->{arc_plt}) = load_indexed "$path/gridmap.arch", $size;
+         ($map->{reg_data}, $map->{reg_plt}) = load_indexed "$path/gridmap.regn", $size;
+
+         Coro::Storable::freeze $map
+      };
+
+   Coro::Storable::thaw $map
+}
+
+sub reload() {
+   $WORLD = load_gridmap "$MAPDIR/world";
+   warn "worldmap gridmap loaded.";
+}
+
+# this is contorted, but likely the correct way to acquire the lock :)
+cf::sync_job {
+   my $guard = cf::lock_acquire "ext::world_gridmap";
+   cf::async_ext {
+      reload;
+      undef $guard;
+   };
+};
+
 sub wxwy {
    $_[0]->path =~ m{/world/world_(\d\d\d)_(\d\d\d)$}
       ? ($1, $2)
@@ -28,34 +104,40 @@
 sub load_header_orig {
    my ($self) = @_;
 
-   $self->width  ($WORLD->{tilew});
-   $self->height ($WORLD->{tileh});
-
    my ($x, $y) = $self->wxwy;
 
-   $self->outdoor (1);
+   my $guard = cf::lock_acquire "ext::world_gridmap";
+
+   $self->width  ($WORLD->{tile_w});
+   $self->height ($WORLD->{tile_h});
 
    $self->name ("'The World' at +$x+$y");
    $self->msg ("worldmap dynamically created by map-world extension");
+   $self->outdoor (1);
+   $self->default_region (cf::region::find "wilderness");
 
-#  $self->tile_path (0, sprintf "/world/world_%03d_%03d", $x, $y - 1) if $y >   0;
-#  $self->tile_path (1, sprintf "/world/world_%03d_%03d", $x + 1, $y) if $x < 999;
-#  $self->tile_path (2, sprintf "/world/world_%03d_%03d", $x, $y + 1) if $y < 999;
-#  $self->tile_path (3, sprintf "/world/world_%03d_%03d", $x - 1, $y) if $x >   0;
-   $self->tile_path (0, sprintf "/world/world_%03d_%03d", $x, $y - 1) if $y > 100;
-   $self->tile_path (1, sprintf "/world/world_%03d_%03d", $x + 1, $y) if $x < 129;
-   $self->tile_path (2, sprintf "/world/world_%03d_%03d", $x, $y + 1) if $y < 129;
-   $self->tile_path (3, sprintf "/world/world_%03d_%03d", $x - 1, $y) if $x > 100;
-
-   #TODO: region
- 
-   $self->{load_path} = sprintf "%s/%s/world-overlay/world_%03d_%03d", cf::datadir, cf::mapdir, $x, $y
-      if $x >= $WORLD->{minx} && $x <= $WORLD->{maxx}
-          && $y >= $WORLD->{miny} && $y <= $WORLD->{maxy};
+   $self->tile_path (0, sprintf "/world/world_%03d_%03d", $x, $y - 1) if $y >   0;
+   $self->tile_path (1, sprintf "/world/world_%03d_%03d", $x + 1, $y) if $x < 999;
+   $self->tile_path (2, sprintf "/world/world_%03d_%03d", $x, $y + 1) if $y < 999;
+   $self->tile_path (3, sprintf "/world/world_%03d_%03d", $x - 1, $y) if $x >   0;
+
+   my $overlay = sprintf "%s/world/world_%03d_%03d.map", $cf::MAPDIR, $x, $y;
+
+   $self->{load_path} = $overlay
+      unless Coro::AIO::aio_stat $overlay;
+
+   $self->{need_create_treasure} = 1;
 
    1
 }
 
+sub fill {
+   my ($self) = @_;
+
+   $self->add_underlay ("\x00" x ($WORLD->{tile_w} * $WORLD->{tile_h}), 0, $WORLD->{tile_w}, $WORLD->{arc_plt});
+   $self->default_region (cf::region::find $WORLD->{reg_plt}[0]);
+}
+
 sub load {
    my ($self) = @_;
 
@@ -63,43 +145,35 @@
       $self->SUPER::load;
    } else {
       $self->alloc;
-
-      for my $X (0 .. $WORLD->{tilew} - 1) {
-         Coro::cede;
-         for my $Y (0 .. $WORLD->{tileh} - 1) {
-            my $ob = cf::object::new "deep_sea";
-            $self->insert ($ob, $X, $Y);
-         }
-      }
-      $self->set_object_flag (cf::FLAG_NO_MAP_SAVE, 1);
-
+      $self->fill;
       $self->in_memory (cf::MAP_IN_MEMORY);
+      $self->activate;
    }
 }
 
 sub post_load {
    my ($self) = @_;
 
-   my ($x, $y) = $self->wxwy;
+   {
+      my $guard = cf::lock_acquire "ext::world_gridmap";
+
+      my ($x, $y) = $self->wxwy;
+
+      if ($x >= 100 && $x <= 129 && $y >= 100 && $y <= 129) {
+         my $stride = $WORLD->{grid_w} * $WORLD->{tile_w};
+         my $top = ($y - 100) * $WORLD->{tile_h} * $stride
+                    + ($x - 100) * $WORLD->{tile_w};
 
-   return
-      unless $x >= $WORLD->{minx} && $x <= $WORLD->{maxx}
-             && $y >= $WORLD->{miny} && $y <= $WORLD->{maxy};
-
-   my $stride = ($WORLD->{maxx} - $WORLD->{minx} + 1) * $WORLD->{tilew};
-   my $top = ($y - $WORLD->{miny}) * $WORLD->{tileh} * $stride
-              + ($x - $WORLD->{minx}) * $WORLD->{tilew};
-
-   for my $Y (0 .. $WORLD->{tileh} - 1) {
-      Coro::cede;
-      my $row = substr $WORLD->{data}, $top + $Y * $stride, $WORLD->{tilew};
-      for my $X (0 .. $WORLD->{tilew} - 1) {
-         next if grep $_->flag (cf::FLAG_IS_FLOOR), $self->at ($X, $Y);
-         my $ob = cf::object::new $WORLD->{arch}[ord substr $row, $X];
-         $ob->flag (cf::FLAG_NO_MAP_SAVE, 1);
-         $self->insert ($ob, $X, $Y, undef, cf::INS_ABOVE_FLOOR_ONLY);
+         $self->add_underlay   ($WORLD->{arc_data}, $top, $stride, $WORLD->{arc_plt});
+         $self->set_regiondata ($WORLD->{reg_data}, $top, $stride, $WORLD->{reg_plt});
+
+      } else {
+         $self->fill;
       }
    }
+
+   $self->create_region_treasure
+      if delete $self->{need_create_treasure};
 }
 
 1