lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-15 09:04:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix some Scalarm in ioe57

Browse Source
This commit is contained in:
alemuntoni 2021-06-09 08:54:48 +02:00
parent da5d6ac575
commit 8149cdf7f1
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/meshlabplugins/io_e57/io_e57.cpp
View File

@ -70,9 +70,7 @@ static inline std::string filenameToString(const QString& fileName) noexcept;
*/
static inline QString formatImageFilename(const std::string& fileName) noexcept;
void E57IOPlugin::initPreOpenParameter(const QString &format, RichParameterList & parlst) {}
unsigned int E57IOPlugin::numberMeshesContainedInFile(const QString& format, const QString& fileName) const {
unsigned int E57IOPlugin::numberMeshesContainedInFile(const QString& format, const QString& fileName, const RichParameterList&) const {
unsigned int count;
@ -152,20 +150,20 @@ void E57IOPlugin::open(const QString &formatName, const QString &fileName, const
continue;
}
auto rotationMatrix = vcg::Matrix44f::Identity();
auto translateMatrix = vcg::Matrix44f::Identity();
auto rotationMatrix = Matrix44m::Identity();
auto translateMatrix = Matrix44m::Identity();
auto quaternion = vcg::Quaternion<float>{
static_cast<float>(scanHeader.pose.rotation.w),
static_cast<float>(scanHeader.pose.rotation.x),
static_cast<float>(scanHeader.pose.rotation.y),
static_cast<float>(scanHeader.pose.rotation.z),
auto quaternion = vcg::Quaternion<Scalarm>{
static_cast<Scalarm>(scanHeader.pose.rotation.w),
static_cast<Scalarm>(scanHeader.pose.rotation.x),
static_cast<Scalarm>(scanHeader.pose.rotation.y),
static_cast<Scalarm>(scanHeader.pose.rotation.z),
};
quaternion.ToMatrix(rotationMatrix);
translateMatrix.ElementAt(0, 3) = static_cast<float>(scanHeader.pose.translation.x);
translateMatrix.ElementAt(1, 3) = static_cast<float>(scanHeader.pose.translation.y);
translateMatrix.ElementAt(2, 3) = static_cast<float>(scanHeader.pose.translation.z);
translateMatrix.ElementAt(0, 3) = static_cast<Scalarm>(scanHeader.pose.translation.x);
translateMatrix.ElementAt(1, 3) = static_cast<Scalarm>(scanHeader.pose.translation.y);
translateMatrix.ElementAt(2, 3) = static_cast<Scalarm>(scanHeader.pose.translation.z);
meshModel->cm.Tr = translateMatrix * rotationMatrix;
@ -365,7 +363,7 @@ void E57IOPlugin::loadMesh(MeshModel &m, int &mask, int scanIndex, size_t buffSi
}
// set the mask
m.Enable(mask);
m.enable(mask);
// read the data from the E57 file
try {

3
src/meshlabplugins/io_e57/io_e57.h
View File

@ -136,9 +136,8 @@ public:
std::list<FileFormat> exportFormats() const;
virtual void exportMaskCapability(const QString &format, int &capability, int &defaultBits) const;
virtual void initPreOpenParameter(const QString &/*format*/, RichParameterList & /*par*/);
unsigned int numberMeshesContainedInFile(const QString& format, const QString& fileName) const;
unsigned int numberMeshesContainedInFile(const QString& format, const QString& fileName, const RichParameterList& preParams) const;
void open(const QString &formatName, const QString &fileName, MeshModel &m,
int& mask, const RichParameterList &, vcg::CallBackPos *cb = 0);