Skip to content

Silicon studio fixes #44

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Silicon studio fixes #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f55d8a
Using m_StrandAlbedoName instead of m_BaseAlbedoName to load the stra…
BenjaminSanterre Oct 30, 2020
190e68a
Removing wrong comment as EI_ALL is used in many layouts
BenjaminSanterre Oct 30, 2020
9ef29b4
Adding missing const (skinningMatrices missing const may lead to unde…
BenjaminSanterre Oct 30, 2020
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
2 changes: 1 addition & 1 deletion src/EngineInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ struct EI_RenderTargetSet; // Render set

enum EI_ShaderStage
{
EI_UNINITIALIZED = 0, // we will always specify shader stage. "all" is never used.
EI_UNINITIALIZED = 0,
EI_VS,
EI_PS,
EI_CS,
Expand Down
2 changes: 1 addition & 1 deletion src/TressFX/TressFXBoneSkinning.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ Vector3 TressFXBoneSkinning::SkinPosition( int i )
// compute a bone skinning transform
TressFXBoneSkinningData skinning = boneSkinningData[global_id];

std::vector<XMMATRIX>& skinningMatrices = m_pScene->GetWorldSpaceSkeletonMats(m_skinNumber);
const std::vector<XMMATRIX>& skinningMatrices = m_pScene->GetWorldSpaceSkeletonMats(m_skinNumber);
// Interpolate world space bone matrices using weights.
XMMATRIX bone_matrix = skinningMatrices[(int)skinning.boneIndex[0]] * skinning.weight[0];
float weight_sum = skinning.weight[0];
Expand Down
4 changes: 2 additions & 2 deletions src/TressFX/TressFXHairObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ void TressFXHairObject::UploadRenderingGPUResources(EI_CommandContext& commandC

}

void TressFXHairObject::PopulateDrawStrandsBindSet(EI_Device* pDevice, TressFXRenderingSettings* pRenderSettings/*=nullptr*/)
void TressFXHairObject::PopulateDrawStrandsBindSet(EI_Device* pDevice, const TressFXRenderingSettings* pRenderSettings/*=nullptr*/)
{
if (pRenderSettings)
{
Expand All @@ -348,7 +348,7 @@ void TressFXHairObject::PopulateDrawStrandsBindSet(EI_Device* pDevice, TressFXRe
}
if (pRenderSettings->m_StrandAlbedoName != "<none>")
{
m_StrandAlbedo = GetDevice()->CreateResourceFromFile(pRenderSettings->m_BaseAlbedoName.c_str(), true);
m_StrandAlbedo = GetDevice()->CreateResourceFromFile(pRenderSettings->m_StrandAlbedoName.c_str(), true);
}
}
EI_BindSetDescription bindSetDesc =
Expand Down
2 changes: 1 addition & 1 deletion src/TressFX/TressFXHairObject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ class TressFXHairObject : private TressFXNonCopyable
void UpdatePerObjectRenderParams(EI_CommandContext& commandContext);
void IncreaseSimulationFrame() { m_SimCB[m_SimulationFrame%2]->g_ResetPositions = 0.0f; m_SimulationFrame++; }

void PopulateDrawStrandsBindSet(EI_Device* pDevice, TressFXRenderingSettings* pRenderSettings=nullptr);
void PopulateDrawStrandsBindSet(EI_Device* pDevice, const TressFXRenderingSettings* pRenderSettings=nullptr);
private:
// Turn raw data into GPU resources for rendering.
void CreateRenderingGPUResources(EI_Device* pDevice,
Expand Down