diff --git a/wrap/io_trimesh/export_ply.h b/wrap/io_trimesh/export_ply.h index c1dd5618..ae383c47 100644 --- a/wrap/io_trimesh/export_ply.h +++ b/wrap/io_trimesh/export_ply.h @@ -359,18 +359,18 @@ static int Save(SaveMeshType &m, const char * filename, bool binary, PlyInfo &p { float t[17]; - t[ 0] = (float)-m.shot.Extrinsics.tra[0]; - t[ 1] = (float)-m.shot.Extrinsics.tra[1]; - t[ 2] = (float)-m.shot.Extrinsics.tra[2]; - t[ 3] = (float)m.shot.Extrinsics.rot[0][0]; - t[ 4] = (float)m.shot.Extrinsics.rot[0][1]; - t[ 5] = (float)m.shot.Extrinsics.rot[0][2]; - t[ 6] = (float)m.shot.Extrinsics.rot[1][0]; - t[ 7] = (float)m.shot.Extrinsics.rot[1][1]; - t[ 8] = (float)m.shot.Extrinsics.rot[1][2]; - t[ 9] = (float)m.shot.Extrinsics.rot[2][0]; - t[10] = (float)m.shot.Extrinsics.rot[2][1]; - t[11] = (float)m.shot.Extrinsics.rot[2][2]; + t[ 0] = (float)m.shot.Extrinsics.Tra()[0]; + t[ 1] = (float)m.shot.Extrinsics.Tra()[1]; + t[ 2] = (float)m.shot.Extrinsics.Tra()[2]; + t[ 3] = (float)m.shot.Extrinsics.Rot()[0][0]; + t[ 4] = (float)m.shot.Extrinsics.Rot()[0][1]; + t[ 5] = (float)m.shot.Extrinsics.Rot()[0][2]; + t[ 6] = (float)m.shot.Extrinsics.Rot()[1][0]; + t[ 7] = (float)m.shot.Extrinsics.Rot()[1][1]; + t[ 8] = (float)m.shot.Extrinsics.Rot()[1][2]; + t[ 9] = (float)m.shot.Extrinsics.Rot()[2][0]; + t[10] = (float)m.shot.Extrinsics.Rot()[2][1]; + t[11] = (float)m.shot.Extrinsics.Rot()[2][2]; t[12] = (float)m.shot.Intrinsics.FocalMm; t[13] = (float)m.shot.Intrinsics.PixelSizeMm[0]; t[14] = (float)m.shot.Intrinsics.PixelSizeMm[1]; @@ -389,18 +389,18 @@ static int Save(SaveMeshType &m, const char * filename, bool binary, PlyInfo &p else { fprintf(fpout,"%g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %d %d %g %g %g %g\n" - ,-m.shot.Extrinsics.tra[0] - ,-m.shot.Extrinsics.tra[1] - ,-m.shot.Extrinsics.tra[2] - ,m.shot.Extrinsics.rot[0][0] - ,m.shot.Extrinsics.rot[0][1] - ,m.shot.Extrinsics.rot[0][2] - ,m.shot.Extrinsics.rot[1][0] - ,m.shot.Extrinsics.rot[1][1] - ,m.shot.Extrinsics.rot[1][2] - ,m.shot.Extrinsics.rot[2][0] - ,m.shot.Extrinsics.rot[2][1] - ,m.shot.Extrinsics.rot[2][2] + ,-m.shot.Extrinsics.Tra()[0] + ,-m.shot.Extrinsics.Tra()[1] + ,-m.shot.Extrinsics.Tra()[2] + ,m.shot.Extrinsics.Rot()[0][0] + ,m.shot.Extrinsics.Rot()[0][1] + ,m.shot.Extrinsics.Rot()[0][2] + ,m.shot.Extrinsics.Rot()[1][0] + ,m.shot.Extrinsics.Rot()[1][1] + ,m.shot.Extrinsics.Rot()[1][2] + ,m.shot.Extrinsics.Rot()[2][0] + ,m.shot.Extrinsics.Rot()[2][1] + ,m.shot.Extrinsics.Rot()[2][2] ,m.shot.Intrinsics.FocalMm ,m.shot.Intrinsics.PixelSizeMm[0] ,m.shot.Intrinsics.PixelSizeMm[1] diff --git a/wrap/io_trimesh/import_ply.h b/wrap/io_trimesh/import_ply.h index 33d846c3..0176099c 100644 --- a/wrap/io_trimesh/import_ply.h +++ b/wrap/io_trimesh/import_ply.h @@ -605,22 +605,23 @@ static int Open( OpenMeshType &m, const char * filename, PlyInfo &pi ) // extrinsic m.shot.Extrinsics.SetIdentity(); // view point - m.shot.Extrinsics.tra[0] = -ca.view_px; - m.shot.Extrinsics.tra[1] = -ca.view_py; - m.shot.Extrinsics.tra[2] = -ca.view_pz; + m.shot.Extrinsics.SetTra(Point3( ca.view_px,ca.view_py,ca.view_pz)); - // axis (i.e. rotation). - m.shot.Extrinsics.rot[0][0] = ca.x_axisx; - m.shot.Extrinsics.rot[0][1] = ca.x_axisy; - m.shot.Extrinsics.rot[0][2] = ca.x_axisz; + // axis (i.e. rotation). + Matrix44 rm; + rm[0][0] = ca.x_axisx; + rm[0][1] = ca.x_axisy; + rm[0][2] = ca.x_axisz; - m.shot.Extrinsics.rot[1][0] = ca.y_axisx; - m.shot.Extrinsics.rot[1][1] = ca.y_axisy; - m.shot.Extrinsics.rot[1][2] = ca.y_axisz; + rm[1][0] = ca.y_axisx; + rm[1][1] = ca.y_axisy; + rm[1][2] = ca.y_axisz; - m.shot.Extrinsics.rot[2][0] = ca.z_axisx; - m.shot.Extrinsics.rot[2][1] = ca.z_axisy; - m.shot.Extrinsics.rot[2][2] = ca.z_axisz; + rm[2][0] = ca.z_axisx; + rm[2][1] = ca.z_axisy; + rm[2][2] = ca.z_axisz; + + m.shot.Extrinsics.SetRot(rm); //intrinsic m.shot.Intrinsics.FocalMm = ca.focal;