celisej567/Nuake-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added image GPU resource handling + missing texture

Browse Source
This commit is contained in:
antopilo
2025-01-04 12:02:39 -05:00
parent 8d7f587d7e
commit 2d07e3777e
7 changed files with 95 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Nuake/src/Rendering/Textures/Material.h
View File

@@ -9,6 +9,10 @@
#include "src/Resource/Resource.h"
#include "src/FileSystem/FileSystem.h"
#include "src/Rendering/Vulkan/VkResources.h"
#include "src/Rendering/Vulkan/VulkanImage/VulkanImage.h"
namespace Nuake
{
struct UBOStructure {
@@ -56,6 +60,7 @@ namespace Nuake
};
}
public:
UUID AlbedoImage;
Ref<Texture> m_Albedo;
Ref<Texture> m_AO;
Ref<Texture> m_Metalness;
@@ -169,8 +174,25 @@ namespace Nuake
{
const auto& texturePath = j["Albedo"]["Path"];
const std::string absolutePath = FileSystem::RelativeToAbsolute(texturePath);
Ref<Texture> albedoTexture = TextureManager::Get()->GetTexture(absolutePath);
SetAlbedo(albedoTexture);
if (FileSystem::FileExists(texturePath))
{
GPUResources& resources = GPUResources::Get();
Ref<VulkanImage> image = CreateRef<VulkanImage>(absolutePath);
if (resources.AddTexture(image))
{
AlbedoImage = image->GetID();
}
Ref<Texture> albedoTexture = TextureManager::Get()->GetTexture(absolutePath);
SetAlbedo(albedoTexture);
}
else
{
GPUResources& resources = GPUResources::Get();
Ref<VulkanImage> missingTexture = TextureManager::Get()->GetTexture2("missing_texture");
AlbedoImage = missingTexture->GetID();
}
}
if (j.contains("AlbedoColor"))

6
Nuake/src/Rendering/Textures/TextureManager.cpp
View File

@@ -3,6 +3,8 @@
#include "src/Rendering/Vulkan/VulkanImage/VulkanImage.h"
#include "src/Resource/StaticResources.h"
#include "src/Rendering/Vulkan/VkResources.h"
#include <glad/glad.h>
namespace Nuake
@@ -55,6 +57,7 @@ namespace Nuake
m_Registry2.emplace(Resources_Images_restore_icon_png_path, CreateRef<VulkanImage>(Resources_Images_restore_icon_png, Resources_Images_restore_icon_png_len));
m_Registry2.emplace(Resources_Images_folder_icon_png_path, CreateRef<VulkanImage>(Resources_Images_folder_icon_png, Resources_Images_folder_icon_png_len));
m_Registry2.emplace(Resources_Images_audio_file_icon_png_path, CreateRef<VulkanImage>(Resources_Images_audio_file_icon_png, Resources_Images_audio_file_icon_png_len));
m_Registry2.emplace("missing_texture", CreateRef<VulkanImage>(Resources_Images_missing_texture_png, Resources_Images_missing_texture_png_len));
//
//unsigned char whitePixel[] = { 255, 255, 255, 255 };
//m_Registry.emplace("Resources/Textures/Default.png", CreateRef<Texture>(Vector2( 1, 1 ), GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, &whitePixel));
@@ -76,7 +79,10 @@ namespace Nuake
Ref<VulkanImage> TextureManager::GetTexture2(const std::string path)
{
if (!IsTextureLoaded2(path))
{
m_Registry2.emplace(path, new VulkanImage(path));
GPUResources::Get().AddTexture(m_Registry2[path]);
}
return m_Registry2.at(path);
}

26
Nuake/src/Rendering/Vulkan/VkResources.h
View File

@@ -6,6 +6,8 @@
#include "src/Rendering/Vertex.h"
#include "src/Rendering/Vulkan/VulkanAllocatedBuffer.h"
#include "src/Rendering/Vulkan/VulkanImage/VulkanImage.h"
#include "src/Rendering/Vulkan/VkMesh.h"
namespace Nuake
{
@@ -96,5 +98,29 @@ namespace Nuake
Logger::Log("Mesh with ID does not exist", "vulkan", CRITICAL);
return nullptr;
}
bool AddTexture(Ref<VulkanImage> image)
{
const UUID id = image->GetID();
if (Images.find(id) == Images.end())
{
Images[id] = image;
return true;
}
Logger::Log("Buffer with ID already exists", "vulkan", CRITICAL);
return false;
}
Ref<VulkanImage> GetTexture(const UUID& id)
{
if (Images.find(id) != Images.end())
{
return Images[id];
}
Logger::Log("Mesh with ID does not exist", "vulkan", CRITICAL);
return nullptr;
}
};
}

9
Nuake/src/Rendering/Vulkan/VulkanImage/VulkanImage.cpp
View File

@@ -15,7 +15,8 @@ using namespace Nuake;
VulkanImage::VulkanImage(const std::string & path) :
ImGuiDescriptorSetGenerated(false),
Format(ImageFormat::RGBA8)
Format(ImageFormat::RGBA8),
ID(UUID())
{
int channels = 0;
int width = 0;
@@ -86,7 +87,8 @@ VulkanImage::VulkanImage(const std::string & path) :
VulkanImage::VulkanImage(ImageFormat inFormat, Vector2 inSize, ImageUsage usage) :
Format(inFormat),
Extent(inSize, 1),
ImGuiDescriptorSetGenerated(false)
ImGuiDescriptorSetGenerated(false),
ID(UUID())
{
VkExtent3D vkExtent =
{
@@ -199,7 +201,8 @@ VulkanImage::VulkanImage(void* inData, ImageFormat inFormat, Vector2 inSize) : V
VulkanImage::VulkanImage(void* inData, size_t inSize) :
Format(ImageFormat::RGBA8),
ImGuiDescriptorSetGenerated(false)
ImGuiDescriptorSetGenerated(false),
ID(UUID())
{
int channels = 0;
int width = 0;

3
Nuake/src/Rendering/Vulkan/VulkanImage/VulkanImage.h
View File

@@ -1,6 +1,7 @@
#pragma once
#include "src/Core/Maths.h"
#include "src/Resource/UUID.h"
#include "volk/volk.h"
#include "vk_mem_alloc.h"
@@ -35,6 +36,7 @@ namespace Nuake
class VulkanImage
{
private:
UUID ID;
VkImage Image;
VkImageView ImageView;
VmaAllocation Allocation;
@@ -57,6 +59,7 @@ namespace Nuake
int GetWidth() const { return static_cast<int>(Extent.x); }
int GetHeight() const { return static_cast<int>(Extent.y); }
UUID GetID() const { return ID; }
VkImageView& GetImageView() { return ImageView; }
VkImage& GetImage() { return Image; }
VkDescriptorSet& GetImGuiDescriptorSet();

27
Nuake/src/Resource/StaticResources.cpp
View File

@@ -189155,6 +189155,33 @@ namespace Nuake {
};
unsigned int Resources_Images_minimize_icon_png_len = sizeof(Resources_Images_minimize_icon_png);
// Data for file: Resources_Images_missing_texture_png_path
const std::string Resources_Images_missing_texture_png_path = R"(Resources/Images/missing_texture.png)";
unsigned char Resources_Images_missing_texture_png[] = {
0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, 0x00, 0x0D,
0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20,
0x08, 0x06, 0x00, 0x00, 0x00, 0x73, 0x7A, 0x7A, 0xF4, 0x00, 0x00, 0x00,
0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xAE, 0xCE, 0x1C, 0xE9, 0x00, 0x00,
0x00, 0xAD, 0x49, 0x44, 0x41, 0x54, 0x58, 0x85, 0xED, 0x96, 0xB1, 0x0D,
0x02, 0x31, 0x0C, 0x45, 0x9F, 0x23, 0x31, 0x43, 0x9A, 0x2C, 0x70, 0xCA,
0x28, 0x37, 0x0F, 0x62, 0x06, 0xC4, 0x3A, 0x97, 0x51, 0x10, 0x0B, 0xD0,
0x30, 0x03, 0x85, 0x29, 0x4E, 0x41, 0xD1, 0x75, 0xB1, 0x0B, 0x28, 0xFC,
0xFB, 0x97, 0xFF, 0x64, 0x29, 0xB2, 0x65, 0xCB, 0x9B, 0x02, 0xAC, 0xAF,
0x95, 0x99, 0xB4, 0xDC, 0x00, 0x38, 0x9F, 0x2E, 0x00, 0x3C, 0x9E, 0xF7,
0x29, 0x7E, 0x29, 0x15, 0x80, 0x64, 0x29, 0x3F, 0x32, 0xB3, 0xE5, 0x23,
0x23, 0x8A, 0xEA, 0x34, 0x3D, 0x44, 0x10, 0x0F, 0xBE, 0x4F, 0xE0, 0x97,
0x09, 0x81, 0x10, 0x08, 0x81, 0x10, 0x08, 0x81, 0xD4, 0xB7, 0x9A, 0x25,
0x2D, 0xB7, 0xEF, 0x56, 0xB3, 0x64, 0x29, 0x75, 0x9F, 0x80, 0x45, 0x62,
0x64, 0x2C, 0x12, 0x9D, 0x91, 0xA5, 0x54, 0x05, 0xFB, 0x3E, 0xBF, 0xBD,
0xAF, 0x80, 0xFD, 0x9E, 0x48, 0x96, 0xF2, 0x23, 0xE3, 0xB9, 0x27, 0x04,
0x70, 0xDD, 0x03, 0xEA, 0xC3, 0xFF, 0xE0, 0x17, 0x84, 0x40, 0x08, 0x84,
0x40, 0x08, 0x84, 0x80, 0x77, 0x9F, 0x7B, 0xEF, 0x89, 0xD4, 0x1F, 0xB2,
0x94, 0x8F, 0x0F, 0x59, 0xCA, 0x01, 0x3E, 0x97, 0x25, 0x38, 0xEA, 0x96,
0xDA, 0xB5, 0x47, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE,
0x42, 0x60, 0x82,
};
unsigned int Resources_Images_missing_texture_png_len = sizeof(Resources_Images_missing_texture_png);
// Data for file: Resources_Images_nuake_logo_png_path
const std::string Resources_Images_nuake_logo_png_path = R"(Resources/Images/nuake-logo.png)";
unsigned char Resources_Images_nuake_logo_png[] = {

3
Nuake/src/Resource/StaticResources.h
View File

@@ -116,6 +116,9 @@ namespace Nuake {
extern const std::string Resources_Images_minimize_icon_png_path;
extern unsigned int Resources_Images_minimize_icon_png_len;
extern unsigned char Resources_Images_minimize_icon_png[];
extern const std::string Resources_Images_missing_texture_png_path;
extern unsigned int Resources_Images_missing_texture_png_len;
extern unsigned char Resources_Images_missing_texture_png[];
extern const std::string Resources_Images_nuake_logo_png_path;
extern unsigned int Resources_Images_nuake_logo_png_len;
extern unsigned char Resources_Images_nuake_logo_png[];