Skip to content

Commit 06ea532

Browse files
stripe2933stripe2933
committed
Unified hint text.
1 parent fdfd0a1 commit 06ea532

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

‎impl/control/ImGuiTaskCollector.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -436,10 +436,10 @@ void vk_gltf_viewer::control::ImGuiTaskCollector::assetInspector(gltf::AssetExte
436436
"gltf-buffers-table",
437437
ImGuiTableFlags_Borders | ImGuiTableFlags_Reorderable | ImGuiTableFlags_RowBg | ImGuiTableFlags_Hideable | ImGuiTableFlags_ScrollY,
438438
assetExtended.asset.buffers,
439-
ImGui::ColumnInfo { "Name", [](std::size_t row, fastgltf::Buffer &buffer) {
440-
ImGui::WithID(row, [&]() {
439+
ImGui::ColumnInfo { "Name", [&](std::size_t bufferIndex, fastgltf::Buffer &buffer) {
440+
ImGui::WithID(bufferIndex, [&]() {
441441
ImGui::SetNextItemWidth(-std::numeric_limits<float>::min());
442-
ImGui::InputTextWithHint("##name", "<empty>", &buffer.name);
442+
ImGui::InputTextWithHint("##name", gui::getDisplayName(assetExtended.asset.buffers, bufferIndex), &buffer.name);
443443
});
444444
}, ImGuiTableColumnFlags_WidthStretch },
445445
ImGui::ColumnInfo { "Size", [](const fastgltf::Buffer &buffer) {
@@ -481,10 +481,10 @@ void vk_gltf_viewer::control::ImGuiTaskCollector::assetInspector(gltf::AssetExte
481481
"gltf-buffer-views-table",
482482
ImGuiTableFlags_Borders | ImGuiTableFlags_Reorderable | ImGuiTableFlags_RowBg | ImGuiTableFlags_Hideable | ImGuiTableFlags_ScrollY,
483483
assetExtended.asset.bufferViews,
484-
ImGui::ColumnInfo { "Name", [](std::size_t rowIndex, fastgltf::BufferView &bufferView) {
485-
ImGui::WithID(rowIndex, [&]() {
484+
ImGui::ColumnInfo { "Name", [&](std::size_t bufferViewIndex, fastgltf::BufferView &bufferView) {
485+
ImGui::WithID(bufferViewIndex, [&] {
486486
ImGui::SetNextItemWidth(-std::numeric_limits<float>::min());
487-
ImGui::InputTextWithHint("##name", "<empty>", &bufferView.name);
487+
ImGui::InputTextWithHint("##name", gui::getDisplayName(assetExtended.asset.bufferViews, bufferViewIndex), &bufferView.name);
488488
});
489489
}, ImGuiTableColumnFlags_WidthStretch },
490490
ImGui::ColumnInfo { "Buffer", [](std::size_t i, const fastgltf::BufferView &bufferView) {
@@ -525,10 +525,10 @@ void vk_gltf_viewer::control::ImGuiTaskCollector::assetInspector(gltf::AssetExte
525525
"gltf-images-table",
526526
ImGuiTableFlags_Borders | ImGuiTableFlags_Reorderable | ImGuiTableFlags_RowBg | ImGuiTableFlags_Hideable | ImGuiTableFlags_ScrollY,
527527
assetExtended.asset.images,
528-
ImGui::ColumnInfo { "Name", [](std::size_t rowIndex, fastgltf::Image &image) {
529-
ImGui::WithID(rowIndex, [&]() {
528+
ImGui::ColumnInfo { "Name", [&](std::size_t imageIndex, fastgltf::Image &image) {
529+
ImGui::WithID(imageIndex, [&] {
530530
ImGui::SetNextItemWidth(-std::numeric_limits<float>::min());
531-
ImGui::InputTextWithHint("##name", "<empty>", &image.name);
531+
ImGui::InputTextWithHint("##name", gui::getDisplayName(assetExtended.asset.images, imageIndex), &image.name);
532532
});
533533
}, ImGuiTableColumnFlags_WidthStretch },
534534
ImGui::ColumnInfo { "MIME", [](const fastgltf::Image &image) {
@@ -625,10 +625,10 @@ void vk_gltf_viewer::control::ImGuiTaskCollector::assetInspector(gltf::AssetExte
625625
"gltf-samplers-table",
626626
ImGuiTableFlags_Borders | ImGuiTableFlags_Reorderable | ImGuiTableFlags_RowBg | ImGuiTableFlags_Hideable | ImGuiTableFlags_ScrollY,
627627
assetExtended.asset.samplers,
628-
ImGui::ColumnInfo { "Name", [](std::size_t rowIndex, fastgltf::Sampler &sampler) {
629-
ImGui::WithID(rowIndex, [&]() {
628+
ImGui::ColumnInfo { "Name", [&](std::size_t samplerIndex, fastgltf::Sampler &sampler) {
629+
ImGui::WithID(samplerIndex, [&] {
630630
ImGui::SetNextItemWidth(-std::numeric_limits<float>::min());
631-
ImGui::InputTextWithHint("##name", "<empty>", &sampler.name);
631+
ImGui::InputTextWithHint("##name", gui::getDisplayName(assetExtended.asset.samplers, samplerIndex), &sampler.name);
632632
});
633633
}, ImGuiTableColumnFlags_WidthStretch },
634634
ImGui::ColumnInfo { "Filter (Mag/Min)", [](const fastgltf::Sampler &sampler) {
@@ -710,7 +710,7 @@ void vk_gltf_viewer::control::ImGuiTaskCollector::materialEditor(gltf::AssetExte
710710
gui::popup::waitList.emplace_back(
711711
std::in_place_type<gui::popup::NameChanger>,
712712
assetExtended.asset.materials[*i].name,
713-
std::format("Unnamed material {}", *i));
713+
std::format("Unnamed Material {}", *i));
714714
}
715715
}
716716

@@ -1083,7 +1083,7 @@ void vk_gltf_viewer::control::ImGuiTaskCollector::sceneHierarchy(gltf::AssetExte
10831083
const fastgltf::Node &node = asset.nodes[nodeIndex];
10841084

10851085
if (std::string_view name = node.name; name.empty()) {
1086-
tempStringBuffer.append("<Unnamed node {}>", nodeIndex);
1086+
tempStringBuffer.append("Unnamed Node {}", nodeIndex);
10871087
}
10881088
else {
10891089
tempStringBuffer.append(name);
@@ -1307,7 +1307,7 @@ void vk_gltf_viewer::control::ImGuiTaskCollector::nodeInspector(gltf::AssetExten
13071307
if (assetExtended.selectedNodes.size() == 1) {
13081308
const std::size_t selectedNodeIndex = *assetExtended.selectedNodes.begin();
13091309
fastgltf::Node &node = assetExtended.asset.nodes[selectedNodeIndex];
1310-
ImGui::InputTextWithHint("Name", "<empty>", &node.name);
1310+
ImGui::InputTextWithHint("Name", gui::getDisplayName(assetExtended.asset.nodes, selectedNodeIndex), &node.name);
13111311

13121312
ImGui::SeparatorText("Transform");
13131313

@@ -1403,7 +1403,7 @@ void vk_gltf_viewer::control::ImGuiTaskCollector::nodeInspector(gltf::AssetExten
14031403
if (ImGui::BeginTabBar("node-tab-bar")) {
14041404
if (node.meshIndex && ImGui::BeginTabItem("Mesh")) {
14051405
fastgltf::Mesh &mesh = assetExtended.asset.meshes[*node.meshIndex];
1406-
ImGui::InputTextWithHint("Name", "<empty>", &mesh.name);
1406+
ImGui::InputTextWithHint("Name", gui::getDisplayName(assetExtended.asset.meshes, *node.meshIndex), &mesh.name);
14071407

14081408
for (auto &&[primitiveIndex, primitive]: mesh.primitives | ranges::views::enumerate) {
14091409
if (ImGui::CollapsingHeader(tempStringBuffer.write("Primitive {}", primitiveIndex).view().c_str())) {
@@ -1502,7 +1502,7 @@ void vk_gltf_viewer::control::ImGuiTaskCollector::nodeInspector(gltf::AssetExten
15021502
}
15031503
if (node.cameraIndex && ImGui::BeginTabItem("Camera")) {
15041504
auto &[camera, name] = assetExtended.asset.cameras[*node.cameraIndex];
1505-
ImGui::InputTextWithHint("Name", "<empty>", &name);
1505+
ImGui::InputTextWithHint("Name", gui::getDisplayName(assetExtended.asset.cameras, *node.cameraIndex), &name);
15061506

15071507
ImGui::WithDisabled([&]() {
15081508
if (int type = camera.index(); ImGui::Combo("Type", &type, "Perspective\0Orthographic\0")) {
@@ -1564,7 +1564,7 @@ void vk_gltf_viewer::control::ImGuiTaskCollector::nodeInspector(gltf::AssetExten
15641564
}
15651565
if (node.lightIndex && ImGui::BeginTabItem("Light")) {
15661566
fastgltf::Light &light = assetExtended.asset.lights[*node.lightIndex];
1567-
ImGui::InputTextWithHint("Name", "<empty>", &light.name);
1567+
ImGui::InputTextWithHint("Name", gui::getDisplayName(assetExtended.asset.lights, *node.lightIndex), &light.name);
15681568
ImGui::EndTabItem();
15691569
}
15701570

‎interface/gui/popup/TextureViewer.cppm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ void vk_gltf_viewer::gui::popup::TextureViewer::show() {
4343

4444
ImGui::WithGroup([&] {
4545
fastgltf::Texture &texture = assetExtended.get().asset.textures[textureIndex];
46-
ImGui::InputTextWithHint("Name", "<empty>", &texture.name);
46+
ImGui::InputTextWithHint("Name", getDisplayName(assetExtended.get().asset.textures, textureIndex), &texture.name);
4747
if (ImGui::BeginCombo("Image Index", tempStringBuffer.write(selectedImageIndex).view().c_str())) {
4848
if (texture.imageIndex) {
4949
// TODO: do not disable this and load the image when the selection is changed.

0 commit comments

Comments
 (0)