AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-24 05:03:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tree works properly with /scale, fixes #344

Browse Source
This commit is contained in:
UnknownShadow200 2017-11-05 20:06:00 +11:00
parent 46e611f8ac
commit 141ed08d08
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
MCGalaxy/Drawing/DrawOps/TreeDrawOp.cs
View File

@ -47,23 +47,29 @@ namespace MCGalaxy.Drawing.Ops {
Vec3U16 P = Clamp(marks[0]);
Level lvl = Level;
// Need to make a list of leave coordinates, because otherwise
// drawing tree with /scale won't work properly
List<Vec3U16> leaves = new List<Vec3U16>();
Tree.Generate(P.X, P.Y, P.Z, (xT, yT, zT, bT) =>
{
if (bT == Block.Leaves && !lvl.IsAirAt(xT, yT, zT)) return;
if (bT != Block.Leaves) {
output(Place(xT, yT, zT, (ExtBlock)bT));
} else {
output(Place(xT, yT, zT, brush));
}
});
{
if (bT != Block.Leaves) {
output(Place(xT, yT, zT, (ExtBlock)bT));
} else if (lvl.IsAirAt(xT, yT, zT)) {
leaves.Add(new Vec3U16(xT, yT, zT));
}
});
foreach (Vec3U16 pos in leaves) {
output(Place(pos.X, pos.Y, pos.Z, brush));
}
}
public override void SetMarks(Vec3S32[] marks) {
base.SetMarks(marks);
int value = Size != -1 ? Size : Tree.DefaultSize(random);
Tree.SetData(random, value);
Max.Y += Tree.height;
Min.X -= Tree.size; Min.Z -= Tree.size;
Max.X += Tree.size; Max.Z += Tree.size;