Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions Tetragrama/Components/DockspaceUIComponent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ namespace Tetragrama::Components
m_editor_serializer->Initialize(parent->Arena);
m_asset_importer->Initialize(parent->Arena);

m_dockspace_node_flag = ImGuiDockNodeFlags_NoWindowMenuButton | ImGuiDockNodeFlags_PassthruCentralNode;
m_dockspace_node_flag = ImGuiDockNodeFlags_NoWindowMenuButton | static_cast<decltype(ImGuiDockNodeFlags_NoWindowMenuButton)>(ImGuiDockNodeFlags_PassthruCentralNode);
m_window_flags = ImGuiWindowFlags_MenuBar | ImGuiWindowFlags_NoDocking | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoNavFocus;

auto app = reinterpret_cast<EditorPtr>(ParentLayer->CurrentApp);
Expand Down Expand Up @@ -211,7 +211,7 @@ namespace Tetragrama::Components

ImGui::PushFont(ImGui::GetIO().Fonts->Fonts[0]);
ImGui::SetCursorPos(ImVec2(10, ImGui::GetWindowSize().y - 30));
ImGui::TextColored(s_asset_importer_report_msg_color, s_asset_importer_report_msg.c_str());
ImGui::TextColored(s_asset_importer_report_msg_color, "%s", s_asset_importer_report_msg.c_str());
ImGui::PopFont();

ImGui::EndPopup();
Expand Down Expand Up @@ -244,7 +244,7 @@ namespace Tetragrama::Components

ImGui::PushFont(ImGui::GetIO().Fonts->Fonts[0]);
ImGui::SetCursorPos(ImVec2(10, wind_size.y - 30));
ImGui::TextColored(s_scene_serializer_log_color, s_scene_serializer_log);
ImGui::TextColored(s_scene_serializer_log_color, "%s", s_scene_serializer_log);
ImGui::PopFont();

ImGui::EndPopup();
Expand Down Expand Up @@ -385,7 +385,7 @@ namespace Tetragrama::Components

if (ImGui::BeginPopupModal(str_id, NULL, ImGuiWindowFlags_AlwaysAutoResize))
{
ImGui::Text(fmt::format("You have unsaved changes for your current scene : {}", current_scene->Name).c_str());
ImGui::Text("%s", fmt::format("You have unsaved changes for your current scene : {}", current_scene->Name).c_str());
ImGui::Separator();

if (ImGui::Button("Save", ImVec2(120, 0)))
Expand Down
1 change: 1 addition & 0 deletions Tetragrama/Messengers/Messenger.h
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ namespace Tetragrama::Messengers
// catch (...)
//{
//}
return {};
}

template <typename TRecipient, typename TMessage>
Expand Down
16 changes: 11 additions & 5 deletions ZEngine/ZEngine/Hardwares/VulkanDevice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -721,22 +721,22 @@ namespace ZEngine::Hardwares

VKAPI_ATTR VkBool32 VKAPI_CALL VulkanDevice::__debugCallback(VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity, VkDebugUtilsMessageTypeFlagsEXT messageType, const VkDebugUtilsMessengerCallbackDataEXT* pCallbackData, void* pUserData)
{
if ((messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT) == VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT)
if ((messageSeverity & static_cast<decltype(messageSeverity)>(VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT)) == VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT)
{
ZENGINE_CORE_ERROR("{}", pCallbackData->pMessage)
}

if ((messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT) == VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT)
if ((messageSeverity & static_cast<decltype(messageSeverity)>(VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT)) == VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT)
{
ZENGINE_CORE_WARN("{}", pCallbackData->pMessage)
}

if ((messageSeverity & VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT) == VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT)
if ((messageSeverity & static_cast<decltype(messageSeverity)>(VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT)) == VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT)
{
ZENGINE_CORE_WARN("{}", pCallbackData->pMessage)
}

if ((messageSeverity & VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT) == VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT)
if ((messageSeverity & static_cast<decltype(messageSeverity)>(VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT)) == VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT)
{
ZENGINE_CORE_WARN("{}", pCallbackData->pMessage)
}
Expand Down Expand Up @@ -961,6 +961,8 @@ namespace ZEngine::Hardwares
dst_access_mask = VK_ACCESS_INDIRECT_COMMAND_READ_BIT;
dst_pipeline_stage = VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT;
break;
case UNKNOWN:
break;
}

VkBufferMemoryBarrier bufMemBarrier2 = {VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER};
Expand Down Expand Up @@ -1583,6 +1585,8 @@ namespace ZEngine::Hardwares
vkFreeDescriptorSets(LogicalDevice, reinterpret_cast<VkDescriptorPool>(res_handle.Data1), 1, &ds);
break;
}
case DeviceResourceType::RESOURCE_COUNT:
break;
}

DirtyResources.Remove(handle);
Expand Down Expand Up @@ -2360,7 +2364,7 @@ namespace ZEngine::Hardwares

void Image2DBuffer::Dispose()
{
if (this && m_buffer_image)
if (m_buffer_image)
{
Device->EnqueueBufferImageForDeletion(m_buffer_image);
m_buffer_image = {};
Expand Down Expand Up @@ -2498,6 +2502,8 @@ namespace ZEngine::Hardwares
dst_access_mask = VK_ACCESS_INDIRECT_COMMAND_READ_BIT;
dst_pipeline_stage = VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT;
break;
case UNKNOWN:
break;
}

auto command_buffer = m_device->GetInstantCommandBuffer(Rendering::QueueType::GRAPHIC_QUEUE);
Expand Down
4 changes: 2 additions & 2 deletions ZEngine/ZEngine/Helpers/HandleManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ namespace ZEngine::Helpers
template <typename T>
struct Handle
{
uint32_t Index = UINT32_MAX;
uint64_t Index = UINT64_MAX;

bool Valid() const
{
return Index != UINT32_MAX;
return Index != UINT64_MAX;
}

operator bool() const
Expand Down
Loading