nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved array and combine objects to new source pattern

Browse source 
reverted align object to only align children
have new combine 2 object to preserve old files
This commit is contained in:
Lars Brubaker 2019-01-25 16:46:23 -08:00
parent 57b94fd7a4
commit 564e5e7bf1
11 changed files with 253 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Tests/MatterControl.Tests/MatterControl/InteractiveSceneTests.cs
View file

@ -67,7 +67,7 @@ namespace MatterControl.Tests.MatterControl
0, -10, -10,
20, 10, 10), .001));
var union = new CombineObject3D();
var union = new CombineObject3D_2();
union.Children.Add(cubeA);
union.Children.Add(offsetCubeB);
root.Children.Add(union);
@ -92,7 +92,7 @@ namespace MatterControl.Tests.MatterControl
var cubeA = new CubeObject3D(20, 20, 20);
var cubeB = new CubeObject3D(20, 20, 20);
var union = new CombineObject3D();
var union = new CombineObject3D_2();
union.Children.Add(cubeA);
union.Children.Add(cubeB);
root.Children.Add(union);
@ -122,7 +122,7 @@ namespace MatterControl.Tests.MatterControl
var cubeB = new CubeObject3D(20, 20, 20);
var offsetCubeB = new TranslateObject3D(cubeB, 10);
var combine = new CombineObject3D();
var combine = new CombineObject3D_2();
combine.Children.Add(cubeA);
combine.Children.Add(offsetCubeB);
root.Children.Add(combine);
@ -161,7 +161,7 @@ namespace MatterControl.Tests.MatterControl
Name = "cubeB"
};
var combine = new CombineObject3D();
var combine = new CombineObject3D_2();
combine.Children.Add(cubeA);
combine.Children.Add(cubeB);
root.Children.Add(combine);
@ -194,7 +194,7 @@ namespace MatterControl.Tests.MatterControl
var cubeB = new CubeObject3D(20, 20, 20);
var offsetCubeB = new TranslateObject3D(cubeB, 10);
var combine = new CombineObject3D();
var combine = new CombineObject3D_2();
combine.Children.Add(cubeA);
combine.Children.Add(offsetCubeB);
root.Children.Add(combine);
@ -247,7 +247,7 @@ namespace MatterControl.Tests.MatterControl
group.Children.Add(cubeA);
group.Children.Add(offsetCubeB);
var union = new CombineObject3D();
var union = new CombineObject3D_2();
union.Children.Add(group);
root.Children.Add(union);