Merge pull request #4616 from larsbrubaker/master

Show screen rotation axis (testing)
This commit is contained in:
johnlewin 2019-06-18 11:21:03 -07:00 committed by GitHub
commit d62563bdd1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions

View file

@ -84,6 +84,13 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
GLHelper.Render(mesh.mesh, mesh.color);
}
Matrix4X4 xyMatrix = world.GetXYInViewRotation(new Vector3(0, 0, 30));
foreach (var mesh in meshes)
{
GLHelper.Render(mesh.mesh, mesh.color, xyMatrix * Matrix4X4.CreateTranslation(0, 0, 30));
}
}
}
}

@ -1 +1 @@
Subproject commit 9981588309fb21b68f717f95b15a7aa6979c3210
Subproject commit 208284c9787b08ee52b6dfdc616c1e092fe59469

@ -1 +1 @@
Subproject commit 21b6a884daa784ac9df2de0511e4a0ac373adece
Subproject commit 3c6db41c4ef7853af68e62531c828e7bb8ee05d8