mtcontrib/mtsatellite
1
0
Fork 0
mirror of https://bitbucket.org/s_l_teichmann/mtsatellite synced 2025-07-12 04:50:32 +02:00
Code Issues Projects Releases Wiki Activity

Finished logic to supress pyramid regeneration in mtwebmapper. Untested.

Browse Source
This commit is contained in:
Sascha L. Teichmann
2016-05-08 15:38:50 +02:00
parent 4bed73d9e3
commit 0900bd16ce
3 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
common/basetilecreator.go
View File

@ -5,6 +5,7 @@
package common
import (
"image"
"image/color"
"io/ioutil"
"log"
@ -49,6 +50,8 @@ var tileDepths = [...][2]int16{
var BackgroundColor = color.RGBA{R: 0xff, G: 0xff, B: 0xff, A: 0xff}
type BaseTileUpdateFunc func(x, y int, img image.Image) bool
type BaseTileCreator struct {
client *RedisClient
colors *Colors
@ -57,7 +60,7 @@ type BaseTileCreator struct {
yMin int16
yMax int16
baseDir string
update bool
update BaseTileUpdateFunc
emptyImage []byte
bg color.RGBA
}
@ -69,7 +72,7 @@ func NewBaseTileCreator(
yMin, yMax int16,
transparent bool,
baseDir string,
update bool) *BaseTileCreator {
update BaseTileUpdateFunc) *BaseTileCreator {
renderer := NewRenderer(tileWidth, tileHeight, transparent)
yMin, yMax = Order16(yMin, yMax)
return &BaseTileCreator{
@ -88,7 +91,7 @@ func (btc *BaseTileCreator) Close() error {
return btc.client.Close()
}
func (btc *BaseTileCreator) CreateTile(x, z int16, i, j int) error {
func (btc *BaseTileCreator) CreateTile(x, z int16, i, j int) (bool, error) {
btc.renderer.Reset()
btc.renderer.SetPos(x, z)
btc.yOrder.Reset()
@ -128,7 +131,7 @@ func (btc *BaseTileCreator) CreateTile(x, z int16, i, j int) error {
c2.Z = area.Z2 + z
query := Cuboid{P1: c1, P2: c2}
if err := btc.client.QueryCuboid(query, drawBlock); err != nil {
return err
return false, err
}
if err := btc.yOrder.Drain(btc.colors); err != nil {
log.Printf("WARN: rendering block failed: %s\n", err)
@ -140,28 +143,34 @@ func (btc *BaseTileCreator) CreateTile(x, z int16, i, j int) error {
path := filepath.Join(btc.baseDir, strconv.Itoa(i), strconv.Itoa(j)+".png")
// Empty images are likely to be produced during seeding.
if !btc.update && btc.renderer.IsEmpty() {
if btc.update == nil && btc.renderer.IsEmpty() {
// To avoid redundant encoding cache the resulting empty image.
if btc.emptyImage == nil {
var err error
m := BackgroundImage((tileWidth-2)*16, (tileHeight-2)*16, btc.bg)
if btc.emptyImage, err = EncodeToMem(m); err != nil {
return err
return false, err
}
}
//log.Printf("Writing empty (%d, %d) to file %s\n", x, z, path)
return ioutil.WriteFile(path, btc.emptyImage, 0666)
return true, ioutil.WriteFile(path, btc.emptyImage, 0666)
}
image := btc.renderer.CreateShadedImage(
16, 16, (tileWidth-2)*16, (tileHeight-2)*16,
btc.colors, btc.bg)
log.Printf("Writing (%d, %d) to file %s\n", x, z, path)
if !btc.update {
return SaveAsPNG(path, image)
if btc.update == nil {
log.Printf("Writing (%d, %d) to file %s.\n", x, z, path)
return true, SaveAsPNG(path, image)
}
return SaveAsPNGAtomic(path, image)
if btc.update(i, j, image) {
log.Printf("Writing (%d, %d) to file %s.\n", x, z, path)
return true, SaveAsPNGAtomic(path, image)
}
log.Printf("File %s does not change.\n", path)
return false, nil
}