Skip to content

Commit 5dd3d01

Browse files
TheMostDiligentTheMostDiligent
committed
USD Viewer: use HN_VIEW_MODE instead of PBR_Renderer::DebugViewType
1 parent 14e4da5 commit 5dd3d01

File tree

2 files changed

+34
-44
lines changed

2 files changed

+34
-44
lines changed

‎Samples/USDViewer/src/USDViewer.cpp‎

Lines changed: 31 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -879,48 +879,38 @@ void USDViewer::UpdateUI()
879879
UpdateFrameParams = true;
880880

881881
{
882-
std::array<const char*, static_cast<size_t>(PBR_Renderer::DebugViewType::NumDebugViews)> DebugViews;
883-
884-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::None)] = "None";
885-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::Texcoord0)] = "Tex coords 0";
886-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::Texcoord1)] = "Tex coords 1";
887-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::BaseColor)] = "Base Color";
888-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::Transparency)] = "Transparency";
889-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::Occlusion)] = "Occlusion";
890-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::Emissive)] = "Emissive";
891-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::Metallic)] = "Metallic";
892-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::Roughness)] = "Roughness";
893-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::DiffuseColor)] = "Diffuse color";
894-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::SpecularColor)] = "Specular color (R0)";
895-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::Reflectance90)] = "Reflectance90";
896-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::MeshNormal)] = "Mesh normal";
897-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::ShadingNormal)] = "Shading normal";
898-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::MotionVectors)] = "Motion vectors";
899-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::NdotV)] = "n*v";
900-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::PunctualLighting)] = "Punctual Lighting";
901-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::DiffuseIBL)] = "Diffuse IBL";
902-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::WhiteBaseColor)] = "White Base Color";
903-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::SpecularIBL)] = "Specular IBL";
904-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::ClearCoat)] = "Clear Coat";
905-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::ClearCoatFactor)] = "Clear Coat Factor";
906-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::ClearCoatRoughness)] = "Clear Coat Roughness";
907-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::ClearCoatNormal)] = "Clear Coat Normal";
908-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::Sheen)] = "Sheen";
909-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::SheenColor)] = "Sheen Color";
910-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::SheenRoughness)] = "Sheen Roughness";
911-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::AnisotropyStrength)] = "Anisotropy Strength";
912-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::AnisotropyDirection)] = "Anisotropy Direction";
913-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::Iridescence)] = "Iridescence";
914-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::IridescenceFactor)] = "Iridescence Factor";
915-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::IridescenceThickness)] = "Iridescence Thickness";
916-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::Transmission)] = "Transmission";
917-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::Thickness)] = "Volume Thickness";
918-
DebugViews[static_cast<size_t>(PBR_Renderer::DebugViewType::SceneDepth)] = "Scene Depth";
919-
static_assert(static_cast<size_t>(PBR_Renderer::DebugViewType::NumDebugViews) == 35, "Did you add a new debug view mode? You may want to handle it here");
920-
921-
if (ImGui::Combo("Debug view", &m_Stage.DebugViewMode, DebugViews.data(), static_cast<int>(DebugViews.size()), 15))
882+
std::array<const char*, USD::HN_VIEW_MODE_COUNT> ViewModes;
883+
884+
ViewModes[USD::HN_VIEW_MODE_SHADED] = "Shaded";
885+
ViewModes[USD::HN_VIEW_MODE_TEXCOORD0] = "Tex coords 0";
886+
ViewModes[USD::HN_VIEW_MODE_TEXCOORD1] = "Tex coords 1";
887+
ViewModes[USD::HN_VIEW_MODE_BASE_COLOR] = "Base Color";
888+
ViewModes[USD::HN_VIEW_MODE_TRANSPARENCY] = "Transparency";
889+
ViewModes[USD::HN_VIEW_MODE_OCCLUSION] = "Occlusion";
890+
ViewModes[USD::HN_VIEW_MODE_EMISSIVE] = "Emissive";
891+
ViewModes[USD::HN_VIEW_MODE_METALLIC] = "Metallic";
892+
ViewModes[USD::HN_VIEW_MODE_ROUGHNESS] = "Roughness";
893+
ViewModes[USD::HN_VIEW_MODE_DIFFUSE_COLOR] = "Diffuse color";
894+
ViewModes[USD::HN_VIEW_MODE_SPECULAR_COLOR] = "Specular color (R0)";
895+
ViewModes[USD::HN_VIEW_MODE_REFLECTANCE90] = "Reflectance90";
896+
ViewModes[USD::HN_VIEW_MODE_MESH_NORMAL] = "Mesh normal";
897+
ViewModes[USD::HN_VIEW_MODE_SHADING_NORMAL] = "Shading normal";
898+
ViewModes[USD::HN_VIEW_MODE_MOTION_VECTORS] = "Motion vectors";
899+
ViewModes[USD::HN_VIEW_MODE_NDOTV] = "n*v";
900+
ViewModes[USD::HN_VIEW_MODE_PUNCTUAL_LIGHTING] = "Punctual Lighting";
901+
ViewModes[USD::HN_VIEW_MODE_DIFFUSE_IBL] = "Diffuse IBL";
902+
ViewModes[USD::HN_VIEW_MODE_SPECULAR_IBL] = "Specular IBL";
903+
ViewModes[USD::HN_VIEW_MODE_WHITE_BASE_COLOR] = "White Base Color";
904+
ViewModes[USD::HN_VIEW_MODE_CLEARCOAT] = "Clear Coat";
905+
ViewModes[USD::HN_VIEW_MODE_CLEARCOAT_FACTOR] = "Clear Coat Factor";
906+
ViewModes[USD::HN_VIEW_MODE_CLEARCOAT_ROUGHNESS] = "Clear Coat Roughness";
907+
ViewModes[USD::HN_VIEW_MODE_CLEARCOAT_NORMAL] = "Clear Coat Normal";
908+
ViewModes[USD::HN_VIEW_MODE_SCENE_DEPTH] = "Scene Depth";
909+
static_assert(USD::HN_VIEW_MODE_COUNT == 25, "Did you add a new view mode? You may want to handle it here");
910+
911+
if (ImGui::Combo("View Mode", &m_Stage.ViewMode, ViewModes.data(), static_cast<int>(ViewModes.size()), 15))
922912
{
923-
m_Stage.RenderDelegate->SetDebugView(static_cast<PBR_Renderer::DebugViewType>(m_Stage.DebugViewMode));
913+
m_Stage.RenderDelegate->SetViewMode(static_cast<USD::HN_VIEW_MODE>(m_Stage.ViewMode));
924914
}
925915
}
926916

‎Samples/USDViewer/src/USDViewer.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ class USDViewer final : public SampleBase
111111
float MetersPerUnit = 0.01f;
112112
float4x4 RootTransform = float4x4::Identity();
113113

114-
int DebugViewMode = 0;
115-
int GeometryMode = 0;
116-
bool UseShadows = true;
114+
int ViewMode = 0;
115+
int GeometryMode = 0;
116+
bool UseShadows = true;
117117

118118
struct AnimationInfo
119119
{

0 commit comments

Comments
 (0)