Skip to content

USDScene : Load treatAsPoint and treatAsLine for UsdLuxLights #1283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johnhaddon merged 2 commits into from
Jul 18, 2022
Merged

USDScene : Load treatAsPoint and treatAsLine for UsdLuxLights #1283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9afe1de
USDScene : Load `treatAsPoint` and `treatAsLine` for UsdLuxLights
johnhaddon Jul 14, 2022
be83869
USD ShaderAlgo : Ensure lights load with `light` shader type
johnhaddon Jul 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 36 additions & 7 deletions contrib/IECoreUSD/src/IECoreUSD/ShaderAlgo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@
#include "IECore/MessageHandler.h"
#include "IECore/SimpleTypedData.h"

#if PXR_VERSION >= 2111
#include "pxr/usd/usdLux/cylinderLight.h"
#include "pxr/usd/usdLux/sphereLight.h"
#endif

#include "boost/algorithm/string/replace.hpp"
#include "boost/pointer_cast.hpp"

Expand All @@ -53,21 +58,44 @@ namespace

pxr::TfToken g_adapterLabelToken( IECoreScene::ShaderNetworkAlgo::componentConnectionAdapterLabel().string() );

pxr::TfToken shaderId( const pxr::UsdShadeConnectableAPI &connectable )
std::pair<pxr::TfToken, std::string> shaderIdAndType( const pxr::UsdShadeConnectableAPI &connectable )
{
pxr::TfToken result;
pxr::TfToken id;
std::string type;
if( auto shader = pxr::UsdShadeShader( connectable ) )
{
shader.GetShaderId( &result );
shader.GetShaderId( &id );
type = "surface";
}
#if PXR_VERSION >= 2111
else if( auto light = pxr::UsdLuxLightAPI( connectable ) )
{
light.GetShaderIdAttr().Get( &result );
light.GetShaderIdAttr().Get( &id );
type = "light";
}
#endif

return result;
return std::make_pair( id, type );
}

void readAdditionalLightParameters( const pxr::UsdPrim &prim, IECore::CompoundDataMap &parameters )
{
// Just to keep us on our toes, not all light parameters are stored as UsdShade inputs,
// so we have special-case code for loading those here.
#if PXR_VERSION >= 2111
if( auto sphereLight = pxr::UsdLuxSphereLight( prim ) )
{
bool treatAsPoint = false;
sphereLight.GetTreatAsPointAttr().Get( &treatAsPoint );
parameters["treatAsPoint"] = new IECore::BoolData( treatAsPoint );
}
else if( auto cylinderLight = pxr::UsdLuxCylinderLight( prim ) )
{
bool treatAsLine = false;
cylinderLight.GetTreatAsLineAttr().Get( &treatAsLine );
parameters["treatAsLine"] = new IECore::BoolData( treatAsLine );
}
#endif
}

IECoreScene::ShaderNetwork::Parameter readShaderNetworkWalk( const pxr::SdfPath &anchorPath, const pxr::UsdShadeOutput &output, IECoreScene::ShaderNetwork &shaderNetwork );
Expand All @@ -81,9 +109,8 @@ IECore::InternedString readShaderNetworkWalk( const pxr::SdfPath &anchorPath, co
return handle;
}

const pxr::TfToken id = shaderId( usdShader );
auto [id, shaderType] = shaderIdAndType( usdShader );
std::string shaderName = "defaultsurface";
std::string shaderType = "surface";
if( id.size() )
{
std::string name = id.GetString();
Expand Down Expand Up @@ -137,6 +164,8 @@ IECore::InternedString readShaderNetworkWalk( const pxr::SdfPath &anchorPath, co
}
}

readAdditionalLightParameters( usdShader.GetPrim(), parameters );

parametersData = boost::const_pointer_cast< IECore::CompoundData >( IECoreScene::ShaderNetworkAlgo::collapseSplineParameters( parametersData ) );

IECoreScene::ShaderPtr newShader = new IECoreScene::Shader( shaderName, shaderType, parametersData );
Expand Down
4 changes: 4 additions & 0 deletions contrib/IECoreUSD/test/IECoreUSD/USDSceneTest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3022,6 +3022,9 @@ def testLightAttribute( self ) :
self.assertEqual( shader.size(), 1 )
self.assertEqual( shader.getOutput(), "SpotLight23" )

self.assertEqual( shader.getShader( "SpotLight23" ).name, "SphereLight" )
self.assertEqual( shader.getShader( "SpotLight23" ).type, "light" )

self.assertEqual(
shader.getShader( "SpotLight23" ).parameters,
IECore.CompoundData( {
Expand All @@ -3031,6 +3034,7 @@ def testLightAttribute( self ) :
"exposure" : 0.0,
"intensity" : 30000.0,
"radius" : 0.0,
"treatAsPoint" : True,
"shaping:cone:angle" : 66.0,
"shaping:cone:softness" : 1.0
} )
Expand Down