diff --git a/MatterControlLib/MatterControlLib.csproj b/MatterControlLib/MatterControlLib.csproj index e5ac14686..87469627e 100644 --- a/MatterControlLib/MatterControlLib.csproj +++ b/MatterControlLib/MatterControlLib.csproj @@ -86,7 +86,7 @@ - + diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index ded9aeabe..abd613e3e 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit ded9aeabe383f8a06a53c66219b2ce7fb963477f +Subproject commit abd613e3e82c8af0fa60fed9b5a509af573f3924 diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 7e70801c0..c7f95927d 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 7e70801c003906a47ba8e2de31e637c409914ea7 +Subproject commit c7f95927d2ded956426acf5ff891d47d9a962cd7 diff --git a/Tests/MatterControl.Tests/MatterControl/InteractiveSceneTests.cs b/Tests/MatterControl.Tests/MatterControl/InteractiveSceneTests.cs index 15125a3a7..cc267d97e 100644 --- a/Tests/MatterControl.Tests/MatterControl/InteractiveSceneTests.cs +++ b/Tests/MatterControl.Tests/MatterControl/InteractiveSceneTests.cs @@ -48,7 +48,6 @@ namespace MatterControl.Tests.MatterControl [Test, Category("InteractiveScene")] public void CombineTests() { - return; AggContext.StaticData = new FileSystemStaticData(TestContext.CurrentContext.ResolveProjectPath(4, "StaticData")); MatterControlUtilities.OverrideAppDataLocation(TestContext.CurrentContext.ResolveProjectPath(4)); @@ -64,6 +63,9 @@ namespace MatterControl.Tests.MatterControl var cubeA = new CubeObject3D(20, 20, 20); var cubeB = new CubeObject3D(20, 20, 20); var offsetCubeB = new TranslateObject3D(cubeB, 10); + Assert.IsTrue(offsetCubeB.GetAxisAlignedBoundingBox().Equals(new AxisAlignedBoundingBox( + 0, -10, -10, + 20, 10, 10), .001)); var union = new CombineObject3D(); union.Children.Add(cubeA); @@ -71,6 +73,10 @@ namespace MatterControl.Tests.MatterControl root.Children.Add(union); union.Combine(); + Assert.IsTrue(union.GetAxisAlignedBoundingBox().Equals(new AxisAlignedBoundingBox( + -10, -10, -10, + 20, 10, 10), .001)); + union.Flatten(null); Assert.AreEqual(1, root.Children.Count()); @@ -264,7 +270,6 @@ namespace MatterControl.Tests.MatterControl [Test, Category("InteractiveScene")] public void SubtractTests() { - return; // Subtract has correct number of results { var root = new Object3D();