Skip to content

Commit ce750f0

Browse files
author
tpat
committed
Using glyphgeom with changes only from glyphs branch
1 parent 5886501 commit ce750f0

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

src/Graphics/Glyphs/GlyphGeom.cc

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -823,13 +823,6 @@ void GlyphGeom::generateEllipsoid(const Point& center, Tensor& t, int resolution
823823
SinCosTable tab1(nu, 0, 2 * M_PI);
824824
SinCosTable tab2(nv, 0, end);
825825

826-
Eigen::Matrix3f m;
827-
m << eig_vec1[0], eig_vec2[0], eig_vec3[0],
828-
eig_vec1[1], eig_vec2[1], eig_vec3[1],
829-
eig_vec1[2], eig_vec2[2], eig_vec3[2];
830-
Eigen::Matrix3f mInverse = m.inverse();
831-
Eigen::Matrix3f mInverseTranspose = mInverse.transpose();
832-
833826
// Draw the ellipsoid
834827
for (int v = 0; v<nv - 1; v++)
835828
{
@@ -845,13 +838,13 @@ void GlyphGeom::generateEllipsoid(const Point& center, Tensor& t, int resolution
845838
double nx = tab1.sin(u);
846839
double ny = tab1.cos(u);
847840

848-
Eigen::Vector3f p1(nr1 * nx,
849-
nr1 * ny,
850-
nz1);
841+
double x1 = nr1 * nx;
842+
double y1 = nr1 * ny;
843+
double z1 = nz1;
851844

852-
Eigen::Vector3f p2(nr2 * nx,
853-
nr2 * ny,
854-
nz2);
845+
double x2 = nr2 * nx;
846+
double y2 = nr2 * ny;
847+
double z2 = nz2;
855848

856849
// Rotate and translate points
857850
Vector p1 = Vector(trans * Point(x1, y1, z1));

0 commit comments

Comments
 (0)