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

#3947 HoloLens : Add face culling to VdeExportPart

Browse Source
This commit is contained in:
Magne Sjaastad 2019-01-15 11:31:47 +01:00
parent 5222950476
commit 5014c86a3f
3 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationCode/Commands/HoloLensCommands/RicHoloLensExportImpl.cpp
View File

@ -44,8 +44,9 @@
#include "cvfPart.h" #include "cvfPart.h"
#include "cvfRenderState.h" #include "cvfRenderState.h"
#include "cvfRenderStateTextureBindings.h"
#include "cvfRenderState_FF.h" #include "cvfRenderState_FF.h"
#include "cvfRenderStateCullFace.h"
#include "cvfRenderStateTextureBindings.h"
#include "cvfTexture.h" #include "cvfTexture.h"
#include "cvfTexture2D_FF.h" #include "cvfTexture2D_FF.h"
@ -131,6 +132,23 @@ std::vector<VdeExportPart> RicHoloLensExportImpl::partsForExport(const RimGridVi
} }
} }
if (visiblePart->effect())
{
const cvf::RenderStateCullFace* renderStateCullFace = dynamic_cast<const cvf::RenderStateCullFace*>(
visiblePart->effect()->renderStateOfType(cvf::RenderState::CULL_FACE));
if (renderStateCullFace)
{
if (renderStateCullFace->mode() == cvf::RenderStateCullFace::BACK)
{
exportPart.setCullFace(VdeExportPart::CF_BACK);
}
else if (renderStateCullFace->mode() == cvf::RenderStateCullFace::FRONT)
{
exportPart.setCullFace(VdeExportPart::CF_FRONT);
}
}
}
appendTextureImage(exportPart, visiblePart.p()); appendTextureImage(exportPart, visiblePart.p());
exportParts.push_back(exportPart); exportParts.push_back(exportPart);

17
ApplicationCode/Commands/HoloLensCommands/VdeExportPart.cpp
View File

@ -28,6 +28,7 @@ VdeExportPart::VdeExportPart(cvf::Part* part)
, m_color(cvf::Color3f::MAGENTA) , m_color(cvf::Color3f::MAGENTA)
, m_opacity(1.0) , m_opacity(1.0)
, m_winding(COUNTERCLOCKWISE) , m_winding(COUNTERCLOCKWISE)
, m_cullFace(CF_NONE)
, m_role(GEOMETRY) , m_role(GEOMETRY)
{ {
} }
@ -88,6 +89,14 @@ void VdeExportPart::setWinding(Winding winding)
m_winding = winding; m_winding = winding;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void VdeExportPart::setCullFace(CullFace cullFace)
{
m_cullFace = cullFace;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -160,6 +169,14 @@ VdeExportPart::Winding VdeExportPart::winding() const
return m_winding; return m_winding;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
VdeExportPart::CullFace VdeExportPart::cullFace() const
{
return m_cullFace;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

10
ApplicationCode/Commands/HoloLensCommands/VdeExportPart.h
View File

@ -44,6 +44,13 @@ public:
COUNTERCLOCKWISE COUNTERCLOCKWISE
}; };
enum CullFace
{
CF_NONE,
CF_FRONT,
CF_BACK
};
enum Role enum Role
{ {
GEOMETRY, GEOMETRY,
@ -60,6 +67,7 @@ public:
void setColor(const cvf::Color3f& color); void setColor(const cvf::Color3f& color);
void setOpacity(float opacity); void setOpacity(float opacity);
void setWinding(Winding winding); void setWinding(Winding winding);
void setCullFace(CullFace cullFace);
void setRole(Role role); void setRole(Role role);
const cvf::Part* part() const; const cvf::Part* part() const;
@ -71,6 +79,7 @@ public:
cvf::Color3f color() const; cvf::Color3f color() const;
float opacity() const; float opacity() const;
Winding winding() const; Winding winding() const;
CullFace cullFace() const;
Role role() const; Role role() const;
private: private:
@ -83,5 +92,6 @@ private:
cvf::Color3f m_color; cvf::Color3f m_color;
float m_opacity; float m_opacity;
Winding m_winding; Winding m_winding;
CullFace m_cullFace;
Role m_role; Role m_role;
}; };