birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating up through commit 90f050496

Browse Source
This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/PhysX/Code/Editor/ConfigurationWidget.cpp
+4 -6
View File
@@ -47,15 +47,13 @@ namespace PhysX
verticalLayout->addWidget(m_tabs);
connect(m_settings, &SettingsWidget::onValueChanged,
this, [this](const AZ::Data::Asset<Physics::MaterialLibraryAsset>& materialLibrary,
this, [this](const PhysX::PhysXSystemConfiguration& physxSystemConfiguration,
const AzPhysics::SceneConfiguration& defaultSceneConfiguration,
const Debug::DebugDisplayData& debugDisplayData,
const PhysX::WindConfiguration& windConfiguration)
const Debug::DebugDisplayData& debugDisplayData)
{
m_physXSystemConfiguration.m_defaultMaterialLibrary = materialLibrary;
m_physXSystemConfiguration = physxSystemConfiguration;
m_defaultSceneConfiguration = defaultSceneConfiguration;
m_physXDebugConfiguration.m_debugDisplayData = debugDisplayData;
m_physXSystemConfiguration.m_windConfiguration = windConfiguration;
emit onConfigurationChanged(m_physXSystemConfiguration, m_physXDebugConfiguration, m_defaultSceneConfiguration);
});
@@ -90,7 +88,7 @@ namespace PhysX
m_physXSystemConfiguration = physXSystemConfiguration;
m_defaultSceneConfiguration = defaultSceneConfiguration;
m_physXDebugConfiguration = physXDebugConfiguration;
m_settings->SetValue(m_physXSystemConfiguration.m_defaultMaterialLibrary, m_defaultSceneConfiguration, m_physXDebugConfiguration.m_debugDisplayData, m_physXSystemConfiguration.m_windConfiguration);
m_settings->SetValue(m_physXSystemConfiguration, m_defaultSceneConfiguration, m_physXDebugConfiguration.m_debugDisplayData);
m_collisionFiltering->SetConfiguration(m_physXSystemConfiguration.m_collisionConfig.m_collisionLayers, m_physXSystemConfiguration.m_collisionConfig.m_collisionGroups);
m_pvd->SetValue(m_physXDebugConfiguration.m_pvdConfigurationData);
}