From 661d50c6be6b6cb501f39b20a3e35988c80effb1 Mon Sep 17 00:00:00 2001 From: OusmBlueNinja <89956790+OusmBlueNinja@users.noreply.github.com> Date: Wed, 7 May 2025 10:41:12 -0500 Subject: [PATCH] Fixed prefabs in asset view --- imgui.ini | 32 ++++++++++++------------- remake/build.log | 3 --- src/src/editor/windows/AssetBrowser.cpp | 9 +------ 3 files changed, 17 insertions(+), 27 deletions(-) diff --git a/imgui.ini b/imgui.ini index b469a8c..019f3e6 100644 --- a/imgui.ini +++ b/imgui.ini @@ -10,24 +10,24 @@ Collapsed=1 [Window][WindowOverViewport_11111111] Pos=0,19 -Size=1920,1158 +Size=1280,701 Collapsed=0 [Window][Inspector] -Pos=1553,19 -Size=367,659 +Pos=913,19 +Size=367,202 Collapsed=0 DockId=0x00000018,0 [Window][Scene Tree] Pos=0,19 -Size=347,579 +Size=347,350 Collapsed=0 DockId=0x0000000F,0 [Window][Viewport] Pos=349,19 -Size=1202,659 +Size=562,202 Collapsed=0 DockId=0x00000017,0 @@ -36,14 +36,14 @@ Size=1280,19 Collapsed=0 [Window][Performance Info] -Pos=1606,680 -Size=314,497 +Pos=1094,223 +Size=186,497 Collapsed=0 DockId=0x00000016,0 [Window][Console] -Pos=349,680 -Size=1201,273 +Pos=349,223 +Size=710,273 Collapsed=0 DockId=0x00000013,0 @@ -54,8 +54,8 @@ Collapsed=0 DockId=0x00000017,1 [Window][Profiler] -Pos=349,955 -Size=1201,222 +Pos=349,498 +Size=710,222 Collapsed=0 DockId=0x00000014,0 @@ -112,8 +112,8 @@ Collapsed=0 DockId=0x0000000E,0 [Window][Audio Output] -Pos=1552,680 -Size=52,497 +Pos=1061,223 +Size=31,497 Collapsed=0 DockId=0x00000012,0 @@ -124,8 +124,8 @@ Collapsed=0 DockId=0x0000000D,0 [Window][Resources] -Pos=0,600 -Size=347,577 +Pos=0,371 +Size=347,349 Collapsed=0 DockId=0x00000010,0 @@ -140,7 +140,7 @@ Column 0 Weight=1.0000 Column 1 Width=120 [Docking][Data] -DockSpace ID=0x11111111 Window=0x1BBC0F80 Pos=0,19 Size=1920,1158 Split=X +DockSpace ID=0x11111111 Window=0x1BBC0F80 Pos=0,19 Size=1280,701 Split=X DockNode ID=0x00000005 Parent=0x11111111 SizeRef=989,1158 Split=X DockNode ID=0x00000001 Parent=0x00000005 SizeRef=347,701 Split=Y Selected=0x12EF0F59 DockNode ID=0x00000003 Parent=0x00000001 SizeRef=342,637 Split=Y Selected=0x12EF0F59 diff --git a/remake/build.log b/remake/build.log index 3449d45..e69de29 100644 --- a/remake/build.log +++ b/remake/build.log @@ -1,3 +0,0 @@ -[COMPILE] g++ -std=c++20 -Wall -g -Isrc/include -Isrc/include/lua -Isrc/vendor -Isrc/vendor/imgui -Isrc/vendor/box2d -Isrc/vendor/xxhash -Isrc/vendor/miniaudio -Isrc/vendor/imguizmo -IC:/msys64/mingw64/include -Isrc\vendor\imgui -IC:\msys64\mingw64\lib\libyaml-cpp.a -MMD -MP -c src\src\editor\windows\AssetBrowser.cpp -o src\build\editor\windows\AssetBrowser.o -[COMPILE] g++ -std=c++20 -Wall -g -Isrc/include -Isrc/include/lua -Isrc/vendor -Isrc/vendor/imgui -Isrc/vendor/box2d -Isrc/vendor/xxhash -Isrc/vendor/miniaudio -Isrc/vendor/imguizmo -IC:/msys64/mingw64/include -Isrc\vendor\imgui -IC:\msys64\mingw64\lib\libyaml-cpp.a -MMD -MP -c src\src\core\utils\AssetManager.cpp -o src\build\core\utils\AssetManager.o -[LINK] g++ src\build\Engine.o src\build\main.o src\build\Renderer.o src\build\Components\AnimationComponent.o src\build\Components\AudioPlayerComponent.o src\build\Components\CameraComponent.o src\build\Components\LightComponent.o src\build\Components\ParticleComponent.o src\build\Components\PhysicsComponent.o src\build\Components\ScriptComponent.o src\build\Components\SpriteComponent.o src\build\Components\TextComonent.o src\build\Components\TilemapComponent.o src\build\core\audio\AudioEngine.o src\build\core\functions\Prefab.o src\build\core\utils\AssetManager.o src\build\core\utils\EngineConfig.o src\build\core\utils\ExceptionHandler.o src\build\core\utils\FileDialog.o src\build\core\utils\input.o src\build\core\utils\LoadingWindow.o src\build\core\utils\Logging.o src\build\core\utils\Popup.o src\build\core\utils\Profiler.o src\build\core\utils\Texture.o src\build\core\utils\utils.o src\build\editor\windows\AssetBrowser.o src\build\editor\windows\AudioInfo.o src\build\editor\windows\Inspector.o src\build\Entitys\Object.o src\build\utils\GameObjectsList.o src\build\utils\Shader.o src\build\utils\UID.o src\build\lapi.o src\build\lauxlib.o src\build\lbaselib.o src\build\lcode.o src\build\lcorolib.o src\build\lctype.o src\build\ldblib.o src\build\ldebug.o src\build\ldo.o src\build\ldump.o src\build\lfunc.o src\build\lgc.o src\build\linit.o src\build\liolib.o src\build\llex.o src\build\lmathlib.o src\build\lmem.o src\build\loadlib.o src\build\lobject.o src\build\lopcodes.o src\build\loslib.o src\build\lparser.o src\build\lstate.o src\build\lstring.o src\build\lstrlib.o src\build\ltable.o src\build\ltablib.o src\build\ltm.o src\build\lua.o src\build\luac.o src\build\lundump.o src\build\lutf8lib.o src\build\lvm.o src\build\lzio.o src\build\imgui.o src\build\imgui_demo.o src\build\imgui_draw.o src\build\imgui_impl_glfw.o src\build\imgui_impl_opengl3.o src\build\imgui_tables.o src\build\imgui_widgets.o src\build\aabb.o src\build\arena_allocator.o src\build\array.o src\build\bitset.o src\build\body.o src\build\broad_phase.o src\build\constraint_graph.o src\build\contact.o src\build\contact_solver.o src\build\core.o src\build\distance.o src\build\distance_joint.o src\build\dynamic_tree.o src\build\geometry.o src\build\hull.o src\build\id_pool.o src\build\island.o src\build\joint.o src\build\manifold.o src\build\math_functions.o src\build\motor_joint.o src\build\mouse_joint.o src\build\mover.o src\build\prismatic_joint.o src\build\revolute_joint.o src\build\sensor.o src\build\shape.o src\build\solver.o src\build\solver_set.o src\build\table.o src\build\timer.o src\build\types.o src\build\weld_joint.o src\build\wheel_joint.o src\build\world.o src\build\xxhash.o src\build\miniaudio.o src\build\ImGuizmo.o -o src\build\app.exe -LC:\msys64\mingw64\lib -lglfw3 -lglew32 -lopengl32 -lgdi32 -lyaml-cpp -lcomdlg32 -lssl -lcrypto -ldbghelp diff --git a/src/src/editor/windows/AssetBrowser.cpp b/src/src/editor/windows/AssetBrowser.cpp index a4dcde9..1741355 100644 --- a/src/src/editor/windows/AssetBrowser.cpp +++ b/src/src/editor/windows/AssetBrowser.cpp @@ -160,14 +160,7 @@ void ShowAssetBrowser() { const auto *prefab = dynamic_cast(asset); - if (ImGui::Button(prefab->prefabName.empty() ? "##Prefab" : ("##" + prefab->prefabName).c_str(), ImVec2(thumbnailSize, thumbnailSize))) - { - } - - ImGui::PushTextWrapPos(ImGui::GetCursorPosX() + thumbnailSize); - ImGui::TextWrapped("%s", prefab->prefabName.empty() ? "Prefab" : prefab->prefabName.c_str()); - ImGui::PopTextWrapPos(); - + ImGui::Button("Prefab", ImVec2(thumbnailSize, thumbnailSize)); if (ImGui::BeginDragDropSource(ImGuiDragDropFlags_SourceAllowNullID)) { ImGui::SetDragDropPayload("ASSET_PREFAB", &prefab->uaid, sizeof(uint64_t));