+ Removed some calls in constructors to virtual methods.

+ Fixed a failing test.
This commit is contained in:
Michael L Smith 2016-03-22 18:46:38 -07:00
parent 90fce7428f
commit 6f036c8613
3 changed files with 7 additions and 7 deletions

View File

@ -26,7 +26,7 @@ namespace OSCADSharp.UnitTests.Scripting
var compound = new Variable("x", 5) / 12;
string type = compound.GetType().ToString();
Assert.AreEqual("OSCADSharp.DataBinding.CompoundVariable", type);
Assert.AreEqual("OSCADSharp.DataBinding.Variable+CompoundVariable", type);
}
}
}

View File

@ -35,7 +35,7 @@ namespace OSCADSharp
internal MirroredObject(OSCADObject obj, Variable normal) : base(obj)
{
this.Bind("normal", normal);
this.BindIfVariableNotNull("normal", normal);
}
internal MirroredObject(OSCADObject obj, Vector3 normal, Variable x, Variable y, Variable z) : base(obj)

View File

@ -42,7 +42,7 @@ namespace OSCADSharp
/// <param name="opacity"></param>
internal ColoredObject(OSCADObject obj, Variable colorName, Variable opacity) : base(obj)
{
this.Bind("color", colorName);
this.BindIfVariableNotNull("color", colorName);
this.BindIfVariableNotNull("opacity", opacity);
}
@ -112,7 +112,7 @@ namespace OSCADSharp
internal ResizedObject(OSCADObject obj, Variable size) : base(obj)
{
this.Bind("size", size);
this.BindIfVariableNotNull("size", size);
}
internal ResizedObject(OSCADObject obj, Vector3 size, Variable x, Variable y, Variable z) : base(obj)
@ -211,7 +211,7 @@ namespace OSCADSharp
internal RotatedObject(OSCADObject obj, Variable normal) : base(obj)
{
this.Bind("angle", normal);
this.BindIfVariableNotNull("angle", normal);
}
internal RotatedObject(OSCADObject obj, Vector3 angle, Variable x, Variable y, Variable z) : base(obj)
@ -297,7 +297,7 @@ namespace OSCADSharp
internal ScaledObject(OSCADObject obj, Variable normal) : base(obj)
{
this.Bind("scalefactor", normal);
this.BindIfVariableNotNull("scalefactor", normal);
}
internal ScaledObject(OSCADObject obj, Vector3 scale, Variable x, Variable y, Variable z) : base(obj)
@ -380,7 +380,7 @@ namespace OSCADSharp
internal TranslatedObject(OSCADObject obj, Variable normal) : base(obj)
{
this.Bind("vector", normal);
this.BindIfVariableNotNull("vector", normal);
}
internal TranslatedObject(OSCADObject obj, Vector3 vector, Variable x, Variable y, Variable z) : base(obj)