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

Foliage not foilage. Embarrassing.

Browse Source
This commit is contained in:
UnknownShadow200 2017-02-03 09:57:17 +11:00
parent 6fca2f1b3a
commit c3e76fafb8
12 changed files with 81 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MCGalaxy/Blocks/Physics/OtherPhysics.cs
View File

@ -16,7 +16,7 @@
permissions and limitations under the Licenses.
*/
using System;
using MCGalaxy.Generator.Foilage;
using MCGalaxy.Generator.Foliage;
namespace MCGalaxy.Blocks.Physics {

2
MCGalaxy/Commands/building/CmdTree.cs
View File

@ -18,7 +18,7 @@
using System;
using MCGalaxy.Drawing.Brushes;
using MCGalaxy.Drawing.Ops;
using MCGalaxy.Generator.Foilage;
using MCGalaxy.Generator.Foliage;
namespace MCGalaxy.Commands.Building {
public sealed class CmdTree : Command {

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

@ -27,7 +27,7 @@ Ideas, concepts, and code were used from the following two sources:
using System;
using System.Collections.Generic;
using MCGalaxy.Drawing.Brushes;
using MCGalaxy.Generator.Foilage;
using MCGalaxy.Generator.Foliage;
namespace MCGalaxy.Drawing.Ops {
public class TreeDrawOp : DrawOp {

2
MCGalaxy/Generator/Foilage/AshTree.cs → MCGalaxy/Generator/Foliage/AshTree.cs
View File

@ -20,7 +20,7 @@ using System.Collections.Generic;
using MCGalaxy.Drawing.Brushes;
using MCGalaxy.Drawing.Ops;
namespace MCGalaxy.Generator.Foilage {
namespace MCGalaxy.Generator.Foliage {
public sealed class AshTree : Tree {
int branchBaseHeight, branchAmount;

5
MCGalaxy/Generator/Foilage/ForesterTrees.cs → MCGalaxy/Generator/Foliage/ForesterTrees.cs
View File

@ -20,9 +20,10 @@
permissions and limitations under the Licenses.
*/
using System;
using System.Collections.Generic;
namespace MCGalaxy.Generator.Foilage {
namespace MCGalaxy.Generator.Foliage {
public sealed class BambooTree : Tree {
public override int DefaultValue(Random rnd) { return rnd.Next(4, 8); }

2
MCGalaxy/Generator/Foilage/OakTree.cs → MCGalaxy/Generator/Foliage/OakTree.cs
View File

@ -19,7 +19,7 @@ using System;
using System.Collections.Generic;
using MCGalaxy.Drawing.Ops;
namespace MCGalaxy.Generator.Foilage {
namespace MCGalaxy.Generator.Foliage {
public sealed class OakTree : Tree {
int numBranches, maxExtent, maxBranchHeight, trunkHeight;

2
MCGalaxy/Generator/Foilage/StandardTrees.cs → MCGalaxy/Generator/Foliage/StandardTrees.cs
View File

@ -26,7 +26,7 @@ Ideas, concepts, and code were used from the following two sources:
*/
using System;
namespace MCGalaxy.Generator.Foilage {
namespace MCGalaxy.Generator.Foliage {
public sealed class CactusTree : Tree {
public override int DefaultValue(Random rnd) { return rnd.Next(3, 6); }

2
MCGalaxy/Generator/Foilage/Tree.cs → MCGalaxy/Generator/Foliage/Tree.cs
View File

@ -19,7 +19,7 @@ using System;
using System.Collections.Generic;
using MCGalaxy.Drawing.Brushes;
namespace MCGalaxy.Generator.Foilage {
namespace MCGalaxy.Generator.Foliage {
public delegate void TreeOutput(ushort x, ushort y, ushort z, byte block);

2
MCGalaxy/Generator/RealisticMapGen.cs
View File

@ -27,7 +27,7 @@ Ideas, concepts, and code were used from the following two sources:
using System;
using MCGalaxy.Drawing;
using MCGalaxy.Drawing.Ops;
using MCGalaxy.Generator.Foilage;
using MCGalaxy.Generator.Foliage;
namespace MCGalaxy.Generator {
public sealed class RealisticMapGen {

2
MCGalaxy/Levels/LevelOptions.cs
View File

@ -17,7 +17,7 @@
*/
using System;
using System.Collections.Generic;
using MCGalaxy.Generator.Foilage;
using MCGalaxy.Generator.Foliage;
namespace MCGalaxy {

10
MCGalaxy/MCGalaxy_.csproj
View File

@ -496,11 +496,11 @@
<Compile Include="Generator\fCraft\MapGenerator.cs" />
<Compile Include="Generator\fCraft\MapGeneratorArgs.cs" />
<Compile Include="Generator\fCraft\Noise.cs" />
<Compile Include="Generator\Foilage\AshTree.cs" />
<Compile Include="Generator\Foilage\OakTree.cs" />
<Compile Include="Generator\Foilage\ForesterTrees.cs" />
<Compile Include="Generator\Foilage\StandardTrees.cs" />
<Compile Include="Generator\Foilage\Tree.cs" />
<Compile Include="Generator\Foliage\AshTree.cs" />
<Compile Include="Generator\Foliage\OakTree.cs" />
<Compile Include="Generator\Foliage\ForesterTrees.cs" />
<Compile Include="Generator\Foliage\StandardTrees.cs" />
<Compile Include="Generator\Foliage\Tree.cs" />
<Compile Include="Generator\HeightmapGen.cs" />
<Compile Include="Generator\ImprovedNoise.cs" />
<Compile Include="Generator\MapGen.cs" />

99
MCGalaxy/util/Math/Vectors.cs
View File

@ -32,26 +32,16 @@ namespace MCGalaxy {
X = value; Y = value; Z = value;
}
public override bool Equals(object obj) {
return (obj is Vec3U16) && Equals((Vec3U16)obj);
}
public bool Equals(Vec3U16 other) {
return X == other.X & Y == other.Y && Z == other.Z;
}
public override int GetHashCode() {
int hashCode = 0;
hashCode += 1000000007 * X;
hashCode += 1000000009 * Y;
hashCode += 1000000021 * Z;
return hashCode;
public static explicit operator Vec3U16(Vec3S32 a) {
return new Vec3U16((ushort)a.X, (ushort)a.Y, (ushort)a.Z);
}
public int LengthSquared { get { return X * X + Y * Y + Z * Z; } }
public float Length { get { return (float)Math.Sqrt( X * X + Y * Y + Z * Z ); } }
/// <summary> Clamps the given block coordinates to inside the map. </summary>
public static Vec3U16 Clamp(ushort x, ushort y, ushort z, Level lvl) {
Vec3U16 P = new Vec3U16(x, y, z);
@ -78,6 +68,23 @@ namespace MCGalaxy {
return P;
}
public override bool Equals(object obj) {
return (obj is Vec3U16) && Equals((Vec3U16)obj);
}
public bool Equals(Vec3U16 other) {
return X == other.X & Y == other.Y && Z == other.Z;
}
public override int GetHashCode() {
int hashCode = 0;
hashCode += 1000000007 * X;
hashCode += 1000000009 * Y;
hashCode += 1000000021 * Z;
return hashCode;
}
public static bool operator == (Vec3U16 a, Vec3U16 b) {
return a.X == b.X && a.Y == b.Y && a.Z == b.Z;
}
@ -86,9 +93,6 @@ namespace MCGalaxy {
return a.X != b.X || a.Y != b.Y || a.Z != b.Z;
}
public static explicit operator Vec3U16(Vec3S32 a) {
return new Vec3U16((ushort)a.X, (ushort)a.Y, (ushort)a.Z);
}
public override string ToString() {
return X + "," + Y + "," + Z;
@ -110,27 +114,28 @@ namespace MCGalaxy {
X = value; Y = value; Z = value;
}
public override bool Equals(object obj) {
return (obj is Vec3S32) && Equals((Vec3S32)obj);
}
public bool Equals(Vec3S32 other) {
return X == other.X & Y == other.Y && Z == other.Z;
}
public override int GetHashCode() {
int hashCode = 0;
hashCode += 1000000007 * X;
hashCode += 1000000009 * Y;
hashCode += 1000000021 * Z;
return hashCode;
}
public int LengthSquared { get { return X * X + Y * Y + Z * Z; } }
public float Length { get { return (float)Math.Sqrt( X * X + Y * Y + Z * Z ); } }
public float Dot(Vec3S32 b) { return X * b.X + Y * b.Y + Z * b.Z; }
public float Dot(Vec3S32 b) { return X * b.X + Y * b.Y + Z * b.Z; }
public int this[int index] {
get {
if (index == 0) return X;
else if (index == 1) return Y;
else if (index == 2) return Z;
return 0;
}
set {
if (index == 0) { X = value; }
else if (index == 1) { Y = value; }
else if (index == 2) { Z = value; }
}
}
public static Vec3S32 Max(Vec3S32 a, Vec3S32 b) {
return new Vec3S32(Math.Max(a.X, b.X), Math.Max(a.Y, b.Y), Math.Max(a.Z, b.Z));
@ -138,12 +143,13 @@ namespace MCGalaxy {
public static Vec3S32 Min(Vec3S32 a, Vec3S32 b) {
return new Vec3S32(Math.Min(a.X, b.X), Math.Min(a.Y, b.Y), Math.Min(a.Z, b.Z));
}
}
public static implicit operator Vec3S32(Vec3U16 a) {
return new Vec3S32(a.X, a.Y, a.Z);
}
public static Vec3S32 operator + (Vec3S32 a, Vec3S32 b) {
return new Vec3S32(a.X + b.X, a.Y + b.Y, a.Z + b.Z);
}
@ -160,6 +166,23 @@ namespace MCGalaxy {
return new Vec3S32(a.X / b, a.Y / b, a.Z / b);
}
public override bool Equals(object obj) {
return (obj is Vec3S32) && Equals((Vec3S32)obj);
}
public bool Equals(Vec3S32 other) {
return X == other.X & Y == other.Y && Z == other.Z;
}
public override int GetHashCode() {
int hashCode = 0;
hashCode += 1000000007 * X;
hashCode += 1000000009 * Y;
hashCode += 1000000021 * Z;
return hashCode;
}
public static bool operator == (Vec3S32 a, Vec3S32 b) {
return a.X == b.X && a.Y == b.Y && a.Z == b.Z;
}
@ -167,6 +190,7 @@ namespace MCGalaxy {
public static bool operator != (Vec3S32 a, Vec3S32 b) {
return a.X != b.X || a.Y != b.Y || a.Z != b.Z;
}
public override string ToString() {
return X + "," + Y + "," + Z;
@ -184,6 +208,7 @@ namespace MCGalaxy {
X = x; Y = y; Z = z;
}
public float LengthSquared {
get { return X * X + Y * Y + Z * Z; }
}
@ -196,6 +221,7 @@ namespace MCGalaxy {
return a.X * b.X + a.Y * b.Y + a.Z * b.Z;
}
public static Vec3F32 Cross(Vec3F32 a, Vec3F32 b) {
return new Vec3F32(a.Y * b.Z - a.Z * b.Y,
a.Z * b.X - a.X * b.Z,
@ -206,7 +232,8 @@ namespace MCGalaxy {
float invLen = 1 / a.Length;
a.X *= invLen; a.Y *= invLen; a.Z *= invLen;
return a;
}
}
public static Vec3F32 operator * (float a, Vec3F32 b) {
return new Vec3F32(a * b.X, a * b.Y, a * b.Z);
@ -222,7 +249,8 @@ namespace MCGalaxy {
public static implicit operator Vec3F32(Vec3S32 a) {
return new Vec3F32(a.X, a.Y, a.Z);
}
}
public override bool Equals(object obj) {
return (obj is Vec3F32) && Equals((Vec3F32)obj);
@ -248,6 +276,7 @@ namespace MCGalaxy {
return a.X != b.X || a.Y != b.Y || a.Z != b.Z;
}
public override string ToString() {
return X + "," + Y + "," + Z;
}