Skip to content

Commit

Permalink
Got ImGui Accepting Callbacks from GLFW
Browse files Browse the repository at this point in the history
  • Loading branch information
tomheeleynz committed Sep 4, 2022
1 parent 78372fe commit f4b8db5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 12 deletions.
2 changes: 1 addition & 1 deletion Arcane/src/Arcane/Platform/Vulkan/VulkanImGuiLayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ namespace Arcane {
GLFWwindow* windowHandle = static_cast<GLFWwindow*>(app.GetWindow().GetNativeWindow());
VulkanContext* vulkanContext = static_cast<VulkanContext*>(app.GetWindow().GetContext());

ImGui_ImplGlfw_InitForVulkan(windowHandle, false);
ImGui_ImplGlfw_InitForVulkan(windowHandle,true);

ImGui_ImplVulkan_InitInfo initInfo{};
initInfo.Instance = vulkanContext->GetInstance();
Expand Down
11 changes: 0 additions & 11 deletions EnchantingTable/src/Panels/EntityPanel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,17 +89,6 @@ void EntityPanel::DrawComponents(Arcane::Entity& entity)
if (material != nullptr) {
for (Arcane::ShaderVariable variable : material->GetMaterialVariables())
{
//if (variable.Type == Arcane::ShaderVariableType::Vec3)
//{
// glm::vec3 currentValue = material->GetVec3(variable.binding, variable.offset);

// if (currentValue.x < 0)
// currentValue = {0.0f, 0.0f, 0.0f};

// ImGui::ColorEdit3(variable.Name.c_str(), glm::value_ptr(currentValue));
// material->WriteVec3(variable.binding, variable.offset, currentValue);
//}

if (variable.Type == Arcane::ShaderVariableType::Sampler)
{
ImGui::Text("Albedo");
Expand Down

0 comments on commit f4b8db5

Please sign in to comment.