ouczbs/idk_me
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改暂时还原

Browse Source
This commit is contained in:
ouczbs 2024-05-24 22:58:23 +08:00
parent e48f56135a
commit 228fafbbbb
8 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/engine/editor/IDE.h
View File

@ -21,7 +21,7 @@ Accessible through Core::GetSystem<IDE>() [#include <IDE.h>]
#include <editor/commands/CommandController.h> #include <editor/commands/CommandController.h>
#include <editor/Registry.h> #include <editor/Registry.h>
#include <editor/ObjectSelection.h> #include <editor/ObjectSelection.h>
//#include "windows/IGE_IWindow.h"
#undef FindWindow #undef FindWindow
namespace idk namespace idk

4
src/engine/editor/windows/IGE_InspectorWindow_DisplayComponentInnerSpecializations.cpp
View File

@ -176,11 +176,11 @@ namespace idk
ImGui::TextDisabled("Values driven by Canvas."); ImGui::TextDisabled("Values driven by Canvas.");
return; return;
} }
/*if (c_rt->GetGameObject()->HasComponent<AspectRatioFitter>()) if (c_rt->GetGameObject()->HasComponent<AspectRatioFitter>())
{ {
ImGui::TextDisabled("Values driven by AspectRatioFitter."); ImGui::TextDisabled("Values driven by AspectRatioFitter.");
return; return;
}*/ }
const float region_width = ImGui::GetWindowContentRegionWidth(); const float region_width = ImGui::GetWindowContentRegionWidth();

4
src/engine/editorstatic/DescriptorPoolManager.cpp
View File

@ -34,7 +34,7 @@ namespace vknu
,hlp::arr_count(pool_size) ,hlp::arr_count(pool_size)
,std::data(pool_size) ,std::data(pool_size)
}; };
pool = device.createDescriptorPoolUnique(create_info, nullptr, vk::DispatchLoaderStatic{}); pool = device.createDescriptorPoolUnique(create_info, nullptr, vk::DispatchLoaderDefault{});
} }
DescriptorPoolsManager::DescriptorPoolsManager(VkDevice device) : _device{device} DescriptorPoolsManager::DescriptorPoolsManager(VkDevice device) : _device{device}
{ {
@ -51,7 +51,7 @@ namespace vknu
void DescriptorPoolsManager::ResetManager(Manager& manager) void DescriptorPoolsManager::ResetManager(Manager& manager)
{ {
vk::Device d = _device; vk::Device d = _device;
d.resetDescriptorPool(*manager.pool, vk::DescriptorPoolResetFlags{}, vk::DispatchLoaderStatic{}); d.resetDescriptorPool(*manager.pool, vk::DescriptorPoolResetFlags{}, vk::DispatchLoaderDefault{});
manager.size = 0; manager.size = 0;
} }

1
src/engine/game/AddSystems.cpp
View File

@ -15,7 +15,6 @@
#include <opengl/resource/OpenGLMesh.h> #include <opengl/resource/OpenGLMesh.h>
#include <opengl/resource/OpenGLTexture.h> #include <opengl/resource/OpenGLTexture.h>
#include <editor/IDE.h> #include <editor/IDE.h>
#include <windows/IGE_IWindow.h>
#include <file/FileSystem.h> #include <file/FileSystem.h>
#include <debug/LogSystem.h> #include <debug/LogSystem.h>

2
src/engine/idk/res/ResourceHandle.inl
View File

@ -2,10 +2,10 @@
#include <type_traits> #include <type_traits>
#include <res/Resource.h> #include <res/Resource.h>
#include <res/ResourceUtils.inl>
#include <res/ResourceManager.inl> #include <res/ResourceManager.inl>
#include <math/comparable.inl> #include <math/comparable.inl>
#include <res/Guid.inl> #include <res/Guid.inl>
namespace idk namespace idk
{ {
template<typename Res> template<typename Res>

5
src/engine/vkn/ShaderModule.cpp
View File

@ -185,11 +185,6 @@ namespace idk::vkn
ubo_info[ub.name] = std::move(info); ubo_info[ub.name] = std::move(info);
} }
//这里反序列化的数据是错误的，不能执行析构函数
using SVBuiltResource = decltype(resources.builtin_inputs);
char data[sizeof(SVBuiltResource)];
std::construct_at((SVBuiltResource*)&data, std::move(resources.builtin_outputs));
std::construct_at((SVBuiltResource*)&data, std::move(resources.builtin_inputs));
//for (auto& ub : cs) //for (auto& ub : cs)
//{ //{

4
src/engine/vkn/VknMeshModder.cpp
View File

@ -33,10 +33,6 @@ namespace idk::vkn
vk::UniqueCommandBuffer cmd_buffer; vk::UniqueCommandBuffer cmd_buffer;
vk::UniqueBuffer buffer; vk::UniqueBuffer buffer;
vk::UniqueDeviceMemory memory; vk::UniqueDeviceMemory memory;
~StagingStuff() {
}
}; };
//Expensive (probably). //Expensive (probably).
StagingStuff TransferData(vk::CommandPool cmd_pool, vk::Queue queue, vk::PhysicalDevice pdevice, vk::Device device, size_t dst_offset, size_t num_bytes, const void* data, vk::Buffer dst_buffer, vk::Fence fence) StagingStuff TransferData(vk::CommandPool cmd_pool, vk::Queue queue, vk::PhysicalDevice pdevice, vk::Device device, size_t dst_offset, size_t num_bytes, const void* data, vk::Buffer dst_buffer, vk::Fence fence)

14
src/engine/vkn/VknRenderTargetFactory.cpp
View File

@ -36,14 +36,12 @@ namespace idk::vkn
auto result = RenderTargetFactory::GenerateDefaultResource(); auto result = RenderTargetFactory::GenerateDefaultResource();
auto pm = RscHandle<VknRenderTarget>{}; auto& m = *RscHandle<VknRenderTarget>{};
if (pm) {
auto& m = *pm; m.size = uvec2{ Core::GetSystem<Application>().GetScreenSize() };
m.size = uvec2{ Core::GetSystem<Application>().GetScreenSize() }; if (m.ColorGradingLut == RscHandle<Texture>{})
if (m.ColorGradingLut == RscHandle<Texture>{}) m.ColorGradingLut = RscHandle<Texture>{GetDefaultColorGradeGuid()};
m.ColorGradingLut = RscHandle<Texture>{ GetDefaultColorGradeGuid() }; m.Name("Default RenderTarget");
m.Name("Default RenderTarget");
}
return result; return result;
} }