OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#3345 HoloLens: Account for scaling stored in part's transformation

Browse Source
This commit is contained in:
sigurdp
2018-09-18 16:23:58 +02:00
parent f1f234a04a
commit 5e9f1b743b
3 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/Commands/HoloLensCommands/VdeArrayDataPacket.h
View File

@@ -18,6 +18,7 @@
#pragma once
#include <cstddef>
#include <vector>

30
ApplicationCode/Commands/HoloLensCommands/VdeFileExporter.cpp
View File

@@ -37,6 +37,7 @@
#include "cvfScene.h"
#include "cvfDrawableGeo.h"
#include "cvfPrimitiveSet.h"
#include "cvfTransform.h"
#include "cvfTrace.h"
#include <QString>
@@ -67,14 +68,14 @@ bool VdeFileExporter::exportViewContents(const RimGridView& view)
cvf::Collection<cvf::Part> allPartsColl;
RicHoloLensExportImpl::partsForExport(&view, &allPartsColl);
std::vector<RicHoloLensMesh> meshArr;
std::vector<VdeMesh> meshArr;
for (size_t i = 0; i < allPartsColl.size(); i++)
{
const cvf::Part* part = allPartsColl.at(i);
if (part)
{
RicHoloLensMesh mesh;
VdeMesh mesh;
if (extractMeshFromPart(view, *part, &mesh))
{
meshArr.push_back(mesh);
@@ -102,7 +103,7 @@ bool VdeFileExporter::exportViewContents(const RimGridView& view)
int nextArrayId = 0;
for (size_t i = 0; i < meshArr.size(); i++)
{
const RicHoloLensMesh& mesh = meshArr[i];
const VdeMesh& mesh = meshArr[i];
const size_t primCount = mesh.connArr.size()/3;
cvf::Trace::show("%d: primCount=%d meshSourceObjName='%s'", i, primCount, mesh.meshSourceObjName.toLatin1().constData());
@@ -179,7 +180,7 @@ bool VdeFileExporter::exportViewContents(const RimGridView& view)
for (size_t i = 0; i < meshArr.size(); i++)
{
const RicHoloLensMesh& mesh = meshArr[i];
const VdeMesh& mesh = meshArr[i];
const MeshIds& meshIds = meshIdsArr[i];
QMap<QString, QVariant> meshMeta;
@@ -260,7 +261,7 @@ bool VdeFileExporter::exportViewContents(const RimGridView& view)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool VdeFileExporter::extractMeshFromPart(const RimGridView& view, const cvf::Part& part, RicHoloLensMesh* mesh)
bool VdeFileExporter::extractMeshFromPart(const RimGridView& view, const cvf::Part& part, VdeMesh* mesh)
{
const cvf::DrawableGeo* geo = dynamic_cast<const cvf::DrawableGeo*>(part.drawable());
if (!geo)
@@ -281,7 +282,24 @@ bool VdeFileExporter::extractMeshFromPart(const RimGridView& view, const cvf::Pa
}
mesh->verticesPerPrimitive = 3;
mesh->vertexArr = vertexArr;
if (part.transform())
{
const size_t vertexCount = vertexArr->size();
cvf::ref<cvf::Vec3fArray> transVertexArr = new cvf::Vec3fArray(vertexArr->size());
cvf::Mat4f m = cvf::Mat4f(part.transform()->worldTransform());
for (size_t i = 0; i < vertexCount; i++)
{
transVertexArr->set(i, vertexArr->get(i).getTransformedPoint(m));
}
mesh->vertexArr = transVertexArr.p();
}
else
{
mesh->vertexArr = vertexArr;
}
cvf::UIntArray faceConn;
const size_t faceCount = primSet->faceCount();

6
ApplicationCode/Commands/HoloLensCommands/VdeFileExporter.h
View File

@@ -38,7 +38,7 @@ class Part;
//
//
//==================================================================================================
struct RicHoloLensMesh
struct VdeMesh
{
QString meshSourceObjName;
@@ -46,7 +46,7 @@ struct RicHoloLensMesh
cvf::cref<cvf::Vec3fArray> vertexArr;
std::vector<cvf::uint> connArr;
RicHoloLensMesh()
VdeMesh()
: verticesPerPrimitive(-1)
{}
};
@@ -66,7 +66,7 @@ public:
bool exportViewContents(const RimGridView& view);
private:
static bool extractMeshFromPart(const RimGridView& view, const cvf::Part& part, RicHoloLensMesh* mesh);
static bool extractMeshFromPart(const RimGridView& view, const cvf::Part& part, VdeMesh* mesh);
private:
QString m_absOutputFolder;