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

New work on curve object

Browse source
This commit is contained in:
LarsBrubaker 2018-12-12 07:47:47 -08:00
parent 87c6ca7ff4
commit 38c8d47df3
4 changed files with 41 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

82
MatterControlLib/DesignTools/Operations/CurveObject3D.cs
View file

@ -28,6 +28,7 @@ either expressed or implied, of the FreeBSD Project.
*/
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using System.Diagnostics;
@ -103,63 +104,52 @@ namespace MatterHackers.MatterControl.DesignTools
rotationCenter = new Vector2(aabb.minXYZ.X + (aabb.maxXYZ.X - aabb.minXYZ.X) * (StartPercent / 100), aabb.maxXYZ.Y + radius);
foreach (var object3Ds in meshWrapperEnumerator)
{
var originalMatrix = object3Ds.original.WorldMatrix(this);
var matrix = object3Ds.original.WorldMatrix(this);
var curvedMesh = object3Ds.meshCopy.Mesh;
var originalMesh = object3Ds.original.Mesh;
// split long edges so it will be curved
if (false)
{
int sidesPerRotation = 30;
double numRotations = aabb.XSize / circumference;
double numberOfCuts = numRotations * sidesPerRotation;
var maxXLength = aabb.XSize / numberOfCuts;
// chop any segment that is too short in x
for (int i = curvedMesh.MeshEdges.Count - 1; i >= 0; i--)
{
var edgeToSplit = curvedMesh.MeshEdges[i];
var start = edgeToSplit.VertexOnEnd[0].Position;
var end = edgeToSplit.VertexOnEnd[1].Position;
var edgeXLength = Math.Abs(end.X - start.X);
int numberOfDivides = (int)(edgeXLength / maxXLength);
if (numberOfDivides > 1)
{
for (int j = 1; j < numberOfDivides - 1; j++)
{
IVertex newVertex;
MeshEdge newMeshEdge;
curvedMesh.SplitMeshEdge(edgeToSplit, out newVertex, out newMeshEdge);
var otherIndex = newMeshEdge.GetVertexEndIndex(newVertex);
var ratio = (numberOfDivides - j) / (double)numberOfDivides;
newVertex.Position = start + (end - start) * ratio;
edgeToSplit = newMeshEdge;
start = edgeToSplit.VertexOnEnd[0].Position;
end = edgeToSplit.VertexOnEnd[1].Position;
foreach (var face in edgeToSplit.FacesSharingMeshEdge())
{
Face newFace;
curvedMesh.SplitFace(face,
edgeToSplit.VertexOnEnd[0],
edgeToSplit.VertexOnEnd[1],
out newMeshEdge,
out newFace);
}
}
}
// convert the mesh into vertex and face arrays
double[] v;
int[] f;
curvedMesh.ToVerticesAndFaces(out v, out f);
MeshHelper.Transform(v, matrix);
// make lists so we can add to them
var vL = new List<double>(v);
var fL = new List<int>(f);
var facesToRemove = new List<int>();
// check the edge of every face
for (int i = 0; i < fL.Count; i += 3)
{
// if the edge is > maxXLength
// add a new vertex at the split
// add two new faces
// mark this face for removal
}
// convert the lists back into the mesh
}
for (int i = 0; i < originalMesh.Vertices.Count; i++)
if (!BendCcw)
{
var matrix = originalMatrix;
if (!BendCcw)
{
// rotate around so it will bend correctly
matrix *= Matrix4X4.CreateTranslation(0, -aabb.maxXYZ.Y, 0);
matrix *= Matrix4X4.CreateRotationX(MathHelper.Tau / 2);
matrix *= Matrix4X4.CreateTranslation(0, aabb.maxXYZ.Y - aabb.YSize, 0);
}
var worldPosition = Vector3.Transform(originalMesh.Vertices[i].Position, matrix);
// rotate around so it will bend correctly
matrix *= Matrix4X4.CreateTranslation(0, -aabb.maxXYZ.Y, 0);
matrix *= Matrix4X4.CreateRotationX(MathHelper.Tau / 2);
matrix *= Matrix4X4.CreateTranslation(0, aabb.maxXYZ.Y - aabb.YSize, 0);
}
var matrixInv = matrix.Inverted;
for (int i = 0; i < curvedMesh.Vertices.Count; i++)
{
var worldPosition = Vector3.Transform(curvedMesh.Vertices[i].Position, (Matrix4X4)matrix);
var angleToRotate = ((worldPosition.X - rotationCenter.X) / circumference) * MathHelper.Tau - MathHelper.Tau / 4;
var distanceFromCenter = rotationCenter.Y - worldPosition.Y;
@ -167,11 +157,11 @@ namespace MatterHackers.MatterControl.DesignTools
var rotatePosition = new Vector3(Math.Cos(angleToRotate), Math.Sin(angleToRotate), 0) * distanceFromCenter;
rotatePosition.Z = worldPosition.Z;
var worldWithBend = rotatePosition + new Vector3(rotationCenter.X, radius + aabb.maxXYZ.Y, 0);
curvedMesh.Vertices[i].Position = Vector3.Transform(worldWithBend, matrix.Inverted);
curvedMesh.Vertices[i].Position = Vector3.Transform(worldWithBend, matrixInv);
}
// the vertices need to be resorted as they have moved relative to each other
curvedMesh.Vertices.Sort();
//curvedMesh.Vertices.Sort();
curvedMesh.MarkAsChanged();
curvedMesh.CalculateNormals();

57
MatterControlLib/PartPreviewWindow/View3D/Actions/SubtractObject3D.cs
View file

@ -70,10 +70,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
{
double[] va;
int[] fa;
meshToVerticesAndFaces(inMeshA, matrixA, out va, out fa);
inMeshA.ToVerticesAndFaces(matrixA, out va, out fa);
double[] vb;
int[] fb;
meshToVerticesAndFaces(inMeshB, matrixB, out vb, out fb);
inMeshB.ToVerticesAndFaces(matrixB, out vb, out fb);
int vcCount;
int fcCount;
@ -88,24 +88,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
var fcArray = new int[fcCount];
Marshal.Copy(pFc, fcArray, 0, fcCount);
Mesh model = new Mesh();
for (int vertexIndex = 0; vertexIndex < vcCount; vertexIndex++)
{
model.CreateVertex(vcArray[vertexIndex + 0],
vcArray[vertexIndex + 1],
vcArray[vertexIndex + 2], CreateOption.CreateNew, SortOption.WillSortLater);
vertexIndex += 2;
}
for (int faceIndex = 0; faceIndex < fcCount; faceIndex++)
{
model.CreateFace(fcArray[faceIndex + 0],
fcArray[faceIndex + 1],
fcArray[faceIndex + 2], CreateOption.CreateNew);
faceIndex += 2;
}
return model;
return new Mesh(vcArray, fcArray);
}
finally
{
@ -168,40 +151,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
return null;
}
private static void meshToVerticesAndFaces(Mesh inMesh, Matrix4X4 matrix, out double[] va, out int[] fa)
{
va = new double[inMesh.Vertices.Count * 3];
int i = 0;
var positionIndex = new Dictionary<(double, double, double), int>();
foreach (var vertex in inMesh.Vertices)
{
var key = (vertex.Position.X, vertex.Position.Y, vertex.Position.Z);
if (!positionIndex.ContainsKey(key))
{
positionIndex.Add(key, i);
var position = Vector3.Transform(vertex.Position, matrix);
va[(i * 3) + 0] = position.X;
va[(i * 3) + 1] = position.Y;
va[(i * 3) + 2] = position.Z;
i++;
}
}
var lfa = new List<int>(inMesh.Faces.Count * 3);
i = 0;
foreach (var face in inMesh.Faces)
{
foreach (var vertex in face.VerticesAsTriangles())
{
lfa.Add(positionIndex[(vertex.v0.Position.X, vertex.v0.Position.Y, vertex.v0.Position.Z)]);
lfa.Add(positionIndex[(vertex.v1.Position.X, vertex.v1.Position.Y, vertex.v1.Position.Z)]);
lfa.Add(positionIndex[(vertex.v2.Position.X, vertex.v2.Position.Y, vertex.v2.Position.Z)]);
}
}
fa = lfa.ToArray();
}
[DllImport("609_Boolean_bin.dll", CallingConvention = CallingConvention.Cdecl)]
public extern static void DoBooleanOpperation(
double[] va, int vaCount, int[] fa, int faCount,

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit f89d966b2faa5dd74bfc7945339f9f55946d56d8
Subproject commit f0da9f4009234e0d4d6ae9a68affe010623c5f5a

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit cd62838711fa562b37ed2cf1d0deb30863b798be
Subproject commit e7ca6318576abe6742e0206e6b027564e5483410