diff --git a/OSCADSharp/OSCADSharp.UnitTests/Scripting/VariableTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Scripting/VariableTests.cs index dbb5481..e39cd90 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Scripting/VariableTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Scripting/VariableTests.cs @@ -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); } } } diff --git a/OSCADSharp/OSCADSharp/OSCADObject.AbstractTransforms.cs b/OSCADSharp/OSCADSharp/OSCADObject.AbstractTransforms.cs index aac58fa..513fc70 100644 --- a/OSCADSharp/OSCADSharp/OSCADObject.AbstractTransforms.cs +++ b/OSCADSharp/OSCADSharp/OSCADObject.AbstractTransforms.cs @@ -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) diff --git a/OSCADSharp/OSCADSharp/OSCADObject.BasicTransforms.cs b/OSCADSharp/OSCADSharp/OSCADObject.BasicTransforms.cs index 87bb081..a25553b 100644 --- a/OSCADSharp/OSCADSharp/OSCADObject.BasicTransforms.cs +++ b/OSCADSharp/OSCADSharp/OSCADObject.BasicTransforms.cs @@ -42,7 +42,7 @@ namespace OSCADSharp /// 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)