Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-02-08 23:09:36 +01:00
Code Releases Wiki Activity

fix: Image visualizer data processor nodes not working

Browse Source 
Fixes #2081
This commit is contained in:
WerWolv 2025-01-24 21:35:38 +01:00
parent a6b4f62d75
commit acc77205bb
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/builtin/source/content/data_processor_nodes/other_nodes.cpp
View File

@ -291,14 +291,14 @@ namespace hex::plugin::builtin {
NodeVisualizerImage() : Node("hex.builtin.nodes.visualizer.image.header", { dp::Attribute(dp::Attribute::IOType::In, dp::Attribute::Type::Buffer, "hex.builtin.nodes.common.input") }) { } NodeVisualizerImage() : Node("hex.builtin.nodes.visualizer.image.header", { dp::Attribute(dp::Attribute::IOType::In, dp::Attribute::Type::Buffer, "hex.builtin.nodes.common.input") }) { }
void drawNode() override { void drawNode() override {
if (!m_texture.has_value()) { if (!m_texture.isValid() && !m_data.empty()) {
m_texture = ImGuiExt::Texture::fromImage(m_data.data(), m_data.size(), ImGuiExt::Texture::Filter::Nearest); m_texture = ImGuiExt::Texture::fromImage(m_data.data(), m_data.size(), ImGuiExt::Texture::Filter::Nearest);
} }
ImGui::Image(*m_texture, scaled(ImVec2(m_texture->getAspectRatio() * 200, 200))); ImGui::Image(m_texture, scaled(ImVec2(m_texture.getAspectRatio() * 200, 200)));
if (ImGui::IsItemHovered() && ImGui::IsKeyDown(ImGuiKey_LeftShift)) { if (ImGui::IsItemHovered() && ImGui::IsKeyDown(ImGuiKey_LeftShift)) {
ImGui::BeginTooltip(); ImGui::BeginTooltip();
ImGui::Image(*m_texture, scaled(ImVec2(m_texture->getAspectRatio() * 600, 600))); ImGui::Image(m_texture, scaled(ImVec2(m_texture.getAspectRatio() * 600, 600)));
ImGui::EndTooltip(); ImGui::EndTooltip();
} }
} }
@ -307,11 +307,12 @@ namespace hex::plugin::builtin {
const auto &rawData = this->getBufferOnInput(0); const auto &rawData = this->getBufferOnInput(0);
m_data = rawData; m_data = rawData;
m_texture = {};
} }
private: private:
std::vector<u8> m_data; std::vector<u8> m_data;
std::optional<ImGuiExt::Texture> m_texture; ImGuiExt::Texture m_texture;
}; };
class NodeVisualizerImageRGBA : public dp::Node { class NodeVisualizerImageRGBA : public dp::Node {
@ -319,14 +320,14 @@ namespace hex::plugin::builtin {
NodeVisualizerImageRGBA() : Node("hex.builtin.nodes.visualizer.image_rgba.header", { dp::Attribute(dp::Attribute::IOType::In, dp::Attribute::Type::Buffer, "hex.builtin.nodes.common.input"), dp::Attribute(dp::Attribute::IOType::In, dp::Attribute::Type::Integer, "hex.builtin.nodes.common.width"), dp::Attribute(dp::Attribute::IOType::In, dp::Attribute::Type::Integer, "hex.builtin.nodes.common.height") }) { } NodeVisualizerImageRGBA() : Node("hex.builtin.nodes.visualizer.image_rgba.header", { dp::Attribute(dp::Attribute::IOType::In, dp::Attribute::Type::Buffer, "hex.builtin.nodes.common.input"), dp::Attribute(dp::Attribute::IOType::In, dp::Attribute::Type::Integer, "hex.builtin.nodes.common.width"), dp::Attribute(dp::Attribute::IOType::In, dp::Attribute::Type::Integer, "hex.builtin.nodes.common.height") }) { }
void drawNode() override { void drawNode() override {
if (!m_texture.has_value()) { if (!m_texture.isValid() && !m_data.empty()) {
m_texture = ImGuiExt::Texture::fromImage(m_data.data(), m_data.size(), ImGuiExt::Texture::Filter::Nearest); m_texture = ImGuiExt::Texture::fromImage(m_data.data(), m_data.size(), ImGuiExt::Texture::Filter::Nearest);
} }
ImGui::Image(*m_texture, scaled(ImVec2(m_texture->getAspectRatio() * 200, 200))); ImGui::Image(m_texture, scaled(ImVec2(m_texture.getAspectRatio() * 200, 200)));
if (ImGui::IsItemHovered() && ImGui::IsKeyDown(ImGuiKey_LeftShift)) { if (ImGui::IsItemHovered() && ImGui::IsKeyDown(ImGuiKey_LeftShift)) {
ImGui::BeginTooltip(); ImGui::BeginTooltip();
ImGui::Image(*m_texture, scaled(ImVec2(m_texture->getAspectRatio() * 600, 600))); ImGui::Image(m_texture, scaled(ImVec2(m_texture.getAspectRatio() * 600, 600)));
ImGui::EndTooltip(); ImGui::EndTooltip();
} }
} }
@ -343,11 +344,12 @@ namespace hex::plugin::builtin {
throwNodeError(hex::format("Image requires at least {} bytes of data, but only {} bytes are available", requiredBytes, rawData.size())); throwNodeError(hex::format("Image requires at least {} bytes of data, but only {} bytes are available", requiredBytes, rawData.size()));
m_data = rawData; m_data = rawData;
m_texture = {};
} }
private: private:
std::vector<u8> m_data; std::vector<u8> m_data;
std::optional<ImGuiExt::Texture> m_texture; ImGuiExt::Texture m_texture;
}; };
class NodeVisualizerByteDistribution : public dp::Node { class NodeVisualizerByteDistribution : public dp::Node {