From c15c92e507f37a476b29f391564b760c38f538a9 Mon Sep 17 00:00:00 2001 From: Kevin Chabowski Date: Sat, 17 Aug 2013 22:29:42 +0200 Subject: Snow/Ice can now optionally be removed/added. --- mapwidget.go | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 54 insertions(+), 3 deletions(-) (limited to 'mapwidget.go') diff --git a/mapwidget.go b/mapwidget.go index 37a05d0..3592e42 100644 --- a/mapwidget.go +++ b/mapwidget.go @@ -74,7 +74,7 @@ type MapWidget struct { isInit bool - showBiomes bool + showBiomes, fixSnowIce bool offX, offZ int mx1, mx2, my1, my2 int @@ -113,6 +113,10 @@ func (mw *MapWidget) SetShowBiomes(b bool) { mw.redraw <- true } +func (mw *MapWidget) SetFixSnowIce(b bool) { + mw.fixSnowIce = b +} + func (mw *MapWidget) SetTool(t Tool) { mw.tool = t } @@ -489,6 +493,44 @@ func (mw *MapWidget) SetBiomeAt(x, z int, bio mcmap.Biome) { } chunk.SetBiome(bx, bz, bio) + + var newcol *gdk.Color + if mw.fixSnowIce { + for y := chunk.Height(bx, bz); y >= 0; y-- { + if blk := chunk.Block(bx, y, bz); blk.ID != mcmap.BlkAir { + if coldBiome[bio] { + if (blk.ID == mcmap.BlkStationaryWater) || (blk.ID == mcmap.BlkWater) { + blk.ID = mcmap.BlkIce + newcol = blockColors[mcmap.BlkIce] + } else if blockCanSnowIn[blk.ID] { + if yFix := y + 1; yFix < mcmap.ChunkSizeY { + blkFix := chunk.Block(bx, yFix, bz) + blkFix.ID = mcmap.BlkSnow + blkFix.Data = 0x0 + newcol = blockColors[mcmap.BlkSnow] + } + } + } else { + if blk.ID == mcmap.BlkIce { + blk.ID = mcmap.BlkStationaryWater + blk.Data = 0x0 + newcol = blockColors[mcmap.BlkStationaryWater] + } else if blk.ID == mcmap.BlkSnow { + blk.ID = mcmap.BlkAir + for y2 := y - 1; y2 >= 0; y2-- { + if col, ok := blockColors[chunk.Block(bx, y2, bz).ID]; ok { + newcol = col + break + } + } + } + } + + break + } + } + } + chunk.MarkModified() // Update cache @@ -497,12 +539,21 @@ func (mw *MapWidget) SetBiomeAt(x, z int, bio mcmap.Biome) { } // Update tile - if tile, ok := mw.biotiles[pos]; ok { + if biotile, ok := mw.biotiles[pos]; ok { gdk.ThreadsEnter() - drawable := tile.GetDrawable() + + drawable := biotile.GetDrawable() gc := gdk.NewGC(drawable) gc.SetRgbFgColor(bioColors[bio]) drawable.DrawRectangle(gc, true, bx*zoom, bz*zoom, zoom, zoom) + + if newcol != nil { + drawable = mw.maptiles[pos].GetDrawable() + gc = gdk.NewGC(drawable) + gc.SetRgbFgColor(newcol) + drawable.DrawRectangle(gc, true, bx*zoom, bz*zoom, zoom, zoom) + } + gdk.ThreadsLeave() } } -- cgit v1.2.3-54-g00ecf