Final skeletal fixes

This commit is contained in:
SirLynix
2022-08-17 20:03:52 +02:00
committed by Jérôme Leclercq
parent 3efe62ddbe
commit b37af6da31
4 changed files with 17 additions and 25 deletions

View File

@@ -214,6 +214,8 @@ namespace Nz
{
builder.PreTransferBarrier();
OnTransfer(this, renderFrame, builder);
for (std::size_t viewerIndex = m_invalidatedViewerInstances.FindFirst(); viewerIndex != m_invalidatedViewerInstances.npos; viewerIndex = m_invalidatedViewerInstances.FindNext(viewerIndex))
{
ViewerData* viewerData = m_viewerPool.RetrieveFromIndex(viewerIndex);

View File

@@ -50,6 +50,10 @@ namespace Nz
#include <Nazara/Graphics/Resources/Shaders/Modules/Engine/LightData.nzslb.h>
};
const UInt8 r_skeletalDataModule[] = {
#include <Nazara/Graphics/Resources/Shaders/Modules/Engine/SkeletalData.nzslb.h>
};
const UInt8 r_viewerDataModule[] = {
#include <Nazara/Graphics/Resources/Shaders/Modules/Engine/ViewerData.nzslb.h>
};
@@ -233,6 +237,7 @@ namespace Nz
RegisterEmbedShaderModule(r_mathCookTorrancePBRModule);
RegisterEmbedShaderModule(r_phongMaterialShader);
RegisterEmbedShaderModule(r_physicallyBasedMaterialShader);
RegisterEmbedShaderModule(r_skeletalDataModule);
RegisterEmbedShaderModule(r_textureBlitShader);
RegisterEmbedShaderModule(r_viewerDataModule);

View File

@@ -156,7 +156,7 @@ fn billboardMain(input: VertIn) -> VertOut
fn main(input: VertIn) -> VertOut
{
let pos: vec3[f32];
const if (HasSkinning && false)
const if (HasSkinning)
{
pos = vec3[f32](0.0, 0.0, 0.0);