xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Support for docking (incomplete) #90

Merged
Xenosas1337 merged 4 commits from SP3-1-Rendering into main 2022-10-16 16:38:30 +08:00
Conversation 0 Commits 4 Files Changed 19 +3 -2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2830dad8e3 - Show all commits

4
SHADE_Engine/src/Graphics/Images/SHVkSampler.cpp
View File

@ -39,7 +39,8 @@ namespace SHADE
} }
SHVkSampler::SHVkSampler(SHVkSampler&& rhs) noexcept SHVkSampler::SHVkSampler(SHVkSampler&& rhs) noexcept
: vkSampler { rhs.vkSampler } : vkSampler{ rhs.vkSampler }
, device{ rhs.device }
{ {
rhs.vkSampler = nullptr; rhs.vkSampler = nullptr;
} }
@ -56,6 +57,7 @@ namespace SHADE
SHADE::SHVkSampler& SHVkSampler::operator=(SHVkSampler&& rhs) noexcept SHADE::SHVkSampler& SHVkSampler::operator=(SHVkSampler&& rhs) noexcept
{ {
vkSampler = rhs.vkSampler; vkSampler = rhs.vkSampler;
device = rhs.device;
rhs.vkSampler = nullptr; rhs.vkSampler = nullptr;
return *this; return *this;
} }

1
SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
View File

@ -189,7 +189,6 @@ namespace SHADE
worldRenderer = defaultViewport->AddRenderer(resourceManager, swapchain->GetNumImages(), renderContextCmdPools, descPool, SHGraphicsGlobalData::GetDescSetLayouts()[SHGraphicsConstants::DescriptorSetIndex::HIGH_FREQUENCY_GLOBALS], worldRenderGraph); worldRenderer = defaultViewport->AddRenderer(resourceManager, swapchain->GetNumImages(), renderContextCmdPools, descPool, SHGraphicsGlobalData::GetDescSetLayouts()[SHGraphicsConstants::DescriptorSetIndex::HIGH_FREQUENCY_GLOBALS], worldRenderGraph);
worldRenderer->SetCamera(worldCamera); worldRenderer->SetCamera(worldCamera);
// TODO: This is VERY temporarily here until a more solid resource management system is implemented // TODO: This is VERY temporarily here until a more solid resource management system is implemented
shaderSourceLibrary.Init("../../TempShaderFolder/"); shaderSourceLibrary.Init("../../TempShaderFolder/");