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

Removing the requirement of flattening the scene

Browse source
This commit is contained in:
Lars Brubaker 2018-02-05 18:11:28 -08:00
parent 31a3156510
commit 3aebc493a2
2 changed files with 31 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

43
SlicerConfiguration/Slicer.cs
View file

@ -125,10 +125,16 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
var outputOptions = new List<(Matrix4X4 matrix, string fileName)>();
int savedStlCount = 0;
bool first = true;
for (int extruderIndex = 0; extruderIndex < itemsByExtruder.Count; extruderIndex++)
{
if (!first)
{
mergeRules += ",";
}
var itemsThisExtruder = itemsByExtruder[extruderIndex];
mergeRules += UnionAllObjects(itemsThisExtruder, outputOptions, ref savedStlCount) + " ";
mergeRules += AddObjectsForExtruder(itemsThisExtruder, outputOptions, ref savedStlCount);
first = false;
}
var supportObjects = meshItemsOnBuildPlate.Where((item) =>
@ -139,10 +145,11 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
if (supportObjects.Any())
{
// add a flag to the merge rules to let us know there was support
mergeRules += "S ";
mergeRules += UnionAllObjects(supportObjects, outputOptions, ref savedStlCount) + " ";
mergeRules += "," + AddObjectsForExtruder(supportObjects, outputOptions, ref savedStlCount) + "S";
}
mergeRules += " ";
return outputOptions;
}
break;
@ -154,24 +161,34 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
return new List<(Matrix4X4 matrix, string fileName)>();
}
private static string UnionAllObjects(IEnumerable<IObject3D> items,
private static string AddObjectsForExtruder(IEnumerable<IObject3D> items,
List<(Matrix4X4 matrix, string fileName)> outputItems,
ref int savedStlCount)
{
string mergeString = "";
bool first = true;
foreach(var item in items)
if (items.Any())
{
string assetsDirectory = Path.Combine(ApplicationDataStorage.Instance.ApplicationLibraryDataPath, "Assets");
outputItems.Add((item.WorldMatrix(), Path.Combine(assetsDirectory, item.MeshPath)));
mergeString += $"({savedStlCount++}";
if(!first)
bool first = true;
foreach (var item in items)
{
mergeString += ",";
if (!first)
{
mergeString += ",";
}
string assetsDirectory = Path.Combine(ApplicationDataStorage.Instance.ApplicationLibraryDataPath, "Assets");
outputItems.Add((item.WorldMatrix(), Path.Combine(assetsDirectory, item.MeshPath)));
mergeString += $"({savedStlCount++}";
first = false;
}
}
mergeString += new String(')', items.Count());
mergeString += new String(')', items.Count());
}
else
{
var tinyObjectFileName = SaveAndGetFilePathForMesh(PlatonicSolids.CreateCube(.001, .001, .001), CancellationToken.None);
outputItems.Add((Matrix4X4.Identity, tinyObjectFileName));
mergeString += $"({savedStlCount++})";
}
return mergeString;
}