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

Combine simple brushes code into one files.

Browse Source
This commit is contained in:
UnknownShadow200 2016-08-04 12:35:09 +10:00
parent 3c3e16c1e3
commit a3ee120e61
5 changed files with 37 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Drawing/Brushes/ReplaceBrush.cs → Drawing/Brushes/ReplaceBrushes.cs
View File

37
Drawing/Brushes/CheckeredBrush.cs → Drawing/Brushes/SimpleBrushes.cs
View File

@ -16,11 +16,44 @@
permissions and limitations under the Licenses.
*/
using System;
using System.Collections.Generic;
using MCGalaxy.Commands.Building;
using MCGalaxy.Drawing.Ops;
namespace MCGalaxy.Drawing.Brushes {
namespace MCGalaxy.Drawing.Brushes {
public sealed class SolidBrush : Brush {
readonly byte block, extBlock;
public SolidBrush(byte type, byte extType) {
this.block = type;
this.extBlock = extType;
}
public override string Name { get { return "Normal"; } }
public override byte NextBlock(DrawOp op) { return block; }
public override byte NextExtBlock(DrawOp op) { return extBlock; }
}
public sealed class StripedBrush : Brush {
readonly byte block1, extBlock1, block2, extBlock2;
public StripedBrush(byte block1, byte extBlock1, byte block2, byte extBlock2) {
this.block1 = block1; this.extBlock1 = extBlock1;
this.block2 = block2; this.extBlock2 = extBlock2;
}
public override string Name { get { return "Striped"; } }
public override byte NextBlock(DrawOp op) {
return ((op.Coords.X + op.Coords.Y + op.Coords.Z) & 3) <= 1 ? block1 : block2;
}
public override byte NextExtBlock(DrawOp op) {
return ((op.Coords.X + op.Coords.Y + op.Coords.Z) & 3) <= 1 ? extBlock1 : extBlock2;
}
}
public sealed class CheckeredBrush : Brush {
readonly byte block1, extBlock1, block2, extBlock2;

37
Drawing/Brushes/SolidBrush.cs
View File

@ -1,37 +0,0 @@
/*
Copyright 2015 MCGalaxy
Dual-licensed under the Educational Community License, Version 2.0 and
the GNU General Public License, Version 3 (the "Licenses"); you may
not use this file except in compliance with the Licenses. You may
obtain a copy of the Licenses at
http://www.opensource.org/licenses/ecl2.php
http://www.gnu.org/licenses/gpl-3.0.html
Unless required by applicable law or agreed to in writing,
software distributed under the Licenses are distributed on an "AS IS"
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
or implied. See the Licenses for the specific language governing
permissions and limitations under the Licenses.
*/
using System;
using MCGalaxy.Commands.Building;
using MCGalaxy.Drawing.Ops;
namespace MCGalaxy.Drawing.Brushes {
public sealed class SolidBrush : Brush {
readonly byte block, extBlock;
public SolidBrush(byte type, byte extType) {
this.block = type;
this.extBlock = extType;
}
public override string Name { get { return "Normal"; } }
public override byte NextBlock(DrawOp op) { return block; }
public override byte NextExtBlock(DrawOp op) { return extBlock; }
}
}

42
Drawing/Brushes/StripedBrush.cs
View File

@ -1,42 +0,0 @@
/*
Copyright 2015 MCGalaxy
Dual-licensed under the Educational Community License, Version 2.0 and
the GNU General Public License, Version 3 (the "Licenses"); you may
not use this file except in compliance with the Licenses. You may
obtain a copy of the Licenses at
http://www.opensource.org/licenses/ecl2.php
http://www.gnu.org/licenses/gpl-3.0.html
Unless required by applicable law or agreed to in writing,
software distributed under the Licenses are distributed on an "AS IS"
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
or implied. See the Licenses for the specific language governing
permissions and limitations under the Licenses.
*/
using System;
using System.Collections.Generic;
using MCGalaxy.Commands.Building;
using MCGalaxy.Drawing.Ops;
namespace MCGalaxy.Drawing.Brushes {
public sealed class StripedBrush : Brush {
readonly byte block1, extBlock1, block2, extBlock2;
public StripedBrush(byte block1, byte extBlock1, byte block2, byte extBlock2) {
this.block1 = block1; this.extBlock1 = extBlock1;
this.block2 = block2; this.extBlock2 = extBlock2;
}
public override string Name { get { return "Striped"; } }
public override byte NextBlock(DrawOp op) {
return ((op.Coords.X + op.Coords.Y + op.Coords.Z) & 3) <= 1 ? block1 : block2;
}
public override byte NextExtBlock(DrawOp op) {
return ((op.Coords.X + op.Coords.Y + op.Coords.Z) & 3) <= 1 ? extBlock1 : extBlock2;
}
}
}

6
MCGalaxy_.csproj
View File

@ -414,14 +414,12 @@
<Compile Include="Database\SQLite\SQLiteBulkTransaction.cs" />
<Compile Include="Database\SQLite\SQLiteParameterisedQuery.cs" />
<Compile Include="Drawing\Brushes\Brush.cs" />
<Compile Include="Drawing\Brushes\CheckeredBrush.cs" />
<Compile Include="Drawing\Brushes\CloudyBrush.cs" />
<Compile Include="Drawing\Brushes\PasteBrush.cs" />
<Compile Include="Drawing\Brushes\RainbowBrush.cs" />
<Compile Include="Drawing\Brushes\RandomBrush.cs" />
<Compile Include="Drawing\Brushes\ReplaceBrush.cs" />
<Compile Include="Drawing\Brushes\SolidBrush.cs" />
<Compile Include="Drawing\Brushes\StripedBrush.cs" />
<Compile Include="Drawing\Brushes\ReplaceBrushes.cs" />
<Compile Include="Drawing\Brushes\SimpleBrushes.cs" />
<Compile Include="Drawing\BrushFactories\BrushFactory.cs" />
<Compile Include="Drawing\BrushFactories\CloudyBrush.cs" />
<Compile Include="Drawing\BrushFactories\FrequencyBrushes.cs" />