nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

many updates

Browse Source
This commit is contained in:
turanszkij
2018-09-05 17:13:36 +01:00
parent 31aaebd4d7
commit ad5fefa373
8 changed files with 760 additions and 739 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/CameraWindow.cpp
+12 -6
View File
@@ -50,8 +50,10 @@ CameraWindow::CameraWindow(wiGUI* gui) :GUI(gui)
farPlaneSlider->SetPos(XMFLOAT2(x, y += inc));
farPlaneSlider->SetValue(wiRenderer::getCamera()->zFarP);
farPlaneSlider->OnSlide([&](wiEventArgs args) {
wiRenderer::getCamera()->zFarP = args.fValue;
wiRenderer::getCamera()->UpdateProjection();
Scene& scene = wiRenderer::GetScene();
CameraComponent& camera = *scene.cameras.GetComponent(wiRenderer::getCameraID());
camera.zFarP = args.fValue;
camera.UpdateProjection();
});
cameraWindow->AddWidget(farPlaneSlider);
@@ -60,8 +62,10 @@ CameraWindow::CameraWindow(wiGUI* gui) :GUI(gui)
nearPlaneSlider->SetPos(XMFLOAT2(x, y += inc));
nearPlaneSlider->SetValue(wiRenderer::getCamera()->zNearP);
nearPlaneSlider->OnSlide([&](wiEventArgs args) {
wiRenderer::getCamera()->zNearP = args.fValue;
wiRenderer::getCamera()->UpdateProjection();
Scene& scene = wiRenderer::GetScene();
CameraComponent& camera = *scene.cameras.GetComponent(wiRenderer::getCameraID());
camera.zNearP = args.fValue;
camera.UpdateProjection();
});
cameraWindow->AddWidget(nearPlaneSlider);
@@ -69,8 +73,10 @@ CameraWindow::CameraWindow(wiGUI* gui) :GUI(gui)
fovSlider->SetSize(XMFLOAT2(100, 30));
fovSlider->SetPos(XMFLOAT2(x, y += inc));
fovSlider->OnSlide([&](wiEventArgs args) {
wiRenderer::getCamera()->fov = args.fValue / 180.f * XM_PI;
wiRenderer::getCamera()->UpdateProjection();
Scene& scene = wiRenderer::GetScene();
CameraComponent& camera = *scene.cameras.GetComponent(wiRenderer::getCameraID());
camera.fov = args.fValue / 180.f * XM_PI;
camera.UpdateProjection();
});
cameraWindow->AddWidget(fovSlider);
Editor/ModelImporter_GLTF.cpp
+428 -496
View File
File diff suppressed because it is too large Load Diff
WickedEngine/wiRenderer.cpp
+185 -174
View File
@@ -3172,12 +3172,12 @@ void wiRenderer::UpdateRenderData(GRAPHICSTHREAD threadID)
SubresourceData InitData;
InitData.pSysMem = &materialGPUData;
material.constantBuffer = new GPUBuffer;
device->CreateBuffer(&desc, &InitData, material.constantBuffer);
material.constantBuffer.reset(new GPUBuffer);
device->CreateBuffer(&desc, &InitData, material.constantBuffer.get());
}
else
{
device->UpdateBuffer(material.constantBuffer, &materialGPUData, threadID);
device->UpdateBuffer(material.constantBuffer.get(), &materialGPUData, threadID);
}
}
@@ -3402,116 +3402,116 @@ void wiRenderer::UpdateRenderData(GRAPHICSTHREAD threadID)
ManageDecalAtlas(threadID);
//wiProfiler::GetInstance().BeginRange("Skinning", wiProfiler::DOMAIN_GPU, threadID);
//GetDevice()->EventBegin("Skinning", threadID);
//{
// bool streamOutSetUp = false;
// CSTYPES lastCS = CSTYPE_SKINNING_LDS;
wiProfiler::GetInstance().BeginRange("Skinning", wiProfiler::DOMAIN_GPU, threadID);
GetDevice()->EventBegin("Skinning", threadID);
{
bool streamOutSetUp = false;
CSTYPES lastCS = CSTYPE_SKINNING_LDS;
// for (Model* model : GetScene().models)
// {
// // Update material constant buffers:
// MaterialCB materialGPUData;
// for (auto& it : model->materials)
// {
// Material* material = it.second;
// materialGPUData.Create(*material);
// // These will probably not change every time so only issue a GPU memory update if it is necessary:
// if (memcmp(&material->gpuData, &materialGPUData, sizeof(MaterialCB)) != 0)
// {
// material->gpuData = materialGPUData;
// GetDevice()->UpdateBuffer(&material->constantBuffer, &materialGPUData, threadID);
// }
// }
for (size_t i = 0; i < scene.meshes.GetCount(); ++i)
{
MeshComponent& mesh = scene.meshes[i];
// // Skinning:
// for (auto& iter = model->meshes.begin(); iter != model->meshes.end(); ++iter)
// {
// Mesh* mesh = iter->second;
if (mesh.IsSkinned())
{
ArmatureComponent& armature = *scene.armatures.GetComponent(mesh.armatureID);
// if (mesh->hasArmature() && !mesh->hasDynamicVB() && mesh->renderable && !mesh->vertices_POS.empty()
// && mesh->streamoutBuffer_POS != nullptr && mesh->vertexBuffer_POS != nullptr)
// {
// Armature* armature = mesh->armature;
if (armature.boneBuffer == nullptr)
{
armature.boneData.resize(armature.boneCollection.size());
// if (!streamOutSetUp)
// {
// // Set up skinning shader
// streamOutSetUp = true;
// GPUBuffer* vbs[] = {
// nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr
// };
// const UINT strides[] = {
// 0,0,0,0,0,0,0,0
// };
// GetDevice()->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, nullptr, threadID);
// GetDevice()->BindComputePSO(CPSO[CSTYPE_SKINNING_LDS], threadID);
// }
GPUBufferDesc bd;
bd.Usage = USAGE_DYNAMIC;
bd.CPUAccessFlags = CPU_ACCESS_WRITE;
// CSTYPES targetCS = CSTYPE_SKINNING_LDS;
bd.ByteWidth = sizeof(ArmatureComponent::ShaderBoneType) * (UINT)armature.boneCollection.size();
bd.BindFlags = BIND_SHADER_RESOURCE;
bd.MiscFlags = RESOURCE_MISC_BUFFER_STRUCTURED;
bd.StructureByteStride = sizeof(ArmatureComponent::ShaderBoneType);
// if (!GetLDSSkinningEnabled() || armature->boneCollection.size() > SKINNING_COMPUTE_THREADCOUNT)
// {
// // If we have more bones that can fit into LDS, we switch to a skinning shader which loads from device memory:
// targetCS = CSTYPE_SKINNING;
// }
armature.boneBuffer.reset(new GPUBuffer);
HRESULT hr = wiRenderer::GetDevice()->CreateBuffer(&bd, nullptr, armature.boneBuffer.get());
assert(SUCCEEDED(hr));
}
// if (targetCS != lastCS)
// {
// lastCS = targetCS;
// GetDevice()->BindComputePSO(CPSO[targetCS], threadID);
// }
if (!streamOutSetUp)
{
// Set up skinning shader
streamOutSetUp = true;
GPUBuffer* vbs[] = {
nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr
};
const UINT strides[] = {
0,0,0,0,0,0,0,0
};
GetDevice()->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, nullptr, threadID);
GetDevice()->BindComputePSO(CPSO[CSTYPE_SKINNING_LDS], threadID);
}
// // Upload bones for skinning to shader
// for (unsigned int k = 0; k < armature->boneCollection.size(); k++)
// {
// armature->boneData[k].Create(armature->boneCollection[k]->boneRelativity);
// }
// GetDevice()->UpdateBuffer(&armature->boneBuffer, armature->boneData.data(), threadID, (int)(sizeof(Armature::ShaderBoneType) * armature->boneCollection.size()));
// GetDevice()->BindResource(CS, &armature->boneBuffer, SKINNINGSLOT_IN_BONEBUFFER, threadID);
CSTYPES targetCS = CSTYPE_SKINNING_LDS;
// // Do the skinning
// GPUResource* vbs[] = {
// mesh->vertexBuffer_POS,
// mesh->vertexBuffer_BON,
// };
// GPUResource* sos[] = {
// mesh->streamoutBuffer_POS,
// mesh->streamoutBuffer_PRE,
// };
if (!GetLDSSkinningEnabled() || armature.skinningMatrices.size() > SKINNING_COMPUTE_THREADCOUNT)
{
// If we have more bones that can fit into LDS, we switch to a skinning shader which loads from device memory:
targetCS = CSTYPE_SKINNING;
}
// GetDevice()->BindResources(CS, vbs, SKINNINGSLOT_IN_VERTEX_POS, ARRAYSIZE(vbs), threadID);
// GetDevice()->BindUAVs(CS, sos, 0, ARRAYSIZE(sos), threadID);
if (targetCS != lastCS)
{
lastCS = targetCS;
GetDevice()->BindComputePSO(CPSO[targetCS], threadID);
}
// GetDevice()->Dispatch((UINT)ceilf((float)mesh->vertices_POS.size() / SKINNING_COMPUTE_THREADCOUNT), 1, 1, threadID);
// GetDevice()->UAVBarrier(sos, ARRAYSIZE(sos), threadID); // todo: defer
// //GetDevice()->TransitionBarrier(sos, ARRAYSIZE(sos), RESOURCE_STATE_UNORDERED_ACCESS, RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER, threadID);
// }
// else if (mesh->hasDynamicVB())
// {
// // Upload CPU skinned vertex buffer (Soft body VB)
// size_t size_pos = sizeof(MeshComponent::Vertex_POS)*mesh->vertices_Transformed_POS.size();
// size_t size_pre = sizeof(MeshComponent::Vertex_POS)*mesh->vertices_Transformed_PRE.size();
// UINT offset;
// void* vertexData = GetDevice()->AllocateFromRingBuffer(dynamicVertexBufferPool, size_pos + size_pre, offset, threadID);
// mesh->bufferOffset_POS = offset;
// mesh->bufferOffset_PRE = offset + (UINT)size_pos;
// memcpy(vertexData, mesh->vertices_Transformed_POS.data(), size_pos);
// memcpy(reinterpret_cast<void*>(reinterpret_cast<size_t>(vertexData) + size_pos), mesh->vertices_Transformed_PRE.data(), size_pre);
// GetDevice()->InvalidateBufferAccess(dynamicVertexBufferPool, threadID);
// }
// }
// }
// Upload bones for skinning to shader
for (size_t k = 0; k < armature.skinningMatrices.size(); k++)
{
armature.boneData[k].Create(armature.skinningMatrices[k]);
}
GetDevice()->UpdateBuffer(armature.boneBuffer.get(), armature.boneData.data(), threadID, (int)(sizeof(ArmatureComponent::ShaderBoneType) * armature.boneData.size()));
GetDevice()->BindResource(CS, armature.boneBuffer.get(), SKINNINGSLOT_IN_BONEBUFFER, threadID);
// if (streamOutSetUp)
// {
// GetDevice()->UnbindUAVs(0, 2, threadID);
// GetDevice()->UnbindResources(SKINNINGSLOT_IN_VERTEX_POS, 2, threadID);
// }
// Do the skinning
GPUResource* vbs[] = {
mesh.vertexBuffer_POS.get(),
mesh.vertexBuffer_BON.get(),
};
GPUResource* sos[] = {
mesh.streamoutBuffer_POS.get(),
mesh.streamoutBuffer_PRE.get(),
};
//}
//GetDevice()->EventEnd(threadID);
//wiProfiler::GetInstance().EndRange(threadID); // skinning
GetDevice()->BindResources(CS, vbs, SKINNINGSLOT_IN_VERTEX_POS, ARRAYSIZE(vbs), threadID);
GetDevice()->BindUAVs(CS, sos, 0, ARRAYSIZE(sos), threadID);
GetDevice()->Dispatch((UINT)ceilf((float)mesh.vertices_POS.size() / SKINNING_COMPUTE_THREADCOUNT), 1, 1, threadID);
GetDevice()->UAVBarrier(sos, ARRAYSIZE(sos), threadID); // todo: defer
//GetDevice()->TransitionBarrier(sos, ARRAYSIZE(sos), RESOURCE_STATE_UNORDERED_ACCESS, RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER, threadID);
}
else if (mesh.IsDynamicVB())
{
// Upload CPU skinned vertex buffer (Soft body VB)
size_t size_pos = sizeof(MeshComponent::Vertex_POS) * mesh.vertices_Transformed_POS.size();
size_t size_pre = sizeof(MeshComponent::Vertex_POS) * mesh.vertices_Transformed_PRE.size();
UINT offset;
void* vertexData = GetDevice()->AllocateFromRingBuffer(dynamicVertexBufferPool, size_pos + size_pre, offset, threadID);
mesh.bufferOffset_POS = offset;
mesh.bufferOffset_PRE = offset + (UINT)size_pos;
memcpy(vertexData, mesh.vertices_Transformed_POS.data(), size_pos);
memcpy(reinterpret_cast<void*>(reinterpret_cast<size_t>(vertexData) + size_pos), mesh.vertices_Transformed_PRE.data(), size_pre);
GetDevice()->InvalidateBufferAccess(dynamicVertexBufferPool, threadID);
}
}
if (streamOutSetUp)
{
GetDevice()->UnbindUAVs(0, 2, threadID);
GetDevice()->UnbindResources(SKINNINGSLOT_IN_VERTEX_POS, 2, threadID);
}
}
GetDevice()->EventEnd(threadID);
wiProfiler::GetInstance().EndRange(threadID); // skinning
//// Particle system simulation/sorting/culling:
//for (auto& x : emitterSystems)
@@ -3725,72 +3725,73 @@ void wiRenderer::DrawDebugWorld(CameraComponent* camera, GRAPHICSTHREAD threadID
device->EventBegin("DrawDebugWorld", threadID);
//if (debugBoneLines)
//{
// device->EventBegin("DebugBoneLines", threadID);
if (debugBoneLines)
{
device->EventBegin("DebugBoneLines", threadID);
// device->BindGraphicsPSO(PSO_debug[DEBUGRENDERING_LINES], threadID);
device->BindGraphicsPSO(PSO_debug[DEBUGRENDERING_LINES], threadID);
// MiscCB sb;
// sb.mTransform = XMMatrixTranspose(camera->GetViewProjection());
// sb.mColor = XMFLOAT4(1, 1, 1, 1);
// device->UpdateBuffer(constantBuffers[CBTYPE_MISC], &sb, threadID);
MiscCB sb;
sb.mTransform = XMMatrixTranspose(camera->GetViewProjection());
sb.mColor = XMFLOAT4(1, 1, 1, 1);
device->UpdateBuffer(constantBuffers[CBTYPE_MISC], &sb, threadID);
// for (auto& model : GetScene().models)
// {
// for (auto& armature : model->armatures)
// {
// if (armature->boneCollection.empty())
// {
// continue;
// }
for (size_t i = 0; i < scene.armatures.GetCount(); ++i)
{
const ArmatureComponent& armature = scene.armatures[i];
// struct LineSegment
// {
// XMFLOAT4 a, colorA, b, colorB;
// };
// UINT offset;
// void* mem = device->AllocateFromRingBuffer(dynamicVertexBufferPool, sizeof(LineSegment) * armature->boneCollection.size(), offset, threadID);
if (armature.boneCollection.empty())
{
continue;
}
// int i = 0;
// for (auto& bone : armature->boneCollection)
// {
// XMMATRIX world = XMLoadFloat4x4(&bone->world);
// XMVECTOR a = XMVectorSet(0, 0, 0, 1);
// XMVECTOR b = XMVectorSet(0, 0, bone->length, 1);
struct LineSegment
{
XMFLOAT4 a, colorA, b, colorB;
};
UINT offset;
void* mem = device->AllocateFromRingBuffer(dynamicVertexBufferPool, sizeof(LineSegment) * armature.boneCollection.size(), offset, threadID);
// a = XMVector4Transform(a, world);
// b = XMVector4Transform(b, world);
int j = 0;
for (Entity entity : armature.boneCollection)
{
const TransformComponent& transform = *scene.transforms.GetComponent(entity);
XMMATRIX world = XMLoadFloat4x4(&transform.world);
XMVECTOR a = XMVectorSet(0, 0, 0, 1);
XMVECTOR b = XMVectorSet(0, 0, 1, 1);
a = XMVector4Transform(a, world);
b = XMVector4Transform(b, world);
// LineSegment segment;
// XMStoreFloat4(&segment.a, a);
// XMStoreFloat4(&segment.b, b);
LineSegment segment;
XMStoreFloat4(&segment.a, a);
XMStoreFloat4(&segment.b, b);
// memcpy((void*)((size_t)mem + i * sizeof(LineSegment)), &segment, sizeof(LineSegment));
// i++;
// }
memcpy((void*)((size_t)mem + j * sizeof(LineSegment)), &segment, sizeof(LineSegment));
j++;
}
// device->InvalidateBufferAccess(dynamicVertexBufferPool, threadID);
device->InvalidateBufferAccess(dynamicVertexBufferPool, threadID);
// GPUBuffer* vbs[] = {
// dynamicVertexBufferPool,
// };
// const UINT strides[] = {
// sizeof(XMFLOAT4) + sizeof(XMFLOAT4),
// };
// const UINT offsets[] = {
// offset,
// };
// device->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, offsets, threadID);
GPUBuffer* vbs[] = {
dynamicVertexBufferPool,
};
const UINT strides[] = {
sizeof(XMFLOAT4) + sizeof(XMFLOAT4),
};
const UINT offsets[] = {
offset,
};
device->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, offsets, threadID);
// device->Draw(2 * i, 0, threadID);
device->Draw(2 * j, 0, threadID);
// }
// }
}
// device->EventEnd(threadID);
//}
device->EventEnd(threadID);
}
if (!renderableLines.empty())
{
@@ -5212,7 +5213,7 @@ void wiRenderer::RenderMeshes(const XMFLOAT3& eye, const CulledCollection& culle
if (k < 1)
continue;
device->BindIndexBuffer(mesh.indexBuffer, mesh.GetIndexFormat(), 0, threadID);
device->BindIndexBuffer(mesh.indexBuffer.get(), mesh.GetIndexFormat(), 0, threadID);
enum class BOUNDVERTEXBUFFERTYPE
{
@@ -5306,7 +5307,7 @@ void wiRenderer::RenderMeshes(const XMFLOAT3& eye, const CulledCollection& culle
case BOUNDVERTEXBUFFERTYPE::POSITION:
{
GPUBuffer* vbs[] = {
dynamicVB ? dynamicVertexBufferPool : (mesh.streamoutBuffer_POS != nullptr ? mesh.streamoutBuffer_POS : mesh.vertexBuffer_POS),
dynamicVB ? dynamicVertexBufferPool : (mesh.streamoutBuffer_POS.get() != nullptr ? mesh.streamoutBuffer_POS.get() : mesh.vertexBuffer_POS.get()),
dynamicVertexBufferPool
};
UINT strides[] = {
@@ -5323,8 +5324,8 @@ void wiRenderer::RenderMeshes(const XMFLOAT3& eye, const CulledCollection& culle
case BOUNDVERTEXBUFFERTYPE::POSITION_TEXCOORD:
{
GPUBuffer* vbs[] = {
dynamicVB ? dynamicVertexBufferPool : (mesh.streamoutBuffer_POS != nullptr ? mesh.streamoutBuffer_POS : mesh.vertexBuffer_POS),
mesh.vertexBuffer_TEX,
dynamicVB ? dynamicVertexBufferPool : (mesh.streamoutBuffer_POS.get() != nullptr ? mesh.streamoutBuffer_POS.get() : mesh.vertexBuffer_POS.get()),
mesh.vertexBuffer_TEX.get(),
dynamicVertexBufferPool
};
UINT strides[] = {
@@ -5343,9 +5344,9 @@ void wiRenderer::RenderMeshes(const XMFLOAT3& eye, const CulledCollection& culle
case BOUNDVERTEXBUFFERTYPE::EVERYTHING:
{
GPUBuffer* vbs[] = {
dynamicVB ? dynamicVertexBufferPool : (mesh.streamoutBuffer_POS != nullptr ? mesh.streamoutBuffer_POS : mesh.vertexBuffer_POS),
mesh.vertexBuffer_TEX,
dynamicVB ? dynamicVertexBufferPool : (mesh.streamoutBuffer_PRE != nullptr ? mesh.streamoutBuffer_PRE : mesh.vertexBuffer_POS),
dynamicVB ? dynamicVertexBufferPool : (mesh.streamoutBuffer_POS.get() != nullptr ? mesh.streamoutBuffer_POS.get() : mesh.vertexBuffer_POS.get()),
mesh.vertexBuffer_TEX.get(),
dynamicVB ? dynamicVertexBufferPool : (mesh.streamoutBuffer_PRE.get() != nullptr ? mesh.streamoutBuffer_PRE.get() : mesh.vertexBuffer_POS.get()),
dynamicVertexBufferPool
};
UINT strides[] = {
@@ -5370,7 +5371,7 @@ void wiRenderer::RenderMeshes(const XMFLOAT3& eye, const CulledCollection& culle
}
boundVBType_Prev = boundVBType;
device->BindConstantBuffer(PS, material.constantBuffer, CB_GETBINDSLOT(MaterialCB), threadID);
device->BindConstantBuffer(PS, material.constantBuffer.get(), CB_GETBINDSLOT(MaterialCB), threadID);
device->BindStencilRef(material.GetStencilRef(), threadID);
@@ -6754,9 +6755,9 @@ void wiRenderer::BuildSceneBVH(GRAPHICSTHREAD threadID)
device->BindConstantBuffer(CS, constantBuffers[CBTYPE_BVH], CB_GETBINDSLOT(BVHCB), threadID);
GPUResource* res[] = {
mesh.indexBuffer,
mesh.vertexBuffer_POS,
mesh.vertexBuffer_TEX,
mesh.indexBuffer.get(),
mesh.vertexBuffer_POS.get(),
mesh.vertexBuffer_TEX.get(),
};
device->BindResources(CS, res, TEXSLOT_ONDEMAND0, ARRAYSIZE(res), threadID);
@@ -7895,12 +7896,22 @@ wiRenderer::RayIntersectWorldResult wiRenderer::RayIntersectWorld(const RAY& ray
if (mesh.IsSkinned())
{
//for (size_t i = 0; i < mesh.vertices_POS.size(); ++i)
//{
// _tmpvert = mesh.TransformVertex((int)i);
// _vertices[i] = XMLoadFloat4(&_tmpvert.pos);
//}
assert(0); // todo
const ArmatureComponent& armature = *scene.armatures.GetComponent(mesh.armatureID);
for (size_t vertexI = 0; vertexI < mesh.vertices_POS.size(); ++vertexI)
{
XMVECTOR pos = mesh.vertices_POS[vertexI].LoadPOS();
const XMFLOAT4& ind = mesh.vertices_BON[vertexI].GetInd_FULL();
const XMFLOAT4& wei = mesh.vertices_BON[vertexI].GetWei_FULL();
XMMATRIX sump = XMLoadFloat4x4(&armature.skinningMatrices[(int)ind.x]) * wei.x;
sump += XMLoadFloat4x4(&armature.skinningMatrices[(int)ind.y]) * wei.y;
sump += XMLoadFloat4x4(&armature.skinningMatrices[(int)ind.z]) * wei.z;
sump += XMLoadFloat4x4(&armature.skinningMatrices[(int)ind.w]) * wei.w;
_vertices[i] = XMVector3Transform(pos, sump);
}
}
else if (mesh.IsDynamicVB())
{
@@ -8168,9 +8179,9 @@ void wiRenderer::CreateImpostor(Entity entity, GRAPHICSTHREAD threadID)
GetDevice()->InvalidateBufferAccess(dynamicVertexBufferPool, threadID);
GPUBuffer* vbs[] = {
mesh.IsSkinned() ? mesh.streamoutBuffer_POS : mesh.vertexBuffer_POS,
mesh.vertexBuffer_TEX,
mesh.IsSkinned() ? mesh.streamoutBuffer_PRE : mesh.vertexBuffer_POS,
mesh.IsSkinned() ? mesh.streamoutBuffer_POS.get() : mesh.vertexBuffer_POS.get(),
mesh.vertexBuffer_TEX.get(),
mesh.IsSkinned() ? mesh.streamoutBuffer_PRE.get() : mesh.vertexBuffer_POS.get(),
dynamicVertexBufferPool
};
UINT strides[] = {
@@ -8187,7 +8198,7 @@ void wiRenderer::CreateImpostor(Entity entity, GRAPHICSTHREAD threadID)
};
GetDevice()->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, offsets, threadID);
GetDevice()->BindIndexBuffer(mesh.indexBuffer, mesh.GetIndexFormat(), 0, threadID);
GetDevice()->BindIndexBuffer(mesh.indexBuffer.get(), mesh.GetIndexFormat(), 0, threadID);
GetDevice()->BindGraphicsPSO(PSO_captureimpostor, threadID);
@@ -8268,7 +8279,7 @@ void wiRenderer::CreateImpostor(Entity entity, GRAPHICSTHREAD threadID)
}
MaterialComponent& material = *GetScene().materials.GetComponent(subset.materialID);
GetDevice()->BindConstantBuffer(PS, material.constantBuffer, CB_GETBINDSLOT(MaterialCB), threadID);
GetDevice()->BindConstantBuffer(PS, material.constantBuffer.get(), CB_GETBINDSLOT(MaterialCB), threadID);
GetDevice()->BindResource(PS, material.GetBaseColorMap(), TEXSLOT_ONDEMAND0, threadID);
GetDevice()->BindResource(PS, material.GetNormalMap(), TEXSLOT_ONDEMAND1, threadID);
WickedEngine/wiSceneSystem.cpp
+79 -51
View File
@@ -31,6 +31,29 @@ namespace wiSceneSystem
XMStoreFloat4x4(&world, W);
}
}
void TransformComponent::UpdateParentedTransform(const TransformComponent& parent, const XMFLOAT4X4& inverseParentBindMatrix)
{
XMVECTOR S_local = XMLoadFloat3(&scale_local);
XMVECTOR R_local = XMLoadFloat4(&rotation_local);
XMVECTOR T_local = XMLoadFloat3(&translation_local);
XMMATRIX W =
XMMatrixScalingFromVector(S_local) *
XMMatrixRotationQuaternion(R_local) *
XMMatrixTranslationFromVector(T_local);
XMMATRIX W_parent = XMLoadFloat4x4(&parent.world);
XMMATRIX B = XMLoadFloat4x4(&inverseParentBindMatrix);
W = W * B * W_parent;
XMVECTOR S, R, T;
XMMatrixDecompose(&S, &R, &T, W);
XMStoreFloat3(&scale, S);
XMStoreFloat4(&rotation, R);
XMStoreFloat3(&translation, T);
world_prev = world;
XMStoreFloat4x4(&world, W);
}
void TransformComponent::ApplyTransform()
{
dirty = true;
@@ -302,17 +325,12 @@ namespace wiSceneSystem
// Create actual GPU data:
SAFE_DELETE(indexBuffer);
SAFE_DELETE(vertexBuffer_POS);
SAFE_DELETE(vertexBuffer_TEX);
SAFE_DELETE(vertexBuffer_BON);
SAFE_DELETE(streamoutBuffer_POS);
SAFE_DELETE(streamoutBuffer_PRE);
GPUBufferDesc bd;
SubresourceData InitData;
//if (!hasDynamicVB())
HRESULT hr;
//if (!IsDynamicVB())
{
ZeroMemory(&bd, sizeof(bd));
bd.Usage = USAGE_IMMUTABLE;
@@ -323,8 +341,9 @@ namespace wiSceneSystem
InitData.pSysMem = vertices_POS.data();
bd.ByteWidth = (UINT)(sizeof(Vertex_POS) * vertices_POS.size());
vertexBuffer_POS = new GPUBuffer;
wiRenderer::GetDevice()->CreateBuffer(&bd, &InitData, vertexBuffer_POS);
vertexBuffer_POS.reset(new GPUBuffer);
hr = wiRenderer::GetDevice()->CreateBuffer(&bd, &InitData, vertexBuffer_POS.get());
assert(SUCCEEDED(hr));
}
if (!vertices_BON.empty())
@@ -337,8 +356,9 @@ namespace wiSceneSystem
InitData.pSysMem = vertices_BON.data();
bd.ByteWidth = (UINT)(sizeof(Vertex_BON) * vertices_BON.size());
vertexBuffer_BON = new GPUBuffer;
wiRenderer::GetDevice()->CreateBuffer(&bd, &InitData, vertexBuffer_BON);
vertexBuffer_BON.reset(new GPUBuffer);
hr = wiRenderer::GetDevice()->CreateBuffer(&bd, &InitData, vertexBuffer_BON.get());
assert(SUCCEEDED(hr));
ZeroMemory(&bd, sizeof(bd));
bd.Usage = USAGE_DEFAULT;
@@ -347,12 +367,14 @@ namespace wiSceneSystem
bd.MiscFlags = RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS;
bd.ByteWidth = (UINT)(sizeof(Vertex_POS) * vertices_POS.size());
streamoutBuffer_POS = new GPUBuffer;
wiRenderer::GetDevice()->CreateBuffer(&bd, nullptr, streamoutBuffer_POS);
streamoutBuffer_POS.reset(new GPUBuffer);
hr = wiRenderer::GetDevice()->CreateBuffer(&bd, nullptr, streamoutBuffer_POS.get());
assert(SUCCEEDED(hr));
bd.ByteWidth = (UINT)(sizeof(Vertex_POS) * vertices_POS.size());
streamoutBuffer_PRE = new GPUBuffer;
wiRenderer::GetDevice()->CreateBuffer(&bd, nullptr, streamoutBuffer_PRE);
streamoutBuffer_PRE.reset(new GPUBuffer);
hr = wiRenderer::GetDevice()->CreateBuffer(&bd, nullptr, streamoutBuffer_PRE.get());
assert(SUCCEEDED(hr));
}
// texture coordinate buffers are always static:
@@ -365,8 +387,9 @@ namespace wiSceneSystem
bd.ByteWidth = (UINT)(bd.StructureByteStride * vertices_TEX.size());
bd.Format = Vertex_TEX::FORMAT;
InitData.pSysMem = vertices_TEX.data();
vertexBuffer_TEX = new GPUBuffer;
wiRenderer::GetDevice()->CreateBuffer(&bd, &InitData, vertexBuffer_TEX);
vertexBuffer_TEX.reset(new GPUBuffer);
hr = wiRenderer::GetDevice()->CreateBuffer(&bd, &InitData, vertexBuffer_TEX.get());
assert(SUCCEEDED(hr));
// Remap index buffer to be continuous across subsets and create gpu buffer data:
@@ -420,8 +443,9 @@ namespace wiSceneSystem
bd.Format = GetIndexFormat() == INDEXFORMAT_16BIT ? FORMAT_R16_UINT : FORMAT_R32_UINT;
InitData.pSysMem = gpuIndexData;
bd.ByteWidth = (UINT)(stride * indices.size());
indexBuffer = new GPUBuffer;
wiRenderer::GetDevice()->CreateBuffer(&bd, &InitData, indexBuffer);
indexBuffer.reset(new GPUBuffer);
hr = wiRenderer::GetDevice()->CreateBuffer(&bd, &InitData, indexBuffer.get());
assert(SUCCEEDED(hr));
SAFE_DELETE_ARRAY(gpuIndexData);
@@ -612,6 +636,7 @@ namespace wiSceneSystem
}
void CameraComponent::CreatePerspective(float newWidth, float newHeight, float newNear, float newFar, float newFOV)
{
zNearP = newNear;
@@ -699,7 +724,7 @@ namespace wiSceneSystem
RunHierarchyUpdateSystem(parents, transforms, layers);
RunBoneUpdateSystem(transforms, bones);
RunArmatureUpdateSystem(transforms, bones, armatures);
RunPhysicsUpdateSystem(transforms, meshes, objects, physicscomponents);
@@ -988,6 +1013,12 @@ namespace wiSceneSystem
XMStoreFloat4x4(&parentcomponent->world_parent_inverse_bind, XMMatrixInverse(nullptr, XMLoadFloat4x4(&transform_parent->world)));
}
TransformComponent* transform_child = transforms.GetComponent(entity);
if (transform_child != nullptr)
{
transform_child->UpdateParentedTransform(*transform_parent, parentcomponent->world_parent_inverse_bind);
}
LayerComponent* layer_child = layers.GetComponent(entity);
if (layer_child != nullptr)
{
@@ -1058,26 +1089,7 @@ namespace wiSceneSystem
TransformComponent* transform_parent = transforms.GetComponent(parentcomponent.parentID);
if (transform_child != nullptr && transform_parent != nullptr)
{
XMVECTOR S_local = XMLoadFloat3(&transform_child->scale_local);
XMVECTOR R_local = XMLoadFloat4(&transform_child->rotation_local);
XMVECTOR T_local = XMLoadFloat3(&transform_child->translation_local);
XMMATRIX W =
XMMatrixScalingFromVector(S_local) *
XMMatrixRotationQuaternion(R_local) *
XMMatrixTranslationFromVector(T_local);
XMMATRIX W_parent = XMLoadFloat4x4(&transform_parent->world);
XMMATRIX B = XMLoadFloat4x4(&parentcomponent.world_parent_inverse_bind);
W = W * B * W_parent;
XMVECTOR S, R, T;
XMMatrixDecompose(&S, &R, &T, W);
XMStoreFloat3(&transform_child->scale, S);
XMStoreFloat4(&transform_child->rotation, R);
XMStoreFloat3(&transform_child->translation, T);
transform_child->world_prev = transform_child->world;
XMStoreFloat4x4(&transform_child->world, W);
transform_child->UpdateParentedTransform(*transform_parent, parentcomponent.world_parent_inverse_bind);
}
@@ -1090,21 +1102,37 @@ namespace wiSceneSystem
}
}
void RunBoneUpdateSystem(
void RunArmatureUpdateSystem(
const ComponentManager<TransformComponent>& transforms,
ComponentManager<BoneComponent>& bones
const ComponentManager<BoneComponent>& bones,
ComponentManager<ArmatureComponent>& armatures
)
{
for (size_t i = 0; i < bones.GetCount(); ++i)
for (size_t i = 0; i < armatures.GetCount(); ++i)
{
BoneComponent& bone = bones[i];
Entity entity = bones.GetEntity(i);
const TransformComponent& transform = *transforms.GetComponent(entity);
ArmatureComponent& armature = armatures[i];
Entity entity = armatures.GetEntity(i);
XMMATRIX R = XMLoadFloat4x4(&armature.skinningRemap);
if (armature.skinningMatrices.size() != armature.boneCollection.size())
{
armature.skinningMatrices.resize(armature.boneCollection.size());
}
int boneIndex = 0;
for (Entity boneEntity : armature.boneCollection)
{
const BoneComponent& bone = *bones.GetComponent(boneEntity);
const TransformComponent& bone_transform = *transforms.GetComponent(boneEntity);
XMMATRIX B = XMLoadFloat4x4(&bone.inverseBindPoseMatrix);
XMMATRIX W = XMLoadFloat4x4(&bone_transform.world);
XMMATRIX M = W * B * R;
XMStoreFloat4x4(&armature.skinningMatrices[boneIndex++], M);
}
XMMATRIX inverseBindPoseMatrix = XMLoadFloat4x4(&bone.inverseBindPoseMatrix);
XMMATRIX world = XMLoadFloat4x4(&transform.world);
XMMATRIX skinningMatrix = inverseBindPoseMatrix * world;
XMStoreFloat4x4(&bone.skinningMatrix, skinningMatrix);
}
}
void RunPhysicsUpdateSystem(
WickedEngine/wiSceneSystem.h
+55 -12
View File
@@ -47,6 +47,7 @@ namespace wiSceneSystem
XMFLOAT4X4 world_prev;
void UpdateTransform();
void UpdateParentedTransform(const TransformComponent& parent, const XMFLOAT4X4& inverseParentBindMatrix);
void ApplyTransform();
void ClearTransform();
void Translate(const XMFLOAT3& value);
@@ -107,7 +108,7 @@ namespace wiSceneSystem
std::string displacementMapName;
wiGraphicsTypes::Texture2D* displacementMap = nullptr;
wiGraphicsTypes::GPUBuffer* constantBuffer = nullptr;
std::unique_ptr<wiGraphicsTypes::GPUBuffer> constantBuffer;
inline void SetUserStencilRef(uint8_t value)
{
@@ -288,12 +289,12 @@ namespace wiSceneSystem
};
std::vector<MeshSubset> subsets;
wiGraphicsTypes::GPUBuffer* indexBuffer = nullptr;
wiGraphicsTypes::GPUBuffer* vertexBuffer_POS = nullptr;
wiGraphicsTypes::GPUBuffer* vertexBuffer_TEX = nullptr;
wiGraphicsTypes::GPUBuffer* vertexBuffer_BON = nullptr;
wiGraphicsTypes::GPUBuffer* streamoutBuffer_POS = nullptr;
wiGraphicsTypes::GPUBuffer* streamoutBuffer_PRE = nullptr;
std::unique_ptr<wiGraphicsTypes::GPUBuffer> indexBuffer;
std::unique_ptr<wiGraphicsTypes::GPUBuffer> vertexBuffer_POS;
std::unique_ptr<wiGraphicsTypes::GPUBuffer> vertexBuffer_TEX;
std::unique_ptr<wiGraphicsTypes::GPUBuffer> vertexBuffer_BON;
std::unique_ptr<wiGraphicsTypes::GPUBuffer> streamoutBuffer_POS;
std::unique_ptr<wiGraphicsTypes::GPUBuffer> streamoutBuffer_PRE;
// Dynamic vertexbuffers write into a global pool, these will be the offsets into that:
bool dynamicVB = false;
@@ -396,12 +397,12 @@ namespace wiSceneSystem
struct BoneComponent
{
XMFLOAT4X4 inverseBindPoseMatrix;
XMFLOAT4X4 skinningMatrix;
};
struct ArmatureComponent
{
std::vector<wiECS::Entity> boneCollection;
std::vector<XMFLOAT4X4> skinningMatrices;
GFX_STRUCT ShaderBoneType
{
@@ -419,7 +420,7 @@ namespace wiSceneSystem
ALIGN_16
};
std::vector<ShaderBoneType> boneData;
wiGraphicsTypes::GPUBuffer boneBuffer;
std::unique_ptr<wiGraphicsTypes::GPUBuffer> boneBuffer;
// This will be used to eg. mirror the whole skin, without modifying the armature transform itself
// It will affect the skin only, so the mesh vertices should be mirrored as well to work correctly!
@@ -439,7 +440,24 @@ namespace wiSceneSystem
LIGHTTYPE_COUNT,
} type = POINT;
inline void SetType(LightType val) { type = val; }
inline void SetType(LightType val) {
type = val;
switch (type)
{
case DIRECTIONAL:
case SPOT:
shadowBias = 0.0001f;
break;
case POINT:
case SPHERE:
case DISC:
case RECTANGLE:
case TUBE:
case LIGHTTYPE_COUNT:
shadowBias = 0.1f;
break;
}
}
inline LightType GetType() const { return type; }
XMFLOAT3 color = XMFLOAT3(1, 1, 1);
@@ -621,6 +639,29 @@ namespace wiSceneSystem
inline float GetOpacity() const { return color.w; }
};
struct AnimationComponent
{
struct AnimationChannel
{
wiECS::Entity target = wiECS::INVALID_ENTITY;
enum class Type
{
TRANSLATION,
ROTATION,
SCALE
} type = Type::TRANSLATION;
enum class Mode
{
LINEAR,
STEP,
} mode = Mode::LINEAR;
std::vector<float> keyframe_times;
std::vector<float> keyframe_data;
};
std::vector<AnimationChannel> channels;
};
struct ModelComponent
{
std::unordered_set<wiECS::Entity> materials;
@@ -654,6 +695,7 @@ namespace wiSceneSystem
wiECS::ComponentManager<EnvironmentProbeComponent> probes;
wiECS::ComponentManager<ForceFieldComponent> forces;
wiECS::ComponentManager<DecalComponent> decals;
wiECS::ComponentManager<AnimationComponent> animations;
wiECS::ComponentManager<ModelComponent> models;
AABB bounds;
@@ -748,9 +790,10 @@ namespace wiSceneSystem
wiECS::ComponentManager<ObjectComponent>& objects,
wiECS::ComponentManager<PhysicsComponent>& physicscomponents
);
void RunBoneUpdateSystem(
void RunArmatureUpdateSystem(
const wiECS::ComponentManager<TransformComponent>& transforms,
wiECS::ComponentManager<BoneComponent>& bones
const wiECS::ComponentManager<BoneComponent>& bones,
wiECS::ComponentManager<ArmatureComponent>& armatures
);
void RunMaterialUpdateSystem(wiECS::ComponentManager<MaterialComponent>& materials, float dt);
void RunObjectUpdateSystem(
WickedEngine/wiSceneSystem_Decl.h
+1
View File
@@ -19,6 +19,7 @@ namespace wiSceneSystem
struct EnvironmentProbeComponent;
struct ForceFieldComponent;
struct DecalComponent;
struct AnimationComponent;
struct ModelComponent;
struct Scene;
}
models/GLTF/CesiumMan.glb
BIN
View File
Binary file not shown.
models/GLTF/T-Rex.glb
BIN
View File
Binary file not shown.