Scarfski/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-10-25 10:20:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

texturev: Added ability to delete image. (#3940)

Browse Source
This commit is contained in:
Branimir Karadžić
2026-08-30 06:06:13 +00:00
committed by GitHub
parent 5929f9826c
commit a9dd2e20fe
1 changed files with 201 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

218
tools/texturev/texturev.cpp
View File

@@ -111,6 +111,7 @@ struct Binding
View,
Help,
About,
Delete,
Video,
Count
@@ -168,6 +169,7 @@ static const InputBinding s_bindingApp[] =
{ entry::Key::Return, entry::Modifier::None, 1, NULL, "view files" },
{ entry::Key::KeyH, entry::Modifier::None, 1, NULL, "view help" },
{ entry::Key::KeyI, entry::Modifier::None, 1, NULL, "view info" },
{ entry::Key::Delete, entry::Modifier::None, 1, NULL, "view delete" },
{ entry::Key::Key1, entry::Modifier::None, 1, NULL, "view zoom 1.0\n"
"view fit\n" },
@@ -219,31 +221,34 @@ static const InputBinding s_bindingView[] =
static const InputBinding s_bindingHelp[] =
{
{ entry::Key::Esc, entry::Modifier::None, 1, NULL, "view help" },
{ entry::Key::KeyH, entry::Modifier::None, 1, NULL, "view help" },
{ entry::Key::Esc, entry::Modifier::None, 1, NULL, "view help" },
{ entry::Key::KeyH, entry::Modifier::None, 1, NULL, "view help" },
INPUT_BINDING_END
};
static const InputBinding s_bindingAbout[] =
{
{ entry::Key::Esc, entry::Modifier::None, 1, NULL, "view about" },
{ entry::Key::Esc, entry::Modifier::None, 1, NULL, "view about" },
INPUT_BINDING_END
};
static const InputBinding s_bindingDelete[] =
{
{ entry::Key::KeyD, entry::Modifier::None, 1, NULL, "view delete file" },
{ entry::Key::KeyT, entry::Modifier::None, 1, NULL, "view delete trash" },
{ entry::Key::Esc, entry::Modifier::None, 1, NULL, "view delete cancel" },
INPUT_BINDING_END
};
// Bindings active while a video clip is loaded. Replaces the standard View
// bindings on file change so per-image keys (rgb channel toggle, geometry,
// layer / mip navigation) don't accidentally fire on the video texture.
// Per-file navigation, exit, zoom and help are kept.
static const InputBinding s_bindingVideo[] =
{
{ entry::Key::Esc, entry::Modifier::None, 1, NULL, "exit" },
{ entry::Key::Left, entry::Modifier::None, 1, NULL, "video skip -8" },
{ entry::Key::Right, entry::Modifier::None, 1, NULL, "video skip +8" },
{ entry::Key::Space, entry::Modifier::None, 1, NULL, "video pause" },
{ entry::Key::LeftBracket, entry::Modifier::None, 1, NULL, "video rate down" },
{ entry::Key::RightBracket, entry::Modifier::None, 1, NULL, "video rate up" },
{ entry::Key::KeyL, entry::Modifier::None, 1, NULL, "video marker" },
{ entry::Key::Esc, entry::Modifier::None, 1, NULL, "exit" },
{ entry::Key::Left, entry::Modifier::None, 1, NULL, "video skip -8" },
{ entry::Key::Right, entry::Modifier::None, 1, NULL, "video skip +8" },
{ entry::Key::Space, entry::Modifier::None, 1, NULL, "video pause" },
{ entry::Key::LeftBracket, entry::Modifier::None, 1, NULL, "video rate down" },
{ entry::Key::RightBracket, entry::Modifier::None, 1, NULL, "video rate up" },
{ entry::Key::KeyL, entry::Modifier::None, 1, NULL, "video marker" },
INPUT_BINDING_END
};
@@ -254,6 +259,7 @@ static const char* s_bindingName[] =
"View",
"Help",
"About",
"Delete",
"Video",
};
static_assert(Binding::Count == BX_COUNTOF(s_bindingName) );
@@ -264,6 +270,7 @@ static const InputBinding* s_binding[] =
s_bindingView,
s_bindingHelp,
s_bindingAbout,
s_bindingDelete,
s_bindingVideo,
};
static_assert(Binding::Count == BX_COUNTOF(s_binding) );
@@ -301,10 +308,21 @@ struct RendererTypeRemap
struct View
{
struct Action
{
enum Enum
{
None,
Delete,
Trash,
};
};
View()
: m_rendererType(bgfx::RendererType::Count)
, m_cubeMapGeo(Geometry::Quad)
, m_outputFormat(Output::sRGB)
, m_action(Action::None)
, m_fileIndex(0)
, m_scaleFn(0)
, m_mip(0)
@@ -329,6 +347,7 @@ struct View
, m_alpha(false)
, m_help(false)
, m_about(false)
, m_delete(false)
, m_info(false)
, m_files(false)
, m_sdf(false)
@@ -731,6 +750,30 @@ struct View
{
m_about ^= true;
}
else if (0 == bx::strCmp(_argv[1], "delete") )
{
if (_argc >= 3)
{
if (0 == bx::strCmp(_argv[2], "file") )
{
m_action = Action::Delete;
}
else if (0 == bx::strCmp(_argv[2], "trash") )
{
m_action = Action::Trash;
}
m_delete = false;
}
else if (!m_delete)
{
m_delete = !m_fileList.empty();
}
else
{
m_delete = false;
}
}
else if (0 == bx::strCmp(_argv[1], "save") )
{
save();
@@ -898,6 +941,7 @@ struct View
bgfx::TextureInfo m_textureInfo;
Geometry::Enum m_cubeMapGeo;
Output::Enum m_outputFormat;
Action::Enum m_action;
uint32_t m_fileIndex;
uint32_t m_scaleFn;
uint32_t m_mip;
@@ -923,6 +967,7 @@ struct View
bool m_alpha;
bool m_help;
bool m_about;
bool m_delete;
bool m_info;
bool m_files;
bool m_sdf;
@@ -1639,7 +1684,7 @@ int _main_(int _argc, char** _argv)
, uint16_t(view.m_height)
);
bool modalWindow = view.m_help || view.m_about;
bool modalWindow = view.m_help || view.m_about || view.m_delete;
bool overArea = false
|| ImGui::GetMousePos().y <= ImGui::GetTextLineHeightWithSpacing()
|| ImGui::MouseOverArea()
@@ -1930,7 +1975,10 @@ int _main_(int _argc, char** _argv)
static bool help = false;
static bool about = false;
static bool deleteFile = false;
static bool deleteOpened = false;
static bool mouseDelta = false;
if (!mouseDelta)
{
mouseStatePrev = mouseState;
@@ -2008,6 +2056,26 @@ int _main_(int _argc, char** _argv)
about = view.m_about;
}
if (deleteFile != view.m_delete)
{
if (!deleteFile)
{
ImGui::OpenPopup("Delete");
deleteOpened = true;
inputRemoveBindings(s_bindingName[Binding::App]);
inputRemoveBindings(s_bindingName[playbackBinding]);
inputAddBindings(s_bindingName[Binding::Delete], s_binding[Binding::Delete]);
}
else
{
inputRemoveBindings(s_bindingName[Binding::Delete]);
inputAddBindings(s_bindingName[Binding::App], s_binding[Binding::App]);
inputAddBindings(s_bindingName[playbackBinding], s_binding[playbackBinding]);
}
deleteFile = view.m_delete;
}
if (view.m_info)
{
ImGui::SetNextWindowSize(
@@ -2199,6 +2267,9 @@ int _main_(int _argc, char** _argv)
keyBindingHelp("down", "Next texture.");
ImGui::NextLine();
keyBindingHelp("delete", "Delete current file (or move it to trash).");
ImGui::NextLine();
keyBindingHelp("r/g/b", "Toggle R, G, or B color channel.");
keyBindingHelp("a", "Toggle alpha blending.");
ImGui::NextLine();
@@ -2220,8 +2291,121 @@ int _main_(int _argc, char** _argv)
ImGui::EndPopup();
}
if (ImGui::BeginPopupModal("Delete", &view.m_delete, ImGuiWindowFlags_AlwaysAutoResize) )
{
ImGui::Text("Delete file:\n\n");
ImGui::PushFont(ImGui::Font::Mono);
ImGui::Text("%s", view.m_fileList.empty() ? "" : view.m_fileList[view.m_fileIndex].c_str() );
ImGui::NextLine();
keyBindingHelp("d", "Delete file.");
keyBindingHelp("t", "Move file to trash.");
keyBindingHelp("[any]", "Cancel.");
ImGui::PopFont();
ImGui::Dummy(ImVec2(0.0f, 0.0f) );
bool cancel = false;
if (ImGui::Button("Delete", ImVec2(96.0f, 0.0f) ) )
{
view.m_action = View::Action::Delete;
}
ImGui::SameLine();
if (ImGui::Button("Trash", ImVec2(96.0f, 0.0f) ) )
{
view.m_action = View::Action::Trash;
}
ImGui::SameLine();
cancel |= ImGui::Button("Cancel", ImVec2(96.0f, 0.0f) );
// Any key other than the ones bound above cancels. Skip the frame
// popup is opened, otherwise key that opened it would cancel it.
if (!deleteOpened)
{
for (int32_t key = ImGuiKey_Tab; key <= ImGuiKey_Oem102 && !cancel; ++key)
{
if (key >= ImGuiKey_LeftCtrl
&& key <= ImGuiKey_RightSuper)
{
continue;
}
cancel = ImGui::IsKeyPressed(ImGuiKey(key), false);
}
}
deleteOpened = false;
if (cancel
|| View::Action::None != view.m_action
|| view.m_fileList.empty()
|| !view.m_delete)
{
view.m_delete = false;
ImGui::CloseCurrentPopup();
}
ImGui::EndPopup();
}
imguiEndFrame();
if (View::Action::None != view.m_action)
{
const View::Action::Enum action = view.m_action;
view.m_action = View::Action::None;
if (!view.m_fileList.empty() )
{
bx::FilePath fp = view.m_path;
fp.join(view.m_fileList[view.m_fileIndex].c_str() );
if (videoOwnsTexture)
{
videoPlayer.close();
videoOwnsTexture = false;
texture = BGFX_INVALID_HANDLE;
}
else if (bgfx::isValid(texture) )
{
bgfx::destroy(texture);
texture = BGFX_INVALID_HANDLE;
}
bx::Error err;
const bool result = View::Action::Trash == action
? bx::moveToTrash(fp, &err)
: bx::remove(fp, &err)
;
if (result)
{
view.m_fileList.erase(view.m_fileList.begin() + view.m_fileIndex);
if (view.m_fileIndex >= view.m_fileList.size() )
{
view.m_fileIndex = bx::satSub<uint32_t>(uint32_t(view.m_fileList.size() ), 1u);
}
}
else
{
const bx::StringView& msg = err.getMessage();
bx::printf("Failed to delete %s: %S\n", fp.getCPtr(), &msg);
}
fileIndex = UINT32_MAX;
if (view.m_fileList.empty() )
{
entry::setWindowTitle(entry::kDefaultWindowHandle, "texturev");
}
}
}
if (view.m_fileIndex != fileIndex
&& 0 != view.m_fileList.size() )
{
@@ -2256,7 +2440,7 @@ int _main_(int _argc, char** _argv)
}
const int desiredBinding = nextIsVideo ? Binding::Video : Binding::View;
const bool modalOpen = view.m_help || view.m_about;
const bool modalOpen = view.m_help || view.m_about || view.m_delete;
if (desiredBinding != playbackBinding && !modalOpen)
{
inputRemoveBindings(s_bindingName[playbackBinding]);