celisej567/Nuake
1
0
Fork 0
mirror of https://github.com/antopilo/Nuake.git synced 2026-09-21 20:08:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Added normal maapping + material preview widget

Browse Source
This commit is contained in:
antopilo
2025-04-25 20:22:41 -04:00
parent 30b5ccc339
commit 67916d0307
18 changed files with 1005 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

528
Editor/Source/Editor/ComponentsPanel/MaterialEditor.cpp
View File

@@ -6,12 +6,268 @@
#include <imgui/imgui.h>
#include <imgui/imgui_internal.h>
#include <Nuake/Scene/Components/CameraComponent.h>
#include "Nuake/Rendering/Vulkan/SceneViewport.h"
#include "Nuake/Scene/Entities/Entity.h"
#include <Nuake/Scene/Components/ModelComponent.h>
#include <Engine.h>
#include "Nuake/Rendering/Vulkan/DebugCmd.h"
#include "Nuake/Resource/Project.h"
#include <Nuake/UI/ImUI.h>
Ref<Nuake::Model> sphereModel;
Ref<Nuake::Model> quadModel;
Ref<Nuake::Model> cubeModel;
enum class Shapes
{
Sphere, Cube, Quad
};
Shapes currentShape = Shapes::Sphere;
MaterialEditor::MaterialEditor()
{
using namespace Nuake;
PreviewScene = CreateRef<Nuake::Scene>();
PreviewScene->GetEnvironment()->mVolumetric->SetFogAmount(1.0f);
auto camera = PreviewScene->CreateEntity("Camera");
camera.GetComponent<Nuake::TransformComponent>().Translation = Nuake::Vector3(-2, 0, -2);
auto& camComponent = camera.AddComponent<Nuake::CameraComponent>();
camComponent.CameraInstance->Fov = 44.0f;
//auto light = PreviewScene->CreateEntity("Light");
//auto& lightC = light.AddComponent<LightComponent>();
//lightC.CastShadows = false;
//lightC.Type = LightType::Directional;
glm::vec3 forward = glm::normalize(Vector3(0, 1, 0));
glm::vec3 up = glm::vec3(0, 1, 0);
// Prevent up being colinear with forward
if (glm::abs(glm::dot(forward, up)) > 0.999f)
up = glm::vec3(1, 0, 0);
glm::vec3 right = glm::normalize(glm::cross(up, forward));
up = glm::cross(forward, right);
glm::mat3 rotationMatrix(right, up, forward);
//auto& lightT = light.GetComponent<TransformComponent>();
//lightT.GlobalRotation = glm::quat_cast(rotationMatrix);
auto sphere = PreviewScene->CreateEntity("Sphere");
auto& modelComponent = sphere.AddComponent<Nuake::ModelComponent>();
auto& sphereT = sphere.GetComponent<TransformComponent>();
sphereT.Translation = { 1, 0, 0 };
const std::vector<Nuake::Vertex> quadVertices
{
{ Vector3(-0.5f, 0.5f, 0.0f), 0.0f, Vector3(0, 0, 1), 1.0f, Vector4(1, 0, 0, 0), Vector4(0, 1, 0, 0) },
{ Vector3(0.5f, 0.5f, 0.0f), 1.0f, Vector3(0, 0, 1), 1.0f, Vector4(1, 0, 0, 0), Vector4(0, 1, 0, 0) },
{ Vector3(-0.5f, -0.5f, 0.0f), 0.0f, Vector3(0, 0, 1), 0.0f, Vector4(1, 0, 0, 0), Vector4(0, 1, 0, 0) },
{ Vector3(0.5f, -0.5f, 0.0f), 1.0f, Vector3(0, 0, 1), 0.0f, Vector4(1, 0, 0, 0), Vector4(0, 1, 0, 0) },
{ Vector3(-0.5f, -0.5f, 0.0f), 0.0f, Vector3(0, 0, 1), 0.0f, Vector4(1, 0, 0, 0), Vector4(0, 1, 0, 0) },
{ Vector3(0.5f, 0.5f, 0.0f), 1.0f, Vector3(0, 0, 1), 1.0f, Vector4(1, 0, 0, 0), Vector4(0, 1, 0, 0) }
};
const std::vector<uint32_t> quadIndices
{
5, 4, 3, 2, 1, 0
};
auto meshQuad = CreateRef<Mesh>();
meshQuad->AddSurface(quadVertices, quadIndices);
quadModel = CreateRef<Model>();
quadModel->AddMesh(meshQuad);
ResourceManager::RegisterResource(quadModel);
// Sphere
const int sectorCount = 32;
const int stackCount = 16;
const float radius = 0.5f;
std::vector<Nuake::Vertex> sphereVertices;
std::vector<uint32_t> sphereIndices;
for (int i = 0; i <= stackCount; ++i)
{
float stackAngle = glm::pi<float>() / 2 - i * glm::pi<float>() / stackCount;
float xy = radius * cosf(stackAngle);
float z = radius * sinf(stackAngle);
for (int j = 0; j <= sectorCount; ++j)
{
float sectorAngle = j * 2.0f * glm::pi<float>() / sectorCount;
float x = xy * cosf(sectorAngle);
float y = xy * sinf(sectorAngle);
Vector3 position = Vector3(x, y, z);
Vector3 normal = glm::normalize(position);
// Collapse seam at the poles
float u = (i == 0 || i == stackCount) ? 0.5f : (float)j / sectorCount;
float v = 1.0f - (float)i / stackCount;
Vector4 tangent = Vector4(1, 0, 0, 0);
Vector4 bitangent = Vector4(0, 1, 0, 0);
sphereVertices.push_back({ position, u, normal, v, tangent, bitangent });
}
}
for (int i = 0; i < stackCount; ++i)
{
int k1 = i * (sectorCount + 1);
int k2 = k1 + sectorCount + 1;
for (int j = 0; j < sectorCount; ++j, ++k1, ++k2)
{
if (i != 0)
{
sphereIndices.push_back(k1);
sphereIndices.push_back(k2);
sphereIndices.push_back(k1 + 1);
}
if (i != (stackCount - 1))
{
sphereIndices.push_back(k1 + 1);
sphereIndices.push_back(k2);
sphereIndices.push_back(k2 + 1);
}
}
}
auto mesh = CreateRef<Mesh>();
mesh->AddSurface(sphereVertices, sphereIndices);
sphereModel = CreateRef<Model>();
sphereModel->AddMesh(mesh);
ResourceManager::RegisterResource(sphereModel);
modelComponent.ModelResource = sphereModel->ID;
const float boxSize = 0.33f;
const std::vector<Nuake::Vertex> boxVertices =
{
// Front face
{ Vector3(-boxSize, -boxSize, boxSize), 0.0f, Vector3(0, 0, 1), 0.0f, Vector4(1, 0, 0, 0), Vector4(0, 1, 0, 0) },
{ Vector3(boxSize, -boxSize, boxSize), 1.0f, Vector3(0, 0, 1), 0.0f, Vector4(1, 0, 0, 0), Vector4(0, 1, 0, 0) },
{ Vector3(boxSize, boxSize, boxSize), 1.0f, Vector3(0, 0, 1), 1.0f, Vector4(1, 0, 0, 0), Vector4(0, 1, 0, 0) },
{ Vector3(-boxSize, boxSize, boxSize), 0.0f, Vector3(0, 0, 1), 1.0f, Vector4(1, 0, 0, 0), Vector4(0, 1, 0, 0) },
// Back face
{ Vector3(-boxSize, -boxSize, -boxSize), 1.0f, Vector3(0, 0, -1), 0.0f, Vector4(-1, 0, 0, 0), Vector4(0, 1, 0, 0) },
{ Vector3(-boxSize, boxSize, -boxSize), 1.0f, Vector3(0, 0, -1), 1.0f, Vector4(-1, 0, 0, 0), Vector4(0, 1, 0, 0) },
{ Vector3(boxSize, boxSize, -boxSize), 0.0f, Vector3(0, 0, -1), 1.0f, Vector4(-1, 0, 0, 0), Vector4(0, 1, 0, 0) },
{ Vector3(boxSize, -boxSize, -boxSize), 0.0f, Vector3(0, 0, -1), 0.0f, Vector4(-1, 0, 0, 0), Vector4(0, 1, 0, 0) },
// Left face
{ Vector3(-boxSize, -boxSize, -boxSize), 0.0f, Vector3(-1, 0, 0), 0.0f, Vector4(0, 0, 1, 0), Vector4(0, 1, 0, 0) },
{ Vector3(-boxSize, -boxSize, boxSize), 1.0f, Vector3(-1, 0, 0), 0.0f, Vector4(0, 0, 1, 0), Vector4(0, 1, 0, 0) },
{ Vector3(-boxSize, boxSize, boxSize), 1.0f, Vector3(-1, 0, 0), 1.0f, Vector4(0, 0, 1, 0), Vector4(0, 1, 0, 0) },
{ Vector3(-boxSize, boxSize, -boxSize), 0.0f, Vector3(-1, 0, 0), 1.0f, Vector4(0, 0, 1, 0), Vector4(0, 1, 0, 0) },
// Right face
{ Vector3(boxSize, -boxSize, -boxSize), 1.0f, Vector3(1, 0, 0), 0.0f, Vector4(0, 0, -1, 0), Vector4(0, 1, 0, 0) },
{ Vector3(boxSize, boxSize, -boxSize), 1.0f, Vector3(1, 0, 0), 1.0f, Vector4(0, 0, -1, 0), Vector4(0, 1, 0, 0) },
{ Vector3(boxSize, boxSize, boxSize), 0.0f, Vector3(1, 0, 0), 1.0f, Vector4(0, 0, -1, 0), Vector4(0, 1, 0, 0) },
{ Vector3(boxSize, -boxSize, boxSize), 0.0f, Vector3(1, 0, 0), 0.0f, Vector4(0, 0, -1, 0), Vector4(0, 1, 0, 0) },
// Top face
{ Vector3(-boxSize, boxSize, -boxSize), 0.0f, Vector3(0, 1, 0), 0.0f, Vector4(1, 0, 0, 0), Vector4(0, 0, -1, 0) },
{ Vector3(-boxSize, boxSize, boxSize), 0.0f, Vector3(0, 1, 0), 1.0f, Vector4(1, 0, 0, 0), Vector4(0, 0, -1, 0) },
{ Vector3(boxSize, boxSize, boxSize), 1.0f, Vector3(0, 1, 0), 1.0f, Vector4(1, 0, 0, 0), Vector4(0, 0, -1, 0) },
{ Vector3(boxSize, boxSize, -boxSize), 1.0f, Vector3(0, 1, 0), 0.0f, Vector4(1, 0, 0, 0), Vector4(0, 0, -1, 0) },
// Bottom face
{ Vector3(-boxSize, -boxSize, -boxSize), 1.0f, Vector3(0, -1, 0), 0.0f, Vector4(1, 0, 0, 0), Vector4(0, 0, 1, 0) },
{ Vector3(boxSize, -boxSize, -boxSize), 0.0f, Vector3(0, -1, 0), 0.0f, Vector4(1, 0, 0, 0), Vector4(0, 0, 1, 0) },
{ Vector3(boxSize, -boxSize, boxSize), 0.0f, Vector3(0, -1, 0), 1.0f, Vector4(1, 0, 0, 0), Vector4(0, 0, 1, 0) },
{ Vector3(-boxSize, -boxSize, boxSize), 1.0f, Vector3(0, -1, 0), 1.0f, Vector4(1, 0, 0, 0), Vector4(0, 0, 1, 0) },
};
const std::vector<uint32_t> boxIndices =
{
// Front
0, 1, 2, 2, 3, 0,
// Back
4, 5, 6, 6, 7, 4,
// Left
8, 9,10,10,11, 8,
// Right
12,13,14,14,15,12,
// Top
16,17,18,18,19,16,
// Bottom
20,21,22,22,23,20
};
auto meshBox = CreateRef<Mesh>();
meshBox->AddSurface(boxVertices, boxIndices);
cubeModel = CreateRef<Model>();
cubeModel->AddMesh(meshBox);
ResourceManager::RegisterResource(cubeModel);
modelComponent.ModelResource = cubeModel->ID;
auto& vkRenderer = Nuake::VkRenderer::Get();
const UUID viewId = camComponent.CameraInstance->ID;
SceneViewport = vkRenderer.CreateViewport(viewId, {200, 200});
SceneViewport->GetOnDebugDraw().AddStatic([](DebugCmd& cmd) {
Matrix4 transform = Matrix4(1.0f);
//cmd.DrawQuad(transform);
});
SceneViewport->GetOnLineDraw().AddStatic([](DebugLineCmd& cmd) {
Matrix4 transform = Matrix4(1.0f);
auto cam = cmd.GetScene()->GetEntity("Camera");
auto& camc = cam.GetComponent<CameraComponent>();
auto& cami = camc.CameraInstance;
auto proj = cami->GetPerspective();
auto view = cami->GetTransform();
//cmd.DrawSphere(proj * view * transform, { 1, 0, 0, 1 }, 2.0f, false);
});
//PreviewScene->GetEnvironment()->AmbientColor = { 0, 0, 0, 0 };
vkRenderer.RegisterSceneViewport(PreviewScene, SceneViewport->GetID());
}
void MaterialEditor::Draw(Ref<Nuake::Material> material)
{
using namespace Nuake;
auto& t = PreviewScene->GetEntity("Camera").GetComponent<CameraComponent>();
auto ent = PreviewScene->GetEntity("Sphere");
RID shape;
switch (currentShape)
{
case Shapes::Quad:
{
shape = quadModel->ID;
break;
}
case Shapes::Sphere:
{
shape = sphereModel->ID;
break;
}
case Shapes::Cube:
{
shape = cubeModel->ID;
break;
}
}
shape.Get<Model>()->GetMeshes()[0]->SetMaterial(material);
ent.GetComponent<ModelComponent>().ModelResource = shape;
auto& cam = Engine::GetCurrentScene()->m_EditorCamera;
std::string materialTitle = material->Path;
{
UIFont boldfont = UIFont(Fonts::SubTitle);
@@ -36,6 +292,130 @@ void MaterialEditor::Draw(Ref<Nuake::Material> material)
}
}
ImVec2 previewSize = {ImGui::GetContentRegionAvail().x, 200 };
Vector2 viewportPanelSize = glm::vec2(previewSize.x, previewSize.y);
static float yaw = 0.0f; // Horizontal angle in radians
static float pitch = 0.0f; // Vertical angle in radians
static float actualYaw = 0.0f;
static float actualPitch = 0.0f;
static Vector3 actualPos = { 0, 0, 0 };
static float distance = 1.5f; // Distance from origin
const float yawSpeed = 0.01f;
const float pitchSpeed = 0.01f;
static Vector3 camPosition = Vector3(1.5, 0, 0);
t.CameraInstance->OnWindowResize(previewSize.x, previewSize.y);
SceneViewport->QueueResize({ previewSize.x, previewSize.y });
ImGui::BeginChild("MaterialPreview", previewSize);
{
auto cursorPos = ImGui::GetCursorPos();
if (ImGui::BeginPopup("shapes_popup"))
{
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(2, 2));
ImGui::PushStyleColor(ImGuiCol_Button, IM_COL32(0, 0, 0, 0));
ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 100);
bool isActive = currentShape == Shapes::Sphere;
if (isActive)
{
Color color = Engine::GetProject()->Settings.PrimaryColor;
ImGui::PushStyleColor(ImGuiCol_Button, { color.r, color.g, color.b, 1.0f });
}
if (ImGui::Button((std::string(ICON_FA_CIRCLE) + " Sphere").c_str()))
{
currentShape = Shapes::Sphere;
}
Nuake::UI::Tooltip("Sphere");
if (isActive)
{
ImGui::PopStyleColor();
}
isActive = currentShape == Shapes::Cube;
if (isActive)
{
Color color = Engine::GetProject()->Settings.PrimaryColor;
ImGui::PushStyleColor(ImGuiCol_Button, { color.r, color.g, color.b, 1.0f });
}
if (ImGui::Button((std::string(ICON_FA_CUBE) + " Cube").c_str()))
{
currentShape = Shapes::Cube;
}
UI::Tooltip("Cube");
if (isActive)
{
ImGui::PopStyleColor();
}
isActive = currentShape == Shapes::Quad;
if (isActive)
{
Color color = Engine::GetProject()->Settings.PrimaryColor;
ImGui::PushStyleColor(ImGuiCol_Button, { color.r, color.g, color.b, 1.0f });
}
if (ImGui::Button((std::string(ICON_FA_SQUARE) + " Plane").c_str()))
{
currentShape = Shapes::Quad;
}
UI::Tooltip("Plane");
if (isActive)
{
ImGui::PopStyleColor();
}
ImGui::PopStyleColor();
ImGui::PopStyleVar(2);
ImGui::EndPopup();
}
if (ImGui::IsWindowHovered(ImGuiHoveredFlags_AllowWhenBlockedByActiveItem) && ImGui::IsMouseDragging(ImGuiMouseButton_Left))
{
ImVec2 delta = ImGui::GetMouseDragDelta(ImGuiMouseButton_Left);
yaw -= delta.x * yawSpeed;
pitch += delta.y * pitchSpeed;
// Clamp pitch to prevent flipping
pitch = std::clamp(pitch, -glm::half_pi<float>() + 0.01f, glm::half_pi<float>() - 0.01f);
ImGui::ResetMouseDragDelta(ImGuiMouseButton_Left); // Prevents accumulating deltas
}
VkDescriptorSet textureDesc = SceneViewport->GetRenderTarget()->GetImGuiDescriptorSet();
ImGui::Image(textureDesc, ImGui::GetContentRegionAvail(), {0, 1}, {1, 0});
ImGui::SetCursorPos(cursorPos);
if (ImGui::Button(ICON_FA_SHAPES, ImVec2(30, 28)))
{
ImGui::OpenPopup("shapes_popup");
}
UI::Tooltip("Preview Shape");
}
ImGui::EndChild();
actualYaw = glm::mix(actualYaw, yaw, 20.0f * Engine::GetTimestep());
actualPitch = glm::mix(actualPitch, pitch, 20.0f * Engine::GetTimestep());
camPosition.x = distance * cosf(actualPitch) * sinf(actualYaw);
camPosition.y = distance * sinf(actualPitch);
camPosition.z = distance * cosf(actualPitch) * cosf(actualYaw);
actualPos = glm::mix(actualPos, camPosition, 20.0f * Engine::GetTimestep());
Vector3 target = Vector3(0, 0, 0);
Vector3 direction = glm::normalize(target - camPosition);
t.CameraInstance->Translation = { camPosition };
t.CameraInstance->SetDirection(direction);
bool flagsHeaderOpened;
{
UIFont boldfont = UIFont(Fonts::Bold);
@@ -87,79 +467,141 @@ void MaterialEditor::Draw(Ref<Nuake::Material> material)
if (AlbedoOpened)
{
ImGui::BeginChild("##albedo", TexturePanelSize, true);
ImGui::BeginTable("##Flags", 3, ImGuiTableFlags_BordersInner | ImGuiTableFlags_SizingStretchProp);
{
ImTextureID textureID = 0;
if (material->HasAlbedo())
ImGui::TableSetupColumn("name", 0, 0.3f);
ImGui::TableSetupColumn("set", 0, 0.6f);
ImGui::TableSetupColumn("reset", 0, 0.1f);
ImGui::TableNextColumn();
{
auto vkTexture = GPUResources::Get().GetTexture(material->AlbedoImage);
textureID = (ImTextureID)vkTexture->GetImGuiDescriptorSet();
ImGui::Text("Color");
ImGui::TableNextColumn();
Vector3 materialColor = material->data.m_AlbedoColor;
ImVec4 color = { materialColor.r, materialColor.g, materialColor.b, 1.0 };
ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
ImGui::ColorEdit3("##materialAlbedoColor", &material->data.m_AlbedoColor.r, ImGuiColorEditFlags_NoInputs);
ImGui::PopItemWidth();
ImGui::TableNextColumn();
// Reset
ImGui::TableNextColumn();
}
if (ImGui::ImageButtonEx(ImGui::GetCurrentWindow()->GetID("#image1"), (ImTextureID)textureID, ImVec2(80, 80), ImVec2(0, 1), ImVec2(1, 0), ImVec4(0, 0, 0, 0), ImVec4(1, 1, 1, 1)))
{
std::string texture = FileDialog::OpenFile("*.png | *.jpg");
if (texture != "")
ImGui::Text("Texture");
ImGui::TableNextColumn();
ImTextureID textureID = 0;
if (material->HasAlbedo())
{
material->SetAlbedo(TextureManager::Get()->GetTexture(texture));
}
}
auto vkTexture = GPUResources::Get().GetTexture(material->AlbedoImage);
if (ImGui::BeginPopupContextWindow())
{
if (ImGui::MenuItem("Clear Texture"))
textureID = (ImTextureID)vkTexture->GetImGuiDescriptorSet();
}
if (ImGui::ImageButtonEx(ImGui::GetCurrentWindow()->GetID("#image1"), (ImTextureID)textureID, ImVec2(80, 80), ImVec2(0, 1), ImVec2(1, 0), ImVec4(0, 0, 0, 0), ImVec4(1, 1, 1, 1)))
{
material->m_Albedo = nullptr;
std::string texture = FileDialog::OpenFile("*.png | *.jpg");
if (texture != "")
{
material->SetAlbedo(TextureManager::Get()->GetTexture(texture));
}
}
ImGui::EndPopup();
}
ImGui::SameLine();
ImGui::ColorEdit3("Color", &material->data.m_AlbedoColor.r);
if (ImGui::BeginPopupContextWindow())
{
if (ImGui::MenuItem("Clear Texture"))
{
material->m_Albedo = nullptr;
}
ImGui::EndPopup();
}
ImGui::TableNextColumn();
// Reset
}
}
ImGui::EndChild();
ImGui::EndTable();
}
if (ImGui::CollapsingHeader("Normal", ImGuiTreeNodeFlags_DefaultOpen))
{
ImGui::BeginChild("##normal", TexturePanelSize, true);
ImGui::BeginTable("##Flags", 3, ImGuiTableFlags_BordersInner | ImGuiTableFlags_SizingStretchProp);
{
uint32_t textureID = 0;
if (material->HasNormal())
ImGui::TableSetupColumn("name", 0, 0.3f);
ImGui::TableSetupColumn("set", 0, 0.6f);
ImGui::TableSetupColumn("reset", 0, 0.1f);
ImGui::TableNextColumn();
static bool normalEnabled = true;
{
textureID = material->m_Normal->GetID();
ImGui::Text("Enabled");
ImGui::TableNextColumn();
ImGui::Checkbox("##normalEnabled", &normalEnabled);
ImGui::TableNextColumn();
// Reset
ImGui::TableNextColumn();
}
if (ImGui::ImageButtonEx(ImGui::GetCurrentWindow()->GetID("#image3"), (void*)textureID, ImVec2(80, 80), ImVec2(0, 1), ImVec2(1, 0), ImVec4(0, 0, 0, 1), ImVec4(1, 1, 1, 1)))
if (!normalEnabled)
{
std::string texture = FileDialog::OpenFile("*.png | *.jpg");
if (texture != "")
ImGui::BeginDisabled();
}
{
ImGui::Text("Texture");
ImGui::TableNextColumn();
ImTextureID textureID = 0;
if (material->HasNormal())
{
material->SetNormal(TextureManager::Get()->GetTexture(texture));
auto vkTexture = GPUResources::Get().GetTexture(material->NormalImage);
textureID = (ImTextureID)vkTexture->GetImGuiDescriptorSet();
}
if (ImGui::ImageButtonEx(ImGui::GetCurrentWindow()->GetID("#image3"), (void*)textureID, ImVec2(80, 80), ImVec2(0, 1), ImVec2(1, 0), ImVec4(0, 0, 0, 1), ImVec4(1, 1, 1, 1)))
{
std::string texture = FileDialog::OpenFile("*.png | *.jpg");
if (texture != "")
{
material->SetNormal(TextureManager::Get()->GetTexture(texture));
}
}
if (ImGui::BeginPopupContextWindow())
{
if (ImGui::MenuItem("Clear Texture"))
{
material->m_Normal = nullptr;
}
ImGui::EndPopup();
}
}
if (ImGui::BeginPopupContextWindow())
if (!normalEnabled)
{
if (ImGui::MenuItem("Clear Texture"))
{
material->m_Normal = nullptr;
}
ImGui::EndPopup();
ImGui::EndDisabled();
}
}
ImGui::EndChild();
ImGui::EndTable();
}
if (ImGui::CollapsingHeader("AO", ImGuiTreeNodeFlags_DefaultOpen))
{
ImGui::BeginChild("##ao", TexturePanelSize, true);
{
uint32_t textureID = 0;
ImTextureID textureID = 0;
if (material->HasAO())
{
textureID = material->m_AO->GetID();
auto vkTexture = GPUResources::Get().GetTexture(material->AOImage);
textureID = (ImTextureID)vkTexture->GetImGuiDescriptorSet();
}
if (ImGui::ImageButtonEx(ImGui::GetCurrentWindow()->GetID("#image2"), (void*)textureID, ImVec2(80, 80), ImVec2(0, 1), ImVec2(1, 0), ImVec4(1, 1, 1, 1), ImVec4(1, 1, 1, 1)))
@@ -190,10 +632,11 @@ void MaterialEditor::Draw(Ref<Nuake::Material> material)
{
ImGui::BeginChild("##metalness", TexturePanelSize, true);
{
uint32_t textureID = 0;
ImTextureID textureID = 0;
if (material->HasMetalness())
{
textureID = material->m_Metalness->GetID();
auto vkTexture = GPUResources::Get().GetTexture(material->MetalnessImage);
textureID = (ImTextureID)vkTexture->GetImGuiDescriptorSet();
}
if (ImGui::ImageButtonEx(ImGui::GetCurrentWindow()->GetID("#image4"), (void*)textureID, ImVec2(80, 80), ImVec2(0, 1), ImVec2(1, 0), ImVec4(0, 0, 0, 1), ImVec4(1, 1, 1, 1)))
@@ -224,10 +667,11 @@ void MaterialEditor::Draw(Ref<Nuake::Material> material)
{
ImGui::BeginChild("##roughness", TexturePanelSize, true);
{
uint32_t textureID = 0;
ImTextureID textureID = 0;
if (material->HasRoughness())
{
textureID = material->m_Roughness->GetID();
auto vkTexture = GPUResources::Get().GetTexture(material->RoughnessImage);
textureID = (ImTextureID)vkTexture->GetImGuiDescriptorSet();
}
if (ImGui::ImageButtonEx(ImGui::GetCurrentWindow()->GetID("#image5"), (void*)textureID, ImVec2(80, 80), ImVec2(0, 1), ImVec2(1, 0), ImVec4(0, 0, 0, 0), ImVec4(1, 1, 1, 1)))

7
Editor/Source/Editor/ComponentsPanel/MaterialEditor.h
View File

@@ -1,11 +1,16 @@
#pragma once
#include <Nuake/Core/Core.h>
#include <Nuake/Rendering/Textures/Material.h>
#include <Nuake/Scene/Scene.h>
#include "Nuake/Rendering/Vulkan/SceneViewport.h"
class MaterialEditor
{
private:
Ref<Nuake::Scene> PreviewScene;
Ref<Nuake::Viewport> SceneViewport;
public:
MaterialEditor() = default;
MaterialEditor();
~MaterialEditor() = default;
void Draw(Ref<Nuake::Material> material);

3
Editor/Source/Editor/ComponentsPanel/ModelResourceInspector.cpp
View File

@@ -5,6 +5,7 @@
ModelResourceInspector::ModelResourceInspector(Ref<Nuake::Model> model)
{
_model = model;
}
void ModelResourceInspector::Draw()
@@ -19,7 +20,7 @@ void ModelResourceInspector::Draw()
std::string childId = "materialEditor" + std::to_string(i);
ImGui::BeginChild(childId.c_str(), ImVec2(0, 0), false);
{
MaterialEditor editor;
static MaterialEditor editor;
editor.Draw(_model->GetMeshes().at(i)->GetMaterial());
}
ImGui::EndChild();

11
Editor/Source/Editor/Windows/SceneEditor/Widgets/FileBrowserWidget.cpp
View File

@@ -10,6 +10,7 @@
#include <Nuake/UI/ImUI.h>
#include "../../../Misc/InterfaceFonts.h"
#include <Nuake/Resource/Bakers/AssetBakerManager.h>
using namespace Nuake;
@@ -269,7 +270,7 @@ void FileBrowserWidget::Draw()
{
if (searchQuery.empty() || f->GetName().find(String::Sanitize(searchQuery)) != std::string::npos)
{
if (f->GetFileType() == FileType::Unknown || f->GetFileType() == FileType::Assembly)
if ((f->GetFileType() == FileType::Unknown && !AssetBakerManager::Get().IsBakable(f)) || f->GetFileType() == FileType::Assembly)
{
continue;
}
@@ -781,6 +782,14 @@ void FileBrowserWidget::DrawFile(Ref<Nuake::File> file, uint32_t drawId)
shouldOpenScene = true;
}
}
if (AssetBakerManager::Get().IsBakable(file))
{
if (ImGui::MenuItem("Rebake"))
{
AssetBakerManager::Get().OnNewAssetDetected(file);
}
}
ImGui::Separator();

6
Editor/Source/Editor/Windows/SceneEditor/Widgets/SelectionPropertyWidget.cpp
View File

@@ -3,7 +3,6 @@
#include "Nuake/Scene/Components.h"
#include "Nuake/UI/ImUI.h"
#include "../../../ComponentsPanel/MaterialEditor.h"
#include <Nuake/Resource/SkyResource.h>
#include <Nuake/FileSystem/FileDialog.h>
@@ -238,7 +237,6 @@ void SelectionPropertyWidget::DrawFile(Ref<Nuake::File> file)
{
case FileType::Material:
{
MaterialEditor matEditor;
matEditor.Draw(std::static_pointer_cast<Material>(selectedResource));
break;
}
@@ -1665,14 +1663,14 @@ void SelectionPropertyWidget::DrawMaterialPanel(Ref<Nuake::Material> material)
ImGui::EndChild();
}
if (ImGui::CollapsingHeader("Normal", ImGuiTreeNodeFlags_DefaultOpen))
if (ImGui::CollapsingHeader("Normal", ImGuiTreeNodeFlags_DefaultOpen))
{
ImGui::BeginChild("##normal", TexturePanelSize, true);
{
uint32_t textureID = 0;
if (material->HasNormal())
{
textureID = material->m_Normal->GetID();
textureID = material->m_Normal->GetID();
}
if (ImGui::ImageButtonEx(ImGui::GetCurrentWindow()->GetID("#image3"), (void*)textureID, ImVec2(80, 80), ImVec2(0, 1), ImVec2(1, 0), ImVec4(0, 0, 0, 1), ImVec4(1, 1, 1, 1)))

2
Editor/Source/Editor/Windows/SceneEditor/Widgets/SelectionPropertyWidget.h
View File

@@ -3,6 +3,7 @@
#include "../../EditorSelectionPanel.h"
#include "../../../misc/AnimatedValue.h"
#include "../../../ComponentsPanel/MaterialEditor.h"
class EditorContext;
@@ -12,6 +13,7 @@ using DrawFieldTypeFn = std::function<void(entt::meta_data& fieldMeta, entt::met
class SelectionPropertyWidget : public IEditorWidget
{
private:
MaterialEditor matEditor;
TransformPanel transformPanel;
MeshPanel meshPanel;
SkinnedMeshPanel skinnedMeshPanel;