Merge pull request #175 from SHADE-DP/SP3-4-Editor

Asset browser now recurses down subassets

Assets/Materials/BagMaterial.shmat

@@ -0,0 +1,8 @@
+- VertexShader: 39210065
+  FragmentShader: 46377769
+  SubPass: G-Buffer Write
+  Properties:
+    data.color: {x: 1, y: 1, z: 1, w: 1}
+    data.textureIndex: 58303057
+    data.alpha: 0
+    data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/BagMaterial.shmat.shmeta

@@ -0,0 +1,3 @@
+Name: BagMaterial
+ID: 123745521
+Type: 7

Assets/Scenes/M2Scene.shade

@@ -50,7 +50,7 @@
       Colliders:
         - Is Trigger: false
           Type: Box
-          Half Extents: {x: 0.0170898438, y: 0.00048828125, z: 0.0170898438}
+          Half Extents: {x: 0.00427246094, y: 0.000122070312, z: 0.00427246094}
           Friction: 0.400000006
           Bounciness: 0
           Density: 1
@@ -59,7 +59,7 @@
 - EID: 2
   Name: Player
   IsActive: true
-  NumberOfChildren: 2
+  NumberOfChildren: 3
   Components:
     Transform Component:
       Translate: {x: -3.06177855, y: -2, z: -5}
@@ -85,7 +85,7 @@
       Colliders:
         - Is Trigger: false
           Type: Box
-          Half Extents: {x: 0.0009765625, y: 0.0009765625, z: 0.0009765625}
+          Half Extents: {x: 0.000244140625, y: 0.000244140625, z: 0.000244140625}
           Friction: 0.400000006
           Bounciness: 0
           Density: 1
@@ -111,6 +111,19 @@
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 1, y: 1, z: 1}
   Scripts: ~
+- EID: 9
+  Name: Default
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+    Renderable Component:
+      Mesh: 144838771
+      Material: 123745521
+  Scripts: ~
 - EID: 5
   Name: item
   IsActive: true
@@ -121,7 +134,7 @@
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 2, y: 2, z: 2}
     Renderable Component:
-      Mesh: 149697411
+      Mesh: 144838771
       Material: 126974645
     RigidBody Component:
       Type: Dynamic
@@ -140,14 +153,14 @@
       Colliders:
         - Is Trigger: false
           Type: Box
-          Half Extents: {x: 0.0009765625, y: 0.0009765625, z: 0.0009765625}
+          Half Extents: {x: 0.000244140625, y: 0.000244140625, z: 0.000244140625}
           Friction: 0.400000006
           Bounciness: 0
           Density: 1
           Position Offset: {x: 0, y: 0.5, z: 0}
         - Is Trigger: true
           Type: Box
-          Half Extents: {x: 0.001953125, y: 0.001953125, z: 0.001953125}
+          Half Extents: {x: 0.00048828125, y: 0.00048828125, z: 0.00048828125}
           Friction: 0.400000006
           Bounciness: 0
           Density: 1
@@ -182,7 +195,7 @@
       Colliders:
         - Is Trigger: false
           Type: Box
-          Half Extents: {x: 0.0009765625, y: 0.0009765625, z: 0.0009765625}
+          Half Extents: {x: 0.000244140625, y: 0.000244140625, z: 0.000244140625}
           Friction: 0.400000006
           Bounciness: 0
           Density: 1

Assets/Scenes/Scene2.shade

@@ -0,0 +1,72 @@
+- EID: 0
+  Name: Default
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0.304069757, z: 1.73034382}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+    Camera Component:
+      Position: {x: 0, y: 0.304069757, z: 1.73034382}
+      Pitch: 0
+      Yaw: 0
+      Roll: 0
+      Width: 1200
+      Height: 1080
+      Near: 0.00999999978
+      Far: 10000
+      Perspective: true
+  Scripts: ~
+- EID: 1
+  Name: Raccoon
+  IsActive: true
+  NumberOfChildren: 1
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+    Renderable Component:
+      Mesh: 149697411
+      Material: 126974645
+  Scripts: ~
+- EID: 3
+  Name: Bag
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0.006237939, y: -0.000393368304, z: 0}
+      Rotate: {x: -0, y: 2.79945588, z: 0}
+      Scale: {x: 1.0000881, y: 1, z: 1.0000881}
+    Renderable Component:
+      Mesh: 144838771
+      Material: 123745521
+  Scripts: ~
+- EID: 2
+  Name: DirectionalLight
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Light Component:
+      Position: {x: 0, y: 0, z: 0}
+      Type: Directional
+      Direction: {x: 0, y: 0, z: 1}
+      Color: {x: 1, y: 1, z: 1, w: 1}
+      Layer: 4294967295
+      Strength: 0
+  Scripts: ~
+- EID: 4
+  Name: AmbientLight
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Light Component:
+      Position: {x: 0, y: 0, z: 0}
+      Type: Ambient
+      Direction: {x: 0, y: 0, z: 1}
+      Color: {x: 1, y: 1, z: 1, w: 1}
+      Layer: 4294967295
+      Strength: 0.600000024
+  Scripts: ~

Assets/Scenes/Scene2.shade.shmeta

@@ -0,0 +1,3 @@
+Name: Scene2
+ID: 87285316
+Type: 5

SHADE_Engine/src/Editor/EditorWindow/AssetBrowser/SHAssetBrowser.cpp

@@ -102,8 +102,10 @@ namespace SHADE
       }
       for (auto const& file : files)
       {
+        if(file.assetMeta == nullptr)
+          continue;
         const float horizontalLineSize = 25.0f;
-        const ImRect childRect = DrawFile(file);
+        const ImRect childRect = DrawFile(file.assetMeta);
         const float midPoint = (childRect.Min.y + childRect.Max.y) * 0.5f;
         drawList->AddLine(ImVec2(vertLineStart.x, midPoint), ImVec2(vertLineStart.x + horizontalLineSize, midPoint), treeLineColor, 1);
         vertLineEnd.y = midPoint;
@@ -146,47 +148,48 @@ namespace SHADE
     //}
   }
 
-  ImRect SHAssetBrowser::DrawFile(SHFile const& file) noexcept
+  ImRect SHAssetBrowser::DrawFile(SHAsset const* const asset) noexcept
   {
-    if (file.assetMeta == nullptr)
+    if (asset == nullptr)
       return ImRect(ImGui::GetItemRectMin(), ImGui::GetItemRectMax());
-    const bool isSelected = std::ranges::find(selectedAssets, file.assetMeta->id) != selectedAssets.end();
+    const bool isSelected = std::ranges::find(selectedAssets, asset->id) != selectedAssets.end();
-    ImGuiTreeNodeFlags flags = ImGuiTreeNodeFlags_Leaf;
+    ImGuiTreeNodeFlags flags = (!asset->subAssets.empty()) ? ImGuiTreeNodeFlags_OpenOnArrow : ImGuiTreeNodeFlags_Leaf;
     if (isSelected)
       flags |= ImGuiTreeNodeFlags_Selected;
     std::string icon{};
 
-    switch (file.assetMeta->type)
+    switch (asset->type)
     {
     case AssetType::INVALID: break;
     case AssetType::SHADER: icon = ICON_FA_FILE_CODE; break;
     case AssetType::SHADER_BUILT_IN: icon = ICON_FA_FILE_CODE; break;
     case AssetType::TEXTURE: icon = ICON_FA_IMAGES; break;
-    case AssetType::MESH: icon = ICON_FA_CUBES; break;
+    case AssetType::MODEL: icon = ICON_FA_CUBES_STACKED; break;
     case AssetType::SCENE: icon = ICON_MD_IMAGE; break;
     case AssetType::PREFAB: icon = ICON_FA_BOX_OPEN; break;
     case AssetType::MATERIAL: break;
+    case AssetType::MESH: icon = ICON_FA_CUBES; break;
     case AssetType::MAX_COUNT: break;
     default:;
     }
     
-    ImGui::TreeNodeEx(file.assetMeta, flags, "%s %s", icon.data(), file.assetMeta->name.data());
+    bool const isOpen = ImGui::TreeNodeEx(asset, flags, "%s %s", icon.data(), asset->name.data());
     const ImRect nodeRect = ImRect(ImGui::GetItemRectMin(), ImGui::GetItemRectMax());
     if (SHDragDrop::BeginSource())
     {
-      auto id = file.assetMeta->id;
+      auto id = asset->id;
-      ImGui::Text("Moving Asset: %s [%zu]", file.name.data(), file.assetMeta->id);
+      ImGui::Text("Moving Asset: %s [%zu]", asset->name.data(), asset->id);
       SHDragDrop::SetPayload<AssetID>(SHDragDrop::DRAG_RESOURCE, &id);
       SHDragDrop::EndSource();
     }
     if (ImGui::IsItemClicked())
     {
       selectedAssets.clear();
-      selectedAssets.push_back(file.assetMeta->id);
+      selectedAssets.push_back(asset->id);
     }
     if (ImGui::IsItemHovered() && ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left))
     {
-      switch (file.assetMeta->type)
+      switch (asset->type)
       {
       case AssetType::INVALID: break;
       case AssetType::SHADER:  break;
@@ -196,14 +199,14 @@ namespace SHADE
       case AssetType::SCENE:
         if(auto editor = SHSystemManager::GetSystem<SHEditor>())
         {
-          editor->LoadScene(file.assetMeta->id);
+          editor->LoadScene(asset->id);
         }
         break;
       case AssetType::PREFAB:  break;
       case AssetType::MATERIAL:
         if (auto matInspector = SHEditorWindowManager::GetEditorWindow<SHMaterialInspector>())
         {
-          matInspector->OpenMaterial(file.assetMeta->id);
+          matInspector->OpenMaterial(asset->id);
         }
         break;
       case AssetType::MAX_COUNT: break;
@@ -211,7 +214,27 @@ namespace SHADE
       }
 
     }
+
+    //TODO: Combine Draw asset and Draw Folder recursive drawing
+    const ImColor treeLineColor = ImGui::GetColorU32(ImGuiCol_CheckMark);
+    const float horizontalOffset = 0.0f;
+    ImDrawList* drawList = ImGui::GetWindowDrawList();
+    ImVec2 vertLineStart = ImGui::GetCursorScreenPos();
+    vertLineStart.x += horizontalOffset;
+    ImVec2 vertLineEnd = vertLineStart;
+    if(isOpen)
+    {
+      for(auto const& subAsset : asset->subAssets)
+      {
+        const float horizontalLineSize = 25.0f;
+        const ImRect childRect = DrawFile(subAsset);
+        const float midPoint = (childRect.Min.y + childRect.Max.y) * 0.5f;
+        drawList->AddLine(ImVec2(vertLineStart.x, midPoint), ImVec2(vertLineStart.x + horizontalLineSize, midPoint), treeLineColor, 1);
+        vertLineEnd.y = midPoint;
+      }
+      drawList->AddLine(vertLineStart, vertLineEnd, treeLineColor, 1);
       ImGui::TreePop();
+    }
     return nodeRect;
   }
 
@@ -222,7 +245,7 @@ namespace SHADE
     auto& path = std::get<0>(assetBeingCreated.value());
     auto& type = std::get<1>(assetBeingCreated.value());
     auto& assetName = std::get<2>(assetBeingCreated.value());
-    if (ImGui::InputText("##newAssetname", &assetName, ImGuiInputTextFlags_EnterReturnsTrue))
+    if (ImGui::InputText("##newAssetName", &assetName, ImGuiInputTextFlags_EnterReturnsTrue))
     {
       AssetID assetId = SHAssetManager::CreateNewAsset(type, assetName);
       if (auto matInspector = SHEditorWindowManager::GetEditorWindow<SHMaterialInspector>())

SHADE_Engine/src/Editor/EditorWindow/AssetBrowser/SHAssetBrowser.h

@@ -21,7 +21,7 @@ namespace SHADE
     void DrawMenuBar();
     ImRect RecursivelyDrawTree(FolderPointer folder);
     void DrawCurrentFolder();
-    ImRect DrawFile(SHFile const& file) noexcept;
+    ImRect DrawFile(SHAsset const* const asset) noexcept;
     void DrawAssetBeingCreated() noexcept;
 
     FolderPointer rootFolder, prevFolder, currentFolder;