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

Making Dual Contouring have a ref implementation using marching cubes

Browse source
This commit is contained in:
Lars Brubaker 2022-08-16 17:10:17 -07:00
parent 7bf216ccdb
commit 3603831e5e
3 changed files with 70 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

109
MatterControlLib/DesignTools/Primitives/DualContouringObject3D.cs
View file

@ -29,14 +29,28 @@ either expressed or implied, of the FreeBSD Project.
using System.Threading.Tasks;
using DualContouring;
using g3;
using MatterHackers.DataConverters3D;
using MatterHackers.Localizations;
using MatterHackers.PolygonMesh;
using MatterHackers.PolygonMesh.Processors;
using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl.DesignTools
{
public class DualContouringObject3D : Object3D
{
public enum Shapes
{
Box,
[EnumName("2 Boxes")]
Boxes2,
[EnumName("3 Boxes")]
Boxes3,
Sphere,
Cylinder,
}
public DualContouringObject3D()
{
Name = "Dual Contouring".Localize();
@ -50,23 +64,21 @@ namespace MatterHackers.MatterControl.DesignTools
return item;
}
public Shapes Shape { get; set; } = Shapes.Box;
public OuptutTypes Ouptput { get; set; }
public int Iterations { get; set; } = 5;
public double Size { get; set; } = 15;
public double Threshold { get; set; } = .001;
public enum Shapes
{
Box,
Union1,
Union2,
Sphere,
Cylinder,
}
public Shapes Shape { get; set; } = Shapes.Box;
public enum OuptutTypes
{
DualContouring,
MarchingCubes,
}
public override async void OnInvalidate(InvalidateArgs invalidateArgs)
{
@ -92,20 +104,19 @@ namespace MatterHackers.MatterControl.DesignTools
{
using (RebuildLock())
{
#if true
using (new CenterAndHeightMaintainer(this))
{
ISdf shape = null;
switch (Shape)
{
case Shapes.Box:
switch (Shape)
{
case Shapes.Box:
shape = new Box()
{
Size = new Vector3(Size, Size, Size)
};
break;
case Shapes.Union1:
case Shapes.Boxes3:
shape = new Union()
{
Items = new ISdf[]
@ -113,7 +124,7 @@ namespace MatterHackers.MatterControl.DesignTools
new Transform(new Box()
{
Size = new Vector3(Size, Size, Size)
}, Matrix4X4.CreateRotationX(MathHelper.Tau * .2)),
}, Matrix4X4.CreateRotationZ(MathHelper.Tau * .2) * Matrix4X4.CreateRotationX(MathHelper.Tau * .2)),
new Box()
{
Size = new Vector3(Size, Size, Size)
@ -121,12 +132,12 @@ namespace MatterHackers.MatterControl.DesignTools
new Transform(new Box()
{
Size = new Vector3(Size, Size, Size)
}, Matrix4X4.CreateRotationY(MathHelper.Tau * .2)),
}, Matrix4X4.CreateRotationY(MathHelper.Tau * .2) * Matrix4X4.CreateRotationX(MathHelper.Tau * .3)),
}
};
break;
case Shapes.Union2:
case Shapes.Boxes2:
shape = new Union()
{
Items = new ISdf[]
@ -138,26 +149,26 @@ namespace MatterHackers.MatterControl.DesignTools
new Transform(new Box()
{
Size = new Vector3(Size, Size, Size)
}, Matrix4X4.CreateRotationY(MathHelper.Tau * .2)),
}, Matrix4X4.CreateRotationZ(MathHelper.Tau * .2)),
}
};
break;
case Shapes.Sphere:
shape = new Sphere()
break;
case Shapes.Sphere:
shape = new Sphere()
{
Radius = Size
};
break;
case Shapes.Cylinder:
shape = new Cylinder()
{
Radius = Size,
Height = Size
};
break;
}
break;
case Shapes.Cylinder:
shape = new Cylinder()
{
Radius = Size,
Height = Size
};
break;
}
var bounds = shape.Bounds;
bounds.Expand(.1);
@ -165,15 +176,13 @@ namespace MatterHackers.MatterControl.DesignTools
{
Iterations = 7;
}
var root = Octree.BuildOctree(shape.Sdf, bounds.MinXYZ, bounds.Size, Iterations, Threshold);
Mesh = Octree.GenerateMeshFromOctree(root);
#else
var c = new MarchingCubes();
c.Generate();
MeshNormals.QuickCompute(c.Mesh); // generate normals
Mesh = c.Mesh.ToMesh();
#endif
if (Ouptput == OuptutTypes.DualContouring)
{
var root = Octree.BuildOctree(shape.Sdf, bounds.MinXYZ, bounds.Size, Iterations, Threshold);
Mesh = Octree.GenerateMeshFromOctree(root);
}
}
}
@ -184,5 +193,19 @@ namespace MatterHackers.MatterControl.DesignTools
return Task.CompletedTask;
});
}
public class SdfToImplicit : ImplicitFunction3d
{
public ISdf Sdf { get; set; }
public SdfToImplicit(ISdf sdf)
{
Sdf = sdf;
}
public double Value(ref Vector3d pt)
{
return Sdf.Sdf(new Vector3(pt.x, pt.y, pt.z));
}
}
}
}

3
StaticData/Translations/Master.txt
View file

@ -3382,6 +3382,9 @@ Translated:Other
English:Other Speeds
Translated:Other Speeds
English:Ouptput
Translated:Ouptput
English:Outer Diameter
Translated:Outer Diameter

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 3ae73a123c0d97a6ed9692bfcbf0599f4d904e84
Subproject commit 84b6947e49f3fb1cdb5e777ecf7451f8369c91ea